Datasets:
rasdani
/
github-patches-10k-sample-sorted

Dataset card Data Studio Files
xet
Community
1
in_source_id
string
before_files
list
after_files
list
pr_diff
string
DjangoGirls__djangogirls-153
[ { "content": "import csv\nfrom django.shortcuts import render, redirect, get_object_or_404\nfrom django.http import Http404, JsonResponse, HttpResponse\nfrom django.views.decorators.csrf import csrf_exempt\nfrom django.contrib import messages\nfrom django.template.defaultfilters import striptags\n\nfrom core.utils import get_event_page\nfrom core.models import EventPageMenu\nfrom .decorators import organiser_only\nfrom .models import Application, Form, Score, Question, Email\nfrom .forms import ApplicationForm, ScoreForm, EmailForm\nfrom .utils import get_applications_for_page, get_organiser_menu, random_application\n\n\ndef apply(request, city):\n page = get_event_page(city, request.user.is_authenticated(), False)\n if not page:\n raise Http404\n elif type(page) == tuple:\n return render(\n request, \"event_not_live.html\",\n {'city': page[0], 'past': page[1]}\n )\n\n try:\n form_obj = Form.objects.get(page=page)\n except Form.DoesNotExist:\n return redirect('core:event', city)\n\n organiser = request.user in page.event.team.all() or request.user.is_superuser\n\n if not organiser and not form_obj.application_open:\n return redirect('core:event', city)\n\n menu = EventPageMenu.objects.filter(page=page)\n\n form = ApplicationForm(\n request.POST or None, questions=form_obj.question_set.all()\n )\n\n if form.is_valid():\n form.save(form=form_obj)\n messages.success(request, \"Yay! Your application has been saved. You'll hear from us soon!\")\n\n return render(request, 'apply.html', {\n 'page': page,\n 'menu': menu,\n 'form_obj': form_obj,\n })\n\n number_of_email_questions = Question.objects.filter(question_type='email', form=form_obj).count()\n\n return render(request, 'apply.html', {\n 'page': page,\n 'menu': menu,\n 'form_obj': form_obj,\n 'form': form,\n 'number_of_email_questions': number_of_email_questions,\n })\n\n\n@organiser_only\ndef applications(request, city):\n \"\"\"\n Display a list of applications for this city.\n If 'state' get parameter is passed, filter the list.\n If 'order' get parameter is passed, order the list.\n e.g /applications/?state=accepted&state=rejected\n \"\"\"\n state = request.GET.getlist('state', None)\n rsvp_status = request.GET.getlist('rsvp_status', None)\n page = get_event_page(city, request.user.is_authenticated(), False)\n order = request.GET.get('order', None)\n try:\n applications = get_applications_for_page(page, state, rsvp_status, order)\n except:\n return redirect('core:event', city=city)\n\n return render(request, 'applications.html', {\n 'page': page,\n 'applications': applications,\n 'all_applications_count': Application.objects.filter(form__page=page).count(),\n 'order': order,\n 'menu': get_organiser_menu(city),\n })\n\n\n@organiser_only\ndef applications_csv(request, city):\n \"\"\"\n Download a csv of applications for this city.\n \"\"\"\n page = get_event_page(city, request.user.is_authenticated(), False)\n try:\n applications = get_applications_for_page(page, None, None, None)\n except:\n return redirect('core:event', city=city)\n\n response = HttpResponse(content_type='text/csv')\n response['Content-Disposition'] = u'attachment; filename=\"{}.csv\"'.format(city)\n writer = csv.writer(response)\n csv_header = [\"Application Number\", \"Application State\", \"RSVP Status\", \"Average Score\"]\n questions = page.form_set.first().question_set.values_list('title', flat=True)\n csv_header.extend(map(striptags, questions))\n writer.writerow(csv_header)\n for app in applications:\n score = app.average_score if app.is_scored_by_user(request.user) else '(hidden)'\n app_info = [app.number, app.state, app.rsvp_status, score]\n app_info.extend(app.answer_set.values_list('answer', flat=True))\n writer.writerow(app_info)\n return response\n\n\n@organiser_only\ndef application_detail(request, city, app_id):\n \"\"\"\n Display the details of a single application.\n \"\"\"\n application = Application.objects.get(pk=app_id)\n try:\n score = Score.objects.get(\n user=request.user, application=application)\n except Score.DoesNotExist:\n score = None\n score_form = ScoreForm(instance=score)\n page = get_event_page(city, request.user.is_authenticated(), False)\n all_scores = Score.objects.filter(application=application)\n\n if request.POST:\n # Handle score submission.\n score_form = ScoreForm(request.POST, instance=score)\n if score_form.is_valid():\n score = score_form.save(commit=False)\n score.user = request.user\n score.application = application\n score.save()\n\n if request.POST.get('random'):\n # Go to a new random application.\n new_app = random_application(request, page, application)\n if new_app:\n return redirect(\n 'applications:application_detail', city, new_app.id)\n return redirect('applications:applications', city)\n\n return render(request, 'application_detail.html', {\n 'page': page,\n 'application': application,\n 'form': application.form,\n 'scores': all_scores,\n 'user_score': score,\n 'score_form': score_form,\n 'menu': get_organiser_menu(city),\n })\n\n\n@organiser_only\ndef communication(request, city):\n \"\"\"\n Send emails to applicants and attendees\n \"\"\"\n page = get_event_page(city, request.user.is_authenticated(), False)\n\n emails = Email.objects.filter(form__page=page).order_by('-created')\n\n return render(request, 'communication.html', {\n 'page': page,\n 'menu': get_organiser_menu(city),\n 'emails': emails,\n })\n\n\n@organiser_only\ndef compose_email(request, city, email_id=None):\n \"\"\"\n Create new email or update email to applicants and attendees\n \"\"\"\n page = get_event_page(city, request.user.is_authenticated(), False)\n form_obj = get_object_or_404(Form, page=page)\n emailmsg = None if not email_id else get_object_or_404(Email, form__page=page, id=email_id)\n\n form = EmailForm(request.POST or None, instance=emailmsg, initial={\n 'author': request.user, 'form': form_obj\n })\n if form.is_valid() and request.method == 'POST':\n obj = form.save(commit=False)\n obj.author = request.user\n obj.form = form_obj\n obj.save()\n if request.POST.get('send'):\n obj.send()\n return redirect('applications:communication', city)\n\n return render(request, 'compose_email.html', {\n 'page': page,\n 'menu': get_organiser_menu(city),\n 'form': form,\n 'email': emailmsg,\n })\n\n\n@organiser_only\n@csrf_exempt\ndef change_state(request, city):\n \"\"\"\n Change the state of Applicaction(s). Use it like this:\n e.g /applications/?state=accepted&application=1&application=2&application=3\n \"\"\"\n state = request.POST.get('state', None)\n applications = request.POST.getlist('application', None)\n page = get_event_page(city, request.user.is_authenticated(), False)\n\n if not state or not applications:\n return JsonResponse({'error': 'Missing parameters'})\n\n applications = Application.objects.filter(id__in=applications, form__page=page)\n applications.update(state=state)\n\n ids = applications.values_list('id', flat=True)\n ids = [str(id) for id in ids]\n\n return JsonResponse({'message': 'Applications have been updated', 'updated': ids})\n\n\n@organiser_only\n@csrf_exempt\ndef change_rsvp(request, city):\n \"\"\"\n Change the rsvp_status of Applicaction(s). Use it like this:\n e.g /applications/?rsvp=yes&application=1&application=2&application=3\n \"\"\"\n rsvp_status = request.POST.get('rsvp_status', None)\n applications = request.POST.getlist('application', None)\n page = get_event_page(city, request.user.is_authenticated(), False)\n\n if not rsvp_status or not applications:\n return JsonResponse({'error': 'Missing parameters'})\n\n applications = Application.objects.filter(id__in=applications, form__page=page)\n applications.update(rsvp_status=rsvp_status)\n\n ids = applications.values_list('id', flat=True)\n ids = [str(id) for id in ids]\n\n return JsonResponse({'message': 'Applications have been updated', 'updated': ids})\n\n\ndef rsvp(request, city, code):\n page = get_event_page(city, request.user.is_authenticated(), False)\n if not page:\n raise Http404\n elif type(page) == tuple:\n return render(\n request, \"event_not_live.html\",\n {'city': page[0], 'past': page[1]}\n )\n\n application, rsvp = Application.get_by_rsvp_code(code, page)\n if not application:\n return redirect('/{}/'.format(page.url))\n\n application.rsvp_status = rsvp\n application.save()\n\n if rsvp == 'yes':\n message = \"Your answer has been saved, your participation in the workshop has been confirmed! We can't wait to meet you. We will be in touch with details soon.\"\n else:\n message = \"Your answer has been saved, thanks for letting us know. Your spot will be assigned to another person on the waiting list.\"\n messages.success(request, message)\n\n menu = EventPageMenu.objects.filter(page=page)\n\n return render(request, 'apply.html', {\n 'page': page,\n 'menu': menu,\n })\n", "path": "applications/views.py" } ]
[ { "content": "import csv\nfrom django.shortcuts import render, redirect, get_object_or_404\nfrom django.http import Http404, JsonResponse, HttpResponse\nfrom django.views.decorators.csrf import csrf_exempt\nfrom django.contrib import messages\nfrom django.template.defaultfilters import striptags\n\nfrom core.utils import get_event_page\nfrom core.models import EventPageMenu\nfrom .decorators import organiser_only\nfrom .models import Application, Form, Score, Question, Email\nfrom .forms import ApplicationForm, ScoreForm, EmailForm\nfrom .utils import get_applications_for_page, get_organiser_menu, random_application\n\n\ndef apply(request, city):\n page = get_event_page(city, request.user.is_authenticated(), False)\n if not page:\n raise Http404\n elif type(page) == tuple:\n return render(\n request, \"event_not_live.html\",\n {'city': page[0], 'past': page[1]}\n )\n\n try:\n form_obj = Form.objects.filter(page=page).first()\n except Form.DoesNotExist:\n return redirect('core:event', city)\n\n organiser = request.user in page.event.team.all() or request.user.is_superuser\n\n if not organiser and not form_obj.application_open:\n return redirect('core:event', city)\n\n menu = EventPageMenu.objects.filter(page=page)\n\n form = ApplicationForm(\n request.POST or None, questions=form_obj.question_set.all()\n )\n\n if form.is_valid():\n form.save(form=form_obj)\n messages.success(request, \"Yay! Your application has been saved. You'll hear from us soon!\")\n\n return render(request, 'apply.html', {\n 'page': page,\n 'menu': menu,\n 'form_obj': form_obj,\n })\n\n number_of_email_questions = Question.objects.filter(question_type='email', form=form_obj).count()\n\n return render(request, 'apply.html', {\n 'page': page,\n 'menu': menu,\n 'form_obj': form_obj,\n 'form': form,\n 'number_of_email_questions': number_of_email_questions,\n })\n\n\n@organiser_only\ndef applications(request, city):\n \"\"\"\n Display a list of applications for this city.\n If 'state' get parameter is passed, filter the list.\n If 'order' get parameter is passed, order the list.\n e.g /applications/?state=accepted&state=rejected\n \"\"\"\n state = request.GET.getlist('state', None)\n rsvp_status = request.GET.getlist('rsvp_status', None)\n page = get_event_page(city, request.user.is_authenticated(), False)\n order = request.GET.get('order', None)\n try:\n applications = get_applications_for_page(page, state, rsvp_status, order)\n except:\n return redirect('core:event', city=city)\n\n return render(request, 'applications.html', {\n 'page': page,\n 'applications': applications,\n 'all_applications_count': Application.objects.filter(form__page=page).count(),\n 'order': order,\n 'menu': get_organiser_menu(city),\n })\n\n\n@organiser_only\ndef applications_csv(request, city):\n \"\"\"\n Download a csv of applications for this city.\n \"\"\"\n page = get_event_page(city, request.user.is_authenticated(), False)\n try:\n applications = get_applications_for_page(page, None, None, None)\n except:\n return redirect('core:event', city=city)\n\n response = HttpResponse(content_type='text/csv')\n response['Content-Disposition'] = u'attachment; filename=\"{}.csv\"'.format(city)\n writer = csv.writer(response)\n csv_header = [\"Application Number\", \"Application State\", \"RSVP Status\", \"Average Score\"]\n questions = page.form_set.first().question_set.values_list('title', flat=True)\n csv_header.extend(map(striptags, questions))\n writer.writerow(csv_header)\n for app in applications:\n score = app.average_score if app.is_scored_by_user(request.user) else '(hidden)'\n app_info = [app.number, app.state, app.rsvp_status, score]\n app_info.extend(app.answer_set.values_list('answer', flat=True))\n writer.writerow(app_info)\n return response\n\n\n@organiser_only\ndef application_detail(request, city, app_id):\n \"\"\"\n Display the details of a single application.\n \"\"\"\n application = Application.objects.get(pk=app_id)\n try:\n score = Score.objects.get(\n user=request.user, application=application)\n except Score.DoesNotExist:\n score = None\n score_form = ScoreForm(instance=score)\n page = get_event_page(city, request.user.is_authenticated(), False)\n all_scores = Score.objects.filter(application=application)\n\n if request.POST:\n # Handle score submission.\n score_form = ScoreForm(request.POST, instance=score)\n if score_form.is_valid():\n score = score_form.save(commit=False)\n score.user = request.user\n score.application = application\n score.save()\n\n if request.POST.get('random'):\n # Go to a new random application.\n new_app = random_application(request, page, application)\n if new_app:\n return redirect(\n 'applications:application_detail', city, new_app.id)\n return redirect('applications:applications', city)\n\n return render(request, 'application_detail.html', {\n 'page': page,\n 'application': application,\n 'form': application.form,\n 'scores': all_scores,\n 'user_score': score,\n 'score_form': score_form,\n 'menu': get_organiser_menu(city),\n })\n\n\n@organiser_only\ndef communication(request, city):\n \"\"\"\n Send emails to applicants and attendees\n \"\"\"\n page = get_event_page(city, request.user.is_authenticated(), False)\n\n emails = Email.objects.filter(form__page=page).order_by('-created')\n\n return render(request, 'communication.html', {\n 'page': page,\n 'menu': get_organiser_menu(city),\n 'emails': emails,\n })\n\n\n@organiser_only\ndef compose_email(request, city, email_id=None):\n \"\"\"\n Create new email or update email to applicants and attendees\n \"\"\"\n page = get_event_page(city, request.user.is_authenticated(), False)\n form_obj = get_object_or_404(Form, page=page)\n emailmsg = None if not email_id else get_object_or_404(Email, form__page=page, id=email_id)\n\n form = EmailForm(request.POST or None, instance=emailmsg, initial={\n 'author': request.user, 'form': form_obj\n })\n if form.is_valid() and request.method == 'POST':\n obj = form.save(commit=False)\n obj.author = request.user\n obj.form = form_obj\n obj.save()\n if request.POST.get('send'):\n obj.send()\n return redirect('applications:communication', city)\n\n return render(request, 'compose_email.html', {\n 'page': page,\n 'menu': get_organiser_menu(city),\n 'form': form,\n 'email': emailmsg,\n })\n\n\n@organiser_only\n@csrf_exempt\ndef change_state(request, city):\n \"\"\"\n Change the state of Applicaction(s). Use it like this:\n e.g /applications/?state=accepted&application=1&application=2&application=3\n \"\"\"\n state = request.POST.get('state', None)\n applications = request.POST.getlist('application', None)\n page = get_event_page(city, request.user.is_authenticated(), False)\n\n if not state or not applications:\n return JsonResponse({'error': 'Missing parameters'})\n\n applications = Application.objects.filter(id__in=applications, form__page=page)\n applications.update(state=state)\n\n ids = applications.values_list('id', flat=True)\n ids = [str(id) for id in ids]\n\n return JsonResponse({'message': 'Applications have been updated', 'updated': ids})\n\n\n@organiser_only\n@csrf_exempt\ndef change_rsvp(request, city):\n \"\"\"\n Change the rsvp_status of Applicaction(s). Use it like this:\n e.g /applications/?rsvp=yes&application=1&application=2&application=3\n \"\"\"\n rsvp_status = request.POST.get('rsvp_status', None)\n applications = request.POST.getlist('application', None)\n page = get_event_page(city, request.user.is_authenticated(), False)\n\n if not rsvp_status or not applications:\n return JsonResponse({'error': 'Missing parameters'})\n\n applications = Application.objects.filter(id__in=applications, form__page=page)\n applications.update(rsvp_status=rsvp_status)\n\n ids = applications.values_list('id', flat=True)\n ids = [str(id) for id in ids]\n\n return JsonResponse({'message': 'Applications have been updated', 'updated': ids})\n\n\ndef rsvp(request, city, code):\n page = get_event_page(city, request.user.is_authenticated(), False)\n if not page:\n raise Http404\n elif type(page) == tuple:\n return render(\n request, \"event_not_live.html\",\n {'city': page[0], 'past': page[1]}\n )\n\n application, rsvp = Application.get_by_rsvp_code(code, page)\n if not application:\n return redirect('/{}/'.format(page.url))\n\n application.rsvp_status = rsvp\n application.save()\n\n if rsvp == 'yes':\n message = \"Your answer has been saved, your participation in the workshop has been confirmed! We can't wait to meet you. We will be in touch with details soon.\"\n else:\n message = \"Your answer has been saved, thanks for letting us know. Your spot will be assigned to another person on the waiting list.\"\n messages.success(request, message)\n\n menu = EventPageMenu.objects.filter(page=page)\n\n return render(request, 'apply.html', {\n 'page': page,\n 'menu': menu,\n })\n", "path": "applications/views.py" } ]
diff --git a/applications/views.py b/applications/views.py index 7b7e4348e..9244cd3cf 100644 --- a/applications/views.py +++ b/applications/views.py @@ -24,7 +24,7 @@ def apply(request, city): ) try: - form_obj = Form.objects.get(page=page) + form_obj = Form.objects.filter(page=page).first() except Form.DoesNotExist: return redirect('core:event', city)
django-json-api__django-rest-framework-json-api-937
[ { "content": "# -*- coding: utf-8 -*-\n\n__title__ = \"djangorestframework-jsonapi\"\n__version__ = \"4.1.0\"\n__author__ = \"\"\n__license__ = \"BSD\"\n__copyright__ = \"\"\n\n# Version synonym\nVERSION = __version__\n", "path": "rest_framework_json_api/__init__.py" } ]
[ { "content": "# -*- coding: utf-8 -*-\n\n__title__ = \"djangorestframework-jsonapi\"\n__version__ = \"4.2.0\"\n__author__ = \"\"\n__license__ = \"BSD\"\n__copyright__ = \"\"\n\n# Version synonym\nVERSION = __version__\n", "path": "rest_framework_json_api/__init__.py" } ]
diff --git a/CHANGELOG.md b/CHANGELOG.md index c62b5383..e7f43647 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 Note that in line with [Django REST Framework policy](http://www.django-rest-framework.org/topics/release-notes/), any parts of the framework not mentioned in the documentation should generally be considered private API, and may be subject to change. -## [Unreleased] +## [4.2.0] - 2021-05-03 ### Added @@ -26,16 +26,13 @@ any parts of the framework not mentioned in the documentation should generally b name='order-related'), ``` * Ensure default `included_resources` are considered when calculating prefetches. - +* Avoided error when using `include` query parameter on related urls (a regression since 4.1.0) ### Deprecated * Deprecated default `format_type` argument of `rest_framework_json_api.utils.format_value`. Use `rest_framework_json_api.utils.format_field_name` or specify specifc `format_type` instead. -* Deprecated `format_type` argument of `rest_framework_json_api.utils.format_link_segment`. Use `format_value` instead. +* Deprecated `format_type` argument of `rest_framework_json_api.utils.format_link_segment`. Use `rest_framework_json_api.utils.format_value` instead. -### Fixed - -* Avoided error when using `include` query parameter on related urls (a regression since 4.1.0) ## [4.1.0] - 2021-03-08 diff --git a/rest_framework_json_api/__init__.py b/rest_framework_json_api/__init__.py index 3ce910ef..d166001f 100644 --- a/rest_framework_json_api/__init__.py +++ b/rest_framework_json_api/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- __title__ = "djangorestframework-jsonapi" -__version__ = "4.1.0" +__version__ = "4.2.0" __author__ = "" __license__ = "BSD" __copyright__ = ""
django-json-api__django-rest-framework-json-api-383
[ { "content": "# -*- coding: utf-8 -*-\n\n__title__ = 'djangorestframework-jsonapi'\n__version__ = '2.2.0'\n__author__ = ''\n__license__ = 'MIT'\n__copyright__ = ''\n\n# Version synonym\nVERSION = __version__\n", "path": "rest_framework_json_api/__init__.py" } ]
[ { "content": "# -*- coding: utf-8 -*-\n\n__title__ = 'djangorestframework-jsonapi'\n__version__ = '2.3.0'\n__author__ = ''\n__license__ = 'MIT'\n__copyright__ = ''\n\n# Version synonym\nVERSION = __version__\n", "path": "rest_framework_json_api/__init__.py" } ]
diff --git a/CHANGELOG.md b/CHANGELOG.md index b1dc4c5e..618ad51f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -v2.3.0 +v2.3.0 - Released November 28, 2017 * Added support for polymorphic models * When `JSON_API_FORMAT_KEYS` is False (the default) do not translate request diff --git a/rest_framework_json_api/__init__.py b/rest_framework_json_api/__init__.py index a3d9c816..27b12fcc 100644 --- a/rest_framework_json_api/__init__.py +++ b/rest_framework_json_api/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- __title__ = 'djangorestframework-jsonapi' -__version__ = '2.2.0' +__version__ = '2.3.0' __author__ = '' __license__ = 'MIT' __copyright__ = ''
netket__netket-817
[ { "content": "# Copyright 2021 The NetKet Authors - All rights reserved.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nimport abc\nimport numbers\nfrom functools import partial\n\nfrom tqdm import tqdm\n\nimport jax\nfrom jax.tree_util import tree_map\n\nfrom netket.logging import JsonLog\nfrom netket.utils import mpi\n\n\ndef _to_iterable(maybe_iterable):\n \"\"\"\n _to_iterable(maybe_iterable)\n\n Ensure the result is iterable. If the input is not iterable, it is wrapped into a tuple.\n \"\"\"\n if hasattr(maybe_iterable, \"__iter__\"):\n surely_iterable = maybe_iterable\n else:\n surely_iterable = (maybe_iterable,)\n\n return surely_iterable\n\n\n# Note: to implement a new Driver (see also _vmc.py for an example)\n# If you want to inherit the nice interface of AbstractMCDriver, you should\n# subclass it, defining the following methods:\n# - Either _forward_and_backward or individually _forward, _backward, that should\n# compute the loss function and the gradient. If the driver is minimizing or\n# maximising some loss function, this quantity should be assigned to self._stats\n# in order to monitor it.\n# - _estimate_stats should return the MC estimate of a single operator\n# - reset should reset the driver (usually the sampler).\n# - info should return a string with an overview of the driver.\n# - The __init__ method shouldbe called with the machine and the optimizer. If this\n# driver is minimising a loss function and you want it's name to show up automatically\n# in the progress bar/ouput files you should pass the optional keyword argument\n# minimized_quantity_name.\nclass AbstractVariationalDriver(abc.ABC):\n \"\"\"Abstract base class for NetKet Variational Monte Carlo drivers\"\"\"\n\n def __init__(self, variational_state, optimizer, minimized_quantity_name=\"\"):\n self._mynode = mpi.node_number\n self._mpi_nodes = mpi.n_nodes\n self._loss_stats = None\n self._loss_name = minimized_quantity_name\n self._step_count = 0\n\n self._variational_state = variational_state\n self.optimizer = optimizer\n\n def _forward_and_backward(self):\n \"\"\"\n Performs the forward and backward pass at the same time.\n Concrete drivers should either override this method, or override individually\n _forward and _backward.\n\n Returns:\n the update for the weights.\n \"\"\"\n self._forward()\n dp = self._backward()\n return dp\n\n def _forward(self):\n \"\"\"\n Performs the forward pass, computing the loss function.\n Concrete should either implement _forward and _backward or the joint method\n _forward_and_backward.\n \"\"\"\n raise NotImplementedError()\n\n def _backward(self):\n \"\"\"\n Performs the backward pass, computing the update for the parameters.\n Concrete should either implement _forward and _backward or the joint method\n _forward_and_backward.\n \"\"\"\n raise NotImplementedError()\n\n def _estimate_stats(self, observable):\n \"\"\"\n Returns the MCMC statistics for the expectation value of an observable.\n Must be implemented by super-classes of AbstractVMC.\n\n :param observable: A quantum operator (netket observable)\n :return:\n \"\"\"\n return self.state.expect(observable)\n\n def reset(self):\n \"\"\"\n Resets the driver.\n Concrete drivers should also call super().reset() to ensure that the step\n count is set to 0.\n \"\"\"\n self.state.reset()\n self.step_count = 0\n pass\n\n @abc.abstractmethod\n def info(self, depth=0):\n \"\"\"\n Returns an info string used to print information to screen about this driver.\n \"\"\"\n pass\n\n @property\n def state(self):\n \"\"\"\n Returns the machine that is optimized by this driver.\n \"\"\"\n return self._variational_state\n\n @property\n def optimizer(self):\n \"\"\"\n The optimizer used to update the parameters at every iteration.\n \"\"\"\n return self._optimizer\n\n @optimizer.setter\n def optimizer(self, optimizer):\n self._optimizer = optimizer\n self._optimizer_state = optimizer.init(self.state.parameters)\n\n @property\n def step_count(self):\n \"\"\"\n Returns a monotonic integer labelling all the steps performed by this driver.\n This can be used, for example, to identify the line in a log file.\n \"\"\"\n return self._step_count\n\n def iter(self, n_steps: int, step: int = 1):\n \"\"\"\n Returns a generator which advances the VMC optimization, yielding\n after every `step_size` steps.\n\n Args:\n n_iter: The total number of steps to perform.\n step_size: The number of internal steps the simulation\n is advanced every turn.\n\n Yields:\n int: The current step.\n \"\"\"\n for _ in range(0, n_steps, step):\n for i in range(0, step):\n dp = self._forward_and_backward()\n if i == 0:\n yield self.step_count\n\n self._step_count += 1\n self.update_parameters(dp)\n\n def advance(self, steps: int = 1):\n \"\"\"\n Performs `steps` optimization steps.\n\n steps: (Default=1) number of steps\n \"\"\"\n for _ in self.iter(steps):\n pass\n\n def run(\n self,\n n_iter,\n out=None,\n obs=None,\n show_progress=True,\n save_params_every=50, # for default logger\n write_every=50, # for default logger\n step_size=1, # for default logger\n callback=lambda *x: True,\n ):\n \"\"\"\n Executes the Monte Carlo Variational optimization, updating the weights of the network\n stored in this driver for `n_iter` steps and dumping values of the observables `obs`\n in the output `logger`. If no logger is specified, creates a json file at `out`,\n overwriting files with the same prefix.\n\n By default uses :ref:`netket.logging.JsonLog`. To know about the output format\n check it's documentation. The logger object is also returned at the end of this function\n so that you can inspect the results without reading the json output.\n\n Args:\n n_iter: the total number of iterations\n out: A logger object, or an iterable of loggers, to be used to store simulation log and data.\n If this argument is a string, it will be used as output prefix for the standard JSON logger.\n obs: An iterable containing all observables that should be computed\n save_params_every: Every how many steps the parameters of the network should be\n serialized to disk (ignored if logger is provided)\n write_every: Every how many steps the json data should be flushed to disk (ignored if\n logger is provided)\n step_size: Every how many steps should observables be logged to disk (default=1)\n show_progress: If true displays a progress bar (default=True)\n callback: Callable or list of callable callback functions to stop training given a condition\n \"\"\"\n\n if not isinstance(n_iter, numbers.Number):\n raise ValueError(\n \"n_iter, the first positional argument to `run`, must be a number!\"\n )\n\n if obs is None:\n obs = {}\n\n if out is None:\n out = tuple()\n print(\n \"No output specified (out=[apath|nk.logging.JsonLogger(...)]).\"\n \"Running the optimization but not saving the output.\"\n )\n\n # Log only non-root nodes\n if self._mynode == 0:\n # if out is a path, create an overwriting Json Log for output\n if isinstance(out, str):\n loggers = (JsonLog(out, \"w\", save_params_every, write_every),)\n else:\n loggers = _to_iterable(out)\n else:\n loggers = tuple()\n show_progress = False\n\n callbacks = _to_iterable(callback)\n callback_stop = False\n\n with tqdm(total=n_iter, disable=not show_progress) as pbar:\n old_step = self.step_count\n first_step = True\n\n for step in self.iter(n_iter, step_size):\n\n log_data = self.estimate(obs)\n\n # if the cost-function is defined then report it in the progress bar\n if self._loss_stats is not None:\n pbar.set_postfix_str(self._loss_name + \"=\" + str(self._loss_stats))\n log_data[self._loss_name] = self._loss_stats\n\n # Execute callbacks before loggers because they can append to log_data\n for callback in callbacks:\n if not callback(step, log_data, self):\n callback_stop = True\n\n for logger in loggers:\n logger(self.step_count, log_data, self.state)\n\n if len(callbacks) > 0:\n if mpi.mpi_any(callback_stop):\n break\n\n # Reset the timing of tqdm after the first step, to ignore compilation time\n if first_step:\n first_step = False\n pbar.unpause()\n\n # Update the progress bar\n pbar.update(self.step_count - old_step)\n old_step = self.step_count\n\n # Final update so that it shows up filled.\n pbar.update(self.step_count - old_step)\n\n # flush at the end of the evolution so that final values are saved to\n # file\n for logger in loggers:\n logger.flush(self.state)\n\n return loggers\n\n def estimate(self, observables):\n \"\"\"\n Return MCMC statistics for the expectation value of observables in the\n current state of the driver.\n\n Args:\n observables: A pytree of operators for which statistics should be computed.\n\n Returns:\n A pytree of the same structure as the input, containing MCMC statistics\n for the corresponding operators as leaves.\n \"\"\"\n return tree_map(self._estimate_stats, observables)\n\n def update_parameters(self, dp):\n \"\"\"\n Updates the parameters of the machine using the optimizer in this driver\n\n Args:\n dp: the pytree containing the updates to the parameters\n \"\"\"\n self._optimizer_state, self.state.parameters = apply_gradient(\n self._optimizer.update, self._optimizer_state, dp, self.state.parameters\n )\n\n\n@partial(jax.jit, static_argnums=0)\ndef apply_gradient(optimizer_fun, optimizer_state, dp, params):\n import optax\n\n updates, new_optimizer_state = optimizer_fun(dp, optimizer_state, params)\n\n new_params = optax.apply_updates(params, updates)\n return new_optimizer_state, new_params\n", "path": "netket/driver/abstract_variational_driver.py" } ]
[ { "content": "# Copyright 2021 The NetKet Authors - All rights reserved.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nimport abc\nimport numbers\nfrom functools import partial\n\nfrom tqdm import tqdm\n\nimport jax\nfrom jax.tree_util import tree_map\n\nfrom netket.logging import JsonLog\nfrom netket.utils import mpi\n\n\ndef _to_iterable(maybe_iterable):\n \"\"\"\n _to_iterable(maybe_iterable)\n\n Ensure the result is iterable. If the input is not iterable, it is wrapped into a tuple.\n \"\"\"\n if hasattr(maybe_iterable, \"__iter__\"):\n surely_iterable = maybe_iterable\n else:\n surely_iterable = (maybe_iterable,)\n\n return surely_iterable\n\n\n# Note: to implement a new Driver (see also _vmc.py for an example)\n# If you want to inherit the nice interface of AbstractMCDriver, you should\n# subclass it, defining the following methods:\n# - Either _forward_and_backward or individually _forward, _backward, that should\n# compute the loss function and the gradient. If the driver is minimizing or\n# maximising some loss function, this quantity should be assigned to self._stats\n# in order to monitor it.\n# - _estimate_stats should return the MC estimate of a single operator\n# - reset should reset the driver (usually the sampler).\n# - info should return a string with an overview of the driver.\n# - The __init__ method shouldbe called with the machine and the optimizer. If this\n# driver is minimising a loss function and you want it's name to show up automatically\n# in the progress bar/ouput files you should pass the optional keyword argument\n# minimized_quantity_name.\nclass AbstractVariationalDriver(abc.ABC):\n \"\"\"Abstract base class for NetKet Variational Monte Carlo drivers\"\"\"\n\n def __init__(self, variational_state, optimizer, minimized_quantity_name=\"\"):\n self._mynode = mpi.node_number\n self._mpi_nodes = mpi.n_nodes\n self._loss_stats = None\n self._loss_name = minimized_quantity_name\n self._step_count = 0\n\n self._variational_state = variational_state\n self.optimizer = optimizer\n\n def _forward_and_backward(self):\n \"\"\"\n Performs the forward and backward pass at the same time.\n Concrete drivers should either override this method, or override individually\n _forward and _backward.\n\n Returns:\n the update for the weights.\n \"\"\"\n self._forward()\n dp = self._backward()\n return dp\n\n def _forward(self):\n \"\"\"\n Performs the forward pass, computing the loss function.\n Concrete should either implement _forward and _backward or the joint method\n _forward_and_backward.\n \"\"\"\n raise NotImplementedError()\n\n def _backward(self):\n \"\"\"\n Performs the backward pass, computing the update for the parameters.\n Concrete should either implement _forward and _backward or the joint method\n _forward_and_backward.\n \"\"\"\n raise NotImplementedError()\n\n def _estimate_stats(self, observable):\n \"\"\"\n Returns the MCMC statistics for the expectation value of an observable.\n Must be implemented by super-classes of AbstractVMC.\n\n :param observable: A quantum operator (netket observable)\n :return:\n \"\"\"\n return self.state.expect(observable)\n\n def reset(self):\n \"\"\"\n Resets the driver.\n Concrete drivers should also call super().reset() to ensure that the step\n count is set to 0.\n \"\"\"\n self.state.reset()\n self._step_count = 0\n pass\n\n @abc.abstractmethod\n def info(self, depth=0):\n \"\"\"\n Returns an info string used to print information to screen about this driver.\n \"\"\"\n pass\n\n @property\n def state(self):\n \"\"\"\n Returns the machine that is optimized by this driver.\n \"\"\"\n return self._variational_state\n\n @property\n def optimizer(self):\n \"\"\"\n The optimizer used to update the parameters at every iteration.\n \"\"\"\n return self._optimizer\n\n @optimizer.setter\n def optimizer(self, optimizer):\n self._optimizer = optimizer\n self._optimizer_state = optimizer.init(self.state.parameters)\n\n @property\n def step_count(self):\n \"\"\"\n Returns a monotonic integer labelling all the steps performed by this driver.\n This can be used, for example, to identify the line in a log file.\n \"\"\"\n return self._step_count\n\n def iter(self, n_steps: int, step: int = 1):\n \"\"\"\n Returns a generator which advances the VMC optimization, yielding\n after every `step_size` steps.\n\n Args:\n n_iter: The total number of steps to perform.\n step_size: The number of internal steps the simulation\n is advanced every turn.\n\n Yields:\n int: The current step.\n \"\"\"\n for _ in range(0, n_steps, step):\n for i in range(0, step):\n dp = self._forward_and_backward()\n if i == 0:\n yield self.step_count\n\n self._step_count += 1\n self.update_parameters(dp)\n\n def advance(self, steps: int = 1):\n \"\"\"\n Performs `steps` optimization steps.\n\n steps: (Default=1) number of steps\n \"\"\"\n for _ in self.iter(steps):\n pass\n\n def run(\n self,\n n_iter,\n out=None,\n obs=None,\n show_progress=True,\n save_params_every=50, # for default logger\n write_every=50, # for default logger\n step_size=1, # for default logger\n callback=lambda *x: True,\n ):\n \"\"\"\n Executes the Monte Carlo Variational optimization, updating the weights of the network\n stored in this driver for `n_iter` steps and dumping values of the observables `obs`\n in the output `logger`. If no logger is specified, creates a json file at `out`,\n overwriting files with the same prefix.\n\n By default uses :ref:`netket.logging.JsonLog`. To know about the output format\n check it's documentation. The logger object is also returned at the end of this function\n so that you can inspect the results without reading the json output.\n\n Args:\n n_iter: the total number of iterations\n out: A logger object, or an iterable of loggers, to be used to store simulation log and data.\n If this argument is a string, it will be used as output prefix for the standard JSON logger.\n obs: An iterable containing all observables that should be computed\n save_params_every: Every how many steps the parameters of the network should be\n serialized to disk (ignored if logger is provided)\n write_every: Every how many steps the json data should be flushed to disk (ignored if\n logger is provided)\n step_size: Every how many steps should observables be logged to disk (default=1)\n show_progress: If true displays a progress bar (default=True)\n callback: Callable or list of callable callback functions to stop training given a condition\n \"\"\"\n\n if not isinstance(n_iter, numbers.Number):\n raise ValueError(\n \"n_iter, the first positional argument to `run`, must be a number!\"\n )\n\n if obs is None:\n obs = {}\n\n if out is None:\n out = tuple()\n print(\n \"No output specified (out=[apath|nk.logging.JsonLogger(...)]).\"\n \"Running the optimization but not saving the output.\"\n )\n\n # Log only non-root nodes\n if self._mynode == 0:\n # if out is a path, create an overwriting Json Log for output\n if isinstance(out, str):\n loggers = (JsonLog(out, \"w\", save_params_every, write_every),)\n else:\n loggers = _to_iterable(out)\n else:\n loggers = tuple()\n show_progress = False\n\n callbacks = _to_iterable(callback)\n callback_stop = False\n\n with tqdm(total=n_iter, disable=not show_progress) as pbar:\n old_step = self.step_count\n first_step = True\n\n for step in self.iter(n_iter, step_size):\n\n log_data = self.estimate(obs)\n\n # if the cost-function is defined then report it in the progress bar\n if self._loss_stats is not None:\n pbar.set_postfix_str(self._loss_name + \"=\" + str(self._loss_stats))\n log_data[self._loss_name] = self._loss_stats\n\n # Execute callbacks before loggers because they can append to log_data\n for callback in callbacks:\n if not callback(step, log_data, self):\n callback_stop = True\n\n for logger in loggers:\n logger(self.step_count, log_data, self.state)\n\n if len(callbacks) > 0:\n if mpi.mpi_any(callback_stop):\n break\n\n # Reset the timing of tqdm after the first step, to ignore compilation time\n if first_step:\n first_step = False\n pbar.unpause()\n\n # Update the progress bar\n pbar.update(self.step_count - old_step)\n old_step = self.step_count\n\n # Final update so that it shows up filled.\n pbar.update(self.step_count - old_step)\n\n # flush at the end of the evolution so that final values are saved to\n # file\n for logger in loggers:\n logger.flush(self.state)\n\n return loggers\n\n def estimate(self, observables):\n \"\"\"\n Return MCMC statistics for the expectation value of observables in the\n current state of the driver.\n\n Args:\n observables: A pytree of operators for which statistics should be computed.\n\n Returns:\n A pytree of the same structure as the input, containing MCMC statistics\n for the corresponding operators as leaves.\n \"\"\"\n return tree_map(self._estimate_stats, observables)\n\n def update_parameters(self, dp):\n \"\"\"\n Updates the parameters of the machine using the optimizer in this driver\n\n Args:\n dp: the pytree containing the updates to the parameters\n \"\"\"\n self._optimizer_state, self.state.parameters = apply_gradient(\n self._optimizer.update, self._optimizer_state, dp, self.state.parameters\n )\n\n\n@partial(jax.jit, static_argnums=0)\ndef apply_gradient(optimizer_fun, optimizer_state, dp, params):\n import optax\n\n updates, new_optimizer_state = optimizer_fun(dp, optimizer_state, params)\n\n new_params = optax.apply_updates(params, updates)\n return new_optimizer_state, new_params\n", "path": "netket/driver/abstract_variational_driver.py" } ]
diff --git a/netket/driver/abstract_variational_driver.py b/netket/driver/abstract_variational_driver.py index d9b5b2fbc8..9b4b2d0b03 100644 --- a/netket/driver/abstract_variational_driver.py +++ b/netket/driver/abstract_variational_driver.py @@ -112,7 +112,7 @@ def reset(self): count is set to 0. """ self.state.reset() - self.step_count = 0 + self._step_count = 0 pass @abc.abstractmethod
spotify__luigi-1372
[ { "content": "# -*- coding: utf-8 -*-\n#\n# Copyright 2012-2015 Spotify AB\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n#\n\"\"\"\nImplementation of Simple Storage Service support.\n:py:class:`S3Target` is a subclass of the Target class to support S3 file system operations\n\"\"\"\n\nfrom __future__ import division\n\nimport itertools\nimport logging\nimport os\nimport os.path\ntry:\n from urlparse import urlsplit\nexcept ImportError:\n from urllib.parse import urlsplit\nimport warnings\ntry:\n from ConfigParser import NoSectionError\nexcept ImportError:\n from configparser import NoSectionError\n\nfrom luigi import six\nfrom luigi.six.moves import range\n\nfrom luigi import configuration\nfrom luigi.format import get_default_format\nfrom luigi.parameter import Parameter\nfrom luigi.target import FileAlreadyExists, FileSystem, FileSystemException, FileSystemTarget, AtomicLocalFile, MissingParentDirectory\nfrom luigi.task import ExternalTask\n\nlogger = logging.getLogger('luigi-interface')\n\ntry:\n import boto\n from boto.s3.key import Key\nexcept ImportError:\n logger.warning(\"Loading s3 module without boto installed. Will crash at \"\n \"runtime if s3 functionality is used.\")\n\n\n# two different ways of marking a directory\n# with a suffix in S3\nS3_DIRECTORY_MARKER_SUFFIX_0 = '_$folder$'\nS3_DIRECTORY_MARKER_SUFFIX_1 = '/'\n\n\nclass InvalidDeleteException(FileSystemException):\n pass\n\n\nclass FileNotFoundException(FileSystemException):\n pass\n\n\nclass S3Client(FileSystem):\n \"\"\"\n boto-powered S3 client.\n \"\"\"\n\n def __init__(self, aws_access_key_id=None, aws_secret_access_key=None,\n **kwargs):\n options = self._get_s3_config()\n options.update(kwargs)\n # Removing key args would break backwards compability\n if not aws_access_key_id:\n aws_access_key_id = options.get('aws_access_key_id')\n if not aws_secret_access_key:\n aws_secret_access_key = options.get('aws_secret_access_key')\n for key in ['aws_access_key_id', 'aws_secret_access_key']:\n if key in options:\n options.pop(key)\n self.s3 = boto.connect_s3(aws_access_key_id,\n aws_secret_access_key,\n **options)\n\n def exists(self, path):\n \"\"\"\n Does provided path exist on S3?\n \"\"\"\n (bucket, key) = self._path_to_bucket_and_key(path)\n\n # grab and validate the bucket\n s3_bucket = self.s3.get_bucket(bucket, validate=True)\n\n # root always exists\n if self._is_root(key):\n return True\n\n # file\n s3_key = s3_bucket.get_key(key)\n if s3_key:\n return True\n\n if self.isdir(path):\n return True\n\n logger.debug('Path %s does not exist', path)\n return False\n\n def remove(self, path, recursive=True):\n \"\"\"\n Remove a file or directory from S3.\n \"\"\"\n if not self.exists(path):\n logger.debug('Could not delete %s; path does not exist', path)\n return False\n\n (bucket, key) = self._path_to_bucket_and_key(path)\n\n # root\n if self._is_root(key):\n raise InvalidDeleteException(\n 'Cannot delete root of bucket at path %s' % path)\n\n # grab and validate the bucket\n s3_bucket = self.s3.get_bucket(bucket, validate=True)\n\n # file\n s3_key = s3_bucket.get_key(key)\n if s3_key:\n s3_bucket.delete_key(s3_key)\n logger.debug('Deleting %s from bucket %s', key, bucket)\n return True\n\n if self.isdir(path) and not recursive:\n raise InvalidDeleteException(\n 'Path %s is a directory. Must use recursive delete' % path)\n\n delete_key_list = [\n k for k in s3_bucket.list(self._add_path_delimiter(key))]\n\n # delete the directory marker file if it exists\n s3_dir_with_suffix_key = s3_bucket.get_key(key + S3_DIRECTORY_MARKER_SUFFIX_0)\n if s3_dir_with_suffix_key:\n delete_key_list.append(s3_dir_with_suffix_key)\n\n if len(delete_key_list) > 0:\n for k in delete_key_list:\n logger.debug('Deleting %s from bucket %s', k, bucket)\n s3_bucket.delete_keys(delete_key_list)\n return True\n\n return False\n\n def get_key(self, path):\n (bucket, key) = self._path_to_bucket_and_key(path)\n\n s3_bucket = self.s3.get_bucket(bucket, validate=True)\n\n return s3_bucket.get_key(key)\n\n def put(self, local_path, destination_s3_path):\n \"\"\"\n Put an object stored locally to an S3 path.\n \"\"\"\n (bucket, key) = self._path_to_bucket_and_key(destination_s3_path)\n\n # grab and validate the bucket\n s3_bucket = self.s3.get_bucket(bucket, validate=True)\n\n # put the file\n s3_key = Key(s3_bucket)\n s3_key.key = key\n s3_key.set_contents_from_filename(local_path)\n\n def put_string(self, content, destination_s3_path):\n \"\"\"\n Put a string to an S3 path.\n \"\"\"\n (bucket, key) = self._path_to_bucket_and_key(destination_s3_path)\n # grab and validate the bucket\n s3_bucket = self.s3.get_bucket(bucket, validate=True)\n\n # put the content\n s3_key = Key(s3_bucket)\n s3_key.key = key\n s3_key.set_contents_from_string(content)\n\n def put_multipart(self, local_path, destination_s3_path, part_size=67108864):\n \"\"\"\n Put an object stored locally to an S3 path\n using S3 multi-part upload (for files > 5GB).\n\n :param local_path: Path to source local file\n :param destination_s3_path: URL for target S3 location\n :param part_size: Part size in bytes. Default: 67108864 (64MB), must be >= 5MB and <= 5 GB.\n \"\"\"\n # calculate number of parts to upload\n # based on the size of the file\n source_size = os.stat(local_path).st_size\n\n if source_size <= part_size:\n # fallback to standard, non-multipart strategy\n return self.put(local_path, destination_s3_path)\n\n (bucket, key) = self._path_to_bucket_and_key(destination_s3_path)\n\n # grab and validate the bucket\n s3_bucket = self.s3.get_bucket(bucket, validate=True)\n\n # calculate the number of parts (int division).\n # use modulo to avoid float precision issues\n # for exactly-sized fits\n num_parts = \\\n (source_size // part_size) \\\n if source_size % part_size == 0 \\\n else (source_size // part_size) + 1\n\n mp = None\n try:\n mp = s3_bucket.initiate_multipart_upload(key)\n\n for i in range(num_parts):\n # upload a part at a time to S3\n offset = part_size * i\n bytes = min(part_size, source_size - offset)\n with open(local_path, 'rb') as fp:\n part_num = i + 1\n logger.info('Uploading part %s/%s to %s', part_num, num_parts, destination_s3_path)\n fp.seek(offset)\n mp.upload_part_from_file(fp, part_num=part_num, size=bytes)\n\n # finish the upload, making the file available in S3\n mp.complete_upload()\n except BaseException:\n if mp:\n logger.info('Canceling multipart s3 upload for %s', destination_s3_path)\n # cancel the upload so we don't get charged for\n # storage consumed by uploaded parts\n mp.cancel_upload()\n raise\n\n def get(self, s3_path, destination_local_path):\n \"\"\"\n Get an object stored in S3 and write it to a local path.\n \"\"\"\n (bucket, key) = self._path_to_bucket_and_key(s3_path)\n\n # grab and validate the bucket\n s3_bucket = self.s3.get_bucket(bucket, validate=True)\n\n # download the file\n s3_key = Key(s3_bucket)\n s3_key.key = key\n s3_key.get_contents_to_filename(destination_local_path)\n\n def get_as_string(self, s3_path):\n \"\"\"\n Get the contents of an object stored in S3 as a string.\n \"\"\"\n (bucket, key) = self._path_to_bucket_and_key(s3_path)\n\n # grab and validate the bucket\n s3_bucket = self.s3.get_bucket(bucket, validate=True)\n\n # get the content\n s3_key = Key(s3_bucket)\n s3_key.key = key\n contents = s3_key.get_contents_as_string()\n\n return contents\n\n def copy(self, source_path, destination_path):\n \"\"\"\n Copy an object from one S3 location to another.\n \"\"\"\n (src_bucket, src_key) = self._path_to_bucket_and_key(source_path)\n (dst_bucket, dst_key) = self._path_to_bucket_and_key(destination_path)\n\n s3_bucket = self.s3.get_bucket(dst_bucket, validate=True)\n\n if self.isdir(source_path):\n src_prefix = self._add_path_delimiter(src_key)\n dst_prefix = self._add_path_delimiter(dst_key)\n for key in self.list(source_path):\n s3_bucket.copy_key(dst_prefix + key,\n src_bucket,\n src_prefix + key)\n else:\n s3_bucket.copy_key(dst_key, src_bucket, src_key)\n\n def rename(self, source_path, destination_path):\n \"\"\"\n Rename/move an object from one S3 location to another.\n \"\"\"\n self.copy(source_path, destination_path)\n self.remove(source_path)\n\n def listdir(self, path):\n \"\"\"\n Get an iterable with S3 folder contents.\n Iterable contains paths relative to queried path.\n \"\"\"\n (bucket, key) = self._path_to_bucket_and_key(path)\n\n # grab and validate the bucket\n s3_bucket = self.s3.get_bucket(bucket, validate=True)\n\n key_path = self._add_path_delimiter(key)\n key_path_len = len(key_path)\n for item in s3_bucket.list(prefix=key_path):\n yield self._add_path_delimiter(path) + item.key[key_path_len:]\n\n def list(self, path): # backwards compat\n key_path_len = len(self._add_path_delimiter(path))\n for item in self.listdir(path):\n yield item[key_path_len:]\n\n def isdir(self, path):\n \"\"\"\n Is the parameter S3 path a directory?\n \"\"\"\n (bucket, key) = self._path_to_bucket_and_key(path)\n\n # grab and validate the bucket\n s3_bucket = self.s3.get_bucket(bucket, validate=True)\n\n # root is a directory\n if self._is_root(key):\n return True\n\n for suffix in (S3_DIRECTORY_MARKER_SUFFIX_0,\n S3_DIRECTORY_MARKER_SUFFIX_1):\n s3_dir_with_suffix_key = s3_bucket.get_key(key + suffix)\n if s3_dir_with_suffix_key:\n return True\n\n # files with this prefix\n key_path = self._add_path_delimiter(key)\n s3_bucket_list_result = \\\n list(itertools.islice(\n s3_bucket.list(prefix=key_path),\n 1))\n if s3_bucket_list_result:\n return True\n\n return False\n is_dir = isdir # compatibility with old version.\n\n def mkdir(self, path, parents=True, raise_if_exists=False):\n if raise_if_exists and self.isdir(path):\n raise FileAlreadyExists()\n\n _, key = self._path_to_bucket_and_key(path)\n if self._is_root(key):\n return # isdir raises if the bucket doesn't exist; nothing to do here.\n\n key = self._add_path_delimiter(key)\n\n if not parents and not self.isdir(os.path.dirname(key)):\n raise MissingParentDirectory()\n\n return self.put_string(\"\", self._add_path_delimiter(path))\n\n def _get_s3_config(self, key=None):\n try:\n config = dict(configuration.get_config().items('s3'))\n except NoSectionError:\n return {}\n # So what ports etc can be read without us having to specify all dtypes\n for k, v in six.iteritems(config):\n try:\n config[k] = int(v)\n except ValueError:\n pass\n if key:\n return config.get(key)\n return config\n\n def _path_to_bucket_and_key(self, path):\n (scheme, netloc, path, query, fragment) = urlsplit(path)\n path_without_initial_slash = path[1:]\n return netloc, path_without_initial_slash\n\n def _is_root(self, key):\n return (len(key) == 0) or (key == '/')\n\n def _add_path_delimiter(self, key):\n return key if key[-1:] == '/' else key + '/'\n\n\nclass AtomicS3File(AtomicLocalFile):\n \"\"\"\n An S3 file that writes to a temp file and put to S3 on close.\n \"\"\"\n\n def __init__(self, path, s3_client):\n self.s3_client = s3_client\n super(AtomicS3File, self).__init__(path)\n\n def move_to_final_destination(self):\n self.s3_client.put_multipart(self.tmp_path, self.path)\n\n\nclass ReadableS3File(object):\n\n def __init__(self, s3_key):\n self.s3_key = s3_key\n self.buffer = []\n self.closed = False\n self.finished = False\n\n def read(self, size=0):\n f = self.s3_key.read(size=size)\n\n # boto will loop on the key forever and it's not what is expected by\n # the python io interface\n # boto/boto#2805\n if f == b'':\n self.finished = True\n if self.finished:\n return b''\n\n return f\n\n def close(self):\n self.s3_key.close()\n self.closed = True\n\n def __del__(self):\n self.close()\n\n def __exit__(self, exc_type, exc, traceback):\n self.close()\n\n def __enter__(self):\n return self\n\n def _add_to_buffer(self, line):\n self.buffer.append(line)\n\n def _flush_buffer(self):\n output = b''.join(self.buffer)\n self.buffer = []\n return output\n\n def readable(self):\n return True\n\n def writable(self):\n return False\n\n def seekable(self):\n return False\n\n def __iter__(self):\n key_iter = self.s3_key.__iter__()\n\n has_next = True\n while has_next:\n try:\n # grab the next chunk\n chunk = next(key_iter)\n\n # split on newlines, preserving the newline\n for line in chunk.splitlines(True):\n\n if not line.endswith(os.linesep):\n # no newline, so store in buffer\n self._add_to_buffer(line)\n else:\n # newline found, send it out\n if self.buffer:\n self._add_to_buffer(line)\n yield self._flush_buffer()\n else:\n yield line\n except StopIteration:\n # send out anything we have left in the buffer\n output = self._flush_buffer()\n if output:\n yield output\n has_next = False\n self.close()\n\n\nclass S3Target(FileSystemTarget):\n \"\"\"\n \"\"\"\n\n fs = None\n\n def __init__(self, path, format=None, client=None):\n super(S3Target, self).__init__(path)\n if format is None:\n format = get_default_format()\n\n self.format = format\n self.fs = client or S3Client()\n\n def open(self, mode='r'):\n \"\"\"\n \"\"\"\n if mode not in ('r', 'w'):\n raise ValueError(\"Unsupported open mode '%s'\" % mode)\n\n if mode == 'r':\n s3_key = self.fs.get_key(self.path)\n if not s3_key:\n raise FileNotFoundException(\"Could not find file at %s\" % self.path)\n\n fileobj = ReadableS3File(s3_key)\n return self.format.pipe_reader(fileobj)\n else:\n return self.format.pipe_writer(AtomicS3File(self.path, self.fs))\n\n\nclass S3FlagTarget(S3Target):\n \"\"\"\n Defines a target directory with a flag-file (defaults to `_SUCCESS`) used\n to signify job success.\n\n This checks for two things:\n\n * the path exists (just like the S3Target)\n * the _SUCCESS file exists within the directory.\n\n Because Hadoop outputs into a directory and not a single file,\n the path is assumed to be a directory.\n\n This is meant to be a handy alternative to AtomicS3File.\n\n The AtomicFile approach can be burdensome for S3 since there are no directories, per se.\n\n If we have 1,000,000 output files, then we have to rename 1,000,000 objects.\n \"\"\"\n\n fs = None\n\n def __init__(self, path, format=None, client=None, flag='_SUCCESS'):\n \"\"\"\n Initializes a S3FlagTarget.\n\n :param path: the directory where the files are stored.\n :type path: str\n :param client:\n :type client:\n :param flag:\n :type flag: str\n \"\"\"\n if format is None:\n format = get_default_format()\n\n if path[-1] != \"/\":\n raise ValueError(\"S3FlagTarget requires the path to be to a \"\n \"directory. It must end with a slash ( / ).\")\n super(S3FlagTarget, self).__init__(path)\n self.format = format\n self.fs = client or S3Client()\n self.flag = flag\n\n def exists(self):\n hadoopSemaphore = self.path + self.flag\n return self.fs.exists(hadoopSemaphore)\n\n\nclass S3EmrTarget(S3FlagTarget):\n \"\"\"\n Deprecated. Use :py:class:`S3FlagTarget`\n \"\"\"\n\n def __init__(self, *args, **kwargs):\n warnings.warn(\"S3EmrTarget is deprecated. Please use S3FlagTarget\")\n super(S3EmrTarget, self).__init__(*args, **kwargs)\n\n\nclass S3PathTask(ExternalTask):\n \"\"\"\n A external task that to require existence of a path in S3.\n \"\"\"\n path = Parameter()\n\n def output(self):\n return S3Target(self.path)\n\n\nclass S3EmrTask(ExternalTask):\n \"\"\"\n An external task that requires the existence of EMR output in S3.\n \"\"\"\n path = Parameter()\n\n def output(self):\n return S3EmrTarget(self.path)\n\n\nclass S3FlagTask(ExternalTask):\n \"\"\"\n An external task that requires the existence of EMR output in S3.\n \"\"\"\n path = Parameter()\n flag = Parameter(default=None)\n\n def output(self):\n return S3FlagTarget(self.path, flag=self.flag)\n", "path": "luigi/s3.py" } ]
[ { "content": "# -*- coding: utf-8 -*-\n#\n# Copyright 2012-2015 Spotify AB\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n#\n\"\"\"\nImplementation of Simple Storage Service support.\n:py:class:`S3Target` is a subclass of the Target class to support S3 file system operations\n\"\"\"\n\nfrom __future__ import division\n\nimport itertools\nimport logging\nimport os\nimport os.path\ntry:\n from urlparse import urlsplit\nexcept ImportError:\n from urllib.parse import urlsplit\nimport warnings\ntry:\n from ConfigParser import NoSectionError\nexcept ImportError:\n from configparser import NoSectionError\n\nfrom luigi import six\nfrom luigi.six.moves import range\n\nfrom luigi import configuration\nfrom luigi.format import get_default_format\nfrom luigi.parameter import Parameter\nfrom luigi.target import FileAlreadyExists, FileSystem, FileSystemException, FileSystemTarget, AtomicLocalFile, MissingParentDirectory\nfrom luigi.task import ExternalTask\n\nlogger = logging.getLogger('luigi-interface')\n\ntry:\n import boto\n from boto.s3.key import Key\nexcept ImportError:\n logger.warning(\"Loading s3 module without boto installed. Will crash at \"\n \"runtime if s3 functionality is used.\")\n\n\n# two different ways of marking a directory\n# with a suffix in S3\nS3_DIRECTORY_MARKER_SUFFIX_0 = '_$folder$'\nS3_DIRECTORY_MARKER_SUFFIX_1 = '/'\n\n\nclass InvalidDeleteException(FileSystemException):\n pass\n\n\nclass FileNotFoundException(FileSystemException):\n pass\n\n\nclass S3Client(FileSystem):\n \"\"\"\n boto-powered S3 client.\n \"\"\"\n\n def __init__(self, aws_access_key_id=None, aws_secret_access_key=None,\n **kwargs):\n options = self._get_s3_config()\n options.update(kwargs)\n # Removing key args would break backwards compability\n if not aws_access_key_id:\n aws_access_key_id = options.get('aws_access_key_id')\n if not aws_secret_access_key:\n aws_secret_access_key = options.get('aws_secret_access_key')\n for key in ['aws_access_key_id', 'aws_secret_access_key']:\n if key in options:\n options.pop(key)\n self.s3 = boto.connect_s3(aws_access_key_id,\n aws_secret_access_key,\n **options)\n\n def exists(self, path):\n \"\"\"\n Does provided path exist on S3?\n \"\"\"\n (bucket, key) = self._path_to_bucket_and_key(path)\n\n # grab and validate the bucket\n s3_bucket = self.s3.get_bucket(bucket, validate=True)\n\n # root always exists\n if self._is_root(key):\n return True\n\n # file\n s3_key = s3_bucket.get_key(key)\n if s3_key:\n return True\n\n if self.isdir(path):\n return True\n\n logger.debug('Path %s does not exist', path)\n return False\n\n def remove(self, path, recursive=True):\n \"\"\"\n Remove a file or directory from S3.\n \"\"\"\n if not self.exists(path):\n logger.debug('Could not delete %s; path does not exist', path)\n return False\n\n (bucket, key) = self._path_to_bucket_and_key(path)\n\n # root\n if self._is_root(key):\n raise InvalidDeleteException(\n 'Cannot delete root of bucket at path %s' % path)\n\n # grab and validate the bucket\n s3_bucket = self.s3.get_bucket(bucket, validate=True)\n\n # file\n s3_key = s3_bucket.get_key(key)\n if s3_key:\n s3_bucket.delete_key(s3_key)\n logger.debug('Deleting %s from bucket %s', key, bucket)\n return True\n\n if self.isdir(path) and not recursive:\n raise InvalidDeleteException(\n 'Path %s is a directory. Must use recursive delete' % path)\n\n delete_key_list = [\n k for k in s3_bucket.list(self._add_path_delimiter(key))]\n\n # delete the directory marker file if it exists\n s3_dir_with_suffix_key = s3_bucket.get_key(key + S3_DIRECTORY_MARKER_SUFFIX_0)\n if s3_dir_with_suffix_key:\n delete_key_list.append(s3_dir_with_suffix_key)\n\n if len(delete_key_list) > 0:\n for k in delete_key_list:\n logger.debug('Deleting %s from bucket %s', k, bucket)\n s3_bucket.delete_keys(delete_key_list)\n return True\n\n return False\n\n def get_key(self, path):\n (bucket, key) = self._path_to_bucket_and_key(path)\n\n s3_bucket = self.s3.get_bucket(bucket, validate=True)\n\n return s3_bucket.get_key(key)\n\n def put(self, local_path, destination_s3_path):\n \"\"\"\n Put an object stored locally to an S3 path.\n \"\"\"\n (bucket, key) = self._path_to_bucket_and_key(destination_s3_path)\n\n # grab and validate the bucket\n s3_bucket = self.s3.get_bucket(bucket, validate=True)\n\n # put the file\n s3_key = Key(s3_bucket)\n s3_key.key = key\n s3_key.set_contents_from_filename(local_path)\n\n def put_string(self, content, destination_s3_path):\n \"\"\"\n Put a string to an S3 path.\n \"\"\"\n (bucket, key) = self._path_to_bucket_and_key(destination_s3_path)\n # grab and validate the bucket\n s3_bucket = self.s3.get_bucket(bucket, validate=True)\n\n # put the content\n s3_key = Key(s3_bucket)\n s3_key.key = key\n s3_key.set_contents_from_string(content)\n\n def put_multipart(self, local_path, destination_s3_path, part_size=67108864):\n \"\"\"\n Put an object stored locally to an S3 path\n using S3 multi-part upload (for files > 5GB).\n\n :param local_path: Path to source local file\n :param destination_s3_path: URL for target S3 location\n :param part_size: Part size in bytes. Default: 67108864 (64MB), must be >= 5MB and <= 5 GB.\n \"\"\"\n # calculate number of parts to upload\n # based on the size of the file\n source_size = os.stat(local_path).st_size\n\n if source_size <= part_size:\n # fallback to standard, non-multipart strategy\n return self.put(local_path, destination_s3_path)\n\n (bucket, key) = self._path_to_bucket_and_key(destination_s3_path)\n\n # grab and validate the bucket\n s3_bucket = self.s3.get_bucket(bucket, validate=True)\n\n # calculate the number of parts (int division).\n # use modulo to avoid float precision issues\n # for exactly-sized fits\n num_parts = \\\n (source_size // part_size) \\\n if source_size % part_size == 0 \\\n else (source_size // part_size) + 1\n\n mp = None\n try:\n mp = s3_bucket.initiate_multipart_upload(key)\n\n for i in range(num_parts):\n # upload a part at a time to S3\n offset = part_size * i\n bytes = min(part_size, source_size - offset)\n with open(local_path, 'rb') as fp:\n part_num = i + 1\n logger.info('Uploading part %s/%s to %s', part_num, num_parts, destination_s3_path)\n fp.seek(offset)\n mp.upload_part_from_file(fp, part_num=part_num, size=bytes)\n\n # finish the upload, making the file available in S3\n mp.complete_upload()\n except BaseException:\n if mp:\n logger.info('Canceling multipart s3 upload for %s', destination_s3_path)\n # cancel the upload so we don't get charged for\n # storage consumed by uploaded parts\n mp.cancel_upload()\n raise\n\n def get(self, s3_path, destination_local_path):\n \"\"\"\n Get an object stored in S3 and write it to a local path.\n \"\"\"\n (bucket, key) = self._path_to_bucket_and_key(s3_path)\n\n # grab and validate the bucket\n s3_bucket = self.s3.get_bucket(bucket, validate=True)\n\n # download the file\n s3_key = Key(s3_bucket)\n s3_key.key = key\n s3_key.get_contents_to_filename(destination_local_path)\n\n def get_as_string(self, s3_path):\n \"\"\"\n Get the contents of an object stored in S3 as a string.\n \"\"\"\n (bucket, key) = self._path_to_bucket_and_key(s3_path)\n\n # grab and validate the bucket\n s3_bucket = self.s3.get_bucket(bucket, validate=True)\n\n # get the content\n s3_key = Key(s3_bucket)\n s3_key.key = key\n contents = s3_key.get_contents_as_string()\n\n return contents\n\n def copy(self, source_path, destination_path):\n \"\"\"\n Copy an object from one S3 location to another.\n \"\"\"\n (src_bucket, src_key) = self._path_to_bucket_and_key(source_path)\n (dst_bucket, dst_key) = self._path_to_bucket_and_key(destination_path)\n\n s3_bucket = self.s3.get_bucket(dst_bucket, validate=True)\n\n if self.isdir(source_path):\n src_prefix = self._add_path_delimiter(src_key)\n dst_prefix = self._add_path_delimiter(dst_key)\n for key in self.list(source_path):\n s3_bucket.copy_key(dst_prefix + key,\n src_bucket,\n src_prefix + key)\n else:\n s3_bucket.copy_key(dst_key, src_bucket, src_key)\n\n def rename(self, source_path, destination_path):\n \"\"\"\n Rename/move an object from one S3 location to another.\n \"\"\"\n self.copy(source_path, destination_path)\n self.remove(source_path)\n\n def listdir(self, path):\n \"\"\"\n Get an iterable with S3 folder contents.\n Iterable contains paths relative to queried path.\n \"\"\"\n (bucket, key) = self._path_to_bucket_and_key(path)\n\n # grab and validate the bucket\n s3_bucket = self.s3.get_bucket(bucket, validate=True)\n\n key_path = self._add_path_delimiter(key)\n key_path_len = len(key_path)\n for item in s3_bucket.list(prefix=key_path):\n yield self._add_path_delimiter(path) + item.key[key_path_len:]\n\n def list(self, path): # backwards compat\n key_path_len = len(self._add_path_delimiter(path))\n for item in self.listdir(path):\n yield item[key_path_len:]\n\n def isdir(self, path):\n \"\"\"\n Is the parameter S3 path a directory?\n \"\"\"\n (bucket, key) = self._path_to_bucket_and_key(path)\n\n # grab and validate the bucket\n s3_bucket = self.s3.get_bucket(bucket, validate=True)\n\n # root is a directory\n if self._is_root(key):\n return True\n\n for suffix in (S3_DIRECTORY_MARKER_SUFFIX_0,\n S3_DIRECTORY_MARKER_SUFFIX_1):\n s3_dir_with_suffix_key = s3_bucket.get_key(key + suffix)\n if s3_dir_with_suffix_key:\n return True\n\n # files with this prefix\n key_path = self._add_path_delimiter(key)\n s3_bucket_list_result = \\\n list(itertools.islice(\n s3_bucket.list(prefix=key_path),\n 1))\n if s3_bucket_list_result:\n return True\n\n return False\n is_dir = isdir # compatibility with old version.\n\n def mkdir(self, path, parents=True, raise_if_exists=False):\n if raise_if_exists and self.isdir(path):\n raise FileAlreadyExists()\n\n _, key = self._path_to_bucket_and_key(path)\n if self._is_root(key):\n return # isdir raises if the bucket doesn't exist; nothing to do here.\n\n key = self._add_path_delimiter(key)\n\n if not parents and not self.isdir(os.path.dirname(key)):\n raise MissingParentDirectory()\n\n return self.put_string(\"\", self._add_path_delimiter(path))\n\n def _get_s3_config(self, key=None):\n try:\n config = dict(configuration.get_config().items('s3'))\n except NoSectionError:\n return {}\n # So what ports etc can be read without us having to specify all dtypes\n for k, v in six.iteritems(config):\n try:\n config[k] = int(v)\n except ValueError:\n pass\n if key:\n return config.get(key)\n return config\n\n def _path_to_bucket_and_key(self, path):\n (scheme, netloc, path, query, fragment) = urlsplit(path)\n path_without_initial_slash = path[1:]\n return netloc, path_without_initial_slash\n\n def _is_root(self, key):\n return (len(key) == 0) or (key == '/')\n\n def _add_path_delimiter(self, key):\n return key if key[-1:] == '/' else key + '/'\n\n\nclass AtomicS3File(AtomicLocalFile):\n \"\"\"\n An S3 file that writes to a temp file and put to S3 on close.\n \"\"\"\n\n def __init__(self, path, s3_client):\n self.s3_client = s3_client\n super(AtomicS3File, self).__init__(path)\n\n def move_to_final_destination(self):\n self.s3_client.put_multipart(self.tmp_path, self.path)\n\n\nclass ReadableS3File(object):\n\n def __init__(self, s3_key):\n self.s3_key = s3_key\n self.buffer = []\n self.closed = False\n self.finished = False\n\n def read(self, size=0):\n f = self.s3_key.read(size=size)\n\n # boto will loop on the key forever and it's not what is expected by\n # the python io interface\n # boto/boto#2805\n if f == b'':\n self.finished = True\n if self.finished:\n return b''\n\n return f\n\n def close(self):\n self.s3_key.close()\n self.closed = True\n\n def __del__(self):\n self.close()\n\n def __exit__(self, exc_type, exc, traceback):\n self.close()\n\n def __enter__(self):\n return self\n\n def _add_to_buffer(self, line):\n self.buffer.append(line)\n\n def _flush_buffer(self):\n output = b''.join(self.buffer)\n self.buffer = []\n return output\n\n def readable(self):\n return True\n\n def writable(self):\n return False\n\n def seekable(self):\n return False\n\n def __iter__(self):\n key_iter = self.s3_key.__iter__()\n\n has_next = True\n while has_next:\n try:\n # grab the next chunk\n chunk = next(key_iter)\n\n # split on newlines, preserving the newline\n for line in chunk.splitlines(True):\n\n if not line.endswith(os.linesep):\n # no newline, so store in buffer\n self._add_to_buffer(line)\n else:\n # newline found, send it out\n if self.buffer:\n self._add_to_buffer(line)\n yield self._flush_buffer()\n else:\n yield line\n except StopIteration:\n # send out anything we have left in the buffer\n output = self._flush_buffer()\n if output:\n yield output\n has_next = False\n self.close()\n\n\nclass S3Target(FileSystemTarget):\n \"\"\"\n \"\"\"\n\n fs = None\n\n def __init__(self, path, format=None, client=None):\n super(S3Target, self).__init__(path)\n if format is None:\n format = get_default_format()\n\n self.path = path\n self.format = format\n self.fs = client or S3Client()\n\n def open(self, mode='r'):\n \"\"\"\n \"\"\"\n if mode not in ('r', 'w'):\n raise ValueError(\"Unsupported open mode '%s'\" % mode)\n\n if mode == 'r':\n s3_key = self.fs.get_key(self.path)\n if not s3_key:\n raise FileNotFoundException(\"Could not find file at %s\" % self.path)\n\n fileobj = ReadableS3File(s3_key)\n return self.format.pipe_reader(fileobj)\n else:\n return self.format.pipe_writer(AtomicS3File(self.path, self.fs))\n\n\nclass S3FlagTarget(S3Target):\n \"\"\"\n Defines a target directory with a flag-file (defaults to `_SUCCESS`) used\n to signify job success.\n\n This checks for two things:\n\n * the path exists (just like the S3Target)\n * the _SUCCESS file exists within the directory.\n\n Because Hadoop outputs into a directory and not a single file,\n the path is assumed to be a directory.\n\n This is meant to be a handy alternative to AtomicS3File.\n\n The AtomicFile approach can be burdensome for S3 since there are no directories, per se.\n\n If we have 1,000,000 output files, then we have to rename 1,000,000 objects.\n \"\"\"\n\n fs = None\n\n def __init__(self, path, format=None, client=None, flag='_SUCCESS'):\n \"\"\"\n Initializes a S3FlagTarget.\n\n :param path: the directory where the files are stored.\n :type path: str\n :param client:\n :type client:\n :param flag:\n :type flag: str\n \"\"\"\n if format is None:\n format = get_default_format()\n\n if path[-1] != \"/\":\n raise ValueError(\"S3FlagTarget requires the path to be to a \"\n \"directory. It must end with a slash ( / ).\")\n super(S3FlagTarget, self).__init__(path)\n self.format = format\n self.fs = client or S3Client()\n self.flag = flag\n\n def exists(self):\n hadoopSemaphore = self.path + self.flag\n return self.fs.exists(hadoopSemaphore)\n\n\nclass S3EmrTarget(S3FlagTarget):\n \"\"\"\n Deprecated. Use :py:class:`S3FlagTarget`\n \"\"\"\n\n def __init__(self, *args, **kwargs):\n warnings.warn(\"S3EmrTarget is deprecated. Please use S3FlagTarget\")\n super(S3EmrTarget, self).__init__(*args, **kwargs)\n\n\nclass S3PathTask(ExternalTask):\n \"\"\"\n A external task that to require existence of a path in S3.\n \"\"\"\n path = Parameter()\n\n def output(self):\n return S3Target(self.path)\n\n\nclass S3EmrTask(ExternalTask):\n \"\"\"\n An external task that requires the existence of EMR output in S3.\n \"\"\"\n path = Parameter()\n\n def output(self):\n return S3EmrTarget(self.path)\n\n\nclass S3FlagTask(ExternalTask):\n \"\"\"\n An external task that requires the existence of EMR output in S3.\n \"\"\"\n path = Parameter()\n flag = Parameter(default=None)\n\n def output(self):\n return S3FlagTarget(self.path, flag=self.flag)\n", "path": "luigi/s3.py" } ]
diff --git a/luigi/s3.py b/luigi/s3.py index 61c3ca3ea0..1741724aed 100644 --- a/luigi/s3.py +++ b/luigi/s3.py @@ -501,6 +501,7 @@ def __init__(self, path, format=None, client=None): if format is None: format = get_default_format() + self.path = path self.format = format self.fs = client or S3Client() diff --git a/test/s3_test.py b/test/s3_test.py index d4cf3e1142..ccbf9e6836 100644 --- a/test/s3_test.py +++ b/test/s3_test.py @@ -100,6 +100,11 @@ def test_read_iterator_long(self): self.assertEqual("line two" + os.linesep, lines[1]) self.assertEqual("line three", lines[2]) + def test_get_path(self): + t = self.create_target() + path = t.path + self.assertEqual('s3://mybucket/test_file', path) + class TestS3Client(unittest.TestCase):
vllm-project__vllm-3129
[ { "content": "\"\"\"vLLM: a high-throughput and memory-efficient inference engine for LLMs\"\"\"\n\nfrom vllm.engine.arg_utils import AsyncEngineArgs, EngineArgs\nfrom vllm.engine.async_llm_engine import AsyncLLMEngine\nfrom vllm.engine.llm_engine import LLMEngine\nfrom vllm.engine.ray_utils import initialize_cluster\nfrom vllm.entrypoints.llm import LLM\nfrom vllm.outputs import CompletionOutput, RequestOutput\nfrom vllm.sampling_params import SamplingParams\n\n__version__ = \"0.3.2\"\n\n__all__ = [\n \"LLM\",\n \"SamplingParams\",\n \"RequestOutput\",\n \"CompletionOutput\",\n \"LLMEngine\",\n \"EngineArgs\",\n \"AsyncLLMEngine\",\n \"AsyncEngineArgs\",\n \"initialize_cluster\",\n]\n", "path": "vllm/__init__.py" } ]
[ { "content": "\"\"\"vLLM: a high-throughput and memory-efficient inference engine for LLMs\"\"\"\n\nfrom vllm.engine.arg_utils import AsyncEngineArgs, EngineArgs\nfrom vllm.engine.async_llm_engine import AsyncLLMEngine\nfrom vllm.engine.llm_engine import LLMEngine\nfrom vllm.engine.ray_utils import initialize_cluster\nfrom vllm.entrypoints.llm import LLM\nfrom vllm.outputs import CompletionOutput, RequestOutput\nfrom vllm.sampling_params import SamplingParams\n\n__version__ = \"0.3.3\"\n\n__all__ = [\n \"LLM\",\n \"SamplingParams\",\n \"RequestOutput\",\n \"CompletionOutput\",\n \"LLMEngine\",\n \"EngineArgs\",\n \"AsyncLLMEngine\",\n \"AsyncEngineArgs\",\n \"initialize_cluster\",\n]\n", "path": "vllm/__init__.py" } ]
diff --git a/vllm/__init__.py b/vllm/__init__.py index 7ff92d8cc68..f1e30f5eb6e 100644 --- a/vllm/__init__.py +++ b/vllm/__init__.py @@ -8,7 +8,7 @@ from vllm.outputs import CompletionOutput, RequestOutput from vllm.sampling_params import SamplingParams -__version__ = "0.3.2" +__version__ = "0.3.3" __all__ = [ "LLM",
vllm-project__vllm-2887
[ { "content": "\"\"\"vLLM: a high-throughput and memory-efficient inference engine for LLMs\"\"\"\n\nfrom vllm.engine.arg_utils import AsyncEngineArgs, EngineArgs\nfrom vllm.engine.async_llm_engine import AsyncLLMEngine\nfrom vllm.engine.llm_engine import LLMEngine\nfrom vllm.engine.ray_utils import initialize_cluster\nfrom vllm.entrypoints.llm import LLM\nfrom vllm.outputs import CompletionOutput, RequestOutput\nfrom vllm.sampling_params import SamplingParams\n\n__version__ = \"0.3.0\"\n\n__all__ = [\n \"LLM\",\n \"SamplingParams\",\n \"RequestOutput\",\n \"CompletionOutput\",\n \"LLMEngine\",\n \"EngineArgs\",\n \"AsyncLLMEngine\",\n \"AsyncEngineArgs\",\n \"initialize_cluster\",\n]\n", "path": "vllm/__init__.py" } ]
[ { "content": "\"\"\"vLLM: a high-throughput and memory-efficient inference engine for LLMs\"\"\"\n\nfrom vllm.engine.arg_utils import AsyncEngineArgs, EngineArgs\nfrom vllm.engine.async_llm_engine import AsyncLLMEngine\nfrom vllm.engine.llm_engine import LLMEngine\nfrom vllm.engine.ray_utils import initialize_cluster\nfrom vllm.entrypoints.llm import LLM\nfrom vllm.outputs import CompletionOutput, RequestOutput\nfrom vllm.sampling_params import SamplingParams\n\n__version__ = \"0.3.1\"\n\n__all__ = [\n \"LLM\",\n \"SamplingParams\",\n \"RequestOutput\",\n \"CompletionOutput\",\n \"LLMEngine\",\n \"EngineArgs\",\n \"AsyncLLMEngine\",\n \"AsyncEngineArgs\",\n \"initialize_cluster\",\n]\n", "path": "vllm/__init__.py" } ]
diff --git a/vllm/__init__.py b/vllm/__init__.py index 36d177f5942..e3234c009c1 100644 --- a/vllm/__init__.py +++ b/vllm/__init__.py @@ -8,7 +8,7 @@ from vllm.outputs import CompletionOutput, RequestOutput from vllm.sampling_params import SamplingParams -__version__ = "0.3.0" +__version__ = "0.3.1" __all__ = [ "LLM",
Gallopsled__pwntools-1252
[ { "content": "\n#!/usr/bin/env python2\n\"\"\"\nPwntools exposes several magic command-line arguments and environment\nvariables when operating in `from pwn import *` mode.\n\nThe arguments extracted from the command-line and removed from ``sys.argv``.\n\nArguments can be set by appending them to the command-line, or setting\nthem in the environment prefixed by ``PWNLIB_``.\n\nThe easiest example is to enable more verbose debugging. Just set ``DEBUG``.\n\n.. code-block:: bash\n\n $ PWNLIB_DEBUG=1 python exploit.py\n $ python exploit.py DEBUG\n\nThese arguments are automatically extracted, regardless of their name, and\nexposed via :mod:`pwnlib.args.args`, which is exposed as the global variable\n:data:`args`. Arguments which ``pwntools`` reserves internally are not exposed\nthis way.\n\n.. code-block:: bash\n\n $ python -c 'from pwn import *; print args' A=1 B=Hello HOST=1.2.3.4 DEBUG\n defaultdict(<type 'str'>, {'A': '1', 'HOST': '1.2.3.4', 'B': 'Hello'})\n\nThis is very useful for conditional code, for example determining whether to\nrun an exploit locally or to connect to a remote server. Arguments which are\nnot specified evaluate to an empty string.\n\n.. code-block:: python\n\n if args['REMOTE']:\n io = remote('exploitme.com', 4141)\n else:\n io = process('./pwnable')\n\nArguments can also be accessed directly with the dot operator, e.g.:\n\n.. code-block:: python\n\n if args.REMOTE:\n ...\n\nAny undefined arguments evaluate to an empty string, ``''``.\n\nThe full list of supported \"magic arguments\" and their effects are listed\nbelow.\n\n\"\"\"\nfrom __future__ import absolute_import\n\nimport collections\nimport logging\nimport os\nimport string\nimport sys\n\nfrom pwnlib import term\nfrom pwnlib.context import context\n\nclass PwnlibArgs(collections.defaultdict):\n def __getattr__(self, attr):\n return self[attr]\n\nargs = PwnlibArgs(str)\nterm_mode = True\nenv_prefix = 'PWNLIB_'\nfree_form = True\n\n# Check to see if we were invoked as one of the 'pwn xxx' scripts.\n# If so, we don't want to remove e.g. \"SYS_\" from the end of the command\n# line, as this breaks things like constgrep.\nimport pwnlib.commandline\nbasename = os.path.basename(sys.argv[0])\n\nif basename == 'pwn' or basename in pwnlib.commandline.__all__:\n free_form = False\n\n\ndef isident(s):\n \"\"\"\n Helper function to check whether a string is a valid identifier,\n as passed in on the command-line.\n \"\"\"\n first = string.uppercase + '_'\n body = string.digits + first\n if not s:\n return False\n if s[0] not in first:\n return False\n if not all(c in body for c in s[1:]):\n return False\n return True\n\ndef asbool(s):\n \"\"\"\n Convert a string to its boolean value\n \"\"\"\n if s.lower() == 'true':\n return True\n elif s.lower() == 'false':\n return False\n elif s.isdigit():\n return bool(int(s))\n else:\n raise ValueError('must be integer or boolean: %r' % s)\n\ndef LOG_LEVEL(x):\n \"\"\"Sets the logging verbosity used via ``context.log_level``,\n e.g. ``LOG_LEVEL=debug``.\n \"\"\"\n with context.local(log_level=x):\n context.defaults['log_level']=context.log_level\n\ndef LOG_FILE(x):\n \"\"\"Sets a log file to be used via ``context.log_file``, e.g.\n ``LOG_FILE=./log.txt``\"\"\"\n context.log_file=x\n\ndef SILENT(x):\n \"\"\"Sets the logging verbosity to ``error`` which silences most\n output.\"\"\"\n LOG_LEVEL('error')\n\ndef DEBUG(x):\n \"\"\"Sets the logging verbosity to ``debug`` which displays much\n more information, including logging each byte sent by tubes.\"\"\"\n LOG_LEVEL('debug')\n\ndef NOTERM(v):\n \"\"\"Disables pretty terminal settings and animations.\"\"\"\n if asbool(v):\n global term_mode\n term_mode = False\n\ndef TIMEOUT(v):\n \"\"\"Sets a timeout for tube operations (in seconds) via\n ``context.timeout``, e.g. ``TIMEOUT=30``\"\"\"\n context.defaults['timeout'] = int(v)\n\ndef RANDOMIZE(v):\n \"\"\"Enables randomization of various pieces via ``context.randomize``\"\"\"\n context.defaults['randomize'] = asbool(v)\n\ndef NOASLR(v):\n \"\"\"Disables ASLR via ``context.aslr``\"\"\"\n context.defaults['aslr'] = not asbool(v)\n\ndef NOPTRACE(v):\n \"\"\"Disables facilities which require ``ptrace`` such as ``gdb.attach()``\n statements, via ``context.noptrace``.\"\"\"\n context.defaults['noptrace'] = asbool(v)\n\ndef STDERR(v):\n \"\"\"Sends logging to ``stderr`` by default, instead of ``stdout``\"\"\"\n context.log_console = sys.stderr\n\nhooks = {\n 'LOG_LEVEL': LOG_LEVEL,\n 'LOG_FILE': LOG_FILE,\n 'DEBUG': DEBUG,\n 'NOTERM': NOTERM,\n 'SILENT': SILENT,\n 'RANDOMIZE': RANDOMIZE,\n 'TIMEOUT': TIMEOUT,\n 'NOASLR': NOASLR,\n 'NOPTRACE': NOPTRACE,\n 'STDERR': STDERR,\n}\n\ndef initialize():\n global args, term_mode\n\n # Hack for readthedocs.org\n if 'READTHEDOCS' in os.environ:\n os.environ['PWNLIB_NOTERM'] = '1'\n\n for k, v in os.environ.items():\n if not k.startswith(env_prefix):\n continue\n k = k[len(env_prefix):]\n\n if k in hooks:\n hooks[k](v)\n elif isident(k):\n args[k] = v\n\n argv = sys.argv[:]\n for arg in sys.argv[:]:\n orig = arg\n value = 'True'\n\n if '=' in arg:\n arg, value = arg.split('=')\n\n if arg in hooks:\n sys.argv.remove(orig)\n hooks[arg](value)\n\n elif free_form and isident(arg):\n sys.argv.remove(orig)\n args[arg] = value\n\n if term_mode:\n term.init()\n", "path": "pwnlib/args.py" } ]
[ { "content": "\n#!/usr/bin/env python2\n\"\"\"\nPwntools exposes several magic command-line arguments and environment\nvariables when operating in `from pwn import *` mode.\n\nThe arguments extracted from the command-line and removed from ``sys.argv``.\n\nArguments can be set by appending them to the command-line, or setting\nthem in the environment prefixed by ``PWNLIB_``.\n\nThe easiest example is to enable more verbose debugging. Just set ``DEBUG``.\n\n.. code-block:: bash\n\n $ PWNLIB_DEBUG=1 python exploit.py\n $ python exploit.py DEBUG\n\nThese arguments are automatically extracted, regardless of their name, and\nexposed via :mod:`pwnlib.args.args`, which is exposed as the global variable\n:data:`args`. Arguments which ``pwntools`` reserves internally are not exposed\nthis way.\n\n.. code-block:: bash\n\n $ python -c 'from pwn import *; print args' A=1 B=Hello HOST=1.2.3.4 DEBUG\n defaultdict(<type 'str'>, {'A': '1', 'HOST': '1.2.3.4', 'B': 'Hello'})\n\nThis is very useful for conditional code, for example determining whether to\nrun an exploit locally or to connect to a remote server. Arguments which are\nnot specified evaluate to an empty string.\n\n.. code-block:: python\n\n if args['REMOTE']:\n io = remote('exploitme.com', 4141)\n else:\n io = process('./pwnable')\n\nArguments can also be accessed directly with the dot operator, e.g.:\n\n.. code-block:: python\n\n if args.REMOTE:\n ...\n\nAny undefined arguments evaluate to an empty string, ``''``.\n\nThe full list of supported \"magic arguments\" and their effects are listed\nbelow.\n\n\"\"\"\nfrom __future__ import absolute_import\n\nimport collections\nimport logging\nimport os\nimport string\nimport sys\n\nfrom pwnlib import term\nfrom pwnlib.context import context\n\nclass PwnlibArgs(collections.defaultdict):\n def __getattr__(self, attr):\n return self[attr]\n\nargs = PwnlibArgs(str)\nterm_mode = True\nenv_prefix = 'PWNLIB_'\nfree_form = True\n\n# Check to see if we were invoked as one of the 'pwn xxx' scripts.\n# If so, we don't want to remove e.g. \"SYS_\" from the end of the command\n# line, as this breaks things like constgrep.\nimport pwnlib.commandline\nbasename = os.path.basename(sys.argv[0])\n\nif basename == 'pwn' or basename in pwnlib.commandline.__all__:\n free_form = False\n\n\ndef isident(s):\n \"\"\"\n Helper function to check whether a string is a valid identifier,\n as passed in on the command-line.\n \"\"\"\n first = string.uppercase + '_'\n body = string.digits + first\n if not s:\n return False\n if s[0] not in first:\n return False\n if not all(c in body for c in s[1:]):\n return False\n return True\n\ndef asbool(s):\n \"\"\"\n Convert a string to its boolean value\n \"\"\"\n if s.lower() == 'true':\n return True\n elif s.lower() == 'false':\n return False\n elif s.isdigit():\n return bool(int(s))\n else:\n raise ValueError('must be integer or boolean: %r' % s)\n\ndef LOG_LEVEL(x):\n \"\"\"Sets the logging verbosity used via ``context.log_level``,\n e.g. ``LOG_LEVEL=debug``.\n \"\"\"\n with context.local(log_level=x):\n context.defaults['log_level']=context.log_level\n\ndef LOG_FILE(x):\n \"\"\"Sets a log file to be used via ``context.log_file``, e.g.\n ``LOG_FILE=./log.txt``\"\"\"\n context.log_file=x\n\ndef SILENT(x):\n \"\"\"Sets the logging verbosity to ``error`` which silences most\n output.\"\"\"\n LOG_LEVEL('error')\n\ndef DEBUG(x):\n \"\"\"Sets the logging verbosity to ``debug`` which displays much\n more information, including logging each byte sent by tubes.\"\"\"\n LOG_LEVEL('debug')\n\ndef NOTERM(v):\n \"\"\"Disables pretty terminal settings and animations.\"\"\"\n if asbool(v):\n global term_mode\n term_mode = False\n\ndef TIMEOUT(v):\n \"\"\"Sets a timeout for tube operations (in seconds) via\n ``context.timeout``, e.g. ``TIMEOUT=30``\"\"\"\n context.defaults['timeout'] = int(v)\n\ndef RANDOMIZE(v):\n \"\"\"Enables randomization of various pieces via ``context.randomize``\"\"\"\n context.defaults['randomize'] = asbool(v)\n\ndef NOASLR(v):\n \"\"\"Disables ASLR via ``context.aslr``\"\"\"\n context.defaults['aslr'] = not asbool(v)\n\ndef NOPTRACE(v):\n \"\"\"Disables facilities which require ``ptrace`` such as ``gdb.attach()``\n statements, via ``context.noptrace``.\"\"\"\n context.defaults['noptrace'] = asbool(v)\n\ndef STDERR(v):\n \"\"\"Sends logging to ``stderr`` by default, instead of ``stdout``\"\"\"\n context.log_console = sys.stderr\n\nhooks = {\n 'LOG_LEVEL': LOG_LEVEL,\n 'LOG_FILE': LOG_FILE,\n 'DEBUG': DEBUG,\n 'NOTERM': NOTERM,\n 'SILENT': SILENT,\n 'RANDOMIZE': RANDOMIZE,\n 'TIMEOUT': TIMEOUT,\n 'NOASLR': NOASLR,\n 'NOPTRACE': NOPTRACE,\n 'STDERR': STDERR,\n}\n\ndef initialize():\n global args, term_mode\n\n # Hack for readthedocs.org\n if 'READTHEDOCS' in os.environ:\n os.environ['PWNLIB_NOTERM'] = '1'\n\n for k, v in os.environ.items():\n if not k.startswith(env_prefix):\n continue\n k = k[len(env_prefix):]\n\n if k in hooks:\n hooks[k](v)\n elif isident(k):\n args[k] = v\n\n argv = sys.argv[:]\n for arg in sys.argv[:]:\n orig = arg\n value = 'True'\n\n if '=' in arg:\n arg, value = arg.split('=', 1)\n\n if arg in hooks:\n sys.argv.remove(orig)\n hooks[arg](value)\n\n elif free_form and isident(arg):\n sys.argv.remove(orig)\n args[arg] = value\n\n if term_mode:\n term.init()\n", "path": "pwnlib/args.py" } ]
diff --git a/pwnlib/args.py b/pwnlib/args.py index 046f97361..37ee01edc 100644 --- a/pwnlib/args.py +++ b/pwnlib/args.py @@ -194,7 +194,7 @@ def initialize(): value = 'True' if '=' in arg: - arg, value = arg.split('=') + arg, value = arg.split('=', 1) if arg in hooks: sys.argv.remove(orig)
arviz-devs__arviz-1192
[ { "content": "# pylint: disable=no-member,invalid-name,redefined-outer-name\n\"\"\"ArviZ plotting backends.\"\"\"\nimport re\nimport numpy as np\nfrom pandas import DataFrame\n\nfrom ...rcparams import rcParams\n\n\ndef to_cds(\n data,\n var_names=None,\n groups=None,\n dimensions=None,\n group_info=True,\n var_name_format=None,\n index_origin=None,\n):\n \"\"\"Transform data to ColumnDataSource (CDS) compatible with Bokeh.\n\n Uses `_ARVIZ_GROUP_` and `_ARVIZ_CDS_SELECTION_`to separate var_name\n from group and dimensions in CDS columns.\n\n Parameters\n ----------\n data : obj\n Any object that can be converted to an az.InferenceData object\n Refer to documentation of az.convert_to_inference_data for details\n var_names : str or list of str, optional\n Variables to be processed, if None all variables are processed.\n groups : str or list of str, optional\n Select groups for CDS. Default groups are {\"posterior_groups\", \"prior_groups\",\n \"posterior_groups_warmup\"}\n - posterior_groups: posterior, posterior_predictive, sample_stats\n - prior_groups: prior, prior_predictive, sample_stats_prior\n - posterior_groups_warmup: warmup_posterior, warmup_posterior_predictive,\n warmup_sample_stats\n ignore_groups : str or list of str, optional\n Ignore specific groups from CDS.\n dimension : str, or list of str, optional\n Select dimensions along to slice the data. By default uses (\"chain\", \"draw\").\n group_info : bool\n Add group info for `var_name_format`\n var_name_format : str or tuple of tuple of string, optional\n Select column name format for non-scalar input.\n Predefined options are {\"brackets\", \"underscore\", \"cds\"}\n \"brackets\":\n - add_group_info == False: theta[0,0]\n - add_group_info == True: theta_posterior[0,0]\n \"underscore\":\n - add_group_info == False: theta_0_0\n - add_group_info == True: theta_posterior_0_0_\n \"cds\":\n - add_group_info == False: theta_ARVIZ_CDS_SELECTION_0_0\n - add_group_info == True: theta_ARVIZ_GROUP_posterior__ARVIZ_CDS_SELECTION_0_0\n tuple:\n Structure:\n tuple: (dim_info, group_info)\n dim_info: (str: `.join` separator,\n str: dim_separator_start,\n str: dim_separator_end)\n group_info: (str: group separator start, str: group separator end)\n Example: ((\",\", \"[\", \"]\"), (\"_\", \"\"))\n - add_group_info == False: theta[0,0]\n - add_group_info == True: theta_posterior[0,0]\n index_origin : int, optional\n Start parameter indices from `index_origin`. Either 0 or 1.\n\n Returns\n -------\n bokeh.models.ColumnDataSource object\n \"\"\"\n from ...utils import flatten_inference_data_to_dict\n\n if var_name_format is None:\n var_name_format = \"cds\"\n\n cds_dict = flatten_inference_data_to_dict(\n data=data,\n var_names=var_names,\n groups=groups,\n dimensions=dimensions,\n group_info=group_info,\n index_origin=index_origin,\n var_name_format=var_name_format,\n )\n cds_data = ColumnDataSource(DataFrame.from_dict(cds_dict, orient=\"columns\"))\n return cds_data\n\n\ndef output_notebook(*args, **kwargs):\n \"\"\"Wrap bokeh.plotting.output_notebook.\"\"\"\n import bokeh.plotting as bkp\n\n return bkp.output_notebook(*args, **kwargs)\n\n\ndef output_file(*args, **kwargs):\n \"\"\"Wrap bokeh.plotting.output_file.\"\"\"\n import bokeh.plotting as bkp\n\n return bkp.output_file(*args, **kwargs)\n\n\ndef ColumnDataSource(*args, **kwargs):\n \"\"\"Wrap bokeh.models.ColumnDataSource.\"\"\"\n from bokeh.models import ColumnDataSource\n\n return ColumnDataSource(*args, **kwargs)\n\n\ndef create_layout(ax, force_layout=False):\n \"\"\"Transform bokeh array of figures to layout.\"\"\"\n ax = np.atleast_2d(ax)\n subplot_order = rcParams[\"plot.bokeh.layout.order\"]\n if force_layout:\n from bokeh.layouts import gridplot as layout\n\n ax = ax.tolist()\n layout_args = {\n \"sizing_mode\": rcParams[\"plot.bokeh.layout.sizing_mode\"],\n \"toolbar_location\": rcParams[\"plot.bokeh.layout.toolbar_location\"],\n }\n elif any(item in subplot_order for item in (\"row\", \"column\")):\n # check number of rows\n match = re.match(r\"(\\d*)(row|column)\", subplot_order)\n n = int(match.group(1)) if match.group(1) is not None else 1\n subplot_order = match.group(2)\n # set up 1D list of axes\n ax = [item for item in ax.ravel().tolist() if item is not None]\n layout_args = {\"sizing_mode\": rcParams[\"plot.bokeh.layout.sizing_mode\"]}\n if subplot_order == \"row\" and n == 1:\n from bokeh.layouts import row as layout\n elif subplot_order == \"column\" and n == 1:\n from bokeh.layouts import column as layout\n else:\n from bokeh.layouts import layout\n\n if n != 1:\n ax = np.array(ax + [None for _ in range(int(np.ceil(len(ax) / n)) - len(ax))])\n if subplot_order == \"row\":\n ax = ax.reshape(n, -1)\n else:\n ax = ax.reshape(-1, n)\n ax = ax.tolist()\n else:\n if subplot_order in (\"square\", \"square_trimmed\"):\n ax = [item for item in ax.ravel().tolist() if item is not None]\n n = int(np.ceil(len(ax) ** 0.5))\n ax = ax + [None for _ in range(n ** 2 - len(ax))]\n ax = np.array(ax).reshape(n, n)\n ax = ax.tolist()\n if (subplot_order == \"square_trimmed\") and any(\n all(item is None for item in row) for row in ax\n ):\n from bokeh.layouts import layout\n\n ax = [row for row in ax if not all(item is None for item in row)]\n layout_args = {\"sizing_mode\": rcParams[\"plot.bokeh.layout.sizing_mode\"]}\n else:\n from bokeh.layouts import gridplot as layout\n\n layout_args = {\n \"sizing_mode\": rcParams[\"plot.bokeh.layout.sizing_mode\"],\n \"toolbar_location\": rcParams[\"plot.bokeh.layout.toolbar_location\"],\n }\n # ignore \"fixed\" sizing_mode without explicit width and height\n if layout_args.get(\"sizing_mode\", \"\") == \"fixed\":\n layout_args.pop(\"sizing_mode\")\n return layout(ax, **layout_args)\n\n\ndef show_layout(ax, show=True, force_layout=False):\n \"\"\"Create a layout and call bokeh show.\"\"\"\n if show is None:\n show = rcParams[\"plot.bokeh.show\"]\n if show:\n import bokeh.plotting as bkp\n\n layout = create_layout(ax, force_layout=force_layout)\n bkp.show(layout)\n\n\ndef _copy_docstring(lib, function):\n \"\"\"Extract docstring from function.\"\"\"\n import importlib\n\n try:\n module = importlib.import_module(lib)\n func = getattr(module, function)\n doc = func.__doc__\n except ImportError:\n doc = \"Failed to import function {} from {}\".format(function, lib)\n\n return doc\n\n\noutput_notebook.__doc__ += \"\\n\\n\" + _copy_docstring(\"bokeh.plotting\", \"output_notebook\")\noutput_file.__doc__ += \"\\n\\n\" + _copy_docstring(\"bokeh.plotting\", \"output_file\")\nColumnDataSource.__doc__ += \"\\n\\n\" + _copy_docstring(\"bokeh.models\", \"ColumnDataSource\")\n", "path": "arviz/plots/backends/__init__.py" } ]
[ { "content": "# pylint: disable=no-member,invalid-name,redefined-outer-name\n\"\"\"ArviZ plotting backends.\"\"\"\nimport re\nimport numpy as np\nfrom pandas import DataFrame\n\nfrom ...rcparams import rcParams\n\n\ndef to_cds(\n data,\n var_names=None,\n groups=None,\n dimensions=None,\n group_info=True,\n var_name_format=None,\n index_origin=None,\n):\n \"\"\"Transform data to ColumnDataSource (CDS) compatible with Bokeh.\n\n Uses `_ARVIZ_GROUP_` and `_ARVIZ_CDS_SELECTION_`to separate var_name\n from group and dimensions in CDS columns.\n\n Parameters\n ----------\n data : obj\n Any object that can be converted to an az.InferenceData object\n Refer to documentation of az.convert_to_inference_data for details\n var_names : str or list of str, optional\n Variables to be processed, if None all variables are processed.\n groups : str or list of str, optional\n Select groups for CDS. Default groups are {\"posterior_groups\", \"prior_groups\",\n \"posterior_groups_warmup\"}\n - posterior_groups: posterior, posterior_predictive, sample_stats\n - prior_groups: prior, prior_predictive, sample_stats_prior\n - posterior_groups_warmup: warmup_posterior, warmup_posterior_predictive,\n warmup_sample_stats\n ignore_groups : str or list of str, optional\n Ignore specific groups from CDS.\n dimension : str, or list of str, optional\n Select dimensions along to slice the data. By default uses (\"chain\", \"draw\").\n group_info : bool\n Add group info for `var_name_format`\n var_name_format : str or tuple of tuple of string, optional\n Select column name format for non-scalar input.\n Predefined options are {\"brackets\", \"underscore\", \"cds\"}\n \"brackets\":\n - add_group_info == False: theta[0,0]\n - add_group_info == True: theta_posterior[0,0]\n \"underscore\":\n - add_group_info == False: theta_0_0\n - add_group_info == True: theta_posterior_0_0_\n \"cds\":\n - add_group_info == False: theta_ARVIZ_CDS_SELECTION_0_0\n - add_group_info == True: theta_ARVIZ_GROUP_posterior__ARVIZ_CDS_SELECTION_0_0\n tuple:\n Structure:\n tuple: (dim_info, group_info)\n dim_info: (str: `.join` separator,\n str: dim_separator_start,\n str: dim_separator_end)\n group_info: (str: group separator start, str: group separator end)\n Example: ((\",\", \"[\", \"]\"), (\"_\", \"\"))\n - add_group_info == False: theta[0,0]\n - add_group_info == True: theta_posterior[0,0]\n index_origin : int, optional\n Start parameter indices from `index_origin`. Either 0 or 1.\n\n Returns\n -------\n bokeh.models.ColumnDataSource object\n \"\"\"\n from ...utils import flatten_inference_data_to_dict\n\n if var_name_format is None:\n var_name_format = \"cds\"\n\n cds_dict = flatten_inference_data_to_dict(\n data=data,\n var_names=var_names,\n groups=groups,\n dimensions=dimensions,\n group_info=group_info,\n index_origin=index_origin,\n var_name_format=var_name_format,\n )\n cds_data = ColumnDataSource(DataFrame.from_dict(cds_dict, orient=\"columns\"))\n return cds_data\n\n\ndef output_notebook(*args, **kwargs):\n \"\"\"Wrap bokeh.plotting.output_notebook.\"\"\"\n import bokeh.plotting as bkp\n\n return bkp.output_notebook(*args, **kwargs)\n\n\ndef output_file(*args, **kwargs):\n \"\"\"Wrap bokeh.plotting.output_file.\"\"\"\n import bokeh.plotting as bkp\n\n return bkp.output_file(*args, **kwargs)\n\n\ndef ColumnDataSource(*args, **kwargs):\n \"\"\"Wrap bokeh.models.ColumnDataSource.\"\"\"\n from bokeh.models import ColumnDataSource\n\n return ColumnDataSource(*args, **kwargs)\n\n\ndef create_layout(ax, force_layout=False):\n \"\"\"Transform bokeh array of figures to layout.\"\"\"\n ax = np.atleast_2d(ax)\n subplot_order = rcParams[\"plot.bokeh.layout.order\"]\n if force_layout:\n from bokeh.layouts import gridplot as layout\n\n ax = ax.tolist()\n layout_args = {\n \"sizing_mode\": rcParams[\"plot.bokeh.layout.sizing_mode\"],\n \"toolbar_location\": rcParams[\"plot.bokeh.layout.toolbar_location\"],\n }\n elif any(item in subplot_order for item in (\"row\", \"column\")):\n # check number of rows\n match = re.match(r\"(\\d*)(row|column)\", subplot_order)\n n = int(match.group(1)) if match.group(1) is not None else 1\n subplot_order = match.group(2)\n # set up 1D list of axes\n ax = [item for item in ax.ravel().tolist() if item is not None]\n layout_args = {\"sizing_mode\": rcParams[\"plot.bokeh.layout.sizing_mode\"]}\n if subplot_order == \"row\" and n == 1:\n from bokeh.layouts import row as layout\n elif subplot_order == \"column\" and n == 1:\n from bokeh.layouts import column as layout\n else:\n from bokeh.layouts import layout\n\n if n != 1:\n ax = np.array(ax + [None for _ in range(int(np.ceil(len(ax) / n)) - len(ax))])\n if subplot_order == \"row\":\n ax = ax.reshape(n, -1)\n else:\n ax = ax.reshape(-1, n)\n ax = ax.tolist()\n else:\n if subplot_order in (\"square\", \"square_trimmed\"):\n ax = [item for item in ax.ravel().tolist() if item is not None]\n n = int(np.ceil(len(ax) ** 0.5))\n ax = ax + [None for _ in range(n ** 2 - len(ax))]\n ax = np.array(ax).reshape(n, n)\n ax = ax.tolist()\n if (subplot_order == \"square_trimmed\") and any(\n all(item is None for item in row) for row in ax\n ):\n from bokeh.layouts import layout\n\n ax = [row for row in ax if not all(item is None for item in row)]\n layout_args = {\"sizing_mode\": rcParams[\"plot.bokeh.layout.sizing_mode\"]}\n else:\n from bokeh.layouts import gridplot as layout\n\n layout_args = {\n \"sizing_mode\": rcParams[\"plot.bokeh.layout.sizing_mode\"],\n \"toolbar_location\": rcParams[\"plot.bokeh.layout.toolbar_location\"],\n }\n # ignore \"fixed\" sizing_mode without explicit width and height\n if layout_args.get(\"sizing_mode\", \"\") == \"fixed\":\n layout_args.pop(\"sizing_mode\")\n return layout(ax, **layout_args)\n\n\ndef show_layout(ax, show=True, force_layout=False):\n \"\"\"Create a layout and call bokeh show.\"\"\"\n if show is None:\n show = rcParams[\"plot.bokeh.show\"]\n if show:\n import bokeh.plotting as bkp\n\n layout = create_layout(ax, force_layout=force_layout)\n bkp.show(layout)\n\n\ndef _copy_docstring(lib, function):\n \"\"\"Extract docstring from function.\"\"\"\n import importlib\n\n try:\n module = importlib.import_module(lib)\n func = getattr(module, function)\n doc = func.__doc__\n except ImportError:\n doc = \"Failed to import function {} from {}\".format(function, lib)\n\n if not isinstance(doc, str):\n doc = \"\"\n return doc\n\n\noutput_notebook.__doc__ += \"\\n\\n\" + _copy_docstring(\"bokeh.plotting\", \"output_notebook\")\noutput_file.__doc__ += \"\\n\\n\" + _copy_docstring(\"bokeh.plotting\", \"output_file\")\nColumnDataSource.__doc__ += \"\\n\\n\" + _copy_docstring(\"bokeh.models\", \"ColumnDataSource\")\n", "path": "arviz/plots/backends/__init__.py" } ]
diff --git a/CHANGELOG.md b/CHANGELOG.md index 33809b738d..269fa95967 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,7 @@ * Fixed bug in `plot_posterior` with rcParam "plot.matplotlib.show" = True (#1151) * Set `fill_last` argument of `plot_kde` to False by default (#1158) * plot_ppc animation: improve docs and error handling (#1162) +* Fix import error when wrapped function docstring is empty (#1192) ### Deprecation * `hpd` function deprecated in favor of `hdi`. `credible_interval` argument replaced by `hdi_prob`throughout with exception of `plot_loo_pit` (#1176) diff --git a/arviz/plots/backends/__init__.py b/arviz/plots/backends/__init__.py index 2ee57a34d6..8ae038933e 100644 --- a/arviz/plots/backends/__init__.py +++ b/arviz/plots/backends/__init__.py @@ -192,6 +192,8 @@ def _copy_docstring(lib, function): except ImportError: doc = "Failed to import function {} from {}".format(function, lib) + if not isinstance(doc, str): + doc = "" return doc
AUTOMATIC1111__stable-diffusion-webui-10635
[ { "content": "import base64\nimport io\nimport time\nimport datetime\nimport uvicorn\nimport gradio as gr\nfrom threading import Lock\nfrom io import BytesIO\nfrom fastapi import APIRouter, Depends, FastAPI, Request, Response\nfrom fastapi.security import HTTPBasic, HTTPBasicCredentials\nfrom fastapi.exceptions import HTTPException\nfrom fastapi.responses import JSONResponse\nfrom fastapi.encoders import jsonable_encoder\nfrom secrets import compare_digest\n\nimport modules.shared as shared\nfrom modules import sd_samplers, deepbooru, sd_hijack, images, scripts, ui, postprocessing\nfrom modules.api import models\nfrom modules.shared import opts\nfrom modules.processing import StableDiffusionProcessingTxt2Img, StableDiffusionProcessingImg2Img, process_images\nfrom modules.textual_inversion.textual_inversion import create_embedding, train_embedding\nfrom modules.textual_inversion.preprocess import preprocess\nfrom modules.hypernetworks.hypernetwork import create_hypernetwork, train_hypernetwork\nfrom PIL import PngImagePlugin,Image\nfrom modules.sd_models import checkpoints_list, unload_model_weights, reload_model_weights\nfrom modules.sd_models_config import find_checkpoint_config_near_filename\nfrom modules.realesrgan_model import get_realesrgan_models\nfrom modules import devices\nfrom typing import Dict, List, Any\nimport piexif\nimport piexif.helper\n\n\ndef upscaler_to_index(name: str):\n try:\n return [x.name.lower() for x in shared.sd_upscalers].index(name.lower())\n except Exception as e:\n raise HTTPException(status_code=400, detail=f\"Invalid upscaler, needs to be one of these: {' , '.join([x.name for x in shared.sd_upscalers])}\") from e\n\n\ndef script_name_to_index(name, scripts):\n try:\n return [script.title().lower() for script in scripts].index(name.lower())\n except Exception as e:\n raise HTTPException(status_code=422, detail=f\"Script '{name}' not found\") from e\n\n\ndef validate_sampler_name(name):\n config = sd_samplers.all_samplers_map.get(name, None)\n if config is None:\n raise HTTPException(status_code=404, detail=\"Sampler not found\")\n\n return name\n\n\ndef setUpscalers(req: dict):\n reqDict = vars(req)\n reqDict['extras_upscaler_1'] = reqDict.pop('upscaler_1', None)\n reqDict['extras_upscaler_2'] = reqDict.pop('upscaler_2', None)\n return reqDict\n\n\ndef decode_base64_to_image(encoding):\n if encoding.startswith(\"data:image/\"):\n encoding = encoding.split(\";\")[1].split(\",\")[1]\n try:\n image = Image.open(BytesIO(base64.b64decode(encoding)))\n return image\n except Exception as e:\n raise HTTPException(status_code=500, detail=\"Invalid encoded image\") from e\n\n\ndef encode_pil_to_base64(image):\n with io.BytesIO() as output_bytes:\n\n if opts.samples_format.lower() == 'png':\n use_metadata = False\n metadata = PngImagePlugin.PngInfo()\n for key, value in image.info.items():\n if isinstance(key, str) and isinstance(value, str):\n metadata.add_text(key, value)\n use_metadata = True\n image.save(output_bytes, format=\"PNG\", pnginfo=(metadata if use_metadata else None), quality=opts.jpeg_quality)\n\n elif opts.samples_format.lower() in (\"jpg\", \"jpeg\", \"webp\"):\n parameters = image.info.get('parameters', None)\n exif_bytes = piexif.dump({\n \"Exif\": { piexif.ExifIFD.UserComment: piexif.helper.UserComment.dump(parameters or \"\", encoding=\"unicode\") }\n })\n if opts.samples_format.lower() in (\"jpg\", \"jpeg\"):\n image.save(output_bytes, format=\"JPEG\", exif = exif_bytes, quality=opts.jpeg_quality)\n else:\n image.save(output_bytes, format=\"WEBP\", exif = exif_bytes, quality=opts.jpeg_quality)\n\n else:\n raise HTTPException(status_code=500, detail=\"Invalid image format\")\n\n bytes_data = output_bytes.getvalue()\n\n return base64.b64encode(bytes_data)\n\n\ndef api_middleware(app: FastAPI):\n rich_available = True\n try:\n import anyio # importing just so it can be placed on silent list\n import starlette # importing just so it can be placed on silent list\n from rich.console import Console\n console = Console()\n except Exception:\n import traceback\n rich_available = False\n\n @app.middleware(\"http\")\n async def log_and_time(req: Request, call_next):\n ts = time.time()\n res: Response = await call_next(req)\n duration = str(round(time.time() - ts, 4))\n res.headers[\"X-Process-Time\"] = duration\n endpoint = req.scope.get('path', 'err')\n if shared.cmd_opts.api_log and endpoint.startswith('/sdapi'):\n print('API {t} {code} {prot}/{ver} {method} {endpoint} {cli} {duration}'.format(\n t = datetime.datetime.now().strftime(\"%Y-%m-%d %H:%M:%S.%f\"),\n code = res.status_code,\n ver = req.scope.get('http_version', '0.0'),\n cli = req.scope.get('client', ('0:0.0.0', 0))[0],\n prot = req.scope.get('scheme', 'err'),\n method = req.scope.get('method', 'err'),\n endpoint = endpoint,\n duration = duration,\n ))\n return res\n\n def handle_exception(request: Request, e: Exception):\n err = {\n \"error\": type(e).__name__,\n \"detail\": vars(e).get('detail', ''),\n \"body\": vars(e).get('body', ''),\n \"errors\": str(e),\n }\n if not isinstance(e, HTTPException): # do not print backtrace on known httpexceptions\n print(f\"API error: {request.method}: {request.url} {err}\")\n if rich_available:\n console.print_exception(show_locals=True, max_frames=2, extra_lines=1, suppress=[anyio, starlette], word_wrap=False, width=min([console.width, 200]))\n else:\n traceback.print_exc()\n return JSONResponse(status_code=vars(e).get('status_code', 500), content=jsonable_encoder(err))\n\n @app.middleware(\"http\")\n async def exception_handling(request: Request, call_next):\n try:\n return await call_next(request)\n except Exception as e:\n return handle_exception(request, e)\n\n @app.exception_handler(Exception)\n async def fastapi_exception_handler(request: Request, e: Exception):\n return handle_exception(request, e)\n\n @app.exception_handler(HTTPException)\n async def http_exception_handler(request: Request, e: HTTPException):\n return handle_exception(request, e)\n\n\nclass Api:\n def __init__(self, app: FastAPI, queue_lock: Lock):\n if shared.cmd_opts.api_auth:\n self.credentials = {}\n for auth in shared.cmd_opts.api_auth.split(\",\"):\n user, password = auth.split(\":\")\n self.credentials[user] = password\n\n self.router = APIRouter()\n self.app = app\n self.queue_lock = queue_lock\n api_middleware(self.app)\n self.add_api_route(\"/sdapi/v1/txt2img\", self.text2imgapi, methods=[\"POST\"], response_model=models.TextToImageResponse)\n self.add_api_route(\"/sdapi/v1/img2img\", self.img2imgapi, methods=[\"POST\"], response_model=models.ImageToImageResponse)\n self.add_api_route(\"/sdapi/v1/extra-single-image\", self.extras_single_image_api, methods=[\"POST\"], response_model=models.ExtrasSingleImageResponse)\n self.add_api_route(\"/sdapi/v1/extra-batch-images\", self.extras_batch_images_api, methods=[\"POST\"], response_model=models.ExtrasBatchImagesResponse)\n self.add_api_route(\"/sdapi/v1/png-info\", self.pnginfoapi, methods=[\"POST\"], response_model=models.PNGInfoResponse)\n self.add_api_route(\"/sdapi/v1/progress\", self.progressapi, methods=[\"GET\"], response_model=models.ProgressResponse)\n self.add_api_route(\"/sdapi/v1/interrogate\", self.interrogateapi, methods=[\"POST\"])\n self.add_api_route(\"/sdapi/v1/interrupt\", self.interruptapi, methods=[\"POST\"])\n self.add_api_route(\"/sdapi/v1/skip\", self.skip, methods=[\"POST\"])\n self.add_api_route(\"/sdapi/v1/options\", self.get_config, methods=[\"GET\"], response_model=models.OptionsModel)\n self.add_api_route(\"/sdapi/v1/options\", self.set_config, methods=[\"POST\"])\n self.add_api_route(\"/sdapi/v1/cmd-flags\", self.get_cmd_flags, methods=[\"GET\"], response_model=models.FlagsModel)\n self.add_api_route(\"/sdapi/v1/samplers\", self.get_samplers, methods=[\"GET\"], response_model=List[models.SamplerItem])\n self.add_api_route(\"/sdapi/v1/upscalers\", self.get_upscalers, methods=[\"GET\"], response_model=List[models.UpscalerItem])\n self.add_api_route(\"/sdapi/v1/sd-models\", self.get_sd_models, methods=[\"GET\"], response_model=List[models.SDModelItem])\n self.add_api_route(\"/sdapi/v1/hypernetworks\", self.get_hypernetworks, methods=[\"GET\"], response_model=List[models.HypernetworkItem])\n self.add_api_route(\"/sdapi/v1/face-restorers\", self.get_face_restorers, methods=[\"GET\"], response_model=List[models.FaceRestorerItem])\n self.add_api_route(\"/sdapi/v1/realesrgan-models\", self.get_realesrgan_models, methods=[\"GET\"], response_model=List[models.RealesrganItem])\n self.add_api_route(\"/sdapi/v1/prompt-styles\", self.get_prompt_styles, methods=[\"GET\"], response_model=List[models.PromptStyleItem])\n self.add_api_route(\"/sdapi/v1/embeddings\", self.get_embeddings, methods=[\"GET\"], response_model=models.EmbeddingsResponse)\n self.add_api_route(\"/sdapi/v1/refresh-checkpoints\", self.refresh_checkpoints, methods=[\"POST\"])\n self.add_api_route(\"/sdapi/v1/create/embedding\", self.create_embedding, methods=[\"POST\"], response_model=models.CreateResponse)\n self.add_api_route(\"/sdapi/v1/create/hypernetwork\", self.create_hypernetwork, methods=[\"POST\"], response_model=models.CreateResponse)\n self.add_api_route(\"/sdapi/v1/preprocess\", self.preprocess, methods=[\"POST\"], response_model=models.PreprocessResponse)\n self.add_api_route(\"/sdapi/v1/train/embedding\", self.train_embedding, methods=[\"POST\"], response_model=models.TrainResponse)\n self.add_api_route(\"/sdapi/v1/train/hypernetwork\", self.train_hypernetwork, methods=[\"POST\"], response_model=models.TrainResponse)\n self.add_api_route(\"/sdapi/v1/memory\", self.get_memory, methods=[\"GET\"], response_model=models.MemoryResponse)\n self.add_api_route(\"/sdapi/v1/unload-checkpoint\", self.unloadapi, methods=[\"POST\"])\n self.add_api_route(\"/sdapi/v1/reload-checkpoint\", self.reloadapi, methods=[\"POST\"])\n self.add_api_route(\"/sdapi/v1/scripts\", self.get_scripts_list, methods=[\"GET\"], response_model=models.ScriptsList)\n self.add_api_route(\"/sdapi/v1/script-info\", self.get_script_info, methods=[\"GET\"], response_model=List[models.ScriptInfo])\n\n self.default_script_arg_txt2img = []\n self.default_script_arg_img2img = []\n\n def add_api_route(self, path: str, endpoint, **kwargs):\n if shared.cmd_opts.api_auth:\n return self.app.add_api_route(path, endpoint, dependencies=[Depends(self.auth)], **kwargs)\n return self.app.add_api_route(path, endpoint, **kwargs)\n\n def auth(self, credentials: HTTPBasicCredentials = Depends(HTTPBasic())):\n if credentials.username in self.credentials:\n if compare_digest(credentials.password, self.credentials[credentials.username]):\n return True\n\n raise HTTPException(status_code=401, detail=\"Incorrect username or password\", headers={\"WWW-Authenticate\": \"Basic\"})\n\n def get_selectable_script(self, script_name, script_runner):\n if script_name is None or script_name == \"\":\n return None, None\n\n script_idx = script_name_to_index(script_name, script_runner.selectable_scripts)\n script = script_runner.selectable_scripts[script_idx]\n return script, script_idx\n\n def get_scripts_list(self):\n t2ilist = [script.name for script in scripts.scripts_txt2img.scripts if script.name is not None]\n i2ilist = [script.name for script in scripts.scripts_img2img.scripts if script.name is not None]\n\n return models.ScriptsList(txt2img=t2ilist, img2img=i2ilist)\n\n def get_script_info(self):\n res = []\n\n for script_list in [scripts.scripts_txt2img.scripts, scripts.scripts_img2img.scripts]:\n res += [script.api_info for script in script_list if script.api_info is not None]\n\n return res\n\n def get_script(self, script_name, script_runner):\n if script_name is None or script_name == \"\":\n return None, None\n\n script_idx = script_name_to_index(script_name, script_runner.scripts)\n return script_runner.scripts[script_idx]\n\n def init_default_script_args(self, script_runner):\n #find max idx from the scripts in runner and generate a none array to init script_args\n last_arg_index = 1\n for script in script_runner.scripts:\n if last_arg_index < script.args_to:\n last_arg_index = script.args_to\n # None everywhere except position 0 to initialize script args\n script_args = [None]*last_arg_index\n script_args[0] = 0\n\n # get default values\n with gr.Blocks(): # will throw errors calling ui function without this\n for script in script_runner.scripts:\n if script.ui(script.is_img2img):\n ui_default_values = []\n for elem in script.ui(script.is_img2img):\n ui_default_values.append(elem.value)\n script_args[script.args_from:script.args_to] = ui_default_values\n return script_args\n\n def init_script_args(self, request, default_script_args, selectable_scripts, selectable_idx, script_runner):\n script_args = default_script_args.copy()\n # position 0 in script_arg is the idx+1 of the selectable script that is going to be run when using scripts.scripts_*2img.run()\n if selectable_scripts:\n script_args[selectable_scripts.args_from:selectable_scripts.args_to] = request.script_args\n script_args[0] = selectable_idx + 1\n\n # Now check for always on scripts\n if request.alwayson_scripts and (len(request.alwayson_scripts) > 0):\n for alwayson_script_name in request.alwayson_scripts.keys():\n alwayson_script = self.get_script(alwayson_script_name, script_runner)\n if alwayson_script is None:\n raise HTTPException(status_code=422, detail=f\"always on script {alwayson_script_name} not found\")\n # Selectable script in always on script param check\n if alwayson_script.alwayson is False:\n raise HTTPException(status_code=422, detail=\"Cannot have a selectable script in the always on scripts params\")\n # always on script with no arg should always run so you don't really need to add them to the requests\n if \"args\" in request.alwayson_scripts[alwayson_script_name]:\n # min between arg length in scriptrunner and arg length in the request\n for idx in range(0, min((alwayson_script.args_to - alwayson_script.args_from), len(request.alwayson_scripts[alwayson_script_name][\"args\"]))):\n script_args[alwayson_script.args_from + idx] = request.alwayson_scripts[alwayson_script_name][\"args\"][idx]\n return script_args\n\n def text2imgapi(self, txt2imgreq: models.StableDiffusionTxt2ImgProcessingAPI):\n script_runner = scripts.scripts_txt2img\n if not script_runner.scripts:\n script_runner.initialize_scripts(False)\n ui.create_ui()\n if not self.default_script_arg_txt2img:\n self.default_script_arg_txt2img = self.init_default_script_args(script_runner)\n selectable_scripts, selectable_script_idx = self.get_selectable_script(txt2imgreq.script_name, script_runner)\n\n populate = txt2imgreq.copy(update={ # Override __init__ params\n \"sampler_name\": validate_sampler_name(txt2imgreq.sampler_name or txt2imgreq.sampler_index),\n \"do_not_save_samples\": not txt2imgreq.save_images,\n \"do_not_save_grid\": not txt2imgreq.save_images,\n })\n if populate.sampler_name:\n populate.sampler_index = None # prevent a warning later on\n\n args = vars(populate)\n args.pop('script_name', None)\n args.pop('script_args', None) # will refeed them to the pipeline directly after initializing them\n args.pop('alwayson_scripts', None)\n\n script_args = self.init_script_args(txt2imgreq, self.default_script_arg_txt2img, selectable_scripts, selectable_script_idx, script_runner)\n\n send_images = args.pop('send_images', True)\n args.pop('save_images', None)\n\n with self.queue_lock:\n p = StableDiffusionProcessingTxt2Img(sd_model=shared.sd_model, **args)\n p.scripts = script_runner\n p.outpath_grids = opts.outdir_txt2img_grids\n p.outpath_samples = opts.outdir_txt2img_samples\n\n shared.state.begin()\n if selectable_scripts is not None:\n p.script_args = script_args\n processed = scripts.scripts_txt2img.run(p, *p.script_args) # Need to pass args as list here\n else:\n p.script_args = tuple(script_args) # Need to pass args as tuple here\n processed = process_images(p)\n shared.state.end()\n\n b64images = list(map(encode_pil_to_base64, processed.images)) if send_images else []\n\n return models.TextToImageResponse(images=b64images, parameters=vars(txt2imgreq), info=processed.js())\n\n def img2imgapi(self, img2imgreq: models.StableDiffusionImg2ImgProcessingAPI):\n init_images = img2imgreq.init_images\n if init_images is None:\n raise HTTPException(status_code=404, detail=\"Init image not found\")\n\n mask = img2imgreq.mask\n if mask:\n mask = decode_base64_to_image(mask)\n\n script_runner = scripts.scripts_img2img\n if not script_runner.scripts:\n script_runner.initialize_scripts(True)\n ui.create_ui()\n if not self.default_script_arg_img2img:\n self.default_script_arg_img2img = self.init_default_script_args(script_runner)\n selectable_scripts, selectable_script_idx = self.get_selectable_script(img2imgreq.script_name, script_runner)\n\n populate = img2imgreq.copy(update={ # Override __init__ params\n \"sampler_name\": validate_sampler_name(img2imgreq.sampler_name or img2imgreq.sampler_index),\n \"do_not_save_samples\": not img2imgreq.save_images,\n \"do_not_save_grid\": not img2imgreq.save_images,\n \"mask\": mask,\n })\n if populate.sampler_name:\n populate.sampler_index = None # prevent a warning later on\n\n args = vars(populate)\n args.pop('include_init_images', None) # this is meant to be done by \"exclude\": True in model, but it's for a reason that I cannot determine.\n args.pop('script_name', None)\n args.pop('script_args', None) # will refeed them to the pipeline directly after initializing them\n args.pop('alwayson_scripts', None)\n\n script_args = self.init_script_args(img2imgreq, self.default_script_arg_img2img, selectable_scripts, selectable_script_idx, script_runner)\n\n send_images = args.pop('send_images', True)\n args.pop('save_images', None)\n\n with self.queue_lock:\n p = StableDiffusionProcessingImg2Img(sd_model=shared.sd_model, **args)\n p.init_images = [decode_base64_to_image(x) for x in init_images]\n p.scripts = script_runner\n p.outpath_grids = opts.outdir_img2img_grids\n p.outpath_samples = opts.outdir_img2img_samples\n\n shared.state.begin()\n if selectable_scripts is not None:\n p.script_args = script_args\n processed = scripts.scripts_img2img.run(p, *p.script_args) # Need to pass args as list here\n else:\n p.script_args = tuple(script_args) # Need to pass args as tuple here\n processed = process_images(p)\n shared.state.end()\n\n b64images = list(map(encode_pil_to_base64, processed.images)) if send_images else []\n\n if not img2imgreq.include_init_images:\n img2imgreq.init_images = None\n img2imgreq.mask = None\n\n return models.ImageToImageResponse(images=b64images, parameters=vars(img2imgreq), info=processed.js())\n\n def extras_single_image_api(self, req: models.ExtrasSingleImageRequest):\n reqDict = setUpscalers(req)\n\n reqDict['image'] = decode_base64_to_image(reqDict['image'])\n\n with self.queue_lock:\n result = postprocessing.run_extras(extras_mode=0, image_folder=\"\", input_dir=\"\", output_dir=\"\", save_output=False, **reqDict)\n\n return models.ExtrasSingleImageResponse(image=encode_pil_to_base64(result[0][0]), html_info=result[1])\n\n def extras_batch_images_api(self, req: models.ExtrasBatchImagesRequest):\n reqDict = setUpscalers(req)\n\n image_list = reqDict.pop('imageList', [])\n image_folder = [decode_base64_to_image(x.data) for x in image_list]\n\n with self.queue_lock:\n result = postprocessing.run_extras(extras_mode=1, image_folder=image_folder, image=\"\", input_dir=\"\", output_dir=\"\", save_output=False, **reqDict)\n\n return models.ExtrasBatchImagesResponse(images=list(map(encode_pil_to_base64, result[0])), html_info=result[1])\n\n def pnginfoapi(self, req: models.PNGInfoRequest):\n if(not req.image.strip()):\n return models.PNGInfoResponse(info=\"\")\n\n image = decode_base64_to_image(req.image.strip())\n if image is None:\n return models.PNGInfoResponse(info=\"\")\n\n geninfo, items = images.read_info_from_image(image)\n if geninfo is None:\n geninfo = \"\"\n\n items = {**{'parameters': geninfo}, **items}\n\n return models.PNGInfoResponse(info=geninfo, items=items)\n\n def progressapi(self, req: models.ProgressRequest = Depends()):\n # copy from check_progress_call of ui.py\n\n if shared.state.job_count == 0:\n return models.ProgressResponse(progress=0, eta_relative=0, state=shared.state.dict(), textinfo=shared.state.textinfo)\n\n # avoid dividing zero\n progress = 0.01\n\n if shared.state.job_count > 0:\n progress += shared.state.job_no / shared.state.job_count\n if shared.state.sampling_steps > 0:\n progress += 1 / shared.state.job_count * shared.state.sampling_step / shared.state.sampling_steps\n\n time_since_start = time.time() - shared.state.time_start\n eta = (time_since_start/progress)\n eta_relative = eta-time_since_start\n\n progress = min(progress, 1)\n\n shared.state.set_current_image()\n\n current_image = None\n if shared.state.current_image and not req.skip_current_image:\n current_image = encode_pil_to_base64(shared.state.current_image)\n\n return models.ProgressResponse(progress=progress, eta_relative=eta_relative, state=shared.state.dict(), current_image=current_image, textinfo=shared.state.textinfo)\n\n def interrogateapi(self, interrogatereq: models.InterrogateRequest):\n image_b64 = interrogatereq.image\n if image_b64 is None:\n raise HTTPException(status_code=404, detail=\"Image not found\")\n\n img = decode_base64_to_image(image_b64)\n img = img.convert('RGB')\n\n # Override object param\n with self.queue_lock:\n if interrogatereq.model == \"clip\":\n processed = shared.interrogator.interrogate(img)\n elif interrogatereq.model == \"deepdanbooru\":\n processed = deepbooru.model.tag(img)\n else:\n raise HTTPException(status_code=404, detail=\"Model not found\")\n\n return models.InterrogateResponse(caption=processed)\n\n def interruptapi(self):\n shared.state.interrupt()\n\n return {}\n\n def unloadapi(self):\n unload_model_weights()\n\n return {}\n\n def reloadapi(self):\n reload_model_weights()\n\n return {}\n\n def skip(self):\n shared.state.skip()\n\n def get_config(self):\n options = {}\n for key in shared.opts.data.keys():\n metadata = shared.opts.data_labels.get(key)\n if(metadata is not None):\n options.update({key: shared.opts.data.get(key, shared.opts.data_labels.get(key).default)})\n else:\n options.update({key: shared.opts.data.get(key, None)})\n\n return options\n\n def set_config(self, req: Dict[str, Any]):\n for k, v in req.items():\n shared.opts.set(k, v)\n\n shared.opts.save(shared.config_filename)\n return\n\n def get_cmd_flags(self):\n return vars(shared.cmd_opts)\n\n def get_samplers(self):\n return [{\"name\": sampler[0], \"aliases\":sampler[2], \"options\":sampler[3]} for sampler in sd_samplers.all_samplers]\n\n def get_upscalers(self):\n return [\n {\n \"name\": upscaler.name,\n \"model_name\": upscaler.scaler.model_name,\n \"model_path\": upscaler.data_path,\n \"model_url\": None,\n \"scale\": upscaler.scale,\n }\n for upscaler in shared.sd_upscalers\n ]\n\n def get_sd_models(self):\n return [{\"title\": x.title, \"model_name\": x.model_name, \"hash\": x.shorthash, \"sha256\": x.sha256, \"filename\": x.filename, \"config\": find_checkpoint_config_near_filename(x)} for x in checkpoints_list.values()]\n\n def get_hypernetworks(self):\n return [{\"name\": name, \"path\": shared.hypernetworks[name]} for name in shared.hypernetworks]\n\n def get_face_restorers(self):\n return [{\"name\":x.name(), \"cmd_dir\": getattr(x, \"cmd_dir\", None)} for x in shared.face_restorers]\n\n def get_realesrgan_models(self):\n return [{\"name\":x.name,\"path\":x.data_path, \"scale\":x.scale} for x in get_realesrgan_models(None)]\n\n def get_prompt_styles(self):\n styleList = []\n for k in shared.prompt_styles.styles:\n style = shared.prompt_styles.styles[k]\n styleList.append({\"name\":style[0], \"prompt\": style[1], \"negative_prompt\": style[2]})\n\n return styleList\n\n def get_embeddings(self):\n db = sd_hijack.model_hijack.embedding_db\n\n def convert_embedding(embedding):\n return {\n \"step\": embedding.step,\n \"sd_checkpoint\": embedding.sd_checkpoint,\n \"sd_checkpoint_name\": embedding.sd_checkpoint_name,\n \"shape\": embedding.shape,\n \"vectors\": embedding.vectors,\n }\n\n def convert_embeddings(embeddings):\n return {embedding.name: convert_embedding(embedding) for embedding in embeddings.values()}\n\n return {\n \"loaded\": convert_embeddings(db.word_embeddings),\n \"skipped\": convert_embeddings(db.skipped_embeddings),\n }\n\n def refresh_checkpoints(self):\n shared.refresh_checkpoints()\n\n def create_embedding(self, args: dict):\n try:\n shared.state.begin()\n filename = create_embedding(**args) # create empty embedding\n sd_hijack.model_hijack.embedding_db.load_textual_inversion_embeddings() # reload embeddings so new one can be immediately used\n shared.state.end()\n return models.CreateResponse(info=f\"create embedding filename: {filename}\")\n except AssertionError as e:\n shared.state.end()\n return models.TrainResponse(info=f\"create embedding error: {e}\")\n\n def create_hypernetwork(self, args: dict):\n try:\n shared.state.begin()\n filename = create_hypernetwork(**args) # create empty embedding\n shared.state.end()\n return models.CreateResponse(info=f\"create hypernetwork filename: {filename}\")\n except AssertionError as e:\n shared.state.end()\n return models.TrainResponse(info=f\"create hypernetwork error: {e}\")\n\n def preprocess(self, args: dict):\n try:\n shared.state.begin()\n preprocess(**args) # quick operation unless blip/booru interrogation is enabled\n shared.state.end()\n return models.PreprocessResponse(info = 'preprocess complete')\n except KeyError as e:\n shared.state.end()\n return models.PreprocessResponse(info=f\"preprocess error: invalid token: {e}\")\n except AssertionError as e:\n shared.state.end()\n return models.PreprocessResponse(info=f\"preprocess error: {e}\")\n except FileNotFoundError as e:\n shared.state.end()\n return models.PreprocessResponse(info=f'preprocess error: {e}')\n\n def train_embedding(self, args: dict):\n try:\n shared.state.begin()\n apply_optimizations = shared.opts.training_xattention_optimizations\n error = None\n filename = ''\n if not apply_optimizations:\n sd_hijack.undo_optimizations()\n try:\n embedding, filename = train_embedding(**args) # can take a long time to complete\n except Exception as e:\n error = e\n finally:\n if not apply_optimizations:\n sd_hijack.apply_optimizations()\n shared.state.end()\n return models.TrainResponse(info=f\"train embedding complete: filename: {filename} error: {error}\")\n except AssertionError as msg:\n shared.state.end()\n return models.TrainResponse(info=f\"train embedding error: {msg}\")\n\n def train_hypernetwork(self, args: dict):\n try:\n shared.state.begin()\n shared.loaded_hypernetworks = []\n apply_optimizations = shared.opts.training_xattention_optimizations\n error = None\n filename = ''\n if not apply_optimizations:\n sd_hijack.undo_optimizations()\n try:\n hypernetwork, filename = train_hypernetwork(**args)\n except Exception as e:\n error = e\n finally:\n shared.sd_model.cond_stage_model.to(devices.device)\n shared.sd_model.first_stage_model.to(devices.device)\n if not apply_optimizations:\n sd_hijack.apply_optimizations()\n shared.state.end()\n return models.TrainResponse(info=f\"train embedding complete: filename: {filename} error: {error}\")\n except AssertionError:\n shared.state.end()\n return models.TrainResponse(info=f\"train embedding error: {error}\")\n\n def get_memory(self):\n try:\n import os\n import psutil\n process = psutil.Process(os.getpid())\n res = process.memory_info() # only rss is cross-platform guaranteed so we dont rely on other values\n ram_total = 100 * res.rss / process.memory_percent() # and total memory is calculated as actual value is not cross-platform safe\n ram = { 'free': ram_total - res.rss, 'used': res.rss, 'total': ram_total }\n except Exception as err:\n ram = { 'error': f'{err}' }\n try:\n import torch\n if torch.cuda.is_available():\n s = torch.cuda.mem_get_info()\n system = { 'free': s[0], 'used': s[1] - s[0], 'total': s[1] }\n s = dict(torch.cuda.memory_stats(shared.device))\n allocated = { 'current': s['allocated_bytes.all.current'], 'peak': s['allocated_bytes.all.peak'] }\n reserved = { 'current': s['reserved_bytes.all.current'], 'peak': s['reserved_bytes.all.peak'] }\n active = { 'current': s['active_bytes.all.current'], 'peak': s['active_bytes.all.peak'] }\n inactive = { 'current': s['inactive_split_bytes.all.current'], 'peak': s['inactive_split_bytes.all.peak'] }\n warnings = { 'retries': s['num_alloc_retries'], 'oom': s['num_ooms'] }\n cuda = {\n 'system': system,\n 'active': active,\n 'allocated': allocated,\n 'reserved': reserved,\n 'inactive': inactive,\n 'events': warnings,\n }\n else:\n cuda = {'error': 'unavailable'}\n except Exception as err:\n cuda = {'error': f'{err}'}\n return models.MemoryResponse(ram=ram, cuda=cuda)\n\n def launch(self, server_name, port):\n self.app.include_router(self.router)\n uvicorn.run(self.app, host=server_name, port=port)\n", "path": "modules/api/api.py" } ]
[ { "content": "import base64\nimport io\nimport time\nimport datetime\nimport uvicorn\nimport gradio as gr\nfrom threading import Lock\nfrom io import BytesIO\nfrom fastapi import APIRouter, Depends, FastAPI, Request, Response\nfrom fastapi.security import HTTPBasic, HTTPBasicCredentials\nfrom fastapi.exceptions import HTTPException\nfrom fastapi.responses import JSONResponse\nfrom fastapi.encoders import jsonable_encoder\nfrom secrets import compare_digest\n\nimport modules.shared as shared\nfrom modules import sd_samplers, deepbooru, sd_hijack, images, scripts, ui, postprocessing\nfrom modules.api.models import *\nfrom modules.processing import StableDiffusionProcessingTxt2Img, StableDiffusionProcessingImg2Img, process_images\nfrom modules.textual_inversion.textual_inversion import create_embedding, train_embedding\nfrom modules.textual_inversion.preprocess import preprocess\nfrom modules.hypernetworks.hypernetwork import create_hypernetwork, train_hypernetwork\nfrom PIL import PngImagePlugin,Image\nfrom modules.sd_models import checkpoints_list, unload_model_weights, reload_model_weights\nfrom modules.sd_models_config import find_checkpoint_config_near_filename\nfrom modules.realesrgan_model import get_realesrgan_models\nfrom modules import devices\nfrom typing import List\nimport piexif\nimport piexif.helper\n\ndef upscaler_to_index(name: str):\n try:\n return [x.name.lower() for x in shared.sd_upscalers].index(name.lower())\n except:\n raise HTTPException(status_code=400, detail=f\"Invalid upscaler, needs to be one of these: {' , '.join([x.name for x in sd_upscalers])}\")\n\ndef script_name_to_index(name, scripts):\n try:\n return [script.title().lower() for script in scripts].index(name.lower())\n except:\n raise HTTPException(status_code=422, detail=f\"Script '{name}' not found\")\n\ndef validate_sampler_name(name):\n config = sd_samplers.all_samplers_map.get(name, None)\n if config is None:\n raise HTTPException(status_code=404, detail=\"Sampler not found\")\n\n return name\n\ndef setUpscalers(req: dict):\n reqDict = vars(req)\n reqDict['extras_upscaler_1'] = reqDict.pop('upscaler_1', None)\n reqDict['extras_upscaler_2'] = reqDict.pop('upscaler_2', None)\n return reqDict\n\ndef decode_base64_to_image(encoding):\n if encoding.startswith(\"data:image/\"):\n encoding = encoding.split(\";\")[1].split(\",\")[1]\n try:\n image = Image.open(BytesIO(base64.b64decode(encoding)))\n return image\n except Exception as err:\n raise HTTPException(status_code=500, detail=\"Invalid encoded image\")\n\ndef encode_pil_to_base64(image):\n with io.BytesIO() as output_bytes:\n\n if opts.samples_format.lower() == 'png':\n use_metadata = False\n metadata = PngImagePlugin.PngInfo()\n for key, value in image.info.items():\n if isinstance(key, str) and isinstance(value, str):\n metadata.add_text(key, value)\n use_metadata = True\n image.save(output_bytes, format=\"PNG\", pnginfo=(metadata if use_metadata else None), quality=opts.jpeg_quality)\n\n elif opts.samples_format.lower() in (\"jpg\", \"jpeg\", \"webp\"):\n parameters = image.info.get('parameters', None)\n exif_bytes = piexif.dump({\n \"Exif\": { piexif.ExifIFD.UserComment: piexif.helper.UserComment.dump(parameters or \"\", encoding=\"unicode\") }\n })\n if opts.samples_format.lower() in (\"jpg\", \"jpeg\"):\n image.save(output_bytes, format=\"JPEG\", exif = exif_bytes, quality=opts.jpeg_quality)\n else:\n image.save(output_bytes, format=\"WEBP\", exif = exif_bytes, quality=opts.jpeg_quality)\n\n else:\n raise HTTPException(status_code=500, detail=\"Invalid image format\")\n\n bytes_data = output_bytes.getvalue()\n\n return base64.b64encode(bytes_data)\n\ndef api_middleware(app: FastAPI):\n rich_available = True\n try:\n import anyio # importing just so it can be placed on silent list\n import starlette # importing just so it can be placed on silent list\n from rich.console import Console\n console = Console()\n except:\n import traceback\n rich_available = False\n\n @app.middleware(\"http\")\n async def log_and_time(req: Request, call_next):\n ts = time.time()\n res: Response = await call_next(req)\n duration = str(round(time.time() - ts, 4))\n res.headers[\"X-Process-Time\"] = duration\n endpoint = req.scope.get('path', 'err')\n if shared.cmd_opts.api_log and endpoint.startswith('/sdapi'):\n print('API {t} {code} {prot}/{ver} {method} {endpoint} {cli} {duration}'.format(\n t = datetime.datetime.now().strftime(\"%Y-%m-%d %H:%M:%S.%f\"),\n code = res.status_code,\n ver = req.scope.get('http_version', '0.0'),\n cli = req.scope.get('client', ('0:0.0.0', 0))[0],\n prot = req.scope.get('scheme', 'err'),\n method = req.scope.get('method', 'err'),\n endpoint = endpoint,\n duration = duration,\n ))\n return res\n\n def handle_exception(request: Request, e: Exception):\n err = {\n \"error\": type(e).__name__,\n \"detail\": vars(e).get('detail', ''),\n \"body\": vars(e).get('body', ''),\n \"errors\": str(e),\n }\n if not isinstance(e, HTTPException): # do not print backtrace on known httpexceptions\n print(f\"API error: {request.method}: {request.url} {err}\")\n if rich_available:\n console.print_exception(show_locals=True, max_frames=2, extra_lines=1, suppress=[anyio, starlette], word_wrap=False, width=min([console.width, 200]))\n else:\n traceback.print_exc()\n return JSONResponse(status_code=vars(e).get('status_code', 500), content=jsonable_encoder(err))\n\n @app.middleware(\"http\")\n async def exception_handling(request: Request, call_next):\n try:\n return await call_next(request)\n except Exception as e:\n return handle_exception(request, e)\n\n @app.exception_handler(Exception)\n async def fastapi_exception_handler(request: Request, e: Exception):\n return handle_exception(request, e)\n\n @app.exception_handler(HTTPException)\n async def http_exception_handler(request: Request, e: HTTPException):\n return handle_exception(request, e)\n\n\nclass Api:\n def __init__(self, app: FastAPI, queue_lock: Lock):\n if shared.cmd_opts.api_auth:\n self.credentials = dict()\n for auth in shared.cmd_opts.api_auth.split(\",\"):\n user, password = auth.split(\":\")\n self.credentials[user] = password\n\n self.router = APIRouter()\n self.app = app\n self.queue_lock = queue_lock\n api_middleware(self.app)\n self.add_api_route(\"/sdapi/v1/txt2img\", self.text2imgapi, methods=[\"POST\"], response_model=TextToImageResponse)\n self.add_api_route(\"/sdapi/v1/img2img\", self.img2imgapi, methods=[\"POST\"], response_model=ImageToImageResponse)\n self.add_api_route(\"/sdapi/v1/extra-single-image\", self.extras_single_image_api, methods=[\"POST\"], response_model=ExtrasSingleImageResponse)\n self.add_api_route(\"/sdapi/v1/extra-batch-images\", self.extras_batch_images_api, methods=[\"POST\"], response_model=ExtrasBatchImagesResponse)\n self.add_api_route(\"/sdapi/v1/png-info\", self.pnginfoapi, methods=[\"POST\"], response_model=PNGInfoResponse)\n self.add_api_route(\"/sdapi/v1/progress\", self.progressapi, methods=[\"GET\"], response_model=ProgressResponse)\n self.add_api_route(\"/sdapi/v1/interrogate\", self.interrogateapi, methods=[\"POST\"])\n self.add_api_route(\"/sdapi/v1/interrupt\", self.interruptapi, methods=[\"POST\"])\n self.add_api_route(\"/sdapi/v1/skip\", self.skip, methods=[\"POST\"])\n self.add_api_route(\"/sdapi/v1/options\", self.get_config, methods=[\"GET\"], response_model=OptionsModel)\n self.add_api_route(\"/sdapi/v1/options\", self.set_config, methods=[\"POST\"])\n self.add_api_route(\"/sdapi/v1/cmd-flags\", self.get_cmd_flags, methods=[\"GET\"], response_model=FlagsModel)\n self.add_api_route(\"/sdapi/v1/samplers\", self.get_samplers, methods=[\"GET\"], response_model=List[SamplerItem])\n self.add_api_route(\"/sdapi/v1/upscalers\", self.get_upscalers, methods=[\"GET\"], response_model=List[UpscalerItem])\n self.add_api_route(\"/sdapi/v1/sd-models\", self.get_sd_models, methods=[\"GET\"], response_model=List[SDModelItem])\n self.add_api_route(\"/sdapi/v1/hypernetworks\", self.get_hypernetworks, methods=[\"GET\"], response_model=List[HypernetworkItem])\n self.add_api_route(\"/sdapi/v1/face-restorers\", self.get_face_restorers, methods=[\"GET\"], response_model=List[FaceRestorerItem])\n self.add_api_route(\"/sdapi/v1/realesrgan-models\", self.get_realesrgan_models, methods=[\"GET\"], response_model=List[RealesrganItem])\n self.add_api_route(\"/sdapi/v1/prompt-styles\", self.get_prompt_styles, methods=[\"GET\"], response_model=List[PromptStyleItem])\n self.add_api_route(\"/sdapi/v1/embeddings\", self.get_embeddings, methods=[\"GET\"], response_model=EmbeddingsResponse)\n self.add_api_route(\"/sdapi/v1/refresh-checkpoints\", self.refresh_checkpoints, methods=[\"POST\"])\n self.add_api_route(\"/sdapi/v1/create/embedding\", self.create_embedding, methods=[\"POST\"], response_model=CreateResponse)\n self.add_api_route(\"/sdapi/v1/create/hypernetwork\", self.create_hypernetwork, methods=[\"POST\"], response_model=CreateResponse)\n self.add_api_route(\"/sdapi/v1/preprocess\", self.preprocess, methods=[\"POST\"], response_model=PreprocessResponse)\n self.add_api_route(\"/sdapi/v1/train/embedding\", self.train_embedding, methods=[\"POST\"], response_model=TrainResponse)\n self.add_api_route(\"/sdapi/v1/train/hypernetwork\", self.train_hypernetwork, methods=[\"POST\"], response_model=TrainResponse)\n self.add_api_route(\"/sdapi/v1/memory\", self.get_memory, methods=[\"GET\"], response_model=MemoryResponse)\n self.add_api_route(\"/sdapi/v1/unload-checkpoint\", self.unloadapi, methods=[\"POST\"])\n self.add_api_route(\"/sdapi/v1/reload-checkpoint\", self.reloadapi, methods=[\"POST\"])\n self.add_api_route(\"/sdapi/v1/scripts\", self.get_scripts_list, methods=[\"GET\"], response_model=ScriptsList)\n\n self.default_script_arg_txt2img = []\n self.default_script_arg_img2img = []\n\n def add_api_route(self, path: str, endpoint, **kwargs):\n if shared.cmd_opts.api_auth:\n return self.app.add_api_route(path, endpoint, dependencies=[Depends(self.auth)], **kwargs)\n return self.app.add_api_route(path, endpoint, **kwargs)\n\n def auth(self, credentials: HTTPBasicCredentials = Depends(HTTPBasic())):\n if credentials.username in self.credentials:\n if compare_digest(credentials.password, self.credentials[credentials.username]):\n return True\n\n raise HTTPException(status_code=401, detail=\"Incorrect username or password\", headers={\"WWW-Authenticate\": \"Basic\"})\n\n def get_selectable_script(self, script_name, script_runner):\n if script_name is None or script_name == \"\":\n return None, None\n\n script_idx = script_name_to_index(script_name, script_runner.selectable_scripts)\n script = script_runner.selectable_scripts[script_idx]\n return script, script_idx\n \n def get_scripts_list(self):\n t2ilist = [str(title.lower()) for title in scripts.scripts_txt2img.titles]\n i2ilist = [str(title.lower()) for title in scripts.scripts_img2img.titles]\n\n return ScriptsList(txt2img = t2ilist, img2img = i2ilist) \n\n def get_script(self, script_name, script_runner):\n if script_name is None or script_name == \"\":\n return None, None\n \n script_idx = script_name_to_index(script_name, script_runner.scripts)\n return script_runner.scripts[script_idx]\n\n def init_default_script_args(self, script_runner):\n #find max idx from the scripts in runner and generate a none array to init script_args\n last_arg_index = 1\n for script in script_runner.scripts:\n if last_arg_index < script.args_to:\n last_arg_index = script.args_to\n # None everywhere except position 0 to initialize script args\n script_args = [None]*last_arg_index\n script_args[0] = 0\n\n # get default values\n with gr.Blocks(): # will throw errors calling ui function without this\n for script in script_runner.scripts:\n if script.ui(script.is_img2img):\n ui_default_values = []\n for elem in script.ui(script.is_img2img):\n ui_default_values.append(elem.value)\n script_args[script.args_from:script.args_to] = ui_default_values\n return script_args\n\n def init_script_args(self, request, default_script_args, selectable_scripts, selectable_idx, script_runner):\n script_args = default_script_args.copy()\n # position 0 in script_arg is the idx+1 of the selectable script that is going to be run when using scripts.scripts_*2img.run()\n if selectable_scripts:\n script_args[selectable_scripts.args_from:selectable_scripts.args_to] = request.script_args\n script_args[0] = selectable_idx + 1\n\n # Now check for always on scripts\n if request.alwayson_scripts and (len(request.alwayson_scripts) > 0):\n for alwayson_script_name in request.alwayson_scripts.keys():\n alwayson_script = self.get_script(alwayson_script_name, script_runner)\n if alwayson_script == None:\n raise HTTPException(status_code=422, detail=f\"always on script {alwayson_script_name} not found\")\n # Selectable script in always on script param check\n if alwayson_script.alwayson == False:\n raise HTTPException(status_code=422, detail=f\"Cannot have a selectable script in the always on scripts params\")\n # always on script with no arg should always run so you don't really need to add them to the requests\n if \"args\" in request.alwayson_scripts[alwayson_script_name]:\n # min between arg length in scriptrunner and arg length in the request\n for idx in range(0, min((alwayson_script.args_to - alwayson_script.args_from), len(request.alwayson_scripts[alwayson_script_name][\"args\"]))):\n script_args[alwayson_script.args_from + idx] = request.alwayson_scripts[alwayson_script_name][\"args\"][idx]\n return script_args\n\n def text2imgapi(self, txt2imgreq: StableDiffusionTxt2ImgProcessingAPI):\n script_runner = scripts.scripts_txt2img\n if not script_runner.scripts:\n script_runner.initialize_scripts(False)\n ui.create_ui()\n if not self.default_script_arg_txt2img:\n self.default_script_arg_txt2img = self.init_default_script_args(script_runner)\n selectable_scripts, selectable_script_idx = self.get_selectable_script(txt2imgreq.script_name, script_runner)\n\n populate = txt2imgreq.copy(update={ # Override __init__ params\n \"sampler_name\": validate_sampler_name(txt2imgreq.sampler_name or txt2imgreq.sampler_index),\n \"do_not_save_samples\": not txt2imgreq.save_images,\n \"do_not_save_grid\": not txt2imgreq.save_images,\n })\n if populate.sampler_name:\n populate.sampler_index = None # prevent a warning later on\n\n args = vars(populate)\n args.pop('script_name', None)\n args.pop('script_args', None) # will refeed them to the pipeline directly after initializing them\n args.pop('alwayson_scripts', None)\n\n script_args = self.init_script_args(txt2imgreq, self.default_script_arg_txt2img, selectable_scripts, selectable_script_idx, script_runner)\n\n send_images = args.pop('send_images', True)\n args.pop('save_images', None)\n\n with self.queue_lock:\n p = StableDiffusionProcessingTxt2Img(sd_model=shared.sd_model, **args)\n p.scripts = script_runner\n p.outpath_grids = opts.outdir_txt2img_grids\n p.outpath_samples = opts.outdir_txt2img_samples\n\n shared.state.begin()\n if selectable_scripts != None:\n p.script_args = script_args\n processed = scripts.scripts_txt2img.run(p, *p.script_args) # Need to pass args as list here\n else:\n p.script_args = tuple(script_args) # Need to pass args as tuple here\n processed = process_images(p)\n shared.state.end()\n\n b64images = list(map(encode_pil_to_base64, processed.images)) if send_images else []\n\n return TextToImageResponse(images=b64images, parameters=vars(txt2imgreq), info=processed.js())\n\n def img2imgapi(self, img2imgreq: StableDiffusionImg2ImgProcessingAPI):\n init_images = img2imgreq.init_images\n if init_images is None:\n raise HTTPException(status_code=404, detail=\"Init image not found\")\n\n mask = img2imgreq.mask\n if mask:\n mask = decode_base64_to_image(mask)\n\n script_runner = scripts.scripts_img2img\n if not script_runner.scripts:\n script_runner.initialize_scripts(True)\n ui.create_ui()\n if not self.default_script_arg_img2img:\n self.default_script_arg_img2img = self.init_default_script_args(script_runner)\n selectable_scripts, selectable_script_idx = self.get_selectable_script(img2imgreq.script_name, script_runner)\n\n populate = img2imgreq.copy(update={ # Override __init__ params\n \"sampler_name\": validate_sampler_name(img2imgreq.sampler_name or img2imgreq.sampler_index),\n \"do_not_save_samples\": not img2imgreq.save_images,\n \"do_not_save_grid\": not img2imgreq.save_images,\n \"mask\": mask,\n })\n if populate.sampler_name:\n populate.sampler_index = None # prevent a warning later on\n\n args = vars(populate)\n args.pop('include_init_images', None) # this is meant to be done by \"exclude\": True in model, but it's for a reason that I cannot determine.\n args.pop('script_name', None)\n args.pop('script_args', None) # will refeed them to the pipeline directly after initializing them\n args.pop('alwayson_scripts', None)\n\n script_args = self.init_script_args(img2imgreq, self.default_script_arg_img2img, selectable_scripts, selectable_script_idx, script_runner)\n\n send_images = args.pop('send_images', True)\n args.pop('save_images', None)\n\n with self.queue_lock:\n p = StableDiffusionProcessingImg2Img(sd_model=shared.sd_model, **args)\n p.init_images = [decode_base64_to_image(x) for x in init_images]\n p.scripts = script_runner\n p.outpath_grids = opts.outdir_img2img_grids\n p.outpath_samples = opts.outdir_img2img_samples\n\n shared.state.begin()\n if selectable_scripts != None:\n p.script_args = script_args\n processed = scripts.scripts_img2img.run(p, *p.script_args) # Need to pass args as list here\n else:\n p.script_args = tuple(script_args) # Need to pass args as tuple here\n processed = process_images(p)\n shared.state.end()\n\n b64images = list(map(encode_pil_to_base64, processed.images)) if send_images else []\n\n if not img2imgreq.include_init_images:\n img2imgreq.init_images = None\n img2imgreq.mask = None\n\n return ImageToImageResponse(images=b64images, parameters=vars(img2imgreq), info=processed.js())\n\n def extras_single_image_api(self, req: ExtrasSingleImageRequest):\n reqDict = setUpscalers(req)\n\n reqDict['image'] = decode_base64_to_image(reqDict['image'])\n\n with self.queue_lock:\n result = postprocessing.run_extras(extras_mode=0, image_folder=\"\", input_dir=\"\", output_dir=\"\", save_output=False, **reqDict)\n\n return ExtrasSingleImageResponse(image=encode_pil_to_base64(result[0][0]), html_info=result[1])\n\n def extras_batch_images_api(self, req: ExtrasBatchImagesRequest):\n reqDict = setUpscalers(req)\n\n image_list = reqDict.pop('imageList', [])\n image_folder = [decode_base64_to_image(x.data) for x in image_list]\n\n with self.queue_lock:\n result = postprocessing.run_extras(extras_mode=1, image_folder=image_folder, image=\"\", input_dir=\"\", output_dir=\"\", save_output=False, **reqDict)\n\n return ExtrasBatchImagesResponse(images=list(map(encode_pil_to_base64, result[0])), html_info=result[1])\n\n def pnginfoapi(self, req: PNGInfoRequest):\n if(not req.image.strip()):\n return PNGInfoResponse(info=\"\")\n\n image = decode_base64_to_image(req.image.strip())\n if image is None:\n return PNGInfoResponse(info=\"\")\n\n geninfo, items = images.read_info_from_image(image)\n if geninfo is None:\n geninfo = \"\"\n\n items = {**{'parameters': geninfo}, **items}\n\n return PNGInfoResponse(info=geninfo, items=items)\n\n def progressapi(self, req: ProgressRequest = Depends()):\n # copy from check_progress_call of ui.py\n\n if shared.state.job_count == 0:\n return ProgressResponse(progress=0, eta_relative=0, state=shared.state.dict(), textinfo=shared.state.textinfo)\n\n # avoid dividing zero\n progress = 0.01\n\n if shared.state.job_count > 0:\n progress += shared.state.job_no / shared.state.job_count\n if shared.state.sampling_steps > 0:\n progress += 1 / shared.state.job_count * shared.state.sampling_step / shared.state.sampling_steps\n\n time_since_start = time.time() - shared.state.time_start\n eta = (time_since_start/progress)\n eta_relative = eta-time_since_start\n\n progress = min(progress, 1)\n\n shared.state.set_current_image()\n\n current_image = None\n if shared.state.current_image and not req.skip_current_image:\n current_image = encode_pil_to_base64(shared.state.current_image)\n\n return ProgressResponse(progress=progress, eta_relative=eta_relative, state=shared.state.dict(), current_image=current_image, textinfo=shared.state.textinfo)\n\n def interrogateapi(self, interrogatereq: InterrogateRequest):\n image_b64 = interrogatereq.image\n if image_b64 is None:\n raise HTTPException(status_code=404, detail=\"Image not found\")\n\n img = decode_base64_to_image(image_b64)\n img = img.convert('RGB')\n\n # Override object param\n with self.queue_lock:\n if interrogatereq.model == \"clip\":\n processed = shared.interrogator.interrogate(img)\n elif interrogatereq.model == \"deepdanbooru\":\n processed = deepbooru.model.tag(img)\n else:\n raise HTTPException(status_code=404, detail=\"Model not found\")\n\n return InterrogateResponse(caption=processed)\n\n def interruptapi(self):\n shared.state.interrupt()\n\n return {}\n\n def unloadapi(self):\n unload_model_weights()\n\n return {}\n\n def reloadapi(self):\n reload_model_weights()\n\n return {}\n\n def skip(self):\n shared.state.skip()\n\n def get_config(self):\n options = {}\n for key in shared.opts.data.keys():\n metadata = shared.opts.data_labels.get(key)\n if(metadata is not None):\n options.update({key: shared.opts.data.get(key, shared.opts.data_labels.get(key).default)})\n else:\n options.update({key: shared.opts.data.get(key, None)})\n\n return options\n\n def set_config(self, req: Dict[str, Any]):\n for k, v in req.items():\n shared.opts.set(k, v)\n\n shared.opts.save(shared.config_filename)\n return\n\n def get_cmd_flags(self):\n return vars(shared.cmd_opts)\n\n def get_samplers(self):\n return [{\"name\": sampler[0], \"aliases\":sampler[2], \"options\":sampler[3]} for sampler in sd_samplers.all_samplers]\n\n def get_upscalers(self):\n return [\n {\n \"name\": upscaler.name,\n \"model_name\": upscaler.scaler.model_name,\n \"model_path\": upscaler.data_path,\n \"model_url\": None,\n \"scale\": upscaler.scale,\n }\n for upscaler in shared.sd_upscalers\n ]\n\n def get_sd_models(self):\n return [{\"title\": x.title, \"model_name\": x.model_name, \"hash\": x.shorthash, \"sha256\": x.sha256, \"filename\": x.filename, \"config\": find_checkpoint_config_near_filename(x)} for x in checkpoints_list.values()]\n\n def get_hypernetworks(self):\n return [{\"name\": name, \"path\": shared.hypernetworks[name]} for name in shared.hypernetworks]\n\n def get_face_restorers(self):\n return [{\"name\":x.name(), \"cmd_dir\": getattr(x, \"cmd_dir\", None)} for x in shared.face_restorers]\n\n def get_realesrgan_models(self):\n return [{\"name\":x.name,\"path\":x.data_path, \"scale\":x.scale} for x in get_realesrgan_models(None)]\n\n def get_prompt_styles(self):\n styleList = []\n for k in shared.prompt_styles.styles:\n style = shared.prompt_styles.styles[k]\n styleList.append({\"name\":style[0], \"prompt\": style[1], \"negative_prompt\": style[2]})\n\n return styleList\n\n def get_embeddings(self):\n db = sd_hijack.model_hijack.embedding_db\n\n def convert_embedding(embedding):\n return {\n \"step\": embedding.step,\n \"sd_checkpoint\": embedding.sd_checkpoint,\n \"sd_checkpoint_name\": embedding.sd_checkpoint_name,\n \"shape\": embedding.shape,\n \"vectors\": embedding.vectors,\n }\n\n def convert_embeddings(embeddings):\n return {embedding.name: convert_embedding(embedding) for embedding in embeddings.values()}\n\n return {\n \"loaded\": convert_embeddings(db.word_embeddings),\n \"skipped\": convert_embeddings(db.skipped_embeddings),\n }\n\n def refresh_checkpoints(self):\n shared.refresh_checkpoints()\n\n def create_embedding(self, args: dict):\n try:\n shared.state.begin()\n filename = create_embedding(**args) # create empty embedding\n sd_hijack.model_hijack.embedding_db.load_textual_inversion_embeddings() # reload embeddings so new one can be immediately used\n shared.state.end()\n return CreateResponse(info=f\"create embedding filename: {filename}\")\n except AssertionError as e:\n shared.state.end()\n return TrainResponse(info=f\"create embedding error: {e}\")\n\n def create_hypernetwork(self, args: dict):\n try:\n shared.state.begin()\n filename = create_hypernetwork(**args) # create empty embedding\n shared.state.end()\n return CreateResponse(info=f\"create hypernetwork filename: {filename}\")\n except AssertionError as e:\n shared.state.end()\n return TrainResponse(info=f\"create hypernetwork error: {e}\")\n\n def preprocess(self, args: dict):\n try:\n shared.state.begin()\n preprocess(**args) # quick operation unless blip/booru interrogation is enabled\n shared.state.end()\n return PreprocessResponse(info = 'preprocess complete')\n except KeyError as e:\n shared.state.end()\n return PreprocessResponse(info=f\"preprocess error: invalid token: {e}\")\n except AssertionError as e:\n shared.state.end()\n return PreprocessResponse(info=f\"preprocess error: {e}\")\n except FileNotFoundError as e:\n shared.state.end()\n return PreprocessResponse(info=f'preprocess error: {e}')\n\n def train_embedding(self, args: dict):\n try:\n shared.state.begin()\n apply_optimizations = shared.opts.training_xattention_optimizations\n error = None\n filename = ''\n if not apply_optimizations:\n sd_hijack.undo_optimizations()\n try:\n embedding, filename = train_embedding(**args) # can take a long time to complete\n except Exception as e:\n error = e\n finally:\n if not apply_optimizations:\n sd_hijack.apply_optimizations()\n shared.state.end()\n return TrainResponse(info=f\"train embedding complete: filename: {filename} error: {error}\")\n except AssertionError as msg:\n shared.state.end()\n return TrainResponse(info=f\"train embedding error: {msg}\")\n\n def train_hypernetwork(self, args: dict):\n try:\n shared.state.begin()\n shared.loaded_hypernetworks = []\n apply_optimizations = shared.opts.training_xattention_optimizations\n error = None\n filename = ''\n if not apply_optimizations:\n sd_hijack.undo_optimizations()\n try:\n hypernetwork, filename = train_hypernetwork(**args)\n except Exception as e:\n error = e\n finally:\n shared.sd_model.cond_stage_model.to(devices.device)\n shared.sd_model.first_stage_model.to(devices.device)\n if not apply_optimizations:\n sd_hijack.apply_optimizations()\n shared.state.end()\n return TrainResponse(info=f\"train embedding complete: filename: {filename} error: {error}\")\n except AssertionError as msg:\n shared.state.end()\n return TrainResponse(info=f\"train embedding error: {error}\")\n\n def get_memory(self):\n try:\n import os, psutil\n process = psutil.Process(os.getpid())\n res = process.memory_info() # only rss is cross-platform guaranteed so we dont rely on other values\n ram_total = 100 * res.rss / process.memory_percent() # and total memory is calculated as actual value is not cross-platform safe\n ram = { 'free': ram_total - res.rss, 'used': res.rss, 'total': ram_total }\n except Exception as err:\n ram = { 'error': f'{err}' }\n try:\n import torch\n if torch.cuda.is_available():\n s = torch.cuda.mem_get_info()\n system = { 'free': s[0], 'used': s[1] - s[0], 'total': s[1] }\n s = dict(torch.cuda.memory_stats(shared.device))\n allocated = { 'current': s['allocated_bytes.all.current'], 'peak': s['allocated_bytes.all.peak'] }\n reserved = { 'current': s['reserved_bytes.all.current'], 'peak': s['reserved_bytes.all.peak'] }\n active = { 'current': s['active_bytes.all.current'], 'peak': s['active_bytes.all.peak'] }\n inactive = { 'current': s['inactive_split_bytes.all.current'], 'peak': s['inactive_split_bytes.all.peak'] }\n warnings = { 'retries': s['num_alloc_retries'], 'oom': s['num_ooms'] }\n cuda = {\n 'system': system,\n 'active': active,\n 'allocated': allocated,\n 'reserved': reserved,\n 'inactive': inactive,\n 'events': warnings,\n }\n else:\n cuda = { 'error': 'unavailable' }\n except Exception as err:\n cuda = { 'error': f'{err}' }\n return MemoryResponse(ram = ram, cuda = cuda)\n\n def launch(self, server_name, port):\n self.app.include_router(self.router)\n uvicorn.run(self.app, host=server_name, port=port, timeout_keep_alive=0)\n", "path": "modules/api/api.py" } ]
diff --git a/modules/api/api.py b/modules/api/api.py index 9bb95dfd1a4..bfeec3856ba 100644 --- a/modules/api/api.py +++ b/modules/api/api.py @@ -682,4 +682,4 @@ def get_memory(self): def launch(self, server_name, port): self.app.include_router(self.router) - uvicorn.run(self.app, host=server_name, port=port) + uvicorn.run(self.app, host=server_name, port=port, timeout_keep_alive=0)
sunpy__sunpy-2906
[ { "content": "#!/usr/bin/env python\n# This file is based havily on the astropy version here:\n# https://github.com/astropy/package-template/blob/master/setup.py\n# Which is licensed under the astropy license, see licenses/ASTROPY.rst.\n\n################################################################################\n###### YOU SHOULD NOT HAVE TO EDIT THIS FILE, YOU SHOULD EDIT setup.cfg. #######\n################################################################################\n# Note: This file needs to be Python 2 / <3.6 compatible, so that the nice\n# \"SunPy only supports Python 3.6+\" error prints without syntax errors etc.\n\nimport os\nimport sys\nimport glob\nimport builtins # noqa\nimport itertools\n\ntry:\n from configparser import ConfigParser\nexcept ImportError:\n from ConfigParser import ConfigParser\n\n# Get some values from the setup.cfg\nconf = ConfigParser()\nconf.read(['setup.cfg'])\nmetadata = dict(conf.items('metadata'))\n\nPACKAGENAME = metadata.get('package_name', 'sunpy')\nDESCRIPTION = metadata.get('description', 'SunPy: Python for Solar Physics')\nAUTHOR = metadata.get('author', 'The SunPy Community')\nAUTHOR_EMAIL = metadata.get('author_email', '')\nLICENSE = metadata.get('license', 'unknown')\nURL = metadata.get('url', 'https://sunpy.org')\n__minimum_python_version__ = metadata.get(\"minimum_python_version\", \"3.6\")\n\n# Enforce Python version check - this is the same check as in __init__.py but\n# this one has to happen before importing ah_bootstrap.\nif sys.version_info < tuple((int(val) for val in __minimum_python_version__.split('.'))):\n sys.stderr.write(\"ERROR: SunPy requires Python {} or later\\n\".format(__minimum_python_version__))\n sys.exit(1)\n\nwith open(os.path.join(os.path.abspath(os.path.dirname(__file__)), 'README.rst'), encoding='utf-8') as f:\n LONG_DESCRIPTION = f.read()\n\n# Import ah_bootstrap after the python version validation\nimport ah_bootstrap # noqa\nfrom setuptools import setup # noqa\nfrom astropy_helpers.git_helpers import get_git_devstr # noqa\nfrom astropy_helpers.setup_helpers import get_package_info # noqa\nfrom astropy_helpers.setup_helpers import get_debug_option, register_commands\nfrom astropy_helpers.version_helpers import generate_version_py # noqa\n\nbuiltins._SUNPY_SETUP_ = True\n\n\n# -- Read the Docs Setup -----------------------------------------------------\n\non_rtd = os.environ.get('READTHEDOCS', None) == 'True'\n\nif on_rtd:\n os.environ['HOME'] = '/home/docs/'\n os.environ['SUNPY_CONFIGDIR'] = '/home/docs/'\n\n# Store the package name in a built-in variable so it's easy\n# to get from other parts of the setup infrastructure\n# This is used by get_pkg_data in astropy amongst other things\nbuiltins._ASTROPY_PACKAGE_NAME_ = PACKAGENAME\n\n# VERSION should be PEP440 compatible (http://www.python.org/dev/peps/pep-0440)\nVERSION = metadata.get('version', '0.0.dev0')\n\n# Indicates if this version is a release version\nRELEASE = 'dev' not in VERSION\n\nif not RELEASE:\n VERSION += get_git_devstr(False)\n\n# Populate the dict of setup command overrides; this should be done before\n# invoking any other functionality from distutils since it can potentially\n# modify distutils' behaviour.\ncmdclassd = register_commands(PACKAGENAME, VERSION, RELEASE)\n\ntry:\n from sunpy.tests.setup_command import SunPyTest\n # Overwrite the Astropy Testing framework\n cmdclassd['test'] = type('SunPyTest', (SunPyTest,),\n {'package_name': 'sunpy'})\n\nexcept Exception:\n # Catch everything, if it doesn't work, we still want SunPy to install.\n pass\n\n# Freeze build information in version.py\ngenerate_version_py(PACKAGENAME, VERSION, RELEASE,\n get_debug_option(PACKAGENAME))\n\n# Treat everything in scripts except README* as a script to be installed\nscripts = [fname for fname in glob.glob(os.path.join('scripts', '*'))\n if not os.path.basename(fname).startswith('README')]\n\n\n# Get configuration information from all of the various subpackages.\n# See the docstring for setup_helpers.update_package_files for more\n# details.\npackage_info = get_package_info()\n\n# Add the project-global data\npackage_info['package_data'].setdefault(PACKAGENAME, [])\npackage_info['package_data'][PACKAGENAME].append('data/*')\n\n# Define entry points for command-line scripts\nentry_points = {'console_scripts': []}\n\nif conf.has_section('entry_points'):\n entry_point_list = conf.items('entry_points')\n for entry_point in entry_point_list:\n entry_points['console_scripts'].append('{0} = {1}'.format(\n entry_point[0], entry_point[1]))\n\n# Include all .c files, recursively, including those generated by\n# Cython, since we can not do this in MANIFEST.in with a \"dynamic\"\n# directory name.\nc_files = []\nfor root, dirs, files in os.walk(PACKAGENAME):\n for filename in files:\n if filename.endswith('.c'):\n c_files.append(\n os.path.join(\n os.path.relpath(root, PACKAGENAME), filename))\npackage_info['package_data'][PACKAGENAME].extend(c_files)\n\n\nextra_tags = [m.strip() for m in metadata.get(\"extra_requires\", \"\").split(',')]\nif extra_tags:\n extras_require = {tag: [m.strip() for m in metadata[\"{tag}_requires\".format(tag=tag)].split(',')]\n for tag in extra_tags}\n extras_require['all'] = list(itertools.chain.from_iterable(extras_require.values()))\nelse:\n extras_require = None\n\n# Entry points\nentry_points['asdf_extensions'] = [\n 'sunpy = sunpy.io.special.asdf.extension:SunpyExtension',\n]\n\nsetup(name=PACKAGENAME,\n version=VERSION,\n description=DESCRIPTION,\n scripts=scripts,\n setup_requires=[s.strip() for s in metadata.get(\"setup_requires\", \"\").split(',')],\n install_requires=[s.strip() for s in metadata['install_requires'].split(',')],\n extras_require=extras_require,\n tests_require=extras_require.get(\"all\", \"\"),\n author=AUTHOR,\n author_email=AUTHOR_EMAIL,\n license=LICENSE,\n url=URL,\n project_urls={'Funding': 'https://www.flipcause.com/widget/widget_home/MTgxMTU=',\n 'Source': 'https://github.com/sunpy/sunpy/',\n 'Tracker': 'https://github.com/sunpy/sunpy/issues'\n },\n long_description=LONG_DESCRIPTION,\n long_description_content_type='text/x-rst',\n cmdclass=cmdclassd,\n zip_safe=False,\n entry_points=entry_points,\n python_requires='>={}'.format(__minimum_python_version__),\n include_package_data=True,\n **package_info\n )\n", "path": "setup.py" } ]
[ { "content": "#!/usr/bin/env python\n# This file is based havily on the astropy version here:\n# https://github.com/astropy/package-template/blob/master/setup.py\n# Which is licensed under the astropy license, see licenses/ASTROPY.rst.\n\n################################################################################\n###### YOU SHOULD NOT HAVE TO EDIT THIS FILE, YOU SHOULD EDIT setup.cfg. #######\n################################################################################\n# Note: This file needs to be Python 2 / <3.6 compatible, so that the nice\n# \"SunPy only supports Python 3.6+\" error prints without syntax errors etc.\n\nimport os\nimport sys\nimport glob\nimport builtins # noqa\nimport itertools\n\n# Fix for https://github.com/pypa/pip/issues/6163\nsys.path.insert(0, os.path.dirname(__file__))\n\ntry:\n from configparser import ConfigParser\nexcept ImportError:\n from ConfigParser import ConfigParser\n\n# Get some values from the setup.cfg\nconf = ConfigParser()\nconf.read(['setup.cfg'])\nmetadata = dict(conf.items('metadata'))\n\nPACKAGENAME = metadata.get('package_name', 'sunpy')\nDESCRIPTION = metadata.get('description', 'SunPy: Python for Solar Physics')\nAUTHOR = metadata.get('author', 'The SunPy Community')\nAUTHOR_EMAIL = metadata.get('author_email', '')\nLICENSE = metadata.get('license', 'unknown')\nURL = metadata.get('url', 'https://sunpy.org')\n__minimum_python_version__ = metadata.get(\"minimum_python_version\", \"3.6\")\n\n# Enforce Python version check - this is the same check as in __init__.py but\n# this one has to happen before importing ah_bootstrap.\nif sys.version_info < tuple((int(val) for val in __minimum_python_version__.split('.'))):\n sys.stderr.write(\"ERROR: SunPy requires Python {} or later\\n\".format(__minimum_python_version__))\n sys.exit(1)\n\nwith open(os.path.join(os.path.abspath(os.path.dirname(__file__)), 'README.rst'), encoding='utf-8') as f:\n LONG_DESCRIPTION = f.read()\n\n# Import ah_bootstrap after the python version validation\nimport ah_bootstrap # noqa\nfrom setuptools import setup # noqa\nfrom astropy_helpers.git_helpers import get_git_devstr # noqa\nfrom astropy_helpers.setup_helpers import get_package_info # noqa\nfrom astropy_helpers.setup_helpers import get_debug_option, register_commands\nfrom astropy_helpers.version_helpers import generate_version_py # noqa\n\nbuiltins._SUNPY_SETUP_ = True\n\n\n# -- Read the Docs Setup -----------------------------------------------------\n\non_rtd = os.environ.get('READTHEDOCS', None) == 'True'\n\nif on_rtd:\n os.environ['HOME'] = '/home/docs/'\n os.environ['SUNPY_CONFIGDIR'] = '/home/docs/'\n\n# Store the package name in a built-in variable so it's easy\n# to get from other parts of the setup infrastructure\n# This is used by get_pkg_data in astropy amongst other things\nbuiltins._ASTROPY_PACKAGE_NAME_ = PACKAGENAME\n\n# VERSION should be PEP440 compatible (http://www.python.org/dev/peps/pep-0440)\nVERSION = metadata.get('version', '0.0.dev0')\n\n# Indicates if this version is a release version\nRELEASE = 'dev' not in VERSION\n\nif not RELEASE:\n VERSION += get_git_devstr(False)\n\n# Populate the dict of setup command overrides; this should be done before\n# invoking any other functionality from distutils since it can potentially\n# modify distutils' behaviour.\ncmdclassd = register_commands(PACKAGENAME, VERSION, RELEASE)\n\ntry:\n from sunpy.tests.setup_command import SunPyTest\n # Overwrite the Astropy Testing framework\n cmdclassd['test'] = type('SunPyTest', (SunPyTest,),\n {'package_name': 'sunpy'})\n\nexcept Exception:\n # Catch everything, if it doesn't work, we still want SunPy to install.\n pass\n\n# Freeze build information in version.py\ngenerate_version_py(PACKAGENAME, VERSION, RELEASE,\n get_debug_option(PACKAGENAME))\n\n# Treat everything in scripts except README* as a script to be installed\nscripts = [fname for fname in glob.glob(os.path.join('scripts', '*'))\n if not os.path.basename(fname).startswith('README')]\n\n\n# Get configuration information from all of the various subpackages.\n# See the docstring for setup_helpers.update_package_files for more\n# details.\npackage_info = get_package_info()\n\n# Add the project-global data\npackage_info['package_data'].setdefault(PACKAGENAME, [])\npackage_info['package_data'][PACKAGENAME].append('data/*')\n\n# Define entry points for command-line scripts\nentry_points = {'console_scripts': []}\n\nif conf.has_section('entry_points'):\n entry_point_list = conf.items('entry_points')\n for entry_point in entry_point_list:\n entry_points['console_scripts'].append('{0} = {1}'.format(\n entry_point[0], entry_point[1]))\n\n# Include all .c files, recursively, including those generated by\n# Cython, since we can not do this in MANIFEST.in with a \"dynamic\"\n# directory name.\nc_files = []\nfor root, dirs, files in os.walk(PACKAGENAME):\n for filename in files:\n if filename.endswith('.c'):\n c_files.append(\n os.path.join(\n os.path.relpath(root, PACKAGENAME), filename))\npackage_info['package_data'][PACKAGENAME].extend(c_files)\n\n\nextra_tags = [m.strip() for m in metadata.get(\"extra_requires\", \"\").split(',')]\nif extra_tags:\n extras_require = {tag: [m.strip() for m in metadata[\"{tag}_requires\".format(tag=tag)].split(',')]\n for tag in extra_tags}\n extras_require['all'] = list(itertools.chain.from_iterable(extras_require.values()))\nelse:\n extras_require = None\n\n# Entry points\nentry_points['asdf_extensions'] = [\n 'sunpy = sunpy.io.special.asdf.extension:SunpyExtension',\n]\n\nsetup(name=PACKAGENAME,\n version=VERSION,\n description=DESCRIPTION,\n scripts=scripts,\n setup_requires=[s.strip() for s in metadata.get(\"setup_requires\", \"\").split(',')],\n install_requires=[s.strip() for s in metadata['install_requires'].split(',')],\n extras_require=extras_require,\n tests_require=extras_require.get(\"all\", \"\"),\n author=AUTHOR,\n author_email=AUTHOR_EMAIL,\n license=LICENSE,\n url=URL,\n project_urls={'Funding': 'https://www.flipcause.com/widget/widget_home/MTgxMTU=',\n 'Source': 'https://github.com/sunpy/sunpy/',\n 'Tracker': 'https://github.com/sunpy/sunpy/issues'\n },\n long_description=LONG_DESCRIPTION,\n long_description_content_type='text/x-rst',\n cmdclass=cmdclassd,\n zip_safe=False,\n entry_points=entry_points,\n python_requires='>={}'.format(__minimum_python_version__),\n include_package_data=True,\n **package_info\n )\n", "path": "setup.py" } ]
diff --git a/setup.py b/setup.py index 300e476f017..eb9f8d579f9 100755 --- a/setup.py +++ b/setup.py @@ -15,6 +15,9 @@ import builtins # noqa import itertools +# Fix for https://github.com/pypa/pip/issues/6163 +sys.path.insert(0, os.path.dirname(__file__)) + try: from configparser import ConfigParser except ImportError: diff --git a/tox.ini b/tox.ini index a19865ba13c..d34bf2d6f5a 100644 --- a/tox.ini +++ b/tox.ini @@ -2,6 +2,10 @@ envlist = py{37,36}-offline,py{37,36}-{online,astropydev,numpydev,build_docs},figure,doc_tests [testenv] +install_command = pip install -U {opts} {packages} +platform = mylinux: linux + mymacos: darwin + mywindows: win32 setenv = MPLBACKEND = agg COLUMNS = 180 @@ -14,7 +18,7 @@ deps = pytest-rerunfailures pytest-sugar offline,online,build_docs,astropydev: asdf - win32: pillow + mywindows: pillow conda_deps = astropydev,numpydev: cython offline,online,build_docs: numpy<1.16
django-wiki__django-wiki-762
[ { "content": "#!/usr/bin/env python\n# -*- coding: utf-8 -*-\nfrom __future__ import print_function\n\nimport os\nimport sys\nfrom glob import glob\n\nfrom setuptools import find_packages, setup\n\nsys.path.append(\n os.path.join(os.path.dirname(__file__), 'src')\n)\n\n# noqa\nfrom wiki import __version__ # isort:skip # noqa\n\n\n# Utility function to read the README file.\n# Used for the long_description. It's nice, because now 1) we have a top level\n# README file and 2) it's easier to type in the README file than to put a raw\n# string in below ...\ndef get_path(fname):\n return os.path.join(os.path.dirname(__file__), fname)\n\n\ndef read_file(fname):\n \"\"\"\n Read file and decode in py2k\n \"\"\"\n if sys.version_info < (3,):\n return open(fname).read().decode(\"utf-8\")\n return open(fname).read()\n\n\nrequirements = [\n \"Django>=1.8,<2.0\",\n \"bleach>=1.5,<2\",\n \"Pillow\",\n \"django-nyt>=1.0b1\",\n \"six\",\n \"django-mptt>=0.8.6,<0.9\",\n \"django-sekizai>=0.10\",\n \"sorl-thumbnail>=12,<13\",\n \"Markdown>=2.6,<2.7\",\n]\n\n\nsetup(\n name=\"wiki\",\n version=__version__,\n author=\"Benjamin Bach\",\n author_email=\"benjamin@overtag.dk\",\n url=\"http://www.django-wiki.org\",\n description=\"A wiki system written for the Django framework.\",\n license=\"GPLv3\",\n keywords=[\"django\", \"wiki\", \"markdown\"],\n packages=find_packages('src'),\n package_dir={'': 'src'},\n py_modules=[os.path.splitext(os.path.basename(path))[0] for path in glob('src/*.py')],\n long_description=read_file('README.rst'),\n zip_safe=False,\n install_requires=requirements,\n classifiers=[\n 'Development Status :: 5 - Production/Stable',\n 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',\n 'Environment :: Web Environment',\n 'Framework :: Django',\n 'Intended Audience :: Developers',\n 'Operating System :: OS Independent',\n 'Programming Language :: Python',\n 'Programming Language :: Python :: 2.7',\n 'Programming Language :: Python :: 3.4',\n 'Programming Language :: Python :: 3.5',\n 'Programming Language :: Python :: 3.6',\n 'Programming Language :: Python :: Implementation :: CPython',\n 'Programming Language :: Python :: Implementation :: PyPy',\n 'Topic :: Internet :: WWW/HTTP :: Dynamic Content',\n 'Topic :: Software Development',\n 'Topic :: Software Development :: Libraries :: Application Frameworks',\n ],\n include_package_data=True,\n test_suite='runtests',\n)\n", "path": "setup.py" } ]
[ { "content": "#!/usr/bin/env python\n# -*- coding: utf-8 -*-\nfrom __future__ import print_function\n\nimport os\nimport sys\nfrom glob import glob\n\nfrom setuptools import find_packages, setup\n\nsys.path.append(\n os.path.join(os.path.dirname(__file__), 'src')\n)\n\n# noqa\nfrom wiki import __version__ # isort:skip # noqa\n\n\n# Utility function to read the README file.\n# Used for the long_description. It's nice, because now 1) we have a top level\n# README file and 2) it's easier to type in the README file than to put a raw\n# string in below ...\ndef get_path(fname):\n return os.path.join(os.path.dirname(__file__), fname)\n\n\ndef read_file(fname):\n \"\"\"\n Read file and decode in py2k\n \"\"\"\n if sys.version_info < (3,):\n return open(fname).read().decode(\"utf-8\")\n return open(fname).read()\n\n\nrequirements = [\n \"Django>=1.8,<2.0\",\n \"bleach>=1.5,<2\",\n \"Pillow\",\n \"django-nyt>=1.0b1,<1.1\",\n \"six\",\n \"django-mptt>=0.8.6,<0.9\",\n \"django-sekizai>=0.10\",\n \"sorl-thumbnail>=12,<13\",\n \"Markdown>=2.6,<2.7\",\n]\n\n\nsetup(\n name=\"wiki\",\n version=__version__,\n author=\"Benjamin Bach\",\n author_email=\"benjamin@overtag.dk\",\n url=\"http://www.django-wiki.org\",\n description=\"A wiki system written for the Django framework.\",\n license=\"GPLv3\",\n keywords=[\"django\", \"wiki\", \"markdown\"],\n packages=find_packages('src'),\n package_dir={'': 'src'},\n py_modules=[os.path.splitext(os.path.basename(path))[0] for path in glob('src/*.py')],\n long_description=read_file('README.rst'),\n zip_safe=False,\n install_requires=requirements,\n classifiers=[\n 'Development Status :: 5 - Production/Stable',\n 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',\n 'Environment :: Web Environment',\n 'Framework :: Django',\n 'Intended Audience :: Developers',\n 'Operating System :: OS Independent',\n 'Programming Language :: Python',\n 'Programming Language :: Python :: 2.7',\n 'Programming Language :: Python :: 3.4',\n 'Programming Language :: Python :: 3.5',\n 'Programming Language :: Python :: 3.6',\n 'Programming Language :: Python :: Implementation :: CPython',\n 'Programming Language :: Python :: Implementation :: PyPy',\n 'Topic :: Internet :: WWW/HTTP :: Dynamic Content',\n 'Topic :: Software Development',\n 'Topic :: Software Development :: Libraries :: Application Frameworks',\n ],\n include_package_data=True,\n test_suite='runtests',\n)\n", "path": "setup.py" } ]
diff --git a/MANIFEST.in b/MANIFEST.in index 035c89588..e85d373cd 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -5,6 +5,6 @@ include runtests.py recursive-include src *.html *.txt *.png *.js *.css *.gif *.less *.mo *.po *.otf *.svg *.woff *.woff2 *.eot *.ttf prune src/wiki/attachments prune src/wiki/images -# Exclude compiled version of source language, it's meaningless -exclude wiki/locale/en/LC_MESSAGES/django.mo +# Exclude compiled version of source language, it's meaningless +exclude src/wiki/locale/en/LC_MESSAGES/django.mo diff --git a/docs/release_notes.rst b/docs/release_notes.rst index eef3ae35f..444a914b6 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -73,6 +73,12 @@ Fixed * Hunted down unclosed HTML tags :url-issue:`750` (Mads Jensen) :url-issue:`741` +django-wiki 0.2.5 +----------------- + +* Put an upper limit on django-nyt version + + django-wiki 0.2.4 ----------------- diff --git a/setup.py b/setup.py index b60685afa..1da2e33a9 100755 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ def read_file(fname): "Django>=1.8,<2.0", "bleach>=1.5,<2", "Pillow", - "django-nyt>=1.0b1", + "django-nyt>=1.0b1,<1.1", "six", "django-mptt>=0.8.6,<0.9", "django-sekizai>=0.10",
facebookresearch__hydra-279
[ { "content": "# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved\nfrom . import utils\nfrom .errors import MissingConfigException\nfrom .main import main\n\n# Source of truth for Hydra's version\n__version__ = \"0.10.0\"\n\n__all__ = [\"__version__\", \"MissingConfigException\", \"main\", \"utils\"]\n", "path": "hydra/__init__.py" } ]
[ { "content": "# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved\nfrom . import utils\nfrom .errors import MissingConfigException\nfrom .main import main\n\n# Source of truth for Hydra's version\n__version__ = \"0.11.0-pre1\"\n\n__all__ = [\"__version__\", \"MissingConfigException\", \"main\", \"utils\"]\n", "path": "hydra/__init__.py" } ]
diff --git a/hydra/__init__.py b/hydra/__init__.py index 364596a9cf7..7ab4dde7090 100644 --- a/hydra/__init__.py +++ b/hydra/__init__.py @@ -4,6 +4,6 @@ from .main import main # Source of truth for Hydra's version -__version__ = "0.10.0" +__version__ = "0.11.0-pre1" __all__ = ["__version__", "MissingConfigException", "main", "utils"] diff --git a/website/docs/getting_started.md b/website/docs/getting_started.md index 115735b4499..3e57f7da000 100644 --- a/website/docs/getting_started.md +++ b/website/docs/getting_started.md @@ -15,6 +15,17 @@ sidebar_label: Getting started ### Install/upgrade +#### Stable +Use this unless you want to live on the cutting edge. ``` -pip install --upgrade hydra-core +pip install hydra-core --upgrade ``` + +#### Pre-release +Contains features that did not yet made it to the official version. +May contain nuts and bugs and might be incompatible with existing plugins. +``` +pip install hydra-core --pre --upgrade +``` +#### Source +You can install Hydra from source following the [contributing](development/contributing/) guide. \ No newline at end of file
Gallopsled__pwntools-1129
[ { "content": "from __future__ import absolute_import\n\nimport re\n\nfrom pwnlib.context import context\nfrom pwnlib.util.misc import register_sizes\n\nmips = {\n '$0' : 0, '$zero': 0,\n '$1' : 1, '$at': 1,\n '$2' : 2, '$v0': 2,\n '$3' : 3, '$v1': 3,\n '$4' : 4, '$a0': 4,\n '$5' : 5, '$a1': 5,\n '$6' : 6, '$a2': 6,\n '$7' : 7, '$a3': 7,\n '$8' : 8, '$t0': 8,\n '$9' : 9, '$t1': 9,\n '$10': 10, '$t2': 10,\n '$11': 11, '$t3': 11,\n '$12': 12, '$t4': 12,\n '$13': 13, '$t5': 13,\n '$14': 14, '$t6': 14,\n '$15': 15, '$t7': 15,\n '$16': 16, '$s0': 16,\n '$17': 17, '$s1': 17,\n '$18': 18, '$s2': 18,\n '$19': 19, '$s3': 19,\n '$20': 20, '$s4': 20,\n '$21': 21, '$s5': 21,\n '$22': 22, '$s6': 22,\n '$23': 23, '$s7': 23,\n '$24': 24, '$t8': 24,\n '$25': 25, '$t9': 25,\n '$26': 26, '$k0': 26,\n '$27': 27, '$k1': 27,\n '$28': 28, '$gp': 28,\n '$29': 29, '$sp': 29,\n '$30': 30, '$s8': 30,\n '$31': 31, '$ra': 31,\n}\n\narm = map('r{}'.format, range(13))\narm += [\"sp\", \"lr\", \"pc\", \"cpsr\"]\n\nthumb = arm\n\naarch64 = map('x{}'.format, range(32))\naarch64 += [\"sp\", \"lr\", \"pc\", \"cpsr\"]\n\ni386_baseregs = [ \"ax\", \"cx\", \"dx\", \"bx\", \"sp\", \"bp\", \"si\", \"di\", \"ip\"]\n\ni386 = map('e{}'.format, i386_baseregs)\ni386 += i386_baseregs\ni386 += [ \"eflags\", \"cs\", \"ss\", \"ds\", \"es\", \"fs\", \"gs\", ]\n\namd64 = map('r{}'.format, i386_baseregs)\namd64 += map('r{}'.format, range(8,16))\namd64 += map('r{}d'.format, range(8,16))\namd64 += i386\n\npowerpc = map('r{}'.format, range(32))\npowerpc += [\"pc\", \"msr\", \"cr\", \"lr\", \"ctr\", \"xer\", \"orig_r3\", \"trap\" ]\npowerpc = map('%{}'.format, powerpc)\n\nsparc = map('g{}'.format, range(8))\nsparc += map('o{}'.format, range(5))\nsparc += map('l{}'.format, range(8))\nsparc += map('i{}'.format, range(5))\nsparc += [\"pc\", \"sp\", \"fp\", \"psr\" ]\nsparc = map('%{}'.format, sparc)\n\n\n\n# x86/amd64 registers in decreasing size\ni386_ordered = [\n ['rax', 'eax', 'ax', 'al'],\n ['rbx', 'ebx', 'bx', 'bl'],\n ['rcx', 'ecx', 'cx', 'cl'],\n ['rdx', 'edx', 'dx', 'dl'],\n ['rdi', 'edi', 'di'],\n ['rsi', 'esi', 'si'],\n ['rbp', 'ebp', 'bp'],\n ['rsp', 'esp', 'sp'],\n ['r8', 'r8d', 'r8w', 'r8b'],\n ['r9', 'r9d', 'r9w', 'r9b'],\n ['r10', 'r10d', 'r10w', 'r10b'],\n ['r11', 'r11d', 'r11w', 'r11b'],\n ['r12', 'r12d', 'r12w', 'r12b'],\n ['r13', 'r13d', 'r13w', 'r13b'],\n ['r14', 'r14d', 'r14w', 'r14b'],\n ['r15', 'r15d', 'r15w', 'r15b']\n]\n\nall_regs, sizes, bigger, smaller = register_sizes(i386_ordered, [64, 32, 16, 8, 8])\nnative64 = {k:v[0] for k,v in bigger.items()}\nnative32 = {k:v[1] for k,v in bigger.items() if not k.startswith('r')}\n\nclass Register(object):\n #: Register name\n name = None\n\n #: List of larger registers, in order from largest to smallest\n bigger = None\n\n #: List of smaller regsters, in order from smallest to largest\n smaller = None\n\n #: Size of the register, in bits\n size = None\n\n #: Does this register have a 'high' register for mask 0xff00\n ff00 = None\n\n #: Flags for 64-bit mode.64-bit\n #: The first bit is set, if the register can be used with a REX-mode\n #: The second bit is set, if the register can be used without a REX-prefix\n rex_mode = 0\n\n #: Is this a 64-bit only register?\n is64bit = False\n\n #: Name of the native 64-bit register\n native64 = None\n\n #: Name of the native 32-bit register\n native32 = None\n\n #: Name of the register which should be used to clear\n #: this register, e.g. xor REG, REG.\n #: Useful for AMD64 for xor eax, eax is shorter than\n #: xor rax, rax and has the same effect.\n xor = None\n\n def __init__(self, name, size):\n self.name = name\n self.size = size\n\n for row in i386_ordered:\n if name in row:\n self.bigger = row[0:row.index(name)]\n self.smaller = row[row.index(name)+1:]\n self.sizes = {64>>i:r for i,r in enumerate(row)}\n self.native64 = row[0]\n self.native32 = row[1]\n self.xor = self.sizes[min(self.size, 32)]\n\n if self.size >= 32 and name.endswith('x'):\n self.ff00 = name[1] + 'h'\n\n if name[-1] != 'h':\n self.rex_mode |= 1\n\n if name[0] != 'r':\n self.rex_mode |= 2\n\n if name.startswith('r') or name[1:3].isdigit():\n self.is64bit = True\n\n @property\n def bits(self):\n return self.size\n\n @property\n def bytes(self):\n return self.bits / 8\n\n def fits(self, value):\n return self.size >= bits_required(value)\n\n def __str__(self):\n return self.name\n\n def __repr__(self):\n return \"Register(%r)\" % self.name\n\nintel = {}\n\nfor row in i386_ordered:\n for i, reg in enumerate(row):\n intel[reg] = Register(reg, 64 >> i)\n\ndef get_register(name):\n if isinstance(name, Register):\n return name\n if isinstance(name, str):\n return intel.get(name, None)\n return None\n\ndef is_register(obj):\n if isinstance(obj, Register):\n return True\n return get_register(obj)\n\n\ndef bits_required(value):\n bits = 0\n\n if value < 0:\n value = -(value)\n\n while value:\n value >>= 8\n bits += 8\n return bits\n\ndef current():\n return {\n 'i386': i386,\n 'amd64': amd64,\n 'arm': arm,\n 'thumb': arm,\n 'aarch64': aarch64,\n 'mips': mips,\n 'powerpc': powerpc\n }[context.arch]\n\n# def is_register(sz):\n# try:\n# sz = sz.lower()\n# return sz.lower() in {\n# 'i386': i386,\n# 'amd64': amd64,\n# 'powerpc': powerpc,\n# 'sparc': sparc,\n# 'arm': arm,\n# 'aarch64': arm,\n# 'thumb': arm,\n# 'mips': mips,\n# 'mips64': mips\n# }[context.arch]\n# except:\n# return False\n\ndef register_size(reg):\n return sizes[reg]\n\ndef fits_in_register(reg, value):\n return register_size(reg) >= bits_required(value)\n", "path": "pwnlib/shellcraft/registers.py" } ]
[ { "content": "from __future__ import absolute_import\n\nimport re\n\nfrom pwnlib.context import context\nfrom pwnlib.util.misc import register_sizes\n\nmips = {\n '$0' : 0, '$zero': 0,\n '$1' : 1, '$at': 1,\n '$2' : 2, '$v0': 2,\n '$3' : 3, '$v1': 3,\n '$4' : 4, '$a0': 4,\n '$5' : 5, '$a1': 5,\n '$6' : 6, '$a2': 6,\n '$7' : 7, '$a3': 7,\n '$8' : 8, '$t0': 8,\n '$9' : 9, '$t1': 9,\n '$10': 10, '$t2': 10,\n '$11': 11, '$t3': 11,\n '$12': 12, '$t4': 12,\n '$13': 13, '$t5': 13,\n '$14': 14, '$t6': 14,\n '$15': 15, '$t7': 15,\n '$16': 16, '$s0': 16,\n '$17': 17, '$s1': 17,\n '$18': 18, '$s2': 18,\n '$19': 19, '$s3': 19,\n '$20': 20, '$s4': 20,\n '$21': 21, '$s5': 21,\n '$22': 22, '$s6': 22,\n '$23': 23, '$s7': 23,\n '$24': 24, '$t8': 24,\n '$25': 25, '$t9': 25,\n '$26': 26, '$k0': 26,\n '$27': 27, '$k1': 27,\n '$28': 28, '$gp': 28,\n '$29': 29, '$sp': 29,\n '$30': 30, '$s8': 30,\n '$31': 31, '$ra': 31,\n}\n\narm = map('r{}'.format, range(13))\narm += [\"sp\", \"lr\", \"pc\", \"cpsr\"]\n\nthumb = arm\n\naarch64 = map('x{}'.format, range(32))\naarch64 += [\"sp\", \"lr\", \"pc\", \"cpsr\"]\n\ni386_baseregs = [ \"ax\", \"cx\", \"dx\", \"bx\", \"sp\", \"bp\", \"si\", \"di\", \"ip\"]\n\ni386 = map('e{}'.format, i386_baseregs)\ni386 += i386_baseregs\ni386 += [ \"eflags\", \"cs\", \"ss\", \"ds\", \"es\", \"fs\", \"gs\", ]\n\namd64 = map('r{}'.format, i386_baseregs)\namd64 += map('r{}'.format, range(8,16))\namd64 += map('r{}d'.format, range(8,16))\namd64 += i386\n\npowerpc = map('r{}'.format, range(32))\npowerpc += [\"pc\", \"msr\", \"cr\", \"lr\", \"ctr\", \"xer\", \"orig_r3\", \"trap\" ]\npowerpc = map('%{}'.format, powerpc)\n\nsparc = map('g{}'.format, range(8))\nsparc += map('o{}'.format, range(5))\nsparc += map('l{}'.format, range(8))\nsparc += map('i{}'.format, range(5))\nsparc += [\"pc\", \"sp\", \"fp\", \"psr\" ]\nsparc = map('%{}'.format, sparc)\n\n\n\n# x86/amd64 registers in decreasing size\ni386_ordered = [\n ['rax', 'eax', 'ax', 'al'],\n ['rbx', 'ebx', 'bx', 'bl'],\n ['rcx', 'ecx', 'cx', 'cl'],\n ['rdx', 'edx', 'dx', 'dl'],\n ['rdi', 'edi', 'di'],\n ['rsi', 'esi', 'si'],\n ['rbp', 'ebp', 'bp'],\n ['rsp', 'esp', 'sp'],\n ['r8', 'r8d', 'r8w', 'r8b'],\n ['r9', 'r9d', 'r9w', 'r9b'],\n ['r10', 'r10d', 'r10w', 'r10b'],\n ['r11', 'r11d', 'r11w', 'r11b'],\n ['r12', 'r12d', 'r12w', 'r12b'],\n ['r13', 'r13d', 'r13w', 'r13b'],\n ['r14', 'r14d', 'r14w', 'r14b'],\n ['r15', 'r15d', 'r15w', 'r15b']\n]\n\nall_regs, sizes, bigger, smaller = register_sizes(i386_ordered, [64, 32, 16, 8, 8])\nnative64 = {k:v[0] for k,v in bigger.items()}\nnative32 = {k:v[1] for k,v in bigger.items() if not k.startswith('r')}\n\nclass Register(object):\n #: Register name\n name = None\n\n #: List of larger registers, in order from largest to smallest\n bigger = None\n\n #: List of smaller regsters, in order from smallest to largest\n smaller = None\n\n #: Size of the register, in bits\n size = None\n\n #: Does this register have a 'high' register for mask 0xff00\n ff00 = None\n\n #: Flags for 64-bit mode.64-bit\n #: The first bit is set, if the register can be used with a REX-mode\n #: The second bit is set, if the register can be used without a REX-prefix\n rex_mode = 0\n\n #: Is this a 64-bit only register?\n is64bit = False\n\n #: Name of the native 64-bit register\n native64 = None\n\n #: Name of the native 32-bit register\n native32 = None\n\n #: Name of the register which should be used to clear\n #: this register, e.g. xor REG, REG.\n #: Useful for AMD64 for xor eax, eax is shorter than\n #: xor rax, rax and has the same effect.\n xor = None\n\n def __init__(self, name, size):\n self.name = name\n self.size = size\n\n for row in i386_ordered:\n if name in row:\n self.bigger = row[0:row.index(name)]\n self.smaller = row[row.index(name)+1:]\n self.sizes = {64>>i:r for i,r in enumerate(row)}\n self.native64 = row[0]\n self.native32 = row[1]\n self.xor = self.sizes[min(self.size, 32)]\n\n if self.size >= 32 and name.endswith('x'):\n self.ff00 = name[1] + 'h'\n\n if name[-1] != 'h':\n self.rex_mode |= 1\n\n if name[0] != 'r':\n self.rex_mode |= 2\n\n if name.startswith('r') or name[1:3].isdigit():\n self.is64bit = True\n\n @property\n def bits(self):\n return self.size\n\n @property\n def bytes(self):\n return self.bits / 8\n\n def fits(self, value):\n return self.size >= bits_required(value)\n\n def __str__(self):\n return self.name\n\n def __repr__(self):\n return \"Register(%r)\" % self.name\n\nintel = {}\n\nfor row in i386_ordered:\n for i, reg in enumerate(row):\n intel[reg] = Register(reg, 64 >> i)\n\ndef get_register(name):\n if isinstance(name, Register):\n return name\n if isinstance(name, str):\n return intel.get(name, None)\n return None\n\ndef is_register(obj):\n if isinstance(obj, Register):\n return True\n return get_register(obj)\n\n\ndef bits_required(value):\n bits = 0\n\n if value < 0:\n value = -(value)\n\n while value:\n value >>= 8\n bits += 8\n return bits\n\ndef current():\n return {\n 'i386': i386,\n 'amd64': amd64,\n 'arm': arm,\n 'thumb': arm,\n 'aarch64': aarch64,\n 'mips': list(mips),\n 'powerpc': powerpc\n }[context.arch]\n\n# def is_register(sz):\n# try:\n# sz = sz.lower()\n# return sz.lower() in {\n# 'i386': i386,\n# 'amd64': amd64,\n# 'powerpc': powerpc,\n# 'sparc': sparc,\n# 'arm': arm,\n# 'aarch64': arm,\n# 'thumb': arm,\n# 'mips': mips,\n# 'mips64': mips\n# }[context.arch]\n# except:\n# return False\n\ndef register_size(reg):\n return sizes[reg]\n\ndef fits_in_register(reg, value):\n return register_size(reg) >= bits_required(value)\n", "path": "pwnlib/shellcraft/registers.py" } ]
diff --git a/pwnlib/shellcraft/registers.py b/pwnlib/shellcraft/registers.py index c1c7c363e..b184e0518 100644 --- a/pwnlib/shellcraft/registers.py +++ b/pwnlib/shellcraft/registers.py @@ -211,7 +211,7 @@ def current(): 'arm': arm, 'thumb': arm, 'aarch64': aarch64, - 'mips': mips, + 'mips': list(mips), 'powerpc': powerpc }[context.arch]
elastic__apm-agent-python-1149
[ { "content": "# BSD 3-Clause License\n#\n# Copyright (c) 2012, the Sentry Team, see AUTHORS for more details\n# Copyright (c) 2019, Elasticsearch BV\n# All rights reserved.\n#\n# Redistribution and use in source and binary forms, with or without\n# modification, are permitted provided that the following conditions are met:\n#\n# * Redistributions of source code must retain the above copyright notice, this\n# list of conditions and the following disclaimer.\n#\n# * Redistributions in binary form must reproduce the above copyright notice,\n# this list of conditions and the following disclaimer in the documentation\n# and/or other materials provided with the distribution.\n#\n# * Neither the name of the copyright holder nor the names of its\n# contributors may be used to endorse or promote products derived from\n# this software without specific prior written permission.\n#\n# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\n# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\n# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\n# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\n# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\n# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n\n\nimport logging\nimport logging.handlers\nimport math\nimport os\nimport re\nimport socket\nimport threading\n\nfrom elasticapm.conf.constants import BASE_SANITIZE_FIELD_NAMES\nfrom elasticapm.utils import compat, starmatch_to_regex\nfrom elasticapm.utils.logging import get_logger\nfrom elasticapm.utils.threading import IntervalTimer, ThreadManager\n\n__all__ = (\"setup_logging\", \"Config\")\n\n\nlogger = get_logger(\"elasticapm.conf\")\n\nlog_levels_map = {\n \"trace\": 5,\n \"debug\": logging.DEBUG,\n \"info\": logging.INFO,\n \"warning\": logging.WARNING,\n \"warn\": logging.WARNING,\n \"error\": logging.ERROR,\n \"critical\": logging.CRITICAL,\n \"off\": 1000,\n}\nlogfile_set_up = False\n\n\nclass ConfigurationError(ValueError):\n def __init__(self, msg, field_name):\n self.field_name = field_name\n super(ValueError, self).__init__(msg)\n\n\nclass _ConfigValue(object):\n \"\"\"\n Base class for configuration values\n\n dict_key\n String representing the key used for this config value in dict configs.\n env_key\n String representing the key used in environment variables for this\n config value. If not specified, will be set to `\"ELASTIC_APM_\" + dict_key`.\n type\n Type of value stored in this config value.\n validators\n List of validator classes. Must be callables, which will be called with\n a value and the dict_key for the config value. The validator either\n returns the validated value or raises a ConfigurationError if validation\n fails.\n callbacks\n List of functions which will be called when the config value is updated.\n The callbacks must match this signature:\n callback(dict_key, old_value, new_value, config_instance)\n\n Note that callbacks wait until the end of any given `update()` operation\n and are called at this point. This, coupled with the fact that callbacks\n receive the config instance, means that callbacks can utilize multiple\n configuration values (such as is the case for logging). This is\n complicated if more than one of the involved config values are\n dynamic, as both would need callbacks and the callback would need to\n be idempotent.\n callbacks_on_default\n Whether the callback should be called on config initialization if the\n default value is used. Default: True\n default\n The default for this config value if not user-configured.\n required\n Whether this config value is required. If a default is specified,\n this is a redundant option (except to ensure that this config value\n is specified if a default were ever to be removed).\n\n Note that _ConfigValues and any inheriting classes must implement __set__\n and __get__. The calling instance will always be a _ConfigBase descendant\n and the __set__ and __get__ calls will access `instance._values[self.dict_key]`\n to get and set values.\n \"\"\"\n\n def __init__(\n self,\n dict_key,\n env_key=None,\n type=compat.text_type,\n validators=None,\n callbacks=None,\n callbacks_on_default=True,\n default=None,\n required=False,\n ):\n self.type = type\n self.dict_key = dict_key\n self.validators = validators\n self.callbacks = callbacks\n self.default = default\n self.required = required\n if env_key is None:\n env_key = \"ELASTIC_APM_\" + dict_key\n self.env_key = env_key\n self.callbacks_on_default = callbacks_on_default\n\n def __get__(self, instance, owner):\n if instance:\n return instance._values.get(self.dict_key, self.default)\n else:\n return self.default\n\n def __set__(self, config_instance, value):\n value = self._validate(config_instance, value)\n self._callback_if_changed(config_instance, value)\n config_instance._values[self.dict_key] = value\n\n def _validate(self, instance, value):\n if value is None and self.required:\n raise ConfigurationError(\n \"Configuration error: value for {} is required.\".format(self.dict_key), self.dict_key\n )\n if self.validators and value is not None:\n for validator in self.validators:\n value = validator(value, self.dict_key)\n if self.type and value is not None:\n try:\n value = self.type(value)\n except ValueError as e:\n raise ConfigurationError(\"{}: {}\".format(self.dict_key, compat.text_type(e)), self.dict_key)\n instance._errors.pop(self.dict_key, None)\n return value\n\n def _callback_if_changed(self, instance, new_value):\n \"\"\"\n If the value changed (checked against instance._values[self.dict_key]),\n then run the callback function (if defined)\n \"\"\"\n old_value = instance._values.get(self.dict_key, self.default)\n if old_value != new_value:\n instance.callbacks_queue.append((self.dict_key, old_value, new_value))\n\n def call_callbacks(self, old_value, new_value, config_instance):\n if not self.callbacks:\n return\n for callback in self.callbacks:\n try:\n callback(self.dict_key, old_value, new_value, config_instance)\n except Exception as e:\n raise ConfigurationError(\n \"Callback {} raised an exception when setting {} to {}: {}\".format(\n callback, self.dict_key, new_value, e\n ),\n self.dict_key,\n )\n\n\nclass _ListConfigValue(_ConfigValue):\n def __init__(self, dict_key, list_separator=\",\", **kwargs):\n self.list_separator = list_separator\n super(_ListConfigValue, self).__init__(dict_key, **kwargs)\n\n def __set__(self, instance, value):\n if isinstance(value, compat.string_types):\n value = value.split(self.list_separator)\n elif value is not None:\n value = list(value)\n if value:\n value = [self.type(item) for item in value]\n self._callback_if_changed(instance, value)\n instance._values[self.dict_key] = value\n\n\nclass _DictConfigValue(_ConfigValue):\n def __init__(self, dict_key, item_separator=\",\", keyval_separator=\"=\", **kwargs):\n self.item_separator = item_separator\n self.keyval_separator = keyval_separator\n super(_DictConfigValue, self).__init__(dict_key, **kwargs)\n\n def __set__(self, instance, value):\n if isinstance(value, compat.string_types):\n items = (item.split(self.keyval_separator) for item in value.split(self.item_separator))\n value = {key.strip(): self.type(val.strip()) for key, val in items}\n elif not isinstance(value, dict):\n # TODO: better error handling\n value = None\n self._callback_if_changed(instance, value)\n instance._values[self.dict_key] = value\n\n\nclass _BoolConfigValue(_ConfigValue):\n def __init__(self, dict_key, true_string=\"true\", false_string=\"false\", **kwargs):\n self.true_string = true_string\n self.false_string = false_string\n super(_BoolConfigValue, self).__init__(dict_key, **kwargs)\n\n def __set__(self, instance, value):\n if isinstance(value, compat.string_types):\n if value.lower() == self.true_string:\n value = True\n elif value.lower() == self.false_string:\n value = False\n self._callback_if_changed(instance, value)\n instance._values[self.dict_key] = bool(value)\n\n\nclass RegexValidator(object):\n def __init__(self, regex, verbose_pattern=None):\n self.regex = regex\n self.verbose_pattern = verbose_pattern or regex\n\n def __call__(self, value, field_name):\n value = compat.text_type(value)\n match = re.match(self.regex, value)\n if match:\n return value\n raise ConfigurationError(\"{} does not match pattern {}\".format(value, self.verbose_pattern), field_name)\n\n\nclass UnitValidator(object):\n def __init__(self, regex, verbose_pattern, unit_multipliers):\n self.regex = regex\n self.verbose_pattern = verbose_pattern\n self.unit_multipliers = unit_multipliers\n\n def __call__(self, value, field_name):\n value = compat.text_type(value)\n match = re.match(self.regex, value, re.IGNORECASE)\n if not match:\n raise ConfigurationError(\"{} does not match pattern {}\".format(value, self.verbose_pattern), field_name)\n val, unit = match.groups()\n try:\n val = int(val) * self.unit_multipliers[unit]\n except KeyError:\n raise ConfigurationError(\"{} is not a supported unit\".format(unit), field_name)\n return val\n\n\nclass PrecisionValidator(object):\n \"\"\"\n Forces a float value to `precision` digits of precision.\n\n Rounds half away from zero.\n\n If `minimum` is provided, and the value rounds to 0 (but was not zero to\n begin with), use the minimum instead.\n \"\"\"\n\n def __init__(self, precision=0, minimum=None):\n self.precision = precision\n self.minimum = minimum\n\n def __call__(self, value, field_name):\n try:\n value = float(value)\n except ValueError:\n raise ConfigurationError(\"{} is not a float\".format(value), field_name)\n multiplier = 10 ** self.precision\n rounded = math.floor(value * multiplier + 0.5) / multiplier\n if rounded == 0 and self.minimum and value != 0:\n rounded = self.minimum\n return rounded\n\n\nduration_validator = UnitValidator(r\"^((?:-)?\\d+)(ms|s|m)$\", r\"\\d+(ms|s|m)\", {\"ms\": 1, \"s\": 1000, \"m\": 60000})\nsize_validator = UnitValidator(\n r\"^(\\d+)(b|kb|mb|gb)$\", r\"\\d+(b|KB|MB|GB)\", {\"b\": 1, \"kb\": 1024, \"mb\": 1024 * 1024, \"gb\": 1024 * 1024 * 1024}\n)\n\n\nclass ExcludeRangeValidator(object):\n def __init__(self, range_start, range_end, range_desc):\n self.range_start = range_start\n self.range_end = range_end\n self.range_desc = range_desc\n\n def __call__(self, value, field_name):\n if self.range_start <= value <= self.range_end:\n raise ConfigurationError(\n \"{} cannot be in range: {}\".format(\n value, self.range_desc.format(**{\"range_start\": self.range_start, \"range_end\": self.range_end})\n ),\n field_name,\n )\n return value\n\n\nclass FileIsReadableValidator(object):\n def __call__(self, value, field_name):\n value = os.path.normpath(value)\n if not os.path.exists(value):\n raise ConfigurationError(\"{} does not exist\".format(value), field_name)\n elif not os.path.isfile(value):\n raise ConfigurationError(\"{} is not a file\".format(value), field_name)\n elif not os.access(value, os.R_OK):\n raise ConfigurationError(\"{} is not readable\".format(value), field_name)\n return value\n\n\nclass EnumerationValidator(object):\n \"\"\"\n Validator which ensures that a given config value is chosen from a list\n of valid string options.\n \"\"\"\n\n def __init__(self, valid_values, case_sensitive=False):\n \"\"\"\n valid_values\n List of valid string values for the config value\n case_sensitive\n Whether to compare case when comparing a value to the valid list.\n Defaults to False (case-insensitive)\n \"\"\"\n self.case_sensitive = case_sensitive\n if case_sensitive:\n self.valid_values = {s: s for s in valid_values}\n else:\n self.valid_values = {s.lower(): s for s in valid_values}\n\n def __call__(self, value, field_name):\n if self.case_sensitive:\n ret = self.valid_values.get(value)\n else:\n ret = self.valid_values.get(value.lower())\n if ret is None:\n raise ConfigurationError(\n \"{} is not in the list of valid values: {}\".format(value, list(self.valid_values.values())), field_name\n )\n return ret\n\n\ndef _log_level_callback(dict_key, old_value, new_value, config_instance):\n elasticapm_logger = logging.getLogger(\"elasticapm\")\n elasticapm_logger.setLevel(log_levels_map.get(new_value, 100))\n\n global logfile_set_up\n if not logfile_set_up and config_instance.log_file:\n logfile_set_up = True\n filehandler = logging.handlers.RotatingFileHandler(\n config_instance.log_file, maxBytes=config_instance.log_file_size, backupCount=1\n )\n try:\n import ecs_logging\n\n filehandler.setFormatter(ecs_logging.StdlibFormatter())\n except ImportError:\n pass\n elasticapm_logger.addHandler(filehandler)\n\n\ndef _log_ecs_formatting_callback(dict_key, old_value, new_value, config_instance):\n \"\"\"\n If ecs_logging is installed and log_ecs_formatting is set to \"override\", we should\n set the ecs_logging.StdlibFormatter as the formatted for every handler in\n the root logger, and set the default processor for structlog to the\n ecs_logging.StructlogFormatter.\n \"\"\"\n if new_value.lower() == \"override\":\n try:\n import ecs_logging\n except ImportError:\n return\n\n # Stdlib\n root_logger = logging.getLogger()\n formatter = ecs_logging.StdlibFormatter()\n for handler in root_logger.handlers:\n handler.setFormatter(formatter)\n\n # Structlog\n try:\n import structlog\n\n structlog.configure(processors=[ecs_logging.StructlogFormatter()])\n except ImportError:\n pass\n\n\nclass _ConfigBase(object):\n _NO_VALUE = object() # sentinel object\n\n def __init__(self, config_dict=None, env_dict=None, inline_dict=None, copy=False):\n \"\"\"\n config_dict\n Configuration dict as is common for frameworks such as flask and django.\n Keys match the _ConfigValue.dict_key (usually all caps)\n env_dict\n Environment variables dict. Keys match the _ConfigValue.env_key\n (usually \"ELASTIC_APM_\" + dict_key)\n inline_dict\n Any config passed in as kwargs to the Client object. Typically\n the keys match the names of the _ConfigValue variables in the Config\n object.\n copy\n Whether this object is being created to copy an existing Config\n object. If True, don't run the initial `update` (which would call\n callbacks if present)\n \"\"\"\n self._values = {}\n self._errors = {}\n self._dict_key_lookup = {}\n self.callbacks_queue = []\n for config_value in self.__class__.__dict__.values():\n if not isinstance(config_value, _ConfigValue):\n continue\n self._dict_key_lookup[config_value.dict_key] = config_value\n if not copy:\n self.update(config_dict, env_dict, inline_dict, initial=True)\n\n def update(self, config_dict=None, env_dict=None, inline_dict=None, initial=False):\n if config_dict is None:\n config_dict = {}\n if env_dict is None:\n env_dict = os.environ\n if inline_dict is None:\n inline_dict = {}\n for field, config_value in compat.iteritems(self.__class__.__dict__):\n if not isinstance(config_value, _ConfigValue):\n continue\n new_value = self._NO_VALUE\n # first check environment\n if config_value.env_key and config_value.env_key in env_dict:\n new_value = env_dict[config_value.env_key]\n # check the inline config\n elif field in inline_dict:\n new_value = inline_dict[field]\n # finally, check config dictionary\n elif config_value.dict_key in config_dict:\n new_value = config_dict[config_value.dict_key]\n # only set if new_value changed. We'll fall back to the field default if not.\n if new_value is not self._NO_VALUE:\n try:\n setattr(self, field, new_value)\n except ConfigurationError as e:\n self._errors[e.field_name] = str(e)\n # handle initial callbacks\n if (\n initial\n and config_value.callbacks_on_default\n and getattr(self, field) is not None\n and getattr(self, field) == config_value.default\n ):\n self.callbacks_queue.append((config_value.dict_key, self._NO_VALUE, config_value.default))\n # if a field has not been provided by any config source, we have to check separately if it is required\n if config_value.required and getattr(self, field) is None:\n self._errors[config_value.dict_key] = \"Configuration error: value for {} is required.\".format(\n config_value.dict_key\n )\n self.call_pending_callbacks()\n\n def call_pending_callbacks(self):\n \"\"\"\n Call callbacks for config options matching list of tuples:\n\n (dict_key, old_value, new_value)\n \"\"\"\n for dict_key, old_value, new_value in self.callbacks_queue:\n self._dict_key_lookup[dict_key].call_callbacks(old_value, new_value, self)\n self.callbacks_queue = []\n\n @property\n def values(self):\n return self._values\n\n @values.setter\n def values(self, values):\n self._values = values\n\n @property\n def errors(self):\n return self._errors\n\n def copy(self):\n c = self.__class__(copy=True)\n c._errors = {}\n c.values = self.values.copy()\n return c\n\n\nclass Config(_ConfigBase):\n service_name = _ConfigValue(\n \"SERVICE_NAME\", validators=[RegexValidator(\"^[a-zA-Z0-9 _-]+$\")], default=\"python_service\", required=True\n )\n service_node_name = _ConfigValue(\"SERVICE_NODE_NAME\")\n environment = _ConfigValue(\"ENVIRONMENT\")\n secret_token = _ConfigValue(\"SECRET_TOKEN\")\n api_key = _ConfigValue(\"API_KEY\")\n debug = _BoolConfigValue(\"DEBUG\", default=False)\n server_url = _ConfigValue(\"SERVER_URL\", default=\"http://localhost:8200\", required=True)\n server_cert = _ConfigValue(\"SERVER_CERT\", validators=[FileIsReadableValidator()])\n verify_server_cert = _BoolConfigValue(\"VERIFY_SERVER_CERT\", default=True)\n include_paths = _ListConfigValue(\"INCLUDE_PATHS\")\n exclude_paths = _ListConfigValue(\"EXCLUDE_PATHS\", default=compat.get_default_library_patters())\n filter_exception_types = _ListConfigValue(\"FILTER_EXCEPTION_TYPES\")\n server_timeout = _ConfigValue(\n \"SERVER_TIMEOUT\",\n type=float,\n validators=[\n UnitValidator(r\"^((?:-)?\\d+)(ms|s|m)?$\", r\"\\d+(ms|s|m)\", {\"ms\": 0.001, \"s\": 1, \"m\": 60, None: 1000})\n ],\n default=5,\n )\n hostname = _ConfigValue(\"HOSTNAME\", default=socket.gethostname())\n auto_log_stacks = _BoolConfigValue(\"AUTO_LOG_STACKS\", default=True)\n transport_class = _ConfigValue(\"TRANSPORT_CLASS\", default=\"elasticapm.transport.http.Transport\", required=True)\n processors = _ListConfigValue(\n \"PROCESSORS\",\n default=[\n \"elasticapm.processors.sanitize_stacktrace_locals\",\n \"elasticapm.processors.sanitize_http_request_cookies\",\n \"elasticapm.processors.sanitize_http_response_cookies\",\n \"elasticapm.processors.sanitize_http_headers\",\n \"elasticapm.processors.sanitize_http_wsgi_env\",\n \"elasticapm.processors.sanitize_http_request_body\",\n ],\n )\n sanitize_field_names = _ListConfigValue(\n \"SANITIZE_FIELD_NAMES\", type=starmatch_to_regex, default=BASE_SANITIZE_FIELD_NAMES\n )\n metrics_sets = _ListConfigValue(\n \"METRICS_SETS\",\n default=[\n \"elasticapm.metrics.sets.cpu.CPUMetricSet\",\n \"elasticapm.metrics.sets.transactions.TransactionsMetricSet\",\n ],\n )\n metrics_interval = _ConfigValue(\n \"METRICS_INTERVAL\",\n type=int,\n validators=[duration_validator, ExcludeRangeValidator(1, 999, \"{range_start} - {range_end} ms\")],\n default=30000,\n )\n breakdown_metrics = _BoolConfigValue(\"BREAKDOWN_METRICS\", default=True)\n prometheus_metrics = _BoolConfigValue(\"PROMETHEUS_METRICS\", default=False)\n prometheus_metrics_prefix = _ConfigValue(\"PROMETHEUS_METRICS_PREFIX\", default=\"prometheus.metrics.\")\n disable_metrics = _ListConfigValue(\"DISABLE_METRICS\", type=starmatch_to_regex, default=[])\n central_config = _BoolConfigValue(\"CENTRAL_CONFIG\", default=True)\n api_request_size = _ConfigValue(\"API_REQUEST_SIZE\", type=int, validators=[size_validator], default=768 * 1024)\n api_request_time = _ConfigValue(\"API_REQUEST_TIME\", type=int, validators=[duration_validator], default=10 * 1000)\n transaction_sample_rate = _ConfigValue(\n \"TRANSACTION_SAMPLE_RATE\", type=float, validators=[PrecisionValidator(4, 0.0001)], default=1.0\n )\n transaction_max_spans = _ConfigValue(\"TRANSACTION_MAX_SPANS\", type=int, default=500)\n stack_trace_limit = _ConfigValue(\"STACK_TRACE_LIMIT\", type=int, default=500)\n span_frames_min_duration = _ConfigValue(\n \"SPAN_FRAMES_MIN_DURATION\",\n default=5,\n validators=[\n UnitValidator(r\"^((?:-)?\\d+)(ms|s|m)?$\", r\"\\d+(ms|s|m)\", {\"ms\": 1, \"s\": 1000, \"m\": 60000, None: 1})\n ],\n type=int,\n )\n collect_local_variables = _ConfigValue(\"COLLECT_LOCAL_VARIABLES\", default=\"errors\")\n source_lines_error_app_frames = _ConfigValue(\"SOURCE_LINES_ERROR_APP_FRAMES\", type=int, default=5)\n source_lines_error_library_frames = _ConfigValue(\"SOURCE_LINES_ERROR_LIBRARY_FRAMES\", type=int, default=5)\n source_lines_span_app_frames = _ConfigValue(\"SOURCE_LINES_SPAN_APP_FRAMES\", type=int, default=0)\n source_lines_span_library_frames = _ConfigValue(\"SOURCE_LINES_SPAN_LIBRARY_FRAMES\", type=int, default=0)\n local_var_max_length = _ConfigValue(\"LOCAL_VAR_MAX_LENGTH\", type=int, default=200)\n local_var_list_max_length = _ConfigValue(\"LOCAL_VAR_LIST_MAX_LENGTH\", type=int, default=10)\n local_var_dict_max_length = _ConfigValue(\"LOCAL_VAR_DICT_MAX_LENGTH\", type=int, default=10)\n capture_body = _ConfigValue(\n \"CAPTURE_BODY\",\n default=\"off\",\n validators=[lambda val, _: {\"errors\": \"error\", \"transactions\": \"transaction\"}.get(val, val)],\n )\n async_mode = _BoolConfigValue(\"ASYNC_MODE\", default=True)\n instrument_django_middleware = _BoolConfigValue(\"INSTRUMENT_DJANGO_MIDDLEWARE\", default=True)\n autoinsert_django_middleware = _BoolConfigValue(\"AUTOINSERT_DJANGO_MIDDLEWARE\", default=True)\n transactions_ignore_patterns = _ListConfigValue(\"TRANSACTIONS_IGNORE_PATTERNS\", default=[])\n transaction_ignore_urls = _ListConfigValue(\"TRANSACTION_IGNORE_URLS\", type=starmatch_to_regex, default=[])\n service_version = _ConfigValue(\"SERVICE_VERSION\")\n framework_name = _ConfigValue(\"FRAMEWORK_NAME\")\n framework_version = _ConfigValue(\"FRAMEWORK_VERSION\")\n global_labels = _DictConfigValue(\"GLOBAL_LABELS\")\n disable_send = _BoolConfigValue(\"DISABLE_SEND\", default=False)\n enabled = _BoolConfigValue(\"ENABLED\", default=True)\n recording = _BoolConfigValue(\"RECORDING\", default=True)\n instrument = _BoolConfigValue(\"INSTRUMENT\", default=True)\n enable_distributed_tracing = _BoolConfigValue(\"ENABLE_DISTRIBUTED_TRACING\", default=True)\n capture_headers = _BoolConfigValue(\"CAPTURE_HEADERS\", default=True)\n django_transaction_name_from_route = _BoolConfigValue(\"DJANGO_TRANSACTION_NAME_FROM_ROUTE\", default=False)\n disable_log_record_factory = _BoolConfigValue(\"DISABLE_LOG_RECORD_FACTORY\", default=False)\n use_elastic_traceparent_header = _BoolConfigValue(\"USE_ELASTIC_TRACEPARENT_HEADER\", default=True)\n use_elastic_excepthook = _BoolConfigValue(\"USE_ELASTIC_EXCEPTHOOK\", default=False)\n cloud_provider = _ConfigValue(\"CLOUD_PROVIDER\", default=True)\n log_level = _ConfigValue(\n \"LOG_LEVEL\",\n validators=[EnumerationValidator([\"trace\", \"debug\", \"info\", \"warning\", \"warn\", \"error\", \"critical\", \"off\"])],\n callbacks=[_log_level_callback],\n )\n log_file = _ConfigValue(\"LOG_FILE\", default=\"\")\n log_file_size = _ConfigValue(\"LOG_FILE_SIZE\", validators=[size_validator], type=int, default=50 * 1024 * 1024)\n log_ecs_formatting = _ConfigValue(\n \"LOG_ECS_FORMATTING\",\n validators=[EnumerationValidator([\"off\", \"override\"])],\n callbacks=[_log_ecs_formatting_callback],\n default=\"off\",\n )\n\n @property\n def is_recording(self):\n if not self.enabled:\n return False\n else:\n return self.recording\n\n\nclass VersionedConfig(ThreadManager):\n \"\"\"\n A thin layer around Config that provides versioning\n \"\"\"\n\n __slots__ = (\n \"_config\",\n \"_version\",\n \"_first_config\",\n \"_first_version\",\n \"_lock\",\n \"transport\",\n \"_update_thread\",\n \"pid\",\n )\n\n def __init__(self, config_object, version, transport=None):\n \"\"\"\n Create a new VersionedConfig with an initial Config object\n :param config_object: the initial Config object\n :param version: a version identifier for the configuration\n \"\"\"\n self._config = self._first_config = config_object\n self._version = self._first_version = version\n self.transport = transport\n self._lock = threading.Lock()\n self._update_thread = None\n super(VersionedConfig, self).__init__()\n\n def update(self, version, **config):\n \"\"\"\n Update the configuration version\n :param version: version identifier for the new configuration\n :param config: a key/value map of new configuration\n :return: configuration errors, if any\n \"\"\"\n new_config = self._config.copy()\n\n # pass an empty env dict to ensure the environment doesn't get precedence\n new_config.update(inline_dict=config, env_dict={})\n if not new_config.errors:\n with self._lock:\n self._version = version\n self._config = new_config\n else:\n return new_config.errors\n\n def reset(self):\n \"\"\"\n Reset state to the original configuration\n\n Note that because ConfigurationValues can have callbacks, we need to\n note any differences between the original configuration and the most\n recent configuration and run any callbacks that might exist for those\n values.\n \"\"\"\n callbacks = []\n for key in compat.iterkeys(self._config.values):\n if key in self._first_config.values and self._config.values[key] != self._first_config.values[key]:\n callbacks.append((key, self._config.values[key], self._first_config.values[key]))\n\n with self._lock:\n self._version = self._first_version\n self._config = self._first_config\n\n self._config.callbacks_queue.extend(callbacks)\n self._config.call_pending_callbacks()\n\n @property\n def changed(self):\n return self._config != self._first_config\n\n def __getattr__(self, item):\n return getattr(self._config, item)\n\n def __setattr__(self, name, value):\n if name not in self.__slots__:\n setattr(self._config, name, value)\n else:\n super(VersionedConfig, self).__setattr__(name, value)\n\n @property\n def config_version(self):\n return self._version\n\n def update_config(self):\n if not self.transport:\n logger.warning(\"No transport set for config updates, skipping\")\n return\n logger.debug(\"Checking for new config...\")\n keys = {\"service\": {\"name\": self.service_name}}\n if self.environment:\n keys[\"service\"][\"environment\"] = self.environment\n new_version, new_config, next_run = self.transport.get_config(self.config_version, keys)\n if new_version and new_config:\n errors = self.update(new_version, **new_config)\n if errors:\n logger.error(\"Error applying new configuration: %s\", repr(errors))\n else:\n logger.info(\n \"Applied new remote configuration: %s\",\n \"; \".join(\n \"%s=%s\" % (compat.text_type(k), compat.text_type(v)) for k, v in compat.iteritems(new_config)\n ),\n )\n elif new_version == self.config_version:\n logger.debug(\"Remote config unchanged\")\n elif not new_config and self.changed:\n logger.debug(\"Remote config disappeared, resetting to original\")\n self.reset()\n\n return next_run\n\n def start_thread(self, pid=None):\n self._update_thread = IntervalTimer(\n self.update_config, 1, \"eapm conf updater\", daemon=True, evaluate_function_interval=True\n )\n self._update_thread.start()\n super(VersionedConfig, self).start_thread(pid=pid)\n\n def stop_thread(self):\n if self._update_thread:\n self._update_thread.cancel()\n self._update_thread = None\n\n\ndef setup_logging(handler):\n \"\"\"\n Configures logging to pipe to Elastic APM.\n\n For a typical Python install:\n\n >>> from elasticapm.handlers.logging import LoggingHandler\n >>> client = ElasticAPM(...)\n >>> setup_logging(LoggingHandler(client))\n\n Within Django:\n\n >>> from elasticapm.contrib.django.handlers import LoggingHandler\n >>> setup_logging(LoggingHandler())\n\n Returns a boolean based on if logging was configured or not.\n \"\"\"\n # TODO We should probably revisit this. Does it make more sense as\n # a method within the Client class? The Client object could easily\n # pass itself into LoggingHandler and we could eliminate args altogether.\n logger = logging.getLogger()\n if handler.__class__ in map(type, logger.handlers):\n return False\n\n logger.addHandler(handler)\n\n return True\n", "path": "elasticapm/conf/__init__.py" } ]
[ { "content": "# BSD 3-Clause License\n#\n# Copyright (c) 2012, the Sentry Team, see AUTHORS for more details\n# Copyright (c) 2019, Elasticsearch BV\n# All rights reserved.\n#\n# Redistribution and use in source and binary forms, with or without\n# modification, are permitted provided that the following conditions are met:\n#\n# * Redistributions of source code must retain the above copyright notice, this\n# list of conditions and the following disclaimer.\n#\n# * Redistributions in binary form must reproduce the above copyright notice,\n# this list of conditions and the following disclaimer in the documentation\n# and/or other materials provided with the distribution.\n#\n# * Neither the name of the copyright holder nor the names of its\n# contributors may be used to endorse or promote products derived from\n# this software without specific prior written permission.\n#\n# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\n# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\n# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\n# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\n# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\n# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n\n\nimport logging\nimport logging.handlers\nimport math\nimport os\nimport re\nimport socket\nimport threading\n\nfrom elasticapm.conf.constants import BASE_SANITIZE_FIELD_NAMES\nfrom elasticapm.utils import compat, starmatch_to_regex\nfrom elasticapm.utils.logging import get_logger\nfrom elasticapm.utils.threading import IntervalTimer, ThreadManager\n\n__all__ = (\"setup_logging\", \"Config\")\n\n\nlogger = get_logger(\"elasticapm.conf\")\n\nlog_levels_map = {\n \"trace\": 5,\n \"debug\": logging.DEBUG,\n \"info\": logging.INFO,\n \"warning\": logging.WARNING,\n \"warn\": logging.WARNING,\n \"error\": logging.ERROR,\n \"critical\": logging.CRITICAL,\n \"off\": 1000,\n}\nlogfile_set_up = False\n\n\nclass ConfigurationError(ValueError):\n def __init__(self, msg, field_name):\n self.field_name = field_name\n super(ValueError, self).__init__(msg)\n\n\nclass _ConfigValue(object):\n \"\"\"\n Base class for configuration values\n\n dict_key\n String representing the key used for this config value in dict configs.\n env_key\n String representing the key used in environment variables for this\n config value. If not specified, will be set to `\"ELASTIC_APM_\" + dict_key`.\n type\n Type of value stored in this config value.\n validators\n List of validator classes. Must be callables, which will be called with\n a value and the dict_key for the config value. The validator either\n returns the validated value or raises a ConfigurationError if validation\n fails.\n callbacks\n List of functions which will be called when the config value is updated.\n The callbacks must match this signature:\n callback(dict_key, old_value, new_value, config_instance)\n\n Note that callbacks wait until the end of any given `update()` operation\n and are called at this point. This, coupled with the fact that callbacks\n receive the config instance, means that callbacks can utilize multiple\n configuration values (such as is the case for logging). This is\n complicated if more than one of the involved config values are\n dynamic, as both would need callbacks and the callback would need to\n be idempotent.\n callbacks_on_default\n Whether the callback should be called on config initialization if the\n default value is used. Default: True\n default\n The default for this config value if not user-configured.\n required\n Whether this config value is required. If a default is specified,\n this is a redundant option (except to ensure that this config value\n is specified if a default were ever to be removed).\n\n Note that _ConfigValues and any inheriting classes must implement __set__\n and __get__. The calling instance will always be a _ConfigBase descendant\n and the __set__ and __get__ calls will access `instance._values[self.dict_key]`\n to get and set values.\n \"\"\"\n\n def __init__(\n self,\n dict_key,\n env_key=None,\n type=compat.text_type,\n validators=None,\n callbacks=None,\n callbacks_on_default=True,\n default=None,\n required=False,\n ):\n self.type = type\n self.dict_key = dict_key\n self.validators = validators\n self.callbacks = callbacks\n self.default = default\n self.required = required\n if env_key is None:\n env_key = \"ELASTIC_APM_\" + dict_key\n self.env_key = env_key\n self.callbacks_on_default = callbacks_on_default\n\n def __get__(self, instance, owner):\n if instance:\n return instance._values.get(self.dict_key, self.default)\n else:\n return self.default\n\n def __set__(self, config_instance, value):\n value = self._validate(config_instance, value)\n self._callback_if_changed(config_instance, value)\n config_instance._values[self.dict_key] = value\n\n def _validate(self, instance, value):\n if value is None and self.required:\n raise ConfigurationError(\n \"Configuration error: value for {} is required.\".format(self.dict_key), self.dict_key\n )\n if self.validators and value is not None:\n for validator in self.validators:\n value = validator(value, self.dict_key)\n if self.type and value is not None:\n try:\n value = self.type(value)\n except ValueError as e:\n raise ConfigurationError(\"{}: {}\".format(self.dict_key, compat.text_type(e)), self.dict_key)\n instance._errors.pop(self.dict_key, None)\n return value\n\n def _callback_if_changed(self, instance, new_value):\n \"\"\"\n If the value changed (checked against instance._values[self.dict_key]),\n then run the callback function (if defined)\n \"\"\"\n old_value = instance._values.get(self.dict_key, self.default)\n if old_value != new_value:\n instance.callbacks_queue.append((self.dict_key, old_value, new_value))\n\n def call_callbacks(self, old_value, new_value, config_instance):\n if not self.callbacks:\n return\n for callback in self.callbacks:\n try:\n callback(self.dict_key, old_value, new_value, config_instance)\n except Exception as e:\n raise ConfigurationError(\n \"Callback {} raised an exception when setting {} to {}: {}\".format(\n callback, self.dict_key, new_value, e\n ),\n self.dict_key,\n )\n\n\nclass _ListConfigValue(_ConfigValue):\n def __init__(self, dict_key, list_separator=\",\", **kwargs):\n self.list_separator = list_separator\n super(_ListConfigValue, self).__init__(dict_key, **kwargs)\n\n def __set__(self, instance, value):\n if isinstance(value, compat.string_types):\n value = value.split(self.list_separator)\n elif value is not None:\n value = list(value)\n if value:\n value = [self.type(item) for item in value]\n self._callback_if_changed(instance, value)\n instance._values[self.dict_key] = value\n\n\nclass _DictConfigValue(_ConfigValue):\n def __init__(self, dict_key, item_separator=\",\", keyval_separator=\"=\", **kwargs):\n self.item_separator = item_separator\n self.keyval_separator = keyval_separator\n super(_DictConfigValue, self).__init__(dict_key, **kwargs)\n\n def __set__(self, instance, value):\n if isinstance(value, compat.string_types):\n items = (item.split(self.keyval_separator) for item in value.split(self.item_separator))\n value = {key.strip(): self.type(val.strip()) for key, val in items}\n elif not isinstance(value, dict):\n # TODO: better error handling\n value = None\n self._callback_if_changed(instance, value)\n instance._values[self.dict_key] = value\n\n\nclass _BoolConfigValue(_ConfigValue):\n def __init__(self, dict_key, true_string=\"true\", false_string=\"false\", **kwargs):\n self.true_string = true_string\n self.false_string = false_string\n super(_BoolConfigValue, self).__init__(dict_key, **kwargs)\n\n def __set__(self, instance, value):\n if isinstance(value, compat.string_types):\n if value.lower() == self.true_string:\n value = True\n elif value.lower() == self.false_string:\n value = False\n self._callback_if_changed(instance, value)\n instance._values[self.dict_key] = bool(value)\n\n\nclass RegexValidator(object):\n def __init__(self, regex, verbose_pattern=None):\n self.regex = regex\n self.verbose_pattern = verbose_pattern or regex\n\n def __call__(self, value, field_name):\n value = compat.text_type(value)\n match = re.match(self.regex, value)\n if match:\n return value\n raise ConfigurationError(\"{} does not match pattern {}\".format(value, self.verbose_pattern), field_name)\n\n\nclass UnitValidator(object):\n def __init__(self, regex, verbose_pattern, unit_multipliers):\n self.regex = regex\n self.verbose_pattern = verbose_pattern\n self.unit_multipliers = unit_multipliers\n\n def __call__(self, value, field_name):\n value = compat.text_type(value)\n match = re.match(self.regex, value, re.IGNORECASE)\n if not match:\n raise ConfigurationError(\"{} does not match pattern {}\".format(value, self.verbose_pattern), field_name)\n val, unit = match.groups()\n try:\n val = int(val) * self.unit_multipliers[unit]\n except KeyError:\n raise ConfigurationError(\"{} is not a supported unit\".format(unit), field_name)\n return val\n\n\nclass PrecisionValidator(object):\n \"\"\"\n Forces a float value to `precision` digits of precision.\n\n Rounds half away from zero.\n\n If `minimum` is provided, and the value rounds to 0 (but was not zero to\n begin with), use the minimum instead.\n \"\"\"\n\n def __init__(self, precision=0, minimum=None):\n self.precision = precision\n self.minimum = minimum\n\n def __call__(self, value, field_name):\n try:\n value = float(value)\n except ValueError:\n raise ConfigurationError(\"{} is not a float\".format(value), field_name)\n multiplier = 10 ** self.precision\n rounded = math.floor(value * multiplier + 0.5) / multiplier\n if rounded == 0 and self.minimum and value != 0:\n rounded = self.minimum\n return rounded\n\n\nduration_validator = UnitValidator(r\"^((?:-)?\\d+)(ms|s|m)$\", r\"\\d+(ms|s|m)\", {\"ms\": 1, \"s\": 1000, \"m\": 60000})\nsize_validator = UnitValidator(\n r\"^(\\d+)(b|kb|mb|gb)$\", r\"\\d+(b|KB|MB|GB)\", {\"b\": 1, \"kb\": 1024, \"mb\": 1024 * 1024, \"gb\": 1024 * 1024 * 1024}\n)\n\n\nclass ExcludeRangeValidator(object):\n def __init__(self, range_start, range_end, range_desc):\n self.range_start = range_start\n self.range_end = range_end\n self.range_desc = range_desc\n\n def __call__(self, value, field_name):\n if self.range_start <= value <= self.range_end:\n raise ConfigurationError(\n \"{} cannot be in range: {}\".format(\n value, self.range_desc.format(**{\"range_start\": self.range_start, \"range_end\": self.range_end})\n ),\n field_name,\n )\n return value\n\n\nclass FileIsReadableValidator(object):\n def __call__(self, value, field_name):\n value = os.path.normpath(value)\n if not os.path.exists(value):\n raise ConfigurationError(\"{} does not exist\".format(value), field_name)\n elif not os.path.isfile(value):\n raise ConfigurationError(\"{} is not a file\".format(value), field_name)\n elif not os.access(value, os.R_OK):\n raise ConfigurationError(\"{} is not readable\".format(value), field_name)\n return value\n\n\nclass EnumerationValidator(object):\n \"\"\"\n Validator which ensures that a given config value is chosen from a list\n of valid string options.\n \"\"\"\n\n def __init__(self, valid_values, case_sensitive=False):\n \"\"\"\n valid_values\n List of valid string values for the config value\n case_sensitive\n Whether to compare case when comparing a value to the valid list.\n Defaults to False (case-insensitive)\n \"\"\"\n self.case_sensitive = case_sensitive\n if case_sensitive:\n self.valid_values = {s: s for s in valid_values}\n else:\n self.valid_values = {s.lower(): s for s in valid_values}\n\n def __call__(self, value, field_name):\n if self.case_sensitive:\n ret = self.valid_values.get(value)\n else:\n ret = self.valid_values.get(value.lower())\n if ret is None:\n raise ConfigurationError(\n \"{} is not in the list of valid values: {}\".format(value, list(self.valid_values.values())), field_name\n )\n return ret\n\n\ndef _log_level_callback(dict_key, old_value, new_value, config_instance):\n elasticapm_logger = logging.getLogger(\"elasticapm\")\n elasticapm_logger.setLevel(log_levels_map.get(new_value, 100))\n\n global logfile_set_up\n if not logfile_set_up and config_instance.log_file:\n logfile_set_up = True\n filehandler = logging.handlers.RotatingFileHandler(\n config_instance.log_file, maxBytes=config_instance.log_file_size, backupCount=1\n )\n try:\n import ecs_logging\n\n filehandler.setFormatter(ecs_logging.StdlibFormatter())\n except ImportError:\n pass\n elasticapm_logger.addHandler(filehandler)\n\n\ndef _log_ecs_formatting_callback(dict_key, old_value, new_value, config_instance):\n \"\"\"\n If ecs_logging is installed and log_ecs_formatting is set to \"override\", we should\n set the ecs_logging.StdlibFormatter as the formatted for every handler in\n the root logger, and set the default processor for structlog to the\n ecs_logging.StructlogFormatter.\n \"\"\"\n if new_value.lower() == \"override\":\n try:\n import ecs_logging\n except ImportError:\n return\n\n # Stdlib\n root_logger = logging.getLogger()\n formatter = ecs_logging.StdlibFormatter()\n for handler in root_logger.handlers:\n handler.setFormatter(formatter)\n\n # Structlog\n try:\n import structlog\n\n structlog.configure(processors=[ecs_logging.StructlogFormatter()])\n except ImportError:\n pass\n\n\nclass _ConfigBase(object):\n _NO_VALUE = object() # sentinel object\n\n def __init__(self, config_dict=None, env_dict=None, inline_dict=None, copy=False):\n \"\"\"\n config_dict\n Configuration dict as is common for frameworks such as flask and django.\n Keys match the _ConfigValue.dict_key (usually all caps)\n env_dict\n Environment variables dict. Keys match the _ConfigValue.env_key\n (usually \"ELASTIC_APM_\" + dict_key)\n inline_dict\n Any config passed in as kwargs to the Client object. Typically\n the keys match the names of the _ConfigValue variables in the Config\n object.\n copy\n Whether this object is being created to copy an existing Config\n object. If True, don't run the initial `update` (which would call\n callbacks if present)\n \"\"\"\n self._values = {}\n self._errors = {}\n self._dict_key_lookup = {}\n self.callbacks_queue = []\n for config_value in self.__class__.__dict__.values():\n if not isinstance(config_value, _ConfigValue):\n continue\n self._dict_key_lookup[config_value.dict_key] = config_value\n if not copy:\n self.update(config_dict, env_dict, inline_dict, initial=True)\n\n def update(self, config_dict=None, env_dict=None, inline_dict=None, initial=False):\n if config_dict is None:\n config_dict = {}\n if env_dict is None:\n env_dict = os.environ\n if inline_dict is None:\n inline_dict = {}\n for field, config_value in compat.iteritems(self.__class__.__dict__):\n if not isinstance(config_value, _ConfigValue):\n continue\n new_value = self._NO_VALUE\n # first check environment\n if config_value.env_key and config_value.env_key in env_dict:\n new_value = env_dict[config_value.env_key]\n # check the inline config\n elif field in inline_dict:\n new_value = inline_dict[field]\n # finally, check config dictionary\n elif config_value.dict_key in config_dict:\n new_value = config_dict[config_value.dict_key]\n # only set if new_value changed. We'll fall back to the field default if not.\n if new_value is not self._NO_VALUE:\n try:\n setattr(self, field, new_value)\n except ConfigurationError as e:\n self._errors[e.field_name] = str(e)\n # handle initial callbacks\n if (\n initial\n and config_value.callbacks_on_default\n and getattr(self, field) is not None\n and getattr(self, field) == config_value.default\n ):\n self.callbacks_queue.append((config_value.dict_key, self._NO_VALUE, config_value.default))\n # if a field has not been provided by any config source, we have to check separately if it is required\n if config_value.required and getattr(self, field) is None:\n self._errors[config_value.dict_key] = \"Configuration error: value for {} is required.\".format(\n config_value.dict_key\n )\n self.call_pending_callbacks()\n\n def call_pending_callbacks(self):\n \"\"\"\n Call callbacks for config options matching list of tuples:\n\n (dict_key, old_value, new_value)\n \"\"\"\n for dict_key, old_value, new_value in self.callbacks_queue:\n self._dict_key_lookup[dict_key].call_callbacks(old_value, new_value, self)\n self.callbacks_queue = []\n\n @property\n def values(self):\n return self._values\n\n @values.setter\n def values(self, values):\n self._values = values\n\n @property\n def errors(self):\n return self._errors\n\n def copy(self):\n c = self.__class__(copy=True)\n c._errors = {}\n c.values = self.values.copy()\n return c\n\n\nclass Config(_ConfigBase):\n service_name = _ConfigValue(\n \"SERVICE_NAME\", validators=[RegexValidator(\"^[a-zA-Z0-9 _-]+$\")], default=\"python_service\", required=True\n )\n service_node_name = _ConfigValue(\"SERVICE_NODE_NAME\")\n environment = _ConfigValue(\"ENVIRONMENT\")\n secret_token = _ConfigValue(\"SECRET_TOKEN\")\n api_key = _ConfigValue(\"API_KEY\")\n debug = _BoolConfigValue(\"DEBUG\", default=False)\n server_url = _ConfigValue(\"SERVER_URL\", default=\"http://localhost:8200\", required=True)\n server_cert = _ConfigValue(\"SERVER_CERT\", validators=[FileIsReadableValidator()])\n verify_server_cert = _BoolConfigValue(\"VERIFY_SERVER_CERT\", default=True)\n include_paths = _ListConfigValue(\"INCLUDE_PATHS\")\n exclude_paths = _ListConfigValue(\"EXCLUDE_PATHS\", default=compat.get_default_library_patters())\n filter_exception_types = _ListConfigValue(\"FILTER_EXCEPTION_TYPES\")\n server_timeout = _ConfigValue(\n \"SERVER_TIMEOUT\",\n type=float,\n validators=[\n UnitValidator(r\"^((?:-)?\\d+)(ms|s|m)?$\", r\"\\d+(ms|s|m)\", {\"ms\": 0.001, \"s\": 1, \"m\": 60, None: 1000})\n ],\n default=5,\n )\n hostname = _ConfigValue(\"HOSTNAME\", default=socket.gethostname())\n auto_log_stacks = _BoolConfigValue(\"AUTO_LOG_STACKS\", default=True)\n transport_class = _ConfigValue(\"TRANSPORT_CLASS\", default=\"elasticapm.transport.http.Transport\", required=True)\n processors = _ListConfigValue(\n \"PROCESSORS\",\n default=[\n \"elasticapm.processors.sanitize_stacktrace_locals\",\n \"elasticapm.processors.sanitize_http_request_cookies\",\n \"elasticapm.processors.sanitize_http_response_cookies\",\n \"elasticapm.processors.sanitize_http_headers\",\n \"elasticapm.processors.sanitize_http_wsgi_env\",\n \"elasticapm.processors.sanitize_http_request_body\",\n ],\n )\n sanitize_field_names = _ListConfigValue(\n \"SANITIZE_FIELD_NAMES\", type=starmatch_to_regex, default=BASE_SANITIZE_FIELD_NAMES\n )\n metrics_sets = _ListConfigValue(\n \"METRICS_SETS\",\n default=[\n \"elasticapm.metrics.sets.cpu.CPUMetricSet\",\n \"elasticapm.metrics.sets.transactions.TransactionsMetricSet\",\n ],\n )\n metrics_interval = _ConfigValue(\n \"METRICS_INTERVAL\",\n type=int,\n validators=[duration_validator, ExcludeRangeValidator(1, 999, \"{range_start} - {range_end} ms\")],\n default=30000,\n )\n breakdown_metrics = _BoolConfigValue(\"BREAKDOWN_METRICS\", default=True)\n prometheus_metrics = _BoolConfigValue(\"PROMETHEUS_METRICS\", default=False)\n prometheus_metrics_prefix = _ConfigValue(\"PROMETHEUS_METRICS_PREFIX\", default=\"prometheus.metrics.\")\n disable_metrics = _ListConfigValue(\"DISABLE_METRICS\", type=starmatch_to_regex, default=[])\n central_config = _BoolConfigValue(\"CENTRAL_CONFIG\", default=True)\n api_request_size = _ConfigValue(\"API_REQUEST_SIZE\", type=int, validators=[size_validator], default=768 * 1024)\n api_request_time = _ConfigValue(\"API_REQUEST_TIME\", type=int, validators=[duration_validator], default=10 * 1000)\n transaction_sample_rate = _ConfigValue(\n \"TRANSACTION_SAMPLE_RATE\", type=float, validators=[PrecisionValidator(4, 0.0001)], default=1.0\n )\n transaction_max_spans = _ConfigValue(\"TRANSACTION_MAX_SPANS\", type=int, default=500)\n stack_trace_limit = _ConfigValue(\"STACK_TRACE_LIMIT\", type=int, default=500)\n span_frames_min_duration = _ConfigValue(\n \"SPAN_FRAMES_MIN_DURATION\",\n default=5,\n validators=[\n UnitValidator(r\"^((?:-)?\\d+)(ms|s|m)?$\", r\"\\d+(ms|s|m)\", {\"ms\": 1, \"s\": 1000, \"m\": 60000, None: 1})\n ],\n type=int,\n )\n collect_local_variables = _ConfigValue(\"COLLECT_LOCAL_VARIABLES\", default=\"errors\")\n source_lines_error_app_frames = _ConfigValue(\"SOURCE_LINES_ERROR_APP_FRAMES\", type=int, default=5)\n source_lines_error_library_frames = _ConfigValue(\"SOURCE_LINES_ERROR_LIBRARY_FRAMES\", type=int, default=5)\n source_lines_span_app_frames = _ConfigValue(\"SOURCE_LINES_SPAN_APP_FRAMES\", type=int, default=0)\n source_lines_span_library_frames = _ConfigValue(\"SOURCE_LINES_SPAN_LIBRARY_FRAMES\", type=int, default=0)\n local_var_max_length = _ConfigValue(\"LOCAL_VAR_MAX_LENGTH\", type=int, default=200)\n local_var_list_max_length = _ConfigValue(\"LOCAL_VAR_LIST_MAX_LENGTH\", type=int, default=10)\n local_var_dict_max_length = _ConfigValue(\"LOCAL_VAR_DICT_MAX_LENGTH\", type=int, default=10)\n capture_body = _ConfigValue(\n \"CAPTURE_BODY\",\n default=\"off\",\n validators=[lambda val, _: {\"errors\": \"error\", \"transactions\": \"transaction\"}.get(val, val)],\n )\n async_mode = _BoolConfigValue(\"ASYNC_MODE\", default=True)\n instrument_django_middleware = _BoolConfigValue(\"INSTRUMENT_DJANGO_MIDDLEWARE\", default=True)\n autoinsert_django_middleware = _BoolConfigValue(\"AUTOINSERT_DJANGO_MIDDLEWARE\", default=True)\n transactions_ignore_patterns = _ListConfigValue(\"TRANSACTIONS_IGNORE_PATTERNS\", default=[])\n transaction_ignore_urls = _ListConfigValue(\"TRANSACTION_IGNORE_URLS\", type=starmatch_to_regex, default=[])\n service_version = _ConfigValue(\"SERVICE_VERSION\")\n framework_name = _ConfigValue(\"FRAMEWORK_NAME\")\n framework_version = _ConfigValue(\"FRAMEWORK_VERSION\")\n global_labels = _DictConfigValue(\"GLOBAL_LABELS\")\n disable_send = _BoolConfigValue(\"DISABLE_SEND\", default=False)\n enabled = _BoolConfigValue(\"ENABLED\", default=True)\n recording = _BoolConfigValue(\"RECORDING\", default=True)\n instrument = _BoolConfigValue(\"INSTRUMENT\", default=True)\n enable_distributed_tracing = _BoolConfigValue(\"ENABLE_DISTRIBUTED_TRACING\", default=True)\n capture_headers = _BoolConfigValue(\"CAPTURE_HEADERS\", default=True)\n django_transaction_name_from_route = _BoolConfigValue(\"DJANGO_TRANSACTION_NAME_FROM_ROUTE\", default=False)\n disable_log_record_factory = _BoolConfigValue(\"DISABLE_LOG_RECORD_FACTORY\", default=False)\n use_elastic_traceparent_header = _BoolConfigValue(\"USE_ELASTIC_TRACEPARENT_HEADER\", default=True)\n use_elastic_excepthook = _BoolConfigValue(\"USE_ELASTIC_EXCEPTHOOK\", default=False)\n cloud_provider = _ConfigValue(\"CLOUD_PROVIDER\", default=True)\n log_level = _ConfigValue(\n \"LOG_LEVEL\",\n validators=[EnumerationValidator([\"trace\", \"debug\", \"info\", \"warning\", \"warn\", \"error\", \"critical\", \"off\"])],\n callbacks=[_log_level_callback],\n )\n log_file = _ConfigValue(\"LOG_FILE\", default=\"\")\n log_file_size = _ConfigValue(\"LOG_FILE_SIZE\", validators=[size_validator], type=int, default=50 * 1024 * 1024)\n log_ecs_formatting = _ConfigValue(\n \"LOG_ECS_FORMATTING\",\n validators=[EnumerationValidator([\"off\", \"override\"])],\n callbacks=[_log_ecs_formatting_callback],\n default=\"off\",\n )\n\n @property\n def is_recording(self):\n if not self.enabled:\n return False\n else:\n return self.recording\n\n\nclass VersionedConfig(ThreadManager):\n \"\"\"\n A thin layer around Config that provides versioning\n \"\"\"\n\n __slots__ = (\n \"_config\",\n \"_version\",\n \"_first_config\",\n \"_first_version\",\n \"_lock\",\n \"transport\",\n \"_update_thread\",\n \"pid\",\n \"start_stop_order\",\n )\n\n def __init__(self, config_object, version, transport=None):\n \"\"\"\n Create a new VersionedConfig with an initial Config object\n :param config_object: the initial Config object\n :param version: a version identifier for the configuration\n \"\"\"\n self._config = self._first_config = config_object\n self._version = self._first_version = version\n self.transport = transport\n self._lock = threading.Lock()\n self._update_thread = None\n super(VersionedConfig, self).__init__()\n\n def update(self, version, **config):\n \"\"\"\n Update the configuration version\n :param version: version identifier for the new configuration\n :param config: a key/value map of new configuration\n :return: configuration errors, if any\n \"\"\"\n new_config = self._config.copy()\n\n # pass an empty env dict to ensure the environment doesn't get precedence\n new_config.update(inline_dict=config, env_dict={})\n if not new_config.errors:\n with self._lock:\n self._version = version\n self._config = new_config\n else:\n return new_config.errors\n\n def reset(self):\n \"\"\"\n Reset state to the original configuration\n\n Note that because ConfigurationValues can have callbacks, we need to\n note any differences between the original configuration and the most\n recent configuration and run any callbacks that might exist for those\n values.\n \"\"\"\n callbacks = []\n for key in compat.iterkeys(self._config.values):\n if key in self._first_config.values and self._config.values[key] != self._first_config.values[key]:\n callbacks.append((key, self._config.values[key], self._first_config.values[key]))\n\n with self._lock:\n self._version = self._first_version\n self._config = self._first_config\n\n self._config.callbacks_queue.extend(callbacks)\n self._config.call_pending_callbacks()\n\n @property\n def changed(self):\n return self._config != self._first_config\n\n def __getattr__(self, item):\n return getattr(self._config, item)\n\n def __setattr__(self, name, value):\n if name not in self.__slots__:\n setattr(self._config, name, value)\n else:\n super(VersionedConfig, self).__setattr__(name, value)\n\n @property\n def config_version(self):\n return self._version\n\n def update_config(self):\n if not self.transport:\n logger.warning(\"No transport set for config updates, skipping\")\n return\n logger.debug(\"Checking for new config...\")\n keys = {\"service\": {\"name\": self.service_name}}\n if self.environment:\n keys[\"service\"][\"environment\"] = self.environment\n new_version, new_config, next_run = self.transport.get_config(self.config_version, keys)\n if new_version and new_config:\n errors = self.update(new_version, **new_config)\n if errors:\n logger.error(\"Error applying new configuration: %s\", repr(errors))\n else:\n logger.info(\n \"Applied new remote configuration: %s\",\n \"; \".join(\n \"%s=%s\" % (compat.text_type(k), compat.text_type(v)) for k, v in compat.iteritems(new_config)\n ),\n )\n elif new_version == self.config_version:\n logger.debug(\"Remote config unchanged\")\n elif not new_config and self.changed:\n logger.debug(\"Remote config disappeared, resetting to original\")\n self.reset()\n\n return next_run\n\n def start_thread(self, pid=None):\n self._update_thread = IntervalTimer(\n self.update_config, 1, \"eapm conf updater\", daemon=True, evaluate_function_interval=True\n )\n self._update_thread.start()\n super(VersionedConfig, self).start_thread(pid=pid)\n\n def stop_thread(self):\n if self._update_thread:\n self._update_thread.cancel()\n self._update_thread = None\n\n\ndef setup_logging(handler):\n \"\"\"\n Configures logging to pipe to Elastic APM.\n\n For a typical Python install:\n\n >>> from elasticapm.handlers.logging import LoggingHandler\n >>> client = ElasticAPM(...)\n >>> setup_logging(LoggingHandler(client))\n\n Within Django:\n\n >>> from elasticapm.contrib.django.handlers import LoggingHandler\n >>> setup_logging(LoggingHandler())\n\n Returns a boolean based on if logging was configured or not.\n \"\"\"\n # TODO We should probably revisit this. Does it make more sense as\n # a method within the Client class? The Client object could easily\n # pass itself into LoggingHandler and we could eliminate args altogether.\n logger = logging.getLogger()\n if handler.__class__ in map(type, logger.handlers):\n return False\n\n logger.addHandler(handler)\n\n return True\n", "path": "elasticapm/conf/__init__.py" } ]
diff --git a/elasticapm/conf/__init__.py b/elasticapm/conf/__init__.py index c670e4050..bbb665206 100644 --- a/elasticapm/conf/__init__.py +++ b/elasticapm/conf/__init__.py @@ -647,6 +647,7 @@ class VersionedConfig(ThreadManager): "transport", "_update_thread", "pid", + "start_stop_order", ) def __init__(self, config_object, version, transport=None): diff --git a/tests/config/tests.py b/tests/config/tests.py index 42be88be6..f44920a2b 100644 --- a/tests/config/tests.py +++ b/tests/config/tests.py @@ -428,3 +428,13 @@ def test_valid_values_validator(): assert v("Bar", "foo") == "Bar" with pytest.raises(ConfigurationError): v("foobar", "foo") + + +def test_versioned_config_attribute_access(elasticapm_client): + # see https://github.com/elastic/apm-agent-python/issues/1147 + val = elasticapm_client.config.start_stop_order + assert isinstance(val, int) + # update config to ensure start_stop_order isn't read from the proxied Config object + elasticapm_client.config.update("2", capture_body=True) + val = elasticapm_client.config.start_stop_order + assert isinstance(val, int)
facebookresearch__xformers-151
[ { "content": "# Copyright (c) Facebook, Inc. and its affiliates. All rights reserved.\n#\n# This source code is licensed under the BSD license found in the\n# LICENSE file in the root directory of this source tree.\n\n\nimport logging\nfrom enum import Enum\nfrom typing import Optional\n\nimport torch\nimport triton\nfrom torch.cuda.amp import custom_bwd, custom_fwd\n\nfrom xformers.triton.k_softmax import _softmax, _softmax_backward\n\n# CREDITS: This is adapted from the vanilla Triton example. See https://openai.com/blog/triton/\n# and https://triton-lang.org/getting-started/tutorials/02-fused-softmax.html\n\n\n_triton_registered_overflow = False\n_triton_registered_warnings = False\n_triton_softmax_fp16_enabled = False # NOTE: PyTorch keeps softmax as fp32\n\n\nclass MaskType(str, Enum):\n ADD = \"add\"\n MUL = \"mul\"\n\n\n# Helper to handle the SPMD launch grid and error cases\nclass _softmax_triton(torch.autograd.Function):\n @staticmethod\n @custom_fwd(cast_inputs=torch.float16 if _triton_softmax_fp16_enabled else None)\n def forward(ctx, x, mask, log_outputs, causal):\n \"\"\"\n Fused softmax implementation, using the Triton programming model.\n This only supports a reduction over the last dimension for now\n \"\"\"\n\n # Handle 2D/3D tensors\n x_ = x.unsqueeze(0) if x.ndim == 2 else x\n\n if not x_.is_contiguous():\n x_ = x_.contiguous()\n\n y = torch.empty_like(x_)\n assert (\n y.stride(2) == 1 and x_.stride(2) == 1\n ), f\"{x.shape} - {x_.shape} - {x_.stride()}\"\n\n # SPMD launch grid\n grid_2d = (\n x_.shape[0],\n x_.shape[1],\n )\n\n # enqueue GPU kernel\n use_mask = True\n if mask is None:\n # placeholder, will not be used\n mask = x_\n use_mask = False\n else:\n # Make sure that the mask is binary\n assert mask.dtype == x.dtype, \"An additive mask is requested\"\n\n _softmax[grid_2d](\n y,\n x_,\n mask,\n y.stride(0),\n y.stride(1),\n x_.stride(0),\n x_.stride(1),\n mask.stride(0),\n x_.shape[2],\n log=log_outputs,\n use_mask=use_mask,\n causal=causal,\n )\n\n ctx.save_for_backward(y)\n ctx.log_outputs = log_outputs\n ctx.causal = causal\n return y.reshape_as(x)\n\n @staticmethod\n @custom_bwd\n def backward(ctx, grad_out):\n (out,) = ctx.saved_tensors\n\n # Handle 2D/3D tensors\n grad_out_ = grad_out.unsqueeze(0) if grad_out.ndim == 2 else grad_out\n\n # SPMD launch grid\n grid_2d = (\n grad_out_.shape[0],\n grad_out_.shape[1],\n )\n\n depth = triton.next_power_of_2(grad_out_.shape[2])\n grad_in = torch.empty_like(\n out\n ) # torch.zeros is measurably slower, we'll zero out in the kernel\n\n # Make sure that the tensor are contiguous\n grad_in, grad_out, out = map(lambda x: x.contiguous(), [grad_in, grad_out, out])\n\n # fmt: off\n _softmax_backward[grid_2d](\n grad_in, grad_out_, out,\n grad_in.stride(0), grad_in.stride(1),\n grad_out_.stride(0), grad_out_.stride(1),\n out.stride(0), out.stride(1),\n out.shape[2],\n depth=depth,\n log=ctx.log_outputs,\n causal=ctx.causal\n )\n # fmt: on\n return grad_in.reshape_as(grad_out), None, None, None\n\n\ndef softmax(\n x: torch.Tensor, mask: Optional[torch.Tensor] = None, causal: bool = False\n) -> torch.Tensor:\n r\"\"\"Applies the Softmax function to an 3-dimensional input Tensor\n rescaling them so that the elements of the n-dimensional output Tensor\n lie in the range [0,1] and sum to 1.\n\n Softmax is defined as:\n\n .. math::\n \\text{Softmax}(x_{i}) = \\frac{\\exp(x_i)}{\\sum_j \\exp(x_j)}\n\n .. warning: softmax is computed on the last dimension of the input tensor.\n\n\n Args:\n x: input tensor.\n mask: optional mask, its application will be fused to the softmax computation if triton is used\n causal: optional performance optimization, if triton is used and the attention is causal\n\n Returns:\n a Tensor of the same dimension and shape as the input with\n values in the range [0, 1] and sum to 1\n \"\"\"\n return _softmax_dispatch(x, log=False, mask=mask, causal=causal)\n\n\ndef log_softmax(\n x: torch.Tensor, mask: Optional[torch.Tensor] = None, causal: bool = False\n) -> torch.Tensor:\n r\"\"\"Applies the :math:`\\log(\\text{Softmax}(x))` function to an 3-dimensional\n input Tensor. The LogSoftmax formulation can be simplified as:\n\n .. math::\n \\text{LogSoftmax}(x_{i}) = \\log\\left(\\frac{\\exp(x_i) }{ \\sum_j \\exp(x_j)} \\right)\n\n Args:\n x: input tensor.\n\n Returns:\n a Tensor of the same dimension and shape as the input with\n values in the range [-inf, 0)\n \"\"\"\n return _softmax_dispatch(x, log=True, mask=mask, causal=causal)\n\n\ndef _softmax_dispatch(\n x: torch.Tensor, log: bool, mask: Optional[torch.Tensor], causal: bool = False\n) -> torch.Tensor:\n # Triton is used if\n # - CUDA\n # - there's enough data to make it faster than pytorch. This could change over time, Triton is improving\n # - there was no previous failure\n\n global _triton_registered_overflow\n global _triton_registered_warnings\n\n try:\n if torch.cuda.is_available() and x.is_cuda and not _triton_registered_overflow:\n return _softmax_triton.apply(x, mask, log, causal)\n except (triton.code_gen.OutOfResources, RuntimeError) as e:\n # Catch cases where the current GPU does not have enough registers to hold a full tensor line\n # fallback to PyTorch's implementation, which streams the tensor in and out\n _triton_registered_overflow = True\n logging.warning(\n \"Triton softmax kernel register spillover or invalid image caught.\"\n \"Deactivating this kernel, please file an issue int the xFormers repository\"\n )\n logging.warning(e)\n\n if causal and not _triton_registered_warnings:\n logging.warning(\n \"Triton softmax could not be used. \\\n The causal flags is being passed but it does not provide any benefit with PyTorch softmax.\"\n )\n _triton_registered_warnings = True\n\n if mask is not None:\n x += mask\n\n if log:\n return torch.log_softmax(x, dim=-1)\n else:\n return torch.softmax(x, dim=-1)\n", "path": "xformers/triton/softmax.py" } ]
[ { "content": "# Copyright (c) Facebook, Inc. and its affiliates. All rights reserved.\n#\n# This source code is licensed under the BSD license found in the\n# LICENSE file in the root directory of this source tree.\n\n\nimport logging\nfrom enum import Enum\nfrom typing import Optional\n\nimport torch\nimport triton\nfrom torch.cuda.amp import custom_bwd, custom_fwd\n\nfrom xformers.triton.k_softmax import _softmax, _softmax_backward\n\n# CREDITS: This is adapted from the vanilla Triton example. See https://openai.com/blog/triton/\n# and https://triton-lang.org/getting-started/tutorials/02-fused-softmax.html\n\n\n_triton_registered_overflow = False\n_triton_registered_warnings = False\n_triton_softmax_fp16_enabled = False # NOTE: PyTorch keeps softmax as fp32\n\n\nclass MaskType(str, Enum):\n ADD = \"add\"\n MUL = \"mul\"\n\n\n# Helper to handle the SPMD launch grid and error cases\nclass _softmax_triton(torch.autograd.Function):\n @staticmethod\n @custom_fwd(cast_inputs=torch.float16 if _triton_softmax_fp16_enabled else None)\n def forward(ctx, x, mask, log_outputs, causal):\n \"\"\"\n Fused softmax implementation, using the Triton programming model.\n This only supports a reduction over the last dimension for now\n \"\"\"\n\n # Handle 2D/3D tensors\n x_ = x.unsqueeze(0) if x.ndim == 2 else x\n\n if not x_.is_contiguous():\n x_ = x_.contiguous()\n\n y = torch.empty_like(x_)\n assert (\n y.stride(2) == 1 and x_.stride(2) == 1\n ), f\"{x.shape} - {x_.shape} - {x_.stride()}\"\n\n # SPMD launch grid\n grid_2d = (\n x_.shape[0],\n x_.shape[1],\n )\n\n # enqueue GPU kernel\n use_mask = True\n if mask is None:\n # placeholder, will not be used\n mask = x_\n use_mask = False\n else:\n # Make sure that the mask is binary\n assert mask.dtype == x.dtype, \"An additive mask is requested\"\n\n _softmax[grid_2d](\n y,\n x_,\n mask,\n y.stride(0),\n y.stride(1),\n x_.stride(0),\n x_.stride(1),\n mask.stride(0),\n x_.shape[2],\n log=log_outputs,\n use_mask=use_mask,\n causal=causal,\n )\n\n ctx.save_for_backward(y)\n ctx.log_outputs = log_outputs\n ctx.causal = causal\n return y.reshape_as(x)\n\n @staticmethod\n @custom_bwd\n def backward(ctx, grad_out):\n (out,) = ctx.saved_tensors\n\n # Handle 2D/3D tensors\n grad_out_ = grad_out.unsqueeze(0) if grad_out.ndim == 2 else grad_out\n\n # SPMD launch grid\n grid_2d = (\n grad_out_.shape[0],\n grad_out_.shape[1],\n )\n\n depth = triton.next_power_of_2(grad_out_.shape[2])\n grad_in = torch.empty_like(\n out\n ) # torch.zeros is measurably slower, we'll zero out in the kernel\n\n # Make sure that the tensor are contiguous\n grad_in, grad_out, out = map(lambda x: x.contiguous(), [grad_in, grad_out, out])\n\n # fmt: off\n _softmax_backward[grid_2d](\n grad_in, grad_out_, out,\n grad_in.stride(0), grad_in.stride(1),\n grad_out_.stride(0), grad_out_.stride(1),\n out.stride(0), out.stride(1),\n out.shape[2],\n depth=depth,\n log=ctx.log_outputs,\n causal=ctx.causal\n )\n # fmt: on\n return grad_in.reshape_as(grad_out), None, None, None\n\n\ndef softmax(\n x: torch.Tensor, mask: Optional[torch.Tensor] = None, causal: bool = False\n) -> torch.Tensor:\n r\"\"\"Applies the Softmax function to an 3-dimensional input Tensor\n rescaling them so that the elements of the n-dimensional output Tensor\n lie in the range [0,1] and sum to 1.\n\n Softmax is defined as:\n\n .. math::\n \\text{Softmax}(x_{i}) = \\frac{\\exp(x_i)}{\\sum_j \\exp(x_j)}\n\n .. warning: softmax is computed on the last dimension of the input tensor.\n\n\n Args:\n x: input tensor.\n mask: optional mask, its application will be fused to the softmax computation if triton is used\n causal: optional performance optimization, if triton is used and the attention is causal\n\n Returns:\n a Tensor of the same dimension and shape as the input with\n values in the range [0, 1] and sum to 1\n \"\"\"\n return _softmax_dispatch(x, log=False, mask=mask, causal=causal)\n\n\ndef log_softmax(\n x: torch.Tensor, mask: Optional[torch.Tensor] = None, causal: bool = False\n) -> torch.Tensor:\n r\"\"\"Applies the :math:`\\log(\\text{Softmax}(x))` function to an 3-dimensional\n input Tensor. The LogSoftmax formulation can be simplified as:\n\n .. math::\n \\text{LogSoftmax}(x_{i}) = \\log\\left(\\frac{\\exp(x_i) }{ \\sum_j \\exp(x_j)} \\right)\n\n Args:\n x: input tensor.\n\n Returns:\n a Tensor of the same dimension and shape as the input with\n values in the range [-inf, 0)\n \"\"\"\n return _softmax_dispatch(x, log=True, mask=mask, causal=causal)\n\n\ndef _softmax_dispatch(\n x: torch.Tensor, log: bool, mask: Optional[torch.Tensor], causal: bool = False\n) -> torch.Tensor:\n # Triton is used if\n # - CUDA\n # - there's enough data to make it faster than pytorch. This could change over time, Triton is improving\n # - there was no previous failure\n\n global _triton_registered_overflow\n global _triton_registered_warnings\n\n try:\n if torch.cuda.is_available() and x.is_cuda and not _triton_registered_overflow:\n return _softmax_triton.apply(x, mask, log, causal)\n except (triton.code_gen.OutOfResources, RuntimeError) as e:\n # Catch cases where the current GPU does not have enough registers to hold a full tensor line\n # fallback to PyTorch's implementation, which streams the tensor in and out\n _triton_registered_overflow = True\n logging.warning(\n \"Triton softmax kernel register spillover or invalid image caught.\"\n \"Deactivating this kernel, please file an issue int the xFormers repository\"\n )\n logging.warning(e)\n\n if causal and not _triton_registered_warnings:\n logging.warning(\n \"Triton softmax could not be used. \\\n The causal flags is being passed but it does not provide any benefit with PyTorch softmax.\"\n )\n _triton_registered_warnings = True\n\n if mask is not None:\n x = x + mask\n\n if log:\n return torch.log_softmax(x, dim=-1)\n else:\n return torch.softmax(x, dim=-1)\n", "path": "xformers/triton/softmax.py" } ]
diff --git a/tests/test_triton_softmax.py b/tests/test_triton_softmax.py index 34abcc8488..83cea8943d 100644 --- a/tests/test_triton_softmax.py +++ b/tests/test_triton_softmax.py @@ -103,3 +103,61 @@ def test_softmax_fp16(dtype): a = torch.rand(b, s, d, device="cuda", dtype=dtype) triton_softmax(a) + + +@pytest.mark.skipif(not _triton_available, reason="Triton is not available") +@pytest.mark.parametrize("log", [False, True]) +@pytest.mark.parametrize("masking", [True, False]) +@pytest.mark.parametrize("causal", [True, False]) +@pytest.mark.parametrize("contiguous", [True, False]) +def test_softmax_parity_fallback(log, masking, causal, contiguous): + """Check that the fallback paths are correct""" + torch.random.manual_seed(0) + + shape = (16, 16) + + # Check the result of a FW pass + X = torch.normal(0, 1, size=shape, device="cpu", requires_grad=False) + + if not contiguous: + # Make sure that the buffer is not contiguous + X = X.transpose(-2, -1).contiguous().transpose(-2, -1) + + X_ = X.clone() + X.requires_grad = True + X_.requires_grad = True + + seq = shape[1] + mask = torch.zeros((seq, seq)) + if masking: + mask[torch.rand((seq, seq)) > 0.8] = -float("inf") + + if causal: + mask[~torch.tril(torch.ones_like(mask)).bool()] = -float("inf") + + y_torch = ( + torch.log_softmax(X + mask, dim=-1) if log else torch.softmax(X + mask, dim=-1) + ) + y_triton = ( + triton_log_softmax(X_, mask, causal) + if log + else triton_softmax(X_, mask, causal) + ) + + assert torch.allclose(y_torch, y_triton, equal_nan=True) + + print(y_torch) + + # Check that BW also gives the same result + loss_torch = torch.norm(y_torch.transpose(-2, -1) @ y_torch) + loss_torch.backward() + + loss_triton = torch.norm(y_triton.transpose(-2, -1) @ y_triton) + loss_triton.backward() + + print(X.grad) + print(X_.grad) + + assert torch.allclose( + torch.norm(X.grad), torch.norm(X_.grad), equal_nan=True, atol=1e-5 + ), f"{torch.norm(X.grad)}, {torch.norm(X_.grad)}" diff --git a/xformers/triton/softmax.py b/xformers/triton/softmax.py index 008d0fb4b5..e1ccd1dcfa 100644 --- a/xformers/triton/softmax.py +++ b/xformers/triton/softmax.py @@ -200,7 +200,7 @@ def _softmax_dispatch( _triton_registered_warnings = True if mask is not None: - x += mask + x = x + mask if log: return torch.log_softmax(x, dim=-1)
pypi__warehouse-7741
[ { "content": "# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nimport functools\n\nfrom babel.core import Locale\nfrom pyramid import viewderivers\nfrom pyramid.i18n import TranslationStringFactory, default_locale_negotiator\nfrom pyramid.threadlocal import get_current_request\n\nfrom warehouse.cache.http import add_vary\n\n# Taken from:\n# https://github.com/django/django/blob/master/django/conf/locale/__init__.py\nKNOWN_LOCALES = {\n \"en\": \"English\", # English\n \"es\": \"español\", # Spanish\n \"fr\": \"français\", # French\n \"ja\": \"日本語\", # Japanese\n \"pt_BR\": \"Português Brasileiro\", # Brazilian Portugeuse\n \"uk\": \"Українська\", # Ukrainian\n \"el\": \"Ελληνικά\", # Greek\n \"de\": \"Deutsch\", # German\n \"zh_Hans\": \"简体中文\", # Simplified Chinese\n}\n\nLOCALE_ATTR = \"_LOCALE_\"\n\n_translation_factory = TranslationStringFactory(\"messages\")\n\n\nclass LazyString:\n def __init__(self, fn, *args, **kwargs):\n self.fn = fn\n self.args = args\n self.mapping = kwargs.get(\"mapping\", {})\n self.kwargs = kwargs\n\n def __json__(self, request):\n return str(self)\n\n def __mod__(self, new_mapping):\n mapping = self.mapping.copy()\n mapping.update(new_mapping)\n return LazyString(self.fn, *self.args, mapping=new_mapping, **self.kwargs)\n\n def __str__(self):\n return self.fn(*self.args, **self.kwargs)\n\n\ndef _locale(request):\n \"\"\"\n Computes a babel.core:Locale() object for this request.\n \"\"\"\n return Locale.parse(request.locale_name, sep=\"_\")\n\n\ndef _negotiate_locale(request):\n locale_name = getattr(request, LOCALE_ATTR, None)\n if locale_name is not None:\n return locale_name\n\n locale_name = request.params.get(LOCALE_ATTR)\n if locale_name is not None:\n return locale_name\n\n locale_name = request.cookies.get(LOCALE_ATTR)\n if locale_name is not None:\n return locale_name\n\n if not request.accept_language:\n return default_locale_negotiator(request)\n\n return request.accept_language.best_match(\n tuple(KNOWN_LOCALES.keys()), default_match=default_locale_negotiator(request)\n )\n\n\ndef localize(message, **kwargs):\n def _localize(message, **kwargs):\n request = get_current_request()\n return request.localizer.translate(_translation_factory(message, **kwargs))\n\n return LazyString(_localize, message, **kwargs)\n\n\nclass InvalidLocalizer:\n def _fail(self):\n raise RuntimeError(\"Cannot use localizer without has_translations=True\")\n\n @property\n def locale_name(self):\n self._fail()\n\n def pluralize(self, *args, **kwargs):\n self._fail()\n\n def translate(self, *args, **kwargs):\n self._fail()\n\n\ndef translated_view(view, info):\n if info.options.get(\"has_translations\"):\n # If this page can be translated, then we'll add a Vary: PyPI-Locale\n # Vary header.\n # Note: This will give weird results if hitting PyPI directly instead of through\n # the Fastly VCL which sets PyPI-Locale.\n return add_vary(\"PyPI-Locale\")(view)\n elif info.exception_only:\n return view\n else:\n # If we're not using translations on this view, then we'll wrap the view\n # with a wrapper that just ensures that the localizer cannot be used.\n @functools.wraps(view)\n def wrapped(context, request):\n # This whole method is a little bit of an odd duck, we want to make\n # sure that we don't actually *access* request.localizer, because\n # doing so triggers the machinery to create a new localizer. So\n # instead we will dig into the request object __dict__ to\n # effectively do the same thing, just without triggering an access\n # on request.localizer.\n\n # Save the original session so that we can restore it once the\n # inner views have been called.\n nothing = object()\n original_localizer = request.__dict__.get(\"localizer\", nothing)\n\n # This particular view hasn't been set to allow access to the\n # translations, so we'll just assign an InvalidLocalizer to\n # request.localizer\n request.__dict__[\"localizer\"] = InvalidLocalizer()\n\n try:\n # Invoke the real view\n return view(context, request)\n finally:\n # Restore the original session so that things like\n # pyramid_debugtoolbar can access it.\n if original_localizer is nothing:\n del request.__dict__[\"localizer\"]\n else:\n request.__dict__[\"localizer\"] = original_localizer\n\n return wrapped\n\n\ntranslated_view.options = {\"has_translations\"}\n\n\ndef includeme(config):\n # Add the request attributes\n config.add_request_method(_locale, name=\"locale\", reify=True)\n\n # Register our translation directory.\n config.add_translation_dirs(\"warehouse:locale/\")\n\n config.set_locale_negotiator(_negotiate_locale)\n\n # Register our i18n/l10n filters for Jinja2\n filters = config.get_settings().setdefault(\"jinja2.filters\", {})\n filters.setdefault(\"format_date\", \"warehouse.i18n.filters:format_date\")\n filters.setdefault(\"format_datetime\", \"warehouse.i18n.filters:format_datetime\")\n filters.setdefault(\n \"format_rfc822_datetime\", \"warehouse.i18n.filters:format_rfc822_datetime\"\n )\n filters.setdefault(\"format_number\", \"warehouse.i18n.filters:format_number\")\n\n jglobals = config.get_settings().setdefault(\"jinja2.globals\", {})\n jglobals.setdefault(\"KNOWN_LOCALES\", \"warehouse.i18n:KNOWN_LOCALES\")\n\n config.add_view_deriver(\n translated_view, over=\"rendered_view\", under=viewderivers.INGRESS\n )\n", "path": "warehouse/i18n/__init__.py" } ]
[ { "content": "# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nimport functools\n\nfrom babel.core import Locale\nfrom pyramid import viewderivers\nfrom pyramid.i18n import TranslationStringFactory, default_locale_negotiator\nfrom pyramid.threadlocal import get_current_request\n\nfrom warehouse.cache.http import add_vary\n\n# Taken from:\n# https://github.com/django/django/blob/master/django/conf/locale/__init__.py\nKNOWN_LOCALES = {\n \"en\": \"English\", # English\n \"es\": \"español\", # Spanish\n \"fr\": \"français\", # French\n \"ja\": \"日本語\", # Japanese\n \"pt_BR\": \"Português Brasileiro\", # Brazilian Portugeuse\n \"uk\": \"Українська\", # Ukrainian\n \"el\": \"Ελληνικά\", # Greek\n \"de\": \"Deutsch\", # German\n \"zh_Hans\": \"简体中文\", # Simplified Chinese\n \"ru\": \"Русский\", # Russian\n}\n\nLOCALE_ATTR = \"_LOCALE_\"\n\n_translation_factory = TranslationStringFactory(\"messages\")\n\n\nclass LazyString:\n def __init__(self, fn, *args, **kwargs):\n self.fn = fn\n self.args = args\n self.mapping = kwargs.get(\"mapping\", {})\n self.kwargs = kwargs\n\n def __json__(self, request):\n return str(self)\n\n def __mod__(self, new_mapping):\n mapping = self.mapping.copy()\n mapping.update(new_mapping)\n return LazyString(self.fn, *self.args, mapping=new_mapping, **self.kwargs)\n\n def __str__(self):\n return self.fn(*self.args, **self.kwargs)\n\n\ndef _locale(request):\n \"\"\"\n Computes a babel.core:Locale() object for this request.\n \"\"\"\n return Locale.parse(request.locale_name, sep=\"_\")\n\n\ndef _negotiate_locale(request):\n locale_name = getattr(request, LOCALE_ATTR, None)\n if locale_name is not None:\n return locale_name\n\n locale_name = request.params.get(LOCALE_ATTR)\n if locale_name is not None:\n return locale_name\n\n locale_name = request.cookies.get(LOCALE_ATTR)\n if locale_name is not None:\n return locale_name\n\n if not request.accept_language:\n return default_locale_negotiator(request)\n\n return request.accept_language.best_match(\n tuple(KNOWN_LOCALES.keys()), default_match=default_locale_negotiator(request)\n )\n\n\ndef localize(message, **kwargs):\n def _localize(message, **kwargs):\n request = get_current_request()\n return request.localizer.translate(_translation_factory(message, **kwargs))\n\n return LazyString(_localize, message, **kwargs)\n\n\nclass InvalidLocalizer:\n def _fail(self):\n raise RuntimeError(\"Cannot use localizer without has_translations=True\")\n\n @property\n def locale_name(self):\n self._fail()\n\n def pluralize(self, *args, **kwargs):\n self._fail()\n\n def translate(self, *args, **kwargs):\n self._fail()\n\n\ndef translated_view(view, info):\n if info.options.get(\"has_translations\"):\n # If this page can be translated, then we'll add a Vary: PyPI-Locale\n # Vary header.\n # Note: This will give weird results if hitting PyPI directly instead of through\n # the Fastly VCL which sets PyPI-Locale.\n return add_vary(\"PyPI-Locale\")(view)\n elif info.exception_only:\n return view\n else:\n # If we're not using translations on this view, then we'll wrap the view\n # with a wrapper that just ensures that the localizer cannot be used.\n @functools.wraps(view)\n def wrapped(context, request):\n # This whole method is a little bit of an odd duck, we want to make\n # sure that we don't actually *access* request.localizer, because\n # doing so triggers the machinery to create a new localizer. So\n # instead we will dig into the request object __dict__ to\n # effectively do the same thing, just without triggering an access\n # on request.localizer.\n\n # Save the original session so that we can restore it once the\n # inner views have been called.\n nothing = object()\n original_localizer = request.__dict__.get(\"localizer\", nothing)\n\n # This particular view hasn't been set to allow access to the\n # translations, so we'll just assign an InvalidLocalizer to\n # request.localizer\n request.__dict__[\"localizer\"] = InvalidLocalizer()\n\n try:\n # Invoke the real view\n return view(context, request)\n finally:\n # Restore the original session so that things like\n # pyramid_debugtoolbar can access it.\n if original_localizer is nothing:\n del request.__dict__[\"localizer\"]\n else:\n request.__dict__[\"localizer\"] = original_localizer\n\n return wrapped\n\n\ntranslated_view.options = {\"has_translations\"}\n\n\ndef includeme(config):\n # Add the request attributes\n config.add_request_method(_locale, name=\"locale\", reify=True)\n\n # Register our translation directory.\n config.add_translation_dirs(\"warehouse:locale/\")\n\n config.set_locale_negotiator(_negotiate_locale)\n\n # Register our i18n/l10n filters for Jinja2\n filters = config.get_settings().setdefault(\"jinja2.filters\", {})\n filters.setdefault(\"format_date\", \"warehouse.i18n.filters:format_date\")\n filters.setdefault(\"format_datetime\", \"warehouse.i18n.filters:format_datetime\")\n filters.setdefault(\n \"format_rfc822_datetime\", \"warehouse.i18n.filters:format_rfc822_datetime\"\n )\n filters.setdefault(\"format_number\", \"warehouse.i18n.filters:format_number\")\n\n jglobals = config.get_settings().setdefault(\"jinja2.globals\", {})\n jglobals.setdefault(\"KNOWN_LOCALES\", \"warehouse.i18n:KNOWN_LOCALES\")\n\n config.add_view_deriver(\n translated_view, over=\"rendered_view\", under=viewderivers.INGRESS\n )\n", "path": "warehouse/i18n/__init__.py" } ]
diff --git a/Makefile b/Makefile index 773eecb2f7c4..59825039be3f 100644 --- a/Makefile +++ b/Makefile @@ -194,6 +194,7 @@ init-po: .state/env/pyvenv.cfg update-po: .state/env/pyvenv.cfg $(BINDIR)/pybabel update \ + --omit-header \ --input-file="warehouse/locale/messages.pot" \ --output-file="warehouse/locale/$(L)/LC_MESSAGES/messages.po" \ --locale="$(L)" diff --git a/docs/translations.rst b/docs/translations.rst index 152c52c05c62..c4910af98ce0 100644 --- a/docs/translations.rst +++ b/docs/translations.rst @@ -17,16 +17,20 @@ updated. When a translation reaches 100%, it should be added as a known locale and have it's MO file (Machine Object file) compiled. -To add a new known locale, add a key/value to the ``KNOWN_LOCALES`` mapping in -`warehouse/i18n/__init__.py -<https://github.com/pypa/warehouse/blob/master/warehouse/i18n/__init__.py>`_. -The key is the locale code, and corresponds to a directory in -``warehouse/locale``, and the value is the human-readable name for the locale, -in the given language. - -Then, compile the MO file for the locale by running ``make build-mos``. This -may recompile some existing MO files as well, but should add a new MO file for -the new locale. - -Finally, commit these changes and add them to Weblate's pull request (if you -are able) or make a new pull request which adds them. +To add a new known locale: + +1. Check for `outstanding Weblate pull requests + <https://github.com/pypa/warehouse/pulls/weblate>`_ and merge them if so. +2. In a new branch, add a key/value to the ``KNOWN_LOCALES`` mapping in + |warehouse/i18n/__init__.py|_. + The key is the locale code, and corresponds to a directory in + ``warehouse/locale``, and the value is the human-readable name for the + locale, in the given language. +3. Compile the MO file for the locale by running ``make build-mos``. This may + recompile some existing MO files as well, but should add a new MO file for + the new locale. +4. Commit these changes (including all ``*.mo`` files) and make a new pull + request which adds them. + +.. |warehouse/i18n/__init__.py| replace:: ``warehouse/i18n/__init__.py`` +.. _warehouse/i18n/__init__.py: https://github.com/pypa/warehouse/blob/master/warehouse/i18n/__init__.py diff --git a/warehouse/i18n/__init__.py b/warehouse/i18n/__init__.py index d8176fec29b1..ea0b9fd256f2 100644 --- a/warehouse/i18n/__init__.py +++ b/warehouse/i18n/__init__.py @@ -31,6 +31,7 @@ "el": "Ελληνικά", # Greek "de": "Deutsch", # German "zh_Hans": "简体中文", # Simplified Chinese + "ru": "Русский", # Russian } LOCALE_ATTR = "_LOCALE_" diff --git a/warehouse/locale/de/LC_MESSAGES/messages.mo b/warehouse/locale/de/LC_MESSAGES/messages.mo index 103edbafa916..3d734a9c1882 100644 Binary files a/warehouse/locale/de/LC_MESSAGES/messages.mo and b/warehouse/locale/de/LC_MESSAGES/messages.mo differ diff --git a/warehouse/locale/de/LC_MESSAGES/messages.po b/warehouse/locale/de/LC_MESSAGES/messages.po index 84aa457a87b1..18881e7f2475 100644 --- a/warehouse/locale/de/LC_MESSAGES/messages.po +++ b/warehouse/locale/de/LC_MESSAGES/messages.po @@ -1,34 +1,6 @@ -# Translations template for Warehouse. -# Copyright (C) 2019 PyPA -# This file is distributed under the same license as the Warehouse project. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2019. -# Jannis Leidel <jannis@leidel.info>, 2019. -# Fabian Neumann <mail@fabianneumann.de>, 2019. -# Laurent LAPORTE <laurent.laporte.pro@gmail.com>, 2019. -# Steffen Schröder <st.schroeder@gmail.com>, 2019, 2020. -# Jan Willhaus <mail@janwillhaus.de>, 2019. -# Benjamin Richter <richter.benjamin@gmail.com>, 2019, 2020. -# Dustin Ingram <dustin.ingram@gmail.com>, 2020. -msgid "" -msgstr "" -"Project-Id-Version: Warehouse VERSION\n" -"Report-Msgid-Bugs-To: https://github.com/pypa/warehouse/issues/new\n" -"POT-Creation-Date: 2020-01-15 20:11+0200\n" -"PO-Revision-Date: 2020-04-03 03:48+0000\n" -"Last-Translator: Dustin Ingram <dustin.ingram@gmail.com>\n" -"Language-Team: German <https://hosted.weblate.org/projects/pypa/warehouse/de/" -">\n" -"Language: de\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.0-dev\n" -"Generated-By: Babel 2.7.0\n" - +# | msgid "Stay updated:" #: warehouse/views.py:254 #, fuzzy -#| msgid "Stay updated:" msgid "Locale updated" msgstr "Auf dem Laufenden bleiben:" @@ -47,17 +19,18 @@ msgstr "Bitte Benutzername mit 50 Zeichen oder weniger wählen." #: warehouse/accounts/forms.py:85 msgid "" "The username is invalid. Usernames must be composed of letters, numbers, " -"dots, hyphens and underscores. And must also start and finish with a letter " -"or number. Choose a different username." +"dots, hyphens and underscores. And must also start and finish with a " +"letter or number. Choose a different username." msgstr "" -"Der Benutzername ist ungültig. Benutzernamen müssen aus Buchstaben, Zahlen, " -"Punkten, Binde- oder Unterstrichen bestehen und mit einem Buchstaben oder " -"einer Zahl beginnen und enden. Bitte einen anderen Benutzernamen wählen." +"Der Benutzername ist ungültig. Benutzernamen müssen aus Buchstaben, " +"Zahlen, Punkten, Binde- oder Unterstrichen bestehen und mit einem " +"Buchstaben oder einer Zahl beginnen und enden. Bitte einen anderen " +"Benutzernamen wählen." #: warehouse/accounts/forms.py:99 msgid "" -"This username is already being used by another account. Choose a different " -"username." +"This username is already being used by another account. Choose a " +"different username." msgstr "" "Dieser Benutzername wird schon von einem anderen Konto verwendet. Bitte " "einen anderen Benutzername wählen." @@ -86,16 +59,16 @@ msgstr "" #: warehouse/accounts/forms.py:209 msgid "" -"This email address is already being used by this account. Use a different " -"email." +"This email address is already being used by this account. Use a different" +" email." msgstr "" "Diese E-Mail-Adresse wird schon von diesem Konto verwendet. Bitte eine " "andere verwenden." #: warehouse/accounts/forms.py:216 msgid "" -"This email address is already being used by another account. Use a different " -"email." +"This email address is already being used by another account. Use a " +"different email." msgstr "" "Diese E-Mail-Adresse wird schon von einem anderen Konto verwendet. Bitte " "eine andere E-Mail-Adresse verwenden." @@ -114,9 +87,9 @@ msgstr "Ungültiger TOTP-Code." msgid "Invalid WebAuthn assertion: Bad payload" msgstr "Ungültige WebAuthn-Assertion: Bad payload" +# | msgid "Invalid TOTP code." #: warehouse/accounts/forms.py:344 #, fuzzy -#| msgid "Invalid TOTP code." msgid "Invalid Recovery Code." msgstr "Ungültiger TOTP-Code." @@ -144,11 +117,11 @@ msgstr "" #: warehouse/accounts/views.py:455 msgid "" -"New user registration temporarily disabled. See https://pypi.org/help#admin-" -"intervention for details." +"New user registration temporarily disabled. See https://pypi.org/help" +"#admin-intervention for details." msgstr "" -"Die Registrierung neuer Benutzer ist vorübergehend deaktiviert. Siehe ttps://" -"pypi.org/help#admin-intervention für Details." +"Die Registrierung neuer Benutzer ist vorübergehend deaktiviert. Siehe " +"ttps://pypi.org/help#admin-intervention für Details." #: warehouse/accounts/views.py:552 msgid "Expired token: request a new password reset link" @@ -173,15 +146,16 @@ msgstr "Ungültiges Token: Benutzer nicht gefunden" #: warehouse/accounts/views.py:572 msgid "Invalid token: user has logged in since this token was requested" msgstr "" -"Ungültiges Token: Benutzer hat sich angemeldet seit dieses Token angefordert " -"wurde" +"Ungültiges Token: Benutzer hat sich angemeldet seit dieses Token " +"angefordert wurde" #: warehouse/accounts/views.py:579 msgid "" "Invalid token: password has already been changed since this token was " "requested" msgstr "" -"Ungültiges Token: Passwort wurde geändert seit dieses Token angefordert wurde" +"Ungültiges Token: Passwort wurde geändert seit dieses Token angefordert " +"wurde" #: warehouse/accounts/views.py:605 msgid "You have reset your password" @@ -222,12 +196,13 @@ msgstr "E-Mail-Adresse ${email_address} bestätigt. ${confirm_message}." #: warehouse/manage/views.py:186 msgid "Email ${email_address} added - check your email for a verification link" msgstr "" -"E-Mail-Adresse ${email_address} hinzugefügt. Bitte mit dem Bestätigungslink " -"in der eben verschickten E-Mail bestätigen." +"E-Mail-Adresse ${email_address} hinzugefügt. Bitte mit dem " +"Bestätigungslink in der eben verschickten E-Mail bestätigen." #: warehouse/manage/views.py:667 warehouse/manage/views.py:703 msgid "" -"You must provision a two factor method before recovery codes can be generated" +"You must provision a two factor method before recovery codes can be " +"generated" msgstr "" #: warehouse/manage/views.py:678 @@ -413,9 +388,9 @@ msgstr "Irgendetwas lief schief" #: warehouse/templates/500.html:22 msgid "" -"<p>We are experiencing technical issues that are affecting our ability to " -"serve you this site.</p> <p>We are aware of the problem and are working to " -"resolve it as soon as possible.</p>" +"<p>We are experiencing technical issues that are affecting our ability to" +" serve you this site.</p> <p>We are aware of the problem and are working " +"to resolve it as soon as possible.</p>" msgstr "" "<p>Wir haben gerade mit technischen Problemen zu kämpfen und können die " "Website nicht ausliefern.</p> <p>Wir sind uns dem Problem bewusst und " @@ -439,24 +414,25 @@ msgstr "Vertrauen Sie PyPI bei Ihrer Arbeit?" #: warehouse/templates/500.html:37 msgid "" -"Consider <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\" rel=" -"\"noopener\"> contributing </a> or <a href=\"https://psfmember.org/civicrm/" -"contribute/transact?reset=1&id=13\" target=\"_blank\" rel=\"noopener\"> " -"donating </a> to help us build a more stable and secure platform." +"Consider <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\" " +"rel=\"noopener\"> contributing </a> or <a " +"href=\"https://psfmember.org/civicrm/contribute/transact?reset=1&id=13\" " +"target=\"_blank\" rel=\"noopener\"> donating </a> to help us build a more" +" stable and secure platform." msgstr "" -"Um eine stabilere und sicherere Plattform zu schaffen, bitte einfach <a href=" -"\"https://github.com/pypa/warehouse\" target=\"_blank\" rel=\"noopener\"> " -"mitmachen </a> oder <a href=\"https://psfmember.org/civicrm/contribute/" -"transact?reset=1&id=13\" target=\"_blank\" rel=\"noopener\"> spenden </a>. " -"Danke." +"Um eine stabilere und sicherere Plattform zu schaffen, bitte einfach <a " +"href=\"https://github.com/pypa/warehouse\" target=\"_blank\" " +"rel=\"noopener\"> mitmachen </a> oder <a " +"href=\"https://psfmember.org/civicrm/contribute/transact?reset=1&id=13\" " +"target=\"_blank\" rel=\"noopener\"> spenden </a>. Danke." #: warehouse/templates/base.html:23 msgid "" -"Choose a strong password that contains letters (uppercase and lowercase), " -"numbers and special characters. Avoid common words or repetition." +"Choose a strong password that contains letters (uppercase and lowercase)," +" numbers and special characters. Avoid common words or repetition." msgstr "" -"Wählen Sie ein starkes Passwort mit Klein- und Großbuchstaben, Zahlen und " -"Sonderzeichen. Vermeiden Sie häufige Wörter oder Wiederholungen." +"Wählen Sie ein starkes Passwort mit Klein- und Großbuchstaben, Zahlen und" +" Sonderzeichen. Vermeiden Sie häufige Wörter oder Wiederholungen." #: warehouse/templates/base.html:26 msgid "Password strength:" @@ -479,10 +455,10 @@ msgstr "Hauptnavigation" msgid "Help" msgstr "Hilfe" +# | msgid "Sponsors" #: warehouse/templates/base.html:40 warehouse/templates/base.html:54 #: warehouse/templates/includes/current-user-indicator.html:60 #, fuzzy -#| msgid "Sponsors" msgid "Sponsor" msgstr "Sponsoren" @@ -513,8 +489,8 @@ msgstr "Hauptmenü" #: warehouse/templates/base.html:76 warehouse/templates/index.html:79 msgid "" -"The Python Package Index (PyPI) is a repository of software for the Python " -"programming language." +"The Python Package Index (PyPI) is a repository of software for the " +"Python programming language." msgstr "" "Der Python Package Index (PyPI) ist ein Software-Verzeichnis der " "Programmiersprache Python." @@ -550,26 +526,27 @@ msgstr "Warnung" #: warehouse/templates/base.html:158 msgid "You are using an unsupported browser, upgrade to a newer version." msgstr "" -"Sie verwenden einen nicht unterstützten Browser, aktualisieren Sie auf eine " -"neuere Version." +"Sie verwenden einen nicht unterstützten Browser, aktualisieren Sie auf " +"eine neuere Version." #: warehouse/templates/base.html:167 msgid "" "You are using TestPyPI – a separate instance of the Python Package Index " -"that allows you to try distribution tools and processes without affecting " -"the real index." +"that allows you to try distribution tools and processes without affecting" +" the real index." msgstr "" -"Sie verwenden TestPyPI - eine separate Instanz des Python-Paketindex, mit " -"der Sie Verteilungstools und -prozesse ausprobieren können, ohne den realen " -"Index zu beeinflussen." +"Sie verwenden TestPyPI - eine separate Instanz des Python-Paketindex, mit" +" der Sie Verteilungstools und -prozesse ausprobieren können, ohne den " +"realen Index zu beeinflussen." #: warehouse/templates/base.html:177 msgid "" -"Some features may not work without JavaScript. Please try enabling it if you " -"encounter problems." +"Some features may not work without JavaScript. Please try enabling it if " +"you encounter problems." msgstr "" -"Einige Funktionen sind möglicherweise ohne JavaScript nicht nutzbar. Bitte " -"versuchen Sie es mit aktiviertem JavaScript, falls Probleme auftreten." +"Einige Funktionen sind möglicherweise ohne JavaScript nicht nutzbar. " +"Bitte versuchen Sie es mit aktiviertem JavaScript, falls Probleme " +"auftreten." #: warehouse/templates/base.html:210 warehouse/templates/base.html:231 #: warehouse/templates/error-base-with-search.html:20 @@ -691,9 +668,11 @@ msgstr "alle Systeme betriebsbereit" #: warehouse/templates/base.html:311 msgid "" -"Developed and maintained by the Python community, for the Python community." +"Developed and maintained by the Python community, for the Python " +"community." msgstr "" -"Entwickelt und gepflegt von der Python-Community, für die Python-Community." +"Entwickelt und gepflegt von der Python-Community, für die Python-" +"Community." #: warehouse/templates/base.html:313 msgid "Donate today!" @@ -728,8 +707,8 @@ msgstr "" #: warehouse/templates/index.html:44 msgid "Find, install and publish Python packages with the Python Package Index" msgstr "" -"Finde, installiere und veröffentliche Python-Pakete mit dem Python Package " -"Index" +"Finde, installiere und veröffentliche Python-Pakete mit dem Python " +"Package Index" #: warehouse/templates/index.html:60 #, python-format @@ -758,11 +737,11 @@ msgstr "%(num_users)s Benutzer" #: warehouse/templates/index.html:81 msgid "" -"PyPI helps you find and install software developed and shared by the Python " -"community." +"PyPI helps you find and install software developed and shared by the " +"Python community." msgstr "" -"PyPI hilft dabei, von der Python-Community entwickelte und geteilte Software " -"zu finden und zu installieren." +"PyPI hilft dabei, von der Python-Community entwickelte und geteilte " +"Software zu finden und zu installieren." #: warehouse/templates/index.html:82 msgid "Learn about installing packages</a>." @@ -775,7 +754,8 @@ msgstr "Paket-Entwickler benutzen PyPI, um ihre Software zu veröffentlichen." #: warehouse/templates/index.html:86 msgid "Learn how to package your Python code for PyPI</a>." msgstr "" -"Wie wird Python-Software für die Veröffentlichung auf PyPI vorbereitet</a>?" +"Wie wird Python-Software für die Veröffentlichung auf PyPI " +"vorbereitet</a>?" #: warehouse/templates/index.html:96 msgid "Trending projects" @@ -800,20 +780,20 @@ msgstr "Diese URL ist ein API-Endpunkt zum Hochladen von Dateien zu PyPI." #: warehouse/templates/upload.html:26 #, python-format msgid "" -"For more information on uploading projects to PyPI, visit the <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python " -"Packaging User Guide</a>." +"For more information on uploading projects to PyPI, visit the <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" -"Für mehr Informationen über das Hochladen von Projekten zum PyPI, besuchen " -"Sie den <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging User Guide</a>." +"Für mehr Informationen über das Hochladen von Projekten zum PyPI, " +"besuchen Sie den <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>." #: warehouse/templates/upload.html:28 #, python-format msgid "" -"Otherwise, we suggest you <a href=\"%(href)s\">go to the PyPI homepage</a>." -msgstr "" -"Andernfalls bitte <a href=\"%(href)s\">zur PyPI-Homepage zurückkehren</a>." +"Otherwise, we suggest you <a href=\"%(href)s\">go to the PyPI " +"homepage</a>." +msgstr "Andernfalls bitte <a href=\"%(href)s\">zur PyPI-Homepage zurückkehren</a>." #: warehouse/templates/accounts/login.html:17 #: warehouse/templates/accounts/recovery-code.html:17 @@ -965,9 +945,9 @@ msgstr "" msgid "Login using Recovery Code" msgstr "" +# | msgid "Error code" #: warehouse/templates/accounts/recovery-code.html:40 #, fuzzy -#| msgid "Error code" msgid "Enter recovery code" msgstr "Fehlercode" @@ -978,18 +958,17 @@ msgstr "Bestätigen" #: warehouse/templates/accounts/recovery-code.html:58 msgid "" -"PyPI allows for generating recovery codes to be stored securely offline in " -"the event that your device or application is lost. Enter one of these codes " -"in the form to verify your identity. Once used, the recovery code will no " -"longer be valid." +"PyPI allows for generating recovery codes to be stored securely offline " +"in the event that your device or application is lost. Enter one of these " +"codes in the form to verify your identity. Once used, the recovery code " +"will no longer be valid." msgstr "" +# | msgid "Lost your device? Not working? <a href=\"%(href)s\">Get help</a>." #: warehouse/templates/accounts/recovery-code.html:59 #, fuzzy, python-format -#| msgid "Lost your device? Not working? <a href=\"%(href)s\">Get help</a>." msgid "<p>Not working? <a href=\"%(href)s\">Get help</a>.</p>" -msgstr "" -"Gerät verloren? Funktioniert nicht? <a href=\"%(href)s\">Hilfe holen</a>." +msgstr "Gerät verloren? Funktioniert nicht? <a href=\"%(href)s\">Hilfe holen</a>." #: warehouse/templates/accounts/register.html:18 msgid "Create an account" @@ -1050,12 +1029,12 @@ msgstr "Passwort bestätigen" #, fuzzy msgid "" "This password appears in a security breach or has been compromised and " -"cannot be used. Please refer to the <a href=\"/help/#compromised-password" -"\">FAQ</a> for more information." +"cannot be used. Please refer to the <a href=\"/help/#compromised-" +"password\">FAQ</a> for more information." msgstr "" -"Dieses Passwort ist kompromittiert und darf nicht verwendet werden. Weitere " -"Informationen finden sich unter <a href=\"/help/#compromised-password" -"\">FAQ</a>." +"Dieses Passwort ist kompromittiert und darf nicht verwendet werden. " +"Weitere Informationen finden sich unter <a href=\"/help/#compromised-" +"password\">FAQ</a>." #: warehouse/templates/accounts/register.html:162 msgid "Create account" @@ -1091,11 +1070,11 @@ msgstr "Wir haben eine E-Mail an Ihre registrierte E-Mail-Adresse geschickt." #: warehouse/templates/accounts/request-password-reset.html:52 #, python-format msgid "" -"The email contains a link to reset your password. This link will expire in " -"%(n_hours)s hours." +"The email contains a link to reset your password. This link will expire " +"in %(n_hours)s hours." msgstr "" -"Diese E-Mail enthält einen Link, um das Passwort zurückzusetzen. Dieser Link " -"läuft in %(n_hours)s Stunden ab." +"Diese E-Mail enthält einen Link, um das Passwort zurückzusetzen. Dieser " +"Link läuft in %(n_hours)s Stunden ab." #: warehouse/templates/accounts/reset-password.html:18 #: warehouse/templates/accounts/reset-password.html:24 @@ -1126,8 +1105,8 @@ msgid "" "Connect your security device and click the \"Authenticate with device\" " "button." msgstr "" -"Den USB-Sicherheitsschlüssel (oder ähnliches) anschließen und auf den \"Mit " -"Gerät verbinden\"-Knopf drücken." +"Den USB-Sicherheitsschlüssel (oder ähnliches) anschließen und auf den " +"\"Mit Gerät verbinden\"-Knopf drücken." #: warehouse/templates/accounts/two-factor.html:42 msgid "Enable JavaScript to log in with a security device (e.g. USB key)" @@ -1142,18 +1121,18 @@ msgstr "Mit Gerät verbinden" #: warehouse/templates/accounts/two-factor.html:55 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" rel=\"%(rel)s" -"\">Upgrade your browser</a> to log in with a security device (e.g. USB key)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" " +"rel=\"%(rel)s\">Upgrade your browser</a> to log in with a security device" +" (e.g. USB key)" msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" rel=\"%(rel)s" -"\">Bitte den Browser aktualisieren</a>, um sich mit einem USB-" -"Sicherheitsschlüssel (oder ähnliches) anmelden zu können" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" " +"rel=\"%(rel)s\">Bitte den Browser aktualisieren</a>, um sich mit einem " +"USB-Sicherheitsschlüssel (oder ähnliches) anmelden zu können" #: warehouse/templates/accounts/two-factor.html:60 #, python-format msgid "Lost your device? Not working? <a href=\"%(href)s\">Get help</a>." -msgstr "" -"Gerät verloren? Funktioniert nicht? <a href=\"%(href)s\">Hilfe holen</a>." +msgstr "Gerät verloren? Funktioniert nicht? <a href=\"%(href)s\">Hilfe holen</a>." #: warehouse/templates/accounts/two-factor.html:72 msgid "Authenticate with an app" @@ -1166,18 +1145,20 @@ msgstr "Authentifizierungscode eingeben" #: warehouse/templates/accounts/two-factor.html:105 #, python-format msgid "" -"<p>Generate a code using the authentication application connected to your " -"PyPI account. Enter this code in the form to verify your identity.</p> " -"<p>Lost your application? Not working? <a href=\"%(href)s\">Get help</a>.</p>" +"<p>Generate a code using the authentication application connected to your" +" PyPI account. Enter this code in the form to verify your identity.</p> " +"<p>Lost your application? Not working? <a href=\"%(href)s\">Get " +"help</a>.</p>" msgstr "" -"<p>Bitte einen Code mit der Authentifizierungsanwendung generieren, die mit " -"diesem PyPI-Konto verbunden ist. Diesen Code in das Formular eintragen, um " -"die eigene Identität zu bestätigen.</p><p>Anwendung verloren? Etwas anderes " -"funktioniert nicht? <a href=\"%(href)s\">Hier gibt es Hilfe</a>.</p>" +"<p>Bitte einen Code mit der Authentifizierungsanwendung generieren, die " +"mit diesem PyPI-Konto verbunden ist. Diesen Code in das Formular " +"eintragen, um die eigene Identität zu bestätigen.</p><p>Anwendung " +"verloren? Etwas anderes funktioniert nicht? <a href=\"%(href)s\">Hier " +"gibt es Hilfe</a>.</p>" +# | msgid "Set up your application" #: warehouse/templates/accounts/two-factor.html:117 #, fuzzy -#| msgid "Set up your application" msgid "Lost your security key or application?" msgstr "Ihre Anwendung einrichten" @@ -1188,9 +1169,9 @@ msgstr "" #: warehouse/templates/accounts/two-factor.html:122 #, python-format msgid "" -"<p><strong>You have not generated account recovery codes.</strong></p> <p>If " -"you lose access to your two factor methods, you may lose access to your " -"account. <a href=\"%(href)s\">Get help with recovery codes.</a></p>" +"<p><strong>You have not generated account recovery codes.</strong></p> " +"<p>If you lose access to your two factor methods, you may lose access to " +"your account. <a href=\"%(href)s\">Get help with recovery codes.</a></p>" msgstr "" #: warehouse/templates/email/account-deleted/body.html:18 @@ -1205,12 +1186,13 @@ msgstr "Das PyPI-Konto <strong>%(username)s</strong> wurde gelöscht." #: warehouse/templates/email/two-factor-removed/body.html:20 #, python-format msgid "" -"If you did not make this change, you can email <a href=\"%(href)s\">" -"%(email_address)s</a> to communicate with the PyPI administrators." +"If you did not make this change, you can email <a " +"href=\"%(href)s\">%(email_address)s</a> to communicate with the PyPI " +"administrators." msgstr "" -"Falls Sie diese Änderung nicht vorgenommen haben, können Sie unter <a href=" -"\"%(href)s\">%(email_address)s</a> mit den PyPI-Administratoren in Kontakt " -"treten." +"Falls Sie diese Änderung nicht vorgenommen haben, können Sie unter <a " +"href=\"%(href)s\">%(email_address)s</a> mit den PyPI-Administratoren in " +"Kontakt treten." #: warehouse/templates/email/added-as-collaborator/body.html:19 #, python-format @@ -1218,8 +1200,8 @@ msgid "" "You have been added as <strong>%(role)s</strong> to the %(site)s project " "%(project)s by %(submitter)s." msgstr "" -"Sie wurden von %(submitter)s als <strong>%(role)s</strong> zum %(site)s-" -"Projekt %(project)s hinzugefügt." +"Sie wurden von %(submitter)s als <strong>%(role)s</strong> zum " +"%(site)s-Projekt %(project)s hinzugefügt." #: warehouse/templates/email/added-as-collaborator/body.html:24 #, python-format @@ -1227,17 +1209,17 @@ msgid "" "You are receiving this because you have been added by %(submitter)s to a " "project on %(site)s." msgstr "" -"Sie erhalten dies, weil sie von %(submitter)s zu einem Projekt auf %(site)s " -"hinzugefügt wurden." +"Sie erhalten dies, weil sie von %(submitter)s zu einem Projekt auf " +"%(site)s hinzugefügt wurden." #: warehouse/templates/email/password-change/body.html:18 #, python-format msgid "" -"Someone, perhaps you, has changed the password for your PyPI account <strong>" -"%(username)s</strong>." +"Someone, perhaps you, has changed the password for your PyPI account " +"<strong>%(username)s</strong>." msgstr "" -"Jemand, möglicherweise Sie selbst, hat das Passwort des PyPI-Kontos <strong>" -"%(username)s</strong> geändert." +"Jemand, möglicherweise Sie selbst, hat das Passwort des PyPI-Kontos " +"<strong>%(username)s</strong> geändert." #: warehouse/templates/email/password-compromised-hibp/body.html:18 #: warehouse/templates/email/password-compromised/body.html:18 @@ -1246,16 +1228,17 @@ msgstr "Wie bitte?" #: warehouse/templates/email/password-compromised/body.html:20 msgid "" -"PyPI administrators have determined that your password is compromised. To\n" -" protect you and other users, we have preemptively reset your password and " -"you\n" +"PyPI administrators have determined that your password is compromised. To" +"\n" +" protect you and other users, we have preemptively reset your password " +"and you\n" " will no longer be able to log in or upload to PyPI with your existing\n" " password." msgstr "" -"Die PyPI-Adminstratoren haben festgesgtellt, dass Ihr Passwort kompromitiert " -"wurde.\n" -" Um Sie und andere Benutzer zu schützen, haben wir vorsorglich das Passwort " -"zurückgesetzt\n" +"Die PyPI-Adminstratoren haben festgesgtellt, dass Ihr Passwort " +"kompromitiert wurde.\n" +" Um Sie und andere Benutzer zu schützen, haben wir vorsorglich das " +"Passwort zurückgesetzt\n" " und dadurch das Anmelden und Hochladen zu PyPI mit dem alten Passwort " "deaktiviert." @@ -1277,11 +1260,11 @@ msgstr "Was sollte ich tun?" #: warehouse/templates/email/password-compromised/body.html:33 #, python-format msgid "" -"To regain access to your account, <a href=\"%(href)s\">reset your password</" -"a> on PyPI." +"To regain access to your account, <a href=\"%(href)s\">reset your " +"password</a> on PyPI." msgstr "" -"Sie können wieder auf Ihr Konto zugreifen, wenn Sie das <a href=\"%(href)s" -"\">Passwort zurücksetzen</a>." +"Sie können wieder auf Ihr Konto zugreifen, wenn Sie das <a " +"href=\"%(href)s\">Passwort zurücksetzen</a>." #: warehouse/templates/email/password-compromised/body.html:39 msgid "How can I contact you?" @@ -1290,11 +1273,12 @@ msgstr "Wie kann ich Kontakt aufnehmen?" #: warehouse/templates/email/password-compromised/body.html:41 #, python-format msgid "" -"For more information, you can email %(email_address)s to communicate with\n" +"For more information, you can email %(email_address)s to communicate with" +"\n" " the PyPI administrators." msgstr "" -"Für weitere Informationen kontaktieren Sie bitte die PyPI-Administratoren " -"per an %(email_address)s." +"Für weitere Informationen kontaktieren Sie bitte die PyPI-Administratoren" +" per an %(email_address)s." #: warehouse/templates/email/password-compromised-hibp/body.html:20 msgid "" @@ -1302,16 +1286,16 @@ msgid "" "password appears\n" " in public data breaches. To protect you and other users, we have " "preemptively reset your\n" -" password and you will no longer be able to log in or upload to PyPI with " -"your existing\n" +" password and you will no longer be able to log in or upload to PyPI " +"with your existing\n" " password." msgstr "" "Während Ihres letzten Anmelde- oder Hochladeversuches haben wir bemerkt, " "dass Ihr\n" -" Passwort in den Daten von veröffentlichten Datenpannen zu finden ist. Um " -"Sie und andere\n" -" Benutzer zu schützen, haben wir Ihr Passwort vorsorglich zurückgesetzt. " -"Sie können das\n" +" Passwort in den Daten von veröffentlichten Datenpannen zu finden ist. " +"Um Sie und andere\n" +" Benutzer zu schützen, haben wir Ihr Passwort vorsorglich zurückgesetzt." +" Sie können das\n" " alte Passwort nicht mehr zum Anmelden oder Hochladen bei PyPI verwenden." #: warehouse/templates/email/password-compromised-hibp/body.html:26 @@ -1330,16 +1314,17 @@ msgstr "" #: warehouse/templates/email/password-compromised-hibp/body.html:34 #, python-format msgid "" -"To regain access to your account, <a href=\"%(reset_pw_url)s\">reset your " -"password</a> on PyPI. We also recommend that you go to <a href=" -"\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> and check your other " -"passwords and get yourself familiar with good password practices." +"To regain access to your account, <a href=\"%(reset_pw_url)s\">reset your" +" password</a> on PyPI. We also recommend that you go to <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> and check your " +"other passwords and get yourself familiar with good password practices." msgstr "" -"Um den Zugang zu Ihrem Konto zurück zu erhalten, <a href=\"%(reset_pw_url)s" -"\">setzen Sie Ihr PyPI-Passwort zurück</a>. Weiterhin empfehlen wir, dass " -"Sie <a href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> besuchen, Ihre " -"anderen Passwörter überprüfen und sich mit Praktiken für sichere Passwörter " -"vertraut machen." +"Um den Zugang zu Ihrem Konto zurück zu erhalten, <a " +"href=\"%(reset_pw_url)s\">setzen Sie Ihr PyPI-Passwort zurück</a>. " +"Weiterhin empfehlen wir, dass Sie <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> besuchen, Ihre " +"anderen Passwörter überprüfen und sich mit Praktiken für sichere " +"Passwörter vertraut machen." #: warehouse/templates/email/password-compromised-hibp/body.html:40 msgid "How do you know this?" @@ -1348,30 +1333,32 @@ msgstr "Woher wissen Sie das?" #: warehouse/templates/email/password-compromised-hibp/body.html:42 #, python-format msgid "" -"We use a free security service from <a href=\"%(have_i_been_pwned_url)s" -"\">HaveIBeenPwned</a>. When registering, authenticating, or updating your " -"password, we generate a SHA1 hash of your password and use the first 5 " -"characters of the hash to decide if the password is compromised. The " -"plaintext password is never stored by PyPI or sent to HaveIBeenPwned." +"We use a free security service from <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>. When registering, " +"authenticating, or updating your password, we generate a SHA1 hash of " +"your password and use the first 5 characters of the hash to decide if the" +" password is compromised. The plaintext password is never stored by PyPI " +"or sent to HaveIBeenPwned." msgstr "" -"Wir verwenden das kostenlose Angebot von <a href=\"%(have_i_been_pwned_url)s" -"\">HaveIBeenPwned</a>. Wenn Sie sich registrieren, authentifizieren oder " -"ihr Passwort aktualisieren, erzeugen wir einen SHA1-Hashwert Ihres Passworts " -"und benutzen die ersten 5 Zeichen des Hashwerts, um festzustellen, ob Ihr " -"Passwort kompromittiert wurde. Das Klartextpasswort wird nie von PyPI " -"gespeichert oder and HaveIBeenPwned gesendet." +"Wir verwenden das kostenlose Angebot von <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>. Wenn Sie sich " +"registrieren, authentifizieren oder ihr Passwort aktualisieren, erzeugen " +"wir einen SHA1-Hashwert Ihres Passworts und benutzen die ersten 5 Zeichen" +" des Hashwerts, um festzustellen, ob Ihr Passwort kompromittiert wurde. " +"Das Klartextpasswort wird nie von PyPI gespeichert oder and " +"HaveIBeenPwned gesendet." #: warehouse/templates/email/password-compromised-hibp/body.html:47 #, python-format msgid "" -"For more information, see our <a href=\"%(faq_url)s\">FAQ</a>. For help, you " -"can email <a href=\"%(email_href)s\">%(email_address)s</a> to communicate " -"with the PyPI administrators." +"For more information, see our <a href=\"%(faq_url)s\">FAQ</a>. For help, " +"you can email <a href=\"%(email_href)s\">%(email_address)s</a> to " +"communicate with the PyPI administrators." msgstr "" -"Weitere Informationen finden Sie in unseren <a href=\"%(faq_url)s\">FAQ</a>. " -"Für weitere Hilfe können Sie eine E-Mail an <a href=\"%(email_href)s\">" -"%(email_address)s</a> senden, um mit den PyPI-Administratoren Kontakt " -"aufzunehmen." +"Weitere Informationen finden Sie in unseren <a " +"href=\"%(faq_url)s\">FAQ</a>. Für weitere Hilfe können Sie eine E-Mail an" +" <a href=\"%(email_href)s\">%(email_address)s</a> senden, um mit den " +"PyPI-Administratoren Kontakt aufzunehmen." #: warehouse/templates/email/password-reset/body.html:18 #, python-format @@ -1388,8 +1375,8 @@ msgid "" "If you wish to proceed with this request, <a href=\"%(href)s\">click to " "reset your password</a>." msgstr "" -"Wenn Sie mit dem Zurücksetzen des Passwortes fortfahren möchten, <a href=" -"\"%(href)s\">klicken Sie bitte hier</a>." +"Wenn Sie mit dem Zurücksetzen des Passwortes fortfahren möchten, <a " +"href=\"%(href)s\">klicken Sie bitte hier</a>." #: warehouse/templates/email/password-reset/body.html:22 #: warehouse/templates/email/verify-email/body.html:22 @@ -1409,56 +1396,59 @@ msgstr "" #: warehouse/templates/email/primary-email-change/body.html:18 #, python-format msgid "" -"The primary email for your PyPI account <strong>%(username)s</strong> has " -"been changed from <code>%(old_email)s</code> to <code>%(new_email)s</code>" +"The primary email for your PyPI account <strong>%(username)s</strong> has" +" been changed from <code>%(old_email)s</code> to " +"<code>%(new_email)s</code>" msgstr "" -"Die primäre E-Mail-Adresse für Ihr PyPI-Konto <strong>%(username)s</strong> " -"wurde von <code>%(old_email)s</code> zu <code>%(new_email)s</code> geändert" +"Die primäre E-Mail-Adresse für Ihr PyPI-Konto " +"<strong>%(username)s</strong> wurde von <code>%(old_email)s</code> zu " +"<code>%(new_email)s</code> geändert" +# | msgid "" +# | "Someone, perhaps you, has changed the password for your PyPI account " +# | "<strong>%(username)s</strong>." #: warehouse/templates/email/two-factor-added/body.html:18 #, fuzzy, python-format -#| msgid "" -#| "Someone, perhaps you, has changed the password for your PyPI account " -#| "<strong>%(username)s</strong>." msgid "" "Someone, perhaps you, has added a %(method)s two-factor authentication " "method to your PyPI account <strong>%(username)s</strong>." msgstr "" -"Jemand, möglicherweise Sie selbst, hat das Passwort des PyPI-Kontos <strong>" -"%(username)s</strong> geändert." +"Jemand, möglicherweise Sie selbst, hat das Passwort des PyPI-Kontos " +"<strong>%(username)s</strong> geändert." +# | msgid "" +# | "Someone, perhaps you, has changed the password for your PyPI account " +# | "<strong>%(username)s</strong>." #: warehouse/templates/email/two-factor-removed/body.html:18 #, fuzzy, python-format -#| msgid "" -#| "Someone, perhaps you, has changed the password for your PyPI account " -#| "<strong>%(username)s</strong>." msgid "" "Someone, perhaps you, has removed a %(method)s two-factor authentication " "method from your PyPI account <strong>%(username)s</strong>." msgstr "" -"Jemand, möglicherweise Sie selbst, hat das Passwort des PyPI-Kontos <strong>" -"%(username)s</strong> geändert." +"Jemand, möglicherweise Sie selbst, hat das Passwort des PyPI-Kontos " +"<strong>%(username)s</strong> geändert." #: warehouse/templates/email/verify-email/body.html:18 #, python-format msgid "" -"Someone, perhaps you, has added this email address (<code>%(email_address)s</" -"code>) to their PyPI account." +"Someone, perhaps you, has added this email address " +"(<code>%(email_address)s</code>) to their PyPI account." msgstr "" -"Jemand, möglicherweise Sie selbst, hat diese E-Mail-Adresse (<code>" -"%(email_address)s</code>) zu seinem PyPI-Konto hinzugefügt." +"Jemand, möglicherweise Sie selbst, hat diese E-Mail-Adresse " +"(<code>%(email_address)s</code>) zu seinem PyPI-Konto hinzugefügt." +# | msgid "" +# | "If you wish to proceed with this request, <a href=\"%(href)s\">click this +# " +# | "link to verify your email address</a>" #: warehouse/templates/email/verify-email/body.html:20 #, fuzzy, python-format -#| msgid "" -#| "If you wish to proceed with this request, <a href=\"%(href)s\">click this " -#| "link to verify your email address</a>" msgid "" -"If you wish to proceed with this request, <a href=\"%(href)s\">click this " -"link to verify your email address</a>." +"If you wish to proceed with this request, <a href=\"%(href)s\">click this" +" link to verify your email address</a>." msgstr "" -"Wenn Sie fortfahren möchten, <a href=\"%(href)s\">klicken Sie hier, um ihre " -"E-Mail Adresse zu verifizieren</a>" +"Wenn Sie fortfahren möchten, <a href=\"%(href)s\">klicken Sie hier, um " +"ihre E-Mail Adresse zu verifizieren</a>" #: warehouse/templates/includes/current-user-indicator.html:29 msgid "Admin" @@ -1519,8 +1509,8 @@ msgstr "Erfolg" #: warehouse/templates/includes/hash-modal.html:23 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Hashes</a> for %(filename)s" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Hashes</a> for %(filename)s" msgstr "" "<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" "\">Hash-Codes</a> für %(filename)s" @@ -1589,11 +1579,11 @@ msgstr "E-Mail-Adresse bestätigen oder neue Adresse hinzufügen." #: warehouse/templates/includes/session-notifications.html:37 #, python-format msgid "" -"Two factor authentication is available, <a href=\"%(href)s\">enable it now " -"for your account.</a>" +"Two factor authentication is available, <a href=\"%(href)s\">enable it " +"now for your account.</a>" msgstr "" -"Zwei-Faktor-Authentifizierung ist verfügbar, <a href=\"%(href)s\">jetzt für " -"das Benutzerkonto aktivieren.</a>" +"Zwei-Faktor-Authentifizierung ist verfügbar, <a href=\"%(href)s\">jetzt " +"für das Benutzerkonto aktivieren.</a>" #: warehouse/templates/includes/accounts/profile-actions.html:16 msgid "Edit profile" @@ -1610,39 +1600,43 @@ msgstr "Statistiken" #: warehouse/templates/includes/accounts/profile-actions.html:21 #, python-format msgid "" -"View statistics for your projects via <a href=\"%(libs_io_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or by " -"using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our public " -"dataset on Google BigQuery</a>" +"View statistics for your projects via <a href=\"%(libs_io_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, " +"or by using <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">our public dataset on Google BigQuery</a>" msgstr "" -"Besuchen Sie <a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">Libraries.io</a> oder benutzen Sie <a href=\"%(gbq_href)s" -"\" target=\"_blank\" rel=\"noopener\">unseren öffentlichen Datensatz auf " -"Google BigQuery</a>, um Statistiken für Ihre Projekte zu sehen" +"Besuchen Sie <a href=\"%(libs_io_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Libraries.io</a> oder benutzen Sie <a " +"href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">unseren " +"öffentlichen Datensatz auf Google BigQuery</a>, um Statistiken für Ihre " +"Projekte zu sehen" #: warehouse/templates/includes/accounts/profile-actions.html:30 #, python-format msgid "" -"View statistics for %(username)s's projects via <a href=\"%(libs_io_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or " -"by using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our " -"public dataset on Google BigQuery</a>" +"View statistics for %(username)s's projects via <a " +"href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io</a>, or by using <a href=\"%(gbq_href)s\" " +"target=\"_blank\" rel=\"noopener\">our public dataset on Google " +"BigQuery</a>" msgstr "" -"Besuchen Sie <a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">Libraries.io</a> oder benutzen Sie <a href=\"%(gbq_href)s" -"\" target=\"_blank\" rel=\"noopener\">unseren öffentlichen Datensatz auf " -"Google BigQuery</a>, um Statistiken für %(username)ss Projekte zu sehen" +"Besuchen Sie <a href=\"%(libs_io_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Libraries.io</a> oder benutzen Sie <a " +"href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">unseren " +"öffentlichen Datensatz auf Google BigQuery</a>, um Statistiken für " +"%(username)ss Projekte zu sehen" #: warehouse/templates/includes/accounts/profile-callout.html:18 #, python-format msgid "" "You have not uploaded any projects to PyPI, yet. To learn how to get " -"started, visit the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">Python Packaging User Guide</a>" +"started, visit the <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" -"Sie haben noch keine Projekte zu PyPI hochgeladen. Besuchen Sie den<a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python " -"Packaging User Guide</a>, um zu erfahren, wie Sie damit beginnen können" +"Sie haben noch keine Projekte zu PyPI hochgeladen. Besuchen Sie den<a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>, um zu erfahren, wie Sie" +" damit beginnen können" #: warehouse/templates/includes/accounts/profile-callout.html:23 #, python-format @@ -1709,15 +1703,16 @@ msgstr "Offene Issues/Pull Requests:" #: warehouse/templates/includes/packaging/project-data.html:66 #, python-format msgid "" -"View statistics for this project via <a href=\"%(libs_io_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or by " -"using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our public " -"dataset on Google BigQuery</a>" +"View statistics for this project via <a href=\"%(libs_io_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, " +"or by using <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">our public dataset on Google BigQuery</a>" msgstr "" -"Besuchen Sie <a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">Libraries.io</a> oder benutzen Sie <a href=\"%(gbq_href)s" -"\" target=\"_blank\" rel=\"noopener\">unseren öffentlichen Datensatz auf " -"Google BigQuery</a>, um Statistiken für dieses Projekt zu sehen" +"Besuchen Sie <a href=\"%(libs_io_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Libraries.io</a> oder benutzen Sie <a " +"href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">unseren " +"öffentlichen Datensatz auf Google BigQuery</a>, um Statistiken für dieses" +" Projekt zu sehen" #: warehouse/templates/includes/packaging/project-data.html:74 msgid "Meta" @@ -1768,8 +1763,8 @@ msgstr "Verifiziert*" #: warehouse/templates/manage/account.html:35 msgid "*Intermittent delivery problems may lead to verification loss" msgstr "" -"*Vorübergehende Zustellschwierigkeiten können zum Verlust der Verifikation " -"führen" +"*Vorübergehende Zustellschwierigkeiten können zum Verlust der " +"Verifikation führen" #: warehouse/templates/manage/account.html:39 msgid "Verified" @@ -1840,8 +1835,8 @@ msgstr "E-Mail-Adresse entfernen" #: warehouse/templates/manage/account.html:138 msgid "" -"Add <abbr title=\"two factor authentication\">2FA</abbr> with authentication " -"application" +"Add <abbr title=\"two factor authentication\">2FA</abbr> with " +"authentication application" msgstr "" "<abbr title=\"Zwei-Faktor-Authentifizierung\">2FA</abbr> mit " "Authentifizierungs-App hinzufügen" @@ -1861,8 +1856,8 @@ msgstr "" #: warehouse/templates/manage/account.html:147 #: warehouse/templates/manage/account/webauthn-provision.html:37 msgid "" -"Enable JavaScript to set up two factor authentication with a security device " -"(e.g. USB key)" +"Enable JavaScript to set up two factor authentication with a security " +"device (e.g. USB key)" msgstr "" "Bitte JavaScript aktivieren, um Zwei-Faktor-Authentifizierung mit " "Sicherheitshardware (z. B. USB-Schlüssel) einzurichten" @@ -1871,13 +1866,14 @@ msgstr "" #: warehouse/templates/manage/account/webauthn-provision.html:53 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Upgrade your browser</a> to set up two factor authentication with a " -"security device (e.g. USB key)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Upgrade your browser</a> to set up two factor " +"authentication with a security device (e.g. USB key)" msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Aktualisieren Sie ihren Browser</a>, um Zwei-Faktor-Authentifizierung mit " -"einem Sicherheitsgerät (z.B. USB-Schlüssel) einzurichten" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Aktualisieren Sie ihren Browser</a>, um Zwei-Faktor-" +"Authentifizierung mit einem Sicherheitsgerät (z.B. USB-Schlüssel) " +"einzurichten" #: warehouse/templates/manage/account.html:166 #: warehouse/templates/manage/account.html:528 @@ -1926,10 +1922,11 @@ msgstr "API-Token entfernen" #: warehouse/templates/manage/account.html:216 #: warehouse/templates/manage/token.html:59 msgid "" -"Applications or scripts using this token will no longer have access to PyPI." +"Applications or scripts using this token will no longer have access to " +"PyPI." msgstr "" -"Anwendungen oder Skripte, die dieses Token verwenden, werden keinen Zugriff " -"mehr auf PyPI haben." +"Anwendungen oder Skripte, die dieses Token verwenden, werden keinen " +"Zugriff mehr auf PyPI haben." #: warehouse/templates/manage/account.html:227 #, python-format @@ -1943,13 +1940,13 @@ msgstr "Profilbild" #: warehouse/templates/manage/account.html:250 #, python-format msgid "" -"We use <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">gravatar.com</a> to generate your profile picture based on your " -"primary email address" +"We use <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">gravatar.com</a> to generate your profile picture based " +"on your primary email address" msgstr "" -"Wir verwenden <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">gravatar.com</a>, um Profilbilder anhand der primären E-Mail-" -"Adresse anzuzeigen." +"Wir verwenden <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">gravatar.com</a>, um Profilbilder anhand der primären E" +"-Mail-Adresse anzuzeigen." #: warehouse/templates/manage/account.html:257 msgid "Change image on gravatar.com" @@ -1966,10 +1963,11 @@ msgstr "Beitrittsdatum" #: warehouse/templates/manage/account.html:279 #, python-format msgid "" -"Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be changed." +"Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be " +"changed." msgstr "" -"Wird im <a href=\"%(href)s\">öffentlichen Profil</a> angezeigt. Kann nicht " -"geändert werden." +"Wird im <a href=\"%(href)s\">öffentlichen Profil</a> angezeigt. Kann " +"nicht geändert werden." #: warehouse/templates/manage/account.html:290 msgid "Full name" @@ -1984,23 +1982,23 @@ msgstr "Kein Name angegeben" msgid "Displayed on your <a href=\"%(href)s\">public profile</a>" msgstr "Wird auf dem <a href=\"%(href)s\">öffentlichen Profil</a> angezeigt" +# | msgid "Public profile" #: warehouse/templates/manage/account.html:307 #, fuzzy -#| msgid "Public profile" msgid "️Public email" msgstr "Öffentliches Profil" +# | msgid "" +# | "Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be " +# | "changed." #: warehouse/templates/manage/account.html:319 #, fuzzy, python-format -#| msgid "" -#| "Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be " -#| "changed." msgid "" -"One of your verified emails can be displayed on your <a href=\"%(href)s" -"\">public profile</a> to logged-in users." +"One of your verified emails can be displayed on your <a " +"href=\"%(href)s\">public profile</a> to logged-in users." msgstr "" -"Wird im <a href=\"%(href)s\">öffentlichen Profil</a> angezeigt. Kann nicht " -"geändert werden." +"Wird im <a href=\"%(href)s\">öffentlichen Profil</a> angezeigt. Kann " +"nicht geändert werden." #: warehouse/templates/manage/account.html:324 msgid "Update account" @@ -2012,16 +2010,17 @@ msgstr "E-Mail-Adressen des Kontos" #: warehouse/templates/manage/account.html:334 msgid "" -"You can associate several emails with your account. You can use any <span " -"class=\"badge badge--success\"><i class=\"fa fa-check\" aria-hidden=\"true" -"\"></i> Verified</span> email to recover your account, but only your <span " -"class=\"badge\">Primary</span> email will receive notifications." +"You can associate several emails with your account. You can use any <span" +" class=\"badge badge--success\"><i class=\"fa fa-check\" aria-" +"hidden=\"true\"></i> Verified</span> email to recover your account, but " +"only your <span class=\"badge\">Primary</span> email will receive " +"notifications." msgstr "" "Es können mehrere E-Mail-Adressen mit dem Konto verbunden werden. Alle " -"Adressen mit dem Label <span class=\"badge badge--success\"><i class=\"fa fa-" -"check\" aria-hidden=\"true\"></i> Bestätigt</span> können zur " -"Kontowiederherstellung verwendet werden, aber nur die mit dem Label <span " -"class=\"badge\">Primär</span> erhält Benachrichtigungsmails." +"Adressen mit dem Label <span class=\"badge badge--success\"><i class=\"fa" +" fa-check\" aria-hidden=\"true\"></i> Bestätigt</span> können zur " +"Kontowiederherstellung verwendet werden, aber nur die mit dem Label <span" +" class=\"badge\">Primär</span> erhält Benachrichtigungsmails." #: warehouse/templates/manage/account.html:345 msgid "Emails associated with your account" @@ -2068,8 +2067,8 @@ msgid "" "authentication\">2FA</abbr></a>." msgstr "" "Zwei-Faktor-Authentifizierung fügt dem Benutzerkonto eine zusätzliche " -"Sicherheitsebene hinzu. <a href=\"%(href)s\">Mehr über <abbr title=\"Zwei-" -"Faktor-Authentifizierung\">2FA</abbr></a>." +"Sicherheitsebene hinzu. <a href=\"%(href)s\">Mehr über <abbr title" +"=\"Zwei-Faktor-Authentifizierung\">2FA</abbr></a>." #: warehouse/templates/manage/account.html:451 msgid "Two factor authentication methods enabled" @@ -2082,11 +2081,11 @@ msgstr "Zwei-Faktor-Verfahren" #: warehouse/templates/manage/account.html:460 #: warehouse/templates/manage/account.html:570 msgid "" -"Authentication application (<abbr title=\"time-based one-time password" -"\">TOTP</abbr>)" +"Authentication application (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>)" msgstr "" -"Authentifizierungsanwendung (<abbr title=\"Time-based One-Time Password" -"\">TOTP</abbr>)" +"Authentifizierungsanwendung (<abbr title=\"Time-based One-Time " +"Password\">TOTP</abbr>)" #: warehouse/templates/manage/account.html:462 #: warehouse/templates/manage/account.html:476 @@ -2142,11 +2141,11 @@ msgstr "Zwei-Faktor-Authentifizierung ist für dieses Konto nicht aktiviert." #: warehouse/templates/manage/account.html:512 #, python-format msgid "" -"<a href=\"%(href)s\">Verify your primary email address</a> to add two factor " -"authentication to your account." +"<a href=\"%(href)s\">Verify your primary email address</a> to add two " +"factor authentication to your account." msgstr "" -"<a href=\"%(href)s\">Primäre E-Mail-Adresse bestätigen</a>, um Zwei-Faktor-" -"Authentifizierung zu diesem Konto hinzuzufügen." +"<a href=\"%(href)s\">Primäre E-Mail-Adresse bestätigen</a>, um Zwei-" +"Faktor-Authentifizierung zu diesem Konto hinzuzufügen." #: warehouse/templates/manage/account.html:519 #: warehouse/templates/manage/settings.html:23 @@ -2159,8 +2158,8 @@ msgid "" "API tokens provide an alternative way to authenticate when uploading " "packages to PyPI." msgstr "" -"API-Token stellen eine alternative Authentifizierungsmethode beim Hochladen " -"von Paketen zum PyPI dar." +"API-Token stellen eine alternative Authentifizierungsmethode beim " +"Hochladen von Paketen zum PyPI dar." #: warehouse/templates/manage/account.html:520 msgid "Learn more about API tokens" @@ -2178,11 +2177,11 @@ msgstr "API-Token hinzufügen" #: warehouse/templates/manage/account.html:544 #, python-format msgid "" -"<a href=\"%(href)s\">Verify your primary email address</a> to add API tokens " -"to your account." +"<a href=\"%(href)s\">Verify your primary email address</a> to add API " +"tokens to your account." msgstr "" -"<a href=\"%(href)s\">Primäre E-Mail-Adresse bestätigen</a>, um API-Token zu " -"diesem Konto hinzuzufügen." +"<a href=\"%(href)s\">Primäre E-Mail-Adresse bestätigen</a>, um API-Token " +"zu diesem Konto hinzuzufügen." #: warehouse/templates/manage/account.html:559 msgid "Account created" @@ -2257,10 +2256,11 @@ msgstr "Zwei-Faktor-Authentifizierung hinzugefügt" #: warehouse/templates/manage/account.html:613 #: warehouse/templates/manage/account.html:623 msgid "" -"Method: Security device (<abbr title=\"web authentication\">WebAuthn</abbr>)" +"Method: Security device (<abbr title=\"web " +"authentication\">WebAuthn</abbr>)" msgstr "" -"Verfahren: Sicherheitsgerät (<abbr title=\"Web Authentication\">WebAuthn</" -"abbr>)" +"Verfahren: Sicherheitsgerät (<abbr title=\"Web " +"Authentication\">WebAuthn</abbr>)" #: warehouse/templates/manage/account.html:614 #: warehouse/templates/manage/account.html:624 @@ -2273,8 +2273,8 @@ msgid "" "Method: Authentication application (<abbr title=\"time-based one-time " "password\">TOTP</abbr>)" msgstr "" -"Verfahren: Authentifizierungsanwendung (<abbr title=\"Time-based One-time " -"Password\">TOTP</abbr>)" +"Verfahren: Authentifizierungsanwendung (<abbr title=\"Time-based One-time" +" Password\">TOTP</abbr>)" #: warehouse/templates/manage/account.html:620 msgid "Two factor authentication removed" @@ -2324,8 +2324,8 @@ msgstr "Eindeutiger Bezeichner:" #: warehouse/templates/manage/account.html:662 msgid "Events appear here as security-related actions occur on your account." msgstr "" -"Hier erscheinen Ereignisse zu sicherheitsrelevanten Aktionen dieses Konto " -"betreffend." +"Hier erscheinen Ereignisse zu sicherheitsrelevanten Aktionen dieses Konto" +" betreffend." #: warehouse/templates/manage/account.html:664 msgid "Recent account activity" @@ -2351,11 +2351,10 @@ msgid "IP address" msgstr "IP-Adresse" #: warehouse/templates/manage/account.html:687 -msgid "" -"Events will appear here as security-related actions occur on your account." +msgid "Events will appear here as security-related actions occur on your account." msgstr "" -"Hier erscheinen Ereignisse wenn sicherheitsrelevante Aktionen auf dem Konto " -"ausgeführt werden." +"Hier erscheinen Ereignisse wenn sicherheitsrelevante Aktionen auf dem " +"Konto ausgeführt werden." #: warehouse/templates/manage/account.html:694 msgid "Delete account" @@ -2379,45 +2378,45 @@ msgid_plural "" " " msgstr[0] "" "\n" -" Dieses Konto ist derzeit der <strong>alleinige Besitzer</strong> " -"von %(count)s Projekt.\n" +" Dieses Konto ist derzeit der <strong>alleinige " +"Besitzer</strong> von %(count)s Projekt.\n" " " msgstr[1] "" "\n" -" Dieses Konto ist derzeit der <strong>alleinige Besitzer</strong> " -"von %(count)s Projekten.\n" +" Dieses Konto ist derzeit der <strong>alleinige " +"Besitzer</strong> von %(count)s Projekten.\n" " " #: warehouse/templates/manage/account.html:704 msgid "" "\n" -" You must transfer ownership or delete this project before you can " -"delete your account.\n" +" You must transfer ownership or delete this project before you " +"can delete your account.\n" " " msgid_plural "" "\n" -" You must transfer ownership or delete these projects before you " -"can delete your account.\n" +" You must transfer ownership or delete these projects before you" +" can delete your account.\n" " " msgstr[0] "" "\n" -" Sie müssen dieses Projekt übertragen oder löschen, um Ihr Konto zu " -"löschen.\n" +" Sie müssen dieses Projekt übertragen oder löschen, um Ihr Konto" +" zu löschen.\n" " " msgstr[1] "" "\n" -" Sie müssen diese Projekte übertragen oder löschen, um Ihr Konto zu " -"löschen.\n" +" Sie müssen diese Projekte übertragen oder löschen, um Ihr Konto" +" zu löschen.\n" " " #: warehouse/templates/manage/account.html:714 #, python-format msgid "" -"<a href=\"%(transfer_href)s\">transfer ownership</a> or <a href=" -"\"%(delete_href)s\">delete project</a>" +"<a href=\"%(transfer_href)s\">transfer ownership</a> or <a " +"href=\"%(delete_href)s\">delete project</a>" msgstr "" -"<a href=\"%(transfer_href)s\">Eigentum übertragen</a> oder <a href=" -"\"%(delete_href)s\">Projekt löschen</a>" +"<a href=\"%(transfer_href)s\">Eigentum übertragen</a> oder <a " +"href=\"%(delete_href)s\">Projekt löschen</a>" #: warehouse/templates/manage/account.html:723 #: warehouse/templates/manage/token.html:162 @@ -2444,13 +2443,13 @@ msgstr "Dokumentation zerstören" #: warehouse/templates/manage/documentation.html:28 #, python-format msgid "" -"If you would like to DESTROY any existing documentation hosted at <a href=" -"\"%(url)s\">%(url)s</a> there is <strong>no</strong> undo, as uploading new " -"documentation is no longer supported." +"If you would like to DESTROY any existing documentation hosted at <a " +"href=\"%(url)s\">%(url)s</a> there is <strong>no</strong> undo, as " +"uploading new documentation is no longer supported." msgstr "" -"Sie können das LÖSCHEN von unter <a href=\"%(url)s\">%(url)s</a> gehosteter " -"Dokumentation <strong>nicht</strong> rückgängig machen, da das Hochladen " -"neuer Dokumentation nicht mehr unterstützt wird." +"Sie können das LÖSCHEN von unter <a href=\"%(url)s\">%(url)s</a> " +"gehosteter Dokumentation <strong>nicht</strong> rückgängig machen, da das" +" Hochladen neuer Dokumentation nicht mehr unterstützt wird." #: warehouse/templates/manage/documentation.html:35 msgid "Destroy Documentation for project" @@ -2477,8 +2476,8 @@ msgstr "'%(project_name)s' Projekt-Verlauf" #: warehouse/templates/manage/history.html:25 msgid "" -"Each time you (or your collaborators) perform a security action related to " -"this project, the action is recorded and displayed here." +"Each time you (or your collaborators) perform a security action related " +"to this project, the action is recorded and displayed here." msgstr "" "Immer wenn Sie (oder andere Projektbeteiligte) sicherheitsrelevante " "Änderungen am Projekt vornehmen, werden diese aufgezeichnet und hier " @@ -2534,14 +2533,13 @@ msgstr "" #, python-format msgid "<a href=\"%(href)s\">%(username)s</a> removed as project %(role_name)s" msgstr "" -"<a href=\"%(href)s\">%(username)s</a> wurde als %(role_name)s vom Projekt " -"entfernt" +"<a href=\"%(href)s\">%(username)s</a> wurde als %(role_name)s vom Projekt" +" entfernt" #: warehouse/templates/manage/history.html:60 #, python-format msgid "<a href=\"%(href)s\">%(username)s</a> changed to project %(role_name)s" -msgstr "" -"<a href=\"%(href)s\">%(username)s</a> wurde zum %(role_name)s des Projekts" +msgstr "<a href=\"%(href)s\">%(username)s</a> wurde zum %(role_name)s des Projekts" #: warehouse/templates/manage/history.html:62 msgid "Changed by:" @@ -2576,14 +2574,14 @@ msgid "" "Each time you or your collaborators update this project, the action is " "recorded and displayed here." msgstr "" -"Immer wenn Sie oder andere Projektbeteiligte das Projekt aktualisieren, wird " -"dies aufgezeichnet und hier angezeigt." +"Immer wenn Sie oder andere Projektbeteiligte das Projekt aktualisieren, " +"wird dies aufgezeichnet und hier angezeigt." #: warehouse/templates/manage/journal.html:28 #, python-format msgid "" -"This feature will be deprecated in the future, replaced by the <a href=" -"\"%(href)s\">security history page</a>." +"This feature will be deprecated in the future, replaced by the <a " +"href=\"%(href)s\">security history page</a>." msgstr "" "Diese Funktion wird in Zukunft nicht mehr zu Verfügung stehen und wurde " "durch den <a href=\"%(href)s\">Sicherheitsverlauf</a> ersetzt." @@ -2712,12 +2710,12 @@ msgstr "Ansehen" #, python-format msgid "" "You have not uploaded any projects to PyPI, yet. To learn how to get " -"started, visit the <a href=\"%(href)s\" target=\"_blank\" rel=\"noopener" -"\">Python Packaging User Guide</a>" +"started, visit the <a href=\"%(href)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" -"Sie haben noch keine Projekte zu PyPI hochgeladen. Besuchen Sie den<a href=" -"\"%(href)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</" -"a>, um zu erfahren, wie Sie damit beginnen können" +"Sie haben noch keine Projekte zu PyPI hochgeladen. Besuchen Sie den<a " +"href=\"%(href)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>, um zu erfahren, wie Sie damit beginnen können" #: warehouse/templates/manage/release.html:18 #, python-format @@ -2821,12 +2819,12 @@ msgstr "Verwerfen" #: warehouse/templates/manage/release.html:119 #, python-format msgid "" -"Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" +"Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" -"Mehr zum Thema Datei-Upload erfahren im <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>" +"Mehr zum Thema Datei-Upload erfahren im <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" #: warehouse/templates/manage/release.html:122 msgid "Release settings" @@ -2841,13 +2839,13 @@ msgstr "Veröffentlichung entfernen" #, python-format msgid "" "\n" -" Deleting will irreversibly delete this release along with %(count)s " -"file.\n" +" Deleting will irreversibly delete this release along with " +"%(count)s file.\n" " " msgid_plural "" "\n" -" Deleting will irreversibly delete this release along with %(count)s " -"files.\n" +" Deleting will irreversibly delete this release along with " +"%(count)s files.\n" " " msgstr[0] "" "\n" @@ -2862,22 +2860,22 @@ msgstr[1] "" #: warehouse/templates/manage/release.html:135 msgid "Deleting will irreversibly delete this release." -msgstr "" -"Das Löschen führt zur unwiderruflichen Entfernung dieser Veröffentlichung." +msgstr "Das Löschen führt zur unwiderruflichen Entfernung dieser Veröffentlichung." #: warehouse/templates/manage/release.html:137 #: warehouse/templates/manage/releases.html:91 #, python-format msgid "" -"You will not be able to re-upload a new distribution of the same type with " -"the same version number. Consider making a new release or a <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">post " -"release</a> instead." +"You will not be able to re-upload a new distribution of the same type " +"with the same version number. Consider making a new release or a <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">post release</a> instead." msgstr "" -"Es wird nicht möglich sein, eine neue Distribution des gleichen Typs mit der " -"gleichen Versionsnummer erneut hochzuladen. Erstellen Sie stattdessen eine " -"neue Veröffentlichung oder eine <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Nachveröffentlichung</a>." +"Es wird nicht möglich sein, eine neue Distribution des gleichen Typs mit " +"der gleichen Versionsnummer erneut hochzuladen. Erstellen Sie stattdessen" +" eine neue Veröffentlichung oder eine <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Nachveröffentlichung</a>." #: warehouse/templates/manage/release.html:142 #: warehouse/templates/manage/releases.html:27 @@ -2959,13 +2957,13 @@ msgstr "Keine Veröffentlichungen gefunden" #: warehouse/templates/manage/releases.html:109 #, python-format msgid "" -"Learn how to create a new release on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>" +"Learn how to create a new release on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" msgstr "" -"Erfahren Sie im <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Python Packaging User Guide</a> mehr zum Erstellen neue " -"Veröffentlichungen" +"Erfahren Sie im <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> mehr " +"zum Erstellen neue Veröffentlichungen" #: warehouse/templates/manage/roles.html:18 #, python-format @@ -2978,8 +2976,8 @@ msgid "" "Use this page to control which PyPI users can help you to manage " "%(project_name)s" msgstr "" -"Auf dieser Seite können Sie festlegen, welche PyPI-Benutzer Ihnen bei der " -"Verwaltung von %(project_name)s helfen können" +"Auf dieser Seite können Sie festlegen, welche PyPI-Benutzer Ihnen bei der" +" Verwaltung von %(project_name)s helfen können" #: warehouse/templates/manage/roles.html:25 #: warehouse/templates/pages/help.html:509 @@ -2995,11 +2993,11 @@ msgstr "Betreuer" #: warehouse/templates/manage/roles.html:28 #: warehouse/templates/pages/help.html:510 msgid "" -"Can upload releases for a package. Cannot add collaborators. Cannot delete " -"files, releases, or the project." +"Can upload releases for a package. Cannot add collaborators. Cannot " +"delete files, releases, or the project." msgstr "" -"Kann Veröffentlichungen hochladen. Kann Mitarbeiter hinzufügen. Kann weder " -"Dateien, Veröffentlichungen oder noch das gesamte Projekt löschen." +"Kann Veröffentlichungen hochladen. Kann Mitarbeiter hinzufügen. Kann " +"weder Dateien, Veröffentlichungen oder noch das gesamte Projekt löschen." #: warehouse/templates/manage/roles.html:29 #: warehouse/templates/manage/roles.html:62 @@ -3013,8 +3011,8 @@ msgid "" "Can upload releases. Can add other collaborators. Can delete files, " "releases, or the entire project." msgstr "" -"Kann Veröffentlichungen hochladen. Kann andere Mitarbeiter hinzufügen. Kann " -"Dateien, Veröffentlichungen oder das gesamte Projekt löschen." +"Kann Veröffentlichungen hochladen. Kann andere Mitarbeiter hinzufügen. " +"Kann Dateien, Veröffentlichungen oder das gesamte Projekt löschen." #: warehouse/templates/manage/roles.html:34 #, python-format @@ -3070,8 +3068,8 @@ msgid "" "<a href=\"%(href)s\">Verify your primary email address</a> to add an API " "token for %(project_name)s." msgstr "" -"<a href=\"%(href)s\">Bestätigen Sie Ihre primäre Mail-Adresse</a>, um ein " -"API-Token für Projekt %(project_name)s hinzuzufügen." +"<a href=\"%(href)s\">Bestätigen Sie Ihre primäre Mail-Adresse</a>, um ein" +" API-Token für Projekt %(project_name)s hinzuzufügen." #: warehouse/templates/manage/settings.html:41 msgid "Project description and sidebar" @@ -3080,26 +3078,29 @@ msgstr "Projekt-Beschreibung und Seitenleiste" #: warehouse/templates/manage/settings.html:43 #, python-format msgid "" -"To set the '%(project_name)s' description, author, links, classifiers, and " -"other details for your next release, use the <a href=\"%(setup_args_href)s\" " -"rel=\"noopener\" target=\"_blank\"><code>setup()</code> arguments in your " -"<code>setup.py</code> file</a>. Updating these fields will not change the " -"metadata for past releases. Additionally, you <strong>must</strong> use <a " -"href=\"%(twine_docs_href)s\" rel=\"noopener\" target=\"_blank\">Twine</a> to " -"upload your files in order to get full support for these fields. See <a href=" -"\"%(distribution_href)s\" rel=\"noopener\" target=\"_blank\">the Python " -"Packaging User Guide</a> for more help." -msgstr "" -"Um die Beschreibung, Autoren, Links und Kategorien und andere Details der " -"nächsten Veröffentlichung von '%(project_name)s' zu setzen, benutzen Sie die " -"<a href=\"%(setup_args_href)s\" rel=\"noopener\" target=\"_blank" -"\"><code>setup()</code>-Argumente in Ihrer <code>setup.py</code>-Datei</a>. " -"Änderungen an diesen Feldern hat keine Auswirkungen auf bereits bestehende " -"Veröffentlichungen. Zudem <strong>müssen</strong> Sie die Dateien mit <a " -"href=\"%(twine_docs_href)s\" rel=\"noopener\" target=\"_blank\">Twine</a> " -"hochladen, um die volle Unterstützung dieser Felder zu gewährleisten. " -"Erfahren Sie mehr dazu im <a href=\"%(distribution_href)s\" rel=\"noopener\" " -"target=\"_blank\">Python Packaging User Guide</a>." +"To set the '%(project_name)s' description, author, links, classifiers, " +"and other details for your next release, use the <a " +"href=\"%(setup_args_href)s\" rel=\"noopener\" " +"target=\"_blank\"><code>setup()</code> arguments in your " +"<code>setup.py</code> file</a>. Updating these fields will not change the" +" metadata for past releases. Additionally, you <strong>must</strong> use " +"<a href=\"%(twine_docs_href)s\" rel=\"noopener\" " +"target=\"_blank\">Twine</a> to upload your files in order to get full " +"support for these fields. See <a href=\"%(distribution_href)s\" " +"rel=\"noopener\" target=\"_blank\">the Python Packaging User Guide</a> " +"for more help." +msgstr "" +"Um die Beschreibung, Autoren, Links und Kategorien und andere Details der" +" nächsten Veröffentlichung von '%(project_name)s' zu setzen, benutzen Sie" +" die <a href=\"%(setup_args_href)s\" rel=\"noopener\" " +"target=\"_blank\"><code>setup()</code>-Argumente in Ihrer " +"<code>setup.py</code>-Datei</a>. Änderungen an diesen Feldern hat keine " +"Auswirkungen auf bereits bestehende Veröffentlichungen. Zudem " +"<strong>müssen</strong> Sie die Dateien mit <a " +"href=\"%(twine_docs_href)s\" rel=\"noopener\" target=\"_blank\">Twine</a>" +" hochladen, um die volle Unterstützung dieser Felder zu gewährleisten. " +"Erfahren Sie mehr dazu im <a href=\"%(distribution_href)s\" " +"rel=\"noopener\" target=\"_blank\">Python Packaging User Guide</a>." #: warehouse/templates/manage/settings.html:54 #: warehouse/templates/manage/settings.html:85 @@ -3113,11 +3114,11 @@ msgstr "Löschen dieses Projekts führt zu:" #: warehouse/templates/manage/settings.html:62 #, python-format msgid "" -"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s " -"release</a>" +"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s" +" release</a>" msgid_plural "" -"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s " -"releases</a>" +"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s" +" releases</a>" msgstr[0] "" "Projekt unwiderruflich löschen mitsamt <a href=\"%(href)s\">%(count)s " "Release</a>" @@ -3132,22 +3133,23 @@ msgstr "Projekt unwiderruflich löschen" #: warehouse/templates/manage/settings.html:72 msgid "Make the project name available to <strong>any other PyPI</strong> user" msgstr "" -"Diesen Projektnamen einem <strong>beliebigen anderen PyPI</strong>-Benutzer " -"zur Verfügung stellen" +"Diesen Projektnamen einem <strong>beliebigen anderen " +"PyPI</strong>-Benutzer zur Verfügung stellen" #: warehouse/templates/manage/settings.html:74 msgid "" -"This user will be able to make new releases under this project name, so long " -"as the distribution filenames do not match filenames from a previously " -"released distribution (all PyPI distribution filenames are unique, as they " -"are generated by combining the project name + version number + distribution " -"type)" +"This user will be able to make new releases under this project name, so " +"long as the distribution filenames do not match filenames from a " +"previously released distribution (all PyPI distribution filenames are " +"unique, as they are generated by combining the project name + version " +"number + distribution type)" msgstr "" "Diesem Benutzer wird ermöglicht, neue Releases unter diesem Projektnamen " -"vorzunehmen, so lange die Dateinamen der Veröffentlichung nicht mit denen " -"einer früheren veröffentlichen Version übereinstimmen (alle PyPI-" -"veröffentlichten Dateinamen sind einzigartig, da sie aus einer Kombination " -"aus Projektname + Versionsnummer + Veröffentlichungstyp bestehen)" +"vorzunehmen, so lange die Dateinamen der Veröffentlichung nicht mit denen" +" einer früheren veröffentlichen Version übereinstimmen (alle PyPI-" +"veröffentlichten Dateinamen sind einzigartig, da sie aus einer " +"Kombination aus Projektname + Versionsnummer + Veröffentlichungstyp " +"bestehen)" #: warehouse/templates/manage/settings.html:85 msgid "Project Name" @@ -3184,8 +3186,8 @@ msgstr "Projekt \"%(project)s\"" #: warehouse/templates/manage/token.html:44 msgid "" -"For security reasons this token will only appear once. <strong>Copy it now.</" -"strong>" +"For security reasons this token will only appear once. <strong>Copy it " +"now.</strong>" msgstr "" "Aus Sicherheitsgründen wird dieses Token nur einmal angezeigt. " "<strong>Kopieren Sie es jetzt.</strong>" @@ -3214,8 +3216,8 @@ msgstr "Setzen Sie Ihren Benutzernamen auf <code>%(token)s</code>" #: warehouse/templates/manage/token.html:71 #, python-format msgid "" -"Set your password to the token value, including the <code>%(prefix)s</code> " -"prefix" +"Set your password to the token value, including the " +"<code>%(prefix)s</code> prefix" msgstr "" "Setzen Sie Ihr Passwort auf den Token-Wert, einschließlich des Präfixes " "<code>%(prefix)s</code>" @@ -3223,11 +3225,13 @@ msgstr "" #: warehouse/templates/manage/token.html:77 #, python-format msgid "" -"For example, if you are using <a href=\"%(href)s\">Twine</a> to upload your " -"projects to PyPI, set up your <code>%(filename)s</code> file like this:" +"For example, if you are using <a href=\"%(href)s\">Twine</a> to upload " +"your projects to PyPI, set up your <code>%(filename)s</code> file like " +"this:" msgstr "" -"Wenn Sie z.B <a href=\"%(href)s\">Twine</a> zum Hochladen Ihres Projekts auf " -"PyPI verwenden, richten Sie Ihre <code>%(filename)s</code> Datei so ein:" +"Wenn Sie z.B <a href=\"%(href)s\">Twine</a> zum Hochladen Ihres Projekts " +"auf PyPI verwenden, richten Sie Ihre <code>%(filename)s</code> Datei so " +"ein:" #: warehouse/templates/manage/token.html:87 #, python-format @@ -3236,14 +3240,14 @@ msgid "" "multiple projects to PyPI, you can set up your <code>%(filename)s</code> " "file like this:" msgstr "" -"Wenn Sie z.B. <a href=\"%(href)s\">Twine</a> zum Hochladen mehrerer Projekte " -"auf PyPI verwenden, können Sie Ihre <code>%(filename)s</code> Datei wie " -"folgt einrichten:" +"Wenn Sie z.B. <a href=\"%(href)s\">Twine</a> zum Hochladen mehrerer " +"Projekte auf PyPI verwenden, können Sie Ihre <code>%(filename)s</code> " +"Datei wie folgt einrichten:" #: warehouse/templates/manage/token.html:99 msgid "" -"either a user-scoped token or a project-scoped token you want to set as the " -"default" +"either a user-scoped token or a project-scoped token you want to set as " +"the default" msgstr "" "entweder ein Benutzer-Bereichs oder Projekt-Bereichs Token, das Sie als " "Standard setzen möchten" @@ -3258,17 +3262,17 @@ msgid "" "You can then use <code>%(command)s</code> to switch to the correct token " "when uploading to PyPI." msgstr "" -"Sie können dann <code>%(command)s</code> zum Wechseln auf das korrekte Token " -"beim Hochladen auf PyPI verwenden." +"Sie können dann <code>%(command)s</code> zum Wechseln auf das korrekte " +"Token beim Hochladen auf PyPI verwenden." #: warehouse/templates/manage/token.html:112 #, python-format msgid "" -"For further instructions on how to use this token, <a href=\"%(href)s" -"\">visit the PyPI help page</a>." +"For further instructions on how to use this token, <a " +"href=\"%(href)s\">visit the PyPI help page</a>." msgstr "" -"Für weitere Anweisungen, wie dieses Token zu verwenden ist, <a href=" -"\"%(href)s\">besuchen Sie die PyPI-Hilfe-Seite</a>." +"Für weitere Anweisungen, wie dieses Token zu verwenden ist, <a " +"href=\"%(href)s\">besuchen Sie die PyPI-Hilfe-Seite</a>." #: warehouse/templates/manage/token.html:120 msgid "Add another token" @@ -3296,8 +3300,8 @@ msgstr "Projekt:" #: warehouse/templates/manage/token.html:163 msgid "" -"An API token scoped to your entire account will have upload permissions for " -"all of your current and future projects." +"An API token scoped to your entire account will have upload permissions " +"for all of your current and future projects." msgstr "" "Ein API-Token mit dem Geltungsbereich für Ihr gesamtes Konto beinhaltet " "Upload-Berechtigungen für alle Ihre aktuellen und künftigen Projekte." @@ -3316,31 +3320,32 @@ msgstr "" #: warehouse/templates/manage/account/recovery_codes-provision.html:46 msgid "" -"If you lose access to your authentication application or security key(s), " -"you’ll need to use one of these recovery codes to log into your PyPI " +"If you lose access to your authentication application or security key(s)," +" you’ll need to use one of these recovery codes to log into your PyPI " "account. Each code can only be used <strong>once</strong>." msgstr "" #: warehouse/templates/manage/account/recovery_codes-provision.html:47 msgid "" -"These codes should <strong>only</strong> be used for account recovery, not " -"for typical logins." +"These codes should <strong>only</strong> be used for account recovery, " +"not for typical logins." msgstr "" #: warehouse/templates/manage/account/recovery_codes-provision.html:48 msgid "" -"<strong>Keep these somewhere safe</strong>. If you lose your authentication " -"application or security key(s) and do not have access to these recovery " -"codes, you may permanently lose access to your PyPI account!" +"<strong>Keep these somewhere safe</strong>. If you lose your " +"authentication application or security key(s) and do not have access to " +"these recovery codes, you may permanently lose access to your PyPI " +"account!" msgstr "" #: warehouse/templates/manage/account/recovery_codes-provision.html:52 msgid "Save your Recovery Codes" msgstr "" +# | msgid "Download files" #: warehouse/templates/manage/account/recovery_codes-provision.html:64 #, fuzzy -#| msgid "Download files" msgid "Download as file" msgstr "Dateien zum Herunterladen" @@ -3365,13 +3370,13 @@ msgstr "2FA mittels Authentifizierungsanwendung (TOTP) einrichten" #: warehouse/templates/manage/account/totp-provision.html:32 #, python-format msgid "" -"PyPI supports any application that follows the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based " -"one-time password\">TOTP</abbr> standard</a>." +"PyPI supports any application that follows the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title" +"=\"time-based one-time password\">TOTP</abbr> standard</a>." msgstr "" -"PyPI unterstütze alle Anwendungen, die dem <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Time-based " -"One-Time Password\">TOTP</abbr>-Standard</a> folgen." +"PyPI unterstütze alle Anwendungen, die dem <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title" +"=\"Time-based One-Time Password\">TOTP</abbr>-Standard</a> folgen." #: warehouse/templates/manage/account/totp-provision.html:36 #, python-format @@ -3392,11 +3397,11 @@ msgstr "QR-Code mit der gewählten Authentifizierungsanwendung einscannen." #: warehouse/templates/manage/account/totp-provision.html:46 msgid "" -"For security reasons, you can only associate one authentication application " -"per PyPI account." +"For security reasons, you can only associate one authentication " +"application per PyPI account." msgstr "" -"Aus Sicherheitsgründen, kann nur eine einzige Authentifizierungsanwendung " -"mit dem PyPI-Konto verbunden werden." +"Aus Sicherheitsgründen, kann nur eine einzige Authentifizierungsanwendung" +" mit dem PyPI-Konto verbunden werden." #: warehouse/templates/manage/account/totp-provision.html:52 msgid "QR code for setting up an authentication application" @@ -3405,8 +3410,8 @@ msgstr "QR-Code zum Einrichten einer Authentifizierungsanwendung" #: warehouse/templates/manage/account/totp-provision.html:55 msgid "<strong>No QR scanner?</strong> Manually enter the code instead:" msgstr "" -"<strong>Kein QR-Code-Scanner?</strong> Bitte stattdessen den Code manuell " -"eingeben:" +"<strong>Kein QR-Code-Scanner?</strong> Bitte stattdessen den Code manuell" +" eingeben:" #: warehouse/templates/manage/account/totp-provision.html:67 msgid "Verify application" @@ -3418,11 +3423,11 @@ msgstr "Authentifizierungscode" #: warehouse/templates/manage/account/totp-provision.html:73 msgid "" -"To finalize the set up process, enter the authentication code provided by " -"your application." +"To finalize the set up process, enter the authentication code provided by" +" your application." msgstr "" -"Um den Vorgang abzuschließen, bitte den Authentifizierungscode eingeben, der " -"von der Anwendung bereitgestellt wird." +"Um den Vorgang abzuschließen, bitte den Authentifizierungscode eingeben, " +"der von der Anwendung bereitgestellt wird." #: warehouse/templates/manage/account/totp-provision.html:85 msgid "Set up application" @@ -3435,26 +3440,28 @@ msgstr "2FA mit Hilfe eines Sicherheitsgeräts (z. B. USB-Schlüssel) einrichten #: warehouse/templates/manage/account/webauthn-provision.html:26 #, python-format msgid "" -"PyPI supports any device that adheres to the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." +"PyPI supports any device that adheres to the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." msgstr "" -"PyPI unterstützt alle Geräte, die sich an den <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO-Standard</a> halten." +"PyPI unterstützt alle Geräte, die sich an den <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO-Standard</a> " +"halten." #: warehouse/templates/manage/account/webauthn-provision.html:28 #, python-format msgid "" -"Popular <em>USB keys</em> include <a href=\"%(yubico_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=" -"\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Google Titan</a> and <a href=\"%(thetis_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Thetis</a>." +"Popular <em>USB keys</em> include <a href=\"%(yubico_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> and <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." msgstr "" -"Beliebte <em>USB-Schlüssel</em> sind beispielsweise <a href=\"%(yubico_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " -"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Google Titan</a>, und <a href=\"%(thetis_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Thetis</a>." +"Beliebte <em>USB-Schlüssel</em> sind beispielsweise <a " +"href=\"%(yubico_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</a>, " +"und <a href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Thetis</a>." #: warehouse/templates/manage/account/webauthn-provision.html:43 msgid "Name your device to begin" @@ -3479,21 +3486,22 @@ msgstr "Sicherheitsgerät einrichten" #: warehouse/templates/manage/account/webauthn-provision.html:74 #, python-format msgid "" -"<strong>Not working?</strong> Check you're using a device that follows the " -"<a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">FIDO specification</a> and a <a href=\"%(mozilla_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">compatible browser</a>." +"<strong>Not working?</strong> Check you're using a device that follows " +"the <a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">FIDO specification</a> and a <a " +"href=\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">compatible browser</a>." msgstr "" -"<strong>Funktioniert nicht?</strong> Stellen Sie sicher, dass Ihr Gerät den " -"<a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">FIDO-Spezifikationen</a> entspricht und verwenden Sie einen <a " -"href=\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">kompatiblen Browser</a>." +"<strong>Funktioniert nicht?</strong> Stellen Sie sicher, dass Ihr Gerät " +"den <a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">FIDO-Spezifikationen</a> entspricht und verwenden Sie " +"einen <a href=\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">kompatiblen Browser</a>." #: warehouse/templates/manage/account/webauthn-provision.html:78 msgid "" -"Note that some older USB keys do not adhere to the FIDO standard and will " -"not work with PyPI." +"Note that some older USB keys do not adhere to the FIDO standard and will" +" not work with PyPI." msgstr "" "Beachten Sie, dass einige ältere USB-Schlüssel nicht dem FIDO-Standard " "entsprechen und nicht mit PyPI funktionieren." @@ -3550,7 +3558,8 @@ msgstr "Projekt-Beschreibung" #: warehouse/templates/packaging/detail.html:186 msgid "Release history. Focus will be moved to the history panel." msgstr "" -"Veröffentlichungs-Historie. Der Fokus wird auf den Historien-Verlauf gelegt." +"Veröffentlichungs-Historie. Der Fokus wird auf den Historien-Verlauf " +"gelegt." #: warehouse/templates/packaging/detail.html:152 #: warehouse/templates/packaging/detail.html:188 @@ -3561,8 +3570,7 @@ msgstr "Veröffentlichungs-Historie" #: warehouse/templates/packaging/detail.html:157 #: warehouse/templates/packaging/detail.html:193 msgid "Download files. Focus will be moved to the project files." -msgstr "" -"Dateien zum Herunterladen. Der Fokus wird auf die Projekt-Dateien gelenkt." +msgstr "Dateien zum Herunterladen. Der Fokus wird auf die Projekt-Dateien gelenkt." #: warehouse/templates/packaging/detail.html:159 #: warehouse/templates/packaging/detail.html:195 @@ -3599,12 +3607,13 @@ msgstr "vorab-Veröffentlichung" #, python-format msgid "" "Download the file for your platform. If you're not sure which to choose, " -"learn more about <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">installing packages</a>." +"learn more about <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">installing packages</a>." msgstr "" -"Laden Sie die Datei für Ihre Plattform herunter. Wenn Sie nicht sicher sind, " -"was Sie auswählen sollen, lesen Sie <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Installation von Paketen</a>." +"Laden Sie die Datei für Ihre Plattform herunter. Wenn Sie nicht sicher " +"sind, was Sie auswählen sollen, lesen Sie <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Installation von " +"Paketen</a>." #: warehouse/templates/packaging/detail.html:273 #, python-format @@ -3623,9 +3632,9 @@ msgstr "Hashes" #: warehouse/templates/pages/classifiers.html:22 msgid "" -"Each project's maintainers provide PyPI with a list of \"trove classifiers\" " -"to categorize each release, describing who it's for, what systems it can run " -"on, and how mature it is." +"Each project's maintainers provide PyPI with a list of \"trove " +"classifiers\" to categorize each release, describing who it's for, what " +"systems it can run on, and how mature it is." msgstr "" "Die Betreuer eines Projekts verwenden eine Liste von Kategorien, um eine " "Veröffentlichung einzuordnen; um anzugeben für wen sie bestimmt ist, auf " @@ -3633,28 +3642,28 @@ msgstr "" #: warehouse/templates/pages/classifiers.html:23 msgid "" -"These standardized classifiers can then be used by community members to find " -"projects based on their desired criteria." +"These standardized classifiers can then be used by community members to " +"find projects based on their desired criteria." msgstr "" -"Mit Hilfe dieser standardisierten Kategorien können Mitglieder der Community " -"Projekte nach ihren Kriterien suchen." +"Mit Hilfe dieser standardisierten Kategorien können Mitglieder der " +"Community Projekte nach ihren Kriterien suchen." #: warehouse/templates/pages/classifiers.html:25 #, python-format msgid "" -"Instructions for how to add trove classifiers to a project can be found on " -"the <a href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging User Guide</a>. To read the original " -"classifier specification, refer to <a href=\"%(pep301_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python " -"enhancement proposal\">PEP</abbr> 301</a>." +"Instructions for how to add trove classifiers to a project can be found " +"on the <a href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>. To read the original " +"classifier specification, refer to <a href=\"%(pep301_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 301</a>." msgstr "" -"Anweisungen zum Hinzufügen von Kategorien zu einem Projekt sind im <a href=" -"\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Python Packaging User Guide</a> zu finden. Die Spezifikation der " -"Kategorien ist Teil von <a href=\"%(pep301_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\"><abbr title=\"Python enhancement proposal" -"\">PEP</abbr> 301</a>." +"Anweisungen zum Hinzufügen von Kategorien zu einem Projekt sind im <a " +"href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a> zu finden. Die " +"Spezifikation der Kategorien ist Teil von <a href=\"%(pep301_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 301</a>." #: warehouse/templates/pages/classifiers.html:31 msgid "List of classifiers" @@ -3668,36 +3677,37 @@ msgstr "Hinweis:" #: warehouse/templates/pages/help.html:20 #, python-format msgid "" -"All users submitting feedback, reporting issues or contributing to Warehouse " -"are expected to follow the <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">PyPA Code of Conduct</a>." +"All users submitting feedback, reporting issues or contributing to " +"Warehouse are expected to follow the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPA Code of " +"Conduct</a>." msgstr "" -"Beim Übermitteln von Feedback, Melden von Problemen oder jeglichen sonstigen " -"Beträgen zu Warehouse, wird von allen Benutzern erwartet, sich an den <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPA Code of Conduct (Verhaltenskodex)</a> zu halten." +"Beim Übermitteln von Feedback, Melden von Problemen oder jeglichen " +"sonstigen Beträgen zu Warehouse, wird von allen Benutzern erwartet, sich " +"an den <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA Code of Conduct (Verhaltenskodex)</a> zu halten." #: warehouse/templates/pages/help.html:31 #, python-format msgid "" "If you lose your %(method)s and can no longer log in, you may " "<strong>permanently lose access to your account</strong>. You should " -"generate and securely store <a href=\"#recoverycodes\">recovery codes</a> to " -"regain access in that event.." +"generate and securely store <a href=\"#recoverycodes\">recovery codes</a>" +" to regain access in that event.." msgstr "" #: warehouse/templates/pages/help.html:37 msgid "" -"We recommend that all PyPI users set up <em>at least two</em> supported two " -"factor authentication methods and provision <a href=\"#recoverycodes" -"\">recovery codes</a>." +"We recommend that all PyPI users set up <em>at least two</em> supported " +"two factor authentication methods and provision <a " +"href=\"#recoverycodes\">recovery codes</a>." msgstr "" #: warehouse/templates/pages/help.html:43 msgid "" -"If you've lost access to all two factor methods for your account and do not " -"have <a href=\"#recoverycodes\">recovery codes</a>, you can request help <a " -"href=\"#account-recovery\">with account recovery</a>." +"If you've lost access to all two factor methods for your account and do " +"not have <a href=\"#recoverycodes\">recovery codes</a>, you can request " +"help <a href=\"#account-recovery\">with account recovery</a>." msgstr "" #: warehouse/templates/pages/help.html:52 @@ -3726,18 +3736,17 @@ msgstr "Wieso behauptet PyPI, mein Passwort sei kompromittiert?" #: warehouse/templates/pages/help.html:59 msgid "What is two factor authentication and how does it work on PyPI?" -msgstr "" -"Was ist Zwei-Faktor-Authentifizierung und wie funktioniert sie auf PyPI?" +msgstr "Was ist Zwei-Faktor-Authentifizierung und wie funktioniert sie auf PyPI?" #: warehouse/templates/pages/help.html:60 msgid "" -"How does two factor authentication with an authentication application (<abbr " -"title=\"time-based one-time password\">TOTP</abbr>) work? How do I set it up " -"on PyPI?" +"How does two factor authentication with an authentication application " +"(<abbr title=\"time-based one-time password\">TOTP</abbr>) work? How do I" +" set it up on PyPI?" msgstr "" "Wie funktioniert die Zwei-Faktor-Authentifizierung mit einer " -"Authentifizierungsanwendung (<abbr title=\"time-based one-time password" -"\">TOTP</abbr>)? Wie kann ich sie bei PyPI einrichten?" +"Authentifizierungsanwendung (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>)? Wie kann ich sie bei PyPI einrichten?" #: warehouse/templates/pages/help.html:61 msgid "" @@ -3754,14 +3763,15 @@ msgstr "" "Welche Geräte (von einem USB-Schlüssel abgesehen) kann ich als " "Sicherheitsgerät verwenden?" +# | msgid "" +# | "How does two factor authentication with a security device (e.g. USB key) +# " +# | "work? How do I set it up on PyPI?" #: warehouse/templates/pages/help.html:63 #, fuzzy -#| msgid "" -#| "How does two factor authentication with a security device (e.g. USB key) " -#| "work? How do I set it up on PyPI?" msgid "" -"How does two factor authentication with a recovery code work? How do I set " -"it up on PyPI?" +"How does two factor authentication with a recovery code work? How do I " +"set it up on PyPI?" msgstr "" "Wie funktioniert die Zwei-Faktor-Authentifizierung mit einem " "Sicherheitsgerät (z.B. einem USB-Schlüssel)? Wie kann ich es bei PyPI " @@ -3769,8 +3779,7 @@ msgstr "" #: warehouse/templates/pages/help.html:64 msgid "How can I use API tokens to authenticate with PyPI?" -msgstr "" -"Wie kann ich API-Token verwenden, um mich beim PyPI zu authentifizieren?" +msgstr "Wie kann ich API-Token verwenden, um mich beim PyPI zu authentifizieren?" #: warehouse/templates/pages/help.html:66 msgid "How can I run a mirror of PyPI?" @@ -3783,12 +3792,13 @@ msgstr "Hat PyPI APIs, die ich benutzen kann?" #: warehouse/templates/pages/help.html:68 msgid "How do I get notified when a new version of a project is released?" msgstr "" -"Wie erfahre ich davon, wenn eine neue Version eines Projekts veröffentlicht " -"wird?" +"Wie erfahre ich davon, wenn eine neue Version eines Projekts " +"veröffentlicht wird?" #: warehouse/templates/pages/help.html:69 msgid "" -"Where can I see statistics about PyPI, downloads, and project/package usage?" +"Where can I see statistics about PyPI, downloads, and project/package " +"usage?" msgstr "" "Wo kann ich Statistiken über PyPI, Downloads, und Projekt- bzw. Paket-" "Nutzungsdaten erhalten?" @@ -3797,34 +3807,32 @@ msgstr "" msgid "I forgot my PyPI password. Can you help me?" msgstr "Ich habe mein PyPI-Passwort vergessen? Wo bekomme ich Hilfe?" +# | msgid "I forgot my PyPI password. Can you help me?" #: warehouse/templates/pages/help.html:72 #, fuzzy -#| msgid "I forgot my PyPI password. Can you help me?" msgid "I've lost access to my PyPI account. Can you help me?" msgstr "Ich habe mein PyPI-Passwort vergessen? Wo bekomme ich Hilfe?" #: warehouse/templates/pages/help.html:73 msgid "" -"Why am I getting a \"Invalid or non-existent authentication information.\" " -"error when uploading files?" +"Why am I getting a \"Invalid or non-existent authentication " +"information.\" error when uploading files?" msgstr "" #: warehouse/templates/pages/help.html:74 msgid "" -"Why am I getting \"No matching distribution found\" or \"Could not fetch URL" -"\" errors during <code>pip install</code>?" +"Why am I getting \"No matching distribution found\" or \"Could not fetch " +"URL\" errors during <code>pip install</code>?" msgstr "" "Warum erhalte ich die Fehlermeldungen \"No matching distribution found\" " "oder \"Could not fetch URL\" beim Ausführen von <code>pip install</code>?" #: warehouse/templates/pages/help.html:75 msgid "I am having trouble using the PyPI website. Can you help me?" -msgstr "" -"Ich habe Probleme bei der Nutzung der PyPI-Website. Wo bekomme ich Hilfe?" +msgstr "Ich habe Probleme bei der Nutzung der PyPI-Website. Wo bekomme ich Hilfe?" #: warehouse/templates/pages/help.html:76 -msgid "" -"Why can't I manually upload files to PyPI, through the browser interface?" +msgid "Why can't I manually upload files to PyPI, through the browser interface?" msgstr "" "Wieso kann ich Dateien nicht manuell über das Browser-Interface zum PyPI " "hochladen?" @@ -3840,16 +3848,16 @@ msgstr "Wieso wurde mein Paket oder meine Benutzer-Registrierung blockiert?" #: warehouse/templates/pages/help.html:79 msgid "How do I get a file size limit exemption or increase for my project?" msgstr "" -"Wie erhalte ich eine Ausnahme von der Dateigrößenlimitierung oder erhöhe " -"diese für mein Projekt?" +"Wie erhalte ich eine Ausnahme von der Dateigrößenlimitierung oder erhöhe" +" diese für mein Projekt?" #: warehouse/templates/pages/help.html:81 msgid "" -"Why am I getting a \"Filename or contents already exists\" or \"Filename has " -"been previously used\" error?" +"Why am I getting a \"Filename or contents already exists\" or \"Filename " +"has been previously used\" error?" msgstr "" -"Wieso bekomme den Fehler \"Dateiname oder Inhalt existiert bereits\" bzw. " -"\"Dateiname wurde schon einmal verwendet\" angezeigt?" +"Wieso bekomme den Fehler \"Dateiname oder Inhalt existiert bereits\" bzw." +" \"Dateiname wurde schon einmal verwendet\" angezeigt?" #: warehouse/templates/pages/help.html:82 msgid "Why isn't my desired project name available?" @@ -3871,8 +3879,7 @@ msgstr "Wie werde ich Besitzer oder Verwalter eines Projekts auf PyPI?" #: warehouse/templates/pages/help.html:86 msgid "How can I upload a project description in a different format?" -msgstr "" -"Wie kann ich eine Projektbeschreibung in einem anderen Format hochladen?" +msgstr "Wie kann ich eine Projektbeschreibung in einem anderen Format hochladen?" #: warehouse/templates/pages/help.html:87 msgid "How do I request a new trove classifier?" @@ -3904,8 +3911,8 @@ msgstr "Wie bleibe ich bzgl. Änderungen an PyPI auf dem Laufenden?" #: warehouse/templates/pages/help.html:95 msgid "" -"What does the \"beta feature\" badge mean? What are Warehouse's current beta " -"features?" +"What does the \"beta feature\" badge mean? What are Warehouse's current " +"beta features?" msgstr "" "Was bedeutet das Label \"Beta Feature\"? Welche Funktionen vom Warehouse " "sind derzeit Beta Features?" @@ -3952,85 +3959,86 @@ msgstr "Über" msgid "" "\n" " <p>We use a number of terms to describe software available on " -"PyPI, like \"project\", \"release\", \"file\", and \"package\". Sometimes " -"those terms are confusing because they're used to describe different things " -"in other contexts. Here's how we use them on PyPI:</p>\n" -" <p>A \"project\" on PyPI is the name of a collection of releases " -"and files, and information about them. Projects on PyPI are made and shared " -"by other members of the Python community so that you can use them.</p>\n" -" <p>A \"release\" on PyPI is a specific version of a project. For " -"example, the <a href=\"%(requests_href)s\">requests</a> project has many " -"releases, like \"requests 2.10\" and \"requests 1.2.1\". A release consists " -"of one or more \"files\".</p>\n" -" <p>A \"file\", also known as a \"package\", on PyPI is something " -"that you can download and install. Because of different hardware, operating " -"systems, and file formats, a release may have several files (packages), like " -"an archive containing source code or a binary <a href=\"%(wheel_href)s" -"\">wheel</a>.</p>\n" +"PyPI, like \"project\", \"release\", \"file\", and \"package\". Sometimes" +" those terms are confusing because they're used to describe different " +"things in other contexts. Here's how we use them on PyPI:</p>\n" +" <p>A \"project\" on PyPI is the name of a collection of " +"releases and files, and information about them. Projects on PyPI are made" +" and shared by other members of the Python community so that you can use " +"them.</p>\n" +" <p>A \"release\" on PyPI is a specific version of a project. " +"For example, the <a href=\"%(requests_href)s\">requests</a> project has " +"many releases, like \"requests 2.10\" and \"requests 1.2.1\". A release " +"consists of one or more \"files\".</p>\n" +" <p>A \"file\", also known as a \"package\", on PyPI is " +"something that you can download and install. Because of different " +"hardware, operating systems, and file formats, a release may have several" +" files (packages), like an archive containing source code or a binary <a " +"href=\"%(wheel_href)s\">wheel</a>.</p>\n" " " msgstr "" "\n" " <p>Wir benutzen eine Reihe von Begriffen wie \"Projekt\", " -"\"Veröffentlichung\", \"Datei\" und \"Paket\", um die auf PyPI verfügbare " -"Software zu beschreiben. Diese Begriffe können manchmal verwirrend sein, " -"weil sie in andere Kontexten andere Dinge beschreiben. So benutzen wir sie " -"auf PyPI:</p>\n" +"\"Veröffentlichung\", \"Datei\" und \"Paket\", um die auf PyPI verfügbare" +" Software zu beschreiben. Diese Begriffe können manchmal verwirrend sein," +" weil sie in andere Kontexten andere Dinge beschreiben. So benutzen wir " +"sie auf PyPI:</p>\n" "<p>Ein \"Projekt\" bei PyPI ist der Begriff für eine Sammlung von " -"Veröffentlichungen und Dateien und den dazugehörigen Informationen. Projekte " -"bei PyPI werden von anderen Mitgliedern der Python-Community erstellt und " -"geteilt damit Sie sie nutzen können.</p>\n" +"Veröffentlichungen und Dateien und den dazugehörigen Informationen. " +"Projekte bei PyPI werden von anderen Mitgliedern der Python-Community " +"erstellt und geteilt damit Sie sie nutzen können.</p>\n" "<p>Eine \"Veröffentlichung\" bei PyPI ist eine konkrete Version eines " -"Projekts. Zum Beispiel hat das <a href=\"%(requests_href)s\">requests</a>-" -"Projekt eine ganze Reihe von Veröffentlichungen, wie \"requests 2.10\" und " -"\"requests 1.2.1\". Eine Veröffentlichung umfasst eine oder mehrere \"Dateien" -"\".</p>\n" -"<p>Eine \"Datei\" bei PyPI, auch \"Paket\" genannt, können Sie herunterladen " -"und installieren. Wegen sich unterscheidender Hardware, Betriebssystemen und " -"Dateiformaten, kann eine Veröffentlichung mehrere Dateien (Pakete) " -"enthalten, wie zum Beispiel eine Archivdatei mit Quellcode oder ein binäres " -"<a href=\"%(wheel_href)s\">wheel</a>.</p>\n" +"Projekts. Zum Beispiel hat das <a " +"href=\"%(requests_href)s\">requests</a>-Projekt eine ganze Reihe von " +"Veröffentlichungen, wie \"requests 2.10\" und \"requests 1.2.1\". Eine " +"Veröffentlichung umfasst eine oder mehrere \"Dateien\".</p>\n" +"<p>Eine \"Datei\" bei PyPI, auch \"Paket\" genannt, können Sie " +"herunterladen und installieren. Wegen sich unterscheidender Hardware, " +"Betriebssystemen und Dateiformaten, kann eine Veröffentlichung mehrere " +"Dateien (Pakete) enthalten, wie zum Beispiel eine Archivdatei mit " +"Quellcode oder ein binäres <a href=\"%(wheel_href)s\">wheel</a>.</p>\n" " " #: warehouse/templates/pages/help.html:194 #, python-format msgid "" -"To learn how to install a file from PyPI, visit the <a href=" -"\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">installation tutorial</a> on the <a href=\"%(user_guide_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " -"User Guide</a>." +"To learn how to install a file from PyPI, visit the <a " +"href=\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">installation tutorial</a> on the <a " +"href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" "Besuchen Sie die <a href=\"%(installation_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Installationsanleitung </a> im <a href=" -"\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Python Packaging User Guide</a>, um zu erfahren, wie Sie Dateien von PyPU " -"installieren können." +"target=\"_blank\" rel=\"noopener\">Installationsanleitung </a> im <a " +"href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>, um zu erfahren, wie Sie" +" Dateien von PyPU installieren können." #: warehouse/templates/pages/help.html:201 #, python-format msgid "" -"For full instructions on configuring, packaging and distributing your Python " -"project, refer to the <a href=\"%(packaging_tutorial_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">packaging tutorial</a> on " -"the <a href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Python Packaging User Guide</a>." +"For full instructions on configuring, packaging and distributing your " +"Python project, refer to the <a href=\"%(packaging_tutorial_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">packaging " +"tutorial</a> on the <a href=\"%(user_guide_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" "Um zu erfahren, wie Sie Ihr Python-Projekt konfigurieren, verpacken und " -"verteilen, lesen Sie das <a href=\"%(packaging_tutorial_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Packaging-Tutorial</a> im " -"<a href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging User Guide</a>." +"verteilen, lesen Sie das <a href=\"%(packaging_tutorial_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Packaging-" +"Tutorial</a> im <a href=\"%(user_guide_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>." #: warehouse/templates/pages/help.html:208 #, python-format msgid "" -"Classifiers are used to categorize projects on PyPI. See <a href=\"%(href)s" -"\">the classifiers page</a> for more information, as well as a list of valid " -"classifiers." +"Classifiers are used to categorize projects on PyPI. See <a " +"href=\"%(href)s\">the classifiers page</a> for more information, as well " +"as a list of valid classifiers." msgstr "" -"Kategorien werden verwendet, um Projekte auf PyPI einzuordnen. Auf der <a " -"href=\"%(href)s\">Kategorienseite</a> finden Sie weitere Informationen und " -"eine Liste der verfügbaren Kategorien." +"Kategorien werden verwendet, um Projekte auf PyPI einzuordnen. Auf der <a" +" href=\"%(href)s\">Kategorienseite</a> finden Sie weitere Informationen " +"und eine Liste der verfügbaren Kategorien." #: warehouse/templates/pages/help.html:215 msgid "My account" @@ -4038,8 +4046,8 @@ msgstr "Mein Konto" #: warehouse/templates/pages/help.html:218 msgid "" -"Currently, PyPI requires a verified email address to perform the following " -"operations:" +"Currently, PyPI requires a verified email address to perform the " +"following operations:" msgstr "" "Im Moment benötigt PyPI eine bestätigte E-Mail-Adresse, um folgende " "Operation auszuführen:" @@ -4054,8 +4062,8 @@ msgstr "Neue Version oder Datei hochladen." #: warehouse/templates/pages/help.html:223 msgid "" -"The list of activities that require a verified email address is likely to " -"grow over time." +"The list of activities that require a verified email address is likely to" +" grow over time." msgstr "" "Die Anzahl der Vorgänge, die eine verifizierte E-Mail-Adresse benötigen, " "wird im Laufe der Zeit vermutlich ansteigen." @@ -4063,156 +4071,163 @@ msgstr "" #: warehouse/templates/pages/help.html:224 #, python-format msgid "" -"This policy will allow us to enforce a key policy of <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python " -"enhancement proposal\">PEP</abbr> 541</a> regarding maintainer reachability. " -"It also reduces the viability of spam attacks to create many accounts in an " -"automated fashion." +"This policy will allow us to enforce a key policy of <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 541</a> regarding " +"maintainer reachability. It also reduces the viability of spam attacks to" +" create many accounts in an automated fashion." msgstr "" -"Diese Richtlinie wird es ermöglichen, eine wichtige Vorgabe aus <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " -"title=\"Python enhancement proposal\">PEP</abbr> 541</a> bezüglich der " -"Erreichbarkeit von Betreuern umzusetzen. Sie erschwert zudem die " -"Durchführbarkeit von Spam-Angriffen, bei denen automatisiert eine Vielzahl " -"von Konten erstellt werden." +"Diese Richtlinie wird es ermöglichen, eine wichtige Vorgabe aus <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><abbr title=\"Python enhancement proposal\">PEP</abbr> " +"541</a> bezüglich der Erreichbarkeit von Betreuern umzusetzen. Sie " +"erschwert zudem die Durchführbarkeit von Spam-Angriffen, bei denen " +"automatisiert eine Vielzahl von Konten erstellt werden." #: warehouse/templates/pages/help.html:225 #, python-format msgid "" -"You can manage your account's email addresses in your <a href=\"%(href)s" -"\">account settings</a>. This also allows for sending a new confirmation " -"email for users who signed up in the past, before we began enforcing this " -"policy." +"You can manage your account's email addresses in your <a " +"href=\"%(href)s\">account settings</a>. This also allows for sending a " +"new confirmation email for users who signed up in the past, before we " +"began enforcing this policy." msgstr "" -"Sie können die E-Mail-Adressen ihres Kontos in den <a href=\"%(href)s" -"\">Kontoeinstellungen</a> verwalten. Dort können auch Bestätigungs-E-Mails " -"für Nutzer versendet werden, die sich von der Umsetzung dieser Richtilinie " -"registriert haben." +"Sie können die E-Mail-Adressen ihres Kontos in den <a " +"href=\"%(href)s\">Kontoeinstellungen</a> verwalten. Dort können auch " +"Bestätigungs-E-Mails für Nutzer versendet werden, die sich von der " +"Umsetzung dieser Richtilinie registriert haben." #: warehouse/templates/pages/help.html:228 #, python-format msgid "" -"<p> PyPI itself has not suffered a breach. This is a protective measure to " -"reduce the risk of <a href=\"%(credential_stuffing_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">credential stuffing</a> attacks " -"against PyPI and its users. </p> <p> Each time a user supplies a password — " -"while registering, authenticating, or updating their password — PyPI " -"securely checks whether that password has appeared in public data breaches. " -"</p> <p> During each of these processes, PyPI generates a SHA-1 hash of the " -"supplied password and uses the first five (5) characters of the hash to " -"check the <a href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Have I Been Pwned API</a> and determine if the " -"password has been previously compromised. The plaintext password is never " -"stored by PyPI or submitted to the Have I Been Pwned API. </p> <p> PyPI will " -"not allow such passwords to be used when setting a password at registration " -"or updating your password. </p> <p> If you receive an error message saying " -"that \"This password appears in a breach or has been compromised and cannot " -"be used\", you should change it all other places that you use it as soon as " -"possible. </p> <p> If you have received this error while attempting to log " -"in or upload to PyPI, then your password has been reset and you cannot log " -"in to PyPI until you <a href=\"%(reset_pwd_href)s\">reset your password</a>. " -"</p>" -msgstr "" -"<p> PyPI selbst ist nicht von einem Sicherheitsleck betroffen. Dies ist eine " -"reine Vorsichtsmaßnahme, um das Risiko einer <a href=" -"\"%(credential_stuffing_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Credential Stuffing</a> Attacke gegen PyPI und seine Benutzer " -"zu verringern. </p> <p> Jedes Mal, wenn ein Benutzer ein Passwort eingibt — " -"bei der Registrierung, Anmeldung oder beim Ändern des Passworts — prüft PyPI " -"auf sichere Art, ob das Passwort ein einem veröffentlichten Datenleck " -"enthalten ist. </p> <p> Teil dieses Prozesses ist das Generieren eines SHA-1 " -"Hashes über das eingegebene Passwort. Die ersten fünf (5) Zeichen dieses " -"Hashes werden mittels der <a href=\"%(haveibeenpwned_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Have I Been Pwned API</a> " -"darauf geprüft, ob sie vorher schon einmal kompromittiert worden sind. Das " -"Passwort wird niemals im Klartext von PyPI gespeichert oder an die Have I " -"Been Pwned API übergeben. </p> <p> PyPI verhindert die Nutzung von " -"kompromittierten Passwörtern bei der Registrierung oder dem Ändern des " -"Passworts. </p> <p> Sofern Sie eine Fehlermeldung mit dem Inhalt \"Dieses " -"Passwort kommt in einem Datenleck vor oder wurde kompromittiert und kann " -"daher nicht verwendet werden\" erhalten, sollten Sie das Passwort " -"schnellstmöglich an allen verwendeten Stellen ändern. </p> <p> Haben Sie " -"diesen Fehler beim Einloggen oder dem Hochladen auf PyPI erhalten, dann " -"wurde Ihr Passwort zurückgesetzt und sie können sich bis zum <a href=" -"\"%(reset_pwd_href)s\">Zurücksetzen Ihres Passworts</a> nicht mehr anmelden. " -"</p>" +"<p> PyPI itself has not suffered a breach. This is a protective measure " +"to reduce the risk of <a href=\"%(credential_stuffing_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">credential " +"stuffing</a> attacks against PyPI and its users. </p> <p> Each time a " +"user supplies a password — while registering, authenticating, or updating" +" their password — PyPI securely checks whether that password has appeared" +" in public data breaches. </p> <p> During each of these processes, PyPI " +"generates a SHA-1 hash of the supplied password and uses the first five " +"(5) characters of the hash to check the <a " +"href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Have I Been Pwned API</a> and determine if the password " +"has been previously compromised. The plaintext password is never stored " +"by PyPI or submitted to the Have I Been Pwned API. </p> <p> PyPI will not" +" allow such passwords to be used when setting a password at registration " +"or updating your password. </p> <p> If you receive an error message " +"saying that \"This password appears in a breach or has been compromised " +"and cannot be used\", you should change it all other places that you use " +"it as soon as possible. </p> <p> If you have received this error while " +"attempting to log in or upload to PyPI, then your password has been reset" +" and you cannot log in to PyPI until you <a " +"href=\"%(reset_pwd_href)s\">reset your password</a>. </p>" +msgstr "" +"<p> PyPI selbst ist nicht von einem Sicherheitsleck betroffen. Dies ist " +"eine reine Vorsichtsmaßnahme, um das Risiko einer <a " +"href=\"%(credential_stuffing_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Credential Stuffing</a> Attacke gegen " +"PyPI und seine Benutzer zu verringern. </p> <p> Jedes Mal, wenn ein " +"Benutzer ein Passwort eingibt — bei der Registrierung, Anmeldung oder " +"beim Ändern des Passworts — prüft PyPI auf sichere Art, ob das Passwort " +"ein einem veröffentlichten Datenleck enthalten ist. </p> <p> Teil dieses " +"Prozesses ist das Generieren eines SHA-1 Hashes über das eingegebene " +"Passwort. Die ersten fünf (5) Zeichen dieses Hashes werden mittels der <a" +" href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Have I Been Pwned API</a> darauf geprüft, ob sie vorher " +"schon einmal kompromittiert worden sind. Das Passwort wird niemals im " +"Klartext von PyPI gespeichert oder an die Have I Been Pwned API " +"übergeben. </p> <p> PyPI verhindert die Nutzung von kompromittierten " +"Passwörtern bei der Registrierung oder dem Ändern des Passworts. </p> <p>" +" Sofern Sie eine Fehlermeldung mit dem Inhalt \"Dieses Passwort kommt in " +"einem Datenleck vor oder wurde kompromittiert und kann daher nicht " +"verwendet werden\" erhalten, sollten Sie das Passwort schnellstmöglich an" +" allen verwendeten Stellen ändern. </p> <p> Haben Sie diesen Fehler beim " +"Einloggen oder dem Hochladen auf PyPI erhalten, dann wurde Ihr Passwort " +"zurückgesetzt und sie können sich bis zum <a " +"href=\"%(reset_pwd_href)s\">Zurücksetzen Ihres Passworts</a> nicht mehr " +"anmelden. </p>" #: warehouse/templates/pages/help.html:263 #, python-format msgid "" "<p> Two factor authentication (2FA) makes your account more secure by " "requiring two things in order to log in: <em>something you know</em> and " -"<em>something you own</em>. </p> <p> In PyPI's case, \"something you know\" " -"is your username and password, while \"something you own\" can be <a href=" -"\"#totp\">an application to generate a temporary code</a>, or a <a href=" -"\"#utfkey\">security device</a> (most commonly a USB key). </p> <p> It is " -"strongly recommended that you set up two factor authentication on your PyPI " -"account. </p> <p> Users who have chosen to set up two factor authentication " -"will be asked to provide their second method of identity verification during " -"the log in process. This only affects logging in via a web browser, and not " -"(yet) package uploads. </p> <p>You can follow the improvements to <abbr " -"title=\"two factor authentication\">2FA</abbr> on <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">discuss.python.org</a>.</p>" -msgstr "" -"<p>Zwei-Faktor-Authentifizierung (2FA) erhöht die Sicherheit Ihres Kontos, " -"indem zwei Dinge für die Anmeldung angefordert werden: <em>etwas, das Sie " -"wissen</em> und <em>etwas, das Sie besitzen</em>.</p><p>Bei PyPI ist " -"\"etwas, das Sie wissen\" Ihr Benutzername und Ihr Password, während " -"\"etwas, das Sie besitzen\" eine <a href=\"#totp\">Applikation zum " -"Generieren zeitbegrenzt gültiger Codes</a>, oder ein <a href=\"#utfkey" -"\">Sicherheitsgerät</a> (in der Regel ein USB-Schlüssel) sein kann.</p><p>Es " -"wird dringend empfohlen die Zwei-Faktor-Authentifizierung für Ihr PyPI-Konto " -"einzurichten.</p><p>Benutzer, die die Zwei-Faktor-Authentifizierung " -"eingerichtet haben, werden bei der Anmeldung aufgefordert, ihren zweiten " -"Faktor zur Verifikation anzugeben. Dies betrifft nur die Anmeldung über den " -"Web-Browser und (noch) nicht zum Hochladen von Paketen.</p><p>Die " -"Verbesserung von <abbr title=\"two factor authentication\">2FA</abbr> können " -"Sie auf <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">discuss.python.org</a> verfolgen.</p>" +"<em>something you own</em>. </p> <p> In PyPI's case, \"something you " +"know\" is your username and password, while \"something you own\" can be " +"<a href=\"#totp\">an application to generate a temporary code</a>, or a " +"<a href=\"#utfkey\">security device</a> (most commonly a USB key). </p> " +"<p> It is strongly recommended that you set up two factor authentication " +"on your PyPI account. </p> <p> Users who have chosen to set up two factor" +" authentication will be asked to provide their second method of identity " +"verification during the log in process. This only affects logging in via " +"a web browser, and not (yet) package uploads. </p> <p>You can follow the " +"improvements to <abbr title=\"two factor authentication\">2FA</abbr> on " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">discuss.python.org</a>.</p>" +msgstr "" +"<p>Zwei-Faktor-Authentifizierung (2FA) erhöht die Sicherheit Ihres " +"Kontos, indem zwei Dinge für die Anmeldung angefordert werden: <em>etwas," +" das Sie wissen</em> und <em>etwas, das Sie besitzen</em>.</p><p>Bei PyPI" +" ist \"etwas, das Sie wissen\" Ihr Benutzername und Ihr Password, während" +" \"etwas, das Sie besitzen\" eine <a href=\"#totp\">Applikation zum " +"Generieren zeitbegrenzt gültiger Codes</a>, oder ein <a " +"href=\"#utfkey\">Sicherheitsgerät</a> (in der Regel ein USB-Schlüssel) " +"sein kann.</p><p>Es wird dringend empfohlen die Zwei-Faktor-" +"Authentifizierung für Ihr PyPI-Konto einzurichten.</p><p>Benutzer, die " +"die Zwei-Faktor-Authentifizierung eingerichtet haben, werden bei der " +"Anmeldung aufgefordert, ihren zweiten Faktor zur Verifikation anzugeben. " +"Dies betrifft nur die Anmeldung über den Web-Browser und (noch) nicht zum" +" Hochladen von Paketen.</p><p>Die Verbesserung von <abbr title=\"two " +"factor authentication\">2FA</abbr> können Sie auf <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">discuss.python.org</a> verfolgen.</p>" #: warehouse/templates/pages/help.html:290 #, python-format msgid "" "PyPI users can set up two-factor authentication using any authentication " "application that supports the <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based one-time password" -"\">TOTP</abbr> standard</a>." +"target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based one-time " +"password\">TOTP</abbr> standard</a>." msgstr "" "PyPI-Benutzer können die Zwei-Faktor-Authentifizierung mit Hilfe einer " -"Authentifizierungsanwendung einrichten, die den <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based " -"one-time password\">TOTP</abbr>-Standard</a> unterstützt." +"Authentifizierungsanwendung einrichten, die den <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title" +"=\"time-based one-time password\">TOTP</abbr>-Standard</a> unterstützt." #: warehouse/templates/pages/help.html:291 msgid "" "<abbr title=\"time-based one-time password\">TOTP</abbr> authentication " -"applications generate a regularly changing authentication code to use when " -"logging into your account." +"applications generate a regularly changing authentication code to use " +"when logging into your account." msgstr "" -"<abbr title=\"Time-based One-Time Password\">TOTP</abbr>-Authentifizierungs-" -"Apps erzeugen sich regelmäßig ändernde Authentifizierungs-Codes, die beim " -"Login ins Benutzerkonto verwendet werden." +"<abbr title=\"Time-based One-Time Password\">TOTP</abbr" +">-Authentifizierungs-Apps erzeugen sich regelmäßig ändernde " +"Authentifizierungs-Codes, die beim Login ins Benutzerkonto verwendet " +"werden." #: warehouse/templates/pages/help.html:292 msgid "" -"Because <abbr title=\"time-based one-time password\">TOTP</abbr> is an open " -"standard, there are many applications that are compatible with your PyPI " -"account. Popular applications include:" +"Because <abbr title=\"time-based one-time password\">TOTP</abbr> is an " +"open standard, there are many applications that are compatible with your " +"PyPI account. Popular applications include:" msgstr "" "Da <abbr title=\"Time-based One-Time Password\">TOTP</abbr> ein offener " -"Standard ist, gibt es eine Vielzahl an Anwendungen, die kompatibel mit dem " -"PyPI-Konto sind. Beliebte Anwendungen sind z. B.:" +"Standard ist, gibt es eine Vielzahl an Anwendungen, die kompatibel mit " +"dem PyPI-Konto sind. Beliebte Anwendungen sind z. B.:" #: warehouse/templates/pages/help.html:295 #, python-format msgid "" -"Google Authenticator for <a href=\"%(android_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Google Authenticator for <a href=\"%(android_href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Android</a> or <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" msgstr "" -"Google Authenticator für <a href=\"%(android_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Android</a> oder <a href=\"%(ios_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Google Authenticator für <a href=\"%(android_href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Android</a> oder <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/help.html:298 #: warehouse/templates/pages/help.html:300 @@ -4224,13 +4239,15 @@ msgstr "(proprietär)" #: warehouse/templates/pages/help.html:302 #, python-format msgid "" -"Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Android</a> or <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" msgstr "" -"Duo Mobile für <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Android</a> oder <a href=\"%(ios_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Duo Mobile für <a href=\"%(android_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Android</a> oder <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/help.html:308 #: warehouse/templates/pages/help.html:309 @@ -4240,15 +4257,15 @@ msgstr "(Open-Source-Software)" #: warehouse/templates/pages/help.html:313 #, python-format msgid "" -"Some password managers (e.g. <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">1Password</a>) can also generate authentication " -"codes. For security reasons, PyPI only allows you to set up one application " -"per account." +"Some password managers (e.g. <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">1Password</a>) can also generate " +"authentication codes. For security reasons, PyPI only allows you to set " +"up one application per account." msgstr "" "Einige Passwort-Manager (z. B. <a href=\"%(href)s\" title=\"%(title)s\" " "target=\"_blank\" rel=\"noopener\">1Password</a>) können auch " -"Authtifizierungscodes erzeugen. Aus Sicherheitsgründen erlaubt PyPI nur die " -"Einrichtung einer einzigen Anwendung pro Benutzerkonto." +"Authtifizierungscodes erzeugen. Aus Sicherheitsgründen erlaubt PyPI nur " +"die Einrichtung einer einzigen Anwendung pro Benutzerkonto." #: warehouse/templates/pages/help.html:321 msgid "" @@ -4260,43 +4277,44 @@ msgstr "" #: warehouse/templates/pages/help.html:323 msgid "" -"Open an authentication (<abbr title=\"time-based one-time password\">TOTP</" -"abbr>) application" +"Open an authentication (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>) application" msgstr "" -"Öffnen Sie eine Authentifizierungsanwendung (<abbr title=\"time-based one-" -"time password\">TOTP</abbr>)" +"Öffnen Sie eine Authentifizierungsanwendung (<abbr title=\"time-based " +"one-time password\">TOTP</abbr>)" #: warehouse/templates/pages/help.html:324 msgid "" -"Log in to your PyPI account, go to your account settings, and choose \"Add " -"<abbr title=\"two factor authentication\">2FA</abbr> with authentication " -"application\"" +"Log in to your PyPI account, go to your account settings, and choose " +"\"Add <abbr title=\"two factor authentication\">2FA</abbr> with " +"authentication application\"" msgstr "" -"Melden Sie sich in Ihrem PyPI-Konto an, öffnen Sie die Kontoeinstellungen " -"und wählen Sie \"<abbr title=\"two factor authentication\">2FA</abbr> mit " -"Authentifizierungsanwendung hinzufügen\"" +"Melden Sie sich in Ihrem PyPI-Konto an, öffnen Sie die Kontoeinstellungen" +" und wählen Sie \"<abbr title=\"two factor authentication\">2FA</abbr> " +"mit Authentifizierungsanwendung hinzufügen\"" #: warehouse/templates/pages/help.html:325 msgid "" -"PyPI will generate a secret key, specific to your account. This is displayed " -"as a QR code, and as a text code." +"PyPI will generate a secret key, specific to your account. This is " +"displayed as a QR code, and as a text code." msgstr "" -"PyPI wird einen kontospezifischen geheimen Schlüssel generieren. Dieser wird " -"als QR-Code und als Text-Code angezeigt." +"PyPI wird einen kontospezifischen geheimen Schlüssel generieren. Dieser " +"wird als QR-Code und als Text-Code angezeigt." #: warehouse/templates/pages/help.html:326 msgid "" "Scan the QR code with your authentication application, or type it in " -"manually. The method of input will depend on the application you have chosen." +"manually. The method of input will depend on the application you have " +"chosen." msgstr "" -"Scannen Sie den QR-Code mit Ihrer Authentifizierungsanwendung oder geben Sie " -"ihn manuell ein. Die Eingabemethode hängt von der von Ihnen gewählten " -"Anwendung ab." +"Scannen Sie den QR-Code mit Ihrer Authentifizierungsanwendung oder geben " +"Sie ihn manuell ein. Die Eingabemethode hängt von der von Ihnen gewählten" +" Anwendung ab." #: warehouse/templates/pages/help.html:327 msgid "" -"Your application will generate an authentication code - use this to verify " -"your set up on PyPI" +"Your application will generate an authentication code - use this to " +"verify your set up on PyPI" msgstr "" "Ihre Applikation generiert einen Authentifizierungscode – verwenden Sie " "diesen, um Ihre Einrichtung in PyPI zu überprüfen" @@ -4304,12 +4322,12 @@ msgstr "" #: warehouse/templates/pages/help.html:330 msgid "" "The PyPI server and your application now share your PyPI secret key, " -"allowing your application to generate valid authentication codes for your " -"PyPI account." +"allowing your application to generate valid authentication codes for your" +" PyPI account." msgstr "" "Der PyPI-Server und Ihre Applikation teilen sich nun Ihren PyPI-" -"Geheimschlüssel, sodass Ihre Applikation gültige Authentifizierungscodes für " -"Ihr PyPI-Konto generieren kann." +"Geheimschlüssel, sodass Ihre Applikation gültige Authentifizierungscodes " +"für Ihr PyPI-Konto generieren kann." #: warehouse/templates/pages/help.html:332 #: warehouse/templates/pages/help.html:374 @@ -4324,8 +4342,8 @@ msgstr "Wie gewohnt Ihren Benutzernamen und Ihr Password angeben" #: warehouse/templates/pages/help.html:335 msgid "Open your authentication application to generate an authentication code" msgstr "" -"Ihre Authenticator-Applikation öffnen, um einen Authentifikations-Code zu " -"generieren" +"Ihre Authenticator-Applikation öffnen, um einen Authentifikations-Code zu" +" generieren" #: warehouse/templates/pages/help.html:336 msgid "Use this code to finish logging into PyPI" @@ -4333,17 +4351,18 @@ msgstr "Diesen Code verwenden, um die PyPI-Anmeldung abzuschließen" #: warehouse/templates/pages/help.html:342 msgid "" -"A security device is a USB key or <a href=\"#utfdevices\">other device</a> " -"that generates a one-time password and sends that password to the browser. " -"This password is then used by PyPI to authenticate you as a user." +"A security device is a USB key or <a href=\"#utfdevices\">other " +"device</a> that generates a one-time password and sends that password to " +"the browser. This password is then used by PyPI to authenticate you as a " +"user." msgstr "" -"Ein Sicherheitsgerät ist ein USB-Schlüssel oder ein <a href=\"#utfdevices" -"\">anderes Gerät</a>, um Einmalpasswörter zu generieren und diese an Ihren " -"Browser zu senden. Das Passwort authentisiert sie als PyPI-Nutzer." +"Ein Sicherheitsgerät ist ein USB-Schlüssel oder ein <a " +"href=\"#utfdevices\">anderes Gerät</a>, um Einmalpasswörter zu generieren" +" und diese an Ihren Browser zu senden. Das Passwort authentisiert sie als" +" PyPI-Nutzer." #: warehouse/templates/pages/help.html:344 -msgid "" -"To set up two factor authentication with a <em>USB key</em>, you'll need:" +msgid "To set up two factor authentication with a <em>USB key</em>, you'll need:" msgstr "" "Um die Zwei-Faktor-Authentifizierung mit einem <em>USB-Schlüssel</em> " "einzurichten, benötigen Sie:" @@ -4351,15 +4370,15 @@ msgstr "" #: warehouse/templates/pages/help.html:346 #, python-format msgid "" -"To use a <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">browser that supports <abbr title=\"web authentication" -"\">WebAuthn</abbr> and PublicKeyCredential</a>, as this is the standard " -"implemented by PyPI." +"To use a <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">browser that supports <abbr title=\"web " +"authentication\">WebAuthn</abbr> and PublicKeyCredential</a>, as this is " +"the standard implemented by PyPI." msgstr "" -"Einen <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Browser mit Unterstützung für <abbr title=\"web authentication" -"\">WebAuthn</abbr> und PublicKeyCredential</a> benutzen, welcher der " -"Standard ist, den PyPI implementiert." +"Einen <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Browser mit Unterstützung für <abbr title=\"web " +"authentication\">WebAuthn</abbr> und PublicKeyCredential</a> benutzen, " +"welcher der Standard ist, den PyPI implementiert." #: warehouse/templates/pages/help.html:347 msgid "To be running JavaScript on your browser" @@ -4368,35 +4387,36 @@ msgstr "In Ihrem Browser JavaScript zulassen" #: warehouse/templates/pages/help.html:348 #, python-format msgid "" -"To use a USB key that adheres to the <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">FIDO U2F specification</a>:" +"To use a USB key that adheres to the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO U2F " +"specification</a>:" msgstr "" -"Einen USB-Schlüssel verwenden, welcher der <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO-U2F-Spezifikation</a> " -"entspricht:" +"Einen USB-Schlüssel verwenden, welcher der <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO-U2F-" +"Spezifikation</a> entspricht:" #: warehouse/templates/pages/help.html:351 #, python-format msgid "" -"Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</a> and <a " -"href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Thetis</a>." +"Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> and <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." msgstr "" "Beliebte Schlüssel sind <a href=\"%(yubikey_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</a> und " -"<a href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Thetis</a>." +"target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> und <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." #: warehouse/templates/pages/help.html:358 msgid "" "Note that some older Yubico USB keys <strong>do not follow the FIDO " "specification</strong>, and will therefore not work with PyPI" msgstr "" -"Beachten Sie, dass einige ältere USB-Schlüssel von Yubico <strong>nicht der " -"FIDO-Spezifikation</strong> entsprechen und deshalb nicht mit PyPI " +"Beachten Sie, dass einige ältere USB-Schlüssel von Yubico <strong>nicht " +"der FIDO-Spezifikation</strong> entsprechen und deshalb nicht mit PyPI " "funktionieren" #: warehouse/templates/pages/help.html:363 @@ -4406,46 +4426,47 @@ msgstr "Führen Sie die folgenden Schritte aus:" #: warehouse/templates/pages/help.html:365 msgid "" "\n" -" <li>Log in to your PyPI account, go to your account settings, and " -"choose \"Add <abbr title=\"two factor authentication\">2FA</abbr> with " -"security device (e.g. USB key)\"</li>\n" -" <li>Give your key a name. This is necessary because it's possible " -"to add more than one security device to your account.</li>\n" +" <li>Log in to your PyPI account, go to your account settings, " +"and choose \"Add <abbr title=\"two factor authentication\">2FA</abbr> " +"with security device (e.g. USB key)\"</li>\n" +" <li>Give your key a name. This is necessary because it's " +"possible to add more than one security device to your account.</li>\n" " <li>Click on the \"Set up security device\" button</li>\n" -" <li>Insert and touch your USB key, as instructed by your browser</" -"li>\n" +" <li>Insert and touch your USB key, as instructed by your " +"browser</li>\n" " " msgstr "" "\n" " <li>Melden Sie sich mit ihrem PyPI-Konto an, öffnen Sie die " -"Kontoeinstellungen und wählen Sie \"<abbr title=\"two factor authentication" -"\">2FA</abbr> mit einem SIcherheitsgerät (z.B. USB-Schlüssel) hinzufügen\"</" -"li>\n" +"Kontoeinstellungen und wählen Sie \"<abbr title=\"two factor " +"authentication\">2FA</abbr> mit einem SIcherheitsgerät (z.B. USB-" +"Schlüssel) hinzufügen\"</li>\n" "<li>Benennen Sie den Schlüssel. Dies ist erforderlich, da Sie mehrere " "Sicherheitsgeräte zu Ihrem Konto hinzufügen können.</li>\n" "<li>Klicken Sie auf \"Sicherheitsgerät einrichten\"</li>\n" -"<li>Stecken Sie Ihren USB-Schlüssel ein und berühren Sie ihn nach Anweisung " -"Ihres Browsers</li>\n" +"<li>Stecken Sie Ihren USB-Schlüssel ein und berühren Sie ihn nach " +"Anweisung Ihres Browsers</li>\n" " " #: warehouse/templates/pages/help.html:372 msgid "" -"Once complete, your USB key will be registered to your PyPI account and can " -"be used during the log in process." +"Once complete, your USB key will be registered to your PyPI account and " +"can be used during the log in process." msgstr "" -"Nach Abschluss wird der USB-Schlüssel mit Ihrem PyPI-Konto verknüpft und can " -"bei der Anmeldung verwendet werden." +"Nach Abschluss wird der USB-Schlüssel mit Ihrem PyPI-Konto verknüpft und " +"can bei der Anmeldung verwendet werden." #: warehouse/templates/pages/help.html:376 msgid "" "\n" " <li>Provide your username and password, as normal</li>\n" -" <li>Insert and touch your USB key to finish logging into PyPI</" -"li>\n" +" <li>Insert and touch your USB key to finish logging into " +"PyPI</li>\n" " " msgstr "" "\n" -" <li>Wie gewohnt Ihren Benutzernamen und Ihr Passwort angeben</li>\n" +" <li>Wie gewohnt Ihren Benutzernamen und Ihr Passwort " +"angeben</li>\n" "<li>Ihren USB-Schlüssel einstecken und berühren, um die Anmeldung " "abzuschließen</li>\n" " " @@ -4454,83 +4475,84 @@ msgstr "" #, python-format msgid "" "There is a growing ecosystem of <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">devices that are FIDO compliant</a>, and " -"can therefore be used with PyPI." +"target=\"_blank\" rel=\"noopener\">devices that are FIDO compliant</a>, " +"and can therefore be used with PyPI." msgstr "" -"Es gibt eine wachsendes Ökosystem von <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">Geräten, die FIDO-zertifiziert sind</" -"a> und daher mit PyPI genutzt werden können." +"Es gibt eine wachsendes Ökosystem von <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Geräten, die FIDO-" +"zertifiziert sind</a> und daher mit PyPI genutzt werden können." #: warehouse/templates/pages/help.html:392 #, python-format msgid "" -"Emerging solutions include biometric (facial and fingerprint) scanners and " -"FIDO compatible credit cards. There is also growing support for <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">mobile " -"phones to act as security devices</a>." +"Emerging solutions include biometric (facial and fingerprint) scanners " +"and FIDO compatible credit cards. There is also growing support for <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">mobile phones to act as security devices</a>." msgstr "" -"Zu den neuen Lösungen gehören biometrische (Gesichts- und Fingerabdruck-) " -"Scanner und FIDO-kompatible Kreditkarten. Es gibt auch eine wachsende " -"Unterstützung für <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Handys, die als Sicherheitsvorrichtungen dienen</a>." +"Zu den neuen Lösungen gehören biometrische (Gesichts- und Fingerabdruck-)" +" Scanner und FIDO-kompatible Kreditkarten. Es gibt auch eine wachsende " +"Unterstützung für <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Handys, die als " +"Sicherheitsvorrichtungen dienen</a>." #: warehouse/templates/pages/help.html:398 #, python-format msgid "" -"As PyPI's two factor implementation follows the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"web " -"authentication\">WebAuthn</abbr> standard</a>, PyPI users will be able to " -"take advantage of any future developments in this field." +"As PyPI's two factor implementation follows the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"web " +"authentication\">WebAuthn</abbr> standard</a>, PyPI users will be able to" +" take advantage of any future developments in this field." msgstr "" -"Da die Zwei-Faktor-Implementierung von PyPI dem <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"web " -"authentication\">WebAuthn</abbr> Standard</a> folgt, können PyPI-Anwender " -"alle zukünftigen Entwicklungen in diesem Bereich nutzen." +"Da die Zwei-Faktor-Implementierung von PyPI dem <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"web " +"authentication\">WebAuthn</abbr> Standard</a> folgt, können PyPI-Anwender" +" alle zukünftigen Entwicklungen in diesem Bereich nutzen." #: warehouse/templates/pages/help.html:407 msgid "" -"If you lose access to your <a href=\"#totp\">authentication application</a> " -"or <a href=\"#utfkey\">security device</a>, you can use these codes to sign " -"into PyPI." +"If you lose access to your <a href=\"#totp\">authentication " +"application</a> or <a href=\"#utfkey\">security device</a>, you can use " +"these codes to sign into PyPI." msgstr "" #: warehouse/templates/pages/help.html:410 msgid "" -"Recovery codes are <strong>one time use</strong>. They are not a substitute " -"for a <a href=\"#totp\">authentication application</a> or <a href=\"#utfkey" -"\">security device</a> and should only be used for recovery. After using a " -"recovery code to sign in, it becomes inactive." +"Recovery codes are <strong>one time use</strong>. They are not a " +"substitute for a <a href=\"#totp\">authentication application</a> or <a " +"href=\"#utfkey\">security device</a> and should only be used for " +"recovery. After using a recovery code to sign in, it becomes inactive." msgstr "" #: warehouse/templates/pages/help.html:416 msgid "To provision recovery codes:" msgstr "" +# | msgid "" +# | "Log in to your PyPI account, go to your account settings, and choose " +# | "\"Add <abbr title=\"two factor authentication\">2FA</abbr> with " +# | "authentication application\"" #: warehouse/templates/pages/help.html:418 #, fuzzy -#| msgid "" -#| "Log in to your PyPI account, go to your account settings, and choose " -#| "\"Add <abbr title=\"two factor authentication\">2FA</abbr> with " -#| "authentication application\"" msgid "" "Log in to your PyPI account, go to your account settings, and choose " "\"Generate recovery codes\"" msgstr "" -"Melden Sie sich in Ihrem PyPI-Konto an, öffnen Sie die Kontoeinstellungen " -"und wählen Sie \"<abbr title=\"two factor authentication\">2FA</abbr> mit " -"Authentifizierungsanwendung hinzufügen\"" +"Melden Sie sich in Ihrem PyPI-Konto an, öffnen Sie die Kontoeinstellungen" +" und wählen Sie \"<abbr title=\"two factor authentication\">2FA</abbr> " +"mit Authentifizierungsanwendung hinzufügen\"" #: warehouse/templates/pages/help.html:419 msgid "" -"Securely store the displayed recovery codes! Consider printing them out and " -"storing them in a safe location or saving them in a password manager." +"Securely store the displayed recovery codes! Consider printing them out " +"and storing them in a safe location or saving them in a password manager." msgstr "" #: warehouse/templates/pages/help.html:422 msgid "" -"If you lose access to your stored recovery codes or use all of them, you can " -"get new ones by selecting \"Regenerate recovery codes\" in your account " -"settings." +"If you lose access to your stored recovery codes or use all of them, you " +"can get new ones by selecting \"Regenerate recovery codes\" in your " +"account settings." msgstr "" #: warehouse/templates/pages/help.html:424 @@ -4539,40 +4561,43 @@ msgstr "" #: warehouse/templates/pages/help.html:427 msgid "" -"When prompted for Two-Factor Authentication, select \"Login using a Recovery " -"Code\"" +"When prompted for Two-Factor Authentication, select \"Login using a " +"Recovery Code\"" msgstr "" #: warehouse/templates/pages/help.html:428 msgid "" -"As each code can be used only once, you might want to mark the code as used" +"As each code can be used only once, you might want to mark the code as " +"used" msgstr "" #: warehouse/templates/pages/help.html:429 msgid "" -"If you have few recovery codes remaining, you may also want to generate a " -"new set using the \"Regenerate recovery codes\" button in your account " +"If you have few recovery codes remaining, you may also want to generate a" +" new set using the \"Regenerate recovery codes\" button in your account " "settings." msgstr "" +# | msgid "" +# | "\n" +# | " <p>API tokens provide an alternative way (instead of username " +# | "and password) to authenticate when <strong>uploading packages</strong> to +# " +# | "PyPI.</p>\n" +# | " <p>You can create a token for an entire PyPI account, in which +# | "case, the token will work for all projects associated with that account. +# | "Alternatively, you can limit a token's scope to a specific +# project.</p>\n" +# | " <p><strong>We strongly recommend you authenticate with an API " +# | "token where possible.</strong></p>\n" +# | " " #: warehouse/templates/pages/help.html:434 #, fuzzy -#| msgid "" -#| "\n" -#| " <p>API tokens provide an alternative way (instead of username " -#| "and password) to authenticate when <strong>uploading packages</strong> to " -#| "PyPI.</p>\n" -#| " <p>You can create a token for an entire PyPI account, in which " -#| "case, the token will work for all projects associated with that account. " -#| "Alternatively, you can limit a token's scope to a specific project.</p>\n" -#| " <p><strong>We strongly recommend you authenticate with an API " -#| "token where possible.</strong></p>\n" -#| " " msgid "" "\n" -" <p>API tokens provide an alternative way (instead of username and " -"password) to authenticate when <strong>uploading packages</strong> to PyPI.</" -"p>\n" +" <p>API tokens provide an alternative way (instead of username " +"and password) to authenticate when <strong>uploading packages</strong> to" +" PyPI.</p>\n" " <p>You can create a token for an entire PyPI account, in which " "case, the token will work for all projects associated with that account. " "Alternatively, you can limit a token's scope to a specific project.</p>\n" @@ -4582,15 +4607,15 @@ msgid "" " " msgstr "" "\n" -" <p>API-Token bieten einen weiteren Weg (anstelle von Benutzername " -"und Passwort), sich zum <strong>Hochladen von Paketen</strong> bei PyPI zu " -"anzumelden.</p>\n" +" <p>API-Token bieten einen weiteren Weg (anstelle von " +"Benutzername und Passwort), sich zum <strong>Hochladen von " +"Paketen</strong> bei PyPI zu anzumelden.</p>\n" " <p>Sie können einen Token für einen komplettes PyPI Konto " "erzeugen. Dieser funktioniert dann für alle Projekte, die diesem Konto " "zugeordnet sind. Alternativ können Sie den Umfang eines Token auf ein " "bestimmtes Projekt beschränken.</p>\n" -" <p><strong>Wir empfehlen Ihnen dringend, sich nach Möglichkeit mit " -"einem API-Token zu authentifizieren.</strong></p>\n" +" <p><strong>Wir empfehlen Ihnen dringend, sich nach Möglichkeit " +"mit einem API-Token zu authentifizieren.</strong></p>\n" " " #: warehouse/templates/pages/help.html:441 @@ -4612,8 +4637,9 @@ msgid "" "In your <a href=\"%(href)s\">account settings</a>, go to the API tokens " "section and select \"Add API token\"" msgstr "" -"Öffnen Sie den Abschnitt API-Token in Ihren <a href=\"%(href)s" -"\">Kontoeinstellungen</a> und wählen Sie \"API-Token hinzufügen\"" +"Öffnen Sie den Abschnitt API-Token in Ihren <a " +"href=\"%(href)s\">Kontoeinstellungen</a> und wählen Sie \"API-Token " +"hinzufügen\"" #: warehouse/templates/pages/help.html:448 msgid "To use an API token:" @@ -4625,7 +4651,8 @@ msgstr "Setzen Sie Ihren Benutzernamen auf <code>__token__</code>" #: warehouse/templates/pages/help.html:452 msgid "" -"Set your password to the token value, including the <code>pypi-</code> prefix" +"Set your password to the token value, including the <code>pypi-</code> " +"prefix" msgstr "" "Setzen Sie Ihr Passwort auf den Token-Wert, einschließlich des Präfixes " "<code>pypi-</code>" @@ -4633,34 +4660,36 @@ msgstr "" #: warehouse/templates/pages/help.html:456 #, python-format msgid "" -"Where you edit or add these values will depend on your individual use case. " -"For example, some users may need to edit <a href=\"%(pypirc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">their <code>.pypirc</code> " -"file</a>, while others may need to update their CI configuration file (e.g. " -"<a href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\"><code>.travis.yml</code> if you are using Travis</a>)." +"Where you edit or add these values will depend on your individual use " +"case. For example, some users may need to edit <a " +"href=\"%(pypirc_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">their <code>.pypirc</code> file</a>, while others may " +"need to update their CI configuration file (e.g. <a " +"href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>.travis.yml</code> if you are using Travis</a>)." msgstr "" "An welcher Stelle Sie diese Werte bearbeiten oder hinzufügen, hängt von " -"Ihrem individuellen Anwendungsfall ab. Einige Benutzer müssen z.B. <a href=" -"\"%(pypirc_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">ihre <code>.pypirc</code> Datei</a> bearbeiten, während Andere " -"möglicherweise ihre CI-Konfigurationsdatei aktualisieren müssen (z.B. <a " -"href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><code>travis.yml</code>, falls Sie Travis verwenden</a>)." +"Ihrem individuellen Anwendungsfall ab. Einige Benutzer müssen z.B. <a " +"href=\"%(pypirc_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">ihre <code>.pypirc</code> Datei</a> bearbeiten, während " +"Andere möglicherweise ihre CI-Konfigurationsdatei aktualisieren müssen " +"(z.B. <a href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>travis.yml</code>, falls Sie Travis " +"verwenden</a>)." #: warehouse/templates/pages/help.html:460 msgid "" -"Advanced users may wish to inspect their token by decoding it with base64, " -"and checking the output against the unique identifier displayed on PyPI." +"Advanced users may wish to inspect their token by decoding it with " +"base64, and checking the output against the unique identifier displayed " +"on PyPI." msgstr "" -"Fortgeschrittene Benutzer können ihren Token überprüfen, indem sie ihn mit " -"base64 dekodieren und die Ausgabe anhand der in PyPI angezeigten eindeutigen " -"Kennung überprüfen." +"Fortgeschrittene Benutzer können ihren Token überprüfen, indem sie ihn " +"mit base64 dekodieren und die Ausgabe anhand der in PyPI angezeigten " +"eindeutigen Kennung überprüfen." #: warehouse/templates/pages/help.html:468 msgid "Yes, including RSS feeds of new packages and new releases." -msgstr "" -"Ja, einschließlich RSS-Feeds neuer Pakete und neuer Veröffentlichungen." +msgstr "Ja, einschließlich RSS-Feeds neuer Pakete und neuer Veröffentlichungen." #: warehouse/templates/pages/help.html:468 msgid "See the API reference." @@ -4669,142 +4698,147 @@ msgstr "Siehe API-Referenz." #: warehouse/templates/pages/help.html:471 #, python-format msgid "" -"If you need to run your own mirror of PyPI, the <a href=\"%(href)s" -"\">bandersnatch project</a> is the recommended solution. Note that the " -"storage requirements for a PyPI mirror would exceed 1 terabyte—and growing!" +"If you need to run your own mirror of PyPI, the <a " +"href=\"%(href)s\">bandersnatch project</a> is the recommended solution. " +"Note that the storage requirements for a PyPI mirror would exceed 1 " +"terabyte—and growing!" msgstr "" -"Wenn Sie einen eigenen Mirror/Spiegelserver von PyPI ausführen müssen, ist " -"das <a href=\"%(href)s\">bandersnatch-Projekt</a> die empfohlene Lösung. " -"Beachten Sie, dass der Speicherbedarf für einen PyPI-Spiegel mehr als 1 " -"Terabyte betragen würde - Tendenz steigend!" +"Wenn Sie einen eigenen Mirror/Spiegelserver von PyPI ausführen müssen, " +"ist das <a href=\"%(href)s\">bandersnatch-Projekt</a> die empfohlene " +"Lösung. Beachten Sie, dass der Speicherbedarf für einen PyPI-Spiegel mehr" +" als 1 Terabyte betragen würde - Tendenz steigend!" #: warehouse/templates/pages/help.html:474 #, python-format msgid "" -"PyPI itself does not offer a way to get notified when a project uploads new " -"releases. However, there are several third-party services that offer " +"PyPI itself does not offer a way to get notified when a project uploads " +"new releases. However, there are several third-party services that offer " "comprehensive monitoring and notifications for project releases and " -"vulnerabilities listed as <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">GitHub apps</a>." +"vulnerabilities listed as <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">GitHub apps</a>." msgstr "" -"PyPI selbst bietet keine Möglichkeit, sich benachrichtigen zu lassen, wenn " -"ein Projekt neue Versionen hochlädt. Es gibt jedoch mehrere Dienste von " -"Drittanbietern, die umfassende Überwachungen und Benachrichtigungen für " -"Projektfreigaben und Sicherheitslücken anbieten und als <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">GitHub Apps</a> " -"angeboten werden." +"PyPI selbst bietet keine Möglichkeit, sich benachrichtigen zu lassen, " +"wenn ein Projekt neue Versionen hochlädt. Es gibt jedoch mehrere Dienste " +"von Drittanbietern, die umfassende Überwachungen und Benachrichtigungen " +"für Projektfreigaben und Sicherheitslücken anbieten und als <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">GitHub Apps</a> angeboten werden." #: warehouse/templates/pages/help.html:477 #, python-format msgid "" -"You can <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">analyze PyPI download usage statistics via our public dataset " -"on Google BigQuery</a>." +"You can <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">analyze PyPI download usage statistics via our public " +"dataset on Google BigQuery</a>." msgstr "" -"Sie können <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\"> die PyPI Download Statistiken über unseren öffentlichen " -"Datensatz auf Google BigQuery analysieren</a>." +"Sie können <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"> die PyPI Download Statistiken über unseren öffentlichen" +" Datensatz auf Google BigQuery analysieren</a>." #: warehouse/templates/pages/help.html:479 #, python-format msgid "" -"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.io provides statistics for PyPI projects</a> (<a href=" -"\"%(libs_io_example_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">example</a>, <a href=\"%(libs_io_api_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">API</a>) including GitHub stars and " -"forks, dependency tracking (<a href=\"%(in_progress_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">in progress</a>), and <a " -"href=\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">other relevant factors</a>." +"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io provides statistics for PyPI projects</a> " +"(<a href=\"%(libs_io_example_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">example</a>, <a " +"href=\"%(libs_io_api_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">API</a>) including GitHub stars and forks, dependency " +"tracking (<a href=\"%(in_progress_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">in progress</a>), and <a " +"href=\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">other relevant factors</a>." msgstr "" -"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.io stellt Statistiken für PyPI Projekte zur " +"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io stellt Statistiken für PyPI Projekte zur " "Verfügung</a> (<a href=\"%(libs_io_example_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Beispiel</a>, <a href=" -"\"%(libs_io_api_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">API</a>) inklusive GitHub-Stars und -Forks, Abhängigkeitsverfolgung (<a " -"href=\"%(in_progress_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">in Vorbereitung</a>) und <a href=\"%(other_factors_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">anderen relevanten " -"Faktoren</a>." +"target=\"_blank\" rel=\"noopener\">Beispiel</a>, <a " +"href=\"%(libs_io_api_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">API</a>) inklusive GitHub-Stars und -Forks, " +"Abhängigkeitsverfolgung (<a href=\"%(in_progress_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">in " +"Vorbereitung</a>) und <a href=\"%(other_factors_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">anderen relevanten" +" Faktoren</a>." #: warehouse/templates/pages/help.html:488 #, python-format msgid "" -"For recent statistics on uptime and performance, see <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status page</a>." +"For recent statistics on uptime and performance, see <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status " +"page</a>." msgstr "" -"Aktuelle Statistiken zur Betriebszeit und Leistung finden Sie auf <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">unserer " -"Status-Seite</a>." +"Aktuelle Statistiken zur Betriebszeit und Leistung finden Sie auf <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">unserer Status-Seite</a>." #: warehouse/templates/pages/help.html:495 #, python-format msgid "" -"PyPI does not support publishing private packages. If you need to publish " -"your private package to a package index, the recommended solution is to run " -"your own deployment of the <a href=\"%(href)s\">devpi project</a>." +"PyPI does not support publishing private packages. If you need to publish" +" your private package to a package index, the recommended solution is to " +"run your own deployment of the <a href=\"%(href)s\">devpi project</a>." msgstr "" "PyPI unterstützt das Veröffentlichen privater Pakete nicht. Wenn Sie Ihr " -"privates Paket in einem Paketindex veröffentlichen müssen, wird empfohlen, " -"Ihren eigenen Index auf Basis des Projekts <a href=\"%(href)s\">devpi</a> " -"aufzubauen." +"privates Paket in einem Paketindex veröffentlichen müssen, wird " +"empfohlen, Ihren eigenen Index auf Basis des Projekts <a " +"href=\"%(href)s\">devpi</a> aufzubauen." #: warehouse/templates/pages/help.html:498 msgid "" "Your publishing tool may return an error that your new project can't be " -"created with your desired name, despite no evidence of a project or release " -"of the same name on PyPI. Currently, there are three primary reasons this " -"may occur:" +"created with your desired name, despite no evidence of a project or " +"release of the same name on PyPI. Currently, there are three primary " +"reasons this may occur:" msgstr "" -"Ihr Veröffentlichungs-Werkzeug zeigt möglicherweise einen Fehler an, dass " -"Ihr neues Projekt nicht mit Ihrem gewünschten Namen erstellt werden kann, " -"obwohl es kein Projekt oder gleichnamige Veröffentlichung in PyPI gibt. " -"Derzeit gibt es drei Hauptgründe, warum dies der Fall sein kann:" +"Ihr Veröffentlichungs-Werkzeug zeigt möglicherweise einen Fehler an, dass" +" Ihr neues Projekt nicht mit Ihrem gewünschten Namen erstellt werden " +"kann, obwohl es kein Projekt oder gleichnamige Veröffentlichung in PyPI " +"gibt. Derzeit gibt es drei Hauptgründe, warum dies der Fall sein kann:" #: warehouse/templates/pages/help.html:500 #, python-format msgid "" -"The project name conflicts with a <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Standard Library</a> module from " -"any major version from 2.5 to present." +"The project name conflicts with a <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Standard " +"Library</a> module from any major version from 2.5 to present." msgstr "" -"Der Projektname steht in Konflikt mit einem Modul aus der <a href=\"%(href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Standard " -"Bibliothek</a> einer Python Version ab 2.5 bis zur heutigen Version." +"Der Projektname steht in Konflikt mit einem Modul aus der <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Standard Bibliothek</a> einer Python Version ab " +"2.5 bis zur heutigen Version." #: warehouse/templates/pages/help.html:501 #, python-format msgid "" -"The project name has been explicitly prohibited by the PyPI administrators. " -"For example, <code>%(incorrect_code)s</code> is a common typo for <code>" -"%(correct_code)s</code>, and should not surprise the user with a malicious " -"package." +"The project name has been explicitly prohibited by the PyPI " +"administrators. For example, <code>%(incorrect_code)s</code> is a common " +"typo for <code>%(correct_code)s</code>, and should not surprise the user " +"with a malicious package." msgstr "" -"Der Projektname wurde von den PyPI-Administratoren ausdrücklich verboten. " -"Zum Beispiel ist <code>%(incorrect_code)s</code> ein häufiger Tippfehler für " -"<code>%(correct_code)s</code> und sollte den Benutzer nicht mit einem " -"schädlichen Paket überraschen." +"Der Projektname wurde von den PyPI-Administratoren ausdrücklich verboten." +" Zum Beispiel ist <code>%(incorrect_code)s</code> ein häufiger Tippfehler" +" für <code>%(correct_code)s</code> und sollte den Benutzer nicht mit " +"einem schädlichen Paket überraschen." #: warehouse/templates/pages/help.html:502 msgid "" -"The project name has been registered by another user, but no releases have " -"been created." +"The project name has been registered by another user, but no releases " +"have been created." msgstr "" -"Der Projektname wurde von einem anderen Benutzer registriert, aber es wurden " -"keine Veröffentlichungen erstellt." +"Der Projektname wurde von einem anderen Benutzer registriert, aber es " +"wurden keine Veröffentlichungen erstellt." #: warehouse/templates/pages/help.html:506 #, python-format msgid "" -"Follow the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">\"How to request a name transfer\"</a> section of <abbr title=" -"\"Python enhancement proposal\">PEP</abbr> 541." -msgstr "" -"Befolgen Sie den Abschnitt <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">\"How to request a name transfer\"</a> des <abbr " +"Follow the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">\"How to request a name transfer\"</a> section of <abbr " "title=\"Python enhancement proposal\">PEP</abbr> 541." +msgstr "" +"Befolgen Sie den Abschnitt <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">\"How to request a name transfer\"</a>" +" des <abbr title=\"Python enhancement proposal\">PEP</abbr> 541." #: warehouse/templates/pages/help.html:511 msgid "Owner:" @@ -4812,83 +4846,86 @@ msgstr "Eigentümer:" #: warehouse/templates/pages/help.html:514 msgid "" -"Only the current owners of a project have the ability to add new owners or " -"maintainers. If you need to request ownership, you should contact the " -"current owner(s) of the project directly. Many project owners provide their " -"contact details in the 'Author' field of the 'Meta' details on the project " -"page." +"Only the current owners of a project have the ability to add new owners " +"or maintainers. If you need to request ownership, you should contact the " +"current owner(s) of the project directly. Many project owners provide " +"their contact details in the 'Author' field of the 'Meta' details on the " +"project page." msgstr "" -"Nur der momentane Eigentümer des Projekts kann neue Eigentümer oder Betreuer " -"hinzufügen. Um Eigentümerschaft zu beantragen, wenden Sie sich direkt an die " -"momentanen Eigentümer des Projekts. Viele Projekteigentümer geben ihre " -"Kontaktdaten im Feld \"Autor\" der \"Meta\"-Details auf der Projektseite an." +"Nur der momentane Eigentümer des Projekts kann neue Eigentümer oder " +"Betreuer hinzufügen. Um Eigentümerschaft zu beantragen, wenden Sie sich " +"direkt an die momentanen Eigentümer des Projekts. Viele Projekteigentümer" +" geben ihre Kontaktdaten im Feld \"Autor\" der \"Meta\"-Details auf der " +"Projektseite an." #: warehouse/templates/pages/help.html:515 #, python-format -msgid "" -"If the owner is unresponsive, see <a href=\"%(href)s\">%(anchor_text)s</a>" +msgid "If the owner is unresponsive, see <a href=\"%(href)s\">%(anchor_text)s</a>" msgstr "" -"Wenn der Eigentümer nicht reagiert, finden Sie weitere Informationen unter: " -"<a href=\"%(href)s\">%(anchor_text)s</a>" +"Wenn der Eigentümer nicht reagiert, finden Sie weitere Informationen " +"unter: <a href=\"%(href)s\">%(anchor_text)s</a>" #: warehouse/templates/pages/help.html:518 #, python-format msgid "" -"By default, an upload's description will render with <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">reStructuredText</a>. " -"If the description is in an alternate format like Markdown, a package may " -"set the <code>long_description_content_type</code> in <code>setup.py</code> " -"to the alternate format." +"By default, an upload's description will render with <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">reStructuredText</a>. If the description is in an " +"alternate format like Markdown, a package may set the " +"<code>long_description_content_type</code> in <code>setup.py</code> to " +"the alternate format." msgstr "" -"Standardmäßig wird die Beschreibung eines Uploads mittels <a href=\"%(href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">reStructuredText</" -"a> gerendert. Wenn die Beschreibung in einem alternativen Format wie " -"Markdown vorliegt, kann ein Paket den Wert " -"<code>long_description_content_type</code> in der <code>setup.py</code> auf " -"das alternative Format festlegen." +"Standardmäßig wird die Beschreibung eines Uploads mittels <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">reStructuredText</a> gerendert. Wenn die Beschreibung in" +" einem alternativen Format wie Markdown vorliegt, kann ein Paket den Wert" +" <code>long_description_content_type</code> in der <code>setup.py</code> " +"auf das alternative Format festlegen." #: warehouse/templates/pages/help.html:519 #, python-format msgid "" -"Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging User Guide</a> for details on the available " -"formats." +"Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a> for details on the " +"available formats." msgstr "" -"Details zu den verfügbaren Formaten finden Sie im <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>." +"Details zu den verfügbaren Formaten finden Sie im <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>." #: warehouse/templates/pages/help.html:520 #, python-format msgid "" "PyPI will reject uploads if the description fails to render. To check a " -"description locally for validity, you may use <a href=\"%(href)s" -"\">readme_renderer</a>, which is the same description renderer used by PyPI." +"description locally for validity, you may use <a " +"href=\"%(href)s\">readme_renderer</a>, which is the same description " +"renderer used by PyPI." msgstr "" -"PyPI wird das Hochladen ablehnen, wenn die Beschreibung nicht dargestellt " -"werden kann. Um die Beschreibung lokal zu validieren, können Sie <a href=" -"\"%(href)s\">readme_renderer</a> benutzen, den auch PyPI zur Darstellung " -"verwendet." +"PyPI wird das Hochladen ablehnen, wenn die Beschreibung nicht dargestellt" +" werden kann. Um die Beschreibung lokal zu validieren, können Sie <a " +"href=\"%(href)s\">readme_renderer</a> benutzen, den auch PyPI zur " +"Darstellung verwendet." #: warehouse/templates/pages/help.html:524 #, python-format msgid "" -"If you can't upload your project's release to PyPI because you're hitting " -"the upload file size limit, we can sometimes increase your limit. Make sure " -"you've uploaded at least one release for the project that's <em>under</em> " -"the limit (a <a href=\"%(dev_release_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">developmental release version number</a> is " -"fine). Then, <a href=\"%(file_issue_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">file an issue</a> and tell us:</p>" -msgstr "" -"Wenn Sie die Veröffentlichung Ihres Projekts nicht in PyPI hochladen können, " -"weil Sie die maximale Dateigröße erreichen, können wir Ihr Limit manchmal " -"erhöhen. Stellen Sie sicher, dass Sie mindestens eine Version des Projekts " -"hochgeladen haben, die <em>unter</em> dem Limit liegt (eine <a href=" -"\"%(dev_release_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Entwicklungsveröffentlichung</a> ist ausreichend). Legen Sie dann ein <a " -"href=\"%(file_issue_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Issue</a> an und sagen Sie uns:</p>" +"If you can't upload your project's release to PyPI because you're hitting" +" the upload file size limit, we can sometimes increase your limit. Make " +"sure you've uploaded at least one release for the project that's " +"<em>under</em> the limit (a <a href=\"%(dev_release_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">developmental " +"release version number</a> is fine). Then, <a " +"href=\"%(file_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">file an issue</a> and tell us:</p>" +msgstr "" +"Wenn Sie die Veröffentlichung Ihres Projekts nicht in PyPI hochladen " +"können, weil Sie die maximale Dateigröße erreichen, können wir Ihr Limit " +"manchmal erhöhen. Stellen Sie sicher, dass Sie mindestens eine Version " +"des Projekts hochgeladen haben, die <em>unter</em> dem Limit liegt (eine " +"<a href=\"%(dev_release_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Entwicklungsveröffentlichung</a> ist ausreichend). Legen" +" Sie dann ein <a href=\"%(file_issue_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Issue</a> an und sagen Sie uns:</p>" #: warehouse/templates/pages/help.html:532 msgid "A link to your project on PyPI (or Test PyPI)" @@ -4899,27 +4936,25 @@ msgid "The size of your release, in megabytes" msgstr "Die Größe der Veröffentlichung, in Megabytes" #: warehouse/templates/pages/help.html:534 -msgid "" -"Which index/indexes you need the increase for (PyPI, Test PyPI, or both)" -msgstr "" -"Für welchen Index (PyPI, Test PyPI oder beide) Sie die Erhöhung benötigen" +msgid "Which index/indexes you need the increase for (PyPI, Test PyPI, or both)" +msgstr "Für welchen Index (PyPI, Test PyPI oder beide) Sie die Erhöhung benötigen" #: warehouse/templates/pages/help.html:535 msgid "" -"A brief description of your project, including the reason for the additional " -"size." +"A brief description of your project, including the reason for the " +"additional size." msgstr "" -"Eine kurze Beschreibung Ihres Projekts, einschließlich des Grundes für die " -"zusätzliche Größe." +"Eine kurze Beschreibung Ihres Projekts, einschließlich des Grundes für " +"die zusätzliche Größe." #: warehouse/templates/pages/help.html:544 msgid "" -"If you've forgotten your PyPI password but you remember your email address " -"or username, follow these steps to reset your password:" +"If you've forgotten your PyPI password but you remember your email " +"address or username, follow these steps to reset your password:" msgstr "" -"Wenn Sie Ihr PyPI-Passwort vergessen haben, aber Ihre E-Mail-Adresse oder " -"Ihren Benutzernamen kennen, führen Sie die folgenden Schritte aus, um Ihr " -"Kennwort zurückzusetzen:" +"Wenn Sie Ihr PyPI-Passwort vergessen haben, aber Ihre E-Mail-Adresse oder" +" Ihren Benutzernamen kennen, führen Sie die folgenden Schritte aus, um " +"Ihr Kennwort zurückzusetzen:" #: warehouse/templates/pages/help.html:546 #, python-format @@ -4927,57 +4962,57 @@ msgid "Go to <a href=\"%(href)s\">reset your password</a>." msgstr "Gehen Sie zu <a href=\"%(href)s\">Ihr Passwort zurücksetzen</a>." #: warehouse/templates/pages/help.html:547 -msgid "" -"Enter the email address or username you used for PyPI and submit the form." +msgid "Enter the email address or username you used for PyPI and submit the form." msgstr "" -"Geben Sie die E-Mail-Adresse oder den Benutzernamen ein, den Sie für PyPI " -"verwendet haben, und senden Sie das Formular ab." +"Geben Sie die E-Mail-Adresse oder den Benutzernamen ein, den Sie für PyPI" +" verwendet haben, und senden Sie das Formular ab." #: warehouse/templates/pages/help.html:548 msgid "You'll receive an email with a password reset link." -msgstr "" -"Sie erhalten eine E-Mail mit einem Link zum Zurücksetzen des Kennworts." +msgstr "Sie erhalten eine E-Mail mit einem Link zum Zurücksetzen des Kennworts." #: warehouse/templates/pages/help.html:553 msgid "If you've lost access to your PyPI account due to:" msgstr "" +# | msgid "Emails associated with your account" #: warehouse/templates/pages/help.html:555 #, fuzzy -#| msgid "Emails associated with your account" msgid "Lost access to the email address associated with your account" msgstr "Mit dem Konto verbundene E-Mail-Adressen" #: warehouse/templates/pages/help.html:556 msgid "" -"Lost two factor authentication <a href=\"#totp\">application</a>, <a href=" -"\"#utfkey\">device</a>, and <a href=\"#recoverycodes\">recovery codes</a>" +"Lost two factor authentication <a href=\"#totp\">application</a>, <a " +"href=\"#utfkey\">device</a>, and <a href=\"#recoverycodes\">recovery " +"codes</a>" msgstr "" +# | msgid "" +# | "If you no longer have access to the email address associated with your " +# | "account, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" +# | "\"noopener\">file an issue on our tracker</a>." #: warehouse/templates/pages/help.html:559 #, fuzzy, python-format -#| msgid "" -#| "If you no longer have access to the email address associated with your " -#| "account, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -#| "\"noopener\">file an issue on our tracker</a>." msgid "" -"You can proceed to, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">file an issue on our tracker</a> to request assistance " -"with account recovery." +"You can proceed to, <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">file an issue on our tracker</a> to " +"request assistance with account recovery." msgstr "" "Wenn Sie keinen Zugriff mehr auf die mit Ihrem Konto verbundene E-Mail-" -"Adresse haben, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">eröffnen Sie bitte einen Vorgang in unserem Bug-Tracker</a>." +"Adresse haben, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\"" +" rel=\"noopener\">eröffnen Sie bitte einen Vorgang in unserem Bug-" +"Tracker</a>." +# | msgid "Provide your username and password, as normal" #: warehouse/templates/pages/help.html:566 #, fuzzy -#| msgid "Provide your username and password, as normal" msgid "If you are using a username and password for uploads:" msgstr "Wie gewohnt Ihren Benutzernamen und Ihr Password angeben" +# | msgid "Provide your username and password, as normal" #: warehouse/templates/pages/help.html:568 #, fuzzy -#| msgid "Provide your username and password, as normal" msgid "Check to see if your username or password are incorrect." msgstr "Wie gewohnt Ihren Benutzernamen und Ihr Password angeben" @@ -4997,155 +5032,162 @@ msgstr "" #: warehouse/templates/pages/help.html:574 msgid "" -"Ensure that your API Token is <a href=\"#apitoken\">properly formatted</a> " -"and does not contain any trailing characters such as newlines." +"Ensure that your API Token is <a href=\"#apitoken\">properly " +"formatted</a> and does not contain any trailing characters such as " +"newlines." msgstr "" #: warehouse/templates/pages/help.html:579 #, python-format msgid "" -"Transport Layer Security, or TLS, is part of how we make sure connections " -"between your computer and PyPI are private and secure. It's a cryptographic " -"protocol that's had several versions over time. PyPI <a href=" -"\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">turned off support for TLS versions 1.0 and 1.1</a> in April " -"2018. <a href=\"%(reason_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Learn why on the PSF blog</a>." +"Transport Layer Security, or TLS, is part of how we make sure connections" +" between your computer and PyPI are private and secure. It's a " +"cryptographic protocol that's had several versions over time. PyPI <a " +"href=\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">turned off support for TLS versions 1.0 and 1.1</a> in " +"April 2018. <a href=\"%(reason_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Learn why on the PSF blog</a>." msgstr "" "Transport Layer Security, kurz TLS, ist ein Teil davon, wie wir " -"sicherstellen, dass die Verbindungen zwischen Ihrem Computer und PyPI privat " -"und sicher sind. Es ist ein kryptographisches Protokoll, das im Laufe der " -"Zeit mehrere Versionen hatte. PyPI <a href=\"%(announcement_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">hat die Unterstützung für " -"TLS-Versionen 1.0 und 1.1</a> im April 2018 eingestellt. <a href=" -"\"%(reason_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Lernen Sie warum im PSF-Blog</a>." +"sicherstellen, dass die Verbindungen zwischen Ihrem Computer und PyPI " +"privat und sicher sind. Es ist ein kryptographisches Protokoll, das im " +"Laufe der Zeit mehrere Versionen hatte. PyPI <a " +"href=\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">hat die Unterstützung für TLS-Versionen 1.0 und 1.1</a> " +"im April 2018 eingestellt. <a href=\"%(reason_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Lernen Sie warum " +"im PSF-Blog</a>." #: warehouse/templates/pages/help.html:586 #, python-format msgid "" -"If you are having trouble with <code>%(command)s</code> and get a <code>No " -"matching distribution found</code> or <code>Could not fetch URL</code> " -"error, try adding <code>-v</code> to the command to get more information:" +"If you are having trouble with <code>%(command)s</code> and get a " +"<code>No matching distribution found</code> or <code>Could not fetch " +"URL</code> error, try adding <code>-v</code> to the command to get more " +"information:" msgstr "" -"Wenn Sie Probleme mit <code>%(command)s</code> haben und Fehler wie <code>No " -"matching distribution found</code> oder <code>Could not fetch URL</code> " -"erhalten, versuchen Sie dem Kommando <code>-v</code> hinzuzufügen, um " -"weitere Informationen zu erhalten:" +"Wenn Sie Probleme mit <code>%(command)s</code> haben und Fehler wie " +"<code>No matching distribution found</code> oder <code>Could not fetch " +"URL</code> erhalten, versuchen Sie dem Kommando <code>-v</code> " +"hinzuzufügen, um weitere Informationen zu erhalten:" #: warehouse/templates/pages/help.html:588 msgid "" "If you see an error like <code>There was a problem confirming the ssl " "certificate</code> or <code>tlsv1 alert protocol version</code> or " -"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, you need to be connecting to PyPI " -"with a newer TLS support library." +"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, you need to be connecting to " +"PyPI with a newer TLS support library." msgstr "" "Wenn Sie einen Fehler, wie <code>There was a problem confirming the ssl " "certificate</code>, <code>tlsv1 alert protocol version</code> oder " -"<code>TLSV1_ALERT_PROTOCOL_VERSION</code> erhalten, müssen Sie eine neuere " -"TLS Bibliothek verwenden um sich mit PyPI zu verbinden." +"<code>TLSV1_ALERT_PROTOCOL_VERSION</code> erhalten, müssen Sie eine " +"neuere TLS Bibliothek verwenden um sich mit PyPI zu verbinden." #: warehouse/templates/pages/help.html:589 msgid "" "The specific steps you need to take will depend on your operating system " -"version, where your installation of Python originated (python.org, your OS " -"vendor, or an intermediate distributor), and the installed versions of " -"Python, <code>setuptools</code>, and <code>pip</code>." +"version, where your installation of Python originated (python.org, your " +"OS vendor, or an intermediate distributor), and the installed versions of" +" Python, <code>setuptools</code>, and <code>pip</code>." msgstr "" "Die genauen Schritte, die Sie durchführen müssen, hängen von Ihrer " -"Betriebssystemversion, dem Ursprung Ihrer Python Installation (python.org, " -"Version Ihres Betriebssystemherstellers oder eins Zwischenhändlers), den " -"installierten Versionen von Python, <code>setuptools</code> und <code>pip</" -"code> ab." +"Betriebssystemversion, dem Ursprung Ihrer Python Installation " +"(python.org, Version Ihres Betriebssystemherstellers oder eins " +"Zwischenhändlers), den installierten Versionen von Python, " +"<code>setuptools</code> und <code>pip</code> ab." #: warehouse/templates/pages/help.html:591 #, python-format msgid "" -"For help, go to <a href=\"%(irc_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">the <code>#pypa</code> IRC channel on Freenode</a>, file " -"an issue at <a href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">pypa/packaging-problems/issues</a>, or <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">post to the python-help mailing list</a>, including your OS and " -"installation details and the output of <code>%(command)s</code>." -msgstr "" -"Um Hilfe zu erhalten, treten Sie dem <a href=\"%(irc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">IRC-Kanal <code>#pypa</" -"code> auf Freenode</a> bei, öffnen Sie ein Ticket auf <a href=" -"\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">pypa/packaging-problems/issues</a> oder <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">senden Sie eine E-Mail an die Python-Hilfe-Mailingliste</a>. " -"Geben Sie Ihre Betriebssystem- und Installationsdetails und die Ausgabe von " -"<code>%(command)s</code> mit an." +"For help, go to <a href=\"%(irc_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">the <code>#pypa</code> IRC channel on " +"Freenode</a>, file an issue at <a href=\"%(issue_tracker_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">pypa/packaging-" +"problems/issues</a>, or <a href=\"%(mailing_list_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">post to the " +"python-help mailing list</a>, including your OS and installation details " +"and the output of <code>%(command)s</code>." +msgstr "" +"Um Hilfe zu erhalten, treten Sie dem <a href=\"%(irc_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">IRC-Kanal " +"<code>#pypa</code> auf Freenode</a> bei, öffnen Sie ein Ticket auf <a " +"href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">pypa/packaging-problems/issues</a> oder <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">senden Sie eine E-Mail an die Python-Hilfe-" +"Mailingliste</a>. Geben Sie Ihre Betriebssystem- und Installationsdetails" +" und die Ausgabe von <code>%(command)s</code> mit an." #: warehouse/templates/pages/help.html:602 #, python-format msgid "" -"We take <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">accessibility</a> very seriously and want to make the website " -"easy to use for everyone." +"We take <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">accessibility</a> very seriously and want to make the " +"website easy to use for everyone." msgstr "" -"Wir nehmen <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Barrierefreiheit</a> sehr ernst und wollen die Website für " -"jeden einfach bedienbar machen." +"Wir nehmen <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Barrierefreiheit</a> sehr ernst und wollen die Website " +"für jeden einfach bedienbar machen." #: warehouse/templates/pages/help.html:607 #, python-format msgid "" -"If you are experiencing an accessibility problem, <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">report it to us on GitHub</" -"a>, so we can try to fix the problem, for you and others." +"If you are experiencing an accessibility problem, <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">report it to us on" +" GitHub</a>, so we can try to fix the problem, for you and others." msgstr "" -"Wenn Sie ein Problem mit der Barrierefreiheit feststellen, <a href=\"%(href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">teilen Sie es uns " -"auf GitHub mit</a>, damit wir es für Sie und andere beheben können." +"Wenn Sie ein Problem mit der Barrierefreiheit feststellen, <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">teilen Sie es uns auf GitHub mit</a>, damit wir es für " +"Sie und andere beheben können." #: warehouse/templates/pages/help.html:615 #, python-format msgid "" "In a previous version of PyPI, it used to be possible for maintainers to " -"upload releases to PyPI using a form in the web browser. This feature was " -"deprecated with the new version of PyPI – we instead recommend that you <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">use " -"twine to upload your project to PyPI</a>." +"upload releases to PyPI using a form in the web browser. This feature was" +" deprecated with the new version of PyPI – we instead recommend that you " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">use twine to upload your project to PyPI</a>." msgstr "" "In einer vorherigen Version von PyPI konnten Paketbetreuer neue " "Veröffentlichungen über ein Formular im Web-Browser hochladen. Diese " "Funktion wurde mit der neuen PyPI Version abgeschafft - wir empfehlen " -"stattdessen, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">twine zum Hochladen Ihres Projekts auf PyPI zu verwenden</a>." +"stattdessen, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">twine zum Hochladen Ihres Projekts auf PyPI zu " +"verwenden</a>." #: warehouse/templates/pages/help.html:624 msgid "" -"Spammers return to PyPI with some regularity hoping to place their Search " -"Engine Optimized phishing, scam, and click-farming content on the site. " +"Spammers return to PyPI with some regularity hoping to place their Search" +" Engine Optimized phishing, scam, and click-farming content on the site. " "Since PyPI allows for indexing of the Long Description and other data " "related to projects and has a generally solid search reputation, it is a " "prime target." msgstr "" -"Spammer kommen mit einiger Regelmäßigkeit auf PyPI vorbei und hoffen, ihre " -"Suchmaschinen optimierten Phishing, Scam und Click-Farming Inhalte auf der " -"Seite platzieren zu können. Da PyPI das Indexieren der Beschreibungstexte " -"und anderer Projektdaten erlaubt und eine im Allgemeinen gute Sucherfahrung " -"bietet, ist es ein Hauptziel für Spammer." +"Spammer kommen mit einiger Regelmäßigkeit auf PyPI vorbei und hoffen, " +"ihre Suchmaschinen optimierten Phishing, Scam und Click-Farming Inhalte " +"auf der Seite platzieren zu können. Da PyPI das Indexieren der " +"Beschreibungstexte und anderer Projektdaten erlaubt und eine im " +"Allgemeinen gute Sucherfahrung bietet, ist es ein Hauptziel für Spammer." #: warehouse/templates/pages/help.html:626 #, python-format msgid "" "When the PyPI administrators are overwhelmed by spam <strong>or</strong> " -"determine that there is some other threat to PyPI, new user registration and/" -"or new project registration may be disabled. Check <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status page</a> " -"for more details, as we'll likely have updated it with reasoning for the " -"intervention." -msgstr "" -"Wenn die PyPI Administratoren vom Spam überfordert sind <strong>oder</" -"strong> feststellen, dass eine andere Bedrohung für PyPI existiert, können " -"die Registrierung neuer Benutzer oder neuer Projekte deaktiviert werden. " -"Besuchen Sie <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">unsere Status-Seite</a> für weitere Informationen, da wir sie " -"wahrscheinlich mit Gründen für die Intervention aktualisiert haben." +"determine that there is some other threat to PyPI, new user registration " +"and/or new project registration may be disabled. Check <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">our status page</a> for more details, as we'll likely " +"have updated it with reasoning for the intervention." +msgstr "" +"Wenn die PyPI Administratoren vom Spam überfordert sind " +"<strong>oder</strong> feststellen, dass eine andere Bedrohung für PyPI " +"existiert, können die Registrierung neuer Benutzer oder neuer Projekte " +"deaktiviert werden. Besuchen Sie <a href=\"%(href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">unsere Status-Seite</a> für weitere " +"Informationen, da wir sie wahrscheinlich mit Gründen für die Intervention" +" aktualisiert haben." #: warehouse/templates/pages/help.html:635 msgid "PyPI will return these errors for one of these reasons:" @@ -5168,61 +5210,65 @@ msgid "" "PyPI does not allow for a filename to be reused, even once a project has " "been deleted and recreated." msgstr "" -"PyPI lässt die Wiederverwendung eines Dateinamens nicht zu, auch nicht nach " -"dem Löschen und Neuerstellen eines Projekts." +"PyPI lässt die Wiederverwendung eines Dateinamens nicht zu, auch nicht " +"nach dem Löschen und Neuerstellen eines Projekts." #: warehouse/templates/pages/help.html:643 #, python-format msgid "" -"To avoid this situation, <a href=\"%(test_pypi_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">use Test PyPI to perform and check your " -"upload first</a>, before uploading to <a href=\"%(pypi_href)s\">pypi.org</a>." +"To avoid this situation, <a href=\"%(test_pypi_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">use Test PyPI to " +"perform and check your upload first</a>, before uploading to <a " +"href=\"%(pypi_href)s\">pypi.org</a>." msgstr "" -"Um diese Situation zu vermeiden, <a href=\"%(test_pypi_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">verwenden Sie zuerst Test " -"PyPI, um ihren Upload zu prüfen</a>, bevor Sie ihn auf <a href=" -"\"%(pypi_href)s\">pypi.org</a> hochladen." +"Um diese Situation zu vermeiden, <a href=\"%(test_pypi_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">verwenden Sie " +"zuerst Test PyPI, um ihren Upload zu prüfen</a>, bevor Sie ihn auf <a " +"href=\"%(pypi_href)s\">pypi.org</a> hochladen." +# | msgid "" +# | "If you would like to request a new trove classifier file a bug on our <a +# " +# | "href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" +# | "\">issue tracker</a>. Include the name of the requested classifier and a +# | "brief justification of why it is important." #: warehouse/templates/pages/help.html:650 #, fuzzy, python-format -#| msgid "" -#| "If you would like to request a new trove classifier file a bug on our <a " -#| "href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -#| "\">issue tracker</a>. Include the name of the requested classifier and a " -#| "brief justification of why it is important." -msgid "" -"If you would like to request a new trove classifier file a pull request on " -"the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><code>pypa/trove-classifiers</code> project</a>. Be sure to include a " -"brief justification of why it is important." -msgstr "" -"Wenn Sie eine neue Kategorie anfordern möchten, öffnen Sie bitte ein Ticket " -"in unserem <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Issue Tracker</a>. Bitte geben Sie den Namen der gewünschten " -"Kategorie an mit einer kurzen Begründung, warum sie wichtig ist." +msgid "" +"If you would like to request a new trove classifier file a pull request " +"on the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>pypa/trove-classifiers</code> project</a>. Be sure" +" to include a brief justification of why it is important." +msgstr "" +"Wenn Sie eine neue Kategorie anfordern möchten, öffnen Sie bitte ein " +"Ticket in unserem <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Issue Tracker</a>. Bitte geben Sie den" +" Namen der gewünschten Kategorie an mit einer kurzen Begründung, warum " +"sie wichtig ist." #: warehouse/templates/pages/help.html:658 #, python-format msgid "" "If you're experiencing an issue with PyPI itself, we welcome " -"<strong>constructive</strong> feedback and bug reports via our <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">issue " -"tracker</a>. Please note that this tracker is only for issues with the " -"software that runs PyPI. Before writing a new issue, first check that a " -"similar issue does not already exist." +"<strong>constructive</strong> feedback and bug reports via our <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">issue tracker</a>. Please note that this tracker is only" +" for issues with the software that runs PyPI. Before writing a new issue," +" first check that a similar issue does not already exist." msgstr "" "Wenn Sie ein Problem mit PyPI selbst haben, freuen wir uns über " "<strong>konstruktives</strong> Feedback und Fehlerberichte in unserem <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Issue Tracker</a>. Bitte beachten Sie, dass dieser Tracker nur für " -"Probleme mit der Software ist, die PyPI ausführt. Bevor Sie ein neues Ticket " -"schreiben, überprüfen Sie zunächst, ob ein ähnliches Problem vielleicht " -"bereits vorhanden ist." +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Issue Tracker</a>. Bitte beachten Sie, dass dieser " +"Tracker nur für Probleme mit der Software ist, die PyPI ausführt. Bevor " +"Sie ein neues Ticket schreiben, überprüfen Sie zunächst, ob ein ähnliches" +" Problem vielleicht bereits vorhanden ist." #: warehouse/templates/pages/help.html:665 msgid "" -"If you are having an issue is with a specific package installed from PyPI, " -"you should reach out to the maintainers of that project directly instead." +"If you are having an issue is with a specific package installed from " +"PyPI, you should reach out to the maintainers of that project directly " +"instead." msgstr "" "Bei Problemen mit einem bestimmten via PyPI installierten Pakets, sollte " "stattdessen direkt Kontakt mit dem Betreiber jenes Projekts aufgenommen " @@ -5231,112 +5277,118 @@ msgstr "" #: warehouse/templates/pages/help.html:674 #, python-format msgid "" -"PyPI is powered by the Warehouse project; <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> is an open " -"source project developed under the umbrella of the Python Packaging " -"Authority (PyPA) and supported by the Python Packaging Working Group " -"(PackagingWG)." +"PyPI is powered by the Warehouse project; <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> is " +"an open source project developed under the umbrella of the Python " +"Packaging Authority (PyPA) and supported by the Python Packaging Working " +"Group (PackagingWG)." msgstr "" -"PyPI wird vom Warehouse-Projekt betrieben; <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> ist ein Open-" -"Source-Softwareprojekt, das unter dem Dach der Python Packaging Authority " -"(PyPA) entwickelt und von der Python Packaging Working Group (PackagingWG) " -"unterstützt wird." +"PyPI wird vom Warehouse-Projekt betrieben; <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> ist " +"ein Open-Source-Softwareprojekt, das unter dem Dach der Python Packaging " +"Authority (PyPA) entwickelt und von der Python Packaging Working Group " +"(PackagingWG) unterstützt wird." #: warehouse/templates/pages/help.html:679 #, python-format msgid "" -"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPA</a> is an independent group of developers whose goal is to improve " -"and maintain many of the core projects related to Python packaging." +"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA</a> is an independent group of developers whose " +"goal is to improve and maintain many of the core projects related to " +"Python packaging." msgstr "" -"Die <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPA</a> ist eine unabhängige Gruppe von Entwicklern, deren Ziel es ist, " -"viele der Kernkomponenten und -projekte rund um das Thema Python-" -"Paketverwaltung zu verbessern und zu betreiben." +"Die <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA</a> ist eine unabhängige Gruppe von Entwicklern, " +"deren Ziel es ist, viele der Kernkomponenten und -projekte rund um das " +"Thema Python-Paketverwaltung zu verbessern und zu betreiben." #: warehouse/templates/pages/help.html:684 #, python-format msgid "" -"The <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">PackagingWG</a> is a working group of the Python Software " -"Foundation (PSF) whose goal is to raise and disburse funds to support the " -"ongoing improvement of Python packaging. Most recently it <a href=" -"\"%(otf_award_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">secured an award from the Open Technology Fund</a> whose funding is " -"enabling developers to improve Warehouse's security and accessibility." -msgstr "" -"Die <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">PackagingWG</a> ist eine Arbeitsgruppe der Python Software " -"Foundation (PSF), deren Ziel es ist, Geldmittel zu organisieren und zu " -"verteilen, um fortlaufende Verbesserungen an der Python-Paketverwaltung " -"sicherzustellen. Kürzlich <a href=\"%(otf_award_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">erhielt sie einen Auszeichnung des Open " -"Technology Fund</a>, deren Förderung es Entwicklern ermöglicht, die " -"Sicherheit und Barrierefreiheit von Warehouse zu verbessern." +"The <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">PackagingWG</a> is a working group of " +"the Python Software Foundation (PSF) whose goal is to raise and disburse " +"funds to support the ongoing improvement of Python packaging. Most " +"recently it <a href=\"%(otf_award_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">secured an award from the Open " +"Technology Fund</a> whose funding is enabling developers to improve " +"Warehouse's security and accessibility." +msgstr "" +"Die <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">PackagingWG</a> ist eine Arbeitsgruppe" +" der Python Software Foundation (PSF), deren Ziel es ist, Geldmittel zu " +"organisieren und zu verteilen, um fortlaufende Verbesserungen an der " +"Python-Paketverwaltung sicherzustellen. Kürzlich <a " +"href=\"%(otf_award_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">erhielt sie einen Auszeichnung des Open Technology " +"Fund</a>, deren Förderung es Entwicklern ermöglicht, die Sicherheit und " +"Barrierefreiheit von Warehouse zu verbessern." #: warehouse/templates/pages/help.html:694 #, python-format msgid "" -"PyPI is powered by <a href=\"%(warehouse_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Warehouse</a> and by a variety of tools and " -"services provided by our <a href=\"%(sponsors_href)s\">generous sponsors</a>." +"PyPI is powered by <a href=\"%(warehouse_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Warehouse</a> and by a variety of " +"tools and services provided by our <a href=\"%(sponsors_href)s\">generous" +" sponsors</a>." msgstr "" -"PyPI wird betrieben auf <a href=\"%(warehouse_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Warehouse</a> und durch eine Vielzahl von " -"Werkzeugen und Dienstleistungen unserer <a href=\"%(sponsors_href)s" -"\">großzügigen Sponsoren</a>." +"PyPI wird betrieben auf <a href=\"%(warehouse_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> und " +"durch eine Vielzahl von Werkzeugen und Dienstleistungen unserer <a " +"href=\"%(sponsors_href)s\">großzügigen Sponsoren</a>." #: warehouse/templates/pages/help.html:701 msgid "" -"As of April 16, 2018, PyPI.org is at \"production\" status, meaning that it " -"has moved out of beta and replaced the old site (pypi.python.org). It is now " -"robust, tested, and ready for expected browser and API traffic." +"As of April 16, 2018, PyPI.org is at \"production\" status, meaning that " +"it has moved out of beta and replaced the old site (pypi.python.org). It " +"is now robust, tested, and ready for expected browser and API traffic." msgstr "" -"Seit dem 16. April 2018 befindet sich PyPI.org im \"Produktions-Zustand\", " -"d. h. es hat die Beta-Phase verlassen und vollständig die alte Seite (pypi." -"python.org) ersetzt. Es ist robust, getestet, und bereit für den zu " -"erwartenden Browser- und API-Traffic." +"Seit dem 16. April 2018 befindet sich PyPI.org im \"Produktions-" +"Zustand\", d. h. es hat die Beta-Phase verlassen und vollständig die alte" +" Seite (pypi.python.org) ersetzt. Es ist robust, getestet, und bereit für" +" den zu erwartenden Browser- und API-Traffic." #: warehouse/templates/pages/help.html:703 #, python-format msgid "" -"PyPI is heavily cached and distributed via <abbr title=\"content delivery " -"network\">CDN</abbr> thanks to our sponsor <a href=\"%(fastly_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Fastly</a> and thus is " -"generally available globally. However, the site is mostly maintained by " -"volunteers, we do not provide any specific Service Level Agreement, and as " -"could be expected for a giant distributed system, things can and sometimes " -"do go wrong. See <a href=\"%(status_page_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">our status page</a> for current and past outages " -"and incidents. If you have high availability requirements for your package " -"index, consider either a <a href=\"%(mirror_href)s\">mirror</a> or a <a href=" -"\"%(private_index_href)s\">private index</a>." -msgstr "" -"PyPI setzt an vielen Stellen Caches (Zwischenspeicher) ein und ist dank des " -"<abbr title=\"Content-Delivery-Network\">CDN</abbr> unseres Sponsors <a href=" -"\"%(fastly_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Fastly</a> generell weltweit verfügbar. Da die Website aber hauptsächlich " -"von Freiwilligen betrieben wird, bieten wir keinerlei verbindliche " -"Dienstgütevereinbarung (Service-Level-Agreement) an. Und, wie in jedem " -"riesigen verteilten System, können Dinge auch einfach mal schief gehen. <a " -"href=\"%(status_page_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Unsere Status-Seite</a> gibt Auskunft über aktuelle und " -"vergangene Aus- und Störfälle. Bei Hochverfügbarkeitsanforderungen an den " -"Paket-Index, empfehlen wir entweder einen <a href=\"%(mirror_href)s" -"\">Spiegelserver</a> oder einen <a href=\"%(private_index_href)s\">privaten " -"Index</a> aufzusetzen." +"PyPI is heavily cached and distributed via <abbr title=\"content delivery" +" network\">CDN</abbr> thanks to our sponsor <a href=\"%(fastly_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Fastly</a> and " +"thus is generally available globally. However, the site is mostly " +"maintained by volunteers, we do not provide any specific Service Level " +"Agreement, and as could be expected for a giant distributed system, " +"things can and sometimes do go wrong. See <a " +"href=\"%(status_page_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">our status page</a> for current and past outages and " +"incidents. If you have high availability requirements for your package " +"index, consider either a <a href=\"%(mirror_href)s\">mirror</a> or a <a " +"href=\"%(private_index_href)s\">private index</a>." +msgstr "" +"PyPI setzt an vielen Stellen Caches (Zwischenspeicher) ein und ist dank " +"des <abbr title=\"Content-Delivery-Network\">CDN</abbr> unseres Sponsors " +"<a href=\"%(fastly_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Fastly</a> generell weltweit verfügbar. Da die Website " +"aber hauptsächlich von Freiwilligen betrieben wird, bieten wir keinerlei " +"verbindliche Dienstgütevereinbarung (Service-Level-Agreement) an. Und, " +"wie in jedem riesigen verteilten System, können Dinge auch einfach mal " +"schief gehen. <a href=\"%(status_page_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Unsere Status-Seite</a> gibt Auskunft " +"über aktuelle und vergangene Aus- und Störfälle. Bei " +"Hochverfügbarkeitsanforderungen an den Paket-Index, empfehlen wir " +"entweder einen <a href=\"%(mirror_href)s\">Spiegelserver</a> oder einen " +"<a href=\"%(private_index_href)s\">privaten Index</a> aufzusetzen." #: warehouse/templates/pages/help.html:717 #, python-format msgid "" -"We have a huge amount of work to do to continue to maintain and improve PyPI " -"(also known as <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">the Warehouse project</a>)." +"We have a huge amount of work to do to continue to maintain and improve " +"PyPI (also known as <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">the Warehouse project</a>)." msgstr "" -"Wir haben eine Menge Arbeit zu tun, um PyPI (auch bekannt als <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">das " -"Warehouse-Projekt</a>) weiter zu pflegen und zu verbessern." +"Wir haben eine Menge Arbeit zu tun, um PyPI (auch bekannt als <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">das Warehouse-Projekt</a>) weiter zu pflegen und zu " +"verbessern." #: warehouse/templates/pages/help.html:722 msgid "Financial:" @@ -5348,8 +5400,8 @@ msgid "" "We would deeply appreciate <a href=\"%(href)s\">your donations to fund " "development and maintenance</a>." msgstr "" -"Wir freuen uns ausgesprochen über <a href=\"%(href)s\">Spenden, die uns die " -"Weiterentwicklung und den Betrieb ermöglichen</a>." +"Wir freuen uns ausgesprochen über <a href=\"%(href)s\">Spenden, die uns " +"die Weiterentwicklung und den Betrieb ermöglichen</a>." #: warehouse/templates/pages/help.html:723 msgid "Development:" @@ -5357,52 +5409,55 @@ msgstr "Entwicklung:" #: warehouse/templates/pages/help.html:723 msgid "" -"Warehouse is open source, and we would love to see some new faces working on " -"the project. You <strong>do not</strong> need to be an experienced open-" -"source developer to make a contribution – in fact, we'd love to help you " -"make your first open source pull request!" +"Warehouse is open source, and we would love to see some new faces working" +" on the project. You <strong>do not</strong> need to be an experienced " +"open-source developer to make a contribution – in fact, we'd love to help" +" you make your first open source pull request!" msgstr "" -"Warehouse ist Open-Source-Software, und wir freuen uns immer über frische " -"Gesichter, die sich am Projekt beteiligen möchten. Vorherige Erfahrung als " -"Open-Source-Entwickler*in <strong>ist nicht</strong> notwendig – wir wären " -"sogar stolz, Dir zu deinem ersten Open-Source Pull-Request zu verhelfen!" +"Warehouse ist Open-Source-Software, und wir freuen uns immer über frische" +" Gesichter, die sich am Projekt beteiligen möchten. Vorherige Erfahrung " +"als Open-Source-Entwickler*in <strong>ist nicht</strong> notwendig – wir " +"wären sogar stolz, Dir zu deinem ersten Open-Source Pull-Request zu " +"verhelfen!" #: warehouse/templates/pages/help.html:725 #, python-format msgid "" "If you have skills in Python, ElasticSearch, HTML, SCSS, JavaScript, or " -"SQLAlchemy then skim our <a href=\"%(getting_started_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">\"Getting started\" guide</" -"a>, then take a look at the <a href=\"%(issue_tracker_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">issue tracker</a>. We've " -"created a <a href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">'Good first issue'</a> label – we recommend you " -"start here." -msgstr "" -"Hast du Kenntnisse in Python, ElasticSearch, HTML, SCSS, JavaScript, oder " -"SQLAlchemy, dann wirf einen Blick auf unseren <a href=" -"\"%(getting_started_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">\"Getting started\"-Guide</a> und auf den <a href=" -"\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Issue-Tracker</a>. Dort gibt es eine Kategorie <a href=" -"\"%(good_first_issue_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">'Good first issue'</a> – und wir empfehlen, dort zu beginnen." +"SQLAlchemy then skim our <a href=\"%(getting_started_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">\"Getting " +"started\" guide</a>, then take a look at the <a " +"href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">issue tracker</a>. We've created a <a " +"href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">'Good first issue'</a> label – we recommend you start " +"here." +msgstr "" +"Hast du Kenntnisse in Python, ElasticSearch, HTML, SCSS, JavaScript, oder" +" SQLAlchemy, dann wirf einen Blick auf unseren <a " +"href=\"%(getting_started_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">\"Getting started\"-Guide</a> und auf den <a " +"href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Issue-Tracker</a>. Dort gibt es eine Kategorie <a " +"href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">'Good first issue'</a> – und wir empfehlen, dort zu " +"beginnen." #: warehouse/templates/pages/help.html:733 #, python-format msgid "" -"Issues are grouped into <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">milestones</a>; working on issues in the current " -"milestone is a great way to help push the project forward. If you're " -"interested in working on a particular issue, leave a comment and we can " -"guide you through the contribution process." +"Issues are grouped into <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">milestones</a>; working on issues in " +"the current milestone is a great way to help push the project forward. If" +" you're interested in working on a particular issue, leave a comment and " +"we can guide you through the contribution process." msgstr "" -"Probleme werden in <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">Meilensteinen</a> gruppiert. Die Bearbeitung von " -"Problemen im aktuellen Meilenstein ist eine hervorragende Möglichkeit, das " -"Projekt voranzutreiben. Wenn Sie an einem bestimmten Thema interessiert " -"sind, hinterlassen Sie einen Kommentar und wir können Sie durch den Prozess " -"zum Mitwirken führen." +"Probleme werden in <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Meilensteinen</a> gruppiert. Die " +"Bearbeitung von Problemen im aktuellen Meilenstein ist eine hervorragende" +" Möglichkeit, das Projekt voranzutreiben. Wenn Sie an einem bestimmten " +"Thema interessiert sind, hinterlassen Sie einen Kommentar und wir können " +"Sie durch den Prozess zum Mitwirken führen." #: warehouse/templates/pages/help.html:740 msgid "Stay updated:" @@ -5411,70 +5466,73 @@ msgstr "Auf dem Laufenden bleiben:" #: warehouse/templates/pages/help.html:741 #, python-format msgid "" -"You can also follow the ongoing development of the project on the <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">distutils-sig mailing list</a> and the <a href=" -"\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">PyPA Dev message group</a>." +"You can also follow the ongoing development of the project on the <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">distutils-sig mailing list</a> and the <a " +"href=\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA Dev message group</a>." msgstr "" -"Verfolge die fortlaufende Entwicklung des Projekts auf der <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">distutils-sig Mailingliste</a> und in der <a href=" -"\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">PyPA Dev-Gruppe</a>." +"Verfolge die fortlaufende Entwicklung des Projekts auf der <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">distutils-sig Mailingliste</a> und in der <a " +"href=\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA Dev-Gruppe</a>." #: warehouse/templates/pages/help.html:751 #, python-format msgid "" -"Changes to PyPI are generally announced on both the <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">pypi-announce mailing list</a> and the <a href=\"%(blog_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PSF blog</a> under " -"the label \"pypi\". The PSF blog also has <a href=\"%(atom_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Atom</a> and <a href=" -"\"%(rss_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</" -"a> feeds for the \"pypi\" label." -msgstr "" -"Änderungen an PyPI werden in der Regel sowohl auf der <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">pypi-announce Mailing Liste</a>, als auch im <a href=" -"\"%(blog_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PSF " -"Blog</a> unter der Kategorie \"pypi\" veröffentlicht. Der PSF Blog hat " -"außerdem <a href=\"%(atom_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Atom-</a> und <a href=\"%(rss_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">RSS-</a>Feeds für die Kategorie \"pypi\"." +"Changes to PyPI are generally announced on both the <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">pypi-announce mailing list</a> and the <a " +"href=\"%(blog_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PSF blog</a> under the label \"pypi\". The PSF blog also" +" has <a href=\"%(atom_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Atom</a> and <a href=\"%(rss_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</a> feeds for " +"the \"pypi\" label." +msgstr "" +"Änderungen an PyPI werden in der Regel sowohl auf der <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">pypi-announce Mailing Liste</a>, als auch im <a " +"href=\"%(blog_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PSF Blog</a> unter der Kategorie \"pypi\" " +"veröffentlicht. Der PSF Blog hat außerdem <a href=\"%(atom_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Atom-</a> und <a " +"href=\"%(rss_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">RSS-</a>Feeds für die Kategorie \"pypi\"." #: warehouse/templates/pages/help.html:761 msgid "" -"When Warehouse's maintainers are deploying new features, at first we mark " -"them with a small \"beta feature\" symbol to tell you: this should probably " -"work fine, but it's new and less tested than other site functionality." +"When Warehouse's maintainers are deploying new features, at first we mark" +" them with a small \"beta feature\" symbol to tell you: this should " +"probably work fine, but it's new and less tested than other site " +"functionality." msgstr "" "Wenn die Betreuer des Warehouse-Projekts neue Funktionen bereitstellen, " -"werden sie zuerst mit einem kleinen \"Beta Funktion\" Symbol markiert, um " -"Ihnen zu sagen: Dies sollte wahrscheinlich funktionieren, ist aber neu und " -"weniger getestet, als die anderen Webseiten-Funktionen." +"werden sie zuerst mit einem kleinen \"Beta Funktion\" Symbol markiert, um" +" Ihnen zu sagen: Dies sollte wahrscheinlich funktionieren, ist aber neu " +"und weniger getestet, als die anderen Webseiten-Funktionen." +# | msgid "Currently, the following features are in beta:" #: warehouse/templates/pages/help.html:762 #, fuzzy -#| msgid "Currently, the following features are in beta:" msgid "Currently, no features are in beta." msgstr "Derzeit sind folgende Funktionen im Beta-Test:" #: warehouse/templates/pages/help.html:766 #, python-format msgid "" -"\"PyPI\" should be pronounced like \"pie pea eye\", specifically with the " -"\"PI\" pronounced as individual letters, rather as a single sound. This " -"minimizes confusion with the <a href=\"%(href)s\" title=\"%(title)s\">PyPy</" -"a> project, which is a popular alternative implementation of the Python " -"language." +"\"PyPI\" should be pronounced like \"pie pea eye\", specifically with the" +" \"PI\" pronounced as individual letters, rather as a single sound. This " +"minimizes confusion with the <a href=\"%(href)s\" " +"title=\"%(title)s\">PyPy</a> project, which is a popular alternative " +"implementation of the Python language." msgstr "" -"\"PyPI\" wird wie das us-amerikanische \"pie pea eye\" ausgesprochen (dt.: " -"\"pei pi ei\"), insbesondere die ersten beiden Buchstaben einzeln. Damit " -"möchten wir mögliche Verwechslungen mit dem <a href=\"%(href)s\" title=" -"\"%(title)s\">PyPy</a>-Projekt vermeiden, einer alternativen Implementierung " -"der Python-Programmiersprache." +"\"PyPI\" wird wie das us-amerikanische \"pie pea eye\" ausgesprochen " +"(dt.: \"pei pi ei\"), insbesondere die ersten beiden Buchstaben einzeln. " +"Damit möchten wir mögliche Verwechslungen mit dem <a href=\"%(href)s\" " +"title=\"%(title)s\">PyPy</a>-Projekt vermeiden, einer alternativen " +"Implementierung der Python-Programmiersprache." #: warehouse/templates/pages/help.html:778 msgid "Resources" @@ -5511,22 +5569,24 @@ msgstr "Kontakt" #: warehouse/templates/pages/help.html:789 #, python-format msgid "" -"The <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging Authority (PyPA)</a> is a working group who " -"work together to improve Python packaging. If you'd like to get in touch " -"with a core packaging developer, use <a href=\"%(irc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">#pypa on IRC (freenode)</" -"a>, or <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">join the distutils-sig mailing list</a>." -msgstr "" -"Die <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging Authority (PyPA)</a> ist eine Arbeitsgruppe, " -"die zusammenarbeitet, um die Python-Paketierung zu verbessern. Wenn Sie mit " -"einem Kern-Entwickler für Paketierung in Kontakt treten möchten, dann " -"benutzen Sie bitte <a href=\"%(irc_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">#pypa im IRC (freenode)</a> oder <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">treten Sie der distutils-sig Mailing-Liste bei</a>." +"The <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging Authority (PyPA)</a> is a working group" +" who work together to improve Python packaging. If you'd like to get in " +"touch with a core packaging developer, use <a href=\"%(irc_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">#pypa on IRC " +"(freenode)</a>, or <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">join the distutils-sig mailing " +"list</a>." +msgstr "" +"Die <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging Authority (PyPA)</a> ist eine " +"Arbeitsgruppe, die zusammenarbeitet, um die Python-Paketierung zu " +"verbessern. Wenn Sie mit einem Kern-Entwickler für Paketierung in Kontakt" +" treten möchten, dann benutzen Sie bitte <a href=\"%(irc_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">#pypa im IRC " +"(freenode)</a> oder <a href=\"%(mailing_list_href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">treten Sie der distutils-sig Mailing-" +"Liste bei</a>." #: warehouse/templates/pages/security.html:15 msgid "Security" @@ -5538,11 +5598,12 @@ msgstr "Ein Sicherheitsproblem melden" #: warehouse/templates/pages/security.html:22 msgid "" -"We take security very seriously and ask that you follow our security policy " -"carefully." +"We take security very seriously and ask that you follow our security " +"policy carefully." msgstr "" -"Wir nehmen Sicherheitsfragen sehr ernst, und bitten darum, sich sorgfältig " -"an die im Folgenden beschriebene Sicherheitsprozedur zu halten." +"Wir nehmen Sicherheitsfragen sehr ernst, und bitten darum, sich " +"sorgfältig an die im Folgenden beschriebene Sicherheitsprozedur zu " +"halten." #: warehouse/templates/pages/security.html:24 msgid "Important!" @@ -5550,13 +5611,13 @@ msgstr "Wichtig!" #: warehouse/templates/pages/security.html:24 msgid "" -"If you believe you've identified a security issue with Warehouse, <strong>DO " -"NOT</strong> report the issue in any public forum, including (but not " -"limited to):" +"If you believe you've identified a security issue with Warehouse, " +"<strong>DO NOT</strong> report the issue in any public forum, including " +"(but not limited to):" msgstr "" -"Falls Sie der Meinung sind, ein Sicherheitsproblem mit Warehouse erkannt zu " -"haben, veröffentlichen Sie die das Problem <strong>NICHT</strong> in einem " -"öffentlichen Forum, inklusive (aber nicht beschränkt auf):" +"Falls Sie der Meinung sind, ein Sicherheitsproblem mit Warehouse erkannt " +"zu haben, veröffentlichen Sie die das Problem <strong>NICHT</strong> in " +"einem öffentlichen Forum, inklusive (aber nicht beschränkt auf):" #: warehouse/templates/pages/security.html:27 msgid "Our GitHub issue tracker" @@ -5573,22 +5634,23 @@ msgstr "Offizielle oder inoffizielle Mailinglisten" #: warehouse/templates/pages/security.html:35 #, python-format msgid "" -"Instead, email <a href=\"%(href)s\">security at python dot org</a> directly, " -"providing as much relevant information as possible." +"Instead, email <a href=\"%(href)s\">security at python dot org</a> " +"directly, providing as much relevant information as possible." msgstr "" -"Mailen Sie stattdessen direkt an <a href=\"%(href)s\">security at python dot " -"org</a> und liefern sie so viele relevante Informationen wie möglich." +"Mailen Sie stattdessen direkt an <a href=\"%(href)s\">security at python " +"dot org</a> und liefern sie so viele relevante Informationen wie möglich." #: warehouse/templates/pages/security.html:36 #, python-format msgid "" "Messages may be optionally encrypted with GPG using key fingerprints " -"available <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">at the Python Security page</a>." +"available <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">at the Python Security page</a>." msgstr "" -"Nachrichten dürfen optional mit GPG und den <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">auf der Python Sicherheits-" -"Seite</a> bereitgestellten Fingerabdrücken verschlüsselt sein." +"Nachrichten dürfen optional mit GPG und den <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">auf der Python " +"Sicherheits-Seite</a> bereitgestellten Fingerabdrücken verschlüsselt " +"sein." #: warehouse/templates/pages/security.html:38 msgid "What happens next?" @@ -5599,21 +5661,20 @@ msgid "" "Once you've submitted an issue via email, you should receive an " "acknowledgment within 48 hours." msgstr "" -"Sobald Sie ein Problem per E-Mail eingereicht haben, sollten Sie innerhalb " -"von 48 Stunden eine Bestätigung erhalten." +"Sobald Sie ein Problem per E-Mail eingereicht haben, sollten Sie " +"innerhalb von 48 Stunden eine Bestätigung erhalten." #: warehouse/templates/pages/security.html:41 msgid "" "Depending on the action to be taken, you may receive further follow-up " "emails." msgstr "" -"Abhängig von den zu ergreifenden Maßnahmen können Sie weitere Folge-E-Mails " -"erhalten." +"Abhängig von den zu ergreifenden Maßnahmen können Sie weitere " +"Folge-E-Mails erhalten." #: warehouse/templates/pages/security.html:44 msgid "This security policy was last updated on March 14, 2018." -msgstr "" -"Diese Sicherheitsrichtlinie wurde zuletzt am 14. März 2018 aktualisiert." +msgstr "Diese Sicherheitsrichtlinie wurde zuletzt am 14. März 2018 aktualisiert." #: warehouse/templates/pages/sitemap.html:21 msgid "PyPI site map" @@ -5648,9 +5709,9 @@ msgstr "Sicherheits-Richtlinie" msgid "Sponsor the Packaging Working Group" msgstr "" +# | msgid "Search and filter projects" #: warehouse/templates/pages/sponsor.html:23 #, fuzzy -#| msgid "Search and filter projects" msgid "Sponsor PyPI and related projects" msgstr "Projekte suchen und filtern" @@ -5658,23 +5719,24 @@ msgstr "Projekte suchen und filtern" msgid "Donate to the Packaging Working Group" msgstr "" +# | msgid "" +# | "The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" +# | "\"noopener\">PyPA</a> is an independent group of developers whose goal is +# " +# | "to improve and maintain many of the core projects related to Python " +# | "packaging." #: warehouse/templates/pages/sponsor.html:27 #, fuzzy, python-format -#| msgid "" -#| "The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -#| "\"noopener\">PyPA</a> is an independent group of developers whose goal is " -#| "to improve and maintain many of the core projects related to Python " -#| "packaging." -msgid "" -"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Packaging Working Group</a> is a work group of the Python Software " -"Foundation which raises and distributes funds to improve Python's packaging " -"ecosystem." -msgstr "" -"Die <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPA</a> ist eine unabhängige Gruppe von Entwicklern, deren Ziel es ist, " -"viele der Kernkomponenten und -projekte rund um das Thema Python-" -"Paketverwaltung zu verbessern und zu betreiben." +msgid "" +"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Packaging Working Group</a> is a work group of the " +"Python Software Foundation which raises and distributes funds to improve " +"Python's packaging ecosystem." +msgstr "" +"Die <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA</a> ist eine unabhängige Gruppe von Entwicklern, " +"deren Ziel es ist, viele der Kernkomponenten und -projekte rund um das " +"Thema Python-Paketverwaltung zu verbessern und zu betreiben." #: warehouse/templates/pages/sponsor.html:29 msgid "Recent projects funded through the working group include:" @@ -5686,87 +5748,93 @@ msgid "" "'Warehouse' codebase" msgstr "" +# | msgid "" +# | "Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" +# | "\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" +# title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/sponsor.html:33 #, fuzzy, python-format -#| msgid "" -#| "Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -#| "\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$170,000 in funding</a> from the <a href=\"%(funder_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Mozilla Open Source " -"Support Program</a> in 2018" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$170,000 in funding</a> from the <a " +"href=\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Mozilla Open Source Support Program</a> in 2018" msgstr "" -"Duo Mobile für <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Android</a> oder <a href=\"%(ios_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Duo Mobile für <a href=\"%(android_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Android</a> oder <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/sponsor.html:36 msgid "" -"Improving PyPI's security and accessibility, and adding support for multiple " -"locales" +"Improving PyPI's security and accessibility, and adding support for " +"multiple locales" msgstr "" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:37 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" -"With $80,000 in funding from the <a href=\"%(funder_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology Fund</a> in " -"2019" +"With $80,000 in funding from the <a href=\"%(funder_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology " +"Fund</a> in 2019" msgstr "" -"Mehr zum Thema Datei-Upload erfahren im <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>" +"Mehr zum Thema Datei-Upload erfahren im <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" #: warehouse/templates/pages/sponsor.html:40 msgid "Additional security-focused features for PyPI" msgstr "" +# | msgid "" +# | "Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" +# | "\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" +# title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/sponsor.html:41 #, fuzzy, python-format -#| msgid "" -#| "Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -#| "\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$100,000 in funding</a> from <a href=\"%(funder_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Facebook Research</a> in " -"2019 and 2020" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$100,000 in funding</a> from <a href=\"%(funder_href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Facebook " +"Research</a> in 2019 and 2020" msgstr "" -"Duo Mobile für <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Android</a> oder <a href=\"%(ios_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Duo Mobile für <a href=\"%(android_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Android</a> oder <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/sponsor.html:44 msgid "Overhauling pip's user experience and dependency resolver" msgstr "" +# | msgid "" +# | "Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" " +# | "target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s" +# | "\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</" +# | "a> and <a href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" +# " +# | "rel=\"noopener\">Thetis</a>." #: warehouse/templates/pages/sponsor.html:45 #, fuzzy, python-format -#| msgid "" -#| "Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s" -#| "\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</" -#| "a> and <a href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Thetis</a>." -msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$407,000 in funding</a> from the <a href=\"%(funder0_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Chan Zuckerberg " -"Initiative</a> and the <a href=\"%(funder1_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Mozilla Open Source Support Program</a> " -"in 2020" +msgid "" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$407,000 in funding</a> from the <a " +"href=\"%(funder0_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Chan Zuckerberg Initiative</a> and the <a " +"href=\"%(funder1_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Mozilla Open Source Support Program</a> in 2020" msgstr "" "Beliebte Schlüssel sind <a href=\"%(yubikey_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</a> und " -"<a href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Thetis</a>." +"target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> und <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." #: warehouse/templates/pages/sponsor.html:49 msgid "" @@ -5774,9 +5842,9 @@ msgid "" "improvements, benefiting millions of Python users around the world." msgstr "" +# | msgid "Common questions" #: warehouse/templates/pages/sponsor.html:57 #, fuzzy -#| msgid "Common questions" msgid "Community donations" msgstr "Häufige Fragen" @@ -5784,34 +5852,35 @@ msgstr "Häufige Fragen" msgid "We greatly appreciate both one-time and recurring donations." msgstr "" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:61 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" -"For US taxpayers, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">your donation may be tax-deductible</a>." +"For US taxpayers, <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">your donation may be tax-" +"deductible</a>." msgstr "" -"Mehr zum Thema Datei-Upload erfahren im <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>" +"Mehr zum Thema Datei-Upload erfahren im <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" #: warehouse/templates/pages/sponsor.html:62 msgid "Every donation counts!" msgstr "" +# | msgid "Donate" #: warehouse/templates/pages/sponsor.html:65 #, fuzzy -#| msgid "Donate" msgid "Donate here" msgstr "Spenden" +# | msgid "Go to <a href=\"%(href)s\">reset your password</a>." #: warehouse/templates/pages/sponsor.html:66 #, fuzzy, python-format -#| msgid "Go to <a href=\"%(href)s\">reset your password</a>." -msgid "" -"Donating over $5,000? <a href=\"%(href)s\">Become a sponsor</a> instead." +msgid "Donating over $5,000? <a href=\"%(href)s\">Become a sponsor</a> instead." msgstr "Gehen Sie zu <a href=\"%(href)s\">Ihr Passwort zurücksetzen</a>." #: warehouse/templates/pages/sponsor.html:77 @@ -5820,8 +5889,8 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:78 msgid "" -"Looking for brand visibility? In the last year*, 21.1 million people from " -"237 countries visited PyPI.org." +"Looking for brand visibility? In the last year*, 21.1 million people from" +" 237 countries visited PyPI.org." msgstr "" #: warehouse/templates/pages/sponsor.html:79 @@ -5834,8 +5903,8 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:83 msgid "" -"Funds raised by the packaging working group go directly towards improving " -"the tools your company uses every day." +"Funds raised by the packaging working group go directly towards improving" +" the tools your company uses every day." msgstr "" #: warehouse/templates/pages/sponsor.html:86 @@ -5844,13 +5913,13 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:87 msgid "" -"Enhance your company's reputation by investing in Python and the open source " -"community." +"Enhance your company's reputation by investing in Python and the open " +"source community." msgstr "" +# | msgid "Uploading packages" #: warehouse/templates/pages/sponsor.html:96 #, fuzzy -#| msgid "Uploading packages" msgid "Sponsorship packages" msgstr "Hochladen von Paketen" @@ -5872,20 +5941,21 @@ msgid "" "perpetuity</strong>" msgstr "" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:112 #: warehouse/templates/pages/sponsor.html:133 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" -"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation " -"blog</a>" +"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation blog</a>" msgstr "" -"Mehr zum Thema Datei-Upload erfahren im <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>" +"Mehr zum Thema Datei-Upload erfahren im <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" #: warehouse/templates/pages/sponsor.html:116 #: warehouse/templates/pages/sponsor.html:139 @@ -5907,7 +5977,8 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:130 msgid "" -"Logo in a <strong>prominent position</strong> on the PyPI project detail page" +"Logo in a <strong>prominent position</strong> on the PyPI project detail " +"page" msgstr "" #: warehouse/templates/pages/sponsor.html:131 @@ -5922,40 +5993,42 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:243 #, python-format msgid "" -"Logo <strong>and write up</strong> on the <a href=\"%(href)s\">PyPI sponsors " -"page</a>" +"Logo <strong>and write up</strong> on the <a href=\"%(href)s\">PyPI " +"sponsors page</a>" msgstr "" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:134 #: warehouse/templates/pages/sponsor.html:157 #: warehouse/templates/pages/sponsor.html:180 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" "<strong>Quarterly</strong> thank you tweet from the <a href=\"%(href)s\" " "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " "Foundation</a>" msgstr "" -"Mehr zum Thema Datei-Upload erfahren im <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>" +"Mehr zum Thema Datei-Upload erfahren im <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" +# | msgid "" +# | "PyPI supports any device that adheres to the <a href=\"%(href)s\" title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." #: warehouse/templates/pages/sponsor.html:135 #: warehouse/templates/pages/sponsor.html:158 #: warehouse/templates/pages/sponsor.html:181 #, fuzzy, python-format -#| msgid "" -#| "PyPI supports any device that adheres to the <a href=\"%(href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." msgid "" "<strong>Quarterly</strong> thank you tweet from the <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</" -"a>" +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" -"PyPI unterstützt alle Geräte, die sich an den <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO-Standard</a> halten." +"PyPI unterstützt alle Geräte, die sich an den <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO-Standard</a> " +"halten." #: warehouse/templates/pages/sponsor.html:148 msgid "Platinum" @@ -5967,28 +6040,28 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:153 msgid "" -"Logo on <strong>high rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>high rotation</strong> in a prominent position on the " +"PyPI project detail page" msgstr "" +# | msgid "" +# | "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +# | "rel=\"noopener\">Python Packaging User Guide</a> for details on the " +# | "available formats." #: warehouse/templates/pages/sponsor.html:156 #: warehouse/templates/pages/sponsor.html:179 #: warehouse/templates/pages/sponsor.html:201 #: warehouse/templates/pages/sponsor.html:222 #, fuzzy, python-format -#| msgid "" -#| "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Python Packaging User Guide</a> for details on the " -#| "available formats." msgid "" "Inclusion in a blog post on the <a href=\"%(href)s\" title=\"%(title)s\" " "target=\"_blank\" rel=\"noopener\">Python Software Foundation blog</a>, " -"<strong>with other sponsors</strong> whose sponsorship commenced during the " -"same quarter" +"<strong>with other sponsors</strong> whose sponsorship commenced during " +"the same quarter" msgstr "" -"Details zu den verfügbaren Formaten finden Sie im <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>." +"Details zu den verfügbaren Formaten finden Sie im <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>." #: warehouse/templates/pages/sponsor.html:171 msgid "Gold" @@ -6000,8 +6073,8 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:176 msgid "" -"Logo on <strong>medium rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>medium rotation</strong> in a prominent position on the " +"PyPI project detail page" msgstr "" #: warehouse/templates/pages/sponsor.html:194 @@ -6014,44 +6087,46 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:199 msgid "" -"Logo on <strong>low rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>low rotation</strong> in a prominent position on the PyPI" +" project detail page" msgstr "" +# | msgid "Go to <a href=\"%(href)s\">reset your password</a>." #: warehouse/templates/pages/sponsor.html:200 #: warehouse/templates/pages/sponsor.html:221 #, fuzzy, python-format -#| msgid "Go to <a href=\"%(href)s\">reset your password</a>." msgid "Logo on the <a href=\"%(href)s\">PyPI sponsors page</a>" msgstr "Gehen Sie zu <a href=\"%(href)s\">Ihr Passwort zurücksetzen</a>." +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:202 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" "<strong>Bi-yearly</strong> thank you tweet from the <a href=\"%(href)s\" " "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " "Foundation</a>" msgstr "" -"Mehr zum Thema Datei-Upload erfahren im <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>" +"Mehr zum Thema Datei-Upload erfahren im <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:203 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" "<strong>Bi-yearly</strong> thank you tweet from the <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</" -"a>" +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" -"Mehr zum Thema Datei-Upload erfahren im <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>" +"Mehr zum Thema Datei-Upload erfahren im <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" #: warehouse/templates/pages/sponsor.html:216 msgid "Bronze" @@ -6061,96 +6136,100 @@ msgstr "" msgid "$5,000 per year, or equivalent in donated services" msgstr "" +# | msgid "" +# | "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +# | "rel=\"noopener\">Python Packaging User Guide</a> for details on the " +# | "available formats." #: warehouse/templates/pages/sponsor.html:223 #, fuzzy, python-format -#| msgid "" -#| "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Python Packaging User Guide</a> for details on the " -#| "available formats." msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a> (on initial sponsorship, and on each subsequent renewal)" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a> (on initial sponsorship, and on each subsequent renewal)" msgstr "" -"Details zu den verfügbaren Formaten finden Sie im <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>." +"Details zu den verfügbaren Formaten finden Sie im <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>." +# | msgid "" +# | "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +# | "rel=\"noopener\">Python Packaging User Guide</a> for details on the " +# | "available formats." #: warehouse/templates/pages/sponsor.html:224 #, fuzzy, python-format -#| msgid "" -#| "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Python Packaging User Guide</a> for details on the " -#| "available formats." msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</a> " -"(on initial sponsorship, and on each subsequent renewal)" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a> (on initial sponsorship, and on each subsequent renewal)" msgstr "" -"Details zu den verfügbaren Formaten finden Sie im <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>." +"Details zu den verfügbaren Formaten finden Sie im <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>." #: warehouse/templates/pages/sponsor.html:238 msgid "One time grants / custom donations" msgstr "" +# | msgid "" +# | "Learn how to create a new release on the <a href=\"%(href)s\" title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " +# | "Guide</a>" #: warehouse/templates/pages/sponsor.html:239 #, fuzzy, python-format -#| msgid "" -#| "Learn how to create a new release on the <a href=\"%(href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -#| "Guide</a>" msgid "" -"Sponsorship of a specific feature, feature set, or community sprint, valued " -"at over $50,000. See <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">fundable packaging improvements</a> for ideas." +"Sponsorship of a specific feature, feature set, or community sprint, " +"valued at over $50,000. See <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">fundable packaging improvements</a> " +"for ideas." msgstr "" -"Erfahren Sie im <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Python Packaging User Guide</a> mehr zum Erstellen neue " -"Veröffentlichungen" +"Erfahren Sie im <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> mehr " +"zum Erstellen neue Veröffentlichungen" +# | msgid "" +# | "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +# | "rel=\"noopener\">Python Packaging User Guide</a> for details on the " +# | "available formats." #: warehouse/templates/pages/sponsor.html:244 #, fuzzy, python-format -#| msgid "" -#| "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Python Packaging User Guide</a> for details on the " -#| "available formats." msgid "" -"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation " -"blog</a>, explaining what the funds will be used for" +"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation blog</a>, explaining what the funds will be used for" msgstr "" -"Details zu den verfügbaren Formaten finden Sie im <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>." +"Details zu den verfügbaren Formaten finden Sie im <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>." +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:245 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a>" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a>" msgstr "" -"Mehr zum Thema Datei-Upload erfahren im <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>" +"Mehr zum Thema Datei-Upload erfahren im <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:246 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</a>" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" -"Mehr zum Thema Datei-Upload erfahren im <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>" +"Mehr zum Thema Datei-Upload erfahren im <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" #: warehouse/templates/pages/sponsor.html:248 msgid "" @@ -6165,25 +6244,25 @@ msgstr "PyPI-Statistiken" #: warehouse/templates/pages/stats.html:23 msgid "" "We all love stats, so here are some useful statistics about PyPI. The " -"statistics page is cached for 24 hours, so don't expect the numbers to be " -"realtime." +"statistics page is cached for 24 hours, so don't expect the numbers to be" +" realtime." msgstr "" -"Wir alle lieben Statistiken, deshalb hier einige nützliche Statistiken über " -"PyPI. Die Statistikseite wird 24 Stunden lang zwischengespeichert. Erwarten " -"Sie also nicht, dass die Zahlen in Echtzeit angezeigt werden." +"Wir alle lieben Statistiken, deshalb hier einige nützliche Statistiken " +"über PyPI. Die Statistikseite wird 24 Stunden lang zwischengespeichert. " +"Erwarten Sie also nicht, dass die Zahlen in Echtzeit angezeigt werden." #: warehouse/templates/pages/stats.html:30 msgid "Top projects by total package size" msgstr "" +# | msgid "" +# | "Here is a list of the top 100 packages based on sum of their packages " +# | "sizes (in bytes)." #: warehouse/templates/pages/stats.html:32 #, fuzzy -#| msgid "" -#| "Here is a list of the top 100 packages based on sum of their packages " -#| "sizes (in bytes)." msgid "" -"Here is a list of the top 100 projects based on the sum of their packages' " -"sizes (in bytes)." +"Here is a list of the top 100 projects based on the sum of their " +"packages' sizes (in bytes)." msgstr "" "Hier ist eine Liste der Top 100 Pakete basierend auf der Summe ihrer " "Paketgrößen (in Bytes)." @@ -6223,13 +6302,12 @@ msgstr "Nach <a href=\"%(href)s\">Kategorie</a> filtern" #: warehouse/templates/search/results.html:109 msgid "Enter a search query, or select a filter from the list of classifiers." msgstr "" -"Geben Sie eine Suchanfrage ein, oder wählen Sie einen Filter aus der Liste " -"der Kategorien aus." +"Geben Sie eine Suchanfrage ein, oder wählen Sie einen Filter aus der " +"Liste der Kategorien aus." #: warehouse/templates/search/results.html:110 msgid "Enter a search query, or add a filter by clicking on the button." -msgstr "" -"Suchbegriff eingeben, oder Filter durch Klick auf den Button hinzufügen." +msgstr "Suchbegriff eingeben, oder Filter durch Klick auf den Button hinzufügen." #: warehouse/templates/search/results.html:111 msgid "You can combine searches and classifier filters. Examples:" @@ -6339,7 +6417,8 @@ msgstr[1] "" #~ msgid "A new collaborator has been added to a project you own on PyPI:" #~ msgstr "" -#~ "Ein neuer Mitarbeiter wurde zu einem Ihrer Projekte auf PyPI hinzugefügt:" +#~ "Ein neuer Mitarbeiter wurde zu einem " +#~ "Ihrer Projekte auf PyPI hinzugefügt:" #~ msgid "<strong>Username</strong>: %(username)s" #~ msgstr "<strong>Benutzername</strong>: %(username)s" @@ -6354,56 +6433,46 @@ msgstr[1] "" #~ msgstr "<strong>Hinzugefügt von</strong>: %(submitter)s" #~ msgid "" -#~ "If this was a mistake, you can email <a href=\"%(href)s\">" -#~ "%(email_address)s</a> to communicate with the PyPI administrators." +#~ "If this was a mistake, you can " +#~ "email <a href=\"%(href)s\">%(email_address)s</a> to" +#~ " communicate with the PyPI administrators." #~ msgstr "" -#~ "Falls dies ein Fehler war, können die PyPI-Administratoren unter <a href=" -#~ "\"%(href)s\">%(email_address)s</a> kontaktiert werden." +#~ "Falls dies ein Fehler war, können " +#~ "die PyPI-Administratoren unter <a " +#~ "href=\"%(href)s\">%(email_address)s</a> kontaktiert " +#~ "werden." #~ msgid "You are receiving this because you are an owner of this project." -#~ msgstr "" -#~ "Sie sehen diese Nachricht, da Sie der Besitzer dieses Projektes sind." +#~ msgstr "Sie sehen diese Nachricht, da Sie der Besitzer dieses Projektes sind." -#, fuzzy -#~| msgid "This project has no releases" #~ msgid "The project %(project)s has been deleted." #~ msgstr "Dieses Projekt hat keine Veröffentlichungen" -#, fuzzy -#~| msgid "<strong>Added by</strong>: %(submitter)s" #~ msgid "" #~ "<strong>Deleted by:</strong> %(submitter)s with a role:\n" #~ " %(role)s." #~ msgstr "<strong>Hinzugefügt von</strong>: %(submitter)s" -#, fuzzy -#~| msgid "" -#~| "If this was a mistake, you can email <a href=\"%(href)s\">" -#~| "%(email_address)s</a> to communicate with the PyPI administrators." #~ msgid "" #~ "If this was a mistake, you can email <a\n" -#~ " href=\"%(href)s\">%(email_address)s</a> to communicate with the PyPI " -#~ "administrators." +#~ " href=\"%(href)s\">%(email_address)s</a> to " +#~ "communicate with the PyPI administrators." #~ msgstr "" -#~ "Falls dies ein Fehler war, können die PyPI-Administratoren unter <a href=" -#~ "\"%(href)s\">%(email_address)s</a> kontaktiert werden." +#~ "Falls dies ein Fehler war, können " +#~ "die PyPI-Administratoren unter <a " +#~ "href=\"%(href)s\">%(email_address)s</a> kontaktiert " +#~ "werden." -#, fuzzy -#~| msgid "You are receiving this because you are an owner of this project." #~ msgid "" -#~ "You are receiving this because you are %(recipient_role_descr)s of this " -#~ "project." -#~ msgstr "" -#~ "Sie sehen diese Nachricht, da Sie der Besitzer dieses Projektes sind." +#~ "You are receiving this because you " +#~ "are %(recipient_role_descr)s of this project." +#~ msgstr "Sie sehen diese Nachricht, da Sie der Besitzer dieses Projektes sind." -#, fuzzy -#~| msgid "You are receiving this because you are an owner of this project." #~ msgid "" #~ "\n" -#~ "You are receiving this because you are %(recipient_role_descr)s of this " -#~ "project." -#~ msgstr "" -#~ "Sie sehen diese Nachricht, da Sie der Besitzer dieses Projektes sind." +#~ "You are receiving this because you " +#~ "are %(recipient_role_descr)s of this project." +#~ msgstr "Sie sehen diese Nachricht, da Sie der Besitzer dieses Projektes sind." #~ msgid "View <span>hashes</span>" #~ msgstr "<span>Hashes</span> anzeigen" @@ -6412,66 +6481,89 @@ msgstr[1] "" #~ msgstr "Beta-Feature" #~ msgid "" -#~ "If you lose your %(method)s and can no longer log in, the PyPI team " -#~ "<strong>cannot</strong> currently help you recover your account. We plan " -#~ "to develop a <a href=\"%(policy_href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">manual account recovery policy</a> and " -#~ "implement <a href=\"%(recovery_codes_href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">account recovery codes</a> to address this " -#~ "issue." +#~ "If you lose your %(method)s and " +#~ "can no longer log in, the PyPI " +#~ "team <strong>cannot</strong> currently help " +#~ "you recover your account. We plan " +#~ "to develop a <a href=\"%(policy_href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">manual account recovery policy</a>" +#~ " and implement <a " +#~ "href=\"%(recovery_codes_href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\">account recovery " +#~ "codes</a> to address this issue." #~ msgstr "" -#~ "Wenn Sie %(method)s verlieren und sich nicht mehr anmelden können, kann " -#~ "das PyPI-Team Ihnen momentan <strong>nicht</strong> helfen, wieder " -#~ "Zugriff zu erlangen. Wir haben vor eine <a href=\"%(policy_href)s\" title=" -#~ "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Richtlinie zur manuellen " -#~ "Kontowiederherstellung</a> zu entwickeln und <a href=" -#~ "\"%(recovery_codes_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -#~ "\"noopener\">Codes für die Kontowiederherstellung</a> zu implementieren, " -#~ "um dieses Problem zu beheben." +#~ "Wenn Sie %(method)s verlieren und sich" +#~ " nicht mehr anmelden können, kann das" +#~ " PyPI-Team Ihnen momentan " +#~ "<strong>nicht</strong> helfen, wieder Zugriff " +#~ "zu erlangen. Wir haben vor eine <a" +#~ " href=\"%(policy_href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\">Richtlinie zur " +#~ "manuellen Kontowiederherstellung</a> zu entwickeln" +#~ " und <a href=\"%(recovery_codes_href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">Codes für die " +#~ "Kontowiederherstellung</a> zu implementieren, um " +#~ "dieses Problem zu beheben." #~ msgid "" #~ "\n" -#~ " In the short term, we recommend that all PyPI users set up " -#~ "<em>both</em>\n" -#~ " supported two factor authentication methods - using an " -#~ "authentication\n" -#~ " application <em>and</em> setting up a security device (e.g. USB " -#~ "key).\n" +#~ " In the short term, we " +#~ "recommend that all PyPI users set " +#~ "up <em>both</em>\n" +#~ " supported two factor authentication" +#~ " methods - using an authentication\n" +#~ " application <em>and</em> setting up" +#~ " a security device (e.g. USB key)." +#~ "\n" #~ " " #~ msgstr "" #~ "\n" -#~ " Wir empfehlen allen PyPI-Nutzern kurzfristig <em>beide</em> " -#~ "unterstützen Methoden der Zwei-Faktor-Authentifizierung einzurichten – " -#~ "eine Authentifizierungsanwendung <em>und</em> ein Sicherheitsgerät (z.B. " -#~ "einen USB-Schlüssel).\n" +#~ " Wir empfehlen allen PyPI-Nutzern" +#~ " kurzfristig <em>beide</em> unterstützen Methoden" +#~ " der Zwei-Faktor-Authentifizierung " +#~ "einzurichten – eine Authentifizierungsanwendung " +#~ "<em>und</em> ein Sicherheitsgerät (z.B. einen" +#~ " USB-Schlüssel).\n" #~ " " #~ msgid "Top storage users" #~ msgstr "Top-Speicherbenutzer" #~ msgid "" -#~ "There is currently no established process for performing this " -#~ "administrative task that is explicit and fair for all parties. However, " -#~ "one is currently in development per <a href=\"%(href)s\" title=\"%(title)s" -#~ "\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python enhancement " +#~ "There is currently no established " +#~ "process for performing this administrative " +#~ "task that is explicit and fair for" +#~ " all parties. However, one is " +#~ "currently in development per <a " +#~ "href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\"" +#~ " rel=\"noopener\"><abbr title=\"Python enhancement " #~ "proposal\">PEP</abbr> 541</a>." #~ msgstr "" -#~ "Derzeit gibt es kein etabliertes Verfahren für die Durchführung dieser " -#~ "administrativen Aufgabe, das eindeutig und fair für alle Beteiligten ist. " -#~ "Ein solches Verfahren befindet sich mit <a href=\"%(href)s\" title=" -#~ "\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python " -#~ "enhancement proposal\">PEP</abbr> 541</a> in der Entwicklung." +#~ "Derzeit gibt es kein etabliertes " +#~ "Verfahren für die Durchführung dieser " +#~ "administrativen Aufgabe, das eindeutig und " +#~ "fair für alle Beteiligten ist. Ein " +#~ "solches Verfahren befindet sich mit <a" +#~ " href=\"%(href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\"><abbr title=\"Python" +#~ " enhancement proposal\">PEP</abbr> 541</a> in " +#~ "der Entwicklung." #~ msgid "" -#~ "<abbr title=\"Python enhancement proposal\">PEP</abbr> 541 has been " -#~ "accepted, and PyPI is <a href=\"%(href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">creating a workflow</a> which will be " -#~ "documented here." +#~ "<abbr title=\"Python enhancement " +#~ "proposal\">PEP</abbr> 541 has been accepted," +#~ " and PyPI is <a href=\"%(href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">creating a workflow</a> which " +#~ "will be documented here." #~ msgstr "" -#~ "<abbr title=\"Python enhancement proposal\">PEP</abbr> 541 wurde " -#~ "akzeptiert und PyPI <a href=\"%(href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">entwirft einen Workflow</a>, welcher hier " -#~ "dokumentiert wird." +#~ "<abbr title=\"Python enhancement " +#~ "proposal\">PEP</abbr> 541 wurde akzeptiert und" +#~ " PyPI <a href=\"%(href)s\" title=\"%(title)s\"" +#~ " target=\"_blank\" rel=\"noopener\">entwirft einen " +#~ "Workflow</a>, welcher hier dokumentiert wird." #~ msgid "Log Out" #~ msgstr "Abmelden" @@ -6482,13 +6574,15 @@ msgstr[1] "" #~ msgid "Simple index" #~ msgstr "Einfacher Index" -#~ msgid "" -#~ "There have been too many unsuccessful login attempts, try again later." +#~ msgid "There have been too many unsuccessful login attempts, try again later." #~ msgstr "" -#~ "Es gab zu viele erfolglose Anmeldeversuche. Bitte später erneut versuchen." +#~ "Es gab zu viele erfolglose " +#~ "Anmeldeversuche. Bitte später erneut " +#~ "versuchen." #~ msgid "Created on" #~ msgstr "Erstellt am" #~ msgid "User's username" #~ msgstr "Benutzername des Nutzers" + diff --git a/warehouse/locale/el/LC_MESSAGES/messages.mo b/warehouse/locale/el/LC_MESSAGES/messages.mo index 8a213c58f13b..6f201ae4f692 100644 Binary files a/warehouse/locale/el/LC_MESSAGES/messages.mo and b/warehouse/locale/el/LC_MESSAGES/messages.mo differ diff --git a/warehouse/locale/el/LC_MESSAGES/messages.po b/warehouse/locale/el/LC_MESSAGES/messages.po index b8e9fb0c174b..0456244caa1a 100644 --- a/warehouse/locale/el/LC_MESSAGES/messages.po +++ b/warehouse/locale/el/LC_MESSAGES/messages.po @@ -1,30 +1,6 @@ -# Translations template for Warehouse. -# Copyright (C) 2019 PyPA -# This file is distributed under the same license as the Warehouse project. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2019. -# Nick Mavrakis <mavrakis.n@gmail.com>, 2019. -# Giorgos K. <kavalieratos.giwrgos@gmail.com>, 2020. -# Dustin Ingram <dustin.ingram@gmail.com>, 2020. -msgid "" -msgstr "" -"Project-Id-Version: Warehouse VERSION\n" -"Report-Msgid-Bugs-To: https://github.com/pypa/warehouse/issues/new\n" -"POT-Creation-Date: 2020-01-15 20:11+0200\n" -"PO-Revision-Date: 2020-04-03 03:48+0000\n" -"Last-Translator: Dustin Ingram <dustin.ingram@gmail.com>\n" -"Language-Team: Greek <https://hosted.weblate.org/projects/pypa/warehouse/el/" -">\n" -"Language: el\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.0-dev\n" -"Generated-By: Babel 2.7.0\n" - +# | msgid "Stay updated:" #: warehouse/views.py:254 #, fuzzy -#| msgid "Stay updated:" msgid "Locale updated" msgstr "Μείνετε ενημερωμένοι:" @@ -43,21 +19,21 @@ msgstr "Επιλέξτε ένα όνομα χρήστη με μέγιστο 50 #: warehouse/accounts/forms.py:85 msgid "" "The username is invalid. Usernames must be composed of letters, numbers, " -"dots, hyphens and underscores. And must also start and finish with a letter " -"or number. Choose a different username." +"dots, hyphens and underscores. And must also start and finish with a " +"letter or number. Choose a different username." msgstr "" -"Το όνομα χρήστη δεν είναι έγκυρο. Τα ονόματα χρηστών πρέπει να αποτελούνται " -"από γράμματα, αριθμούς, τελείες, παύλες και κάτω παύλες. Επίσης, πρέπει " -"αρχίζουν και να τελειώνουν με γράμμα ή αριθμό. Διαλέξτε ένα διαφορετικό " -"όνομα χρήστη." +"Το όνομα χρήστη δεν είναι έγκυρο. Τα ονόματα χρηστών πρέπει να " +"αποτελούνται από γράμματα, αριθμούς, τελείες, παύλες και κάτω παύλες. " +"Επίσης, πρέπει αρχίζουν και να τελειώνουν με γράμμα ή αριθμό. Διαλέξτε " +"ένα διαφορετικό όνομα χρήστη." #: warehouse/accounts/forms.py:99 msgid "" -"This username is already being used by another account. Choose a different " -"username." +"This username is already being used by another account. Choose a " +"different username." msgstr "" -"Αυτό το όνομα χρήστη χρησιμοποιείται ήδη από άλλον λογαριασμό. Διαλέξτε ένα " -"διαφορετικό όνομα χρήστη." +"Αυτό το όνομα χρήστη χρησιμοποιείται ήδη από άλλον λογαριασμό. Διαλέξτε " +"ένα διαφορετικό όνομα χρήστη." #: warehouse/accounts/forms.py:122 msgid "The password is invalid. Try again." @@ -78,29 +54,28 @@ msgstr "Το email δεν είναι έγκυρο. Δοκιμάστε ξανά." #: warehouse/accounts/forms.py:198 msgid "You can't use an email address from this domain. Use a different email." msgstr "" -"Δεν μπορείτε να χρησιμοποιήσετε ένα email από αυτό το domain. Δοκιμάστε με " -"άλλο email." +"Δεν μπορείτε να χρησιμοποιήσετε ένα email από αυτό το domain. Δοκιμάστε " +"με άλλο email." #: warehouse/accounts/forms.py:209 msgid "" -"This email address is already being used by this account. Use a different " -"email." +"This email address is already being used by this account. Use a different" +" email." msgstr "" -"Αυτό το email χρησιμοποιείται ήδη από αυτόν τον λογαριασμό. Χρησιμοποιήστε " -"ένα διαφορετικό email." +"Αυτό το email χρησιμοποιείται ήδη από αυτόν τον λογαριασμό. " +"Χρησιμοποιήστε ένα διαφορετικό email." #: warehouse/accounts/forms.py:216 msgid "" -"This email address is already being used by another account. Use a different " -"email." +"This email address is already being used by another account. Use a " +"different email." msgstr "" -"Αυτό το email χρησιμοποιείται ήδη από άλλο λογαριασμό. Χρησιμοποιήστε ένα " -"διαφορετικό email." +"Αυτό το email χρησιμοποιείται ήδη από άλλο λογαριασμό. Χρησιμοποιήστε ένα" +" διαφορετικό email." #: warehouse/accounts/forms.py:238 msgid "The name is too long. Choose a name with 100 characters or less." -msgstr "" -"Το όνομα είναι πολύ μεγάλο. Διαλέξτε ένα όνομα με μέγιστο 100 χαρακτήρες." +msgstr "Το όνομα είναι πολύ μεγάλο. Διαλέξτε ένα όνομα με μέγιστο 100 χαρακτήρες." #: warehouse/accounts/forms.py:302 msgid "Invalid TOTP code." @@ -110,9 +85,9 @@ msgstr "Μη έγκυρος TOTP κωδικός." msgid "Invalid WebAuthn assertion: Bad payload" msgstr "Μη έγκυρο WebAuthn assertion: Bad payload" +# | msgid "Invalid TOTP code." #: warehouse/accounts/forms.py:344 #, fuzzy -#| msgid "Invalid TOTP code." msgid "Invalid Recovery Code." msgstr "Μη έγκυρος TOTP κωδικός." @@ -140,8 +115,8 @@ msgstr "" #: warehouse/accounts/views.py:455 msgid "" -"New user registration temporarily disabled. See https://pypi.org/help#admin-" -"intervention for details." +"New user registration temporarily disabled. See https://pypi.org/help" +"#admin-intervention for details." msgstr "" "Η εγγραφή του νέου χρήστη είναι προσωρινά απενεργοποιημένη. Δείτε στο " "https://pypi.org/help#admin-intervention για λεπτομέρειες." @@ -168,16 +143,15 @@ msgstr "Μη έγκυρο token: ο χρήστης δεν βρέθηκε" #: warehouse/accounts/views.py:572 msgid "Invalid token: user has logged in since this token was requested" -msgstr "" -"Μη έγκυρο token: ο χρήστης συνδέθηκε από τότε που ζητήθηκε αυτό το token" +msgstr "Μη έγκυρο token: ο χρήστης συνδέθηκε από τότε που ζητήθηκε αυτό το token" #: warehouse/accounts/views.py:579 msgid "" "Invalid token: password has already been changed since this token was " "requested" msgstr "" -"Μη έγκυρο token: ο κωδικός έχει ήδη αλλάξει από τότε που ζητήθηκε αυτό το " -"token" +"Μη έγκυρο token: ο κωδικός έχει ήδη αλλάξει από τότε που ζητήθηκε αυτό το" +" token" #: warehouse/accounts/views.py:605 msgid "You have reset your password" @@ -218,12 +192,13 @@ msgstr "Η διεύθυνση email ${email_address} επιβεβαιώθηκε. #: warehouse/manage/views.py:186 msgid "Email ${email_address} added - check your email for a verification link" msgstr "" -"Το email ${email_address} προστέθηκε - ελέγξτε το email σας για τον σύνδεσμο " -"επαλήθευσης" +"Το email ${email_address} προστέθηκε - ελέγξτε το email σας για τον " +"σύνδεσμο επαλήθευσης" #: warehouse/manage/views.py:667 warehouse/manage/views.py:703 msgid "" -"You must provision a two factor method before recovery codes can be generated" +"You must provision a two factor method before recovery codes can be " +"generated" msgstr "" #: warehouse/manage/views.py:678 @@ -409,13 +384,13 @@ msgstr "Κάτι πήγε στραβά" #: warehouse/templates/500.html:22 msgid "" -"<p>We are experiencing technical issues that are affecting our ability to " -"serve you this site.</p> <p>We are aware of the problem and are working to " -"resolve it as soon as possible.</p>" +"<p>We are experiencing technical issues that are affecting our ability to" +" serve you this site.</p> <p>We are aware of the problem and are working " +"to resolve it as soon as possible.</p>" msgstr "" -"<p>Αντιμετωπίζουμε κάποια τεχνικά ζητήματα με αποτέλεσμα να μην μπορούμε να " -"σας εξυπηρετήσουμε.</p> <p>Γνωρίζουμε το πρόβλημα και εργαζόμαστε πάνω σε " -"αυτό για να λυθεί το συντομότερο δυνατόν.</p>" +"<p>Αντιμετωπίζουμε κάποια τεχνικά ζητήματα με αποτέλεσμα να μην μπορούμε " +"να σας εξυπηρετήσουμε.</p> <p>Γνωρίζουμε το πρόβλημα και εργαζόμαστε πάνω" +" σε αυτό για να λυθεί το συντομότερο δυνατόν.</p>" #: warehouse/templates/500.html:28 msgid "Check our status page" @@ -435,25 +410,26 @@ msgstr "Βασίζεστε στο PyPI για να γίνει η δουλειά #: warehouse/templates/500.html:37 msgid "" -"Consider <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\" rel=" -"\"noopener\"> contributing </a> or <a href=\"https://psfmember.org/civicrm/" -"contribute/transact?reset=1&id=13\" target=\"_blank\" rel=\"noopener\"> " -"donating </a> to help us build a more stable and secure platform." +"Consider <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\" " +"rel=\"noopener\"> contributing </a> or <a " +"href=\"https://psfmember.org/civicrm/contribute/transact?reset=1&id=13\" " +"target=\"_blank\" rel=\"noopener\"> donating </a> to help us build a more" +" stable and secure platform." msgstr "" -"Σκεφτείτε να <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\" " -"rel=\"noopener\"> συνεισφέρετε </a> ή να <a href=\"https://psfmember.org/" -"civicrm/contribute/transact?reset=1&id=13\" target=\"_blank\" rel=\"noopener" -"\"> δωρίσετε </a> ούτως ώστε να μας βοηθήσετε να φτιάξουμε μια πιο στιβαρή " -"και ασφαλής πλατφόρμα." +"Σκεφτείτε να <a href=\"https://github.com/pypa/warehouse\" " +"target=\"_blank\" rel=\"noopener\"> συνεισφέρετε </a> ή να <a " +"href=\"https://psfmember.org/civicrm/contribute/transact?reset=1&id=13\" " +"target=\"_blank\" rel=\"noopener\"> δωρίσετε </a> ούτως ώστε να μας " +"βοηθήσετε να φτιάξουμε μια πιο στιβαρή και ασφαλής πλατφόρμα." #: warehouse/templates/base.html:23 msgid "" -"Choose a strong password that contains letters (uppercase and lowercase), " -"numbers and special characters. Avoid common words or repetition." +"Choose a strong password that contains letters (uppercase and lowercase)," +" numbers and special characters. Avoid common words or repetition." msgstr "" -"Επιλέξετε ένα δυνατό κωδικό χρήστη ο οποίος θα περιέχει γράμματα (πεζά και " -"κεφαλαία), αριθμούς και ειδικούς χαρακτήρες. Αποφύγετε κοινές λέξεις ή " -"επαναλήψεις." +"Επιλέξετε ένα δυνατό κωδικό χρήστη ο οποίος θα περιέχει γράμματα (πεζά " +"και κεφαλαία), αριθμούς και ειδικούς χαρακτήρες. Αποφύγετε κοινές λέξεις " +"ή επαναλήψεις." #: warehouse/templates/base.html:26 msgid "Password strength:" @@ -476,10 +452,10 @@ msgstr "Κύρια πλοήγηση" msgid "Help" msgstr "Βοήθεια" +# | msgid "Sponsors" #: warehouse/templates/base.html:40 warehouse/templates/base.html:54 #: warehouse/templates/includes/current-user-indicator.html:60 #, fuzzy -#| msgid "Sponsors" msgid "Sponsor" msgstr "Χορηγοί" @@ -510,8 +486,8 @@ msgstr "Κυρίως μενού" #: warehouse/templates/base.html:76 warehouse/templates/index.html:79 msgid "" -"The Python Package Index (PyPI) is a repository of software for the Python " -"programming language." +"The Python Package Index (PyPI) is a repository of software for the " +"Python programming language." msgstr "" "Το Python Package Index (PyPI) είναι ένα αποθετήριο λογισμικού για την " "γλώσσα προγραμματισμού Python." @@ -553,17 +529,17 @@ msgstr "" #: warehouse/templates/base.html:167 msgid "" "You are using TestPyPI – a separate instance of the Python Package Index " -"that allows you to try distribution tools and processes without affecting " -"the real index." +"that allows you to try distribution tools and processes without affecting" +" the real index." msgstr "" -"Χρησιμοποιείτε το TestPyPI - μια ξεχωριστή οντότητα από το Python Package " -"Index η οποία σας επιτρέπει να δοκιμάσετε τα εργαλεία διανομής καθώς και τις " -"διεργασίες χωρίς να επηρεάζεται η πραγματική βάση δεδομένων." +"Χρησιμοποιείτε το TestPyPI - μια ξεχωριστή οντότητα από το Python Package" +" Index η οποία σας επιτρέπει να δοκιμάσετε τα εργαλεία διανομής καθώς και" +" τις διεργασίες χωρίς να επηρεάζεται η πραγματική βάση δεδομένων." #: warehouse/templates/base.html:177 msgid "" -"Some features may not work without JavaScript. Please try enabling it if you " -"encounter problems." +"Some features may not work without JavaScript. Please try enabling it if " +"you encounter problems." msgstr "" "Μερικά χαρακτηριστικά δεν θα λειτουργούν χωρίς την JavaScript. Αν " "αντιμετωπίζετε προβλήματα, παρακαλούμε, ενεργοποιήστε την." @@ -688,9 +664,11 @@ msgstr "όλα τα συστήματα δουλεύουν" #: warehouse/templates/base.html:311 msgid "" -"Developed and maintained by the Python community, for the Python community." +"Developed and maintained by the Python community, for the Python " +"community." msgstr "" -"Ανάπτυξη και υποστήριξη από την κοινότητα Python, για την κοινότητα Python." +"Ανάπτυξη και υποστήριξη από την κοινότητα Python, για την κοινότητα " +"Python." #: warehouse/templates/base.html:313 msgid "Donate today!" @@ -719,13 +697,14 @@ msgstr "Το Python Package Index" #: warehouse/templates/index.html:42 msgid "Test Python package publishing with the Test Python Package Index" msgstr "" -"Δοκιμάστε την δημοσίευση πακέτων χρησιμοποιώντας το Test Python Package Index" +"Δοκιμάστε την δημοσίευση πακέτων χρησιμοποιώντας το Test Python Package " +"Index" #: warehouse/templates/index.html:44 msgid "Find, install and publish Python packages with the Python Package Index" msgstr "" -"Αναζητήστε, εγκαταστήστε και δημοσιεύστε πακέτα Python με το Python Package " -"Index" +"Αναζητήστε, εγκαταστήστε και δημοσιεύστε πακέτα Python με το Python " +"Package Index" #: warehouse/templates/index.html:60 #, python-format @@ -754,11 +733,11 @@ msgstr "%(num_users)s χρήστες" #: warehouse/templates/index.html:81 msgid "" -"PyPI helps you find and install software developed and shared by the Python " -"community." +"PyPI helps you find and install software developed and shared by the " +"Python community." msgstr "" -"Το PyPI σας βοηθά να βρείτε και να εγκαταστήσετε λογισμικό που αναπτύχθηκε " -"και μοιράστηκε από τον κοινότητα Python." +"Το PyPI σας βοηθά να βρείτε και να εγκαταστήσετε λογισμικό που " +"αναπτύχθηκε και μοιράστηκε από τον κοινότητα Python." #: warehouse/templates/index.html:82 msgid "Learn about installing packages</a>." @@ -772,8 +751,7 @@ msgstr "" #: warehouse/templates/index.html:86 msgid "Learn how to package your Python code for PyPI</a>." -msgstr "" -"Μάθετε πως να μετατρέψετε τον Python κώδικα σας σε πακέτο για το PyPI</a>." +msgstr "Μάθετε πως να μετατρέψετε τον Python κώδικα σας σε πακέτο για το PyPI</a>." #: warehouse/templates/index.html:96 msgid "Trending projects" @@ -798,18 +776,19 @@ msgstr "Αυτό το URL είναι ένα API endpoint για ανέβασμα #: warehouse/templates/upload.html:26 #, python-format msgid "" -"For more information on uploading projects to PyPI, visit the <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python " -"Packaging User Guide</a>." +"For more information on uploading projects to PyPI, visit the <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" "Για περισσότερες πληροφορίες σχετικά με το ανέβασμα projects στο PyPI, " -"επισκεφτείτε το <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Python Packaging User Guide</a>." +"επισκεφτείτε το <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>." #: warehouse/templates/upload.html:28 #, python-format msgid "" -"Otherwise, we suggest you <a href=\"%(href)s\">go to the PyPI homepage</a>." +"Otherwise, we suggest you <a href=\"%(href)s\">go to the PyPI " +"homepage</a>." msgstr "" "Διαφορετικά, προτείνουμε να <a href=\"%(href)s\">μπείτε στην επίσημη " "ιστοσελίδα του PyPI</a>." @@ -964,9 +943,9 @@ msgstr "" msgid "Login using Recovery Code" msgstr "" +# | msgid "Error code" #: warehouse/templates/accounts/recovery-code.html:40 #, fuzzy -#| msgid "Error code" msgid "Enter recovery code" msgstr "Κωδικός σφάλματος" @@ -977,18 +956,19 @@ msgstr "Επιβεβαίωση" #: warehouse/templates/accounts/recovery-code.html:58 msgid "" -"PyPI allows for generating recovery codes to be stored securely offline in " -"the event that your device or application is lost. Enter one of these codes " -"in the form to verify your identity. Once used, the recovery code will no " -"longer be valid." +"PyPI allows for generating recovery codes to be stored securely offline " +"in the event that your device or application is lost. Enter one of these " +"codes in the form to verify your identity. Once used, the recovery code " +"will no longer be valid." msgstr "" +# | msgid "Lost your device? Not working? <a href=\"%(href)s\">Get help</a>." #: warehouse/templates/accounts/recovery-code.html:59 #, fuzzy, python-format -#| msgid "Lost your device? Not working? <a href=\"%(href)s\">Get help</a>." msgid "<p>Not working? <a href=\"%(href)s\">Get help</a>.</p>" msgstr "" -"Χάσατε τη συσκευή σας; Δεν δουλεύει; <a href=\"%(href)s\">Πάρτε βοήθεια</a>." +"Χάσατε τη συσκευή σας; Δεν δουλεύει; <a href=\"%(href)s\">Πάρτε " +"βοήθεια</a>." #: warehouse/templates/accounts/register.html:18 msgid "Create an account" @@ -1048,8 +1028,8 @@ msgstr "Επιβεβαίωση κωδικού" #: warehouse/templates/accounts/register.html:157 msgid "" "This password appears in a security breach or has been compromised and " -"cannot be used. Please refer to the <a href=\"/help/#compromised-password" -"\">FAQ</a> for more information." +"cannot be used. Please refer to the <a href=\"/help/#compromised-" +"password\">FAQ</a> for more information." msgstr "" #: warehouse/templates/accounts/register.html:162 @@ -1063,8 +1043,7 @@ msgstr "Μηδενισμός κωδικού χρήστη" #: warehouse/templates/accounts/request-password-reset.html:27 msgid "To reset your password, enter your username or email." -msgstr "" -"Για να μηδενίσετε τον κωδικό σας, εισάγετε το όνομα χρήστη ή το email σας." +msgstr "Για να μηδενίσετε τον κωδικό σας, εισάγετε το όνομα χρήστη ή το email σας." #: warehouse/templates/accounts/request-password-reset.html:39 msgid "Username or email" @@ -1085,11 +1064,11 @@ msgstr "Ένα email έχει αποσταλεί στην καταχωρημέν #: warehouse/templates/accounts/request-password-reset.html:52 #, python-format msgid "" -"The email contains a link to reset your password. This link will expire in " -"%(n_hours)s hours." +"The email contains a link to reset your password. This link will expire " +"in %(n_hours)s hours." msgstr "" -"Το email περιέχει έναν σύνδεσμο για να μηδενίσετε τον κωδικό χρήστη. Αυτός ο " -"σύνδεσμος θα λήξει σε %(n_hours)s ώρες." +"Το email περιέχει έναν σύνδεσμο για να μηδενίσετε τον κωδικό χρήστη. " +"Αυτός ο σύνδεσμος θα λήξει σε %(n_hours)s ώρες." #: warehouse/templates/accounts/reset-password.html:18 #: warehouse/templates/accounts/reset-password.html:24 @@ -1126,8 +1105,8 @@ msgstr "" #: warehouse/templates/accounts/two-factor.html:42 msgid "Enable JavaScript to log in with a security device (e.g. USB key)" msgstr "" -"Ενεργοποιήστε την JavaScript για να συνδεθείτε με μια συσκευή ασφαλείας (πχ " -"USB key)" +"Ενεργοποιήστε την JavaScript για να συνδεθείτε με μια συσκευή ασφαλείας " +"(πχ USB key)" #: warehouse/templates/accounts/two-factor.html:51 msgid "Authenticate with device" @@ -1136,18 +1115,20 @@ msgstr "Πιστοποίηση με συσκευή" #: warehouse/templates/accounts/two-factor.html:55 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" rel=\"%(rel)s" -"\">Upgrade your browser</a> to log in with a security device (e.g. USB key)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" " +"rel=\"%(rel)s\">Upgrade your browser</a> to log in with a security device" +" (e.g. USB key)" msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" rel=\"%(rel)s" -"\">Αναβαθμίστε τον περιηγητή σας</a> για να συνδεθείτε με μια συσκευή " -"ασφαλείας (πχ USB key)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" " +"rel=\"%(rel)s\">Αναβαθμίστε τον περιηγητή σας</a> για να συνδεθείτε με " +"μια συσκευή ασφαλείας (πχ USB key)" #: warehouse/templates/accounts/two-factor.html:60 #, python-format msgid "Lost your device? Not working? <a href=\"%(href)s\">Get help</a>." msgstr "" -"Χάσατε τη συσκευή σας; Δεν δουλεύει; <a href=\"%(href)s\">Πάρτε βοήθεια</a>." +"Χάσατε τη συσκευή σας; Δεν δουλεύει; <a href=\"%(href)s\">Πάρτε " +"βοήθεια</a>." #: warehouse/templates/accounts/two-factor.html:72 msgid "Authenticate with an app" @@ -1160,18 +1141,19 @@ msgstr "Εισάγετε κωδικό πιστοποίησης" #: warehouse/templates/accounts/two-factor.html:105 #, python-format msgid "" -"<p>Generate a code using the authentication application connected to your " -"PyPI account. Enter this code in the form to verify your identity.</p> " -"<p>Lost your application? Not working? <a href=\"%(href)s\">Get help</a>.</p>" +"<p>Generate a code using the authentication application connected to your" +" PyPI account. Enter this code in the form to verify your identity.</p> " +"<p>Lost your application? Not working? <a href=\"%(href)s\">Get " +"help</a>.</p>" msgstr "" "<p>Δημιουργία ενός κωδικού χρησιμοποιώντας την εφαρμογή πιστοποίησης που " -"είναι συνδεδεμένη με τον λογαριασμό σας στο PyPI. Εισάγετε αυτόν τον κωδικό " -"στη φόρμα για να επιβεβαιώσετε την ταυτότητα σας.</p> <p>Χάσατε την " -"εφαρμογή; Δεν δουλεύει; <a href=\"%(href)s\">Πάρτε βοήθεια</a>.</p>" +"είναι συνδεδεμένη με τον λογαριασμό σας στο PyPI. Εισάγετε αυτόν τον " +"κωδικό στη φόρμα για να επιβεβαιώσετε την ταυτότητα σας.</p> <p>Χάσατε " +"την εφαρμογή; Δεν δουλεύει; <a href=\"%(href)s\">Πάρτε βοήθεια</a>.</p>" +# | msgid "Set up your application" #: warehouse/templates/accounts/two-factor.html:117 #, fuzzy -#| msgid "Set up your application" msgid "Lost your security key or application?" msgstr "Ρύθμιση της εφαρμογής σας" @@ -1182,16 +1164,15 @@ msgstr "" #: warehouse/templates/accounts/two-factor.html:122 #, python-format msgid "" -"<p><strong>You have not generated account recovery codes.</strong></p> <p>If " -"you lose access to your two factor methods, you may lose access to your " -"account. <a href=\"%(href)s\">Get help with recovery codes.</a></p>" +"<p><strong>You have not generated account recovery codes.</strong></p> " +"<p>If you lose access to your two factor methods, you may lose access to " +"your account. <a href=\"%(href)s\">Get help with recovery codes.</a></p>" msgstr "" #: warehouse/templates/email/account-deleted/body.html:18 #, python-format msgid "Your PyPI account <strong>%(username)s</strong> has been deleted." -msgstr "" -"Ο λογαριασμός σας στο PyPI <strong>%(username)s</strong> έχει διαγραφεί." +msgstr "Ο λογαριασμός σας στο PyPI <strong>%(username)s</strong> έχει διαγραφεί." #: warehouse/templates/email/account-deleted/body.html:20 #: warehouse/templates/email/password-change/body.html:20 @@ -1200,12 +1181,13 @@ msgstr "" #: warehouse/templates/email/two-factor-removed/body.html:20 #, python-format msgid "" -"If you did not make this change, you can email <a href=\"%(href)s\">" -"%(email_address)s</a> to communicate with the PyPI administrators." +"If you did not make this change, you can email <a " +"href=\"%(href)s\">%(email_address)s</a> to communicate with the PyPI " +"administrators." msgstr "" -"Αν δεν κάνατε αυτή την αλλαγή, μπορείτε να στείλετε email στο <a href=" -"\"%(href)s\">%(email_address)s</a> προκειμένου να επικοινωνήσετε με τους " -"διαχειριστές του PyPI." +"Αν δεν κάνατε αυτή την αλλαγή, μπορείτε να στείλετε email στο <a " +"href=\"%(href)s\">%(email_address)s</a> προκειμένου να επικοινωνήσετε με " +"τους διαχειριστές του PyPI." #: warehouse/templates/email/added-as-collaborator/body.html:19 #, python-format @@ -1222,17 +1204,17 @@ msgid "" "You are receiving this because you have been added by %(submitter)s to a " "project on %(site)s." msgstr "" -"Το λαμβάνετε αυτό επειδή έχετε προστεθεί από %(submitter)s σε ένα project " -"στο %(site)s." +"Το λαμβάνετε αυτό επειδή έχετε προστεθεί από %(submitter)s σε ένα project" +" στο %(site)s." #: warehouse/templates/email/password-change/body.html:18 #, python-format msgid "" -"Someone, perhaps you, has changed the password for your PyPI account <strong>" -"%(username)s</strong>." +"Someone, perhaps you, has changed the password for your PyPI account " +"<strong>%(username)s</strong>." msgstr "" -"Κάποιος, ίσως εσείς, έχει αλλάξει τον κωδικό χρήστη <strong>%(username)s</" -"strong> του λογαριασμού σας στο PyPI." +"Κάποιος, ίσως εσείς, έχει αλλάξει τον κωδικό χρήστη " +"<strong>%(username)s</strong> του λογαριασμού σας στο PyPI." #: warehouse/templates/email/password-compromised-hibp/body.html:18 #: warehouse/templates/email/password-compromised/body.html:18 @@ -1241,13 +1223,15 @@ msgstr "Τι;" #: warehouse/templates/email/password-compromised/body.html:20 msgid "" -"PyPI administrators have determined that your password is compromised. To\n" -" protect you and other users, we have preemptively reset your password and " -"you\n" +"PyPI administrators have determined that your password is compromised. To" +"\n" +" protect you and other users, we have preemptively reset your password " +"and you\n" " will no longer be able to log in or upload to PyPI with your existing\n" " password." msgstr "" -"Οι διαχειριστές του PyPI διαπίστωσαν ότι ο κωδικός σας υποκλάπηκε. Για να\n" +"Οι διαχειριστές του PyPI διαπίστωσαν ότι ο κωδικός σας υποκλάπηκε. Για να" +"\n" " προστατεύσουμε εσάς καθώς και τους υπόλοιπους χρήστες, μηδενίσαμε " "προληπτικά τον κωδικό σας και\n" " πλέον, δεν θα μπορείτε να συνδέεστε ή να ανεβάζετε στο PyPI χωρίς τον " @@ -1260,8 +1244,8 @@ msgid "" "reduce the\n" " risk for PyPI and its users." msgstr "" -"Το ίδιο το PyPI δεν υπέστη κάποια παραβίαση. Αυτό αποτελεί ένα προστατευτικό " -"μέτρο για την ελάττωση\n" +"Το ίδιο το PyPI δεν υπέστη κάποια παραβίαση. Αυτό αποτελεί ένα " +"προστατευτικό μέτρο για την ελάττωση\n" " του ρίσκου για το PyPI και των χρηστών του." #: warehouse/templates/email/password-compromised-hibp/body.html:32 @@ -1272,11 +1256,11 @@ msgstr "Τι πρέπει να κάνω;" #: warehouse/templates/email/password-compromised/body.html:33 #, python-format msgid "" -"To regain access to your account, <a href=\"%(href)s\">reset your password</" -"a> on PyPI." +"To regain access to your account, <a href=\"%(href)s\">reset your " +"password</a> on PyPI." msgstr "" -"Για να μπορείτε να ανακτήσετε την πρόσβαση στο λογαριασμό σας, <a href=" -"\"%(href)s\">μηδενίστε τον κωδικό σας</a> στο PyPI." +"Για να μπορείτε να ανακτήσετε την πρόσβαση στο λογαριασμό σας, <a " +"href=\"%(href)s\">μηδενίστε τον κωδικό σας</a> στο PyPI." #: warehouse/templates/email/password-compromised/body.html:39 msgid "How can I contact you?" @@ -1285,7 +1269,8 @@ msgstr "Πως μπορώ να επικοινωνήσω μαζί σας;" #: warehouse/templates/email/password-compromised/body.html:41 #, python-format msgid "" -"For more information, you can email %(email_address)s to communicate with\n" +"For more information, you can email %(email_address)s to communicate with" +"\n" " the PyPI administrators." msgstr "" "Για περισσότερες πληροφορίες, μπορείτε να στείλετε email στο " @@ -1298,16 +1283,16 @@ msgid "" "password appears\n" " in public data breaches. To protect you and other users, we have " "preemptively reset your\n" -" password and you will no longer be able to log in or upload to PyPI with " -"your existing\n" +" password and you will no longer be able to log in or upload to PyPI " +"with your existing\n" " password." msgstr "" "Κατά τη διάρκεια της πρόσφατης απόπειρας σύνδεσης σας ή ανεβάσματος στο " "PyPI, διαπιστώσαμε ότι ο κωδικός σας εμφανίζεται σε\n" " δημόσια αρχεία παραβιάσεων. Για να προστατεύσουμε εσάς καθώς και τους " "υπόλοιπους χρήστες, μηδενίσαμε προληπτικά τον\n" -" κωδικό σας και πλέον, δεν θα μπορείτε να συνδέεστε ή να ανεβάζετε στο PyPI " -"χωρίς τον υπάρχον\n" +" κωδικό σας και πλέον, δεν θα μπορείτε να συνδέεστε ή να ανεβάζετε στο " +"PyPI χωρίς τον υπάρχον\n" " κωδικό." #: warehouse/templates/email/password-compromised-hibp/body.html:26 @@ -1318,24 +1303,25 @@ msgid "" " risk of <a href=\"%(href)s\">credential stuffing</a>\n" " attacks against PyPI and its users." msgstr "" -"Το ίδιο το PyPI δεν υπέστη κάποια παραβίαση. Αυτό αποτελεί ένα προστατευτικό " -"μέτρο για την ελάττωση\n" +"Το ίδιο το PyPI δεν υπέστη κάποια παραβίαση. Αυτό αποτελεί ένα " +"προστατευτικό μέτρο για την ελάττωση\n" " του ρίσκου επιθέσεων <a href=\"%(href)s\">credential stuffing</a>\n" " προς το PyPI και των χρηστών του." #: warehouse/templates/email/password-compromised-hibp/body.html:34 #, python-format msgid "" -"To regain access to your account, <a href=\"%(reset_pw_url)s\">reset your " -"password</a> on PyPI. We also recommend that you go to <a href=" -"\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> and check your other " -"passwords and get yourself familiar with good password practices." +"To regain access to your account, <a href=\"%(reset_pw_url)s\">reset your" +" password</a> on PyPI. We also recommend that you go to <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> and check your " +"other passwords and get yourself familiar with good password practices." msgstr "" -"Για να μπορείτε να ανακτήσετε την πρόσβαση στο λογαριασμό σας, <a href=" -"\"%(reset_pw_url)s\">μηδενίστε τον κωδικό σας</a> στο PyPI. Επίσης, " -"συνιστούμε να επισκεφτείτε τη διεύθυνση <a href=\"%(have_i_been_pwned_url)s" -"\">HaveIBeenPwned</a>, να δείτε άλλους κωδικούς και να εξοικειωθείτε με " -"καλές πρακτικές επιλογής δυνατών κωδικών." +"Για να μπορείτε να ανακτήσετε την πρόσβαση στο λογαριασμό σας, <a " +"href=\"%(reset_pw_url)s\">μηδενίστε τον κωδικό σας</a> στο PyPI. Επίσης, " +"συνιστούμε να επισκεφτείτε τη διεύθυνση <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>, να δείτε άλλους " +"κωδικούς και να εξοικειωθείτε με καλές πρακτικές επιλογής δυνατών " +"κωδικών." #: warehouse/templates/email/password-compromised-hibp/body.html:40 msgid "How do you know this?" @@ -1344,29 +1330,32 @@ msgstr "Πως το ξέρετε αυτό;" #: warehouse/templates/email/password-compromised-hibp/body.html:42 #, python-format msgid "" -"We use a free security service from <a href=\"%(have_i_been_pwned_url)s" -"\">HaveIBeenPwned</a>. When registering, authenticating, or updating your " -"password, we generate a SHA1 hash of your password and use the first 5 " -"characters of the hash to decide if the password is compromised. The " -"plaintext password is never stored by PyPI or sent to HaveIBeenPwned." +"We use a free security service from <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>. When registering, " +"authenticating, or updating your password, we generate a SHA1 hash of " +"your password and use the first 5 characters of the hash to decide if the" +" password is compromised. The plaintext password is never stored by PyPI " +"or sent to HaveIBeenPwned." msgstr "" -"Χρησιμοποιούμε μια δωρεάν υπηρεσία ασφάλειας <a href=" -"\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>. Όταν δημιουργείτε " -"λογαριασμό, πιστοποιήστε ή αλλάζετε τον κωδικό χρήστη σας, δημιουργούμε ένα " -"SHA1 hash του κωδικού σας και χρησιμοποιούμε τους πρώτους 5 χαρακτήρες του " -"hash για να αποφανθούμε αν ο κωδικός αυτός έχει υποκλαπεί. Ο κωδικός αυτός " -"καθαυτός δεν αποθηκεύεται ποτέ στο PyPI ή στέλνεται στο HaveIBeenPwned." +"Χρησιμοποιούμε μια δωρεάν υπηρεσία ασφάλειας <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>. Όταν δημιουργείτε " +"λογαριασμό, πιστοποιήστε ή αλλάζετε τον κωδικό χρήστη σας, δημιουργούμε " +"ένα SHA1 hash του κωδικού σας και χρησιμοποιούμε τους πρώτους 5 " +"χαρακτήρες του hash για να αποφανθούμε αν ο κωδικός αυτός έχει υποκλαπεί." +" Ο κωδικός αυτός καθαυτός δεν αποθηκεύεται ποτέ στο PyPI ή στέλνεται στο " +"HaveIBeenPwned." #: warehouse/templates/email/password-compromised-hibp/body.html:47 #, python-format msgid "" -"For more information, see our <a href=\"%(faq_url)s\">FAQ</a>. For help, you " -"can email <a href=\"%(email_href)s\">%(email_address)s</a> to communicate " -"with the PyPI administrators." +"For more information, see our <a href=\"%(faq_url)s\">FAQ</a>. For help, " +"you can email <a href=\"%(email_href)s\">%(email_address)s</a> to " +"communicate with the PyPI administrators." msgstr "" -"Για περισσότερες πληροφορίες δείτε στο <a href=\"%(faq_url)s\">FAQ</a>. Για " -"βοήθεια, μπορείτε να στείλετε email στο <a href=\"%(email_href)s\">" -"%(email_address)s</a> για να επικοινωνήσετε με τους διαχειριστές του PyPI." +"Για περισσότερες πληροφορίες δείτε στο <a href=\"%(faq_url)s\">FAQ</a>. " +"Για βοήθεια, μπορείτε να στείλετε email στο <a " +"href=\"%(email_href)s\">%(email_address)s</a> για να επικοινωνήσετε με " +"τους διαχειριστές του PyPI." #: warehouse/templates/email/password-reset/body.html:18 #, python-format @@ -1374,8 +1363,8 @@ msgid "" "Someone, perhaps you, has made a password reset request for your PyPI " "account '%(username)s'." msgstr "" -"Κάποιος, ίσως εσείς, έκανε μια αίτηση μηδενισμού κωδικού για τον λογαριασμό " -"PyPI '%(username)s'." +"Κάποιος, ίσως εσείς, έκανε μια αίτηση μηδενισμού κωδικού για τον " +"λογαριασμό PyPI '%(username)s'." #: warehouse/templates/email/password-reset/body.html:20 #, python-format @@ -1383,8 +1372,8 @@ msgid "" "If you wish to proceed with this request, <a href=\"%(href)s\">click to " "reset your password</a>." msgstr "" -"Αν επιθυμείτε να προχωρήσετε με αυτή την αίτηση, <a href=\"%(href)s" -"\">κλικάρετε εδώ για να μηδενίσετε τον κωδικό σας</a>." +"Αν επιθυμείτε να προχωρήσετε με αυτή την αίτηση, <a " +"href=\"%(href)s\">κλικάρετε εδώ για να μηδενίσετε τον κωδικό σας</a>." #: warehouse/templates/email/password-reset/body.html:22 #: warehouse/templates/email/verify-email/body.html:22 @@ -1402,56 +1391,60 @@ msgstr "Αν δεν κάνατε αυτή την αίτηση, μπορείτε #: warehouse/templates/email/primary-email-change/body.html:18 #, python-format msgid "" -"The primary email for your PyPI account <strong>%(username)s</strong> has " -"been changed from <code>%(old_email)s</code> to <code>%(new_email)s</code>" +"The primary email for your PyPI account <strong>%(username)s</strong> has" +" been changed from <code>%(old_email)s</code> to " +"<code>%(new_email)s</code>" msgstr "" -"Το κύριο email για τον λογαριασμό σας στο PyPI <strong>%(username)s</strong> " -"άλλαξε από <code>%(old_email)s</code> σε <code>%(new_email)s</code>" +"Το κύριο email για τον λογαριασμό σας στο PyPI " +"<strong>%(username)s</strong> άλλαξε από <code>%(old_email)s</code> σε " +"<code>%(new_email)s</code>" +# | msgid "" +# | "Someone, perhaps you, has changed the password for your PyPI account " +# | "<strong>%(username)s</strong>." #: warehouse/templates/email/two-factor-added/body.html:18 #, fuzzy, python-format -#| msgid "" -#| "Someone, perhaps you, has changed the password for your PyPI account " -#| "<strong>%(username)s</strong>." msgid "" "Someone, perhaps you, has added a %(method)s two-factor authentication " "method to your PyPI account <strong>%(username)s</strong>." msgstr "" -"Κάποιος, ίσως εσείς, έχει αλλάξει τον κωδικό χρήστη <strong>%(username)s</" -"strong> του λογαριασμού σας στο PyPI." +"Κάποιος, ίσως εσείς, έχει αλλάξει τον κωδικό χρήστη " +"<strong>%(username)s</strong> του λογαριασμού σας στο PyPI." +# | msgid "" +# | "Someone, perhaps you, has changed the password for your PyPI account " +# | "<strong>%(username)s</strong>." #: warehouse/templates/email/two-factor-removed/body.html:18 #, fuzzy, python-format -#| msgid "" -#| "Someone, perhaps you, has changed the password for your PyPI account " -#| "<strong>%(username)s</strong>." msgid "" "Someone, perhaps you, has removed a %(method)s two-factor authentication " "method from your PyPI account <strong>%(username)s</strong>." msgstr "" -"Κάποιος, ίσως εσείς, έχει αλλάξει τον κωδικό χρήστη <strong>%(username)s</" -"strong> του λογαριασμού σας στο PyPI." +"Κάποιος, ίσως εσείς, έχει αλλάξει τον κωδικό χρήστη " +"<strong>%(username)s</strong> του λογαριασμού σας στο PyPI." #: warehouse/templates/email/verify-email/body.html:18 #, python-format msgid "" -"Someone, perhaps you, has added this email address (<code>%(email_address)s</" -"code>) to their PyPI account." +"Someone, perhaps you, has added this email address " +"(<code>%(email_address)s</code>) to their PyPI account." msgstr "" -"Κάποιος, ίσως εσείς, πρόσθεσε αυτή το email (<code>%(email_address)s</code>) " -"στο λογαριασμό PyPI." +"Κάποιος, ίσως εσείς, πρόσθεσε αυτή το email " +"(<code>%(email_address)s</code>) στο λογαριασμό PyPI." +# | msgid "" +# | "If you wish to proceed with this request, <a href=\"%(href)s\">click this +# " +# | "link to verify your email address</a>" #: warehouse/templates/email/verify-email/body.html:20 #, fuzzy, python-format -#| msgid "" -#| "If you wish to proceed with this request, <a href=\"%(href)s\">click this " -#| "link to verify your email address</a>" msgid "" -"If you wish to proceed with this request, <a href=\"%(href)s\">click this " -"link to verify your email address</a>." +"If you wish to proceed with this request, <a href=\"%(href)s\">click this" +" link to verify your email address</a>." msgstr "" -"Αν θέλετε να προχωρήσετε με αυτή την αίτηση, <a href=\"%(href)s\">κλικάρετε " -"εδώ για να επιβεβαιώσετε την διεύθυνση email σας</a>" +"Αν θέλετε να προχωρήσετε με αυτή την αίτηση, <a " +"href=\"%(href)s\">κλικάρετε εδώ για να επιβεβαιώσετε την διεύθυνση email " +"σας</a>" #: warehouse/templates/includes/current-user-indicator.html:29 msgid "Admin" @@ -1512,11 +1505,11 @@ msgstr "Επιτυχία" #: warehouse/templates/includes/hash-modal.html:23 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Hashes</a> for %(filename)s" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Hashes</a> for %(filename)s" msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Hashes</a> για %(filename)s" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Hashes</a> για %(filename)s" #: warehouse/templates/includes/hash-modal.html:28 #, python-format @@ -1582,11 +1575,11 @@ msgstr "Επιβεβαιώστε την διεύθυνση email σας ή πρ #: warehouse/templates/includes/session-notifications.html:37 #, python-format msgid "" -"Two factor authentication is available, <a href=\"%(href)s\">enable it now " -"for your account.</a>" +"Two factor authentication is available, <a href=\"%(href)s\">enable it " +"now for your account.</a>" msgstr "" -"Η πιστοποίηση δύο-παραγόντων είναι διαθέσιμη, <a href=\"%(href)s" -"\">ενεργοποιήστε τη τώρα για το λογαριασμό σας.</a>" +"Η πιστοποίηση δύο-παραγόντων είναι διαθέσιμη, <a " +"href=\"%(href)s\">ενεργοποιήστε τη τώρα για το λογαριασμό σας.</a>" #: warehouse/templates/includes/accounts/profile-actions.html:16 msgid "Edit profile" @@ -1603,44 +1596,49 @@ msgstr "Στατιστικά" #: warehouse/templates/includes/accounts/profile-actions.html:21 #, python-format msgid "" -"View statistics for your projects via <a href=\"%(libs_io_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or by " -"using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our public " -"dataset on Google BigQuery</a>" -msgstr "" -"Δείτε τα στατιστικά για τα projects σας μέσω του <a href=\"%(libs_io_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a> ή " -"χρησιμοποιώντας το <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener" -"\">δημόσιο σύνολο δεδομένων μας στο Google BigQuery</a>" - +"View statistics for your projects via <a href=\"%(libs_io_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, " +"or by using <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">our public dataset on Google BigQuery</a>" +msgstr "" +"Δείτε τα στατιστικά για τα projects σας μέσω του <a " +"href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io</a> ή χρησιμοποιώντας το <a " +"href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">δημόσιο σύνολο " +"δεδομένων μας στο Google BigQuery</a>" + +# | msgid "" +# | "View statistics for %(username)s's projects via <a +# href=\"%(libs_io_href)s" +# | "\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</" +# | "a>, or by using <a href=\"%(gbq_href)s\" target=\"_blank\" +# rel=\"noopener" +# | "\">Google BigQuery</a>" #: warehouse/templates/includes/accounts/profile-actions.html:30 #, fuzzy, python-format -#| msgid "" -#| "View statistics for %(username)s's projects via <a href=\"%(libs_io_href)s" -#| "\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</" -#| "a>, or by using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener" -#| "\">Google BigQuery</a>" -msgid "" -"View statistics for %(username)s's projects via <a href=\"%(libs_io_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or " -"by using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our " -"public dataset on Google BigQuery</a>" -msgstr "" -"Δείτε τα στατιστικά για τα projects του χρήστη %(username)s's μέσω του <a " -"href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.io</a> ή χρησιμοποιώντας το <a href=\"%(gbq_href)s\" " -"target=\"_blank\" rel=\"noopener\">Google BigQuery</a>" +msgid "" +"View statistics for %(username)s's projects via <a " +"href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io</a>, or by using <a href=\"%(gbq_href)s\" " +"target=\"_blank\" rel=\"noopener\">our public dataset on Google " +"BigQuery</a>" +msgstr "" +"Δείτε τα στατιστικά για τα projects του χρήστη %(username)s's μέσω του <a" +" href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io</a> ή χρησιμοποιώντας το <a " +"href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">Google " +"BigQuery</a>" #: warehouse/templates/includes/accounts/profile-callout.html:18 #, python-format msgid "" "You have not uploaded any projects to PyPI, yet. To learn how to get " -"started, visit the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">Python Packaging User Guide</a>" +"started, visit the <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" -"Δεν έχετε ανεβάσει ακόμα projects στο PyPI. Για να μάθετε πως να ξεκινήσετε, " -"επισκεφτείτε το <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Python Packaging User Guide</a>" +"Δεν έχετε ανεβάσει ακόμα projects στο PyPI. Για να μάθετε πως να " +"ξεκινήσετε, επισκεφτείτε το <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/includes/accounts/profile-callout.html:23 #, python-format @@ -1704,23 +1702,24 @@ msgstr "Forks:" msgid "Open issues/PRs:" msgstr "Ανοιχτά issues/PRs:" +# | msgid "" +# | "View statistics for this project via <a href=\"%(libs_io_href)s\" title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or by +# " +# | "using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">Google +# | "BigQuery</a>" #: warehouse/templates/includes/packaging/project-data.html:66 #, fuzzy, python-format -#| msgid "" -#| "View statistics for this project via <a href=\"%(libs_io_href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or by " -#| "using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">Google " -#| "BigQuery</a>" msgid "" -"View statistics for this project via <a href=\"%(libs_io_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or by " -"using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our public " -"dataset on Google BigQuery</a>" +"View statistics for this project via <a href=\"%(libs_io_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, " +"or by using <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">our public dataset on Google BigQuery</a>" msgstr "" "Δείτε τα στατιστικά για αυτό το project στο <a href=\"%(libs_io_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a> ή " -"χρησιμοποιώντας το <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener" -"\">Google BigQuery</a>" +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a> ή" +" χρησιμοποιώντας το <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">Google BigQuery</a>" #: warehouse/templates/includes/packaging/project-data.html:74 msgid "Meta" @@ -1841,19 +1840,19 @@ msgstr "Αφαίρεση email" #: warehouse/templates/manage/account.html:138 msgid "" -"Add <abbr title=\"two factor authentication\">2FA</abbr> with authentication " -"application" +"Add <abbr title=\"two factor authentication\">2FA</abbr> with " +"authentication application" msgstr "" -"Προσθήκη <abbr title=\"πιστοποίηση δύο-παραγόντων\">2FA</abbr> με εφαρμογή " -"πιστοποίησης" +"Προσθήκη <abbr title=\"πιστοποίηση δύο-παραγόντων\">2FA</abbr> με " +"εφαρμογή πιστοποίησης" #: warehouse/templates/manage/account.html:140 msgid "" "Add <abbr title=\"two factor authentication\">2FA</abbr> with security " "device (e.g. USB key)" msgstr "" -"Προσθήκη <abbr title=\"πιστοποίηση δύο-παραγόντων\">2FA</abbr> με συσκευή " -"ασφαλείας (πχ USB key)" +"Προσθήκη <abbr title=\"πιστοποίηση δύο-παραγόντων\">2FA</abbr> με συσκευή" +" ασφαλείας (πχ USB key)" #: warehouse/templates/manage/account.html:142 msgid "Generate Recovery Codes" @@ -1862,23 +1861,23 @@ msgstr "" #: warehouse/templates/manage/account.html:147 #: warehouse/templates/manage/account/webauthn-provision.html:37 msgid "" -"Enable JavaScript to set up two factor authentication with a security device " -"(e.g. USB key)" +"Enable JavaScript to set up two factor authentication with a security " +"device (e.g. USB key)" msgstr "" -"Ενεργοποιήστε την JavaScript για να ρυθμίσετε την πιστοποίηση δύο-παραγόντων " -"με μια συσκευή ασφάλειας (πχ USB key)" +"Ενεργοποιήστε την JavaScript για να ρυθμίσετε την πιστοποίηση " +"δύο-παραγόντων με μια συσκευή ασφάλειας (πχ USB key)" #: warehouse/templates/manage/account.html:152 #: warehouse/templates/manage/account/webauthn-provision.html:53 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Upgrade your browser</a> to set up two factor authentication with a " -"security device (e.g. USB key)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Upgrade your browser</a> to set up two factor " +"authentication with a security device (e.g. USB key)" msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Αναβαθμίστε τον περιηγητή σας</a> για να ρυθμίσετε την πιστοποίηση δύο-" -"παραγόντων με μια συσκευή ασφαλείας (πχ USB key)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Αναβαθμίστε τον περιηγητή σας</a> για να ρυθμίσετε την " +"πιστοποίηση δύο-παραγόντων με μια συσκευή ασφαλείας (πχ USB key)" #: warehouse/templates/manage/account.html:166 #: warehouse/templates/manage/account.html:528 @@ -1927,10 +1926,11 @@ msgstr "Αφαίρεση API token" #: warehouse/templates/manage/account.html:216 #: warehouse/templates/manage/token.html:59 msgid "" -"Applications or scripts using this token will no longer have access to PyPI." +"Applications or scripts using this token will no longer have access to " +"PyPI." msgstr "" -"Οι εφαρμογές ή τα scripts που χρησιμοποιούν αυτό το token δεν θα έχουν πλέον " -"πρόσβαση στο PyPI." +"Οι εφαρμογές ή τα scripts που χρησιμοποιούν αυτό το token δεν θα έχουν " +"πλέον πρόσβαση στο PyPI." #: warehouse/templates/manage/account.html:227 #, python-format @@ -1944,13 +1944,13 @@ msgstr "Φωτογραφία προφίλ" #: warehouse/templates/manage/account.html:250 #, python-format msgid "" -"We use <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">gravatar.com</a> to generate your profile picture based on your " -"primary email address" +"We use <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">gravatar.com</a> to generate your profile picture based " +"on your primary email address" msgstr "" -"Χρησιμοποιούμε το <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">gravatar.com</a> για να δημιουργήσουμε φωτογραφίες προφίλ " -"βασισμένες στην διεύθυνση email σας" +"Χρησιμοποιούμε το <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">gravatar.com</a> για να δημιουργήσουμε" +" φωτογραφίες προφίλ βασισμένες στην διεύθυνση email σας" #: warehouse/templates/manage/account.html:257 msgid "Change image on gravatar.com" @@ -1967,10 +1967,11 @@ msgstr "Ημερομηνία συμμετοχής" #: warehouse/templates/manage/account.html:279 #, python-format msgid "" -"Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be changed." +"Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be " +"changed." msgstr "" -"Εμφανίστηκε στο <a href=\"%(href)s\">δημόσιο προφίλ σας</a>. Δεν μπορεί να " -"αλλαχθεί." +"Εμφανίστηκε στο <a href=\"%(href)s\">δημόσιο προφίλ σας</a>. Δεν μπορεί " +"να αλλαχθεί." #: warehouse/templates/manage/account.html:290 msgid "Full name" @@ -1985,23 +1986,23 @@ msgstr "Δεν έχει οριστεί όνομα" msgid "Displayed on your <a href=\"%(href)s\">public profile</a>" msgstr "Εμφανίστηκε στο <a href=\"%(href)s\">δημόσιο προφίλ σας</a>" +# | msgid "Public profile" #: warehouse/templates/manage/account.html:307 #, fuzzy -#| msgid "Public profile" msgid "️Public email" msgstr "Δημόσιο προφίλ" +# | msgid "" +# | "Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be " +# | "changed." #: warehouse/templates/manage/account.html:319 #, fuzzy, python-format -#| msgid "" -#| "Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be " -#| "changed." msgid "" -"One of your verified emails can be displayed on your <a href=\"%(href)s" -"\">public profile</a> to logged-in users." +"One of your verified emails can be displayed on your <a " +"href=\"%(href)s\">public profile</a> to logged-in users." msgstr "" -"Εμφανίστηκε στο <a href=\"%(href)s\">δημόσιο προφίλ σας</a>. Δεν μπορεί να " -"αλλαχθεί." +"Εμφανίστηκε στο <a href=\"%(href)s\">δημόσιο προφίλ σας</a>. Δεν μπορεί " +"να αλλαχθεί." #: warehouse/templates/manage/account.html:324 msgid "Update account" @@ -2013,16 +2014,17 @@ msgstr "Emails λογαριασμού" #: warehouse/templates/manage/account.html:334 msgid "" -"You can associate several emails with your account. You can use any <span " -"class=\"badge badge--success\"><i class=\"fa fa-check\" aria-hidden=\"true" -"\"></i> Verified</span> email to recover your account, but only your <span " -"class=\"badge\">Primary</span> email will receive notifications." +"You can associate several emails with your account. You can use any <span" +" class=\"badge badge--success\"><i class=\"fa fa-check\" aria-" +"hidden=\"true\"></i> Verified</span> email to recover your account, but " +"only your <span class=\"badge\">Primary</span> email will receive " +"notifications." msgstr "" -"Μπορείτε να συσχετίσετε πολλαπλά email με τον λογαριασμό σας. Μπορείτε να " -"χρησιμοποιήσετε οποιοδήποτε <span class=\"badge badge--success\"><i class=" -"\"fa fa-check\" aria-hidden=\"true\"></i> Επιβεβαιωμένο</span> email για να " -"ανακτήστε τον λογαριασμό σας, αλλά μόνο το <span class=\"badge\">Κύριο</" -"span> email θα λαμβάνει ειδοποιήσεις." +"Μπορείτε να συσχετίσετε πολλαπλά email με τον λογαριασμό σας. Μπορείτε να" +" χρησιμοποιήσετε οποιοδήποτε <span class=\"badge badge--success\"><i " +"class=\"fa fa-check\" aria-hidden=\"true\"></i> Επιβεβαιωμένο</span> " +"email για να ανακτήστε τον λογαριασμό σας, αλλά μόνο το <span " +"class=\"badge\">Κύριο</span> email θα λαμβάνει ειδοποιήσεις." #: warehouse/templates/manage/account.html:345 msgid "Emails associated with your account" @@ -2068,9 +2070,9 @@ msgid "" "account. <a href=\"%(href)s\">Learn more about <abbr title=\"two factor " "authentication\">2FA</abbr></a>." msgstr "" -"Η πιστοποίηση δύο-παραγόντων προσθέτει ένα επιπλέον επίπεδο ασφάλειας στο " -"λογαριασμό σας. <a href=\"%(href)s\">Μάθετε περισσότερα σχετικά με το <abbr " -"title=\"two factor authentication\">2FA</abbr></a>." +"Η πιστοποίηση δύο-παραγόντων προσθέτει ένα επιπλέον επίπεδο ασφάλειας στο" +" λογαριασμό σας. <a href=\"%(href)s\">Μάθετε περισσότερα σχετικά με το " +"<abbr title=\"two factor authentication\">2FA</abbr></a>." #: warehouse/templates/manage/account.html:451 msgid "Two factor authentication methods enabled" @@ -2083,11 +2085,11 @@ msgstr "Μέθοδος δύο-παραγόντων" #: warehouse/templates/manage/account.html:460 #: warehouse/templates/manage/account.html:570 msgid "" -"Authentication application (<abbr title=\"time-based one-time password" -"\">TOTP</abbr>)" +"Authentication application (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>)" msgstr "" -"Εφαρμογή πιστοποίησης (<abbr title=\"time-based one-time password\">TOTP</" -"abbr>)" +"Εφαρμογή πιστοποίησης (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>)" #: warehouse/templates/manage/account.html:462 #: warehouse/templates/manage/account.html:476 @@ -2138,17 +2140,17 @@ msgstr "" #: warehouse/templates/manage/account.html:507 msgid "You have not enabled two factor authentication on your account." -msgstr "" -"Δεν έχετε ενεργοποιήσει την πιστοποίηση δύο-παραγόντων στο λογαριασμό σας." +msgstr "Δεν έχετε ενεργοποιήσει την πιστοποίηση δύο-παραγόντων στο λογαριασμό σας." #: warehouse/templates/manage/account.html:512 #, python-format msgid "" -"<a href=\"%(href)s\">Verify your primary email address</a> to add two factor " -"authentication to your account." +"<a href=\"%(href)s\">Verify your primary email address</a> to add two " +"factor authentication to your account." msgstr "" "<a href=\"%(href)s\">Επιβεβαιώστε την κύρια διεύθυνση email σας</a> " -"προκειμένου να προσθέσετε την πιστοποίηση δύο-παραγόντων στο λογαριασμό σας." +"προκειμένου να προσθέσετε την πιστοποίηση δύο-παραγόντων στο λογαριασμό " +"σας." #: warehouse/templates/manage/account.html:519 #: warehouse/templates/manage/settings.html:23 @@ -2180,8 +2182,8 @@ msgstr "Προσθήκη API token" #: warehouse/templates/manage/account.html:544 #, python-format msgid "" -"<a href=\"%(href)s\">Verify your primary email address</a> to add API tokens " -"to your account." +"<a href=\"%(href)s\">Verify your primary email address</a> to add API " +"tokens to your account." msgstr "" "<a href=\"%(href)s\">Επιβεβαιώστε την κύρια διεύθυνση email σας</a> " "προκειμένου να προσθέσετε API tokens στο λογαριασμό σας." @@ -2259,10 +2261,11 @@ msgstr "Προστέθηκε η πιστοποίηση δύο-παραγόντω #: warehouse/templates/manage/account.html:613 #: warehouse/templates/manage/account.html:623 msgid "" -"Method: Security device (<abbr title=\"web authentication\">WebAuthn</abbr>)" +"Method: Security device (<abbr title=\"web " +"authentication\">WebAuthn</abbr>)" msgstr "" -"Μέθοδος: Συσκευή ασφάλειας (<abbr title=\"web authentication\">WebAuthn</" -"abbr>)" +"Μέθοδος: Συσκευή ασφάλειας (<abbr title=\"web " +"authentication\">WebAuthn</abbr>)" #: warehouse/templates/manage/account.html:614 #: warehouse/templates/manage/account.html:624 @@ -2275,8 +2278,8 @@ msgid "" "Method: Authentication application (<abbr title=\"time-based one-time " "password\">TOTP</abbr>)" msgstr "" -"Μέθοδος: Εφαρμογή πιστοποίησης (<abbr title=\"time-based one-time password" -"\">TOTP</abbr>)" +"Μέθοδος: Εφαρμογή πιστοποίησης (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>)" #: warehouse/templates/manage/account.html:620 msgid "Two factor authentication removed" @@ -2326,8 +2329,8 @@ msgstr "Μοναδικό αναγνωριστικό:" #: warehouse/templates/manage/account.html:662 msgid "Events appear here as security-related actions occur on your account." msgstr "" -"Συμβάντα θα εμφανίζονται εδώ όταν δράσεις σχετιζόμενες με θέματα ασφάλειας " -"θα προκύπτουν στον λογαριασμό σας." +"Συμβάντα θα εμφανίζονται εδώ όταν δράσεις σχετιζόμενες με θέματα " +"ασφάλειας θα προκύπτουν στον λογαριασμό σας." #: warehouse/templates/manage/account.html:664 msgid "Recent account activity" @@ -2353,11 +2356,10 @@ msgid "IP address" msgstr "Διεύθυνση IP" #: warehouse/templates/manage/account.html:687 -msgid "" -"Events will appear here as security-related actions occur on your account." +msgid "Events will appear here as security-related actions occur on your account." msgstr "" -"Συμβάντα θα εμφανίζονται εδώ όταν δράσεις σχετιζόμενες με θέματα ασφάλειας " -"θα προκύπτουν στον λογαριασμό σας." +"Συμβάντα θα εμφανίζονται εδώ όταν δράσεις σχετιζόμενες με θέματα " +"ασφάλειας θα προκύπτουν στον λογαριασμό σας." #: warehouse/templates/manage/account.html:694 msgid "Delete account" @@ -2381,25 +2383,25 @@ msgid_plural "" " " msgstr[0] "" "\n" -" Ο λογαριασμός σας είναι προσωρινά ο <strong>μοναδικός κάτοχος</" -"strong> %(count)s project.\n" +" Ο λογαριασμός σας είναι προσωρινά ο <strong>μοναδικός " +"κάτοχος</strong> %(count)s project.\n" " " msgstr[1] "" "\n" -" Ο λογαριασμός σας είναι προσωρινά ο <strong>μοναδικός κάτοχος</" -"strong> %(count)s projects.\n" +" Ο λογαριασμός σας είναι προσωρινά ο <strong>μοναδικός " +"κάτοχος</strong> %(count)s projects.\n" " " #: warehouse/templates/manage/account.html:704 msgid "" "\n" -" You must transfer ownership or delete this project before you can " -"delete your account.\n" +" You must transfer ownership or delete this project before you " +"can delete your account.\n" " " msgid_plural "" "\n" -" You must transfer ownership or delete these projects before you " -"can delete your account.\n" +" You must transfer ownership or delete these projects before you" +" can delete your account.\n" " " msgstr[0] "" "\n" @@ -2415,11 +2417,11 @@ msgstr[1] "" #: warehouse/templates/manage/account.html:714 #, python-format msgid "" -"<a href=\"%(transfer_href)s\">transfer ownership</a> or <a href=" -"\"%(delete_href)s\">delete project</a>" +"<a href=\"%(transfer_href)s\">transfer ownership</a> or <a " +"href=\"%(delete_href)s\">delete project</a>" msgstr "" -"<a href=\"%(transfer_href)s\">μεταφορά κυριότητας</a> ή <a href=" -"\"%(delete_href)s\">διαγραφή project</a>" +"<a href=\"%(transfer_href)s\">μεταφορά κυριότητας</a> ή <a " +"href=\"%(delete_href)s\">διαγραφή project</a>" #: warehouse/templates/manage/account.html:723 #: warehouse/templates/manage/token.html:162 @@ -2428,8 +2430,7 @@ msgstr "Προχωρήστε με προσοχή!" #: warehouse/templates/manage/account.html:726 msgid "You will not be able to recover your account after you delete it" -msgstr "" -"Δεν θα έχετε τη δυνατότητα να ανακτήσετε τον λογαριασμό σας αφού διαγραφεί" +msgstr "Δεν θα έχετε τη δυνατότητα να ανακτήσετε τον λογαριασμό σας αφού διαγραφεί" #: warehouse/templates/manage/account.html:728 msgid "Delete your PyPI account" @@ -2447,13 +2448,13 @@ msgstr "Διαγραφή τεκμηρίωσης" #: warehouse/templates/manage/documentation.html:28 #, python-format msgid "" -"If you would like to DESTROY any existing documentation hosted at <a href=" -"\"%(url)s\">%(url)s</a> there is <strong>no</strong> undo, as uploading new " -"documentation is no longer supported." +"If you would like to DESTROY any existing documentation hosted at <a " +"href=\"%(url)s\">%(url)s</a> there is <strong>no</strong> undo, as " +"uploading new documentation is no longer supported." msgstr "" -"Αν θέλετε να ΔΙΑΓΡΑΨΕΤΕ οποιαδήποτε τεκμηρίωση η οποία φιλοξενείται στο <a " -"href=\"%(url)s\">%(url)s</a><strong>δεν υπάρχει</strong> undo, καθώς το " -"ανέβασμα νέας τεκμηρίωσης δεν υποστηρίζεται πλέον." +"Αν θέλετε να ΔΙΑΓΡΑΨΕΤΕ οποιαδήποτε τεκμηρίωση η οποία φιλοξενείται στο " +"<a href=\"%(url)s\">%(url)s</a><strong>δεν υπάρχει</strong> undo, καθώς " +"το ανέβασμα νέας τεκμηρίωσης δεν υποστηρίζεται πλέον." #: warehouse/templates/manage/documentation.html:35 msgid "Destroy Documentation for project" @@ -2480,12 +2481,12 @@ msgstr "Ιστορικό '%(project_name)s'" #: warehouse/templates/manage/history.html:25 msgid "" -"Each time you (or your collaborators) perform a security action related to " -"this project, the action is recorded and displayed here." +"Each time you (or your collaborators) perform a security action related " +"to this project, the action is recorded and displayed here." msgstr "" -"Κάθε φορά που εσείς (ή κάποιος συνεργάτης σας) πραγματοποιεί κάποια ενέργεια " -"ασφάλειας σχετιζόμενη με αυτό το project, τότε αυτή η ενέργεια θα " -"καταγράφεται και τα εμφανίζεται εδώ." +"Κάθε φορά που εσείς (ή κάποιος συνεργάτης σας) πραγματοποιεί κάποια " +"ενέργεια ασφάλειας σχετιζόμενη με αυτό το project, τότε αυτή η ενέργεια " +"θα καταγράφεται και τα εμφανίζεται εδώ." #: warehouse/templates/manage/history.html:29 msgid "Project created" @@ -2498,8 +2499,7 @@ msgstr "Δημιουργία από:" #: warehouse/templates/manage/history.html:34 #, python-format msgid "<a href=\"%(href)s\">Release version %(version)s</a> created" -msgstr "" -"<a href=\"%(href)s\">Η εκδοση κυκλοφορίας %(version)s</a> δημιουργήθηκε" +msgstr "<a href=\"%(href)s\">Η εκδοση κυκλοφορίας %(version)s</a> δημιουργήθηκε" #: warehouse/templates/manage/history.html:36 #: warehouse/templates/manage/history.html:52 @@ -2531,7 +2531,8 @@ msgstr "Όνομα αρχείου:" #, python-format msgid "<a href=\"%(href)s\">%(username)s</a> added as project %(role_name)s" msgstr "" -"<a href=\"%(href)s\">%(username)s</a> προστέθηκε ως %(role_name)s στο project" +"<a href=\"%(href)s\">%(username)s</a> προστέθηκε ως %(role_name)s στο " +"project" #: warehouse/templates/manage/history.html:55 #, python-format @@ -2543,8 +2544,7 @@ msgstr "" #: warehouse/templates/manage/history.html:60 #, python-format msgid "<a href=\"%(href)s\">%(username)s</a> changed to project %(role_name)s" -msgstr "" -"<a href=\"%(href)s\">%(username)s</a> άλλαξε ως %(role_name)s στο project" +msgstr "<a href=\"%(href)s\">%(username)s</a> άλλαξε ως %(role_name)s στο project" #: warehouse/templates/manage/history.html:62 msgid "Changed by:" @@ -2579,17 +2579,17 @@ msgid "" "Each time you or your collaborators update this project, the action is " "recorded and displayed here." msgstr "" -"Κάθε φορά που εσείς ή ένας συνεργάτης σας αναβαθμίζει αυτό το project, τότε " -"η κίνηση αυτή θα καταγράφεται και θα εμφανίζεται εδώ." +"Κάθε φορά που εσείς ή ένας συνεργάτης σας αναβαθμίζει αυτό το project, " +"τότε η κίνηση αυτή θα καταγράφεται και θα εμφανίζεται εδώ." #: warehouse/templates/manage/journal.html:28 #, python-format msgid "" -"This feature will be deprecated in the future, replaced by the <a href=" -"\"%(href)s\">security history page</a>." +"This feature will be deprecated in the future, replaced by the <a " +"href=\"%(href)s\">security history page</a>." msgstr "" -"Αυτό το χαρακτηριστικό θα αφαιρεθεί στο μέλλον και θα αντικατασταθεί από την " -"<a href=\"%(href)s\">σελίδα ιστορικού ασφάλειας</a>." +"Αυτό το χαρακτηριστικό θα αφαιρεθεί στο μέλλον και θα αντικατασταθεί από " +"την <a href=\"%(href)s\">σελίδα ιστορικού ασφάλειας</a>." #: warehouse/templates/manage/journal.html:32 #, python-format @@ -2715,12 +2715,12 @@ msgstr "Προβολή" #, python-format msgid "" "You have not uploaded any projects to PyPI, yet. To learn how to get " -"started, visit the <a href=\"%(href)s\" target=\"_blank\" rel=\"noopener" -"\">Python Packaging User Guide</a>" +"started, visit the <a href=\"%(href)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" "Δεν έχετε ανεβάσει ακόμα κάποια projects στο PyPI. Για να μάθετε πως να " -"ξεκινήσετε, επισκεφτείτε το <a href=\"%(href)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging User Guide</a>" +"ξεκινήσετε, επισκεφτείτε το <a href=\"%(href)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/manage/release.html:18 #, python-format @@ -2824,11 +2824,12 @@ msgstr "Απαλοιφή" #: warehouse/templates/manage/release.html:119 #, python-format msgid "" -"Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" +"Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" -"Μάθετε πως να ανεβάζετε αρχεία στο <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" +"Μάθετε πως να ανεβάζετε αρχεία στο <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" #: warehouse/templates/manage/release.html:122 msgid "Release settings" @@ -2843,23 +2844,23 @@ msgstr "Διαγραφή κυκλοφορίας" #, python-format msgid "" "\n" -" Deleting will irreversibly delete this release along with %(count)s " -"file.\n" +" Deleting will irreversibly delete this release along with " +"%(count)s file.\n" " " msgid_plural "" "\n" -" Deleting will irreversibly delete this release along with %(count)s " -"files.\n" +" Deleting will irreversibly delete this release along with " +"%(count)s files.\n" " " msgstr[0] "" "\n" -" Η διαγραφή αυτή θα διαγράψει χωρίς επιστροφή αυτή την έκδοση μαζί με " -"το αρχείο %(count)s.\n" +" Η διαγραφή αυτή θα διαγράψει χωρίς επιστροφή αυτή την έκδοση μαζί" +" με το αρχείο %(count)s.\n" " " msgstr[1] "" "\n" -" Η διαγραφή αυτή θα διαγράψει χωρίς επιστροφή αυτή την έκδοση μαζί με " -"τα αρχεία %(count)s.\n" +" Η διαγραφή αυτή θα διαγράψει χωρίς επιστροφή αυτή την έκδοση μαζί" +" με τα αρχεία %(count)s.\n" " " #: warehouse/templates/manage/release.html:135 @@ -2870,15 +2871,15 @@ msgstr "Διαγράφοντας αυτό θα διαγραφεί χωρίς ε #: warehouse/templates/manage/releases.html:91 #, python-format msgid "" -"You will not be able to re-upload a new distribution of the same type with " -"the same version number. Consider making a new release or a <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">post " -"release</a> instead." +"You will not be able to re-upload a new distribution of the same type " +"with the same version number. Consider making a new release or a <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">post release</a> instead." msgstr "" -"Δεν θα έχετε τη δυνατότητα να ξανά-ανεβάσετε μια νέα διανομή ίδιου τύπου με " -"τον ίδιο αριθμό έκδοσης. Σκεφτείτε να δημιουργήσετε μια νέα έκδοση ή μια <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">post έκδοση</a>." +"Δεν θα έχετε τη δυνατότητα να ξανά-ανεβάσετε μια νέα διανομή ίδιου τύπου " +"με τον ίδιο αριθμό έκδοσης. Σκεφτείτε να δημιουργήσετε μια νέα έκδοση ή " +"μια <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">post έκδοση</a>." #: warehouse/templates/manage/release.html:142 #: warehouse/templates/manage/releases.html:27 @@ -2960,13 +2961,13 @@ msgstr "Δεν βρέθηκαν εκδόσεις" #: warehouse/templates/manage/releases.html:109 #, python-format msgid "" -"Learn how to create a new release on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>" +"Learn how to create a new release on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" msgstr "" -"Μάθετε πως να δημιουργήσετε μια νέα έκδοση στο <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>" +"Μάθετε πως να δημιουργήσετε μια νέα έκδοση στο <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" #: warehouse/templates/manage/roles.html:18 #, python-format @@ -2979,8 +2980,8 @@ msgid "" "Use this page to control which PyPI users can help you to manage " "%(project_name)s" msgstr "" -"Χρησιμοποιήστε αυτή τη σελίδα για να ελέγξετε ποιοι χρήστες του PyPI μπορούν " -"να σας βοηθήσουν στη διαχείριση του %(project_name)s" +"Χρησιμοποιήστε αυτή τη σελίδα για να ελέγξετε ποιοι χρήστες του PyPI " +"μπορούν να σας βοηθήσουν στη διαχείριση του %(project_name)s" #: warehouse/templates/manage/roles.html:25 #: warehouse/templates/pages/help.html:509 @@ -2996,11 +2997,12 @@ msgstr "Συντηρητής" #: warehouse/templates/manage/roles.html:28 #: warehouse/templates/pages/help.html:510 msgid "" -"Can upload releases for a package. Cannot add collaborators. Cannot delete " -"files, releases, or the project." +"Can upload releases for a package. Cannot add collaborators. Cannot " +"delete files, releases, or the project." msgstr "" "Μπορεί να ανεβάζει εκδόσεις για ένα πακέτο. Δεν μπορεί να προσθέτει " -"συνεργάτες. Δεν μπορεί να διαγράφει αρχεία, εκδόσεις ή το ίδιο το project." +"συνεργάτες. Δεν μπορεί να διαγράφει αρχεία, εκδόσεις ή το ίδιο το " +"project." #: warehouse/templates/manage/roles.html:29 #: warehouse/templates/manage/roles.html:62 @@ -3081,27 +3083,31 @@ msgstr "Περιγραφή project και πλευρική στήλη" #: warehouse/templates/manage/settings.html:43 #, python-format msgid "" -"To set the '%(project_name)s' description, author, links, classifiers, and " -"other details for your next release, use the <a href=\"%(setup_args_href)s\" " -"rel=\"noopener\" target=\"_blank\"><code>setup()</code> arguments in your " -"<code>setup.py</code> file</a>. Updating these fields will not change the " -"metadata for past releases. Additionally, you <strong>must</strong> use <a " -"href=\"%(twine_docs_href)s\" rel=\"noopener\" target=\"_blank\">Twine</a> to " -"upload your files in order to get full support for these fields. See <a href=" -"\"%(distribution_href)s\" rel=\"noopener\" target=\"_blank\">the Python " -"Packaging User Guide</a> for more help." -msgstr "" -"Για να ορίσετε περιγραφή, κάτοχο, συνδέσμους, ταξινομητές (classifiers) και " -"άλλες λεπτομέρειες για την επόμενη έκδοση του '%(project_name)s', " -"χρησιμοποιήστε τις παραμέτρους της συνάρτησης <a href=\"%(setup_args_href)s" -"\" rel=\"noopener\" target=\"_blank\"><code>setup()</code> μέσα στο αρχείο " -"<code>setup.py</code> file</a>. Ενημερώνοντας αυτά τα πεδία, τα metadata των " -"παλαιότερων εκδόσεων δεν θα αλλάξουν. Επίσης, θα <strong>πρέπει</strong> να " -"χρησιμοποιήσετε το πακέτο <a href=\"%(twine_docs_href)s\" rel=\"noopener\" " -"target=\"_blank\">Twine</a> για να ανεβάσετε τα αρχεία σας προκειμένου να " -"έχετε υποστήριξη για αυτά τα πεδία. Δείτε στο <a href=\"%(distribution_href)s" -"\" rel=\"noopener\" target=\"_blank\">the Python Packaging User Guide</a> " -"για περισσότερες πληροφορίες." +"To set the '%(project_name)s' description, author, links, classifiers, " +"and other details for your next release, use the <a " +"href=\"%(setup_args_href)s\" rel=\"noopener\" " +"target=\"_blank\"><code>setup()</code> arguments in your " +"<code>setup.py</code> file</a>. Updating these fields will not change the" +" metadata for past releases. Additionally, you <strong>must</strong> use " +"<a href=\"%(twine_docs_href)s\" rel=\"noopener\" " +"target=\"_blank\">Twine</a> to upload your files in order to get full " +"support for these fields. See <a href=\"%(distribution_href)s\" " +"rel=\"noopener\" target=\"_blank\">the Python Packaging User Guide</a> " +"for more help." +msgstr "" +"Για να ορίσετε περιγραφή, κάτοχο, συνδέσμους, ταξινομητές (classifiers) " +"και άλλες λεπτομέρειες για την επόμενη έκδοση του '%(project_name)s', " +"χρησιμοποιήστε τις παραμέτρους της συνάρτησης <a " +"href=\"%(setup_args_href)s\" rel=\"noopener\" " +"target=\"_blank\"><code>setup()</code> μέσα στο αρχείο " +"<code>setup.py</code> file</a>. Ενημερώνοντας αυτά τα πεδία, τα metadata " +"των παλαιότερων εκδόσεων δεν θα αλλάξουν. Επίσης, θα " +"<strong>πρέπει</strong> να χρησιμοποιήσετε το πακέτο <a " +"href=\"%(twine_docs_href)s\" rel=\"noopener\" target=\"_blank\">Twine</a>" +" για να ανεβάσετε τα αρχεία σας προκειμένου να έχετε υποστήριξη για αυτά " +"τα πεδία. Δείτε στο <a href=\"%(distribution_href)s\" rel=\"noopener\" " +"target=\"_blank\">the Python Packaging User Guide</a> για περισσότερες " +"πληροφορίες." #: warehouse/templates/manage/settings.html:54 #: warehouse/templates/manage/settings.html:85 @@ -3115,11 +3121,11 @@ msgstr "Διαγράφοντας αυτό το project θα:" #: warehouse/templates/manage/settings.html:62 #, python-format msgid "" -"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s " -"release</a>" +"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s" +" release</a>" msgid_plural "" -"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s " -"releases</a>" +"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s" +" releases</a>" msgstr[0] "" "Διαγραφεί ανεπιστρεπτί το project μαζί με <a href=\"%(href)s\">%(count)s " "έκδοση</a>" @@ -3134,22 +3140,22 @@ msgstr "Διαγραφή project ανεπιστρεπτί" #: warehouse/templates/manage/settings.html:72 msgid "Make the project name available to <strong>any other PyPI</strong> user" msgstr "" -"Κάνε το όνομα του project διαθέσιμο σε <strong>οποιοδήποτε άλλον PyPI</" -"strong> χρήστη" +"Κάνε το όνομα του project διαθέσιμο σε <strong>οποιοδήποτε άλλον " +"PyPI</strong> χρήστη" #: warehouse/templates/manage/settings.html:74 msgid "" -"This user will be able to make new releases under this project name, so long " -"as the distribution filenames do not match filenames from a previously " -"released distribution (all PyPI distribution filenames are unique, as they " -"are generated by combining the project name + version number + distribution " -"type)" +"This user will be able to make new releases under this project name, so " +"long as the distribution filenames do not match filenames from a " +"previously released distribution (all PyPI distribution filenames are " +"unique, as they are generated by combining the project name + version " +"number + distribution type)" msgstr "" -"Αυτός ο χρήστης θα έχει τη δυνατότητα να δημιουργεί νέες εκδόσεις κάτω από " -"αυτό το όνομα, μόνο αν τα αρχεία της διανομής δεν είναι ίδια με μια " -"παλαιότερη διανομή (όλα τα αρχεία διανομών στο PyPI είναι μοναδικά, καθώς " -"δημιουργούνται συνδυάζοντας το όνομα του project + τον αριθμό έκδοσης + τον " -"τύπο της διανομής)" +"Αυτός ο χρήστης θα έχει τη δυνατότητα να δημιουργεί νέες εκδόσεις κάτω " +"από αυτό το όνομα, μόνο αν τα αρχεία της διανομής δεν είναι ίδια με μια " +"παλαιότερη διανομή (όλα τα αρχεία διανομών στο PyPI είναι μοναδικά, καθώς" +" δημιουργούνται συνδυάζοντας το όνομα του project + τον αριθμό έκδοσης + " +"τον τύπο της διανομής)" #: warehouse/templates/manage/settings.html:85 msgid "Project Name" @@ -3186,8 +3192,8 @@ msgstr "Project \"%(project)s\"" #: warehouse/templates/manage/token.html:44 msgid "" -"For security reasons this token will only appear once. <strong>Copy it now.</" -"strong>" +"For security reasons this token will only appear once. <strong>Copy it " +"now.</strong>" msgstr "" "Για λόγους ασφαλείας αυτό το token θα εμφανιστεί μόνο μια φορά. " "<strong>Αντιγράψτε το τώρα.</strong>" @@ -3216,21 +3222,22 @@ msgstr "Ορίστε το όνομα χρήστη σας σε <code>%(token)s</c #: warehouse/templates/manage/token.html:71 #, python-format msgid "" -"Set your password to the token value, including the <code>%(prefix)s</code> " -"prefix" +"Set your password to the token value, including the " +"<code>%(prefix)s</code> prefix" msgstr "" -"Ορίστε τον κωδικό χρήστη σας ως την τιμή στο token, συμπεριλαμβάνοντας το " -"πρόθεμα <code>%(prefix)s</code>" +"Ορίστε τον κωδικό χρήστη σας ως την τιμή στο token, συμπεριλαμβάνοντας το" +" πρόθεμα <code>%(prefix)s</code>" #: warehouse/templates/manage/token.html:77 #, python-format msgid "" -"For example, if you are using <a href=\"%(href)s\">Twine</a> to upload your " -"projects to PyPI, set up your <code>%(filename)s</code> file like this:" +"For example, if you are using <a href=\"%(href)s\">Twine</a> to upload " +"your projects to PyPI, set up your <code>%(filename)s</code> file like " +"this:" msgstr "" -"Για παράδειγμα, αν χρησιμοποιείτε το πακέτο <a href=\"%(href)s\">Twine</a> " -"για να ανεβάσετε τα projects σας στο PyPI, δημιουργήστε ένα αρχείο <code>" -"%(filename)s</code> με τα εξής περιεχόμενα:" +"Για παράδειγμα, αν χρησιμοποιείτε το πακέτο <a " +"href=\"%(href)s\">Twine</a> για να ανεβάσετε τα projects σας στο PyPI, " +"δημιουργήστε ένα αρχείο <code>%(filename)s</code> με τα εξής περιεχόμενα:" #: warehouse/templates/manage/token.html:87 #, python-format @@ -3239,17 +3246,17 @@ msgid "" "multiple projects to PyPI, you can set up your <code>%(filename)s</code> " "file like this:" msgstr "" -"Για παράδειγμα, αν χρησιμοποιείτε το πακέτο <a href=\"%(href)s\">Twine</a> " -"για να ανεβάσετε πολλά projects στο PyPI, δημιουργήστε ένα αρχείο <code>" -"%(filename)s</code> με τα εξής περιεχόμενα:" +"Για παράδειγμα, αν χρησιμοποιείτε το πακέτο <a " +"href=\"%(href)s\">Twine</a> για να ανεβάσετε πολλά projects στο PyPI, " +"δημιουργήστε ένα αρχείο <code>%(filename)s</code> με τα εξής περιεχόμενα:" #: warehouse/templates/manage/token.html:99 msgid "" -"either a user-scoped token or a project-scoped token you want to set as the " -"default" +"either a user-scoped token or a project-scoped token you want to set as " +"the default" msgstr "" -"ορίστε ένα προεπιλεγμένο token είτε με πεδίο εφαρμογής στον χρήστη είτε με " -"πεδίο εφαρμογής στο project" +"ορίστε ένα προεπιλεγμένο token είτε με πεδίο εφαρμογής στον χρήστη είτε " +"με πεδίο εφαρμογής στο project" #: warehouse/templates/manage/token.html:104 msgid "a project token" @@ -3267,11 +3274,11 @@ msgstr "" #: warehouse/templates/manage/token.html:112 #, python-format msgid "" -"For further instructions on how to use this token, <a href=\"%(href)s" -"\">visit the PyPI help page</a>." +"For further instructions on how to use this token, <a " +"href=\"%(href)s\">visit the PyPI help page</a>." msgstr "" -"Για περαιτέρω οδηγίες χρήσης του token, <a href=\"%(href)s\">επισκεφτείτε τη " -"σελίδα υποστήριξης του PyPI</a>." +"Για περαιτέρω οδηγίες χρήσης του token, <a href=\"%(href)s\">επισκεφτείτε" +" τη σελίδα υποστήριξης του PyPI</a>." #: warehouse/templates/manage/token.html:120 msgid "Add another token" @@ -3299,11 +3306,11 @@ msgstr "Project:" #: warehouse/templates/manage/token.html:163 msgid "" -"An API token scoped to your entire account will have upload permissions for " -"all of your current and future projects." +"An API token scoped to your entire account will have upload permissions " +"for all of your current and future projects." msgstr "" -"Ένα API token με πεδίο εφαρμογής ολόκληρο τον λογαριασμό σας, θα έχει άδειες " -"ανεβάσματος για όλα τα τωρινά καθώς και μελλοντικά projects σας." +"Ένα API token με πεδίο εφαρμογής ολόκληρο τον λογαριασμό σας, θα έχει " +"άδειες ανεβάσματος για όλα τα τωρινά καθώς και μελλοντικά projects σας." #: warehouse/templates/manage/token.html:166 msgid "Add token" @@ -3319,31 +3326,32 @@ msgstr "" #: warehouse/templates/manage/account/recovery_codes-provision.html:46 msgid "" -"If you lose access to your authentication application or security key(s), " -"you’ll need to use one of these recovery codes to log into your PyPI " +"If you lose access to your authentication application or security key(s)," +" you’ll need to use one of these recovery codes to log into your PyPI " "account. Each code can only be used <strong>once</strong>." msgstr "" #: warehouse/templates/manage/account/recovery_codes-provision.html:47 msgid "" -"These codes should <strong>only</strong> be used for account recovery, not " -"for typical logins." +"These codes should <strong>only</strong> be used for account recovery, " +"not for typical logins." msgstr "" #: warehouse/templates/manage/account/recovery_codes-provision.html:48 msgid "" -"<strong>Keep these somewhere safe</strong>. If you lose your authentication " -"application or security key(s) and do not have access to these recovery " -"codes, you may permanently lose access to your PyPI account!" +"<strong>Keep these somewhere safe</strong>. If you lose your " +"authentication application or security key(s) and do not have access to " +"these recovery codes, you may permanently lose access to your PyPI " +"account!" msgstr "" #: warehouse/templates/manage/account/recovery_codes-provision.html:52 msgid "Save your Recovery Codes" msgstr "" +# | msgid "Download files" #: warehouse/templates/manage/account/recovery_codes-provision.html:64 #, fuzzy -#| msgid "Download files" msgid "Download as file" msgstr "Κατέβασμα αρχείων" @@ -3368,13 +3376,13 @@ msgstr "Ρύθμιση 2FA με τη χρήση μιας εφαρμογής πι #: warehouse/templates/manage/account/totp-provision.html:32 #, python-format msgid "" -"PyPI supports any application that follows the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based " -"one-time password\">TOTP</abbr> standard</a>." +"PyPI supports any application that follows the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title" +"=\"time-based one-time password\">TOTP</abbr> standard</a>." msgstr "" -"Το PyPI υποστηρίζει κάθε εφαρμογή που ακολουθά το <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based " -"one-time password\">TOTP</abbr> στάνταρ</a>." +"Το PyPI υποστηρίζει κάθε εφαρμογή που ακολουθά το <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title" +"=\"time-based one-time password\">TOTP</abbr> στάνταρ</a>." #: warehouse/templates/manage/account/totp-provision.html:36 #, python-format @@ -3382,8 +3390,8 @@ msgid "" "Visit <a href=\"%(href)s\">PyPI's help page</a> for a list of compatible " "applications." msgstr "" -"Επισκεφτείτε <a href=\"%(href)s\">τη σελίδα βοήθειας του PyPI</a> για μια " -"λίστα από συμβατές εφαρμογές." +"Επισκεφτείτε <a href=\"%(href)s\">τη σελίδα βοήθειας του PyPI</a> για μια" +" λίστα από συμβατές εφαρμογές." #: warehouse/templates/manage/account/totp-provision.html:42 msgid "Set up your application" @@ -3391,16 +3399,15 @@ msgstr "Ρύθμιση της εφαρμογής σας" #: warehouse/templates/manage/account/totp-provision.html:45 msgid "Scan the QR code with the authentication application of your choice." -msgstr "" -"Σκανάρετε τον κώδικα QR με την εφαρμογή πιστοποίησης της αρέσκείας σας." +msgstr "Σκανάρετε τον κώδικα QR με την εφαρμογή πιστοποίησης της αρέσκείας σας." #: warehouse/templates/manage/account/totp-provision.html:46 msgid "" -"For security reasons, you can only associate one authentication application " -"per PyPI account." +"For security reasons, you can only associate one authentication " +"application per PyPI account." msgstr "" -"Για λόγος ασφαλείας, μπορείτε να συνδέσετε μόνο μια εφαρμογή πιστοποίησης " -"ανά PyPI λογαριασμό." +"Για λόγος ασφαλείας, μπορείτε να συνδέσετε μόνο μια εφαρμογή πιστοποίησης" +" ανά PyPI λογαριασμό." #: warehouse/templates/manage/account/totp-provision.html:52 msgid "QR code for setting up an authentication application" @@ -3422,8 +3429,8 @@ msgstr "Κωδικός πιστοποίησης" #: warehouse/templates/manage/account/totp-provision.html:73 msgid "" -"To finalize the set up process, enter the authentication code provided by " -"your application." +"To finalize the set up process, enter the authentication code provided by" +" your application." msgstr "" "Για να οριστικοποιήσετε τη διαδικασία ρύθμισης, εισάγετε τον κωδικό " "πιστοποίησης που παρέχει η εφαρμογή σας." @@ -3439,26 +3446,26 @@ msgstr "Ρύθμιση 2FA με μια συσκευή ασφάλειας (πχ U #: warehouse/templates/manage/account/webauthn-provision.html:26 #, python-format msgid "" -"PyPI supports any device that adheres to the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." +"PyPI supports any device that adheres to the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." msgstr "" -"Το PyPI υποστηρίζει κάθε συσκευή που εμμένει στο <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO στάνταρ</a>." +"Το PyPI υποστηρίζει κάθε συσκευή που εμμένει στο <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO στάνταρ</a>." #: warehouse/templates/manage/account/webauthn-provision.html:28 #, python-format msgid "" -"Popular <em>USB keys</em> include <a href=\"%(yubico_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=" -"\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Google Titan</a> and <a href=\"%(thetis_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Thetis</a>." +"Popular <em>USB keys</em> include <a href=\"%(yubico_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> and <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." msgstr "" -"Γνωστά <em>USB keys</em> περιλαμβάνουν τα <a href=\"%(yubico_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=" -"\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Google Titan</a> και <a href=\"%(thetis_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Thetis</a>." +"Γνωστά <em>USB keys</em> περιλαμβάνουν τα <a href=\"%(yubico_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> και <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." #: warehouse/templates/manage/account/webauthn-provision.html:43 msgid "Name your device to begin" @@ -3483,24 +3490,25 @@ msgstr "Ρύθμιση συσκευής ασφάλειας" #: warehouse/templates/manage/account/webauthn-provision.html:74 #, python-format msgid "" -"<strong>Not working?</strong> Check you're using a device that follows the " -"<a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">FIDO specification</a> and a <a href=\"%(mozilla_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">compatible browser</a>." +"<strong>Not working?</strong> Check you're using a device that follows " +"the <a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">FIDO specification</a> and a <a " +"href=\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">compatible browser</a>." msgstr "" -"<strong>Δεν δουλεύει;</strong> Ελέγξτε ότι χρησιμοποιείτε μια συσκευή που " -"ακολουθεί τις <a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">FIDO προδιαγραφές</a> καθώς και έναν <a href=" -"\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">συμβατό περιηγητή</a>." +"<strong>Δεν δουλεύει;</strong> Ελέγξτε ότι χρησιμοποιείτε μια συσκευή που" +" ακολουθεί τις <a href=\"%(fido_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">FIDO προδιαγραφές</a> καθώς και έναν " +"<a href=\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">συμβατό περιηγητή</a>." #: warehouse/templates/manage/account/webauthn-provision.html:78 msgid "" -"Note that some older USB keys do not adhere to the FIDO standard and will " -"not work with PyPI." +"Note that some older USB keys do not adhere to the FIDO standard and will" +" not work with PyPI." msgstr "" -"Σημειώστε ότι κάποια παλιά USB keys δεν είναι συμβατά με το FIDO στάνταρ και " -"δεν θα δουλέψουν με το PyPI." +"Σημειώστε ότι κάποια παλιά USB keys δεν είναι συμβατά με το FIDO στάνταρ " +"και δεν θα δουλέψουν με το PyPI." #: warehouse/templates/packaging/detail.html:94 msgid "Copy PIP instructions" @@ -3520,9 +3528,9 @@ msgstr "Νέα έκδοση διαθέσιμη (%(version)s)" msgid "Latest version" msgstr "Τελευταία έκδοση" +# | msgid "Last released: %(release_date)s" #: warehouse/templates/packaging/detail.html:115 #, fuzzy, python-format -#| msgid "Last released: %(release_date)s" msgid "Released: %(release_date)s" msgstr "Τελευταία εκδόθηκε: %(release_date)s" @@ -3576,7 +3584,8 @@ msgstr "Κατέβασμα αρχείων" #: warehouse/templates/packaging/detail.html:180 msgid "Project details. Focus will be moved to the project details." msgstr "" -"Λεπτομέρειες project. Η εστίαση θα μεταφερθεί στις λεπτομέρειες του ptoject." +"Λεπτομέρειες project. Η εστίαση θα μεταφερθεί στις λεπτομέρειες του " +"ptoject." #: warehouse/templates/packaging/detail.html:182 #: warehouse/templates/packaging/detail.html:218 @@ -3603,12 +3612,13 @@ msgstr "προ-έκδοση" #, python-format msgid "" "Download the file for your platform. If you're not sure which to choose, " -"learn more about <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">installing packages</a>." +"learn more about <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">installing packages</a>." msgstr "" -"Κατεβάστε το αρχείο για την πλατφόρμα σας. Αν δεν ξέρετε ποιο να διαλέξετε, " -"μάθετε περισσότερα στη σελίδα <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">εγκατάσταση πακέτων</a>." +"Κατεβάστε το αρχείο για την πλατφόρμα σας. Αν δεν ξέρετε ποιο να " +"διαλέξετε, μάθετε περισσότερα στη σελίδα <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">εγκατάσταση " +"πακέτων</a>." #: warehouse/templates/packaging/detail.html:273 #, python-format @@ -3627,40 +3637,41 @@ msgstr "Hashes" #: warehouse/templates/pages/classifiers.html:22 msgid "" -"Each project's maintainers provide PyPI with a list of \"trove classifiers\" " -"to categorize each release, describing who it's for, what systems it can run " -"on, and how mature it is." +"Each project's maintainers provide PyPI with a list of \"trove " +"classifiers\" to categorize each release, describing who it's for, what " +"systems it can run on, and how mature it is." msgstr "" "Όλοι οι συντηρητές των projects παρέχουν στο PyPI μια λίστα με \"trove " -"classifiers\" ούτως ώστε να κατηγοριοπηθεί κάθε έκδοση, περιγράφοντας για " -"ποιον είναι, πάνω σε ποια συστήματα τρέχει και κατά πόσο ώριμη είναι." +"classifiers\" ούτως ώστε να κατηγοριοπηθεί κάθε έκδοση, περιγράφοντας για" +" ποιον είναι, πάνω σε ποια συστήματα τρέχει και κατά πόσο ώριμη είναι." #: warehouse/templates/pages/classifiers.html:23 msgid "" -"These standardized classifiers can then be used by community members to find " -"projects based on their desired criteria." +"These standardized classifiers can then be used by community members to " +"find projects based on their desired criteria." msgstr "" "Αυτοί οι στάνταρ, πλέον, ταξινομητές (classifiers) μπορούν να " -"χρησιμοποιηθούν από τα μέλη της κοινότητας για αναζήτηση projects ανάλογα τα " -"επιθυμητά κριτήρια." +"χρησιμοποιηθούν από τα μέλη της κοινότητας για αναζήτηση projects ανάλογα" +" τα επιθυμητά κριτήρια." #: warehouse/templates/pages/classifiers.html:25 #, python-format msgid "" -"Instructions for how to add trove classifiers to a project can be found on " -"the <a href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging User Guide</a>. To read the original " -"classifier specification, refer to <a href=\"%(pep301_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python " -"enhancement proposal\">PEP</abbr> 301</a>." +"Instructions for how to add trove classifiers to a project can be found " +"on the <a href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>. To read the original " +"classifier specification, refer to <a href=\"%(pep301_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 301</a>." msgstr "" "Για περισσότερες πληροφορίες σχετικά με το πως να προσθέτετε trove " -"classifiers σε ένα project, μπορείτε να βρείτε στο <a href=\"%(ppug_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>. Για να διαβάσετε την πρωτότυπη προδιαγραφή για έναν ταξινομητή " -"αναφερθείτε στο <a href=\"%(pep301_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\"><abbr title=\"Python enhancement proposal\">PEP</" -"abbr> 301</a>." +"classifiers σε ένα project, μπορείτε να βρείτε στο <a " +"href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>. Για να διαβάσετε την " +"πρωτότυπη προδιαγραφή για έναν ταξινομητή αναφερθείτε στο <a " +"href=\"%(pep301_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><abbr title=\"Python enhancement proposal\">PEP</abbr> " +"301</a>." #: warehouse/templates/pages/classifiers.html:31 msgid "List of classifiers" @@ -3674,35 +3685,37 @@ msgstr "Σημείωση:" #: warehouse/templates/pages/help.html:20 #, python-format msgid "" -"All users submitting feedback, reporting issues or contributing to Warehouse " -"are expected to follow the <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">PyPA Code of Conduct</a>." +"All users submitting feedback, reporting issues or contributing to " +"Warehouse are expected to follow the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPA Code of " +"Conduct</a>." msgstr "" -"Όλοι οι χρήστες που στέλνουν feedback, αναφέρουν θέματα ή συνεισφέρουν στο " -"Warehouse θα πρέπει να ακολουθούν τον <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">κώδικα δεοντολογίας του PyPA</a>." +"Όλοι οι χρήστες που στέλνουν feedback, αναφέρουν θέματα ή συνεισφέρουν " +"στο Warehouse θα πρέπει να ακολουθούν τον <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">κώδικα " +"δεοντολογίας του PyPA</a>." #: warehouse/templates/pages/help.html:31 #, python-format msgid "" "If you lose your %(method)s and can no longer log in, you may " "<strong>permanently lose access to your account</strong>. You should " -"generate and securely store <a href=\"#recoverycodes\">recovery codes</a> to " -"regain access in that event.." +"generate and securely store <a href=\"#recoverycodes\">recovery codes</a>" +" to regain access in that event.." msgstr "" #: warehouse/templates/pages/help.html:37 msgid "" -"We recommend that all PyPI users set up <em>at least two</em> supported two " -"factor authentication methods and provision <a href=\"#recoverycodes" -"\">recovery codes</a>." +"We recommend that all PyPI users set up <em>at least two</em> supported " +"two factor authentication methods and provision <a " +"href=\"#recoverycodes\">recovery codes</a>." msgstr "" #: warehouse/templates/pages/help.html:43 msgid "" -"If you've lost access to all two factor methods for your account and do not " -"have <a href=\"#recoverycodes\">recovery codes</a>, you can request help <a " -"href=\"#account-recovery\">with account recovery</a>." +"If you've lost access to all two factor methods for your account and do " +"not have <a href=\"#recoverycodes\">recovery codes</a>, you can request " +"help <a href=\"#account-recovery\">with account recovery</a>." msgstr "" #: warehouse/templates/pages/help.html:52 @@ -3731,18 +3744,17 @@ msgstr "Γιατί το PyPI μου λέει ότι ο κωδικός χρήστ #: warehouse/templates/pages/help.html:59 msgid "What is two factor authentication and how does it work on PyPI?" -msgstr "" -"Τι είναι η πιστοποίηση δυο-παραγόντων (2FA) και πως δουλεύει με το PyPI;" +msgstr "Τι είναι η πιστοποίηση δυο-παραγόντων (2FA) και πως δουλεύει με το PyPI;" #: warehouse/templates/pages/help.html:60 msgid "" -"How does two factor authentication with an authentication application (<abbr " -"title=\"time-based one-time password\">TOTP</abbr>) work? How do I set it up " -"on PyPI?" +"How does two factor authentication with an authentication application " +"(<abbr title=\"time-based one-time password\">TOTP</abbr>) work? How do I" +" set it up on PyPI?" msgstr "" "Πως δουλεύουν μεταξύ τους η πιστοποίηση δυο-παραγόντων με την εφαρμογή " -"πιστοποίησης (<abbr title=\"time-based one-time password\">TOTP</abbr>); Πως " -"το ρυθμίζω στο PyPI;" +"πιστοποίησης (<abbr title=\"time-based one-time password\">TOTP</abbr>); " +"Πως το ρυθμίζω στο PyPI;" #: warehouse/templates/pages/help.html:61 msgid "" @@ -3758,14 +3770,15 @@ msgstr "" "Ποιες συσκευές (πέρα από ένα USB key) μπορώ να χρησιμοποιήσω ως συσκευή " "ασφάλειας;" +# | msgid "" +# | "How does two factor authentication with a security device (e.g. USB key) +# " +# | "work? How do I set it up on PyPI?" #: warehouse/templates/pages/help.html:63 #, fuzzy -#| msgid "" -#| "How does two factor authentication with a security device (e.g. USB key) " -#| "work? How do I set it up on PyPI?" msgid "" -"How does two factor authentication with a recovery code work? How do I set " -"it up on PyPI?" +"How does two factor authentication with a recovery code work? How do I " +"set it up on PyPI?" msgstr "" "Πως δουλεύουν μεταξύ τους η πιστοποίηση δυο-παραγόντων με μια συσκευή " "ασφάλειας (πχ USB key); Πως το ρυθμίζω στο PyPI;" @@ -3788,34 +3801,35 @@ msgstr "Πως ενημερώνομαι όταν μια νέα έκδοση εν #: warehouse/templates/pages/help.html:69 msgid "" -"Where can I see statistics about PyPI, downloads, and project/package usage?" +"Where can I see statistics about PyPI, downloads, and project/package " +"usage?" msgstr "" -"Που μπορώ να δω στατιστικά σχετικά με το PyPI, τα downloads και τη χρήση του " -"project/πακέτου;" +"Που μπορώ να δω στατιστικά σχετικά με το PyPI, τα downloads και τη χρήση " +"του project/πακέτου;" #: warehouse/templates/pages/help.html:71 msgid "I forgot my PyPI password. Can you help me?" msgstr "Ξέχασα τον κωδικό χρήστη του PyPI. Μπορείτε να με βοηθήσετε;" +# | msgid "I forgot my PyPI password. Can you help me?" #: warehouse/templates/pages/help.html:72 #, fuzzy -#| msgid "I forgot my PyPI password. Can you help me?" msgid "I've lost access to my PyPI account. Can you help me?" msgstr "Ξέχασα τον κωδικό χρήστη του PyPI. Μπορείτε να με βοηθήσετε;" #: warehouse/templates/pages/help.html:73 msgid "" -"Why am I getting a \"Invalid or non-existent authentication information.\" " -"error when uploading files?" +"Why am I getting a \"Invalid or non-existent authentication " +"information.\" error when uploading files?" msgstr "" #: warehouse/templates/pages/help.html:74 msgid "" -"Why am I getting \"No matching distribution found\" or \"Could not fetch URL" -"\" errors during <code>pip install</code>?" +"Why am I getting \"No matching distribution found\" or \"Could not fetch " +"URL\" errors during <code>pip install</code>?" msgstr "" -"Γιατί εμφανίζονται τα σφάλματα \"No matching distribution found\" ή \"Could " -"not fetch URL\" κατά τη διάρκεια του <code>pip install</code>;" +"Γιατί εμφανίζονται τα σφάλματα \"No matching distribution found\" ή " +"\"Could not fetch URL\" κατά τη διάρκεια του <code>pip install</code>;" #: warehouse/templates/pages/help.html:75 msgid "I am having trouble using the PyPI website. Can you help me?" @@ -3824,8 +3838,7 @@ msgstr "" "βοηθήσετε;" #: warehouse/templates/pages/help.html:76 -msgid "" -"Why can't I manually upload files to PyPI, through the browser interface?" +msgid "Why can't I manually upload files to PyPI, through the browser interface?" msgstr "" "Γιατί δεν μπορώ να ανεβάσω χειροκίνητα αρχεία στο PyPI, μέσα από το " "interface του περιηγητή;" @@ -3846,8 +3859,8 @@ msgstr "" #: warehouse/templates/pages/help.html:81 msgid "" -"Why am I getting a \"Filename or contents already exists\" or \"Filename has " -"been previously used\" error?" +"Why am I getting a \"Filename or contents already exists\" or \"Filename " +"has been previously used\" error?" msgstr "" "Γιατί εμφανίζονται τα σφάλματα \"Filename or contents already exists\" ή " "\"Filename has been previously used\";" @@ -3859,16 +3872,16 @@ msgstr "Γιατί δεν είναι διαθέσιμο το επιθυμητό #: warehouse/templates/pages/help.html:83 msgid "How do I claim an abandoned or previously registered project name?" msgstr "" -"Πως μπορώ να διεκδικήσω ένα εγκαταλελειμμένο ή πρότερα εγγεγραμμένο όνομα " -"project;" +"Πως μπορώ να διεκδικήσω ένα εγκαταλελειμμένο ή πρότερα εγγεγραμμένο όνομα" +" project;" #: warehouse/templates/pages/help.html:84 msgid "What collaborator roles are available for a project on PyPI?" msgstr "Ποιοι ρόλοι συνεργατών είναι διαθέσιμοι για ένα project στο PyPI;" +# | msgid "How do I become a owner/maintainer of a project on PyPI?" #: warehouse/templates/pages/help.html:85 #, fuzzy -#| msgid "How do I become a owner/maintainer of a project on PyPI?" msgid "How do I become an owner/maintainer of a project on PyPI?" msgstr "Πως γίνομαι κάτοχος/συντηρητής ενός project στο PyPI;" @@ -3906,11 +3919,11 @@ msgstr "Πως μπορώ να συμβαδίζω με τις επερχόμεν #: warehouse/templates/pages/help.html:95 msgid "" -"What does the \"beta feature\" badge mean? What are Warehouse's current beta " -"features?" +"What does the \"beta feature\" badge mean? What are Warehouse's current " +"beta features?" msgstr "" -"Τι σημαίνει το σήμα \"beta feature\"; Ποια είναι τα τωρινά beta features του " -"Warehouse;" +"Τι σημαίνει το σήμα \"beta feature\"; Ποια είναι τα τωρινά beta features " +"του Warehouse;" #: warehouse/templates/pages/help.html:96 msgid "How do I pronounce \"PyPI\"?" @@ -3954,86 +3967,89 @@ msgstr "Σχετικά" msgid "" "\n" " <p>We use a number of terms to describe software available on " -"PyPI, like \"project\", \"release\", \"file\", and \"package\". Sometimes " -"those terms are confusing because they're used to describe different things " -"in other contexts. Here's how we use them on PyPI:</p>\n" -" <p>A \"project\" on PyPI is the name of a collection of releases " -"and files, and information about them. Projects on PyPI are made and shared " -"by other members of the Python community so that you can use them.</p>\n" -" <p>A \"release\" on PyPI is a specific version of a project. For " -"example, the <a href=\"%(requests_href)s\">requests</a> project has many " -"releases, like \"requests 2.10\" and \"requests 1.2.1\". A release consists " -"of one or more \"files\".</p>\n" -" <p>A \"file\", also known as a \"package\", on PyPI is something " -"that you can download and install. Because of different hardware, operating " -"systems, and file formats, a release may have several files (packages), like " -"an archive containing source code or a binary <a href=\"%(wheel_href)s" -"\">wheel</a>.</p>\n" +"PyPI, like \"project\", \"release\", \"file\", and \"package\". Sometimes" +" those terms are confusing because they're used to describe different " +"things in other contexts. Here's how we use them on PyPI:</p>\n" +" <p>A \"project\" on PyPI is the name of a collection of " +"releases and files, and information about them. Projects on PyPI are made" +" and shared by other members of the Python community so that you can use " +"them.</p>\n" +" <p>A \"release\" on PyPI is a specific version of a project. " +"For example, the <a href=\"%(requests_href)s\">requests</a> project has " +"many releases, like \"requests 2.10\" and \"requests 1.2.1\". A release " +"consists of one or more \"files\".</p>\n" +" <p>A \"file\", also known as a \"package\", on PyPI is " +"something that you can download and install. Because of different " +"hardware, operating systems, and file formats, a release may have several" +" files (packages), like an archive containing source code or a binary <a " +"href=\"%(wheel_href)s\">wheel</a>.</p>\n" " " msgstr "" "\n" " <p>Χρησιμοποιούμε διάφορους ορισμούς για να περιγράψουμε το " -"διαθέσιμο λογισμικό στο PyPI, όπως \"project\", \"έκδοση\", \"αρχείο\" και " -"\"πακέτο\". Μερικές φορές αυτές οι έννοιες συγχέονται επειδή συνήθως " +"διαθέσιμο λογισμικό στο PyPI, όπως \"project\", \"έκδοση\", \"αρχείο\" " +"και \"πακέτο\". Μερικές φορές αυτές οι έννοιες συγχέονται επειδή συνήθως " "χρησιμοποιούνται για την περιγραφή άλλων πραγμάτων όταν μιλάμε για άλλα " "πράγματα. Στο PyPI τους χρησιμοποιούμε ως εξής:</p>\n" " <p>Ένα \"project\" στο PyPI είναι ένα όνομα μιας συλλογής από " -"εκδόσεις και αρχεία καθώς και πληροφορίες σχετικά με αυτά. Τα projects στο " -"PyPI δημιουργούνται και μοιράζονται από άλλα μέλη της Python κοινότητας " -"ούτως ώστε εσείς να μπορείτε να τα χρησιμοποιείτε.</p>\n" +"εκδόσεις και αρχεία καθώς και πληροφορίες σχετικά με αυτά. Τα projects " +"στο PyPI δημιουργούνται και μοιράζονται από άλλα μέλη της Python " +"κοινότητας ούτως ώστε εσείς να μπορείτε να τα χρησιμοποιείτε.</p>\n" " <p>Μια \"έκδοση\" στο PyPI είναι μια συγκεκριμένη έκδοση ενός " -"project. Για παράδειγμα, το project <a href=\"%(requests_href)s\">requests</" -"a> έχει πολλές εκδόσεις, όπως \"requests 2.10\" και\"requests 1.2.1\". Μια " -"έκδοση αποτελείται από ένα ή περισσότερα \"αρχεία\".</p>\n" -" <p>Ένα \"αρχείο\", γνωστό και ως \"πακέτο\", στο PyPI είναι κάτι " -"που μπορείτε να κατεβάσετε και να εγκαταστήσετε. Λόγω των διαφορετικών " -"hardware, λειτουργικών συστημάτων και μορφή αρχείων, μια έκδοση μπορεί να " -"έχει πολλαπλά αρχεία (πακέτα), όπως ένα archive που περιέχει τον πηγαίο " -"κώδικα ή το binary <a href=\"%(wheel_href)s\">wheel</a>.</p>\n" +"project. Για παράδειγμα, το project <a " +"href=\"%(requests_href)s\">requests</a> έχει πολλές εκδόσεις, όπως " +"\"requests 2.10\" και\"requests 1.2.1\". Μια έκδοση αποτελείται από ένα ή" +" περισσότερα \"αρχεία\".</p>\n" +" <p>Ένα \"αρχείο\", γνωστό και ως \"πακέτο\", στο PyPI είναι " +"κάτι που μπορείτε να κατεβάσετε και να εγκαταστήσετε. Λόγω των " +"διαφορετικών hardware, λειτουργικών συστημάτων και μορφή αρχείων, μια " +"έκδοση μπορεί να έχει πολλαπλά αρχεία (πακέτα), όπως ένα archive που " +"περιέχει τον πηγαίο κώδικα ή το binary <a " +"href=\"%(wheel_href)s\">wheel</a>.</p>\n" " " #: warehouse/templates/pages/help.html:194 #, python-format msgid "" -"To learn how to install a file from PyPI, visit the <a href=" -"\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">installation tutorial</a> on the <a href=\"%(user_guide_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " -"User Guide</a>." +"To learn how to install a file from PyPI, visit the <a " +"href=\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">installation tutorial</a> on the <a " +"href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" -"Για να μέθετε πων να εγκταστείσετε ένα αρχείο από το PyPI, επισκεφτείτε τον " -"<a href=\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">οδηγό εγκατάστασης</a> στη σελίδα του <a href=" -"\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Python Packaging User Guide</a>." +"Για να μέθετε πων να εγκταστείσετε ένα αρχείο από το PyPI, επισκεφτείτε " +"τον <a href=\"%(installation_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">οδηγό εγκατάστασης</a> στη σελίδα του " +"<a href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>." #: warehouse/templates/pages/help.html:201 #, python-format msgid "" -"For full instructions on configuring, packaging and distributing your Python " -"project, refer to the <a href=\"%(packaging_tutorial_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">packaging tutorial</a> on " -"the <a href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Python Packaging User Guide</a>." +"For full instructions on configuring, packaging and distributing your " +"Python project, refer to the <a href=\"%(packaging_tutorial_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">packaging " +"tutorial</a> on the <a href=\"%(user_guide_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" -"Για πλήρεις οδηγίες σχετικά με την ρύθμιση, το πακετάρισμα και τη διανομή " -"του Python project σας, αναφερθείτε στον <a href=" -"\"%(packaging_tutorial_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">οδηγό εγκατάστασης</a> στη σελίδα του <a href=" -"\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Python Packaging User Guide</a>." +"Για πλήρεις οδηγίες σχετικά με την ρύθμιση, το πακετάρισμα και τη διανομή" +" του Python project σας, αναφερθείτε στον <a " +"href=\"%(packaging_tutorial_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">οδηγό εγκατάστασης</a> στη σελίδα του " +"<a href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>." #: warehouse/templates/pages/help.html:208 #, python-format msgid "" -"Classifiers are used to categorize projects on PyPI. See <a href=\"%(href)s" -"\">the classifiers page</a> for more information, as well as a list of valid " -"classifiers." +"Classifiers are used to categorize projects on PyPI. See <a " +"href=\"%(href)s\">the classifiers page</a> for more information, as well " +"as a list of valid classifiers." msgstr "" "Οι ταξινομητές (classifiers) είναι απλά strings (κείμενο) και " "χρησιμοποιούνται για την κατηγοριοποίηση των projects στο PyPI. Για " -"περισσότερες πληροφορίες καθώς και για μια λίστα από έγκυρους classifiers, " -"δείτε στη <a href=\"%(href)s\">σελίδα των classifiers</a>." +"περισσότερες πληροφορίες καθώς και για μια λίστα από έγκυρους " +"classifiers, δείτε στη <a href=\"%(href)s\">σελίδα των classifiers</a>." #: warehouse/templates/pages/help.html:215 msgid "My account" @@ -4041,11 +4057,11 @@ msgstr "Ο λογαριασμός μου" #: warehouse/templates/pages/help.html:218 msgid "" -"Currently, PyPI requires a verified email address to perform the following " -"operations:" +"Currently, PyPI requires a verified email address to perform the " +"following operations:" msgstr "" -"Προς το παρόν, το PyPI απαιτεί μια επιβεβαιωμένη διεύθυνση email προκειμένου " -"να εκτελέσει τις ακόλουθες ενέργειες:" +"Προς το παρόν, το PyPI απαιτεί μια επιβεβαιωμένη διεύθυνση email " +"προκειμένου να εκτελέσει τις ακόλουθες ενέργειες:" #: warehouse/templates/pages/help.html:220 msgid "Register a new project." @@ -4057,8 +4073,8 @@ msgstr "Ανέβασμα μιας καινούργιας έκδοσης ή αρ #: warehouse/templates/pages/help.html:223 msgid "" -"The list of activities that require a verified email address is likely to " -"grow over time." +"The list of activities that require a verified email address is likely to" +" grow over time." msgstr "" "Η λίστα με τις ενέργειες που απαιτούν επιβεβαιωμένη διεύθυνση email " "ενδέχεται να μεγαλώσει με τον καιρό." @@ -4066,78 +4082,82 @@ msgstr "" #: warehouse/templates/pages/help.html:224 #, python-format msgid "" -"This policy will allow us to enforce a key policy of <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python " -"enhancement proposal\">PEP</abbr> 541</a> regarding maintainer reachability. " -"It also reduces the viability of spam attacks to create many accounts in an " -"automated fashion." +"This policy will allow us to enforce a key policy of <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 541</a> regarding " +"maintainer reachability. It also reduces the viability of spam attacks to" +" create many accounts in an automated fashion." msgstr "" -"Αυτή η πολιτική θα μας επιτρέψει να επιβάλουμε την πολιτική κλειδιού του <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><abbr title=\"Python enhancement proposal\">PEP</abbr> 541</a> όσον αφορά " -"την προσβασιμότητα του διατηρητή. Επίσης, ελαττώνει τις επιθέσεις spam " -"αυτόματης δημιουργίας πολλαπλών λογαριασμών." +"Αυτή η πολιτική θα μας επιτρέψει να επιβάλουμε την πολιτική κλειδιού του " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><abbr title=\"Python enhancement proposal\">PEP</abbr> " +"541</a> όσον αφορά την προσβασιμότητα του διατηρητή. Επίσης, ελαττώνει " +"τις επιθέσεις spam αυτόματης δημιουργίας πολλαπλών λογαριασμών." #: warehouse/templates/pages/help.html:225 #, python-format msgid "" -"You can manage your account's email addresses in your <a href=\"%(href)s" -"\">account settings</a>. This also allows for sending a new confirmation " -"email for users who signed up in the past, before we began enforcing this " -"policy." +"You can manage your account's email addresses in your <a " +"href=\"%(href)s\">account settings</a>. This also allows for sending a " +"new confirmation email for users who signed up in the past, before we " +"began enforcing this policy." msgstr "" -"Μπορείτε να διαχειριστείτε τις διευθύνσεις email του λογαριασμού σας μέσα " -"από τις <a href=\"%(href)s\">ρυθμίσεις λογαριασμού</a>. Αυτό, επίσης, " +"Μπορείτε να διαχειριστείτε τις διευθύνσεις email του λογαριασμού σας μέσα" +" από τις <a href=\"%(href)s\">ρυθμίσεις λογαριασμού</a>. Αυτό, επίσης, " "επιτρέπει την αποστολή νέων email επιβεβαίωσης για τους χρήστες που " -"εγγράφηκαν στο παρελθόν προτού ξεκινήσουμε να επιβάλλουμε αυτή την πολιτική." +"εγγράφηκαν στο παρελθόν προτού ξεκινήσουμε να επιβάλλουμε αυτή την " +"πολιτική." #: warehouse/templates/pages/help.html:228 #, python-format msgid "" -"<p> PyPI itself has not suffered a breach. This is a protective measure to " -"reduce the risk of <a href=\"%(credential_stuffing_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">credential stuffing</a> attacks " -"against PyPI and its users. </p> <p> Each time a user supplies a password — " -"while registering, authenticating, or updating their password — PyPI " -"securely checks whether that password has appeared in public data breaches. " -"</p> <p> During each of these processes, PyPI generates a SHA-1 hash of the " -"supplied password and uses the first five (5) characters of the hash to " -"check the <a href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Have I Been Pwned API</a> and determine if the " -"password has been previously compromised. The plaintext password is never " -"stored by PyPI or submitted to the Have I Been Pwned API. </p> <p> PyPI will " -"not allow such passwords to be used when setting a password at registration " -"or updating your password. </p> <p> If you receive an error message saying " -"that \"This password appears in a breach or has been compromised and cannot " -"be used\", you should change it all other places that you use it as soon as " -"possible. </p> <p> If you have received this error while attempting to log " -"in or upload to PyPI, then your password has been reset and you cannot log " -"in to PyPI until you <a href=\"%(reset_pwd_href)s\">reset your password</a>. " -"</p>" -msgstr "" -"<p> Το ίδιο το PyPI δεν υπέστη παραβίαση. Αυτό αποτελεί ένα μέτρο ασφάλειας " -"για την ελάττωση του ρίσκου επιθέσεων <a href=\"%(credential_stuffing_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">credential " -"stuffing</a> ενάντια στο PyPI και τους χρήστες του. </p> <p> Κάθε φορά που " -"ένας χρήστης παρέχει έναν κωδικό — κατά τη διάρκεια εγγραφής, πιστοποίησης ή " -"αλλαγής κωδικού — το PyPI ελέγχει με ασφάλεια αν ο κωδικός αυτός έχει " -"εμφανιστεί ή όχι σε δημόσιες παραβιάσεις δεδομένων. </p> <p> Κατά τη " -"διάρκεια αυτών των διεργασιών, το PyPI δημιουργεί από τον δοσμένο κωδικό ένα " -"hash SHA-1 και χρησιμοποιεί τους πέντε (5) πρώτους χαρακτήρες του hash για " -"να ελέγξει στο <a href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" " +"<p> PyPI itself has not suffered a breach. This is a protective measure " +"to reduce the risk of <a href=\"%(credential_stuffing_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">credential " +"stuffing</a> attacks against PyPI and its users. </p> <p> Each time a " +"user supplies a password — while registering, authenticating, or updating" +" their password — PyPI securely checks whether that password has appeared" +" in public data breaches. </p> <p> During each of these processes, PyPI " +"generates a SHA-1 hash of the supplied password and uses the first five " +"(5) characters of the hash to check the <a " +"href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Have I Been Pwned API</a> and determine if the password " +"has been previously compromised. The plaintext password is never stored " +"by PyPI or submitted to the Have I Been Pwned API. </p> <p> PyPI will not" +" allow such passwords to be used when setting a password at registration " +"or updating your password. </p> <p> If you receive an error message " +"saying that \"This password appears in a breach or has been compromised " +"and cannot be used\", you should change it all other places that you use " +"it as soon as possible. </p> <p> If you have received this error while " +"attempting to log in or upload to PyPI, then your password has been reset" +" and you cannot log in to PyPI until you <a " +"href=\"%(reset_pwd_href)s\">reset your password</a>. </p>" +msgstr "" +"<p> Το ίδιο το PyPI δεν υπέστη παραβίαση. Αυτό αποτελεί ένα μέτρο " +"ασφάλειας για την ελάττωση του ρίσκου επιθέσεων <a " +"href=\"%(credential_stuffing_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">credential stuffing</a> ενάντια στο " +"PyPI και τους χρήστες του. </p> <p> Κάθε φορά που ένας χρήστης παρέχει " +"έναν κωδικό — κατά τη διάρκεια εγγραφής, πιστοποίησης ή αλλαγής κωδικού —" +" το PyPI ελέγχει με ασφάλεια αν ο κωδικός αυτός έχει εμφανιστεί ή όχι σε " +"δημόσιες παραβιάσεις δεδομένων. </p> <p> Κατά τη διάρκεια αυτών των " +"διεργασιών, το PyPI δημιουργεί από τον δοσμένο κωδικό ένα hash SHA-1 και " +"χρησιμοποιεί τους πέντε (5) πρώτους χαρακτήρες του hash για να ελέγξει " +"στο <a href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" " "target=\"_blank\" rel=\"noopener\">Have I Been Pwned API</a> και να " -"αποφανθεί αν ο κωδικός έχει στο παρελθόν υποστεί παραβίαση (με άλλα λόγια " -"ελέγχει κατά πόσο ο κωδικός αυτός είναι κοινός, γνωστός, εύκολα ανακαλύψιμος " -"σε κακόβουλο λογισμικό ή χρήστες). Ο κωδικός αυτός καθαυτός δεν αποθηκεύεται " -"ποτέ στο PyPI ή κατατίθεται στο Have I Been Pwned API. </p> <p> Αν ο κωδικός " -"δεν εγκριθεί από την αναφερθείσα υπηρεσία, τότε το PyPI δεν θα επιτρέψει να " -"χρησιμοποιηθούν τέτοιοι κωδικοί κατά την εγγραφή ή την αλλαγή κωδικού. </p> " -"<p> Αν λάβετε ένα μήνυμα σφάλματος που λέει \"This password appears in a " -"breach or has been compromised and cannot be used\", θα πρέπει να τον " -"αλλάξετε όχι μόνο στο PyPI αλλά και σε άλλα site/υπηρεσίες, το συντομότερο " -"δυνατόν. </p> <p> Αν λάβετε αυτό το σφάλμα κατά τη διάρκεια της σύνδεσης σας " -"στο PyPI ή κατά τη διάρκεια ανεβάσματος ενός πακέτου, τότε ο κωδικός σας " -"έχει μηδενιστεί και δεν θα μπορείτε να συνδεθείτε στο PyPI μέχρις ότου <a " +"αποφανθεί αν ο κωδικός έχει στο παρελθόν υποστεί παραβίαση (με άλλα λόγια" +" ελέγχει κατά πόσο ο κωδικός αυτός είναι κοινός, γνωστός, εύκολα " +"ανακαλύψιμος σε κακόβουλο λογισμικό ή χρήστες). Ο κωδικός αυτός καθαυτός " +"δεν αποθηκεύεται ποτέ στο PyPI ή κατατίθεται στο Have I Been Pwned API. " +"</p> <p> Αν ο κωδικός δεν εγκριθεί από την αναφερθείσα υπηρεσία, τότε το " +"PyPI δεν θα επιτρέψει να χρησιμοποιηθούν τέτοιοι κωδικοί κατά την εγγραφή" +" ή την αλλαγή κωδικού. </p> <p> Αν λάβετε ένα μήνυμα σφάλματος που λέει " +"\"This password appears in a breach or has been compromised and cannot be" +" used\", θα πρέπει να τον αλλάξετε όχι μόνο στο PyPI αλλά και σε άλλα " +"site/υπηρεσίες, το συντομότερο δυνατόν. </p> <p> Αν λάβετε αυτό το σφάλμα" +" κατά τη διάρκεια της σύνδεσης σας στο PyPI ή κατά τη διάρκεια " +"ανεβάσματος ενός πακέτου, τότε ο κωδικός σας έχει μηδενιστεί και δεν θα " +"μπορείτε να συνδεθείτε στο PyPI μέχρις ότου <a " "href=\"%(reset_pwd_href)s\">μηδενίσετε τον κωδικό σας</a>. </p>" #: warehouse/templates/pages/help.html:263 @@ -4145,78 +4165,83 @@ msgstr "" msgid "" "<p> Two factor authentication (2FA) makes your account more secure by " "requiring two things in order to log in: <em>something you know</em> and " -"<em>something you own</em>. </p> <p> In PyPI's case, \"something you know\" " -"is your username and password, while \"something you own\" can be <a href=" -"\"#totp\">an application to generate a temporary code</a>, or a <a href=" -"\"#utfkey\">security device</a> (most commonly a USB key). </p> <p> It is " -"strongly recommended that you set up two factor authentication on your PyPI " -"account. </p> <p> Users who have chosen to set up two factor authentication " -"will be asked to provide their second method of identity verification during " -"the log in process. This only affects logging in via a web browser, and not " -"(yet) package uploads. </p> <p>You can follow the improvements to <abbr " -"title=\"two factor authentication\">2FA</abbr> on <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">discuss.python.org</a>.</p>" -msgstr "" -"<p> Η πιστοποίηση δυο-παραγόντων (2FA) κάνει τον λογαριασμό σας πιο ασφαλή " -"απαιτώντας δυο πράγματα κατά τη διάρκεια της σύνδεσης: <em>κάτι που ξέρετε</" -"em>και <em>κάτι που κατέχετε</em>. </p> <p> Στην περίπτωση του PyPI, το " -"\"κάτι που ξέρετε\" είναι το όνομα και ο κωδικός χρήστη, ενώ το \"κάτι που " -"κατέχετε\" μπορεί να είναι <a href=\"#totp\">μια εφαρμογή που δημιουργεί " -"προσωρινό κωδικό</a>, ή μια <a href=\"#utfkey\">συσκευή ασφάλειας</a> (συχνά " -"ένα USB key). </p> <p> Συνιστάται να ρυθμίσετε την πιστοποίηση δυο-" -"παραγόντων για τον λογαριασμό σας στο PyPI. </p> <p> Οι χρήστες που θα " -"επιλέξουν να ρυθμίσουν την πιστοποίηση δυο-παραγόντων θα ερωτηθούν να " -"παρέχουν την δεύτερη μέθοδο εξακρίβωσης κατά τη διάρκεια της σύνδεσης. Αυτό " -"αφορά μόνο τη σύνδεση μέσω ενός web browser και όχι (ακόμα) το ανέβασμα " -"πακέτου. </p> <p>Μπορείτε να ακολουθήσετε καλές πρακτικές για το <abbr title=" -"\"two factor authentication\">2FA</abbr> στο <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">discuss.python.org</a>.</p>" +"<em>something you own</em>. </p> <p> In PyPI's case, \"something you " +"know\" is your username and password, while \"something you own\" can be " +"<a href=\"#totp\">an application to generate a temporary code</a>, or a " +"<a href=\"#utfkey\">security device</a> (most commonly a USB key). </p> " +"<p> It is strongly recommended that you set up two factor authentication " +"on your PyPI account. </p> <p> Users who have chosen to set up two factor" +" authentication will be asked to provide their second method of identity " +"verification during the log in process. This only affects logging in via " +"a web browser, and not (yet) package uploads. </p> <p>You can follow the " +"improvements to <abbr title=\"two factor authentication\">2FA</abbr> on " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">discuss.python.org</a>.</p>" +msgstr "" +"<p> Η πιστοποίηση δυο-παραγόντων (2FA) κάνει τον λογαριασμό σας πιο " +"ασφαλή απαιτώντας δυο πράγματα κατά τη διάρκεια της σύνδεσης: <em>κάτι " +"που ξέρετε</em>και <em>κάτι που κατέχετε</em>. </p> <p> Στην περίπτωση " +"του PyPI, το \"κάτι που ξέρετε\" είναι το όνομα και ο κωδικός χρήστη, ενώ" +" το \"κάτι που κατέχετε\" μπορεί να είναι <a href=\"#totp\">μια εφαρμογή " +"που δημιουργεί προσωρινό κωδικό</a>, ή μια <a href=\"#utfkey\">συσκευή " +"ασφάλειας</a> (συχνά ένα USB key). </p> <p> Συνιστάται να ρυθμίσετε την " +"πιστοποίηση δυο-παραγόντων για τον λογαριασμό σας στο PyPI. </p> <p> Οι " +"χρήστες που θα επιλέξουν να ρυθμίσουν την πιστοποίηση δυο-παραγόντων θα " +"ερωτηθούν να παρέχουν την δεύτερη μέθοδο εξακρίβωσης κατά τη διάρκεια της" +" σύνδεσης. Αυτό αφορά μόνο τη σύνδεση μέσω ενός web browser και όχι " +"(ακόμα) το ανέβασμα πακέτου. </p> <p>Μπορείτε να ακολουθήσετε καλές " +"πρακτικές για το <abbr title=\"two factor authentication\">2FA</abbr> στο" +" <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">discuss.python.org</a>.</p>" #: warehouse/templates/pages/help.html:290 #, python-format msgid "" "PyPI users can set up two-factor authentication using any authentication " "application that supports the <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based one-time password" -"\">TOTP</abbr> standard</a>." +"target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based one-time " +"password\">TOTP</abbr> standard</a>." msgstr "" "Οι χρήστες του PyPI μπορούν ρυθμίσουν την πιστοποίηση δυο-παραγόντων " -"χρησιμοποιώντας οποιαδήποτε εφαρμογή πιστοποίησης η οποία υποστηρίζει το <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><abbr title=\"time-based one-time password\">TOTP</abbr> στάνταρ</a>." +"χρησιμοποιώντας οποιαδήποτε εφαρμογή πιστοποίησης η οποία υποστηρίζει το " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><abbr title=\"time-based one-time password\">TOTP</abbr>" +" στάνταρ</a>." #: warehouse/templates/pages/help.html:291 msgid "" "<abbr title=\"time-based one-time password\">TOTP</abbr> authentication " -"applications generate a regularly changing authentication code to use when " -"logging into your account." +"applications generate a regularly changing authentication code to use " +"when logging into your account." msgstr "" -"Οι εφαρμογές πιστοποίησης <abbr title=\"time-based one-time password\">TOTP</" -"abbr> παράγουν έναν κωδικό πιστοποίησης ο οποίος αλλάζει τακτικά και μπορεί " -"ο χρήστης να τον χρησιμοποιήσει για να συνδεθεί στον λογαριασμό του " -"(προσοχή, σε καμία περίπτωση δεν αποτελεί τον κωδικό χρήστη)." +"Οι εφαρμογές πιστοποίησης <abbr title=\"time-based one-time " +"password\">TOTP</abbr> παράγουν έναν κωδικό πιστοποίησης ο οποίος αλλάζει" +" τακτικά και μπορεί ο χρήστης να τον χρησιμοποιήσει για να συνδεθεί στον " +"λογαριασμό του (προσοχή, σε καμία περίπτωση δεν αποτελεί τον κωδικό " +"χρήστη)." #: warehouse/templates/pages/help.html:292 msgid "" -"Because <abbr title=\"time-based one-time password\">TOTP</abbr> is an open " -"standard, there are many applications that are compatible with your PyPI " -"account. Popular applications include:" +"Because <abbr title=\"time-based one-time password\">TOTP</abbr> is an " +"open standard, there are many applications that are compatible with your " +"PyPI account. Popular applications include:" msgstr "" -"Επειδή το <abbr title=\"time-based one-time password\">TOTP</abbr> είναι ένα " -"ανοικτό στάνταρ, υπάρχουν πολλές εφαρμογές που είναι συμβατές με τον " +"Επειδή το <abbr title=\"time-based one-time password\">TOTP</abbr> είναι " +"ένα ανοικτό στάνταρ, υπάρχουν πολλές εφαρμογές που είναι συμβατές με τον " "λογαριασμό σας στο PyPI. Οι πιο δημοφιλείς είναι:" #: warehouse/templates/pages/help.html:295 #, python-format msgid "" -"Google Authenticator for <a href=\"%(android_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Google Authenticator for <a href=\"%(android_href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Android</a> or <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" msgstr "" -"Η εφαρμογή Google Authenticator για <a href=\"%(android_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Android</a> ή για <a href=" -"\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</" -"a>" +"Η εφαρμογή Google Authenticator για <a href=\"%(android_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Android</a> ή για " +"<a href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/help.html:298 #: warehouse/templates/pages/help.html:300 @@ -4228,13 +4253,15 @@ msgstr "(ιδιόκτητο)" #: warehouse/templates/pages/help.html:302 #, python-format msgid "" -"Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Android</a> or <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" msgstr "" -"Η εφαρμογή Duo Mobile για <a href=\"%(android_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Android</a> ή για <a href=\"%(ios_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Η εφαρμογή Duo Mobile για <a href=\"%(android_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Android</a> ή για " +"<a href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/help.html:308 #: warehouse/templates/pages/help.html:309 @@ -4244,76 +4271,79 @@ msgstr "(ανοικτού λογισμικού)" #: warehouse/templates/pages/help.html:313 #, python-format msgid "" -"Some password managers (e.g. <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">1Password</a>) can also generate authentication " -"codes. For security reasons, PyPI only allows you to set up one application " -"per account." +"Some password managers (e.g. <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">1Password</a>) can also generate " +"authentication codes. For security reasons, PyPI only allows you to set " +"up one application per account." msgstr "" -"Κάποιοι διαχειριστές κωδικών (password managers) όπως ο πχ <a href=\"%(href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">1Password</" -"a>μπορεί επίσης να παράξει κωδικούς πιστοποίησης. Για λόγους ασφαλείας, το " -"PyPI σας επιτρέπει να ορίσετε μόνο μια εφαρμογή ανά λογαριασμό." +"Κάποιοι διαχειριστές κωδικών (password managers) όπως ο πχ <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">1Password</a>μπορεί επίσης να παράξει κωδικούς " +"πιστοποίησης. Για λόγους ασφαλείας, το PyPI σας επιτρέπει να ορίσετε μόνο" +" μια εφαρμογή ανά λογαριασμό." #: warehouse/templates/pages/help.html:321 msgid "" "To set up <abbr title=\"two factor authentication\">2FA</abbr> with an " "authentication application:" msgstr "" -"Για να ρυθμίσετε το <abbr title=\"πιστοποίηση δυο-παραγόντων\">2FA</abbr> με " -"μια εφαρμογή πιστοποίησης:" +"Για να ρυθμίσετε το <abbr title=\"πιστοποίηση δυο-παραγόντων\">2FA</abbr>" +" με μια εφαρμογή πιστοποίησης:" #: warehouse/templates/pages/help.html:323 msgid "" -"Open an authentication (<abbr title=\"time-based one-time password\">TOTP</" -"abbr>) application" +"Open an authentication (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>) application" msgstr "" -"Ανοίξτε μια εφαρμογή (<abbr title=\"time-based one-time password\">TOTP</" -"abbr>) πιστοποίησης" +"Ανοίξτε μια εφαρμογή (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>) πιστοποίησης" #: warehouse/templates/pages/help.html:324 msgid "" -"Log in to your PyPI account, go to your account settings, and choose \"Add " -"<abbr title=\"two factor authentication\">2FA</abbr> with authentication " -"application\"" +"Log in to your PyPI account, go to your account settings, and choose " +"\"Add <abbr title=\"two factor authentication\">2FA</abbr> with " +"authentication application\"" msgstr "" "Συνδεθείτε στον λογαριασμό σας στο PyPI, πηγαίνετε στις ρυθμίσεις " -"λογαριασμού και διαλέξτε \"Προσθήκη <abbr title=\"πιστοποίηση δυο-παραγόντων" -"\">2FA</abbr> με εφαρμογή πιστοποίησης\"" +"λογαριασμού και διαλέξτε \"Προσθήκη <abbr title=\"πιστοποίηση " +"δυο-παραγόντων\">2FA</abbr> με εφαρμογή πιστοποίησης\"" #: warehouse/templates/pages/help.html:325 msgid "" -"PyPI will generate a secret key, specific to your account. This is displayed " -"as a QR code, and as a text code." +"PyPI will generate a secret key, specific to your account. This is " +"displayed as a QR code, and as a text code." msgstr "" -"Το PyPI θα δημιουργήσει ένα μυστικό κλειδί συγκεκριμένα για τον λογαριασμό " -"σας. Αυτό θα φαίνεται ως ένας κώδικας σε μορφή QR και κειμένου." +"Το PyPI θα δημιουργήσει ένα μυστικό κλειδί συγκεκριμένα για τον " +"λογαριασμό σας. Αυτό θα φαίνεται ως ένας κώδικας σε μορφή QR και " +"κειμένου." #: warehouse/templates/pages/help.html:326 msgid "" "Scan the QR code with your authentication application, or type it in " -"manually. The method of input will depend on the application you have chosen." +"manually. The method of input will depend on the application you have " +"chosen." msgstr "" "Σκανάρετε το QR code με την εφαρμογή πιστοποίησης ή γράψτε τον κωδικό " -"χειροκίνητα. Η μέθοδος εισαγωγής θα εξαρτηθεί από την εφαρμογή που επιλέξατε " -"να χρησιμοποιήσετε." +"χειροκίνητα. Η μέθοδος εισαγωγής θα εξαρτηθεί από την εφαρμογή που " +"επιλέξατε να χρησιμοποιήσετε." #: warehouse/templates/pages/help.html:327 msgid "" -"Your application will generate an authentication code - use this to verify " -"your set up on PyPI" +"Your application will generate an authentication code - use this to " +"verify your set up on PyPI" msgstr "" -"Η εφαρμογή θα παράξει έναν κωδικό πιστοποίησης - χρησιμοποιήστε αυτόν για να " -"επιβεβαιώσετε τη ρύθμιση στο PyPI" +"Η εφαρμογή θα παράξει έναν κωδικό πιστοποίησης - χρησιμοποιήστε αυτόν για" +" να επιβεβαιώσετε τη ρύθμιση στο PyPI" #: warehouse/templates/pages/help.html:330 msgid "" "The PyPI server and your application now share your PyPI secret key, " -"allowing your application to generate valid authentication codes for your " -"PyPI account." +"allowing your application to generate valid authentication codes for your" +" PyPI account." msgstr "" -"Ο PyPI server και η εφαρμογή μπορούν πλέον να μοιράζονται το μυστικό κλειδί " -"σας στο PyPI επιτρέποντας στην εφαρμογή σας να παράγει έγκυρους κωδικούς " -"πιστοποίησης για τον λογαριασμό σας στο PyPI." +"Ο PyPI server και η εφαρμογή μπορούν πλέον να μοιράζονται το μυστικό " +"κλειδί σας στο PyPI επιτρέποντας στην εφαρμογή σας να παράγει έγκυρους " +"κωδικούς πιστοποίησης για τον λογαριασμό σας στο PyPI." #: warehouse/templates/pages/help.html:332 #: warehouse/templates/pages/help.html:374 @@ -4328,19 +4358,21 @@ msgstr "Παρέχετε το όνομα χρήστη και τον κωδικό #: warehouse/templates/pages/help.html:335 msgid "Open your authentication application to generate an authentication code" msgstr "" -"Να ανοίξετε την εφαρμογή πιστοποίησης για να παραχθεί ο κωδικός πιστοποίησης" +"Να ανοίξετε την εφαρμογή πιστοποίησης για να παραχθεί ο κωδικός " +"πιστοποίησης" #: warehouse/templates/pages/help.html:336 msgid "Use this code to finish logging into PyPI" msgstr "" -"Να χρησιμοποιήσετε αυτόν τον κωδικό για να ολοκληρώσετε τη σύνδεση σας στο " -"PyPI" +"Να χρησιμοποιήσετε αυτόν τον κωδικό για να ολοκληρώσετε τη σύνδεση σας " +"στο PyPI" #: warehouse/templates/pages/help.html:342 msgid "" -"A security device is a USB key or <a href=\"#utfdevices\">other device</a> " -"that generates a one-time password and sends that password to the browser. " -"This password is then used by PyPI to authenticate you as a user." +"A security device is a USB key or <a href=\"#utfdevices\">other " +"device</a> that generates a one-time password and sends that password to " +"the browser. This password is then used by PyPI to authenticate you as a " +"user." msgstr "" "Μια συσκευή ασφάλειας είναι ένα USB key ή <a href=\"#utfdevices\">άλλη " "συσκευή</a> η οποία παράγει έναν κωδικό μιας χρήσης και τον στέλνει στον " @@ -4348,24 +4380,23 @@ msgstr "" "εσάς ως χρήστη." #: warehouse/templates/pages/help.html:344 -msgid "" -"To set up two factor authentication with a <em>USB key</em>, you'll need:" +msgid "To set up two factor authentication with a <em>USB key</em>, you'll need:" msgstr "" -"Για να ρυθμίσετε την πιστοποίηση δυο-παραγόντων με ένα <em>USB key</em>, θα " -"χρειαστεί:" +"Για να ρυθμίσετε την πιστοποίηση δυο-παραγόντων με ένα <em>USB key</em>, " +"θα χρειαστεί:" #: warehouse/templates/pages/help.html:346 #, python-format msgid "" -"To use a <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">browser that supports <abbr title=\"web authentication" -"\">WebAuthn</abbr> and PublicKeyCredential</a>, as this is the standard " -"implemented by PyPI." +"To use a <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">browser that supports <abbr title=\"web " +"authentication\">WebAuthn</abbr> and PublicKeyCredential</a>, as this is " +"the standard implemented by PyPI." msgstr "" -"Να χρησιμοποιήσετε έναν <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">browser που να υποστηρίζει <abbr title=\"web " -"authentication\">το WebAuthn</abbr> και το PublicKeyCredential</a>, καθώς " -"αυτά έχουν υλοποιηθεί από το PyPI." +"Να χρησιμοποιήσετε έναν <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">browser που να υποστηρίζει <abbr " +"title=\"web authentication\">το WebAuthn</abbr> και το " +"PublicKeyCredential</a>, καθώς αυτά έχουν υλοποιηθεί από το PyPI." #: warehouse/templates/pages/help.html:347 msgid "To be running JavaScript on your browser" @@ -4374,35 +4405,37 @@ msgstr "Να τρέχετε την JavaScript στον browser σας" #: warehouse/templates/pages/help.html:348 #, python-format msgid "" -"To use a USB key that adheres to the <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">FIDO U2F specification</a>:" +"To use a USB key that adheres to the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO U2F " +"specification</a>:" msgstr "" -"Να χρησιμοποιείτε ένα USB key το οποίο να εμμένει στην προδιαγραφή <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO " -"U2F</a>:" +"Να χρησιμοποιείτε ένα USB key το οποίο να εμμένει στην προδιαγραφή <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">FIDO U2F</a>:" #: warehouse/templates/pages/help.html:351 #, python-format msgid "" -"Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</a> and <a " -"href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Thetis</a>." +"Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> and <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." msgstr "" -"Δημοφιλή κλειδιά αποτελούν τα <a href=\"%(yubikey_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</a> " -"και <a href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Thetis</a>." +"Δημοφιλή κλειδιά αποτελούν τα <a href=\"%(yubikey_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> και <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." #: warehouse/templates/pages/help.html:358 msgid "" "Note that some older Yubico USB keys <strong>do not follow the FIDO " "specification</strong>, and will therefore not work with PyPI" msgstr "" -"Σημειώστε ότι κάποια παλαιότερα Yubico USB keys <strong>δεν ακολουθούν την " -"προδιαγραφή FIDO</strong> με αποτέλεσμα να μην είναι συμβατά με το PyPI" +"Σημειώστε ότι κάποια παλαιότερα Yubico USB keys <strong>δεν ακολουθούν " +"την προδιαγραφή FIDO</strong> με αποτέλεσμα να μην είναι συμβατά με το " +"PyPI" #: warehouse/templates/pages/help.html:363 msgid "Follow these steps:" @@ -4411,22 +4444,23 @@ msgstr "Ακολουθήστε τα ακόλουθα βήματα:" #: warehouse/templates/pages/help.html:365 msgid "" "\n" -" <li>Log in to your PyPI account, go to your account settings, and " -"choose \"Add <abbr title=\"two factor authentication\">2FA</abbr> with " -"security device (e.g. USB key)\"</li>\n" -" <li>Give your key a name. This is necessary because it's possible " -"to add more than one security device to your account.</li>\n" +" <li>Log in to your PyPI account, go to your account settings, " +"and choose \"Add <abbr title=\"two factor authentication\">2FA</abbr> " +"with security device (e.g. USB key)\"</li>\n" +" <li>Give your key a name. This is necessary because it's " +"possible to add more than one security device to your account.</li>\n" " <li>Click on the \"Set up security device\" button</li>\n" -" <li>Insert and touch your USB key, as instructed by your browser</" -"li>\n" +" <li>Insert and touch your USB key, as instructed by your " +"browser</li>\n" " " msgstr "" "\n" " <li>Συνδεθείτε στο λογαριασμό σας στο PyPI, μεταβείτε στις " -"ρυθμίσεις λογαριασμού και επιλέξτε \"Προσθήκη <abbr title=\"πιστοποίηση δυο-" -"παραγόντων\">2FA</abbr> με συσκευή ασφάλειας (πχ USB key)\"</li>\n" +"ρυθμίσεις λογαριασμού και επιλέξτε \"Προσθήκη <abbr title=\"πιστοποίηση " +"δυο-παραγόντων\">2FA</abbr> με συσκευή ασφάλειας (πχ USB key)\"</li>\n" " <li>Δώστε στο κλειδί ένα όνομα. Αυτό είναι απαραίτητο καθώς " -"μπορείτε να προσθέσετε περισσότερο από ένα κλειδιά στο λογαριασμό σας.</li>\n" +"μπορείτε να προσθέσετε περισσότερο από ένα κλειδιά στο λογαριασμό " +"σας.</li>\n" " <li>Κλικάρετε στο κουμπί \"Ρύθμιση συσκευής ασφάλειας\"</li>\n" " <li>Εισάγετε και ακουμπήστε το USB key σας, όπως σας λέει ο " "browser</li>\n" @@ -4434,23 +4468,24 @@ msgstr "" #: warehouse/templates/pages/help.html:372 msgid "" -"Once complete, your USB key will be registered to your PyPI account and can " -"be used during the log in process." +"Once complete, your USB key will be registered to your PyPI account and " +"can be used during the log in process." msgstr "" -"Μόλις ολοκληρωθεί, το USB key θα εγγραφεί με τον λογαριασμό σας στο PyPI και " -"θα μπορεί πλέον να χρησιμοποιείται κατά τη διάρκεια της διαδικασίας εισόδου " -"στο PyPI." +"Μόλις ολοκληρωθεί, το USB key θα εγγραφεί με τον λογαριασμό σας στο PyPI " +"και θα μπορεί πλέον να χρησιμοποιείται κατά τη διάρκεια της διαδικασίας " +"εισόδου στο PyPI." #: warehouse/templates/pages/help.html:376 msgid "" "\n" " <li>Provide your username and password, as normal</li>\n" -" <li>Insert and touch your USB key to finish logging into PyPI</" -"li>\n" +" <li>Insert and touch your USB key to finish logging into " +"PyPI</li>\n" " " msgstr "" "\n" -" <li>Παρέχετε ένα όνομα χρήστη και κωδικό χρήστη, ως συνήθως</li>\n" +" <li>Παρέχετε ένα όνομα χρήστη και κωδικό χρήστη, ως " +"συνήθως</li>\n" " <li>Εισάγετε και ακουμπήσετε το USB key για να ολοκληρώσετε τη " "σύνδεση σας στο PyPI</li>\n" " " @@ -4459,85 +4494,86 @@ msgstr "" #, python-format msgid "" "There is a growing ecosystem of <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">devices that are FIDO compliant</a>, and " -"can therefore be used with PyPI." +"target=\"_blank\" rel=\"noopener\">devices that are FIDO compliant</a>, " +"and can therefore be used with PyPI." msgstr "" -"Υπάρχει ένα ολοένα και αναπτυσσόμενο οικοσύστημα από <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">συσκευές που είναι " -"συμβατές με το FIDO στάνταρ</a> και συνεπώς μπορούν αν χρησιμοποιηθούν με το " -"PyPI." +"Υπάρχει ένα ολοένα και αναπτυσσόμενο οικοσύστημα από <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">συσκευές που " +"είναι συμβατές με το FIDO στάνταρ</a> και συνεπώς μπορούν αν " +"χρησιμοποιηθούν με το PyPI." #: warehouse/templates/pages/help.html:392 #, python-format msgid "" -"Emerging solutions include biometric (facial and fingerprint) scanners and " -"FIDO compatible credit cards. There is also growing support for <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">mobile " -"phones to act as security devices</a>." +"Emerging solutions include biometric (facial and fingerprint) scanners " +"and FIDO compatible credit cards. There is also growing support for <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">mobile phones to act as security devices</a>." msgstr "" "Μελλοντικές λύσεις περιλαμβάνουν βιομετρικούς σαρωτές (προσώπου και " "αποτυπώματος) και συμβατές με το FIDO στάνταρ πιστωτικές κάρτες. Υπάρχει " -"επίσης αναπτυσσόμενη υποστήριξη για <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">κινητά τηλέφωνα τα οποία θα δρουν ως " -"συσκευές ασφάλειας</a>." +"επίσης αναπτυσσόμενη υποστήριξη για <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">κινητά τηλέφωνα τα" +" οποία θα δρουν ως συσκευές ασφάλειας</a>." #: warehouse/templates/pages/help.html:398 #, python-format msgid "" -"As PyPI's two factor implementation follows the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"web " -"authentication\">WebAuthn</abbr> standard</a>, PyPI users will be able to " -"take advantage of any future developments in this field." -msgstr "" -"Καθώς η πιστοποίηση δυο-παραγόντων του PyPI ακολουθά το <a href=\"%(href)s\" " +"As PyPI's two factor implementation follows the <a href=\"%(href)s\" " "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"web " -"authentication\">WebAuthn</abbr> standard</a> οι χρήστες του PyPI θα έχουν " -"το πλεονέκτημα οποιασδήποτε ανάπτυξης πάνω σε αυτό το πεδίο." +"authentication\">WebAuthn</abbr> standard</a>, PyPI users will be able to" +" take advantage of any future developments in this field." +msgstr "" +"Καθώς η πιστοποίηση δυο-παραγόντων του PyPI ακολουθά το <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><abbr title=\"web authentication\">WebAuthn</abbr> " +"standard</a> οι χρήστες του PyPI θα έχουν το πλεονέκτημα οποιασδήποτε " +"ανάπτυξης πάνω σε αυτό το πεδίο." #: warehouse/templates/pages/help.html:407 msgid "" -"If you lose access to your <a href=\"#totp\">authentication application</a> " -"or <a href=\"#utfkey\">security device</a>, you can use these codes to sign " -"into PyPI." +"If you lose access to your <a href=\"#totp\">authentication " +"application</a> or <a href=\"#utfkey\">security device</a>, you can use " +"these codes to sign into PyPI." msgstr "" #: warehouse/templates/pages/help.html:410 msgid "" -"Recovery codes are <strong>one time use</strong>. They are not a substitute " -"for a <a href=\"#totp\">authentication application</a> or <a href=\"#utfkey" -"\">security device</a> and should only be used for recovery. After using a " -"recovery code to sign in, it becomes inactive." +"Recovery codes are <strong>one time use</strong>. They are not a " +"substitute for a <a href=\"#totp\">authentication application</a> or <a " +"href=\"#utfkey\">security device</a> and should only be used for " +"recovery. After using a recovery code to sign in, it becomes inactive." msgstr "" #: warehouse/templates/pages/help.html:416 msgid "To provision recovery codes:" msgstr "" +# | msgid "" +# | "Log in to your PyPI account, go to your account settings, and choose " +# | "\"Add <abbr title=\"two factor authentication\">2FA</abbr> with " +# | "authentication application\"" #: warehouse/templates/pages/help.html:418 #, fuzzy -#| msgid "" -#| "Log in to your PyPI account, go to your account settings, and choose " -#| "\"Add <abbr title=\"two factor authentication\">2FA</abbr> with " -#| "authentication application\"" msgid "" "Log in to your PyPI account, go to your account settings, and choose " "\"Generate recovery codes\"" msgstr "" "Συνδεθείτε στον λογαριασμό σας στο PyPI, πηγαίνετε στις ρυθμίσεις " -"λογαριασμού και διαλέξτε \"Προσθήκη <abbr title=\"πιστοποίηση δυο-παραγόντων" -"\">2FA</abbr> με εφαρμογή πιστοποίησης\"" +"λογαριασμού και διαλέξτε \"Προσθήκη <abbr title=\"πιστοποίηση " +"δυο-παραγόντων\">2FA</abbr> με εφαρμογή πιστοποίησης\"" #: warehouse/templates/pages/help.html:419 msgid "" -"Securely store the displayed recovery codes! Consider printing them out and " -"storing them in a safe location or saving them in a password manager." +"Securely store the displayed recovery codes! Consider printing them out " +"and storing them in a safe location or saving them in a password manager." msgstr "" #: warehouse/templates/pages/help.html:422 msgid "" -"If you lose access to your stored recovery codes or use all of them, you can " -"get new ones by selecting \"Regenerate recovery codes\" in your account " -"settings." +"If you lose access to your stored recovery codes or use all of them, you " +"can get new ones by selecting \"Regenerate recovery codes\" in your " +"account settings." msgstr "" #: warehouse/templates/pages/help.html:424 @@ -4546,40 +4582,43 @@ msgstr "" #: warehouse/templates/pages/help.html:427 msgid "" -"When prompted for Two-Factor Authentication, select \"Login using a Recovery " -"Code\"" +"When prompted for Two-Factor Authentication, select \"Login using a " +"Recovery Code\"" msgstr "" #: warehouse/templates/pages/help.html:428 msgid "" -"As each code can be used only once, you might want to mark the code as used" +"As each code can be used only once, you might want to mark the code as " +"used" msgstr "" #: warehouse/templates/pages/help.html:429 msgid "" -"If you have few recovery codes remaining, you may also want to generate a " -"new set using the \"Regenerate recovery codes\" button in your account " +"If you have few recovery codes remaining, you may also want to generate a" +" new set using the \"Regenerate recovery codes\" button in your account " "settings." msgstr "" +# | msgid "" +# | "\n" +# | " <p>API tokens provide an alternative way (instead of username " +# | "and password) to authenticate when <strong>uploading packages</strong> to +# " +# | "PyPI.</p>\n" +# | " <p>You can create a token for an entire PyPI account, in which +# | "case, the token will work for all projects associated with that account. +# | "Alternatively, you can limit a token's scope to a specific +# project.</p>\n" +# | " <p><strong>We strongly recommend you authenticate with an API " +# | "token where possible.</strong></p>\n" +# | " " #: warehouse/templates/pages/help.html:434 #, fuzzy -#| msgid "" -#| "\n" -#| " <p>API tokens provide an alternative way (instead of username " -#| "and password) to authenticate when <strong>uploading packages</strong> to " -#| "PyPI.</p>\n" -#| " <p>You can create a token for an entire PyPI account, in which " -#| "case, the token will work for all projects associated with that account. " -#| "Alternatively, you can limit a token's scope to a specific project.</p>\n" -#| " <p><strong>We strongly recommend you authenticate with an API " -#| "token where possible.</strong></p>\n" -#| " " msgid "" "\n" -" <p>API tokens provide an alternative way (instead of username and " -"password) to authenticate when <strong>uploading packages</strong> to PyPI.</" -"p>\n" +" <p>API tokens provide an alternative way (instead of username " +"and password) to authenticate when <strong>uploading packages</strong> to" +" PyPI.</p>\n" " <p>You can create a token for an entire PyPI account, in which " "case, the token will work for all projects associated with that account. " "Alternatively, you can limit a token's scope to a specific project.</p>\n" @@ -4589,13 +4628,14 @@ msgid "" " " msgstr "" "\n" -" <p>Τα API tokens παρέχουν έναν εναλλακτικό τρόπο (αντί του ζεύγους " -"όνομα/κωδικός χρήστη) να πιστοποιηθείτε όταν <strong>ανεβάζετε πακέτα</" -"strong> στο PyPI.</p>\n" -" <p>Μπορείτε να δημιουργήσετε token για έναν ολόκληρο λογαριασμό " -"στο PyPI, που σημαίνει ότι το token αυτό θα δουλεύει σε όλα τα project που " -"είναι συνδεδεμένα με αυτόν τον λογαριασμό. Εναλλακτικά μπορείτε να " -"περιορίσετε το πεδίο εφαρμογής του token σε ένα συγκεκριμένο project.</p>\n" +" <p>Τα API tokens παρέχουν έναν εναλλακτικό τρόπο (αντί του " +"ζεύγους όνομα/κωδικός χρήστη) να πιστοποιηθείτε όταν <strong>ανεβάζετε " +"πακέτα</strong> στο PyPI.</p>\n" +" <p>Μπορείτε να δημιουργήσετε token για έναν ολόκληρο λογαριασμό" +" στο PyPI, που σημαίνει ότι το token αυτό θα δουλεύει σε όλα τα project " +"που είναι συνδεδεμένα με αυτόν τον λογαριασμό. Εναλλακτικά μπορείτε να " +"περιορίσετε το πεδίο εφαρμογής του token σε ένα συγκεκριμένο project.</p>" +"\n" " <p><strong>Συνιστούμε τα πιστοποιηθείτε με ένα API token όποτε " "είναι δυνατόν.</strong></p>\n" " " @@ -4619,8 +4659,8 @@ msgid "" "In your <a href=\"%(href)s\">account settings</a>, go to the API tokens " "section and select \"Add API token\"" msgstr "" -"Μέσα από τις <a href=\"%(href)s\">ρυθμίσεις λογαριασμού</a>, πηγαίνετε στο " -"πεδίο API tokens και επιλέξτε \"Προσθήκη API token\"" +"Μέσα από τις <a href=\"%(href)s\">ρυθμίσεις λογαριασμού</a>, πηγαίνετε " +"στο πεδίο API tokens και επιλέξτε \"Προσθήκη API token\"" #: warehouse/templates/pages/help.html:448 msgid "To use an API token:" @@ -4632,7 +4672,8 @@ msgstr "Ορίστε το όνομα χρήστη ως <code>__token__</code>" #: warehouse/templates/pages/help.html:452 msgid "" -"Set your password to the token value, including the <code>pypi-</code> prefix" +"Set your password to the token value, including the <code>pypi-</code> " +"prefix" msgstr "" "Ορίστε τον κωδικό ως την τιμή του token, περιλαμβάνοντας το πρόθεμα " "<code>pypi-</code>" @@ -4640,25 +4681,28 @@ msgstr "" #: warehouse/templates/pages/help.html:456 #, python-format msgid "" -"Where you edit or add these values will depend on your individual use case. " -"For example, some users may need to edit <a href=\"%(pypirc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">their <code>.pypirc</code> " -"file</a>, while others may need to update their CI configuration file (e.g. " -"<a href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\"><code>.travis.yml</code> if you are using Travis</a>)." +"Where you edit or add these values will depend on your individual use " +"case. For example, some users may need to edit <a " +"href=\"%(pypirc_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">their <code>.pypirc</code> file</a>, while others may " +"need to update their CI configuration file (e.g. <a " +"href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>.travis.yml</code> if you are using Travis</a>)." msgstr "" "Όταν επεξεργάζεστε ή προσθέτετε, αυτές οι τιμές θα εξαρτώνται από την " "εκάστοτε περίπτωση. Για παράδειγμα, μερικοί χρήστες θα χρειαστεί να " -"επεξεργαστούν το <a href=\"%(pypirc_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">δικό τους αρχείο <code>.pypirc</code> file</a>, " -"ενώ άλλοι θα χρειαστεί να αλλάξουν το αρχείο ρύθμισης του CI (πχ το <a href=" -"\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><code>.travis.yml</code> αν χρησιμοποιείτε την υπηρεσία Travis</a>)." +"επεξεργαστούν το <a href=\"%(pypirc_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">δικό τους αρχείο <code>.pypirc</code> " +"file</a>, ενώ άλλοι θα χρειαστεί να αλλάξουν το αρχείο ρύθμισης του CI " +"(πχ το <a href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>.travis.yml</code> αν χρησιμοποιείτε την υπηρεσία " +"Travis</a>)." #: warehouse/templates/pages/help.html:460 msgid "" -"Advanced users may wish to inspect their token by decoding it with base64, " -"and checking the output against the unique identifier displayed on PyPI." +"Advanced users may wish to inspect their token by decoding it with " +"base64, and checking the output against the unique identifier displayed " +"on PyPI." msgstr "" "Οι πιο προχωρημένοι χρήστες ίσως να θέλουν να εξετάσουν το token τους " "αποκωδικοποιώντας το με base64 και να ελέγξουν την έξοδο σε σχέση με το " @@ -4675,149 +4719,154 @@ msgstr "Δείτε στο API reference." #: warehouse/templates/pages/help.html:471 #, python-format msgid "" -"If you need to run your own mirror of PyPI, the <a href=\"%(href)s" -"\">bandersnatch project</a> is the recommended solution. Note that the " -"storage requirements for a PyPI mirror would exceed 1 terabyte—and growing!" +"If you need to run your own mirror of PyPI, the <a " +"href=\"%(href)s\">bandersnatch project</a> is the recommended solution. " +"Note that the storage requirements for a PyPI mirror would exceed 1 " +"terabyte—and growing!" msgstr "" -"Αν θέλετε να τρέξετε τον δικό σας καθρέπτη του PyPI, τότε το <a href=" -"\"%(href)s\">bandersnatch project</a> είναι η προτεινόμενη λύση. Σημειώστε " -"ότι οι απαιτήσεις αποθηκευτικού χώρου για ένα καθρέπτη PyPI θα υπερβούν το 1 " -"terabyte—και θα συνεχίσουν να ανεβαίνουν!" +"Αν θέλετε να τρέξετε τον δικό σας καθρέπτη του PyPI, τότε το <a " +"href=\"%(href)s\">bandersnatch project</a> είναι η προτεινόμενη λύση. " +"Σημειώστε ότι οι απαιτήσεις αποθηκευτικού χώρου για ένα καθρέπτη PyPI θα " +"υπερβούν το 1 terabyte—και θα συνεχίσουν να ανεβαίνουν!" #: warehouse/templates/pages/help.html:474 #, python-format msgid "" -"PyPI itself does not offer a way to get notified when a project uploads new " -"releases. However, there are several third-party services that offer " +"PyPI itself does not offer a way to get notified when a project uploads " +"new releases. However, there are several third-party services that offer " "comprehensive monitoring and notifications for project releases and " -"vulnerabilities listed as <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">GitHub apps</a>." -msgstr "" -"Το ίδιο το PyPI δεν παρέχει κάποιον τρόπο να ειδοποιήστε όταν ένα project " -"ανεβάζει νέες εκδόσεις. Ωστόσο, υπάρχουν πολλές υπηρεσίες τρίτων που " -"παρέχουν πλήρεις παρακολουθήσεις και ειδοποιήσεις για εκδόσεις project και " -"αδυναμίες κάτω από μια λίστα με το όνομα <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">GitHub apps</a>." - +"vulnerabilities listed as <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">GitHub apps</a>." +msgstr "" +"Το ίδιο το PyPI δεν παρέχει κάποιον τρόπο να ειδοποιήστε όταν ένα project" +" ανεβάζει νέες εκδόσεις. Ωστόσο, υπάρχουν πολλές υπηρεσίες τρίτων που " +"παρέχουν πλήρεις παρακολουθήσεις και ειδοποιήσεις για εκδόσεις project " +"και αδυναμίες κάτω από μια λίστα με το όνομα <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">GitHub apps</a>." + +# | msgid "" +# | "You can <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" +# | "\"noopener\">analyze PyPI download usage statistics via Google +# BigQuery</" +# | "a>." #: warehouse/templates/pages/help.html:477 #, fuzzy, python-format -#| msgid "" -#| "You can <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -#| "\"noopener\">analyze PyPI download usage statistics via Google BigQuery</" -#| "a>." msgid "" -"You can <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">analyze PyPI download usage statistics via our public dataset " -"on Google BigQuery</a>." +"You can <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">analyze PyPI download usage statistics via our public " +"dataset on Google BigQuery</a>." msgstr "" -"Μπορείτε να <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">αναλύσετε τα στατιστικά των downloads του PyPI μέσω του Google " -"BigQuery</a>." +"Μπορείτε να <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">αναλύσετε τα στατιστικά των downloads του PyPI μέσω του " +"Google BigQuery</a>." #: warehouse/templates/pages/help.html:479 #, python-format msgid "" -"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.io provides statistics for PyPI projects</a> (<a href=" -"\"%(libs_io_example_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">example</a>, <a href=\"%(libs_io_api_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">API</a>) including GitHub stars and " -"forks, dependency tracking (<a href=\"%(in_progress_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">in progress</a>), and <a " -"href=\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">other relevant factors</a>." -msgstr "" -"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Η ιστοσελίδα Libraries.io παρέχει στατιστικά για τα PyPI " -"projects</a> (<a href=\"%(libs_io_example_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">παράδειγμα</a>, <a href=" -"\"%(libs_io_api_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">API</a>) περιλαμβάνοντας τα GitHub stars και forks, dependency tracking " -"(<a href=\"%(in_progress_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">σε εξέλιξη</a>) και <a href=\"%(other_factors_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">άλλους σχετικούς " -"παράγοντες</a>." +"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io provides statistics for PyPI projects</a> " +"(<a href=\"%(libs_io_example_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">example</a>, <a " +"href=\"%(libs_io_api_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">API</a>) including GitHub stars and forks, dependency " +"tracking (<a href=\"%(in_progress_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">in progress</a>), and <a " +"href=\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">other relevant factors</a>." +msgstr "" +"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Η ιστοσελίδα Libraries.io παρέχει στατιστικά για τα PyPI" +" projects</a> (<a href=\"%(libs_io_example_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">παράδειγμα</a>, <a " +"href=\"%(libs_io_api_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">API</a>) περιλαμβάνοντας τα GitHub stars και forks, " +"dependency tracking (<a href=\"%(in_progress_href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">σε εξέλιξη</a>) και <a " +"href=\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">άλλους σχετικούς παράγοντες</a>." #: warehouse/templates/pages/help.html:488 #, python-format msgid "" -"For recent statistics on uptime and performance, see <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status page</a>." +"For recent statistics on uptime and performance, see <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status " +"page</a>." msgstr "" -"Για πρόσφατα στατιστικά σχετικά με το uptime και την απόδοση δείτε στη <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">σελίδα κατάστασης μας</a>." +"Για πρόσφατα στατιστικά σχετικά με το uptime και την απόδοση δείτε στη <a" +" href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">σελίδα κατάστασης μας</a>." #: warehouse/templates/pages/help.html:495 #, python-format msgid "" -"PyPI does not support publishing private packages. If you need to publish " -"your private package to a package index, the recommended solution is to run " -"your own deployment of the <a href=\"%(href)s\">devpi project</a>." +"PyPI does not support publishing private packages. If you need to publish" +" your private package to a package index, the recommended solution is to " +"run your own deployment of the <a href=\"%(href)s\">devpi project</a>." msgstr "" -"Το PyPI δεν υποστηρίζει την έκδοση ιδιωτικών πακέτων. Αν θέλετε να εκδώσετε " -"το ιδιωτικό πακέτο σας σε κάποιο αποθετήριο πακέτων η προτεινόμενη λύση " -"είναι τρέξετε το δικό σας deployment του <a href=\"%(href)s\">devpi project</" -"a>." +"Το PyPI δεν υποστηρίζει την έκδοση ιδιωτικών πακέτων. Αν θέλετε να " +"εκδώσετε το ιδιωτικό πακέτο σας σε κάποιο αποθετήριο πακέτων η " +"προτεινόμενη λύση είναι τρέξετε το δικό σας deployment του <a " +"href=\"%(href)s\">devpi project</a>." #: warehouse/templates/pages/help.html:498 msgid "" "Your publishing tool may return an error that your new project can't be " -"created with your desired name, despite no evidence of a project or release " -"of the same name on PyPI. Currently, there are three primary reasons this " -"may occur:" +"created with your desired name, despite no evidence of a project or " +"release of the same name on PyPI. Currently, there are three primary " +"reasons this may occur:" msgstr "" -"Το εργαλείο που ανεβάζετε πακέτα μπορεί να σας επιστρέψει σφάλμα ότι το νέο " -"project δεν μπορεί να δημιουργηθεί με το επιθυμητό όνομα παρόλο αυτό το " -"όνομα φαίνεται να μην υπάρχει πουθενά στο PyPI. Προς το παρόν, υπάρχουν " -"τρεις πιθανοί λόγοι που μπορεί να συμβαίνει αυτό:" +"Το εργαλείο που ανεβάζετε πακέτα μπορεί να σας επιστρέψει σφάλμα ότι το " +"νέο project δεν μπορεί να δημιουργηθεί με το επιθυμητό όνομα παρόλο αυτό " +"το όνομα φαίνεται να μην υπάρχει πουθενά στο PyPI. Προς το παρόν, " +"υπάρχουν τρεις πιθανοί λόγοι που μπορεί να συμβαίνει αυτό:" #: warehouse/templates/pages/help.html:500 #, python-format msgid "" -"The project name conflicts with a <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Standard Library</a> module from " -"any major version from 2.5 to present." +"The project name conflicts with a <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Standard " +"Library</a> module from any major version from 2.5 to present." msgstr "" -"Το όνομα του project είναι το ίδιο με το όνομα μιας βιβλιοθήκης στο <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python " -"Standard Library</a> από οποιαδήποτε major version από την 2.5 μέχρι σήμερα." +"Το όνομα του project είναι το ίδιο με το όνομα μιας βιβλιοθήκης στο <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Standard Library</a> από οποιαδήποτε major " +"version από την 2.5 μέχρι σήμερα." #: warehouse/templates/pages/help.html:501 #, python-format msgid "" -"The project name has been explicitly prohibited by the PyPI administrators. " -"For example, <code>%(incorrect_code)s</code> is a common typo for <code>" -"%(correct_code)s</code>, and should not surprise the user with a malicious " -"package." +"The project name has been explicitly prohibited by the PyPI " +"administrators. For example, <code>%(incorrect_code)s</code> is a common " +"typo for <code>%(correct_code)s</code>, and should not surprise the user " +"with a malicious package." msgstr "" -"Το όνομα του project έχει απαγορευτεί ρητά από τους διαχειριστές του PyPI. " -"Για παράδειγμα, το <code>%(incorrect_code)s</code> είναι ένα κοινό " -"τυπογραφικό λάθος για το <code>%(correct_code)s</code> και δεν θα έπρεπε να " -"εκπλήξει τον χρήση ότι πρόκειται για ένα επιβλαβές project." +"Το όνομα του project έχει απαγορευτεί ρητά από τους διαχειριστές του " +"PyPI. Για παράδειγμα, το <code>%(incorrect_code)s</code> είναι ένα κοινό " +"τυπογραφικό λάθος για το <code>%(correct_code)s</code> και δεν θα έπρεπε " +"να εκπλήξει τον χρήση ότι πρόκειται για ένα επιβλαβές project." #: warehouse/templates/pages/help.html:502 msgid "" -"The project name has been registered by another user, but no releases have " -"been created." +"The project name has been registered by another user, but no releases " +"have been created." msgstr "" "Το όνομα του project έχει εγγραφεί από άλλον χρήστη αλλά δεν έχουν " "δημιουργηθεί εκδόσεις ακόμα." +# | msgid "" +# | "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +# | "rel=\"noopener\">Python Packaging User Guide</a> for details on the " +# | "available formats." #: warehouse/templates/pages/help.html:506 #, fuzzy, python-format -#| msgid "" -#| "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Python Packaging User Guide</a> for details on the " -#| "available formats." msgid "" -"Follow the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">\"How to request a name transfer\"</a> section of <abbr title=" -"\"Python enhancement proposal\">PEP</abbr> 541." +"Follow the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">\"How to request a name transfer\"</a> section of <abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 541." msgstr "" -"Αναφερθείτε στο <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Python Packaging User Guide</a> για λεπτομέρειες σχετικά με " -"τις διαθέσιμες μορφές." +"Αναφερθείτε στο <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> για " +"λεπτομέρειες σχετικά με τις διαθέσιμες μορφές." #: warehouse/templates/pages/help.html:511 msgid "Owner:" @@ -4825,84 +4874,88 @@ msgstr "Κάτοχος:" #: warehouse/templates/pages/help.html:514 msgid "" -"Only the current owners of a project have the ability to add new owners or " -"maintainers. If you need to request ownership, you should contact the " -"current owner(s) of the project directly. Many project owners provide their " -"contact details in the 'Author' field of the 'Meta' details on the project " -"page." +"Only the current owners of a project have the ability to add new owners " +"or maintainers. If you need to request ownership, you should contact the " +"current owner(s) of the project directly. Many project owners provide " +"their contact details in the 'Author' field of the 'Meta' details on the " +"project page." msgstr "" "Μόνο οι παρόντες κάτοχοι ενός project έχουν τη δυνατότητα να προσθέσουν " "νέους κατόχους ή συντηρητές. Αν θέλετε να αιτηθείτε κατοχή, θα πρέπει να " -"επικοινωνήσετε απ' ευθείας με τον τρέχον κάτοχο (ή τρέχοντες κατόχους) του " -"project. Πολλοί κάτοχοι project παρέχουν στοιχεία επικοινωνίας κάτω από το " -"πεδίο \"Κάτοχος\" στις λεπτομέρειες \"Meta\" στη σελίδα του project." +"επικοινωνήσετε απ' ευθείας με τον τρέχον κάτοχο (ή τρέχοντες κατόχους) " +"του project. Πολλοί κάτοχοι project παρέχουν στοιχεία επικοινωνίας κάτω " +"από το πεδίο \"Κάτοχος\" στις λεπτομέρειες \"Meta\" στη σελίδα του " +"project." #: warehouse/templates/pages/help.html:515 #, python-format -msgid "" -"If the owner is unresponsive, see <a href=\"%(href)s\">%(anchor_text)s</a>" +msgid "If the owner is unresponsive, see <a href=\"%(href)s\">%(anchor_text)s</a>" msgstr "" -"Αν ο κάτοχος δεν επικοινωνήσει μαζί σας ανατρέξτε στο <a href=\"%(href)s\">" -"%(anchor_text)s</a>" +"Αν ο κάτοχος δεν επικοινωνήσει μαζί σας ανατρέξτε στο <a " +"href=\"%(href)s\">%(anchor_text)s</a>" #: warehouse/templates/pages/help.html:518 #, python-format msgid "" -"By default, an upload's description will render with <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">reStructuredText</a>. " -"If the description is in an alternate format like Markdown, a package may " -"set the <code>long_description_content_type</code> in <code>setup.py</code> " -"to the alternate format." +"By default, an upload's description will render with <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">reStructuredText</a>. If the description is in an " +"alternate format like Markdown, a package may set the " +"<code>long_description_content_type</code> in <code>setup.py</code> to " +"the alternate format." msgstr "" -"Από προεπιλογή, η περιγραφή ενός ανεβάσματος θα έχει τη μορφή <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">reStructuredText</a>. Αν η περιγραφή είναι σε εναλλακτική μορφή (πχ " -"Markdown), τότε το πακέτο θα πρέπει να θέσει την τιμή του " -"<code>long_description_content_type</code> μέσα στο αρχείο <code>setup.py</" -"code> σε μια διαφορετική μορφή." +"Από προεπιλογή, η περιγραφή ενός ανεβάσματος θα έχει τη μορφή <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">reStructuredText</a>. Αν η περιγραφή είναι σε " +"εναλλακτική μορφή (πχ Markdown), τότε το πακέτο θα πρέπει να θέσει την " +"τιμή του <code>long_description_content_type</code> μέσα στο αρχείο " +"<code>setup.py</code> σε μια διαφορετική μορφή." #: warehouse/templates/pages/help.html:519 #, python-format msgid "" -"Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging User Guide</a> for details on the available " -"formats." +"Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a> for details on the " +"available formats." msgstr "" -"Αναφερθείτε στο <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Python Packaging User Guide</a> για λεπτομέρειες σχετικά με " -"τις διαθέσιμες μορφές." +"Αναφερθείτε στο <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> για " +"λεπτομέρειες σχετικά με τις διαθέσιμες μορφές." #: warehouse/templates/pages/help.html:520 #, python-format msgid "" "PyPI will reject uploads if the description fails to render. To check a " -"description locally for validity, you may use <a href=\"%(href)s" -"\">readme_renderer</a>, which is the same description renderer used by PyPI." +"description locally for validity, you may use <a " +"href=\"%(href)s\">readme_renderer</a>, which is the same description " +"renderer used by PyPI." msgstr "" -"Το PyPI θα απορρίψει ανεβάσματα αν η περιγραφή δεν μπορεί να αναγνωριστεί. " -"Για να ελέγξετε τοπικά την εγκυρότητα της περιγραφής, θα χρειαστεί να κάνετε " -"χρήση του <a href=\"%(href)s\">readme_renderer</a>, το ίδιο ακριβώς που " -"χρησιμοποιεί το PyPI." +"Το PyPI θα απορρίψει ανεβάσματα αν η περιγραφή δεν μπορεί να " +"αναγνωριστεί. Για να ελέγξετε τοπικά την εγκυρότητα της περιγραφής, θα " +"χρειαστεί να κάνετε χρήση του <a href=\"%(href)s\">readme_renderer</a>, " +"το ίδιο ακριβώς που χρησιμοποιεί το PyPI." #: warehouse/templates/pages/help.html:524 #, python-format msgid "" -"If you can't upload your project's release to PyPI because you're hitting " -"the upload file size limit, we can sometimes increase your limit. Make sure " -"you've uploaded at least one release for the project that's <em>under</em> " -"the limit (a <a href=\"%(dev_release_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">developmental release version number</a> is " -"fine). Then, <a href=\"%(file_issue_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">file an issue</a> and tell us:</p>" +"If you can't upload your project's release to PyPI because you're hitting" +" the upload file size limit, we can sometimes increase your limit. Make " +"sure you've uploaded at least one release for the project that's " +"<em>under</em> the limit (a <a href=\"%(dev_release_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">developmental " +"release version number</a> is fine). Then, <a " +"href=\"%(file_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">file an issue</a> and tell us:</p>" msgstr "" "Αν δεν μπορείτε να ανεβάσετε την έκδοση του project σας στο PyPI λόγω " -"ανώτατου ορίου στο μέγεθος αρχείου, μπορεί μερικές φορές να αυξήσουμε αυτό " -"το όριο. Σιγουρευτείτε ότι έχετε ανεβάσει τουλάχιστον μια έκδοση για το " -"project η οποία είναι <em>κάτω</em> του ορίου (ο αριθμός της έκδοσης μπορεί " -"να είναι ένας <a href=\"%(dev_release_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">αναπτυξιακός αριθμός έκδοσης</a>). Έπειτα, <a " -"href=\"%(file_issue_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">ανοίξτε ένα θέμα</a> και πείτε μας:</p>" +"ανώτατου ορίου στο μέγεθος αρχείου, μπορεί μερικές φορές να αυξήσουμε " +"αυτό το όριο. Σιγουρευτείτε ότι έχετε ανεβάσει τουλάχιστον μια έκδοση για" +" το project η οποία είναι <em>κάτω</em> του ορίου (ο αριθμός της έκδοσης " +"μπορεί να είναι ένας <a href=\"%(dev_release_href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">αναπτυξιακός αριθμός έκδοσης</a>). " +"Έπειτα, <a href=\"%(file_issue_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">ανοίξτε ένα θέμα</a> και πείτε " +"μας:</p>" #: warehouse/templates/pages/help.html:532 msgid "A link to your project on PyPI (or Test PyPI)" @@ -4913,87 +4966,86 @@ msgid "The size of your release, in megabytes" msgstr "Το μέγεθος της έκδοσης σας, σε megabytes" #: warehouse/templates/pages/help.html:534 -msgid "" -"Which index/indexes you need the increase for (PyPI, Test PyPI, or both)" -msgstr "" -"Για ποιο αποθετήριο χρειάζεστε αύξηση ορίου (PyPI, Test PyPI ή και τα δυο)" +msgid "Which index/indexes you need the increase for (PyPI, Test PyPI, or both)" +msgstr "Για ποιο αποθετήριο χρειάζεστε αύξηση ορίου (PyPI, Test PyPI ή και τα δυο)" #: warehouse/templates/pages/help.html:535 msgid "" -"A brief description of your project, including the reason for the additional " -"size." +"A brief description of your project, including the reason for the " +"additional size." msgstr "" -"Μια συνοπτική περιγραφή του project σας, συμπεριλαμβάνοντας τον λόγο για τον " -"επιπλέον χώρο." +"Μια συνοπτική περιγραφή του project σας, συμπεριλαμβάνοντας τον λόγο για " +"τον επιπλέον χώρο." #: warehouse/templates/pages/help.html:544 msgid "" -"If you've forgotten your PyPI password but you remember your email address " -"or username, follow these steps to reset your password:" +"If you've forgotten your PyPI password but you remember your email " +"address or username, follow these steps to reset your password:" msgstr "" -"Αν ξεχάσατε τον κωδικό χρήστη σας στο PyPI αλλά θυμάστε την διεύθυνση email " -"ή το όνομα χρήστη σας, ακολουθήστε τα ακόλουθα βήματα για να μηδενίσετε τον " -"κωδικό σας:" +"Αν ξεχάσατε τον κωδικό χρήστη σας στο PyPI αλλά θυμάστε την διεύθυνση " +"email ή το όνομα χρήστη σας, ακολουθήστε τα ακόλουθα βήματα για να " +"μηδενίσετε τον κωδικό σας:" #: warehouse/templates/pages/help.html:546 #, python-format msgid "Go to <a href=\"%(href)s\">reset your password</a>." msgstr "" -"Μεταβείτε στο σύνδεσμο <a href=\"%(href)s\">για μηδενισμό του κωδικού σας</" -"a>." +"Μεταβείτε στο σύνδεσμο <a href=\"%(href)s\">για μηδενισμό του κωδικού " +"σας</a>." #: warehouse/templates/pages/help.html:547 -msgid "" -"Enter the email address or username you used for PyPI and submit the form." +msgid "Enter the email address or username you used for PyPI and submit the form." msgstr "" -"Εισάγετε τη διεύθυνση email ή το όνομα χρήστη σας που χρησιμοποιήσατε στο " -"PyPI και καταθέστε τη φόρμα." +"Εισάγετε τη διεύθυνση email ή το όνομα χρήστη σας που χρησιμοποιήσατε στο" +" PyPI και καταθέστε τη φόρμα." #: warehouse/templates/pages/help.html:548 msgid "You'll receive an email with a password reset link." msgstr "" -"Θα λάβετε ένα email που θα περιέχει ένα σύνδεσμο για μηδενισμό του κωδικού." +"Θα λάβετε ένα email που θα περιέχει ένα σύνδεσμο για μηδενισμό του " +"κωδικού." #: warehouse/templates/pages/help.html:553 msgid "If you've lost access to your PyPI account due to:" msgstr "" +# | msgid "Emails associated with your account" #: warehouse/templates/pages/help.html:555 #, fuzzy -#| msgid "Emails associated with your account" msgid "Lost access to the email address associated with your account" msgstr "Emails που συσχετίζονται με τον λογαριασμό σας" #: warehouse/templates/pages/help.html:556 msgid "" -"Lost two factor authentication <a href=\"#totp\">application</a>, <a href=" -"\"#utfkey\">device</a>, and <a href=\"#recoverycodes\">recovery codes</a>" +"Lost two factor authentication <a href=\"#totp\">application</a>, <a " +"href=\"#utfkey\">device</a>, and <a href=\"#recoverycodes\">recovery " +"codes</a>" msgstr "" +# | msgid "" +# | "If you no longer have access to the email address associated with your " +# | "account, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" +# | "\"noopener\">file an issue on our tracker</a>." #: warehouse/templates/pages/help.html:559 #, fuzzy, python-format -#| msgid "" -#| "If you no longer have access to the email address associated with your " -#| "account, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -#| "\"noopener\">file an issue on our tracker</a>." msgid "" -"You can proceed to, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">file an issue on our tracker</a> to request assistance " -"with account recovery." +"You can proceed to, <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">file an issue on our tracker</a> to " +"request assistance with account recovery." msgstr "" "Αν δεν έχετε πρόσβαση στη διεύθυνση email που είναι συνδεδεμένη με τον " -"λογαριασμό σας στο PyPI, <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">ανοίξτε ένα θέμα στον tracker μας</a>." +"λογαριασμό σας στο PyPI, <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">ανοίξτε ένα θέμα στον tracker μας</a>." +# | msgid "Provide your username and password, as normal" #: warehouse/templates/pages/help.html:566 #, fuzzy -#| msgid "Provide your username and password, as normal" msgid "If you are using a username and password for uploads:" msgstr "Παρέχετε το όνομα χρήστη και τον κωδικό χρήστη, ως συνήθως" +# | msgid "Provide your username and password, as normal" #: warehouse/templates/pages/help.html:568 #, fuzzy -#| msgid "Provide your username and password, as normal" msgid "Check to see if your username or password are incorrect." msgstr "Παρέχετε το όνομα χρήστη και τον κωδικό χρήστη, ως συνήθως" @@ -5013,60 +5065,63 @@ msgstr "" #: warehouse/templates/pages/help.html:574 msgid "" -"Ensure that your API Token is <a href=\"#apitoken\">properly formatted</a> " -"and does not contain any trailing characters such as newlines." +"Ensure that your API Token is <a href=\"#apitoken\">properly " +"formatted</a> and does not contain any trailing characters such as " +"newlines." msgstr "" #: warehouse/templates/pages/help.html:579 #, python-format msgid "" -"Transport Layer Security, or TLS, is part of how we make sure connections " -"between your computer and PyPI are private and secure. It's a cryptographic " -"protocol that's had several versions over time. PyPI <a href=" -"\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">turned off support for TLS versions 1.0 and 1.1</a> in April " -"2018. <a href=\"%(reason_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Learn why on the PSF blog</a>." +"Transport Layer Security, or TLS, is part of how we make sure connections" +" between your computer and PyPI are private and secure. It's a " +"cryptographic protocol that's had several versions over time. PyPI <a " +"href=\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">turned off support for TLS versions 1.0 and 1.1</a> in " +"April 2018. <a href=\"%(reason_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Learn why on the PSF blog</a>." msgstr "" -"Το Transport Layer Security, ή TLS, το χρησιμοποιούμε για να σιγουρευτούμε " -"ότι οι συνδέσεις μεταξύ του υπολογιστή σας και του PyPI παραμένουν ιδιωτικές " -"και ασφαλείς. Είναι ένα κρυπτογραφικό πρωτόκολλο με διαφορετικές εκδόσεις με " -"το πέρασμα του χρόνου. Το PyPI <a href=\"%(announcement_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">δεν υποστηρίζει τις " -"εκδόσεις TLS 1.0 και 1.1</a> από τον Απρίλιο του 2018. <a href=" -"\"%(reason_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Μάθετε γιατί στο PSF blog</a>." +"Το Transport Layer Security, ή TLS, το χρησιμοποιούμε για να " +"σιγουρευτούμε ότι οι συνδέσεις μεταξύ του υπολογιστή σας και του PyPI " +"παραμένουν ιδιωτικές και ασφαλείς. Είναι ένα κρυπτογραφικό πρωτόκολλο με " +"διαφορετικές εκδόσεις με το πέρασμα του χρόνου. Το PyPI <a " +"href=\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">δεν υποστηρίζει τις εκδόσεις TLS 1.0 και 1.1</a> από τον" +" Απρίλιο του 2018. <a href=\"%(reason_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Μάθετε γιατί στο PSF blog</a>." #: warehouse/templates/pages/help.html:586 #, python-format msgid "" -"If you are having trouble with <code>%(command)s</code> and get a <code>No " -"matching distribution found</code> or <code>Could not fetch URL</code> " -"error, try adding <code>-v</code> to the command to get more information:" +"If you are having trouble with <code>%(command)s</code> and get a " +"<code>No matching distribution found</code> or <code>Could not fetch " +"URL</code> error, try adding <code>-v</code> to the command to get more " +"information:" msgstr "" -"Αν έχετε προβλήματα με το <code>%(command)s</code> και λαμβάνετε το σφάλμα " -"<code>No matching distribution found</code> ή <code>Could not fetch URL</" -"code>, προσπαθήστε να προσθέσετε το <code>-v</code> (πρώτο γράμμα από τη " -"λέξη verbose) στην εντολή για να πάρετε παραπάνω πληροφορίες:" +"Αν έχετε προβλήματα με το <code>%(command)s</code> και λαμβάνετε το " +"σφάλμα <code>No matching distribution found</code> ή <code>Could not " +"fetch URL</code>, προσπαθήστε να προσθέσετε το <code>-v</code> (πρώτο " +"γράμμα από τη λέξη verbose) στην εντολή για να πάρετε παραπάνω " +"πληροφορίες:" #: warehouse/templates/pages/help.html:588 msgid "" "If you see an error like <code>There was a problem confirming the ssl " "certificate</code> or <code>tlsv1 alert protocol version</code> or " -"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, you need to be connecting to PyPI " -"with a newer TLS support library." +"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, you need to be connecting to " +"PyPI with a newer TLS support library." msgstr "" -"Αν δείτε το σφάλμα <code>There was a problem confirming the ssl certificate</" -"code> ή <code>tlsv1 alert protocol version</code> ή " -"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, θα χρειαστεί να συνδεθείτε στο " -"PyPI με μια νεώτερη έκδοση του TLS." +"Αν δείτε το σφάλμα <code>There was a problem confirming the ssl " +"certificate</code> ή <code>tlsv1 alert protocol version</code> ή " +"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, θα χρειαστεί να συνδεθείτε στο" +" PyPI με μια νεώτερη έκδοση του TLS." #: warehouse/templates/pages/help.html:589 msgid "" "The specific steps you need to take will depend on your operating system " -"version, where your installation of Python originated (python.org, your OS " -"vendor, or an intermediate distributor), and the installed versions of " -"Python, <code>setuptools</code>, and <code>pip</code>." +"version, where your installation of Python originated (python.org, your " +"OS vendor, or an intermediate distributor), and the installed versions of" +" Python, <code>setuptools</code>, and <code>pip</code>." msgstr "" "Τα συγκεκριμένα βήματα που θα πρέπει να ακολουθήσετε εξαρτώνται από την " "έκδοση του λειτουργικού σας συστήματος, από που εγκαταστήσατε την Python " @@ -5077,97 +5132,102 @@ msgstr "" #: warehouse/templates/pages/help.html:591 #, python-format msgid "" -"For help, go to <a href=\"%(irc_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">the <code>#pypa</code> IRC channel on Freenode</a>, file " -"an issue at <a href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">pypa/packaging-problems/issues</a>, or <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">post to the python-help mailing list</a>, including your OS and " -"installation details and the output of <code>%(command)s</code>." -msgstr "" -"Για βοήθεια μεταβείτε <a href=\"%(irc_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">στο κανάλι IRC <code>#pypa</code> στο Freenode</" -"a>, ανοίξτε ένα θέμα στο <a href=\"%(issue_tracker_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">pypa/packaging-problems/issues</a> ή " -"<a href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">γράψτε στη python-help mailing list</a>, συμπεριλαμβάνοντας το " -"λειτουργικό σας σύστημα και οδηγίες εγκατάστασης του καθώς και την έξοδο από " -"την εντολή <code>%(command)s</code>." +"For help, go to <a href=\"%(irc_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">the <code>#pypa</code> IRC channel on " +"Freenode</a>, file an issue at <a href=\"%(issue_tracker_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">pypa/packaging-" +"problems/issues</a>, or <a href=\"%(mailing_list_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">post to the " +"python-help mailing list</a>, including your OS and installation details " +"and the output of <code>%(command)s</code>." +msgstr "" +"Για βοήθεια μεταβείτε <a href=\"%(irc_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">στο κανάλι IRC <code>#pypa</code> στο " +"Freenode</a>, ανοίξτε ένα θέμα στο <a href=\"%(issue_tracker_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">pypa/packaging-" +"problems/issues</a> ή <a href=\"%(mailing_list_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">γράψτε στη python-" +"help mailing list</a>, συμπεριλαμβάνοντας το λειτουργικό σας σύστημα και " +"οδηγίες εγκατάστασης του καθώς και την έξοδο από την εντολή " +"<code>%(command)s</code>." #: warehouse/templates/pages/help.html:602 #, python-format msgid "" -"We take <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">accessibility</a> very seriously and want to make the website " -"easy to use for everyone." +"We take <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">accessibility</a> very seriously and want to make the " +"website easy to use for everyone." msgstr "" -"Λαμβάνουμε πολύ σοβαρά υπόψη την <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">προσβασιμότητα</a> και θέλουμε να κάνουμε " -"την ιστοσελίδα εύκολα προσβάσιμη από όλους." +"Λαμβάνουμε πολύ σοβαρά υπόψη την <a href=\"%(href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">προσβασιμότητα</a> και θέλουμε να " +"κάνουμε την ιστοσελίδα εύκολα προσβάσιμη από όλους." #: warehouse/templates/pages/help.html:607 #, python-format msgid "" -"If you are experiencing an accessibility problem, <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">report it to us on GitHub</" -"a>, so we can try to fix the problem, for you and others." +"If you are experiencing an accessibility problem, <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">report it to us on" +" GitHub</a>, so we can try to fix the problem, for you and others." msgstr "" -"Αν αντιμετωπίζετε προβλήματα προσβασιμότητας <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">αναφέρετε το μας στο " -"GitHub</a>, ούτως ώστε να προσπαθήσουμε να διορθώσουμε το πρόβλημα τόσο για " -"εσάς όσο και για τους άλλους." +"Αν αντιμετωπίζετε προβλήματα προσβασιμότητας <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">αναφέρετε το μας " +"στο GitHub</a>, ούτως ώστε να προσπαθήσουμε να διορθώσουμε το πρόβλημα " +"τόσο για εσάς όσο και για τους άλλους." #: warehouse/templates/pages/help.html:615 #, python-format msgid "" "In a previous version of PyPI, it used to be possible for maintainers to " -"upload releases to PyPI using a form in the web browser. This feature was " -"deprecated with the new version of PyPI – we instead recommend that you <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">use " -"twine to upload your project to PyPI</a>." +"upload releases to PyPI using a form in the web browser. This feature was" +" deprecated with the new version of PyPI – we instead recommend that you " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">use twine to upload your project to PyPI</a>." msgstr "" "Σε παλαιότερες εκδόσεις του PyPI, οι συντηρητές μπορούσαν να ανεβάσουν " -"εκδόσεις στο PyPI χρησιμοποιώντας μια φόρμα μέσα από τον web browser. Αυτή η " -"δυνατότητα δεν υπάρχει πλέον στην νέα έκδοση του PyPI – αντί αυτού " -"προτείνουμε να χρησιμοποιείτε το πακέτο <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">twine για το ανέβασμα του " -"project σας στο PyPI</a>." +"εκδόσεις στο PyPI χρησιμοποιώντας μια φόρμα μέσα από τον web browser. " +"Αυτή η δυνατότητα δεν υπάρχει πλέον στην νέα έκδοση του PyPI – αντί αυτού" +" προτείνουμε να χρησιμοποιείτε το πακέτο <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">twine για το " +"ανέβασμα του project σας στο PyPI</a>." #: warehouse/templates/pages/help.html:624 msgid "" -"Spammers return to PyPI with some regularity hoping to place their Search " -"Engine Optimized phishing, scam, and click-farming content on the site. " +"Spammers return to PyPI with some regularity hoping to place their Search" +" Engine Optimized phishing, scam, and click-farming content on the site. " "Since PyPI allows for indexing of the Long Description and other data " "related to projects and has a generally solid search reputation, it is a " "prime target." msgstr "" -"Οι spammers μπορεί να επιστρέψουν στο PyPI με κάποια τακτικότητα ελπίζοντας " -"να τοποθετήσουν το δικό τους Search Engine Optimized phishing, scam και " -"click-farming στην ιστοσελίδα μας. Δεδομένου ότι το PyPI επιτρέπει να " -"γίνεται index η περιγραφή καθώς και άλλα δεδομένα του project και έχει " -"γενικά πολύ καλή φήμη στην αναζήτηση, το καθιστά πρωταρχικό στόχο." +"Οι spammers μπορεί να επιστρέψουν στο PyPI με κάποια τακτικότητα " +"ελπίζοντας να τοποθετήσουν το δικό τους Search Engine Optimized phishing," +" scam και click-farming στην ιστοσελίδα μας. Δεδομένου ότι το PyPI " +"επιτρέπει να γίνεται index η περιγραφή καθώς και άλλα δεδομένα του " +"project και έχει γενικά πολύ καλή φήμη στην αναζήτηση, το καθιστά " +"πρωταρχικό στόχο." #: warehouse/templates/pages/help.html:626 #, python-format msgid "" "When the PyPI administrators are overwhelmed by spam <strong>or</strong> " -"determine that there is some other threat to PyPI, new user registration and/" -"or new project registration may be disabled. Check <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status page</a> " -"for more details, as we'll likely have updated it with reasoning for the " -"intervention." +"determine that there is some other threat to PyPI, new user registration " +"and/or new project registration may be disabled. Check <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">our status page</a> for more details, as we'll likely " +"have updated it with reasoning for the intervention." msgstr "" "Όταν οι διαχειριστές του PyPI βομβαρδιστούν με spam <strong>ή</strong> " -"διαπιστώσουν ότι υπάρχει κάποια άλλη απειλή για το PyPI, οι εγγραφές νέων " -"χρηστών και/ή νέων project μπορεί να απενεργοποιηθούν. Δείτε στη <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">σελίδα " -"κατάστασης μας</a> για περισσότερες πληροφορίες, καθώς θα έχουμε σχετική " -"ανακοίνωση εκεί για το λόγο της διακοπής αυτών των υπηρεσιών." +"διαπιστώσουν ότι υπάρχει κάποια άλλη απειλή για το PyPI, οι εγγραφές νέων" +" χρηστών και/ή νέων project μπορεί να απενεργοποιηθούν. Δείτε στη <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">σελίδα κατάστασης μας</a> για περισσότερες πληροφορίες, " +"καθώς θα έχουμε σχετική ανακοίνωση εκεί για το λόγο της διακοπής αυτών " +"των υπηρεσιών." #: warehouse/templates/pages/help.html:635 msgid "PyPI will return these errors for one of these reasons:" msgstr "" -"Το PyPI θα επιστρέψει αυτά τα σφάλματα για έναν από τους ακόλουθους λόγους:" +"Το PyPI θα επιστρέψει αυτά τα σφάλματα για έναν από τους ακόλουθους " +"λόγους:" #: warehouse/templates/pages/help.html:637 msgid "Filename has been used and file exists" @@ -5186,174 +5246,184 @@ msgid "" "PyPI does not allow for a filename to be reused, even once a project has " "been deleted and recreated." msgstr "" -"Το PyPI δεν επιτρέπει σε ένα όνομα αρχείου να επαναχρησιμοποιείται ακόμα και " -"όταν ένα project διαγραφεί ή επαναδημιουργηθεί." +"Το PyPI δεν επιτρέπει σε ένα όνομα αρχείου να επαναχρησιμοποιείται ακόμα " +"και όταν ένα project διαγραφεί ή επαναδημιουργηθεί." #: warehouse/templates/pages/help.html:643 #, python-format msgid "" -"To avoid this situation, <a href=\"%(test_pypi_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">use Test PyPI to perform and check your " -"upload first</a>, before uploading to <a href=\"%(pypi_href)s\">pypi.org</a>." -msgstr "" -"Για την αποφυγή αυτής της κατάστασης, <a href=\"%(test_pypi_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">χρησιμοποιήστε το Test PyPI " -"για να ελέγξετε το ανέβασμα του πακέτου σας</a>, προτού το ανεβάσετε στο <a " +"To avoid this situation, <a href=\"%(test_pypi_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">use Test PyPI to " +"perform and check your upload first</a>, before uploading to <a " "href=\"%(pypi_href)s\">pypi.org</a>." - +msgstr "" +"Για την αποφυγή αυτής της κατάστασης, <a href=\"%(test_pypi_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">χρησιμοποιήστε το " +"Test PyPI για να ελέγξετε το ανέβασμα του πακέτου σας</a>, προτού το " +"ανεβάσετε στο <a href=\"%(pypi_href)s\">pypi.org</a>." + +# | msgid "" +# | "If you would like to request a new trove classifier file a bug on our <a +# " +# | "href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" +# | "\">issue tracker</a>. Include the name of the requested classifier and a +# | "brief justification of why it is important." #: warehouse/templates/pages/help.html:650 #, fuzzy, python-format -#| msgid "" -#| "If you would like to request a new trove classifier file a bug on our <a " -#| "href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -#| "\">issue tracker</a>. Include the name of the requested classifier and a " -#| "brief justification of why it is important." -msgid "" -"If you would like to request a new trove classifier file a pull request on " -"the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><code>pypa/trove-classifiers</code> project</a>. Be sure to include a " -"brief justification of why it is important." -msgstr "" -"Αν θέλετε να αιτηθείτε ένα νέο trove classifier δημιουργήστε ένα bug στον <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">issue tracker μας</a>. Συμπεριλάβετε το όνομα του επιθυμητού classifier " -"και μια μικρή αιτιολόγηση γιατί αυτό είναι σημαντικό." +msgid "" +"If you would like to request a new trove classifier file a pull request " +"on the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>pypa/trove-classifiers</code> project</a>. Be sure" +" to include a brief justification of why it is important." +msgstr "" +"Αν θέλετε να αιτηθείτε ένα νέο trove classifier δημιουργήστε ένα bug στον" +" <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">issue tracker μας</a>. Συμπεριλάβετε το όνομα του " +"επιθυμητού classifier και μια μικρή αιτιολόγηση γιατί αυτό είναι " +"σημαντικό." #: warehouse/templates/pages/help.html:658 #, python-format msgid "" "If you're experiencing an issue with PyPI itself, we welcome " -"<strong>constructive</strong> feedback and bug reports via our <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">issue " -"tracker</a>. Please note that this tracker is only for issues with the " -"software that runs PyPI. Before writing a new issue, first check that a " -"similar issue does not already exist." +"<strong>constructive</strong> feedback and bug reports via our <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">issue tracker</a>. Please note that this tracker is only" +" for issues with the software that runs PyPI. Before writing a new issue," +" first check that a similar issue does not already exist." msgstr "" "Αν αντιμετωπίζετε προβλήματα με το ίδιο το PyPI, είμαστε ανοιχτοί σε " -"<strong>εποικοδομητικά</strong> feedbacks και and bug reports μέσω του <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">issue tracker μας</a>. Παρακαλούμε, σημειώστε, ότι αυτός ο tracker είναι " -"μόνο για θέματα λογισμικού που τρέχουν στο PyPI. Προτού γράψετε ένα νέο " -"θέμα, ελέγξτε πρώτα αν κάποιο παρόμοιο υπάρχει ήδη." +"<strong>εποικοδομητικά</strong> feedbacks και and bug reports μέσω του <a" +" href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">issue tracker μας</a>. Παρακαλούμε, σημειώστε, ότι αυτός" +" ο tracker είναι μόνο για θέματα λογισμικού που τρέχουν στο PyPI. Προτού " +"γράψετε ένα νέο θέμα, ελέγξτε πρώτα αν κάποιο παρόμοιο υπάρχει ήδη." #: warehouse/templates/pages/help.html:665 msgid "" -"If you are having an issue is with a specific package installed from PyPI, " -"you should reach out to the maintainers of that project directly instead." +"If you are having an issue is with a specific package installed from " +"PyPI, you should reach out to the maintainers of that project directly " +"instead." msgstr "" -"Αν το θέμα σας αφορά ένα συγκεκριμένο πακέτο εγκατεστημένο από το PyPI, θα " -"πρέπει να επικοινωνήσετε με τους συντηρητές αυτού του project." +"Αν το θέμα σας αφορά ένα συγκεκριμένο πακέτο εγκατεστημένο από το PyPI, " +"θα πρέπει να επικοινωνήσετε με τους συντηρητές αυτού του project." #: warehouse/templates/pages/help.html:674 #, python-format msgid "" -"PyPI is powered by the Warehouse project; <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> is an open " -"source project developed under the umbrella of the Python Packaging " -"Authority (PyPA) and supported by the Python Packaging Working Group " -"(PackagingWG)." +"PyPI is powered by the Warehouse project; <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> is " +"an open source project developed under the umbrella of the Python " +"Packaging Authority (PyPA) and supported by the Python Packaging Working " +"Group (PackagingWG)." msgstr "" "To PyPI τροφοδοτείται από το Warehouse project. Το <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> είναι " -"ένα project ανοικτού κώδικα αναπτυσσόμενο κάτω από την ομπρέλα του Python " -"Packaging Authority (PyPA) και υποστηριζόμενο από το Python Packaging " -"Working Group (PackagingWG)." +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> " +"είναι ένα project ανοικτού κώδικα αναπτυσσόμενο κάτω από την ομπρέλα του " +"Python Packaging Authority (PyPA) και υποστηριζόμενο από το Python " +"Packaging Working Group (PackagingWG)." #: warehouse/templates/pages/help.html:679 #, python-format msgid "" -"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPA</a> is an independent group of developers whose goal is to improve " -"and maintain many of the core projects related to Python packaging." -msgstr "" -"Το <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPA</a> είναι μια ανεξάρτητη ομάδα από developers των οποίων ο στόχος " -"είναι η βελτίωση και η διατήρηση πολλών κεντρικών projects σχετικά με το " +"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA</a> is an independent group of developers whose " +"goal is to improve and maintain many of the core projects related to " "Python packaging." +msgstr "" +"Το <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA</a> είναι μια ανεξάρτητη ομάδα από developers των " +"οποίων ο στόχος είναι η βελτίωση και η διατήρηση πολλών κεντρικών " +"projects σχετικά με το Python packaging." #: warehouse/templates/pages/help.html:684 #, python-format msgid "" -"The <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">PackagingWG</a> is a working group of the Python Software " -"Foundation (PSF) whose goal is to raise and disburse funds to support the " -"ongoing improvement of Python packaging. Most recently it <a href=" -"\"%(otf_award_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">secured an award from the Open Technology Fund</a> whose funding is " -"enabling developers to improve Warehouse's security and accessibility." -msgstr "" -"To <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">PackagingWG</a> είναι μια ομάδα εργασίας του Python " -"Software Foundation (PSF) της οποίας ο στόχος είναι να συγκεντρωθούν και να " -"εκταμιευθούν κεφάλαια για την υποστήριξη της βελτίωσης του Python packaging. " -"Πρόσφατα <a href=\"%(otf_award_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">εξασφάλισε ένα βραβείο από το Open Technology Fund</a> " -"του οποίου η χρηματοδότηση επιτρέπει στους developers να βελτιώσουν την " -"ασφάλεια και την προσβασιμότητα του Warehouse." +"The <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">PackagingWG</a> is a working group of " +"the Python Software Foundation (PSF) whose goal is to raise and disburse " +"funds to support the ongoing improvement of Python packaging. Most " +"recently it <a href=\"%(otf_award_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">secured an award from the Open " +"Technology Fund</a> whose funding is enabling developers to improve " +"Warehouse's security and accessibility." +msgstr "" +"To <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">PackagingWG</a> είναι μια ομάδα " +"εργασίας του Python Software Foundation (PSF) της οποίας ο στόχος είναι " +"να συγκεντρωθούν και να εκταμιευθούν κεφάλαια για την υποστήριξη της " +"βελτίωσης του Python packaging. Πρόσφατα <a href=\"%(otf_award_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">εξασφάλισε ένα " +"βραβείο από το Open Technology Fund</a> του οποίου η χρηματοδότηση " +"επιτρέπει στους developers να βελτιώσουν την ασφάλεια και την " +"προσβασιμότητα του Warehouse." #: warehouse/templates/pages/help.html:694 #, python-format msgid "" -"PyPI is powered by <a href=\"%(warehouse_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Warehouse</a> and by a variety of tools and " -"services provided by our <a href=\"%(sponsors_href)s\">generous sponsors</a>." +"PyPI is powered by <a href=\"%(warehouse_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Warehouse</a> and by a variety of " +"tools and services provided by our <a href=\"%(sponsors_href)s\">generous" +" sponsors</a>." msgstr "" -"Το PyPI τροφοδοτείται από το <a href=\"%(warehouse_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">Warehouse</a> και από μια ποικιλία από " -"εργαλεία και υπηρεσίες που παρέχονται από τους <a href=\"%(sponsors_href)s" -"\">γενναιόδωρους χορηγούς μας</a>." +"Το PyPI τροφοδοτείται από το <a href=\"%(warehouse_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> και " +"από μια ποικιλία από εργαλεία και υπηρεσίες που παρέχονται από τους <a " +"href=\"%(sponsors_href)s\">γενναιόδωρους χορηγούς μας</a>." #: warehouse/templates/pages/help.html:701 msgid "" -"As of April 16, 2018, PyPI.org is at \"production\" status, meaning that it " -"has moved out of beta and replaced the old site (pypi.python.org). It is now " -"robust, tested, and ready for expected browser and API traffic." +"As of April 16, 2018, PyPI.org is at \"production\" status, meaning that " +"it has moved out of beta and replaced the old site (pypi.python.org). It " +"is now robust, tested, and ready for expected browser and API traffic." msgstr "" -"Από τις 16 Απριλίου 2018, το PyPI.org είναι σε κατάσταση \"παραγωγής\", που " -"σημαίνει ότι έφυγε από το beta στάδιο και αντικατέστησε την παλαιά " -"ιστοσελίδα (pypi.python.org). Είναι πλέον στιβαρό, τεσταρισμένο και έτοιμο " -"για την αναμενόμενη κυκλοφορία σε επίπεδο browser και API." +"Από τις 16 Απριλίου 2018, το PyPI.org είναι σε κατάσταση \"παραγωγής\", " +"που σημαίνει ότι έφυγε από το beta στάδιο και αντικατέστησε την παλαιά " +"ιστοσελίδα (pypi.python.org). Είναι πλέον στιβαρό, τεσταρισμένο και " +"έτοιμο για την αναμενόμενη κυκλοφορία σε επίπεδο browser και API." #: warehouse/templates/pages/help.html:703 #, python-format msgid "" -"PyPI is heavily cached and distributed via <abbr title=\"content delivery " -"network\">CDN</abbr> thanks to our sponsor <a href=\"%(fastly_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Fastly</a> and thus is " -"generally available globally. However, the site is mostly maintained by " -"volunteers, we do not provide any specific Service Level Agreement, and as " -"could be expected for a giant distributed system, things can and sometimes " -"do go wrong. See <a href=\"%(status_page_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">our status page</a> for current and past outages " -"and incidents. If you have high availability requirements for your package " -"index, consider either a <a href=\"%(mirror_href)s\">mirror</a> or a <a href=" -"\"%(private_index_href)s\">private index</a>." -msgstr "" -"Το PyPI χρησιμοποιεί έντονα την cache και διανέμεται μέσω των <abbr title=" -"\"content delivery network\">CDN</abbr> χάρη στον χορηγό μας <a href=" -"\"%(fastly_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Fastly</a> κάνοντας το διαθέσιμο σε όλο τον κόσμο. Ωστόσο, επειδή η " -"ιστοσελίδα συντηρείται κυρίως από εθελοντές και δεν παρέχουμε κάποιο " -"συγκεκριμένο Σύμφωνο Επιπέδου Υπηρεσιών όπως θα ήταν αναμενόμενο για ένα " -"γιγάντια διανεμόμενο σύστημα, τα πράγματα, μπορεί, μερικές φορές, να πάνε " -"στραβά. Δείτε στη <a href=\"%(status_page_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">σελίδα κατάστασής μας</a> για τρέχουσες " -"και παρελθούσες διακοπές και περιστατικά. Αν έχετε απαιτήσεις για υψηλή " -"διαθεσιμότητα ως προς το αποθετήριο πακέτων, σκεφτείτε είτε να υλοποιήσετε " -"κάποιον <a href=\"%(mirror_href)s\">καθρέπτη</a> είτε να φτιάξετε ένα <a " +"PyPI is heavily cached and distributed via <abbr title=\"content delivery" +" network\">CDN</abbr> thanks to our sponsor <a href=\"%(fastly_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Fastly</a> and " +"thus is generally available globally. However, the site is mostly " +"maintained by volunteers, we do not provide any specific Service Level " +"Agreement, and as could be expected for a giant distributed system, " +"things can and sometimes do go wrong. See <a " +"href=\"%(status_page_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">our status page</a> for current and past outages and " +"incidents. If you have high availability requirements for your package " +"index, consider either a <a href=\"%(mirror_href)s\">mirror</a> or a <a " +"href=\"%(private_index_href)s\">private index</a>." +msgstr "" +"Το PyPI χρησιμοποιεί έντονα την cache και διανέμεται μέσω των <abbr " +"title=\"content delivery network\">CDN</abbr> χάρη στον χορηγό μας <a " +"href=\"%(fastly_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Fastly</a> κάνοντας το διαθέσιμο σε όλο τον κόσμο. " +"Ωστόσο, επειδή η ιστοσελίδα συντηρείται κυρίως από εθελοντές και δεν " +"παρέχουμε κάποιο συγκεκριμένο Σύμφωνο Επιπέδου Υπηρεσιών όπως θα ήταν " +"αναμενόμενο για ένα γιγάντια διανεμόμενο σύστημα, τα πράγματα, μπορεί, " +"μερικές φορές, να πάνε στραβά. Δείτε στη <a href=\"%(status_page_href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">σελίδα κατάστασής" +" μας</a> για τρέχουσες και παρελθούσες διακοπές και περιστατικά. Αν έχετε" +" απαιτήσεις για υψηλή διαθεσιμότητα ως προς το αποθετήριο πακέτων, " +"σκεφτείτε είτε να υλοποιήσετε κάποιον <a " +"href=\"%(mirror_href)s\">καθρέπτη</a> είτε να φτιάξετε ένα <a " "href=\"%(private_index_href)s\">ιδιωτικό αποθετήριο</a>." #: warehouse/templates/pages/help.html:717 #, python-format msgid "" -"We have a huge amount of work to do to continue to maintain and improve PyPI " -"(also known as <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">the Warehouse project</a>)." +"We have a huge amount of work to do to continue to maintain and improve " +"PyPI (also known as <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">the Warehouse project</a>)." msgstr "" -"Έχουμε να κάνουμε ένα τεράστιο φόρτο εργασιών προκειμένου να συνεχίσουμε να " -"διατηρούμε και να βελτιώνουμε το PyPI (γνωστό και ως <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">το Warehouse project</" -"a>)." +"Έχουμε να κάνουμε ένα τεράστιο φόρτο εργασιών προκειμένου να συνεχίσουμε " +"να διατηρούμε και να βελτιώνουμε το PyPI (γνωστό και ως <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">το Warehouse project</a>)." #: warehouse/templates/pages/help.html:722 msgid "Financial:" @@ -5374,52 +5444,55 @@ msgstr "Ανάπτυξη:" #: warehouse/templates/pages/help.html:723 msgid "" -"Warehouse is open source, and we would love to see some new faces working on " -"the project. You <strong>do not</strong> need to be an experienced open-" -"source developer to make a contribution – in fact, we'd love to help you " -"make your first open source pull request!" +"Warehouse is open source, and we would love to see some new faces working" +" on the project. You <strong>do not</strong> need to be an experienced " +"open-source developer to make a contribution – in fact, we'd love to help" +" you make your first open source pull request!" msgstr "" -"Το Warehouse είναι ανοικτού-κώδικα και θα χαρούμε πολύ να δούμε νέα πρόσωπα " -"να δουλεύουν σε αυτό το project. <strong>Δεν χρειάζεται</strong> να είστε " -"κάποιος ειδικός προγραμματιστής ανοικτού-κώδικα για να συνεισφέρετε. Στην " -"πραγματικότητα, θα χαρούμε να σας βοηθήσουμε να κάνετε το πρώτο σας pull " -"request ανοικτού-κώδικα!" +"Το Warehouse είναι ανοικτού-κώδικα και θα χαρούμε πολύ να δούμε νέα " +"πρόσωπα να δουλεύουν σε αυτό το project. <strong>Δεν χρειάζεται</strong> " +"να είστε κάποιος ειδικός προγραμματιστής ανοικτού-κώδικα για να " +"συνεισφέρετε. Στην πραγματικότητα, θα χαρούμε να σας βοηθήσουμε να κάνετε" +" το πρώτο σας pull request ανοικτού-κώδικα!" #: warehouse/templates/pages/help.html:725 #, python-format msgid "" "If you have skills in Python, ElasticSearch, HTML, SCSS, JavaScript, or " -"SQLAlchemy then skim our <a href=\"%(getting_started_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">\"Getting started\" guide</" -"a>, then take a look at the <a href=\"%(issue_tracker_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">issue tracker</a>. We've " -"created a <a href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">'Good first issue'</a> label – we recommend you " -"start here." -msgstr "" -"Αν έχετε γνώσεις πάνω σε Python, ElasticSearch, HTML, SCSS, JavaScript, ή " -"SQLAlchemy τότε διαβάστε τον οδηγό μας <a href=\"%(getting_started_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">\"Getting started\"</" -"a> και έπειτα ρίξτε μια ματιά στον <a href=\"%(issue_tracker_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">issue tracker</a>. Έχουμε " -"δημιουργήσει issues με την ετικέτα <a href=\"%(good_first_issue_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">'Good first issue'</" -"a> – προτείνουμε να ξεκινήσετε από εκεί." +"SQLAlchemy then skim our <a href=\"%(getting_started_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">\"Getting " +"started\" guide</a>, then take a look at the <a " +"href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">issue tracker</a>. We've created a <a " +"href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">'Good first issue'</a> label – we recommend you start " +"here." +msgstr "" +"Αν έχετε γνώσεις πάνω σε Python, ElasticSearch, HTML, SCSS, JavaScript, ή" +" SQLAlchemy τότε διαβάστε τον οδηγό μας <a " +"href=\"%(getting_started_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">\"Getting started\"</a> και έπειτα ρίξτε μια ματιά στον " +"<a href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">issue tracker</a>. Έχουμε δημιουργήσει issues με την " +"ετικέτα <a href=\"%(good_first_issue_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">'Good first issue'</a> – προτείνουμε " +"να ξεκινήσετε από εκεί." #: warehouse/templates/pages/help.html:733 #, python-format msgid "" -"Issues are grouped into <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">milestones</a>; working on issues in the current " -"milestone is a great way to help push the project forward. If you're " -"interested in working on a particular issue, leave a comment and we can " -"guide you through the contribution process." +"Issues are grouped into <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">milestones</a>; working on issues in " +"the current milestone is a great way to help push the project forward. If" +" you're interested in working on a particular issue, leave a comment and " +"we can guide you through the contribution process." msgstr "" -"Τα θέματα (issues) είναι κατηγοριοποιημένα σε <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">milestones</a>. Δουλεύοντας " -"πάνω σε issues στο τρέχον milestone θα βοηθήσετε να πάει το project μπροστά. " -"Αν ενδιαφέρεστε να δουλέψετε πάνω σε ένα συγκεκριμένο issue, αφήστε ένα " -"σχόλιο και θα σας καθοδηγήσουμε στη διαδικασία συνεισφοράς." +"Τα θέματα (issues) είναι κατηγοριοποιημένα σε <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">milestones</a>. " +"Δουλεύοντας πάνω σε issues στο τρέχον milestone θα βοηθήσετε να πάει το " +"project μπροστά. Αν ενδιαφέρεστε να δουλέψετε πάνω σε ένα συγκεκριμένο " +"issue, αφήστε ένα σχόλιο και θα σας καθοδηγήσουμε στη διαδικασία " +"συνεισφοράς." #: warehouse/templates/pages/help.html:740 msgid "Stay updated:" @@ -5428,70 +5501,72 @@ msgstr "Μείνετε ενημερωμένοι:" #: warehouse/templates/pages/help.html:741 #, python-format msgid "" -"You can also follow the ongoing development of the project on the <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">distutils-sig mailing list</a> and the <a href=" -"\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">PyPA Dev message group</a>." +"You can also follow the ongoing development of the project on the <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">distutils-sig mailing list</a> and the <a " +"href=\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA Dev message group</a>." msgstr "" -"Μπορείτε, επίσης, να παρακολουθείτε την εξέλιξη της ανάπτυξης του project " -"στη <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">distutils-sig mailing list</a> και στο <a href=" -"\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">PyPA Dev message group</a>." +"Μπορείτε, επίσης, να παρακολουθείτε την εξέλιξη της ανάπτυξης του project" +" στη <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">distutils-sig mailing list</a> και στο" +" <a href=\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\"" +" rel=\"noopener\">PyPA Dev message group</a>." #: warehouse/templates/pages/help.html:751 #, python-format msgid "" -"Changes to PyPI are generally announced on both the <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">pypi-announce mailing list</a> and the <a href=\"%(blog_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PSF blog</a> under " -"the label \"pypi\". The PSF blog also has <a href=\"%(atom_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Atom</a> and <a href=" -"\"%(rss_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</" -"a> feeds for the \"pypi\" label." +"Changes to PyPI are generally announced on both the <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">pypi-announce mailing list</a> and the <a " +"href=\"%(blog_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PSF blog</a> under the label \"pypi\". The PSF blog also" +" has <a href=\"%(atom_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Atom</a> and <a href=\"%(rss_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</a> feeds for " +"the \"pypi\" label." msgstr "" "Οι αλλαγές στο PyPI ανακοινώνονται στη <a href=\"%(mailing_list_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">pypi-announce mailing " -"list</a> και στο <a href=\"%(blog_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">PSF blog</a> κάτω από την ετικέτα \"pypi\". " -"Επίσης, το PSF blog έχει το <a href=\"%(atom_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Atom</a> και το <a href=\"%(rss_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</a> feeds για την " -"ετικέτα \"pypi\"." +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">pypi-announce " +"mailing list</a> και στο <a href=\"%(blog_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">PSF blog</a> κάτω από την ετικέτα " +"\"pypi\". Επίσης, το PSF blog έχει το <a href=\"%(atom_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Atom</a> και το <a" +" href=\"%(rss_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">RSS</a> feeds για την ετικέτα \"pypi\"." #: warehouse/templates/pages/help.html:761 msgid "" -"When Warehouse's maintainers are deploying new features, at first we mark " -"them with a small \"beta feature\" symbol to tell you: this should probably " -"work fine, but it's new and less tested than other site functionality." +"When Warehouse's maintainers are deploying new features, at first we mark" +" them with a small \"beta feature\" symbol to tell you: this should " +"probably work fine, but it's new and less tested than other site " +"functionality." msgstr "" -"Όταν οι συντηρητές του Warehouse ανεβάζουν νέα χαρακτηριστικά, στην αρχή τα " -"μαρκάρουμε με ένα μικρό σύμβολο \"beta feature\" για να σας πούμε: αυτό " -"μάλλον θα δουλέψει κανονικά αλλά είναι νέο και λιγότερο τεσταρισμένο από " -"άλλη λειτουργία της ιστοσελίδας." +"Όταν οι συντηρητές του Warehouse ανεβάζουν νέα χαρακτηριστικά, στην αρχή " +"τα μαρκάρουμε με ένα μικρό σύμβολο \"beta feature\" για να σας πούμε: " +"αυτό μάλλον θα δουλέψει κανονικά αλλά είναι νέο και λιγότερο τεσταρισμένο" +" από άλλη λειτουργία της ιστοσελίδας." +# | msgid "Currently, the following features are in beta:" #: warehouse/templates/pages/help.html:762 #, fuzzy -#| msgid "Currently, the following features are in beta:" msgid "Currently, no features are in beta." msgstr "Προς το παρόν, τα ακόλουθα χαρακτηριστικά είναι σε beta:" #: warehouse/templates/pages/help.html:766 #, python-format msgid "" -"\"PyPI\" should be pronounced like \"pie pea eye\", specifically with the " -"\"PI\" pronounced as individual letters, rather as a single sound. This " -"minimizes confusion with the <a href=\"%(href)s\" title=\"%(title)s\">PyPy</" -"a> project, which is a popular alternative implementation of the Python " -"language." +"\"PyPI\" should be pronounced like \"pie pea eye\", specifically with the" +" \"PI\" pronounced as individual letters, rather as a single sound. This " +"minimizes confusion with the <a href=\"%(href)s\" " +"title=\"%(title)s\">PyPy</a> project, which is a popular alternative " +"implementation of the Python language." msgstr "" -"Το \"PyPI\" θα πρέπει να προφέρεται ως \"pie pea eye\". Ειδικά το \"PI\" θα " -"πρέπει να προφέρεται ως χωριστά γράμματα αντί σαν δίφθογγος. Αυτό μειώνει " -"τυχόν μπέρδεμα με το <a href=\"%(href)s\" title=\"%(title)s\">PyPy</a> " -"project, το οποίο είναι ένα δημοφιλές εναλλακτικό implementation της γλώσσας " -"προγραμματισμού Python." +"Το \"PyPI\" θα πρέπει να προφέρεται ως \"pie pea eye\". Ειδικά το \"PI\" " +"θα πρέπει να προφέρεται ως χωριστά γράμματα αντί σαν δίφθογγος. Αυτό " +"μειώνει τυχόν μπέρδεμα με το <a href=\"%(href)s\" " +"title=\"%(title)s\">PyPy</a> project, το οποίο είναι ένα δημοφιλές " +"εναλλακτικό implementation της γλώσσας προγραμματισμού Python." #: warehouse/templates/pages/help.html:778 msgid "Resources" @@ -5528,22 +5603,23 @@ msgstr "Επικοινωνία" #: warehouse/templates/pages/help.html:789 #, python-format msgid "" -"The <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging Authority (PyPA)</a> is a working group who " -"work together to improve Python packaging. If you'd like to get in touch " -"with a core packaging developer, use <a href=\"%(irc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">#pypa on IRC (freenode)</" -"a>, or <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">join the distutils-sig mailing list</a>." -msgstr "" -"Το <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging Authority (PyPA)</a> είναι μια ομάδα εργασίας, " -"στόχος της οποίας είναι η βελτίωση του Python packaging. Αν θέλετε να έρθετε " -"σε επαφή με κάποιον προγραμματιστή ειδικό στα πακέτα, χρησιμοποιήστε το <a " -"href=\"%(irc_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">#pypa στο IRC (freenode)</a> ή <a href=\"%(mailing_list_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">μπείτε στο distutils-sig " -"mailing list</a>." +"The <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging Authority (PyPA)</a> is a working group" +" who work together to improve Python packaging. If you'd like to get in " +"touch with a core packaging developer, use <a href=\"%(irc_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">#pypa on IRC " +"(freenode)</a>, or <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">join the distutils-sig mailing " +"list</a>." +msgstr "" +"Το <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging Authority (PyPA)</a> είναι μια ομάδα " +"εργασίας, στόχος της οποίας είναι η βελτίωση του Python packaging. Αν " +"θέλετε να έρθετε σε επαφή με κάποιον προγραμματιστή ειδικό στα πακέτα, " +"χρησιμοποιήστε το <a href=\"%(irc_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">#pypa στο IRC (freenode)</a> ή <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">μπείτε στο distutils-sig mailing list</a>." #: warehouse/templates/pages/security.html:15 msgid "Security" @@ -5555,8 +5631,8 @@ msgstr "Αναφορά θέματος ασφάλειας" #: warehouse/templates/pages/security.html:22 msgid "" -"We take security very seriously and ask that you follow our security policy " -"carefully." +"We take security very seriously and ask that you follow our security " +"policy carefully." msgstr "" "Λαμβάνουμε την ασφάλεια πολύ σοβαρά και σας ζητούμε να ακολουθήσετε την " "πολιτική ασφαλείας μας προσεκτικά." @@ -5567,9 +5643,9 @@ msgstr "Σημαντικό!" #: warehouse/templates/pages/security.html:24 msgid "" -"If you believe you've identified a security issue with Warehouse, <strong>DO " -"NOT</strong> report the issue in any public forum, including (but not " -"limited to):" +"If you believe you've identified a security issue with Warehouse, " +"<strong>DO NOT</strong> report the issue in any public forum, including " +"(but not limited to):" msgstr "" "Αν πιστεύετε ότι αναγνωρίσατε κάποιο θέμα ασφάλειας με το Warehouse, " "<strong>ΜΗΝ ΤΟ</strong> αναφέρετε σε κάποιο δημόσιο forum, " @@ -5590,23 +5666,24 @@ msgstr "Επίσημα ή ανεπίσημα mailing lists" #: warehouse/templates/pages/security.html:35 #, python-format msgid "" -"Instead, email <a href=\"%(href)s\">security at python dot org</a> directly, " -"providing as much relevant information as possible." +"Instead, email <a href=\"%(href)s\">security at python dot org</a> " +"directly, providing as much relevant information as possible." msgstr "" -"Αντ' αυτού, στείλτε ένα email απ' ευθείας στο <a href=\"%(href)s\">security " -"at python dot org</a>, παρέχοντας μας όσες περισσότερες πληροφορίες μπορείτε " -"σχετικά με το θέμα." +"Αντ' αυτού, στείλτε ένα email απ' ευθείας στο <a " +"href=\"%(href)s\">security at python dot org</a>, παρέχοντας μας όσες " +"περισσότερες πληροφορίες μπορείτε σχετικά με το θέμα." #: warehouse/templates/pages/security.html:36 #, python-format msgid "" "Messages may be optionally encrypted with GPG using key fingerprints " -"available <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">at the Python Security page</a>." +"available <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">at the Python Security page</a>." msgstr "" -"Τα μηνύματα μπορούν, προαιρετικά, να κρυπτογραφηθούν με GPG χρησιμοποιώντας " -"τα key fingerprints που είναι διαθέσιμα στη σελίδα <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Security</a>." +"Τα μηνύματα μπορούν, προαιρετικά, να κρυπτογραφηθούν με GPG " +"χρησιμοποιώντας τα key fingerprints που είναι διαθέσιμα στη σελίδα <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Security</a>." #: warehouse/templates/pages/security.html:38 msgid "What happens next?" @@ -5616,15 +5693,13 @@ msgstr "Τι γίνεται μετά;" msgid "" "Once you've submitted an issue via email, you should receive an " "acknowledgment within 48 hours." -msgstr "" -"Όταν καταθέσετε ένα θέμα μέσω email, θα λάβετε αναγνώριση μέσα σε 48 ώρες." +msgstr "Όταν καταθέσετε ένα θέμα μέσω email, θα λάβετε αναγνώριση μέσα σε 48 ώρες." #: warehouse/templates/pages/security.html:41 msgid "" "Depending on the action to be taken, you may receive further follow-up " "emails." -msgstr "" -"Ανάλογα με την ενέργεια που πρέπει να παρθεί, ίσως λάβετε και άλλα emails." +msgstr "Ανάλογα με την ενέργεια που πρέπει να παρθεί, ίσως λάβετε και άλλα emails." #: warehouse/templates/pages/security.html:44 msgid "This security policy was last updated on March 14, 2018." @@ -5663,9 +5738,9 @@ msgstr "Πολιτική ασφάλειας" msgid "Sponsor the Packaging Working Group" msgstr "" +# | msgid "Search and filter projects" #: warehouse/templates/pages/sponsor.html:23 #, fuzzy -#| msgid "Search and filter projects" msgid "Sponsor PyPI and related projects" msgstr "Αναζήτηση και φιλτράρισμα projects" @@ -5673,23 +5748,24 @@ msgstr "Αναζήτηση και φιλτράρισμα projects" msgid "Donate to the Packaging Working Group" msgstr "" +# | msgid "" +# | "The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" +# | "\"noopener\">PyPA</a> is an independent group of developers whose goal is +# " +# | "to improve and maintain many of the core projects related to Python " +# | "packaging." #: warehouse/templates/pages/sponsor.html:27 #, fuzzy, python-format -#| msgid "" -#| "The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -#| "\"noopener\">PyPA</a> is an independent group of developers whose goal is " -#| "to improve and maintain many of the core projects related to Python " -#| "packaging." -msgid "" -"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Packaging Working Group</a> is a work group of the Python Software " -"Foundation which raises and distributes funds to improve Python's packaging " -"ecosystem." -msgstr "" -"Το <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPA</a> είναι μια ανεξάρτητη ομάδα από developers των οποίων ο στόχος " -"είναι η βελτίωση και η διατήρηση πολλών κεντρικών projects σχετικά με το " -"Python packaging." +msgid "" +"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Packaging Working Group</a> is a work group of the " +"Python Software Foundation which raises and distributes funds to improve " +"Python's packaging ecosystem." +msgstr "" +"Το <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA</a> είναι μια ανεξάρτητη ομάδα από developers των " +"οποίων ο στόχος είναι η βελτίωση και η διατήρηση πολλών κεντρικών " +"projects σχετικά με το Python packaging." #: warehouse/templates/pages/sponsor.html:29 msgid "Recent projects funded through the working group include:" @@ -5701,86 +5777,93 @@ msgid "" "'Warehouse' codebase" msgstr "" +# | msgid "" +# | "Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" +# | "\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" +# title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/sponsor.html:33 #, fuzzy, python-format -#| msgid "" -#| "Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -#| "\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$170,000 in funding</a> from the <a href=\"%(funder_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Mozilla Open Source " -"Support Program</a> in 2018" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$170,000 in funding</a> from the <a " +"href=\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Mozilla Open Source Support Program</a> in 2018" msgstr "" -"Η εφαρμογή Duo Mobile για <a href=\"%(android_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Android</a> ή για <a href=\"%(ios_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Η εφαρμογή Duo Mobile για <a href=\"%(android_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Android</a> ή για " +"<a href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/sponsor.html:36 msgid "" -"Improving PyPI's security and accessibility, and adding support for multiple " -"locales" +"Improving PyPI's security and accessibility, and adding support for " +"multiple locales" msgstr "" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:37 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" -"With $80,000 in funding from the <a href=\"%(funder_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology Fund</a> in " -"2019" +"With $80,000 in funding from the <a href=\"%(funder_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology " +"Fund</a> in 2019" msgstr "" -"Μάθετε πως να ανεβάζετε αρχεία στο <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" +"Μάθετε πως να ανεβάζετε αρχεία στο <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" #: warehouse/templates/pages/sponsor.html:40 msgid "Additional security-focused features for PyPI" msgstr "" +# | msgid "" +# | "Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" +# | "\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" +# title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/sponsor.html:41 #, fuzzy, python-format -#| msgid "" -#| "Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -#| "\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$100,000 in funding</a> from <a href=\"%(funder_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Facebook Research</a> in " -"2019 and 2020" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$100,000 in funding</a> from <a href=\"%(funder_href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Facebook " +"Research</a> in 2019 and 2020" msgstr "" -"Η εφαρμογή Duo Mobile για <a href=\"%(android_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Android</a> ή για <a href=\"%(ios_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Η εφαρμογή Duo Mobile για <a href=\"%(android_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Android</a> ή για " +"<a href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/sponsor.html:44 msgid "Overhauling pip's user experience and dependency resolver" msgstr "" +# | msgid "" +# | "Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" " +# | "target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s" +# | "\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</" +# | "a> and <a href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" +# " +# | "rel=\"noopener\">Thetis</a>." #: warehouse/templates/pages/sponsor.html:45 #, fuzzy, python-format -#| msgid "" -#| "Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s" -#| "\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</" -#| "a> and <a href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Thetis</a>." -msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$407,000 in funding</a> from the <a href=\"%(funder0_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Chan Zuckerberg " -"Initiative</a> and the <a href=\"%(funder1_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Mozilla Open Source Support Program</a> " -"in 2020" -msgstr "" -"Δημοφιλή κλειδιά αποτελούν τα <a href=\"%(yubikey_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</a> " -"και <a href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Thetis</a>." +msgid "" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$407,000 in funding</a> from the <a " +"href=\"%(funder0_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Chan Zuckerberg Initiative</a> and the <a " +"href=\"%(funder1_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Mozilla Open Source Support Program</a> in 2020" +msgstr "" +"Δημοφιλή κλειδιά αποτελούν τα <a href=\"%(yubikey_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> και <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." #: warehouse/templates/pages/sponsor.html:49 msgid "" @@ -5788,9 +5871,9 @@ msgid "" "improvements, benefiting millions of Python users around the world." msgstr "" +# | msgid "Common questions" #: warehouse/templates/pages/sponsor.html:57 #, fuzzy -#| msgid "Common questions" msgid "Community donations" msgstr "Κοινές ερωτήσεις" @@ -5798,36 +5881,38 @@ msgstr "Κοινές ερωτήσεις" msgid "We greatly appreciate both one-time and recurring donations." msgstr "" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:61 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" -"For US taxpayers, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">your donation may be tax-deductible</a>." +"For US taxpayers, <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">your donation may be tax-" +"deductible</a>." msgstr "" -"Μάθετε πως να ανεβάζετε αρχεία στο <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" +"Μάθετε πως να ανεβάζετε αρχεία στο <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" #: warehouse/templates/pages/sponsor.html:62 msgid "Every donation counts!" msgstr "" +# | msgid "Donate" #: warehouse/templates/pages/sponsor.html:65 #, fuzzy -#| msgid "Donate" msgid "Donate here" msgstr "Δωρίστε" +# | msgid "Go to <a href=\"%(href)s\">reset your password</a>." #: warehouse/templates/pages/sponsor.html:66 #, fuzzy, python-format -#| msgid "Go to <a href=\"%(href)s\">reset your password</a>." -msgid "" -"Donating over $5,000? <a href=\"%(href)s\">Become a sponsor</a> instead." +msgid "Donating over $5,000? <a href=\"%(href)s\">Become a sponsor</a> instead." msgstr "" -"Μεταβείτε στο σύνδεσμο <a href=\"%(href)s\">για μηδενισμό του κωδικού σας</" -"a>." +"Μεταβείτε στο σύνδεσμο <a href=\"%(href)s\">για μηδενισμό του κωδικού " +"σας</a>." #: warehouse/templates/pages/sponsor.html:77 msgid "Get your logo on PyPI.org" @@ -5835,8 +5920,8 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:78 msgid "" -"Looking for brand visibility? In the last year*, 21.1 million people from " -"237 countries visited PyPI.org." +"Looking for brand visibility? In the last year*, 21.1 million people from" +" 237 countries visited PyPI.org." msgstr "" #: warehouse/templates/pages/sponsor.html:79 @@ -5849,8 +5934,8 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:83 msgid "" -"Funds raised by the packaging working group go directly towards improving " -"the tools your company uses every day." +"Funds raised by the packaging working group go directly towards improving" +" the tools your company uses every day." msgstr "" #: warehouse/templates/pages/sponsor.html:86 @@ -5859,13 +5944,13 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:87 msgid "" -"Enhance your company's reputation by investing in Python and the open source " -"community." +"Enhance your company's reputation by investing in Python and the open " +"source community." msgstr "" +# | msgid "Uploading packages" #: warehouse/templates/pages/sponsor.html:96 #, fuzzy -#| msgid "Uploading packages" msgid "Sponsorship packages" msgstr "Ανέβασμα πακέτων" @@ -5887,19 +5972,21 @@ msgid "" "perpetuity</strong>" msgstr "" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:112 #: warehouse/templates/pages/sponsor.html:133 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" -"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation " -"blog</a>" +"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation blog</a>" msgstr "" -"Μάθετε πως να ανεβάζετε αρχεία στο <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" +"Μάθετε πως να ανεβάζετε αρχεία στο <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" #: warehouse/templates/pages/sponsor.html:116 #: warehouse/templates/pages/sponsor.html:139 @@ -5921,7 +6008,8 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:130 msgid "" -"Logo in a <strong>prominent position</strong> on the PyPI project detail page" +"Logo in a <strong>prominent position</strong> on the PyPI project detail " +"page" msgstr "" #: warehouse/templates/pages/sponsor.html:131 @@ -5936,39 +6024,41 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:243 #, python-format msgid "" -"Logo <strong>and write up</strong> on the <a href=\"%(href)s\">PyPI sponsors " -"page</a>" +"Logo <strong>and write up</strong> on the <a href=\"%(href)s\">PyPI " +"sponsors page</a>" msgstr "" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:134 #: warehouse/templates/pages/sponsor.html:157 #: warehouse/templates/pages/sponsor.html:180 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" "<strong>Quarterly</strong> thank you tweet from the <a href=\"%(href)s\" " "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " "Foundation</a>" msgstr "" -"Μάθετε πως να ανεβάζετε αρχεία στο <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" +"Μάθετε πως να ανεβάζετε αρχεία στο <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" +# | msgid "" +# | "PyPI supports any device that adheres to the <a href=\"%(href)s\" title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." #: warehouse/templates/pages/sponsor.html:135 #: warehouse/templates/pages/sponsor.html:158 #: warehouse/templates/pages/sponsor.html:181 #, fuzzy, python-format -#| msgid "" -#| "PyPI supports any device that adheres to the <a href=\"%(href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." msgid "" "<strong>Quarterly</strong> thank you tweet from the <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</" -"a>" +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" -"Το PyPI υποστηρίζει κάθε συσκευή που εμμένει στο <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO στάνταρ</a>." +"Το PyPI υποστηρίζει κάθε συσκευή που εμμένει στο <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO στάνταρ</a>." #: warehouse/templates/pages/sponsor.html:148 msgid "Platinum" @@ -5980,28 +6070,28 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:153 msgid "" -"Logo on <strong>high rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>high rotation</strong> in a prominent position on the " +"PyPI project detail page" msgstr "" +# | msgid "" +# | "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +# | "rel=\"noopener\">Python Packaging User Guide</a> for details on the " +# | "available formats." #: warehouse/templates/pages/sponsor.html:156 #: warehouse/templates/pages/sponsor.html:179 #: warehouse/templates/pages/sponsor.html:201 #: warehouse/templates/pages/sponsor.html:222 #, fuzzy, python-format -#| msgid "" -#| "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Python Packaging User Guide</a> for details on the " -#| "available formats." msgid "" "Inclusion in a blog post on the <a href=\"%(href)s\" title=\"%(title)s\" " "target=\"_blank\" rel=\"noopener\">Python Software Foundation blog</a>, " -"<strong>with other sponsors</strong> whose sponsorship commenced during the " -"same quarter" +"<strong>with other sponsors</strong> whose sponsorship commenced during " +"the same quarter" msgstr "" -"Αναφερθείτε στο <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Python Packaging User Guide</a> για λεπτομέρειες σχετικά με " -"τις διαθέσιμες μορφές." +"Αναφερθείτε στο <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> για " +"λεπτομέρειες σχετικά με τις διαθέσιμες μορφές." #: warehouse/templates/pages/sponsor.html:171 msgid "Gold" @@ -6013,8 +6103,8 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:176 msgid "" -"Logo on <strong>medium rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>medium rotation</strong> in a prominent position on the " +"PyPI project detail page" msgstr "" #: warehouse/templates/pages/sponsor.html:194 @@ -6027,44 +6117,48 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:199 msgid "" -"Logo on <strong>low rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>low rotation</strong> in a prominent position on the PyPI" +" project detail page" msgstr "" +# | msgid "Go to <a href=\"%(href)s\">reset your password</a>." #: warehouse/templates/pages/sponsor.html:200 #: warehouse/templates/pages/sponsor.html:221 #, fuzzy, python-format -#| msgid "Go to <a href=\"%(href)s\">reset your password</a>." msgid "Logo on the <a href=\"%(href)s\">PyPI sponsors page</a>" msgstr "" -"Μεταβείτε στο σύνδεσμο <a href=\"%(href)s\">για μηδενισμό του κωδικού σας</" -"a>." +"Μεταβείτε στο σύνδεσμο <a href=\"%(href)s\">για μηδενισμό του κωδικού " +"σας</a>." +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:202 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" "<strong>Bi-yearly</strong> thank you tweet from the <a href=\"%(href)s\" " "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " "Foundation</a>" msgstr "" -"Μάθετε πως να ανεβάζετε αρχεία στο <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" +"Μάθετε πως να ανεβάζετε αρχεία στο <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:203 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" "<strong>Bi-yearly</strong> thank you tweet from the <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</" -"a>" +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" -"Μάθετε πως να ανεβάζετε αρχεία στο <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" +"Μάθετε πως να ανεβάζετε αρχεία στο <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" #: warehouse/templates/pages/sponsor.html:216 msgid "Bronze" @@ -6074,94 +6168,100 @@ msgstr "" msgid "$5,000 per year, or equivalent in donated services" msgstr "" +# | msgid "" +# | "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +# | "rel=\"noopener\">Python Packaging User Guide</a> for details on the " +# | "available formats." #: warehouse/templates/pages/sponsor.html:223 #, fuzzy, python-format -#| msgid "" -#| "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Python Packaging User Guide</a> for details on the " -#| "available formats." msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a> (on initial sponsorship, and on each subsequent renewal)" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a> (on initial sponsorship, and on each subsequent renewal)" msgstr "" -"Αναφερθείτε στο <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Python Packaging User Guide</a> για λεπτομέρειες σχετικά με " -"τις διαθέσιμες μορφές." +"Αναφερθείτε στο <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> για " +"λεπτομέρειες σχετικά με τις διαθέσιμες μορφές." +# | msgid "" +# | "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +# | "rel=\"noopener\">Python Packaging User Guide</a> for details on the " +# | "available formats." #: warehouse/templates/pages/sponsor.html:224 #, fuzzy, python-format -#| msgid "" -#| "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Python Packaging User Guide</a> for details on the " -#| "available formats." msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</a> " -"(on initial sponsorship, and on each subsequent renewal)" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a> (on initial sponsorship, and on each subsequent renewal)" msgstr "" -"Αναφερθείτε στο <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Python Packaging User Guide</a> για λεπτομέρειες σχετικά με " -"τις διαθέσιμες μορφές." +"Αναφερθείτε στο <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> για " +"λεπτομέρειες σχετικά με τις διαθέσιμες μορφές." #: warehouse/templates/pages/sponsor.html:238 msgid "One time grants / custom donations" msgstr "" +# | msgid "" +# | "Learn how to create a new release on the <a href=\"%(href)s\" title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " +# | "Guide</a>" #: warehouse/templates/pages/sponsor.html:239 #, fuzzy, python-format -#| msgid "" -#| "Learn how to create a new release on the <a href=\"%(href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -#| "Guide</a>" msgid "" -"Sponsorship of a specific feature, feature set, or community sprint, valued " -"at over $50,000. See <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">fundable packaging improvements</a> for ideas." +"Sponsorship of a specific feature, feature set, or community sprint, " +"valued at over $50,000. See <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">fundable packaging improvements</a> " +"for ideas." msgstr "" -"Μάθετε πως να δημιουργήσετε μια νέα έκδοση στο <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>" +"Μάθετε πως να δημιουργήσετε μια νέα έκδοση στο <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" +# | msgid "" +# | "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +# | "rel=\"noopener\">Python Packaging User Guide</a> for details on the " +# | "available formats." #: warehouse/templates/pages/sponsor.html:244 #, fuzzy, python-format -#| msgid "" -#| "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Python Packaging User Guide</a> for details on the " -#| "available formats." msgid "" -"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation " -"blog</a>, explaining what the funds will be used for" +"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation blog</a>, explaining what the funds will be used for" msgstr "" -"Αναφερθείτε στο <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Python Packaging User Guide</a> για λεπτομέρειες σχετικά με " -"τις διαθέσιμες μορφές." +"Αναφερθείτε στο <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> για " +"λεπτομέρειες σχετικά με τις διαθέσιμες μορφές." +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:245 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a>" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a>" msgstr "" -"Μάθετε πως να ανεβάζετε αρχεία στο <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" +"Μάθετε πως να ανεβάζετε αρχεία στο <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:246 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</a>" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" -"Μάθετε πως να ανεβάζετε αρχεία στο <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" +"Μάθετε πως να ανεβάζετε αρχεία στο <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" #: warehouse/templates/pages/sponsor.html:248 msgid "" @@ -6176,8 +6276,8 @@ msgstr "Στατιστικά PyPI" #: warehouse/templates/pages/stats.html:23 msgid "" "We all love stats, so here are some useful statistics about PyPI. The " -"statistics page is cached for 24 hours, so don't expect the numbers to be " -"realtime." +"statistics page is cached for 24 hours, so don't expect the numbers to be" +" realtime." msgstr "" "Αγαπάμε όλα τα στατιστικά. Ορίστε μερικά χρήσιμα σχετικά με το PyPI. Η " "σελίδα στατιστικών γίνεται cached για 24 ώρες, οπότε μην περιμένετε οι " @@ -6187,17 +6287,17 @@ msgstr "" msgid "Top projects by total package size" msgstr "" +# | msgid "" +# | "Here is a list of the top 100 packages based on sum of their packages " +# | "sizes (in bytes)." #: warehouse/templates/pages/stats.html:32 #, fuzzy -#| msgid "" -#| "Here is a list of the top 100 packages based on sum of their packages " -#| "sizes (in bytes)." msgid "" -"Here is a list of the top 100 projects based on the sum of their packages' " -"sizes (in bytes)." +"Here is a list of the top 100 projects based on the sum of their " +"packages' sizes (in bytes)." msgstr "" -"Ορίστε μια λίστα με τα 100 κορυφαία πακέτα βασισμένα στο συνολικό μέγεθος " -"πακέτου (σε bytes)." +"Ορίστε μια λίστα με τα 100 κορυφαία πακέτα βασισμένα στο συνολικό μέγεθος" +" πακέτου (σε bytes)." #: warehouse/templates/pages/stats.html:39 msgid "Statistics by project" @@ -6349,7 +6449,8 @@ msgstr[1] "" #~ msgid "A new collaborator has been added to a project you own on PyPI:" #~ msgstr "" -#~ "Ένας νέος συνεργάτης έχει προστεθεί σε ένα project που κατέχετε στο PyPI:" +#~ "Ένας νέος συνεργάτης έχει προστεθεί σε" +#~ " ένα project που κατέχετε στο PyPI:" #~ msgid "<strong>Username</strong>: %(username)s" #~ msgstr "<strong>Όνομα χρήστη</strong>: %(username)s" @@ -6364,54 +6465,47 @@ msgstr[1] "" #~ msgstr "<strong>Προστέθηκε από</strong>: %(submitter)s" #~ msgid "" -#~ "If this was a mistake, you can email <a href=\"%(href)s\">" -#~ "%(email_address)s</a> to communicate with the PyPI administrators." +#~ "If this was a mistake, you can " +#~ "email <a href=\"%(href)s\">%(email_address)s</a> to" +#~ " communicate with the PyPI administrators." #~ msgstr "" -#~ "Αν αυτό ήταν λάθος, μπορείτε να στείλετε ένα email στο <a href=\"%(href)s" -#~ "\">%(email_address)s</a> για να επικοινωνήσετε με τους διαχειριστές του " +#~ "Αν αυτό ήταν λάθος, μπορείτε να " +#~ "στείλετε ένα email στο <a " +#~ "href=\"%(href)s\">%(email_address)s</a> για να " +#~ "επικοινωνήσετε με τους διαχειριστές του " #~ "PyPI." #~ msgid "You are receiving this because you are an owner of this project." #~ msgstr "Το λαμβάνετε αυτό επειδή είστε ένας κάτοχος αυτού του project." -#, fuzzy -#~| msgid "This project has no releases" #~ msgid "The project %(project)s has been deleted." #~ msgstr "Αυτό το project δεν έχει κυκλοφορίες" -#, fuzzy -#~| msgid "<strong>Added by</strong>: %(submitter)s" #~ msgid "" #~ "<strong>Deleted by:</strong> %(submitter)s with a role:\n" #~ " %(role)s." #~ msgstr "<strong>Προστέθηκε από</strong>: %(submitter)s" -#, fuzzy -#~| msgid "" -#~| "If this was a mistake, you can email <a href=\"%(href)s\">" -#~| "%(email_address)s</a> to communicate with the PyPI administrators." #~ msgid "" #~ "If this was a mistake, you can email <a\n" -#~ " href=\"%(href)s\">%(email_address)s</a> to communicate with the PyPI " -#~ "administrators." +#~ " href=\"%(href)s\">%(email_address)s</a> to " +#~ "communicate with the PyPI administrators." #~ msgstr "" -#~ "Αν αυτό ήταν λάθος, μπορείτε να στείλετε ένα email στο <a href=\"%(href)s" -#~ "\">%(email_address)s</a> για να επικοινωνήσετε με τους διαχειριστές του " +#~ "Αν αυτό ήταν λάθος, μπορείτε να " +#~ "στείλετε ένα email στο <a " +#~ "href=\"%(href)s\">%(email_address)s</a> για να " +#~ "επικοινωνήσετε με τους διαχειριστές του " #~ "PyPI." -#, fuzzy -#~| msgid "You are receiving this because you are an owner of this project." #~ msgid "" -#~ "You are receiving this because you are %(recipient_role_descr)s of this " -#~ "project." +#~ "You are receiving this because you " +#~ "are %(recipient_role_descr)s of this project." #~ msgstr "Το λαμβάνετε αυτό επειδή είστε ένας κάτοχος αυτού του project." -#, fuzzy -#~| msgid "You are receiving this because you are an owner of this project." #~ msgid "" #~ "\n" -#~ "You are receiving this because you are %(recipient_role_descr)s of this " -#~ "project." +#~ "You are receiving this because you " +#~ "are %(recipient_role_descr)s of this project." #~ msgstr "Το λαμβάνετε αυτό επειδή είστε ένας κάτοχος αυτού του project." #~ msgid "View <span>hashes</span>" @@ -6421,65 +6515,92 @@ msgstr[1] "" #~ msgstr "Beta χαρακτηριστικό" #~ msgid "" -#~ "If you lose your %(method)s and can no longer log in, the PyPI team " -#~ "<strong>cannot</strong> currently help you recover your account. We plan " -#~ "to develop a <a href=\"%(policy_href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">manual account recovery policy</a> and " -#~ "implement <a href=\"%(recovery_codes_href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">account recovery codes</a> to address this " -#~ "issue." +#~ "If you lose your %(method)s and " +#~ "can no longer log in, the PyPI " +#~ "team <strong>cannot</strong> currently help " +#~ "you recover your account. We plan " +#~ "to develop a <a href=\"%(policy_href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">manual account recovery policy</a>" +#~ " and implement <a " +#~ "href=\"%(recovery_codes_href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\">account recovery " +#~ "codes</a> to address this issue." #~ msgstr "" -#~ "Αν χάσετε τα %(method)s και δεν μπορείτε πλέον να συνδεθείτε, οι ομάδα " -#~ "του PyPI <strong>δεν θα μπορεί</strong>, προσωρινά, να σας βοηθήσει να " -#~ "ανακτήσετε τον λογαριασμό σας. Για να διευθετήσουμε αυτό το θέμα, " -#~ "προγραμματίζουμε να αναπτύξουμε μια <a href=\"%(policy_href)s\" title=" -#~ "\"%(title)s\" target=\"_blank\" rel=\"noopener\">πολιτική χειροκίνητης " -#~ "ανάκτησης λογαριασμού</a> και να δημιουργήσουμε <a href=" -#~ "\"%(recovery_codes_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -#~ "\"noopener\">κωδικούς ανάκτησης λογαριασμού</a>." +#~ "Αν χάσετε τα %(method)s και δεν " +#~ "μπορείτε πλέον να συνδεθείτε, οι ομάδα" +#~ " του PyPI <strong>δεν θα μπορεί</strong>," +#~ " προσωρινά, να σας βοηθήσει να " +#~ "ανακτήσετε τον λογαριασμό σας. Για να" +#~ " διευθετήσουμε αυτό το θέμα, " +#~ "προγραμματίζουμε να αναπτύξουμε μια <a " +#~ "href=\"%(policy_href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\">πολιτική χειροκίνητης" +#~ " ανάκτησης λογαριασμού</a> και να " +#~ "δημιουργήσουμε <a href=\"%(recovery_codes_href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">κωδικούς ανάκτησης λογαριασμού</a>." #~ msgid "" #~ "\n" -#~ " In the short term, we recommend that all PyPI users set up " -#~ "<em>both</em>\n" -#~ " supported two factor authentication methods - using an " -#~ "authentication\n" -#~ " application <em>and</em> setting up a security device (e.g. USB " -#~ "key).\n" +#~ " In the short term, we " +#~ "recommend that all PyPI users set " +#~ "up <em>both</em>\n" +#~ " supported two factor authentication" +#~ " methods - using an authentication\n" +#~ " application <em>and</em> setting up" +#~ " a security device (e.g. USB key)." +#~ "\n" #~ " " #~ msgstr "" #~ "\n" -#~ " Βραχυπρόθεσμα, συνιστούμε όλοι οι χρήστης του PyPI να ρυθμίσουν " -#~ "<em>και τις δυο</em>\n" -#~ " υποστηριζόμενες μεθόδους πιστοποίησης δυο-παραγόντων - " -#~ "χρησιμοποιώντας μια εφαρμογή\n" -#~ " πιστοποίησης <em>και</em> ρυθμίζοντας μια συσκευή ασφαλείας (πχ " -#~ "USB key).\n" +#~ " Βραχυπρόθεσμα, συνιστούμε όλοι οι " +#~ "χρήστης του PyPI να ρυθμίσουν <em>και" +#~ " τις δυο</em>\n" +#~ " υποστηριζόμενες μεθόδους πιστοποίησης " +#~ "δυο-παραγόντων - χρησιμοποιώντας μια εφαρμογή" +#~ "\n" +#~ " πιστοποίησης <em>και</em> ρυθμίζοντας " +#~ "μια συσκευή ασφαλείας (πχ USB key).\n" +#~ "" #~ " " #~ msgid "Top storage users" #~ msgstr "Κορυφαίοι χρήστες" #~ msgid "" -#~ "There is currently no established process for performing this " -#~ "administrative task that is explicit and fair for all parties. However, " -#~ "one is currently in development per <a href=\"%(href)s\" title=\"%(title)s" -#~ "\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python enhancement " +#~ "There is currently no established " +#~ "process for performing this administrative " +#~ "task that is explicit and fair for" +#~ " all parties. However, one is " +#~ "currently in development per <a " +#~ "href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\"" +#~ " rel=\"noopener\"><abbr title=\"Python enhancement " #~ "proposal\">PEP</abbr> 541</a>." #~ msgstr "" -#~ "Προς το παρόν, δεν υπάρχει κάποια καθιερωμένη διαδικασία για την εκτέλεση " -#~ "αυτής της διαχειριστικής εργασίας, η οποία να είναι σαφής και δίκαιη για " -#~ "όλα τα μέρη. Ωστόσο, το ένα είναι προς το παρόν σε ανάπτυξη σύμφωνα με το " -#~ "<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -#~ "\"><abbr title=\"Python enhancement proposal\">PEP</abbr> 541</a>." +#~ "Προς το παρόν, δεν υπάρχει κάποια " +#~ "καθιερωμένη διαδικασία για την εκτέλεση " +#~ "αυτής της διαχειριστικής εργασίας, η " +#~ "οποία να είναι σαφής και δίκαιη " +#~ "για όλα τα μέρη. Ωστόσο, το ένα" +#~ " είναι προς το παρόν σε ανάπτυξη " +#~ "σύμφωνα με το <a href=\"%(href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\"><abbr title=\"Python enhancement " +#~ "proposal\">PEP</abbr> 541</a>." #~ msgid "" -#~ "<abbr title=\"Python enhancement proposal\">PEP</abbr> 541 has been " -#~ "accepted, and PyPI is <a href=\"%(href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">creating a workflow</a> which will be " -#~ "documented here." +#~ "<abbr title=\"Python enhancement " +#~ "proposal\">PEP</abbr> 541 has been accepted," +#~ " and PyPI is <a href=\"%(href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">creating a workflow</a> which " +#~ "will be documented here." #~ msgstr "" -#~ "Το <abbr title=\"Python enhancement proposal\">PEP</abbr> 541 έγινε " -#~ "αποδεκτό και το PyPI <a href=\"%(href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">δημιουργεί μια ροή εργασίας</a> η οποία θα " -#~ "τεκμηριωθεί εδώ." +#~ "Το <abbr title=\"Python enhancement " +#~ "proposal\">PEP</abbr> 541 έγινε αποδεκτό και" +#~ " το PyPI <a href=\"%(href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">δημιουργεί μια ροή εργασίας</a> " +#~ "η οποία θα τεκμηριωθεί εδώ." + diff --git a/warehouse/locale/es/LC_MESSAGES/messages.mo b/warehouse/locale/es/LC_MESSAGES/messages.mo index acac8f6ef3e7..2f3836ca4996 100644 Binary files a/warehouse/locale/es/LC_MESSAGES/messages.mo and b/warehouse/locale/es/LC_MESSAGES/messages.mo differ diff --git a/warehouse/locale/es/LC_MESSAGES/messages.po b/warehouse/locale/es/LC_MESSAGES/messages.po index 4d8e7641703b..8381c14cfa32 100644 --- a/warehouse/locale/es/LC_MESSAGES/messages.po +++ b/warehouse/locale/es/LC_MESSAGES/messages.po @@ -1,29 +1,3 @@ -# Translations template for Warehouse. -# Copyright (C) 2019 PyPA -# This file is distributed under the same license as the Warehouse project. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2019. -# Adolfo Jayme Barrientos <fitojb@ubuntu.com>, 2019, 2020. -# Alan Velasco <AlanVelasco.A@gmail.com>, 2019. -# Katia Lira <katialira.villena@gmail.com>, 2019. -# Juan Funez <juan.funez@gmail.com>, 2019. -# anonymous <noreply@weblate.org>, 2020. -msgid "" -msgstr "" -"Project-Id-Version: Warehouse VERSION\n" -"Report-Msgid-Bugs-To: https://github.com/pypa/warehouse/issues/new\n" -"POT-Creation-Date: 2020-01-15 20:11+0200\n" -"PO-Revision-Date: 2020-04-04 04:54+0000\n" -"Last-Translator: Adolfo Jayme Barrientos <fitojb@ubuntu.com>\n" -"Language-Team: Spanish <https://hosted.weblate.org/projects/pypa/warehouse/" -"es/>\n" -"Language: es\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.0-dev\n" -"Generated-By: Babel 2.7.0\n" - #: warehouse/views.py:254 msgid "Locale updated" msgstr "Se actualizó la configuración de idioma" @@ -43,20 +17,21 @@ msgstr "Elija un nombre de usuario de 50 caracteres o menos." #: warehouse/accounts/forms.py:85 msgid "" "The username is invalid. Usernames must be composed of letters, numbers, " -"dots, hyphens and underscores. And must also start and finish with a letter " -"or number. Choose a different username." +"dots, hyphens and underscores. And must also start and finish with a " +"letter or number. Choose a different username." msgstr "" -"El nombre de usuario no es válido. Los nombres de usuario deben componerse " -"de letras, números, puntos, guiones y guiones bajos; además, deben comenzar " -"y finalizar por una letra o un número. Elíjase otro nombre de usuario." +"El nombre de usuario no es válido. Los nombres de usuario deben " +"componerse de letras, números, puntos, guiones y guiones bajos; además, " +"deben comenzar y finalizar por una letra o un número. Elíjase otro nombre" +" de usuario." #: warehouse/accounts/forms.py:99 msgid "" -"This username is already being used by another account. Choose a different " -"username." +"This username is already being used by another account. Choose a " +"different username." msgstr "" -"Otra cuenta ya utiliza este nombre de usuario. Elija un nombre de usuario " -"distinto." +"Otra cuenta ya utiliza este nombre de usuario. Elija un nombre de usuario" +" distinto." #: warehouse/accounts/forms.py:122 msgid "The password is invalid. Try again." @@ -84,16 +59,16 @@ msgstr "" #: warehouse/accounts/forms.py:209 msgid "" -"This email address is already being used by this account. Use a different " -"email." +"This email address is already being used by this account. Use a different" +" email." msgstr "" "Otra cuenta ya utiliza esta dirección de correo. Utilice una dirección " "distinta." #: warehouse/accounts/forms.py:216 msgid "" -"This email address is already being used by another account. Use a different " -"email." +"This email address is already being used by another account. Use a " +"different email." msgstr "" "Otra cuenta ya utiliza esta dirección de correo. Utilice una dirección " "distinta." @@ -101,7 +76,8 @@ msgstr "" #: warehouse/accounts/forms.py:238 msgid "The name is too long. Choose a name with 100 characters or less." msgstr "" -"El nombre es demasiado extenso. Elija un nombre con 100 caracteres o menos." +"El nombre es demasiado extenso. Elija un nombre con 100 caracteres o " +"menos." #: warehouse/accounts/forms.py:302 msgid "Invalid TOTP code." @@ -141,21 +117,21 @@ msgstr "" #: warehouse/accounts/views.py:455 msgid "" -"New user registration temporarily disabled. See https://pypi.org/help#admin-" -"intervention for details." +"New user registration temporarily disabled. See https://pypi.org/help" +"#admin-intervention for details." msgstr "" "Se desactivaron temporalmente las altas de usuarios nuevos. Para obtener " "detalles, consulte https://pypi.org/help#admin-intervention." #: warehouse/accounts/views.py:552 msgid "Expired token: request a new password reset link" -msgstr "" -"Ficha caducada: solicite un enlace de restablecimiento de contraseña nuevo" +msgstr "Ficha caducada: solicite un enlace de restablecimiento de contraseña nuevo" #: warehouse/accounts/views.py:554 msgid "Invalid token: request a new password reset link" msgstr "" -"Ficha no válida: solicite un enlace de restablecimiento de contraseña nuevo" +"Ficha no válida: solicite un enlace de restablecimiento de contraseña " +"nuevo" #: warehouse/accounts/views.py:556 warehouse/accounts/views.py:634 msgid "Invalid token: no token supplied" @@ -172,7 +148,8 @@ msgstr "Ficha no válida: no se encontró la cuenta" #: warehouse/accounts/views.py:572 msgid "Invalid token: user has logged in since this token was requested" msgstr "" -"Ficha no válida: desde que se solicitó esta ficha se ha accedido a la cuenta" +"Ficha no válida: desde que se solicitó esta ficha se ha accedido a la " +"cuenta" #: warehouse/accounts/views.py:579 msgid "" @@ -223,12 +200,13 @@ msgstr "" #: warehouse/manage/views.py:186 msgid "Email ${email_address} added - check your email for a verification link" msgstr "" -"Se añadió la dirección de correo ${email_address}. Encuentre en su buzón el " -"enlace de verificación" +"Se añadió la dirección de correo ${email_address}. Encuentre en su buzón " +"el enlace de verificación" #: warehouse/manage/views.py:667 warehouse/manage/views.py:703 msgid "" -"You must provision a two factor method before recovery codes can be generated" +"You must provision a two factor method before recovery codes can be " +"generated" msgstr "" "Debe suministrar un método de autenticación en dos fases antes de poder " "generar códigos de recuperación" @@ -239,8 +217,7 @@ msgstr "Ya se generaron códigos de recuperación" #: warehouse/manage/views.py:679 msgid "Generating new recovery codes will invalidate your existing codes." -msgstr "" -"Generar códigos de recuperación nuevos invalidará sus códigos existentes." +msgstr "Generar códigos de recuperación nuevos invalidará sus códigos existentes." #: warehouse/manage/views.py:729 msgid "Invalid credentials. Try again" @@ -417,9 +394,9 @@ msgstr "Algo ha fallado" #: warehouse/templates/500.html:22 msgid "" -"<p>We are experiencing technical issues that are affecting our ability to " -"serve you this site.</p> <p>We are aware of the problem and are working to " -"resolve it as soon as possible.</p>" +"<p>We are experiencing technical issues that are affecting our ability to" +" serve you this site.</p> <p>We are aware of the problem and are working " +"to resolve it as soon as possible.</p>" msgstr "" "<p>En este momento no podemos ofrecerle el sitio a causa de dificultades " "técnicas.</p><p>Estamos informados del problema y trabajamos para " @@ -443,24 +420,26 @@ msgstr "¿Depende de PyPI para hacer su trabajo?" #: warehouse/templates/500.html:37 msgid "" -"Consider <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\" rel=" -"\"noopener\"> contributing </a> or <a href=\"https://psfmember.org/civicrm/" -"contribute/transact?reset=1&id=13\" target=\"_blank\" rel=\"noopener\"> " -"donating </a> to help us build a more stable and secure platform." +"Consider <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\" " +"rel=\"noopener\"> contributing </a> or <a " +"href=\"https://psfmember.org/civicrm/contribute/transact?reset=1&id=13\" " +"target=\"_blank\" rel=\"noopener\"> donating </a> to help us build a more" +" stable and secure platform." msgstr "" -"Considere <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\" " -"rel=\"noopener\"> contribuir </a> o <a href=\"https://psfmember.org/civicrm/" -"contribute/transact?reset=1&id=13\" target=\"_blank\" rel=\"noopener\"> " -"donar </a> para ayudarnos a crear una plataforma más estable y segura." +"Considere <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\"" +" rel=\"noopener\"> contribuir </a> o <a " +"href=\"https://psfmember.org/civicrm/contribute/transact?reset=1&id=13\" " +"target=\"_blank\" rel=\"noopener\"> donar </a> para ayudarnos a crear una" +" plataforma más estable y segura." #: warehouse/templates/base.html:23 msgid "" -"Choose a strong password that contains letters (uppercase and lowercase), " -"numbers and special characters. Avoid common words or repetition." +"Choose a strong password that contains letters (uppercase and lowercase)," +" numbers and special characters. Avoid common words or repetition." msgstr "" -"Elija una contraseña fuerte que contenga letras (mayúsculas y minúsculas), " -"números y caracteres especiales. Evite las palabras habituales y la " -"repetición." +"Elija una contraseña fuerte que contenga letras (mayúsculas y " +"minúsculas), números y caracteres especiales. Evite las palabras " +"habituales y la repetición." #: warehouse/templates/base.html:26 msgid "Password strength:" @@ -515,11 +494,11 @@ msgstr "Menú principal" #: warehouse/templates/base.html:76 warehouse/templates/index.html:79 msgid "" -"The Python Package Index (PyPI) is a repository of software for the Python " -"programming language." +"The Python Package Index (PyPI) is a repository of software for the " +"Python programming language." msgstr "" -"El Índice de paquetes de Python (PyPI) es un repositorio de <em>software</" -"em> para el lenguaje de programación Python." +"El Índice de paquetes de Python (PyPI) es un repositorio de " +"<em>software</em> para el lenguaje de programación Python." #: warehouse/templates/base.html:92 msgid "RSS: 40 latest updates" @@ -558,20 +537,20 @@ msgstr "" #: warehouse/templates/base.html:167 msgid "" "You are using TestPyPI – a separate instance of the Python Package Index " -"that allows you to try distribution tools and processes without affecting " -"the real index." +"that allows you to try distribution tools and processes without affecting" +" the real index." msgstr "" "Está utilizando el Entorno de pruebas de PyPI, un ejemplar separado del " -"Índice de paquetes de Python que le permite poner a prueba las herramientas " -"y los procesos de distribución sin afectar el Índice real." +"Índice de paquetes de Python que le permite poner a prueba las " +"herramientas y los procesos de distribución sin afectar el Índice real." #: warehouse/templates/base.html:177 msgid "" -"Some features may not work without JavaScript. Please try enabling it if you " -"encounter problems." +"Some features may not work without JavaScript. Please try enabling it if " +"you encounter problems." msgstr "" -"Algunas prestaciones pueden no funcionar sin JavaScript. Pruebe a activarlo " -"si tiene problemas." +"Algunas prestaciones pueden no funcionar sin JavaScript. Pruebe a " +"activarlo si tiene problemas." #: warehouse/templates/base.html:210 warehouse/templates/base.html:231 #: warehouse/templates/error-base-with-search.html:20 @@ -693,7 +672,8 @@ msgstr "todos los sistemas en servicio" #: warehouse/templates/base.html:311 msgid "" -"Developed and maintained by the Python community, for the Python community." +"Developed and maintained by the Python community, for the Python " +"community." msgstr "" "Desarrollado y mantenido por la comunidad de Python para la comunidad de " "Python." @@ -731,8 +711,8 @@ msgstr "" #: warehouse/templates/index.html:44 msgid "Find, install and publish Python packages with the Python Package Index" msgstr "" -"Encuentre, instale y publique paquetes de Python con el Índice de paquetes " -"de Python" +"Encuentre, instale y publique paquetes de Python con el Índice de " +"paquetes de Python" #: warehouse/templates/index.html:60 #, python-format @@ -761,11 +741,11 @@ msgstr "%(num_users)s usuarios" #: warehouse/templates/index.html:81 msgid "" -"PyPI helps you find and install software developed and shared by the Python " -"community." +"PyPI helps you find and install software developed and shared by the " +"Python community." msgstr "" -"PyPI le ayuda a encontrar e instalar programas desarrollados y compartidos " -"por la comunidad de Python." +"PyPI le ayuda a encontrar e instalar programas desarrollados y " +"compartidos por la comunidad de Python." #: warehouse/templates/index.html:82 msgid "Learn about installing packages</a>." @@ -797,27 +777,27 @@ msgstr "Novedades: las versiones más recientes de proyectos" #: warehouse/templates/upload.html:25 msgid "This URL is an API endpoint for uploading files to PyPI." -msgstr "" -"Este URL es un punto de conexión de la API para cargar archivos en PyPI." +msgstr "Este URL es un punto de conexión de la API para cargar archivos en PyPI." #: warehouse/templates/upload.html:26 #, python-format msgid "" -"For more information on uploading projects to PyPI, visit the <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python " -"Packaging User Guide</a>." +"For more information on uploading projects to PyPI, visit the <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" -"Para obtener más información sobre la carga de proyectos en PyPI, visite el " -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">manual de uso del empaquetamiento de Python</a>." +"Para obtener más información sobre la carga de proyectos en PyPI, visite " +"el <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">manual de uso del empaquetamiento de Python</a>." #: warehouse/templates/upload.html:28 #, python-format msgid "" -"Otherwise, we suggest you <a href=\"%(href)s\">go to the PyPI homepage</a>." +"Otherwise, we suggest you <a href=\"%(href)s\">go to the PyPI " +"homepage</a>." msgstr "" -"Por lo demás, le sugerimos <a href=\"%(href)s\">visitar la página principal " -"de PyPI</a>." +"Por lo demás, le sugerimos <a href=\"%(href)s\">visitar la página " +"principal de PyPI</a>." #: warehouse/templates/accounts/login.html:17 #: warehouse/templates/accounts/recovery-code.html:17 @@ -980,15 +960,15 @@ msgstr "Verificar" #: warehouse/templates/accounts/recovery-code.html:58 msgid "" -"PyPI allows for generating recovery codes to be stored securely offline in " -"the event that your device or application is lost. Enter one of these codes " -"in the form to verify your identity. Once used, the recovery code will no " -"longer be valid." +"PyPI allows for generating recovery codes to be stored securely offline " +"in the event that your device or application is lost. Enter one of these " +"codes in the form to verify your identity. Once used, the recovery code " +"will no longer be valid." msgstr "" -"PyPI permite generar códigos de recuperación que puede almacenar de manera " -"física en caso de que pierda su dispositivo o aplicación. Proporcione uno de " -"estos códigos en el formulario para verificar su identidad. Tras utilizarse, " -"el código de recuperación deja de ser válido." +"PyPI permite generar códigos de recuperación que puede almacenar de " +"manera física en caso de que pierda su dispositivo o aplicación. " +"Proporcione uno de estos códigos en el formulario para verificar su " +"identidad. Tras utilizarse, el código de recuperación deja de ser válido." #: warehouse/templates/accounts/recovery-code.html:59 #, python-format @@ -1053,12 +1033,12 @@ msgstr "Confirmar contraseña" #: warehouse/templates/accounts/register.html:157 msgid "" "This password appears in a security breach or has been compromised and " -"cannot be used. Please refer to the <a href=\"/help/#compromised-password" -"\">FAQ</a> for more information." +"cannot be used. Please refer to the <a href=\"/help/#compromised-" +"password\">FAQ</a> for more information." msgstr "" -"Esta contraseña figura en una vulneración de datos o se encuentra en peligro " -"y no puede utilizarse. Consulte las <a href=\"/help/#compromised-password" -"\">preguntas frecuentes</a> para obtener más información." +"Esta contraseña figura en una vulneración de datos o se encuentra en " +"peligro y no puede utilizarse. Consulte las <a href=\"/help/#compromised-" +"password\">preguntas frecuentes</a> para obtener más información." #: warehouse/templates/accounts/register.html:162 msgid "Create account" @@ -1072,8 +1052,8 @@ msgstr "Restablecimiento de contraseña" #: warehouse/templates/accounts/request-password-reset.html:27 msgid "To reset your password, enter your username or email." msgstr "" -"Para restablecer su contraseña, proporcione su nombre de usuario o dirección " -"de correo." +"Para restablecer su contraseña, proporcione su nombre de usuario o " +"dirección de correo." #: warehouse/templates/accounts/request-password-reset.html:39 msgid "Username or email" @@ -1094,8 +1074,8 @@ msgstr "Se ha enviado un mensaje a la dirección de correo que registró." #: warehouse/templates/accounts/request-password-reset.html:52 #, python-format msgid "" -"The email contains a link to reset your password. This link will expire in " -"%(n_hours)s hours." +"The email contains a link to reset your password. This link will expire " +"in %(n_hours)s hours." msgstr "" "El mensaje contiene un enlace para restablecer su contraseña. El enlace " "caducará en %(n_hours)s horas." @@ -1145,18 +1125,20 @@ msgstr "Autenticar con dispositivo" #: warehouse/templates/accounts/two-factor.html:55 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" rel=\"%(rel)s" -"\">Upgrade your browser</a> to log in with a security device (e.g. USB key)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" " +"rel=\"%(rel)s\">Upgrade your browser</a> to log in with a security device" +" (e.g. USB key)" msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" rel=\"%(rel)s" -"\">Actualice el navegador</a> para acceder con un aparato de seguridad " -"(p. ej., una llave USB)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" " +"rel=\"%(rel)s\">Actualice el navegador</a> para acceder con un aparato de" +" seguridad (p. ej., una llave USB)" #: warehouse/templates/accounts/two-factor.html:60 #, python-format msgid "Lost your device? Not working? <a href=\"%(href)s\">Get help</a>." msgstr "" -"¿Perdió su dispositivo? ¿No funciona? <a href=\"%(href)s\">Consiga ayuda</a>." +"¿Perdió su dispositivo? ¿No funciona? <a href=\"%(href)s\">Consiga " +"ayuda</a>." #: warehouse/templates/accounts/two-factor.html:72 msgid "Authenticate with an app" @@ -1169,14 +1151,15 @@ msgstr "Proporcione el código de autenticación" #: warehouse/templates/accounts/two-factor.html:105 #, python-format msgid "" -"<p>Generate a code using the authentication application connected to your " -"PyPI account. Enter this code in the form to verify your identity.</p> " -"<p>Lost your application? Not working? <a href=\"%(href)s\">Get help</a>.</p>" +"<p>Generate a code using the authentication application connected to your" +" PyPI account. Enter this code in the form to verify your identity.</p> " +"<p>Lost your application? Not working? <a href=\"%(href)s\">Get " +"help</a>.</p>" msgstr "" -"<p>Genere un código mediante la aplicación de autenticación conectada con su " -"cuenta de PyPI. Escriba este código en el formulario para verificar su " -"identidad.</p><p>¿Perdió la aplicación? ¿No funciona? <a href=\"%(href)s" -"\">Consiga ayuda</a>.</p>" +"<p>Genere un código mediante la aplicación de autenticación conectada con" +" su cuenta de PyPI. Escriba este código en el formulario para verificar " +"su identidad.</p><p>¿Perdió la aplicación? ¿No funciona? <a " +"href=\"%(href)s\">Consiga ayuda</a>.</p>" #: warehouse/templates/accounts/two-factor.html:117 msgid "Lost your security key or application?" @@ -1189,14 +1172,15 @@ msgstr "Acceder con código de recuperación" #: warehouse/templates/accounts/two-factor.html:122 #, python-format msgid "" -"<p><strong>You have not generated account recovery codes.</strong></p> <p>If " -"you lose access to your two factor methods, you may lose access to your " -"account. <a href=\"%(href)s\">Get help with recovery codes.</a></p>" +"<p><strong>You have not generated account recovery codes.</strong></p> " +"<p>If you lose access to your two factor methods, you may lose access to " +"your account. <a href=\"%(href)s\">Get help with recovery codes.</a></p>" msgstr "" -"<p><strong>No ha generado códigos de recuperación para la cuenta.</strong></" -"p> <p>Si pierde el acceso a sus métodos de autenticación en dos fases, " -"podría perder el acceso a su cuenta. <a href=\"%(href)s\">Conseguir ayuda " -"con los códigos de recuperación.</a></p>" +"<p><strong>No ha generado códigos de recuperación para la " +"cuenta.</strong></p> <p>Si pierde el acceso a sus métodos de " +"autenticación en dos fases, podría perder el acceso a su cuenta. <a " +"href=\"%(href)s\">Conseguir ayuda con los códigos de " +"recuperación.</a></p>" #: warehouse/templates/email/account-deleted/body.html:18 #, python-format @@ -1210,11 +1194,13 @@ msgstr "Se eliminó su cuenta de PyPI, <strong>%(username)s</strong>." #: warehouse/templates/email/two-factor-removed/body.html:20 #, python-format msgid "" -"If you did not make this change, you can email <a href=\"%(href)s\">" -"%(email_address)s</a> to communicate with the PyPI administrators." +"If you did not make this change, you can email <a " +"href=\"%(href)s\">%(email_address)s</a> to communicate with the PyPI " +"administrators." msgstr "" -"Si no ha realizado este cambio, envíe un mensaje a <a href=\"%(href)s\">" -"%(email_address)s</a> para comunicarse con los administradores de PyPI." +"Si no ha realizado este cambio, envíe un mensaje a <a " +"href=\"%(href)s\">%(email_address)s</a> para comunicarse con los " +"administradores de PyPI." #: warehouse/templates/email/added-as-collaborator/body.html:19 #, python-format @@ -1237,8 +1223,8 @@ msgstr "" #: warehouse/templates/email/password-change/body.html:18 #, python-format msgid "" -"Someone, perhaps you, has changed the password for your PyPI account <strong>" -"%(username)s</strong>." +"Someone, perhaps you, has changed the password for your PyPI account " +"<strong>%(username)s</strong>." msgstr "" "Alguien, quizá usted, ha cambiado la contraseña de su cuenta de PyPI, " "<strong>%(username)s</strong>." @@ -1250,18 +1236,19 @@ msgstr "¿Qué?" #: warehouse/templates/email/password-compromised/body.html:20 msgid "" -"PyPI administrators have determined that your password is compromised. To\n" -" protect you and other users, we have preemptively reset your password and " -"you\n" +"PyPI administrators have determined that your password is compromised. To" +"\n" +" protect you and other users, we have preemptively reset your password " +"and you\n" " will no longer be able to log in or upload to PyPI with your existing\n" " password." msgstr "" -"Los administradores de PyPI han determinado que su contraseña es vulnerable. " -"Para\n" -" protegerle a usted y a otros usuarios, hemos restablecido su contraseña " -"como medida\n" -" precautoria; ya no podrá acceder a la cuenta ni cargar paquetes en PyPI " -"con la\n" +"Los administradores de PyPI han determinado que su contraseña es " +"vulnerable. Para\n" +" protegerle a usted y a otros usuarios, hemos restablecido su contraseña" +" como medida\n" +" precautoria; ya no podrá acceder a la cuenta ni cargar paquetes en PyPI" +" con la\n" " contraseña existente." #: warehouse/templates/email/password-compromised/body.html:26 @@ -1282,11 +1269,11 @@ msgstr "¿Qué debo hacer?" #: warehouse/templates/email/password-compromised/body.html:33 #, python-format msgid "" -"To regain access to your account, <a href=\"%(href)s\">reset your password</" -"a> on PyPI." +"To regain access to your account, <a href=\"%(href)s\">reset your " +"password</a> on PyPI." msgstr "" -"Para recuperar el acceso a su cuenta, <a href=\"%(href)s\">restablezca su " -"contraseña</a> en PyPI." +"Para recuperar el acceso a su cuenta, <a href=\"%(href)s\">restablezca su" +" contraseña</a> en PyPI." #: warehouse/templates/email/password-compromised/body.html:39 msgid "How can I contact you?" @@ -1295,11 +1282,12 @@ msgstr "¿Cómo ponerse en contacto con PyPI?" #: warehouse/templates/email/password-compromised/body.html:41 #, python-format msgid "" -"For more information, you can email %(email_address)s to communicate with\n" +"For more information, you can email %(email_address)s to communicate with" +"\n" " the PyPI administrators." msgstr "" -"Para obtener más información, puede enviar un mensaje a %(email_address)s " -"(en inglés)\n" +"Para obtener más información, puede enviar un mensaje a %(email_address)s" +" (en inglés)\n" " para comunicarse con los administradores de PyPI." #: warehouse/templates/email/password-compromised-hibp/body.html:20 @@ -1308,16 +1296,16 @@ msgid "" "password appears\n" " in public data breaches. To protect you and other users, we have " "preemptively reset your\n" -" password and you will no longer be able to log in or upload to PyPI with " -"your existing\n" +" password and you will no longer be able to log in or upload to PyPI " +"with your existing\n" " password." msgstr "" -"Hemos notado, durante su intento de acceder a PyPI o cargar un paquete en " -"este, que su\n" -" contraseña figura en una o más vulneraciones de seguridad públicas. Para " -"protegerle a usted\n" -" y a otros usuarios, hemos restablecido su contraseña existente y no podrá " -"utilizarla\n" +"Hemos notado, durante su intento de acceder a PyPI o cargar un paquete en" +" este, que su\n" +" contraseña figura en una o más vulneraciones de seguridad públicas. " +"Para protegerle a usted\n" +" y a otros usuarios, hemos restablecido su contraseña existente y no " +"podrá utilizarla\n" " para acceder a PyPI ni para cargar paquetes en este." #: warehouse/templates/email/password-compromised-hibp/body.html:26 @@ -1337,16 +1325,17 @@ msgstr "" #: warehouse/templates/email/password-compromised-hibp/body.html:34 #, python-format msgid "" -"To regain access to your account, <a href=\"%(reset_pw_url)s\">reset your " -"password</a> on PyPI. We also recommend that you go to <a href=" -"\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> and check your other " -"passwords and get yourself familiar with good password practices." +"To regain access to your account, <a href=\"%(reset_pw_url)s\">reset your" +" password</a> on PyPI. We also recommend that you go to <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> and check your " +"other passwords and get yourself familiar with good password practices." msgstr "" -"Para recuperar el acceso a su cuenta de PyPI, <a href=\"%(reset_pw_url)s" -"\">restablezca la contraseña</a>. Recomendamos además que visite <a href=" -"\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>, compruebe sus demás " -"contraseñas y se familiarice con las prácticas recomendadas relativas al uso " -"de contraseñas." +"Para recuperar el acceso a su cuenta de PyPI, <a " +"href=\"%(reset_pw_url)s\">restablezca la contraseña</a>. Recomendamos " +"además que visite <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>, compruebe sus " +"demás contraseñas y se familiarice con las prácticas recomendadas " +"relativas al uso de contraseñas." #: warehouse/templates/email/password-compromised-hibp/body.html:40 msgid "How do you know this?" @@ -1355,30 +1344,32 @@ msgstr "¿Cómo lo sabe PyPI?" #: warehouse/templates/email/password-compromised-hibp/body.html:42 #, python-format msgid "" -"We use a free security service from <a href=\"%(have_i_been_pwned_url)s" -"\">HaveIBeenPwned</a>. When registering, authenticating, or updating your " -"password, we generate a SHA1 hash of your password and use the first 5 " -"characters of the hash to decide if the password is compromised. The " -"plaintext password is never stored by PyPI or sent to HaveIBeenPwned." +"We use a free security service from <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>. When registering, " +"authenticating, or updating your password, we generate a SHA1 hash of " +"your password and use the first 5 characters of the hash to decide if the" +" password is compromised. The plaintext password is never stored by PyPI " +"or sent to HaveIBeenPwned." msgstr "" -"Nos servimos de un servicio gratuito, <a href=\"%(have_i_been_pwned_url)s" -"\">HaveIBeenPwned</a>. Cuando se registra, se autentica o actualiza su " -"contraseña, generamos un resumen SHA1 de su contraseña y empleamos los " -"primeros cinco caracteres del resumen para determinar si la contraseña se ha " -"vulnerado. Jamás se almacena la contraseña en texto plano en PyPI ni se " -"envía esta a HaveIBeenPwned." +"Nos servimos de un servicio gratuito, <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>. Cuando se " +"registra, se autentica o actualiza su contraseña, generamos un resumen " +"SHA1 de su contraseña y empleamos los primeros cinco caracteres del " +"resumen para determinar si la contraseña se ha vulnerado. Jamás se " +"almacena la contraseña en texto plano en PyPI ni se envía esta a " +"HaveIBeenPwned." #: warehouse/templates/email/password-compromised-hibp/body.html:47 #, python-format msgid "" -"For more information, see our <a href=\"%(faq_url)s\">FAQ</a>. For help, you " -"can email <a href=\"%(email_href)s\">%(email_address)s</a> to communicate " -"with the PyPI administrators." +"For more information, see our <a href=\"%(faq_url)s\">FAQ</a>. For help, " +"you can email <a href=\"%(email_href)s\">%(email_address)s</a> to " +"communicate with the PyPI administrators." msgstr "" -"Para obtener más información, consulte nuestra lista de <a href=\"%(faq_url)s" -"\">preguntas frecuentes</a>. Para recibir ayuda de los administradores de " -"PyPI, puede enviar un mensaje a <a href=\"%(email_href)s\">" -"%(email_address)s</a> (en inglés)." +"Para obtener más información, consulte nuestra lista de <a " +"href=\"%(faq_url)s\">preguntas frecuentes</a>. Para recibir ayuda de los " +"administradores de PyPI, puede enviar un mensaje a <a " +"href=\"%(email_href)s\">%(email_address)s</a> (en inglés)." #: warehouse/templates/email/password-reset/body.html:18 #, python-format @@ -1386,8 +1377,8 @@ msgid "" "Someone, perhaps you, has made a password reset request for your PyPI " "account '%(username)s'." msgstr "" -"Alguien, quizá usted, ha solicitado restablecer la contraseña de la cuenta " -"«%(username)s» de PyPI." +"Alguien, quizá usted, ha solicitado restablecer la contraseña de la " +"cuenta «%(username)s» de PyPI." #: warehouse/templates/email/password-reset/body.html:20 #, python-format @@ -1395,8 +1386,8 @@ msgid "" "If you wish to proceed with this request, <a href=\"%(href)s\">click to " "reset your password</a>." msgstr "" -"Si quiere continuar con esta solicitud, <a href=\"%(href)s\">pulse aquí para " -"restablecer la contraseña</a>." +"Si quiere continuar con esta solicitud, <a href=\"%(href)s\">pulse aquí " +"para restablecer la contraseña</a>." #: warehouse/templates/email/password-reset/body.html:22 #: warehouse/templates/email/verify-email/body.html:22 @@ -1416,12 +1407,13 @@ msgstr "" #: warehouse/templates/email/primary-email-change/body.html:18 #, python-format msgid "" -"The primary email for your PyPI account <strong>%(username)s</strong> has " -"been changed from <code>%(old_email)s</code> to <code>%(new_email)s</code>" +"The primary email for your PyPI account <strong>%(username)s</strong> has" +" been changed from <code>%(old_email)s</code> to " +"<code>%(new_email)s</code>" msgstr "" -"La cuenta de correo principal de tu cuenta de PyPI <strong>%(username)s</" -"strong> ha cambiado de <code>%(old_email)s</code> a <code>%(new_email)s</" -"code>" +"La cuenta de correo principal de tu cuenta de PyPI " +"<strong>%(username)s</strong> ha cambiado de <code>%(old_email)s</code> a" +" <code>%(new_email)s</code>" #: warehouse/templates/email/two-factor-added/body.html:18 #, python-format @@ -1438,26 +1430,26 @@ msgid "" "Someone, perhaps you, has removed a %(method)s two-factor authentication " "method from your PyPI account <strong>%(username)s</strong>." msgstr "" -"Alguien, quizá usted, ha retirado un método de autenticación en dos fases " -"%(method)s de la cuenta de PyPI <strong>%(username)s</strong>." +"Alguien, quizá usted, ha retirado un método de autenticación en dos fases" +" %(method)s de la cuenta de PyPI <strong>%(username)s</strong>." #: warehouse/templates/email/verify-email/body.html:18 #, python-format msgid "" -"Someone, perhaps you, has added this email address (<code>%(email_address)s</" -"code>) to their PyPI account." +"Someone, perhaps you, has added this email address " +"(<code>%(email_address)s</code>) to their PyPI account." msgstr "" -"Alguien, quizá usted, ha añadido esta dirección de correo (<code>" -"%(email_address)s</code>) a su cuenta de PyPI." +"Alguien, quizá usted, ha añadido esta dirección de correo " +"(<code>%(email_address)s</code>) a su cuenta de PyPI." #: warehouse/templates/email/verify-email/body.html:20 #, python-format msgid "" -"If you wish to proceed with this request, <a href=\"%(href)s\">click this " -"link to verify your email address</a>." +"If you wish to proceed with this request, <a href=\"%(href)s\">click this" +" link to verify your email address</a>." msgstr "" -"Si quiere continuar con esta solicitud, <a href=\"%(href)s\">pulse en este " -"enlace para verificar la dirección de correo</a>." +"Si quiere continuar con esta solicitud, <a href=\"%(href)s\">pulse en " +"este enlace para verificar la dirección de correo</a>." #: warehouse/templates/includes/current-user-indicator.html:29 msgid "Admin" @@ -1518,11 +1510,11 @@ msgstr "Éxito" #: warehouse/templates/includes/hash-modal.html:23 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Hashes</a> for %(filename)s" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Hashes</a> for %(filename)s" msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Resúmenes</a> de %(filename)s" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Resúmenes</a> de %(filename)s" #: warehouse/templates/includes/hash-modal.html:28 #, python-format @@ -1575,8 +1567,7 @@ msgstr "Siguiente" #: warehouse/templates/includes/session-notifications.html:23 #, python-format msgid "Your primary email address (%(email_address)s) is unverified." -msgstr "" -"No se ha verificado su dirección de correo principal (%(email_address)s)." +msgstr "No se ha verificado su dirección de correo principal (%(email_address)s)." #: warehouse/templates/includes/session-notifications.html:25 msgid "You do not have a primary email address." @@ -1589,11 +1580,11 @@ msgstr "Verifique su dirección o añada otra." #: warehouse/templates/includes/session-notifications.html:37 #, python-format msgid "" -"Two factor authentication is available, <a href=\"%(href)s\">enable it now " -"for your account.</a>" +"Two factor authentication is available, <a href=\"%(href)s\">enable it " +"now for your account.</a>" msgstr "" -"La autenticación en dos fases está disponible. <a href=\"%(href)s\">Actívela " -"ahora para su cuenta.</a>" +"La autenticación en dos fases está disponible. <a " +"href=\"%(href)s\">Actívela ahora para su cuenta.</a>" #: warehouse/templates/includes/accounts/profile-actions.html:16 msgid "Edit profile" @@ -1610,39 +1601,41 @@ msgstr "Estadísticas" #: warehouse/templates/includes/accounts/profile-actions.html:21 #, python-format msgid "" -"View statistics for your projects via <a href=\"%(libs_io_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or by " -"using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our public " -"dataset on Google BigQuery</a>" +"View statistics for your projects via <a href=\"%(libs_io_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, " +"or by using <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">our public dataset on Google BigQuery</a>" msgstr "" -"Consulte estadísticas sobre sus proyectos en <a href=\"%(libs_io_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a> o a " -"través de <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener" -"\">nuestro conjunto de datos público en Google BigQuery</a>" +"Consulte estadísticas sobre sus proyectos en <a href=\"%(libs_io_href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a> " +"o a través de <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">nuestro conjunto de datos público en Google BigQuery</a>" #: warehouse/templates/includes/accounts/profile-actions.html:30 #, python-format msgid "" -"View statistics for %(username)s's projects via <a href=\"%(libs_io_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or " -"by using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our " -"public dataset on Google BigQuery</a>" +"View statistics for %(username)s's projects via <a " +"href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io</a>, or by using <a href=\"%(gbq_href)s\" " +"target=\"_blank\" rel=\"noopener\">our public dataset on Google " +"BigQuery</a>" msgstr "" -"Consulte estadísticas sobre los proyectos de %(username)s en <a href=" -"\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Libraries.io</a> o a través de <a href=\"%(gbq_href)s\" target=\"_blank\" " -"rel=\"noopener\">nuestro conjunto de datos público en Google BigQuery</a>" +"Consulte estadísticas sobre los proyectos de %(username)s en <a " +"href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io</a> o a través de <a href=\"%(gbq_href)s\" " +"target=\"_blank\" rel=\"noopener\">nuestro conjunto de datos público en " +"Google BigQuery</a>" #: warehouse/templates/includes/accounts/profile-callout.html:18 #, python-format msgid "" "You have not uploaded any projects to PyPI, yet. To learn how to get " -"started, visit the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">Python Packaging User Guide</a>" +"started, visit the <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" -"Aún no ha cargado ningún proyecto en PyPI. Para una iniciación, consulte el " -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">manual de uso del empaquetamiento de Python</a>" +"Aún no ha cargado ningún proyecto en PyPI. Para una iniciación, consulte " +"el <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">manual de uso del empaquetamiento de Python</a>" #: warehouse/templates/includes/accounts/profile-callout.html:23 #, python-format @@ -1709,15 +1702,15 @@ msgstr "Informes y solicitudes de incorporación abiertos:" #: warehouse/templates/includes/packaging/project-data.html:66 #, python-format msgid "" -"View statistics for this project via <a href=\"%(libs_io_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or by " -"using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our public " -"dataset on Google BigQuery</a>" +"View statistics for this project via <a href=\"%(libs_io_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, " +"or by using <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">our public dataset on Google BigQuery</a>" msgstr "" -"Consulte estadísticas de este proyecto en <a href=\"%(libs_io_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a> o a través " -"de <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">nuestro " -"conjunto de datos público en Google BigQuery</a>" +"Consulte estadísticas de este proyecto en <a href=\"%(libs_io_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a> o" +" a través de <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">nuestro conjunto de datos público en Google BigQuery</a>" #: warehouse/templates/includes/packaging/project-data.html:74 msgid "Meta" @@ -1768,8 +1761,8 @@ msgstr "Verificado*" #: warehouse/templates/manage/account.html:35 msgid "*Intermittent delivery problems may lead to verification loss" msgstr "" -"*Algunos problemas de entrega intermitente pueden conllevar la pérdida de la " -"verificación" +"*Algunos problemas de entrega intermitente pueden conllevar la pérdida de" +" la verificación" #: warehouse/templates/manage/account.html:39 msgid "Verified" @@ -1840,19 +1833,19 @@ msgstr "Quitar correo" #: warehouse/templates/manage/account.html:138 msgid "" -"Add <abbr title=\"two factor authentication\">2FA</abbr> with authentication " -"application" +"Add <abbr title=\"two factor authentication\">2FA</abbr> with " +"authentication application" msgstr "" -"Añadir <abbr title=\"autenticación en dos fases\">A2F</abbr> con aplicación " -"de autenticación" +"Añadir <abbr title=\"autenticación en dos fases\">A2F</abbr> con " +"aplicación de autenticación" #: warehouse/templates/manage/account.html:140 msgid "" "Add <abbr title=\"two factor authentication\">2FA</abbr> with security " "device (e.g. USB key)" msgstr "" -"Añadir <abbr title=\"autenticación en dos fases\">A2F</abbr> con aparato de " -"seguridad (p. ej., llave USB)" +"Añadir <abbr title=\"autenticación en dos fases\">A2F</abbr> con aparato " +"de seguridad (p. ej., llave USB)" #: warehouse/templates/manage/account.html:142 msgid "Generate Recovery Codes" @@ -1861,8 +1854,8 @@ msgstr "Generar códigos de recuperación" #: warehouse/templates/manage/account.html:147 #: warehouse/templates/manage/account/webauthn-provision.html:37 msgid "" -"Enable JavaScript to set up two factor authentication with a security device " -"(e.g. USB key)" +"Enable JavaScript to set up two factor authentication with a security " +"device (e.g. USB key)" msgstr "" "Active JavaScript para configurar la autenticación en dos fases con un " "aparato de seguridad (p. ej., una llave USB)" @@ -1871,13 +1864,14 @@ msgstr "" #: warehouse/templates/manage/account/webauthn-provision.html:53 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Upgrade your browser</a> to set up two factor authentication with a " -"security device (e.g. USB key)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Upgrade your browser</a> to set up two factor " +"authentication with a security device (e.g. USB key)" msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Actualice su navegador</a> para configurar la autenticación en dos fases " -"con un aparato de seguridad (p. ej., una llave USB)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Actualice su navegador</a> para configurar la " +"autenticación en dos fases con un aparato de seguridad (p. ej., una llave" +" USB)" #: warehouse/templates/manage/account.html:166 #: warehouse/templates/manage/account.html:528 @@ -1926,7 +1920,8 @@ msgstr "Quitar ficha de API" #: warehouse/templates/manage/account.html:216 #: warehouse/templates/manage/token.html:59 msgid "" -"Applications or scripts using this token will no longer have access to PyPI." +"Applications or scripts using this token will no longer have access to " +"PyPI." msgstr "" "Las aplicaciones o secuencias de órdenes que utilicen esta ficha ya no " "podrán acceder a PyPI." @@ -1943,13 +1938,13 @@ msgstr "Imagen de perfil" #: warehouse/templates/manage/account.html:250 #, python-format msgid "" -"We use <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">gravatar.com</a> to generate your profile picture based on your " -"primary email address" +"We use <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">gravatar.com</a> to generate your profile picture based " +"on your primary email address" msgstr "" -"Utilizamos <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">gravatar.com</a> para generar su imagen de perfil en función de " -"su dirección de correo principal" +"Utilizamos <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">gravatar.com</a> para generar su imagen de perfil en " +"función de su dirección de correo principal" #: warehouse/templates/manage/account.html:257 msgid "Change image on gravatar.com" @@ -1966,7 +1961,8 @@ msgstr "Fecha de alta" #: warehouse/templates/manage/account.html:279 #, python-format msgid "" -"Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be changed." +"Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be " +"changed." msgstr "" "Se muestra en su <a href=\"%(href)s\">perfil público</a>. No puede " "modificarse." @@ -1991,11 +1987,11 @@ msgstr "Dirección de correo pública" #: warehouse/templates/manage/account.html:319 #, python-format msgid "" -"One of your verified emails can be displayed on your <a href=\"%(href)s" -"\">public profile</a> to logged-in users." +"One of your verified emails can be displayed on your <a " +"href=\"%(href)s\">public profile</a> to logged-in users." msgstr "" -"Es posible revelar a otros usuarios registrados una de sus direcciones de " -"correo verificadas <a href=\"%(href)s\">en su perfil público</a>." +"Es posible revelar a otros usuarios registrados una de sus direcciones de" +" correo verificadas <a href=\"%(href)s\">en su perfil público</a>." #: warehouse/templates/manage/account.html:324 msgid "Update account" @@ -2007,16 +2003,17 @@ msgstr "Correos de la cuenta" #: warehouse/templates/manage/account.html:334 msgid "" -"You can associate several emails with your account. You can use any <span " -"class=\"badge badge--success\"><i class=\"fa fa-check\" aria-hidden=\"true" -"\"></i> Verified</span> email to recover your account, but only your <span " -"class=\"badge\">Primary</span> email will receive notifications." +"You can associate several emails with your account. You can use any <span" +" class=\"badge badge--success\"><i class=\"fa fa-check\" aria-" +"hidden=\"true\"></i> Verified</span> email to recover your account, but " +"only your <span class=\"badge\">Primary</span> email will receive " +"notifications." msgstr "" "Puede asociar varias direcciones de correo con su cuenta. Puede emplear " -"cualquier dirección <span class=\"badge badge--success\"><i class=\"fa fa-" -"check\" aria-hidden=\"true\"></i> verificada</span> para recuperar su " -"cuenta, aunque únicamente la <span class=\"badge\">principal</span> recibirá " -"notificaciones." +"cualquier dirección <span class=\"badge badge--success\"><i class=\"fa " +"fa-check\" aria-hidden=\"true\"></i> verificada</span> para recuperar su " +"cuenta, aunque únicamente la <span class=\"badge\">principal</span> " +"recibirá notificaciones." #: warehouse/templates/manage/account.html:345 msgid "Emails associated with your account" @@ -2062,9 +2059,9 @@ msgid "" "account. <a href=\"%(href)s\">Learn more about <abbr title=\"two factor " "authentication\">2FA</abbr></a>." msgstr "" -"La autenticación en dos fases añade un control de seguridad a su cuenta. <a " -"href=\"%(href)s\">Más información sobre la <abbr title=\"autenticación en " -"dos fases\">A2F</abbr></a>." +"La autenticación en dos fases añade un control de seguridad a su cuenta. " +"<a href=\"%(href)s\">Más información sobre la <abbr title=\"autenticación" +" en dos fases\">A2F</abbr></a>." #: warehouse/templates/manage/account.html:451 msgid "Two factor authentication methods enabled" @@ -2077,11 +2074,11 @@ msgstr "Método de dos fases" #: warehouse/templates/manage/account.html:460 #: warehouse/templates/manage/account.html:570 msgid "" -"Authentication application (<abbr title=\"time-based one-time password" -"\">TOTP</abbr>)" +"Authentication application (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>)" msgstr "" -"Aplicación de autenticación (<abbr title=\"contraseña temporal de un solo uso" -"\">TOTP</abbr>)" +"Aplicación de autenticación (<abbr title=\"contraseña temporal de un solo" +" uso\">TOTP</abbr>)" #: warehouse/templates/manage/account.html:462 #: warehouse/templates/manage/account.html:476 @@ -2100,8 +2097,7 @@ msgstr "Quitar aplicación" #: warehouse/templates/manage/account.html:473 #: warehouse/templates/manage/account.html:568 msgid "Security device (<abbr title=\"web authentication\">WebAuthn</abbr>)" -msgstr "" -"Aparato de seguridad (<abbr title=\"autenticación web\">WebAuthn</abbr>)" +msgstr "Aparato de seguridad (<abbr title=\"autenticación web\">WebAuthn</abbr>)" #: warehouse/templates/manage/account.html:477 msgid "Remove two factor security device" @@ -2138,8 +2134,8 @@ msgstr "No ha activado la autenticación en dos fases para su cuenta." #: warehouse/templates/manage/account.html:512 #, python-format msgid "" -"<a href=\"%(href)s\">Verify your primary email address</a> to add two factor " -"authentication to your account." +"<a href=\"%(href)s\">Verify your primary email address</a> to add two " +"factor authentication to your account." msgstr "" "<a href=\"%(href)s\">Verifique su dirección de correo principal</a> para " "añadir la autenticación en dos fases a su cuenta." @@ -2174,8 +2170,8 @@ msgstr "Añadir ficha de API" #: warehouse/templates/manage/account.html:544 #, python-format msgid "" -"<a href=\"%(href)s\">Verify your primary email address</a> to add API tokens " -"to your account." +"<a href=\"%(href)s\">Verify your primary email address</a> to add API " +"tokens to your account." msgstr "" "<a href=\"%(href)s\">Verifique su dirección de correo principal</a> para " "añadir fichas de API a su cuenta." @@ -2253,10 +2249,11 @@ msgstr "Adición de autenticación en dos fases" #: warehouse/templates/manage/account.html:613 #: warehouse/templates/manage/account.html:623 msgid "" -"Method: Security device (<abbr title=\"web authentication\">WebAuthn</abbr>)" +"Method: Security device (<abbr title=\"web " +"authentication\">WebAuthn</abbr>)" msgstr "" -"Método: aparato de seguridad (<abbr title=\"autenticación web\">WebAuthn</" -"abbr>)" +"Método: aparato de seguridad (<abbr title=\"autenticación " +"web\">WebAuthn</abbr>)" #: warehouse/templates/manage/account.html:614 #: warehouse/templates/manage/account.html:624 @@ -2269,8 +2266,8 @@ msgid "" "Method: Authentication application (<abbr title=\"time-based one-time " "password\">TOTP</abbr>)" msgstr "" -"Método: aplicación de autenticación (<abbr title=\"contraseña temporal de un " -"solo uso\">TOTP</abbr>)" +"Método: aplicación de autenticación (<abbr title=\"contraseña temporal de" +" un solo uso\">TOTP</abbr>)" #: warehouse/templates/manage/account.html:620 msgid "Two factor authentication removed" @@ -2320,8 +2317,8 @@ msgstr "Identificador único:" #: warehouse/templates/manage/account.html:662 msgid "Events appear here as security-related actions occur on your account." msgstr "" -"Aquí aparecerán sucesos a medida que se produzcan acciones relativas a la " -"seguridad de la cuenta." +"Aquí aparecerán sucesos a medida que se produzcan acciones relativas a la" +" seguridad de la cuenta." #: warehouse/templates/manage/account.html:664 msgid "Recent account activity" @@ -2347,8 +2344,7 @@ msgid "IP address" msgstr "Dirección IP" #: warehouse/templates/manage/account.html:687 -msgid "" -"Events will appear here as security-related actions occur on your account." +msgid "Events will appear here as security-related actions occur on your account." msgstr "" "Aquí figurarán sucesos a medida que se produzcan en su cuenta acciones " "relativas a la seguridad." @@ -2375,45 +2371,45 @@ msgid_plural "" " " msgstr[0] "" "\n" -" Actualmente, su cuenta es la <strong>única propietaria</strong> de " -"%(count)s proyecto.\n" +" Actualmente, su cuenta es la <strong>única propietaria</strong>" +" de %(count)s proyecto.\n" " " msgstr[1] "" "\n" -" Actualmente, su cuenta es la <strong>única propietaria</strong> de " -"%(count)s proyectos.\n" +" Actualmente, su cuenta es la <strong>única propietaria</strong>" +" de %(count)s proyectos.\n" " " #: warehouse/templates/manage/account.html:704 msgid "" "\n" -" You must transfer ownership or delete this project before you can " -"delete your account.\n" +" You must transfer ownership or delete this project before you " +"can delete your account.\n" " " msgid_plural "" "\n" -" You must transfer ownership or delete these projects before you " -"can delete your account.\n" +" You must transfer ownership or delete these projects before you" +" can delete your account.\n" " " msgstr[0] "" "\n" -" Debe transferir la titularidad de este proyecto o eliminarlo si " -"quiere eliminar su cuenta.\n" +" Debe transferir la titularidad de este proyecto o eliminarlo si" +" quiere eliminar su cuenta.\n" " " msgstr[1] "" "\n" -" Debe transferir la titularidad de estos proyectos o eliminarlos si " -"quiere eliminar su cuenta.\n" +" Debe transferir la titularidad de estos proyectos o eliminarlos" +" si quiere eliminar su cuenta.\n" " " #: warehouse/templates/manage/account.html:714 #, python-format msgid "" -"<a href=\"%(transfer_href)s\">transfer ownership</a> or <a href=" -"\"%(delete_href)s\">delete project</a>" +"<a href=\"%(transfer_href)s\">transfer ownership</a> or <a " +"href=\"%(delete_href)s\">delete project</a>" msgstr "" -"<a href=\"%(transfer_href)s\">transferir titularidad</a> o <a href=" -"\"%(delete_href)s\">eliminar proyecto</a>" +"<a href=\"%(transfer_href)s\">transferir titularidad</a> o <a " +"href=\"%(delete_href)s\">eliminar proyecto</a>" #: warehouse/templates/manage/account.html:723 #: warehouse/templates/manage/token.html:162 @@ -2440,13 +2436,13 @@ msgstr "Destruir documentación" #: warehouse/templates/manage/documentation.html:28 #, python-format msgid "" -"If you would like to DESTROY any existing documentation hosted at <a href=" -"\"%(url)s\">%(url)s</a> there is <strong>no</strong> undo, as uploading new " -"documentation is no longer supported." +"If you would like to DESTROY any existing documentation hosted at <a " +"href=\"%(url)s\">%(url)s</a> there is <strong>no</strong> undo, as " +"uploading new documentation is no longer supported." msgstr "" -"Si quiere DESTRUIR cualquier documentación existente alojada en <a href=" -"\"%(url)s\">%(url)s</a>, <strong>no</strong> podrá dar marcha atrás; ya no " -"se admite cargar documentación nueva." +"Si quiere DESTRUIR cualquier documentación existente alojada en <a " +"href=\"%(url)s\">%(url)s</a>, <strong>no</strong> podrá dar marcha atrás;" +" ya no se admite cargar documentación nueva." #: warehouse/templates/manage/documentation.html:35 msgid "Destroy Documentation for project" @@ -2473,12 +2469,12 @@ msgstr "Histórico del proyecto «%(project_name)s»" #: warehouse/templates/manage/history.html:25 msgid "" -"Each time you (or your collaborators) perform a security action related to " -"this project, the action is recorded and displayed here." +"Each time you (or your collaborators) perform a security action related " +"to this project, the action is recorded and displayed here." msgstr "" "Cada vez que usted (o alguno de sus colaboradores) realiza una acción de " -"seguridad relacionada a este proyecto, esta queda registrada y se muestra " -"aquí." +"seguridad relacionada a este proyecto, esta queda registrada y se muestra" +" aquí." #: warehouse/templates/manage/history.html:29 msgid "Project created" @@ -2523,8 +2519,8 @@ msgstr "Nombre de archivo:" #, python-format msgid "<a href=\"%(href)s\">%(username)s</a> added as project %(role_name)s" msgstr "" -"<a href=\"%(href)s\">%(username)s</a> se incorporó como %(role_name)s del " -"proyecto" +"<a href=\"%(href)s\">%(username)s</a> se incorporó como %(role_name)s del" +" proyecto" #: warehouse/templates/manage/history.html:55 #, python-format @@ -2573,17 +2569,17 @@ msgid "" "Each time you or your collaborators update this project, the action is " "recorded and displayed here." msgstr "" -"Cada vez que usted o alguno de sus colaboradores actualice este proyecto, la " -"acción queda registrada y se muestra aquí." +"Cada vez que usted o alguno de sus colaboradores actualice este proyecto," +" la acción queda registrada y se muestra aquí." #: warehouse/templates/manage/journal.html:28 #, python-format msgid "" -"This feature will be deprecated in the future, replaced by the <a href=" -"\"%(href)s\">security history page</a>." +"This feature will be deprecated in the future, replaced by the <a " +"href=\"%(href)s\">security history page</a>." msgstr "" -"Esta funcionalidad se eliminará en el futuro, sustituida por la <a href=" -"\"%(href)s\">página de histórico de seguridad</a>." +"Esta funcionalidad se eliminará en el futuro, sustituida por la <a " +"href=\"%(href)s\">página de histórico de seguridad</a>." #: warehouse/templates/manage/journal.html:32 #, python-format @@ -2709,12 +2705,12 @@ msgstr "Ver" #, python-format msgid "" "You have not uploaded any projects to PyPI, yet. To learn how to get " -"started, visit the <a href=\"%(href)s\" target=\"_blank\" rel=\"noopener" -"\">Python Packaging User Guide</a>" +"started, visit the <a href=\"%(href)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" -"Aún no ha cargado ningún proyecto en PyPI. Para una iniciación, visite el <a " -"href=\"%(href)s\" target=\"_blank\" rel=\"noopener\">manual de uso del " -"empaquetamiento de Python</a>" +"Aún no ha cargado ningún proyecto en PyPI. Para una iniciación, visite el" +" <a href=\"%(href)s\" target=\"_blank\" rel=\"noopener\">manual de uso " +"del empaquetamiento de Python</a>" #: warehouse/templates/manage/release.html:18 #, python-format @@ -2818,8 +2814,8 @@ msgstr "Descartar" #: warehouse/templates/manage/release.html:119 #, python-format msgid "" -"Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" +"Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" "Aprenda a cargar archivos en el <a href=\"%(href)s\" title=\"%(title)s\" " "target=\"_blank\" rel=\"noopener\">manual de uso del empaquetamiento de " @@ -2838,23 +2834,23 @@ msgstr "Eliminar versión" #, python-format msgid "" "\n" -" Deleting will irreversibly delete this release along with %(count)s " -"file.\n" +" Deleting will irreversibly delete this release along with " +"%(count)s file.\n" " " msgid_plural "" "\n" -" Deleting will irreversibly delete this release along with %(count)s " -"files.\n" +" Deleting will irreversibly delete this release along with " +"%(count)s files.\n" " " msgstr[0] "" "\n" -" La eliminación suprimirá irreversiblemente esta versión y %(count)s " -"archivo.\n" +" La eliminación suprimirá irreversiblemente esta versión y " +"%(count)s archivo.\n" " " msgstr[1] "" "\n" -" La eliminación suprimirá irreversiblemente esta versión y %(count)s " -"archivos.\n" +" La eliminación suprimirá irreversiblemente esta versión y " +"%(count)s archivos.\n" " " #: warehouse/templates/manage/release.html:135 @@ -2865,15 +2861,15 @@ msgstr "La eliminación suprimirá irreversiblemente esta versión." #: warehouse/templates/manage/releases.html:91 #, python-format msgid "" -"You will not be able to re-upload a new distribution of the same type with " -"the same version number. Consider making a new release or a <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">post " -"release</a> instead." +"You will not be able to re-upload a new distribution of the same type " +"with the same version number. Consider making a new release or a <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">post release</a> instead." msgstr "" -"No podrá cargar de nuevo una distribución nueva del mismo tipo con el mismo " -"número de versión. En vez de ello, considere crear una versión nueva o una " -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">posversión</a>." +"No podrá cargar de nuevo una distribución nueva del mismo tipo con el " +"mismo número de versión. En vez de ello, considere crear una versión " +"nueva o una <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">posversión</a>." #: warehouse/templates/manage/release.html:142 #: warehouse/templates/manage/releases.html:27 @@ -2955,13 +2951,13 @@ msgstr "No se encontró ninguna versión" #: warehouse/templates/manage/releases.html:109 #, python-format msgid "" -"Learn how to create a new release on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>" +"Learn how to create a new release on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" msgstr "" -"Aprenda a crear versiones nuevas en el <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">manual de uso del empaquetamiento de " -"Python</a>" +"Aprenda a crear versiones nuevas en el <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">manual de uso del " +"empaquetamiento de Python</a>" #: warehouse/templates/manage/roles.html:18 #, python-format @@ -2974,8 +2970,8 @@ msgid "" "Use this page to control which PyPI users can help you to manage " "%(project_name)s" msgstr "" -"Utilice esta página para controlar cuáles usuarios de PyPI pueden ayudarle a " -"gestionar %(project_name)s" +"Utilice esta página para controlar cuáles usuarios de PyPI pueden " +"ayudarle a gestionar %(project_name)s" #: warehouse/templates/manage/roles.html:25 #: warehouse/templates/pages/help.html:509 @@ -2991,11 +2987,11 @@ msgstr "Responsable" #: warehouse/templates/manage/roles.html:28 #: warehouse/templates/pages/help.html:510 msgid "" -"Can upload releases for a package. Cannot add collaborators. Cannot delete " -"files, releases, or the project." +"Can upload releases for a package. Cannot add collaborators. Cannot " +"delete files, releases, or the project." msgstr "" -"Puede cargar versiones de paquetes. No puede añadir colaboradores. No puede " -"eliminar archivos, versiones o el proyecto mismo." +"Puede cargar versiones de paquetes. No puede añadir colaboradores. No " +"puede eliminar archivos, versiones o el proyecto mismo." #: warehouse/templates/manage/roles.html:29 #: warehouse/templates/manage/roles.html:62 @@ -3076,26 +3072,29 @@ msgstr "Descripción y barra lateral del proyecto" #: warehouse/templates/manage/settings.html:43 #, python-format msgid "" -"To set the '%(project_name)s' description, author, links, classifiers, and " -"other details for your next release, use the <a href=\"%(setup_args_href)s\" " -"rel=\"noopener\" target=\"_blank\"><code>setup()</code> arguments in your " -"<code>setup.py</code> file</a>. Updating these fields will not change the " -"metadata for past releases. Additionally, you <strong>must</strong> use <a " -"href=\"%(twine_docs_href)s\" rel=\"noopener\" target=\"_blank\">Twine</a> to " -"upload your files in order to get full support for these fields. See <a href=" -"\"%(distribution_href)s\" rel=\"noopener\" target=\"_blank\">the Python " -"Packaging User Guide</a> for more help." -msgstr "" -"Para establecer la descripción, el autor, los enlaces, los clasificadores y " -"otros detalles de la próxima versión de «%(project_name)s», sírvase de los " -"argumentos <a href=\"%(setup_args_href)s\" rel=\"noopener\" target=\"_blank" -"\"><code>setup()</code> en su archivo <code>setup.py</code></a>. Actualizar " -"estos campos no cambiará los metadatos de las versiones anteriores. Además, " -"<strong>debe</strong> utilizar <a href=\"%(twine_docs_href)s\" rel=\"noopener" -"\" target=\"_blank\">Twine</a> para cargar sus archivos, a fin de obtener " -"compatibilidad completa con estos campos. Consulte el <a href=" -"\"%(distribution_href)s\" rel=\"noopener\" target=\"_blank\">manual de uso " -"del empaquetamiento de Python</a> para conseguir ayuda." +"To set the '%(project_name)s' description, author, links, classifiers, " +"and other details for your next release, use the <a " +"href=\"%(setup_args_href)s\" rel=\"noopener\" " +"target=\"_blank\"><code>setup()</code> arguments in your " +"<code>setup.py</code> file</a>. Updating these fields will not change the" +" metadata for past releases. Additionally, you <strong>must</strong> use " +"<a href=\"%(twine_docs_href)s\" rel=\"noopener\" " +"target=\"_blank\">Twine</a> to upload your files in order to get full " +"support for these fields. See <a href=\"%(distribution_href)s\" " +"rel=\"noopener\" target=\"_blank\">the Python Packaging User Guide</a> " +"for more help." +msgstr "" +"Para establecer la descripción, el autor, los enlaces, los clasificadores" +" y otros detalles de la próxima versión de «%(project_name)s», sírvase de" +" los argumentos <a href=\"%(setup_args_href)s\" rel=\"noopener\" " +"target=\"_blank\"><code>setup()</code> en su archivo " +"<code>setup.py</code></a>. Actualizar estos campos no cambiará los " +"metadatos de las versiones anteriores. Además, <strong>debe</strong> " +"utilizar <a href=\"%(twine_docs_href)s\" rel=\"noopener\" " +"target=\"_blank\">Twine</a> para cargar sus archivos, a fin de obtener " +"compatibilidad completa con estos campos. Consulte el <a " +"href=\"%(distribution_href)s\" rel=\"noopener\" target=\"_blank\">manual " +"de uso del empaquetamiento de Python</a> para conseguir ayuda." #: warehouse/templates/manage/settings.html:54 #: warehouse/templates/manage/settings.html:85 @@ -3109,17 +3108,17 @@ msgstr "La eliminación de este proyecto:" #: warehouse/templates/manage/settings.html:62 #, python-format msgid "" -"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s " -"release</a>" +"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s" +" release</a>" msgid_plural "" -"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s " -"releases</a>" +"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s" +" releases</a>" msgstr[0] "" "Suprimirá irreversiblemente el proyecto y <a href=\"%(href)s\">%(count)s " "versión</a>" msgstr[1] "" -"Suprimirá irreversiblemente el proyecto y sus <a href=\"%(href)s\">%(count)s " -"versiones</a>" +"Suprimirá irreversiblemente el proyecto y sus <a " +"href=\"%(href)s\">%(count)s versiones</a>" #: warehouse/templates/manage/settings.html:68 msgid "Irreversibly delete the project" @@ -3133,18 +3132,18 @@ msgstr "" #: warehouse/templates/manage/settings.html:74 msgid "" -"This user will be able to make new releases under this project name, so long " -"as the distribution filenames do not match filenames from a previously " -"released distribution (all PyPI distribution filenames are unique, as they " -"are generated by combining the project name + version number + distribution " -"type)" +"This user will be able to make new releases under this project name, so " +"long as the distribution filenames do not match filenames from a " +"previously released distribution (all PyPI distribution filenames are " +"unique, as they are generated by combining the project name + version " +"number + distribution type)" msgstr "" "Este usuario podrá crear versiones nuevas con este nombre de proyecto, " -"siempre y cuando los nombres de archivo de la distribución no coincidan con " -"los de una distribución publicada anteriormente (todos los nombres de " -"archivo en las distribuciones de PyPI son únicos porque se generan mediante " -"la combinación del nombre del proyecto más el número de versión más el tipo " -"de distribución)" +"siempre y cuando los nombres de archivo de la distribución no coincidan " +"con los de una distribución publicada anteriormente (todos los nombres de" +" archivo en las distribuciones de PyPI son únicos porque se generan " +"mediante la combinación del nombre del proyecto más el número de versión " +"más el tipo de distribución)" #: warehouse/templates/manage/settings.html:85 msgid "Project Name" @@ -3181,11 +3180,11 @@ msgstr "Proyecto «%(project)s»" #: warehouse/templates/manage/token.html:44 msgid "" -"For security reasons this token will only appear once. <strong>Copy it now.</" -"strong>" +"For security reasons this token will only appear once. <strong>Copy it " +"now.</strong>" msgstr "" -"Por motivos de seguridad, esta ficha aparecerá solo una vez. <strong>Cópiela " -"ahora.</strong>" +"Por motivos de seguridad, esta ficha aparecerá solo una vez. " +"<strong>Cópiela ahora.</strong>" #: warehouse/templates/manage/token.html:46 msgid "Copy token to clipboard" @@ -3211,17 +3210,18 @@ msgstr "Establezca su nombre de usuario a <code>%(token)s</code>" #: warehouse/templates/manage/token.html:71 #, python-format msgid "" -"Set your password to the token value, including the <code>%(prefix)s</code> " -"prefix" +"Set your password to the token value, including the " +"<code>%(prefix)s</code> prefix" msgstr "" -"Establezca su contraseña al valor de la ficha, incluido el prefijo <code>" -"%(prefix)s</code>" +"Establezca su contraseña al valor de la ficha, incluido el prefijo " +"<code>%(prefix)s</code>" #: warehouse/templates/manage/token.html:77 #, python-format msgid "" -"For example, if you are using <a href=\"%(href)s\">Twine</a> to upload your " -"projects to PyPI, set up your <code>%(filename)s</code> file like this:" +"For example, if you are using <a href=\"%(href)s\">Twine</a> to upload " +"your projects to PyPI, set up your <code>%(filename)s</code> file like " +"this:" msgstr "" "Por ejemplo, si utiliza <a href=\"%(href)s\">Twine</a> para cargar sus " "proyectos en PyPI, monte su archivo <code>%(filename)s</code> como se " @@ -3234,17 +3234,17 @@ msgid "" "multiple projects to PyPI, you can set up your <code>%(filename)s</code> " "file like this:" msgstr "" -"Por ejemplo, si utiliza <a href=\"%(href)s\">Twine</a> para cargar varios " -"proyectos en PyPI, monte su archivo <code>%(filename)s</code> como se " +"Por ejemplo, si utiliza <a href=\"%(href)s\">Twine</a> para cargar varios" +" proyectos en PyPI, monte su archivo <code>%(filename)s</code> como se " "muestra a continuación:" #: warehouse/templates/manage/token.html:99 msgid "" -"either a user-scoped token or a project-scoped token you want to set as the " -"default" +"either a user-scoped token or a project-scoped token you want to set as " +"the default" msgstr "" -"una ficha con ámbito de usuario o de proyecto que quiera establecer como la " -"predeterminada" +"una ficha con ámbito de usuario o de proyecto que quiera establecer como " +"la predeterminada" #: warehouse/templates/manage/token.html:104 msgid "a project token" @@ -3262,11 +3262,11 @@ msgstr "" #: warehouse/templates/manage/token.html:112 #, python-format msgid "" -"For further instructions on how to use this token, <a href=\"%(href)s" -"\">visit the PyPI help page</a>." +"For further instructions on how to use this token, <a " +"href=\"%(href)s\">visit the PyPI help page</a>." msgstr "" -"Para más instrucciones sobre el uso de esta ficha, <a href=\"%(href)s" -"\">visite la página de ayuda de PyPI</a>." +"Para más instrucciones sobre el uso de esta ficha, <a " +"href=\"%(href)s\">visite la página de ayuda de PyPI</a>." #: warehouse/templates/manage/token.html:120 msgid "Add another token" @@ -3294,8 +3294,8 @@ msgstr "Proyecto:" #: warehouse/templates/manage/token.html:163 msgid "" -"An API token scoped to your entire account will have upload permissions for " -"all of your current and future projects." +"An API token scoped to your entire account will have upload permissions " +"for all of your current and future projects." msgstr "" "Una ficha de API cuyo alcance abarque toda la cuenta tendrá permisos de " "carga en todos sus proyectos actuales y futuros." @@ -3314,32 +3314,33 @@ msgstr "Volver a generar códigos de recuperación" #: warehouse/templates/manage/account/recovery_codes-provision.html:46 msgid "" -"If you lose access to your authentication application or security key(s), " -"you’ll need to use one of these recovery codes to log into your PyPI " +"If you lose access to your authentication application or security key(s)," +" you’ll need to use one of these recovery codes to log into your PyPI " "account. Each code can only be used <strong>once</strong>." msgstr "" "Si pierde el acceso a su aplicación de autenticación o a su llave de " "seguridad, habrá de utilizar uno de estos códigos de recuperación para " -"acceder a su cuenta de PyPI. Cada código puede utilizarse <strong>una vez</" -"strong>." +"acceder a su cuenta de PyPI. Cada código puede utilizarse <strong>una " +"vez</strong>." #: warehouse/templates/manage/account/recovery_codes-provision.html:47 msgid "" -"These codes should <strong>only</strong> be used for account recovery, not " -"for typical logins." +"These codes should <strong>only</strong> be used for account recovery, " +"not for typical logins." msgstr "" -"Estos códigos deberían utilizarse <strong>solamente</strong> para recuperar " -"la cuenta, no para accesos típicos." +"Estos códigos deberían utilizarse <strong>solamente</strong> para " +"recuperar la cuenta, no para accesos típicos." #: warehouse/templates/manage/account/recovery_codes-provision.html:48 msgid "" -"<strong>Keep these somewhere safe</strong>. If you lose your authentication " -"application or security key(s) and do not have access to these recovery " -"codes, you may permanently lose access to your PyPI account!" +"<strong>Keep these somewhere safe</strong>. If you lose your " +"authentication application or security key(s) and do not have access to " +"these recovery codes, you may permanently lose access to your PyPI " +"account!" msgstr "" -"<strong>Almacénelos en un sitio seguro</strong>. ¡Si pierde su aplicación de " -"autenticación o su llave de seguridad y no cuenta con sus códigos, podría " -"perder permanentemente el acceso a su cuenta de PyPI!" +"<strong>Almacénelos en un sitio seguro</strong>. ¡Si pierde su aplicación" +" de autenticación o su llave de seguridad y no cuenta con sus códigos, " +"podría perder permanentemente el acceso a su cuenta de PyPI!" #: warehouse/templates/manage/account/recovery_codes-provision.html:52 msgid "Save your Recovery Codes" @@ -3361,8 +3362,7 @@ msgstr "Estos códigos no serán visibles de nuevo." #: warehouse/templates/manage/account/recovery_codes-provision.html:79 msgid "Ensure that you have securely stored them before continuing." -msgstr "" -"Cerciórese de que los ha almacenado de manera segura antes de proceder." +msgstr "Cerciórese de que los ha almacenado de manera segura antes de proceder." #: warehouse/templates/manage/account/totp-provision.html:17 msgid "Set up 2FA with an authentication application (TOTP)" @@ -3371,13 +3371,13 @@ msgstr "Configurar A2F con una aplicación de autenticación (TOTP)" #: warehouse/templates/manage/account/totp-provision.html:32 #, python-format msgid "" -"PyPI supports any application that follows the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based " -"one-time password\">TOTP</abbr> standard</a>." +"PyPI supports any application that follows the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title" +"=\"time-based one-time password\">TOTP</abbr> standard</a>." msgstr "" "PyPI admite cualquier aplicación que se ajuste a la <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">norma <abbr title=" -"\"contraseña temporal de un solo uso\">TOTP</abbr></a>." +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">norma <abbr " +"title=\"contraseña temporal de un solo uso\">TOTP</abbr></a>." #: warehouse/templates/manage/account/totp-provision.html:36 #, python-format @@ -3385,8 +3385,8 @@ msgid "" "Visit <a href=\"%(href)s\">PyPI's help page</a> for a list of compatible " "applications." msgstr "" -"En la <a href=\"%(href)s\">página de ayuda de PyPI</a> hallará una lista de " -"aplicaciones compatibles." +"En la <a href=\"%(href)s\">página de ayuda de PyPI</a> hallará una lista " +"de aplicaciones compatibles." #: warehouse/templates/manage/account/totp-provision.html:42 msgid "Set up your application" @@ -3398,11 +3398,11 @@ msgstr "Escanee el código QR con la aplicación de autenticación que elija." #: warehouse/templates/manage/account/totp-provision.html:46 msgid "" -"For security reasons, you can only associate one authentication application " -"per PyPI account." +"For security reasons, you can only associate one authentication " +"application per PyPI account." msgstr "" -"Por motivos de seguridad, puede asociar solo una aplicación de autenticación " -"por cuenta de PyPI." +"Por motivos de seguridad, puede asociar solo una aplicación de " +"autenticación por cuenta de PyPI." #: warehouse/templates/manage/account/totp-provision.html:52 msgid "QR code for setting up an authentication application" @@ -3424,11 +3424,11 @@ msgstr "Código de autenticación" #: warehouse/templates/manage/account/totp-provision.html:73 msgid "" -"To finalize the set up process, enter the authentication code provided by " -"your application." +"To finalize the set up process, enter the authentication code provided by" +" your application." msgstr "" -"Para finalizar la configuración, escriba el código de autenticación provisto " -"por la aplicación." +"Para finalizar la configuración, escriba el código de autenticación " +"provisto por la aplicación." #: warehouse/templates/manage/account/totp-provision.html:85 msgid "Set up application" @@ -3441,26 +3441,26 @@ msgstr "Configurar A2F con un aparato de seguridad (p. ej., una llave USB)" #: warehouse/templates/manage/account/webauthn-provision.html:26 #, python-format msgid "" -"PyPI supports any device that adheres to the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." +"PyPI supports any device that adheres to the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." msgstr "" -"PyPI admite cualquier aparato que cumpla con la <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">norma FIDO</a>." +"PyPI admite cualquier aparato que cumpla con la <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">norma FIDO</a>." #: warehouse/templates/manage/account/webauthn-provision.html:28 #, python-format msgid "" -"Popular <em>USB keys</em> include <a href=\"%(yubico_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=" -"\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Google Titan</a> and <a href=\"%(thetis_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Thetis</a>." +"Popular <em>USB keys</em> include <a href=\"%(yubico_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> and <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." msgstr "" -"Algunas <em>llaves USB</em> populares son <a href=\"%(yubico_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=" -"\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Google Titan</a> y <a href=\"%(thetis_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Thetis</a>." +"Algunas <em>llaves USB</em> populares son <a href=\"%(yubico_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> y <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." #: warehouse/templates/manage/account/webauthn-provision.html:43 msgid "Name your device to begin" @@ -3485,24 +3485,25 @@ msgstr "Configurar aparato de seguridad" #: warehouse/templates/manage/account/webauthn-provision.html:74 #, python-format msgid "" -"<strong>Not working?</strong> Check you're using a device that follows the " -"<a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">FIDO specification</a> and a <a href=\"%(mozilla_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">compatible browser</a>." +"<strong>Not working?</strong> Check you're using a device that follows " +"the <a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">FIDO specification</a> and a <a " +"href=\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">compatible browser</a>." msgstr "" -"<strong>¿No funciona?</strong> Revise que esté utilizando un aparato que se " -"adhiere a la <a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">especificación FIDO</a>, así como un <a href=" -"\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">navegador compatible</a>." +"<strong>¿No funciona?</strong> Revise que esté utilizando un aparato que " +"se adhiere a la <a href=\"%(fido_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">especificación FIDO</a>, así como un " +"<a href=\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">navegador compatible</a>." #: warehouse/templates/manage/account/webauthn-provision.html:78 msgid "" -"Note that some older USB keys do not adhere to the FIDO standard and will " -"not work with PyPI." +"Note that some older USB keys do not adhere to the FIDO standard and will" +" not work with PyPI." msgstr "" -"Observe que algunos dispositivos USB antiguos no respetan la norma FIDO y no " -"funcionarán con PyPI." +"Observe que algunos dispositivos USB antiguos no respetan la norma FIDO y" +" no funcionarán con PyPI." #: warehouse/templates/packaging/detail.html:94 msgid "Copy PIP instructions" @@ -3586,7 +3587,8 @@ msgstr "Detalles de proyecto" #: warehouse/templates/packaging/detail.html:211 msgid "The author of this package has not provided a project description" msgstr "" -"El autor de este paquete no ha brindado ninguna descripción para el proyecto" +"El autor de este paquete no ha brindado ninguna descripción para el " +"proyecto" #: warehouse/templates/packaging/detail.html:227 msgid "Release notifications" @@ -3604,12 +3606,12 @@ msgstr "prelanzamiento" #, python-format msgid "" "Download the file for your platform. If you're not sure which to choose, " -"learn more about <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">installing packages</a>." +"learn more about <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">installing packages</a>." msgstr "" -"Descargue el archivo adecuado para su plataforma. Si no sabe cuál elegir, " -"consulte información sobre <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">cómo instalar paquetes</a>." +"Descargue el archivo adecuado para su plataforma. Si no sabe cuál elegir," +" consulte información sobre <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">cómo instalar paquetes</a>." #: warehouse/templates/packaging/detail.html:273 #, python-format @@ -3628,39 +3630,41 @@ msgstr "Resúmenes" #: warehouse/templates/pages/classifiers.html:22 msgid "" -"Each project's maintainers provide PyPI with a list of \"trove classifiers\" " -"to categorize each release, describing who it's for, what systems it can run " -"on, and how mature it is." +"Each project's maintainers provide PyPI with a list of \"trove " +"classifiers\" to categorize each release, describing who it's for, what " +"systems it can run on, and how mature it is." msgstr "" "Los responsables de cada proyecto brindan a PyPI una lista de " "«clasificadores de interés» para categorizar cada versión, describir el " -"público al que va dirigida, en qué sistemas puede ejecutarse y cuán madura " -"es." +"público al que va dirigida, en qué sistemas puede ejecutarse y cuán " +"madura es." #: warehouse/templates/pages/classifiers.html:23 msgid "" -"These standardized classifiers can then be used by community members to find " -"projects based on their desired criteria." +"These standardized classifiers can then be used by community members to " +"find projects based on their desired criteria." msgstr "" "Los miembros de la comunidad podrán utilizar estos clasificadores " -"normalizados para encontrar proyectos en función de sus criterios deseados." +"normalizados para encontrar proyectos en función de sus criterios " +"deseados." #: warehouse/templates/pages/classifiers.html:25 #, python-format msgid "" -"Instructions for how to add trove classifiers to a project can be found on " -"the <a href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging User Guide</a>. To read the original " -"classifier specification, refer to <a href=\"%(pep301_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python " -"enhancement proposal\">PEP</abbr> 301</a>." +"Instructions for how to add trove classifiers to a project can be found " +"on the <a href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>. To read the original " +"classifier specification, refer to <a href=\"%(pep301_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 301</a>." msgstr "" "Encontrará instrucciones para añadir clasificadores de interés a los " -"proyectos en el <a href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">manual de uso del empaquetamiento de Python</a>. Para " -"consultar la especificación original de los clasificadores, remítase a <a " -"href=\"%(pep301_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><abbr title=\"Propuesta de mejora de Python\">PEP</abbr> 301</a>." +"proyectos en el <a href=\"%(ppug_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">manual de uso del empaquetamiento de " +"Python</a>. Para consultar la especificación original de los " +"clasificadores, remítase a <a href=\"%(pep301_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " +"title=\"Propuesta de mejora de Python\">PEP</abbr> 301</a>." #: warehouse/templates/pages/classifiers.html:31 msgid "List of classifiers" @@ -3674,47 +3678,48 @@ msgstr "Nota:" #: warehouse/templates/pages/help.html:20 #, python-format msgid "" -"All users submitting feedback, reporting issues or contributing to Warehouse " -"are expected to follow the <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">PyPA Code of Conduct</a>." +"All users submitting feedback, reporting issues or contributing to " +"Warehouse are expected to follow the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPA Code of " +"Conduct</a>." msgstr "" "Se espera que todos los usuarios que envíen comentarios, informen de " -"problemas o contribuyan a Warehouse sigan el <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">código de conducta de PyPA</" -"a>." +"problemas o contribuyan a Warehouse sigan el <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">código de conducta" +" de PyPA</a>." #: warehouse/templates/pages/help.html:31 #, python-format msgid "" "If you lose your %(method)s and can no longer log in, you may " "<strong>permanently lose access to your account</strong>. You should " -"generate and securely store <a href=\"#recoverycodes\">recovery codes</a> to " -"regain access in that event.." +"generate and securely store <a href=\"#recoverycodes\">recovery codes</a>" +" to regain access in that event.." msgstr "" "Si pierde su %(method)s y ya no puede conectarse, es posible que " "<strong>pierda permanentemente el acceso a su cuenta</strong>. Si eso " -"ocurre, recobrará el acceso si genera y almacena con seguridad <a href=" -"\"#recoverycodes\">códigos de recuperación</a>." +"ocurre, recobrará el acceso si genera y almacena con seguridad <a " +"href=\"#recoverycodes\">códigos de recuperación</a>." #: warehouse/templates/pages/help.html:37 msgid "" -"We recommend that all PyPI users set up <em>at least two</em> supported two " -"factor authentication methods and provision <a href=\"#recoverycodes" -"\">recovery codes</a>." +"We recommend that all PyPI users set up <em>at least two</em> supported " +"two factor authentication methods and provision <a " +"href=\"#recoverycodes\">recovery codes</a>." msgstr "" -"Recomendamos que todos los usuarios de PyPI configuren <em>por lo menos</em> " -"dos métodos de autenticación en dos fases compatibles y se creen <a href=" -"\"#recoverycodes\">códigos de recuperación</a>." +"Recomendamos que todos los usuarios de PyPI configuren <em>por lo " +"menos</em> dos métodos de autenticación en dos fases compatibles y se " +"creen <a href=\"#recoverycodes\">códigos de recuperación</a>." #: warehouse/templates/pages/help.html:43 msgid "" -"If you've lost access to all two factor methods for your account and do not " -"have <a href=\"#recoverycodes\">recovery codes</a>, you can request help <a " -"href=\"#account-recovery\">with account recovery</a>." +"If you've lost access to all two factor methods for your account and do " +"not have <a href=\"#recoverycodes\">recovery codes</a>, you can request " +"help <a href=\"#account-recovery\">with account recovery</a>." msgstr "" -"Si ha perdido el acceso a ambos métodos de autenticación y no cuenta con <a " -"href=\"#recoverycodes\">códigos de recuperación</a>, puede pedir ayuda <a " -"href=\"#account-recovery\">para recuperar su cuenta</a>." +"Si ha perdido el acceso a ambos métodos de autenticación y no cuenta con " +"<a href=\"#recoverycodes\">códigos de recuperación</a>, puede pedir ayuda" +" <a href=\"#account-recovery\">para recuperar su cuenta</a>." #: warehouse/templates/pages/help.html:52 msgid "What's a package, project, or release?" @@ -3746,32 +3751,32 @@ msgstr "¿Qué es la autenticación en dos fases y cómo funciona en PyPI?" #: warehouse/templates/pages/help.html:60 msgid "" -"How does two factor authentication with an authentication application (<abbr " -"title=\"time-based one-time password\">TOTP</abbr>) work? How do I set it up " -"on PyPI?" +"How does two factor authentication with an authentication application " +"(<abbr title=\"time-based one-time password\">TOTP</abbr>) work? How do I" +" set it up on PyPI?" msgstr "" -"¿Cómo funciona la autenticación en dos fases con aplicación (<abbr title=" -"\"contraseña temporal de un solo uso\">TOTP</abbr>)? ¿Cómo se configura en " -"PyPI?" +"¿Cómo funciona la autenticación en dos fases con aplicación (<abbr " +"title=\"contraseña temporal de un solo uso\">TOTP</abbr>)? ¿Cómo se " +"configura en PyPI?" #: warehouse/templates/pages/help.html:61 msgid "" "How does two factor authentication with a security device (e.g. USB key) " "work? How do I set it up on PyPI?" msgstr "" -"¿Cómo funciona la autenticación en dos fases con aparato de seguridad " -"(p. ej., llave USB)? ¿Cómo la configuro en PyPI?" +"¿Cómo funciona la autenticación en dos fases con aparato de seguridad (p." +" ej., llave USB)? ¿Cómo la configuro en PyPI?" #: warehouse/templates/pages/help.html:62 msgid "What devices (other than a USB key) can I use as a security device?" msgstr "" -"¿Cuáles dispositivos (además de una llave USB) puedo emplear como aparato de " -"seguridad?" +"¿Cuáles dispositivos (además de una llave USB) puedo emplear como aparato" +" de seguridad?" #: warehouse/templates/pages/help.html:63 msgid "" -"How does two factor authentication with a recovery code work? How do I set " -"it up on PyPI?" +"How does two factor authentication with a recovery code work? How do I " +"set it up on PyPI?" msgstr "" "¿Cómo funciona la autenticación en dos fases con código de recuperación? " "¿Cómo la configuro en PyPI?" @@ -3791,15 +3796,16 @@ msgstr "¿PyPI tiene API que pueda utilizar?" #: warehouse/templates/pages/help.html:68 msgid "How do I get notified when a new version of a project is released?" msgstr "" -"¿Cómo hago para que se me notifique cuando se publique una versión nueva de " -"algún proyecto?" +"¿Cómo hago para que se me notifique cuando se publique una versión nueva " +"de algún proyecto?" #: warehouse/templates/pages/help.html:69 msgid "" -"Where can I see statistics about PyPI, downloads, and project/package usage?" +"Where can I see statistics about PyPI, downloads, and project/package " +"usage?" msgstr "" -"¿Dónde puedo consultar estadísticas sobre PyPI, las descargas y el uso de un " -"proyecto/paquete?" +"¿Dónde puedo consultar estadísticas sobre PyPI, las descargas y el uso de" +" un proyecto/paquete?" #: warehouse/templates/pages/help.html:71 msgid "I forgot my PyPI password. Can you help me?" @@ -3811,19 +3817,19 @@ msgstr "He perdido el acceso a mi cuenta de PyPI. Necesito ayuda." #: warehouse/templates/pages/help.html:73 msgid "" -"Why am I getting a \"Invalid or non-existent authentication information.\" " -"error when uploading files?" +"Why am I getting a \"Invalid or non-existent authentication " +"information.\" error when uploading files?" msgstr "" "¿Por qué recibo el error «Información de autenticación no válida o " "inexistente» al cargar archivos?" #: warehouse/templates/pages/help.html:74 msgid "" -"Why am I getting \"No matching distribution found\" or \"Could not fetch URL" -"\" errors during <code>pip install</code>?" +"Why am I getting \"No matching distribution found\" or \"Could not fetch " +"URL\" errors during <code>pip install</code>?" msgstr "" -"¿Por qué recibo errores «No se encontró ninguna distribución coincidente» o " -"«No se pudo recuperar el URL» al ejecutar <code>pip install</code>?" +"¿Por qué recibo errores «No se encontró ninguna distribución coincidente»" +" o «No se pudo recuperar el URL» al ejecutar <code>pip install</code>?" #: warehouse/templates/pages/help.html:75 msgid "I am having trouble using the PyPI website. Can you help me?" @@ -3832,8 +3838,7 @@ msgstr "" "solucionarlos." #: warehouse/templates/pages/help.html:76 -msgid "" -"Why can't I manually upload files to PyPI, through the browser interface?" +msgid "Why can't I manually upload files to PyPI, through the browser interface?" msgstr "" "¿Por qué no puedo cargar archivos manualmente en PyPI a través de la " "interfaz del navegador?" @@ -3844,8 +3849,7 @@ msgstr "¿Cómo puedo publicar mis paquetes privados en PyPI?" #: warehouse/templates/pages/help.html:78 msgid "Why did my package or user registration get blocked?" -msgstr "" -"¿Por qué se ha bloqueado el registro de mi paquete o mi cuenta de usuario?" +msgstr "¿Por qué se ha bloqueado el registro de mi paquete o mi cuenta de usuario?" #: warehouse/templates/pages/help.html:79 msgid "How do I get a file size limit exemption or increase for my project?" @@ -3855,11 +3859,11 @@ msgstr "" #: warehouse/templates/pages/help.html:81 msgid "" -"Why am I getting a \"Filename or contents already exists\" or \"Filename has " -"been previously used\" error?" +"Why am I getting a \"Filename or contents already exists\" or \"Filename " +"has been previously used\" error?" msgstr "" -"¿Por qué recibo un error «Ya existe el nombre de archivo o el contenido»/«El " -"nombre de archivo se ha utilizado con anterioridad»?" +"¿Por qué recibo un error «Ya existe el nombre de archivo o el " +"contenido»/«El nombre de archivo se ha utilizado con anterioridad»?" #: warehouse/templates/pages/help.html:82 msgid "Why isn't my desired project name available?" @@ -3871,8 +3875,7 @@ msgstr "¿Cómo reclamo el nombre de un proyecto abandonado o ya registrado?" #: warehouse/templates/pages/help.html:84 msgid "What collaborator roles are available for a project on PyPI?" -msgstr "" -"¿Qué puestos de colaboración están disponibles para los proyectos de PyPI?" +msgstr "¿Qué puestos de colaboración están disponibles para los proyectos de PyPI?" #: warehouse/templates/pages/help.html:85 msgid "How do I become an owner/maintainer of a project on PyPI?" @@ -3912,11 +3915,11 @@ msgstr "¿Cómo me mantengo al tanto de futuros cambios en PyPI?" #: warehouse/templates/pages/help.html:95 msgid "" -"What does the \"beta feature\" badge mean? What are Warehouse's current beta " -"features?" +"What does the \"beta feature\" badge mean? What are Warehouse's current " +"beta features?" msgstr "" -"¿Qué significa la etiqueta «función beta»? ¿Cuáles son las funciones beta " -"actuales de Warehouse?" +"¿Qué significa la etiqueta «función beta»? ¿Cuáles son las funciones beta" +" actuales de Warehouse?" #: warehouse/templates/pages/help.html:96 msgid "How do I pronounce \"PyPI\"?" @@ -3960,85 +3963,88 @@ msgstr "Acerca de" msgid "" "\n" " <p>We use a number of terms to describe software available on " -"PyPI, like \"project\", \"release\", \"file\", and \"package\". Sometimes " -"those terms are confusing because they're used to describe different things " -"in other contexts. Here's how we use them on PyPI:</p>\n" -" <p>A \"project\" on PyPI is the name of a collection of releases " -"and files, and information about them. Projects on PyPI are made and shared " -"by other members of the Python community so that you can use them.</p>\n" -" <p>A \"release\" on PyPI is a specific version of a project. For " -"example, the <a href=\"%(requests_href)s\">requests</a> project has many " -"releases, like \"requests 2.10\" and \"requests 1.2.1\". A release consists " -"of one or more \"files\".</p>\n" -" <p>A \"file\", also known as a \"package\", on PyPI is something " -"that you can download and install. Because of different hardware, operating " -"systems, and file formats, a release may have several files (packages), like " -"an archive containing source code or a binary <a href=\"%(wheel_href)s" -"\">wheel</a>.</p>\n" +"PyPI, like \"project\", \"release\", \"file\", and \"package\". Sometimes" +" those terms are confusing because they're used to describe different " +"things in other contexts. Here's how we use them on PyPI:</p>\n" +" <p>A \"project\" on PyPI is the name of a collection of " +"releases and files, and information about them. Projects on PyPI are made" +" and shared by other members of the Python community so that you can use " +"them.</p>\n" +" <p>A \"release\" on PyPI is a specific version of a project. " +"For example, the <a href=\"%(requests_href)s\">requests</a> project has " +"many releases, like \"requests 2.10\" and \"requests 1.2.1\". A release " +"consists of one or more \"files\".</p>\n" +" <p>A \"file\", also known as a \"package\", on PyPI is " +"something that you can download and install. Because of different " +"hardware, operating systems, and file formats, a release may have several" +" files (packages), like an archive containing source code or a binary <a " +"href=\"%(wheel_href)s\">wheel</a>.</p>\n" " " msgstr "" "\n" -" <p>Empleamos diversos términos para describir el <em>software</em> " -"que está disponible en PyPI, como «proyecto», «versión», «archivo» y " -"«paquete». En ocasiones, estos términos resultan confusos porque se utilizan " -"para describir cosas distintas en otros contextos. En PyPI los utilizamos " -"así:</p>\n" -" <p>Un «proyecto» en PyPI es una colección de versiones y archivos " -"y la información que los describe. Los proyectos en PyPI los crean y " -"comparten otros miembros de la comunidad de Python para que usted pueda " -"utilizarlos.</p>\n" +" <p>Empleamos diversos términos para describir el " +"<em>software</em> que está disponible en PyPI, como «proyecto», " +"«versión», «archivo» y «paquete». En ocasiones, estos términos resultan " +"confusos porque se utilizan para describir cosas distintas en otros " +"contextos. En PyPI los utilizamos así:</p>\n" +" <p>Un «proyecto» en PyPI es una colección de versiones y " +"archivos y la información que los describe. Los proyectos en PyPI los " +"crean y comparten otros miembros de la comunidad de Python para que usted" +" pueda utilizarlos.</p>\n" " <p>Una «versión» en PyPI es una publicación concreta de un " -"proyecto. Por ejemplo, el proyecto <a href=\"%(requests_href)s\">requests</" -"a> dispone de muchas versiones tales como «requests 2.10» y «requests " -"1.2.1». Una versión consiste de uno o más «archivos».</p>\n" -" <p>Un «archivo», conocido también como «paquete», en PyPI es algo " -"que puede descargarse e instalar. Debido a la variedad de <em>hardware</em>, " -"sistemas operativos y formatos de archivos, una versión puede incluir varios " -"archivos (o paquetes), como un comprimido con código fuente o una <a href=" -"\"%(wheel_href)s\"><em>wheel</em></a> binaria.</p>\n" +"proyecto. Por ejemplo, el proyecto <a " +"href=\"%(requests_href)s\">requests</a> dispone de muchas versiones tales" +" como «requests 2.10» y «requests 1.2.1». Una versión consiste de uno o " +"más «archivos».</p>\n" +" <p>Un «archivo», conocido también como «paquete», en PyPI es " +"algo que puede descargarse e instalar. Debido a la variedad de " +"<em>hardware</em>, sistemas operativos y formatos de archivos, una " +"versión puede incluir varios archivos (o paquetes), como un comprimido " +"con código fuente o una <a href=\"%(wheel_href)s\"><em>wheel</em></a> " +"binaria.</p>\n" " " #: warehouse/templates/pages/help.html:194 #, python-format msgid "" -"To learn how to install a file from PyPI, visit the <a href=" -"\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">installation tutorial</a> on the <a href=\"%(user_guide_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " -"User Guide</a>." +"To learn how to install a file from PyPI, visit the <a " +"href=\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">installation tutorial</a> on the <a " +"href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" -"Para aprender a instalar un archivo proveniente de PyPI, visite el <a href=" -"\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">tutorial de instalación</a> en el <a href=\"%(user_guide_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">manual de uso del " -"empaquetamiento de Python</a>." +"Para aprender a instalar un archivo proveniente de PyPI, visite el <a " +"href=\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">tutorial de instalación</a> en el <a " +"href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">manual de uso del empaquetamiento de Python</a>." #: warehouse/templates/pages/help.html:201 #, python-format msgid "" -"For full instructions on configuring, packaging and distributing your Python " -"project, refer to the <a href=\"%(packaging_tutorial_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">packaging tutorial</a> on " -"the <a href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Python Packaging User Guide</a>." +"For full instructions on configuring, packaging and distributing your " +"Python project, refer to the <a href=\"%(packaging_tutorial_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">packaging " +"tutorial</a> on the <a href=\"%(user_guide_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" -"Para obtener instrucciones completas sobre el montaje, el empaquetamiento y " -"la distribución de su proyecto de Python, consulte el <a href=" -"\"%(packaging_tutorial_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">tutorial de empaquetamiento</a> en el <a href=" -"\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">manual de uso del empaquetamiento de Python</a>." +"Para obtener instrucciones completas sobre el montaje, el empaquetamiento" +" y la distribución de su proyecto de Python, consulte el <a " +"href=\"%(packaging_tutorial_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">tutorial de empaquetamiento</a> en el " +"<a href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">manual de uso del empaquetamiento de Python</a>." #: warehouse/templates/pages/help.html:208 #, python-format msgid "" -"Classifiers are used to categorize projects on PyPI. See <a href=\"%(href)s" -"\">the classifiers page</a> for more information, as well as a list of valid " -"classifiers." +"Classifiers are used to categorize projects on PyPI. See <a " +"href=\"%(href)s\">the classifiers page</a> for more information, as well " +"as a list of valid classifiers." msgstr "" -"Los clasificadores sirven para categorizar proyectos en PyPI. Vea la <a href=" -"\"%(href)s\">página de clasificadores</a> para obtener más información, así " -"como una lista de clasificadores válidos." +"Los clasificadores sirven para categorizar proyectos en PyPI. Vea la <a " +"href=\"%(href)s\">página de clasificadores</a> para obtener más " +"información, así como una lista de clasificadores válidos." #: warehouse/templates/pages/help.html:215 msgid "My account" @@ -4046,8 +4052,8 @@ msgstr "Mi cuenta" #: warehouse/templates/pages/help.html:218 msgid "" -"Currently, PyPI requires a verified email address to perform the following " -"operations:" +"Currently, PyPI requires a verified email address to perform the " +"following operations:" msgstr "" "En la actualidad, PyPI exige una dirección de correo verificada para " "desempeñar las operaciones siguientes:" @@ -4062,162 +4068,168 @@ msgstr "Cargar una versión o un archivo nuevos." #: warehouse/templates/pages/help.html:223 msgid "" -"The list of activities that require a verified email address is likely to " -"grow over time." +"The list of activities that require a verified email address is likely to" +" grow over time." msgstr "" -"Es probable que crezca la lista de actividades que exigen una dirección de " -"correo verificada." +"Es probable que crezca la lista de actividades que exigen una dirección " +"de correo verificada." #: warehouse/templates/pages/help.html:224 #, python-format msgid "" -"This policy will allow us to enforce a key policy of <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python " -"enhancement proposal\">PEP</abbr> 541</a> regarding maintainer reachability. " -"It also reduces the viability of spam attacks to create many accounts in an " -"automated fashion." +"This policy will allow us to enforce a key policy of <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 541</a> regarding " +"maintainer reachability. It also reduces the viability of spam attacks to" +" create many accounts in an automated fashion." msgstr "" -"Esta normativa nos permitirá implantar una disposición clave de la <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " -"title=\"Propuesta de mejora de Python; siglas en inglés\">PEP</abbr> 541</a> " -"sobre la localizabilidad de los responsables. Además, reduce la viabilidad " -"de ataques de contenido basura en que se crean muchas cuentas de forma " -"automatizada." +"Esta normativa nos permitirá implantar una disposición clave de la <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><abbr title=\"Propuesta de mejora de Python; siglas en " +"inglés\">PEP</abbr> 541</a> sobre la localizabilidad de los responsables." +" Además, reduce la viabilidad de ataques de contenido basura en que se " +"crean muchas cuentas de forma automatizada." #: warehouse/templates/pages/help.html:225 #, python-format msgid "" -"You can manage your account's email addresses in your <a href=\"%(href)s" -"\">account settings</a>. This also allows for sending a new confirmation " -"email for users who signed up in the past, before we began enforcing this " -"policy." +"You can manage your account's email addresses in your <a " +"href=\"%(href)s\">account settings</a>. This also allows for sending a " +"new confirmation email for users who signed up in the past, before we " +"began enforcing this policy." msgstr "" -"Puede gestionar las direcciones de correo de su cuenta en la <a href=" -"\"%(href)s\">configuración de cuenta</a>. Ello también permite enviar " -"mensajes de confirmación nuevos para aquellos usuarios que se dieron de alta " -"antes de que comenzáramos a aplicar esta normativa." +"Puede gestionar las direcciones de correo de su cuenta en la <a " +"href=\"%(href)s\">configuración de cuenta</a>. Ello también permite " +"enviar mensajes de confirmación nuevos para aquellos usuarios que se " +"dieron de alta antes de que comenzáramos a aplicar esta normativa." #: warehouse/templates/pages/help.html:228 #, python-format msgid "" -"<p> PyPI itself has not suffered a breach. This is a protective measure to " -"reduce the risk of <a href=\"%(credential_stuffing_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">credential stuffing</a> attacks " -"against PyPI and its users. </p> <p> Each time a user supplies a password — " -"while registering, authenticating, or updating their password — PyPI " -"securely checks whether that password has appeared in public data breaches. " -"</p> <p> During each of these processes, PyPI generates a SHA-1 hash of the " -"supplied password and uses the first five (5) characters of the hash to " -"check the <a href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Have I Been Pwned API</a> and determine if the " -"password has been previously compromised. The plaintext password is never " -"stored by PyPI or submitted to the Have I Been Pwned API. </p> <p> PyPI will " -"not allow such passwords to be used when setting a password at registration " -"or updating your password. </p> <p> If you receive an error message saying " -"that \"This password appears in a breach or has been compromised and cannot " -"be used\", you should change it all other places that you use it as soon as " -"possible. </p> <p> If you have received this error while attempting to log " -"in or upload to PyPI, then your password has been reset and you cannot log " -"in to PyPI until you <a href=\"%(reset_pwd_href)s\">reset your password</a>. " -"</p>" -msgstr "" -"<p> PyPI en sí no ha sufrido una violación. Esta es una medida de protección " -"para reducir el riesgo de ataques de <a href=\"%(credential_stuffing_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">relleno de " -"credenciales</a> contra PyPI y sus usuarios.</p> <p>Cada vez que un usuario " -"proporciona una contraseña, mientras registra, autentica o actualiza su " -"contraseña, PyPI verifica de forma segura si esa contraseña ha aparecido en " -"violaciones de datos públicos.</p> <p>Durante cada uno de estos procesos, " -"PyPI genera un hash SHA-1 de la contraseña suministrada y usa los primeros " -"cinco (5) caracteres del hash para verificar la <a href=" -"\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">API Have I Been Pwned</a> y determinar si la contraseña ha sido " -"comprometida previamente. La contraseña de texto sin formato nunca es " -"almacenada por PyPI ni enviada a la API Have I Been Pwned. </p> <p> PyPI no " -"permitirá que tales contraseñas se usen al establecer una contraseña en el " -"registro o actualizar su contraseña. </p> <p> Si recibes un mensaje de error " -"que dice \"Esta contraseña aparece en una violación o ha sido comprometida y " -"no se puede usar\", debes cambiarla en todos los demás lugares donde la uses " -"lo antes posible. </p> <p>Si ha recibido este error al intentar iniciar " -"sesión o cargar en PyPI, la contraseña se ha restablecido y no puedes " -"iniciar sesión en PyPI hasta que <a href=\"%(reset_pwd_href)s\">restablezcas " -"tu contraseña</a>. </p>" +"<p> PyPI itself has not suffered a breach. This is a protective measure " +"to reduce the risk of <a href=\"%(credential_stuffing_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">credential " +"stuffing</a> attacks against PyPI and its users. </p> <p> Each time a " +"user supplies a password — while registering, authenticating, or updating" +" their password — PyPI securely checks whether that password has appeared" +" in public data breaches. </p> <p> During each of these processes, PyPI " +"generates a SHA-1 hash of the supplied password and uses the first five " +"(5) characters of the hash to check the <a " +"href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Have I Been Pwned API</a> and determine if the password " +"has been previously compromised. The plaintext password is never stored " +"by PyPI or submitted to the Have I Been Pwned API. </p> <p> PyPI will not" +" allow such passwords to be used when setting a password at registration " +"or updating your password. </p> <p> If you receive an error message " +"saying that \"This password appears in a breach or has been compromised " +"and cannot be used\", you should change it all other places that you use " +"it as soon as possible. </p> <p> If you have received this error while " +"attempting to log in or upload to PyPI, then your password has been reset" +" and you cannot log in to PyPI until you <a " +"href=\"%(reset_pwd_href)s\">reset your password</a>. </p>" +msgstr "" +"<p> PyPI en sí no ha sufrido una violación. Esta es una medida de " +"protección para reducir el riesgo de ataques de <a " +"href=\"%(credential_stuffing_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">relleno de credenciales</a> contra " +"PyPI y sus usuarios.</p> <p>Cada vez que un usuario proporciona una " +"contraseña, mientras registra, autentica o actualiza su contraseña, PyPI " +"verifica de forma segura si esa contraseña ha aparecido en violaciones de" +" datos públicos.</p> <p>Durante cada uno de estos procesos, PyPI genera " +"un hash SHA-1 de la contraseña suministrada y usa los primeros cinco (5) " +"caracteres del hash para verificar la <a href=\"%(haveibeenpwned_href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">API Have I Been " +"Pwned</a> y determinar si la contraseña ha sido comprometida previamente." +" La contraseña de texto sin formato nunca es almacenada por PyPI ni " +"enviada a la API Have I Been Pwned. </p> <p> PyPI no permitirá que tales " +"contraseñas se usen al establecer una contraseña en el registro o " +"actualizar su contraseña. </p> <p> Si recibes un mensaje de error que " +"dice \"Esta contraseña aparece en una violación o ha sido comprometida y " +"no se puede usar\", debes cambiarla en todos los demás lugares donde la " +"uses lo antes posible. </p> <p>Si ha recibido este error al intentar " +"iniciar sesión o cargar en PyPI, la contraseña se ha restablecido y no " +"puedes iniciar sesión en PyPI hasta que <a " +"href=\"%(reset_pwd_href)s\">restablezcas tu contraseña</a>. </p>" #: warehouse/templates/pages/help.html:263 #, python-format msgid "" "<p> Two factor authentication (2FA) makes your account more secure by " "requiring two things in order to log in: <em>something you know</em> and " -"<em>something you own</em>. </p> <p> In PyPI's case, \"something you know\" " -"is your username and password, while \"something you own\" can be <a href=" -"\"#totp\">an application to generate a temporary code</a>, or a <a href=" -"\"#utfkey\">security device</a> (most commonly a USB key). </p> <p> It is " -"strongly recommended that you set up two factor authentication on your PyPI " -"account. </p> <p> Users who have chosen to set up two factor authentication " -"will be asked to provide their second method of identity verification during " -"the log in process. This only affects logging in via a web browser, and not " -"(yet) package uploads. </p> <p>You can follow the improvements to <abbr " -"title=\"two factor authentication\">2FA</abbr> on <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">discuss.python.org</a>.</p>" -msgstr "" -"<p> La autenticación en dos fases (A2F) hace que su cuenta sea más segura " -"exigiendo dos cosas para poder acceder: <em>algo que sabe</em> y <em>algo " -"que posee</em>. </p> <p> En el caso de PyPI, «algo que sabe» es su usuario y " -"contraseña, y «algo que posee» puede ser <a href=\"#totp\">una aplicación " -"generadora de códigos temporales</a> o un <a href=\"#utfkey\">aparato de " -"seguridad</a> (más frecuentemente, una llave USB). </p> <p> Exhortamos a que " -"configure la autenticación en dos fases para su cuenta de PyPI. </p> <p> A " -"los usuarios que han elegido configurar la autenticación en dos fases se les " -"solicitará que provean su segundo método de comprobación identitaria durante " -"el proceso de acceso. Esto afecta solo a los accesos a través del navegador; " -"(aún) no a las cargas de paquetes. </p> <p>Puede mantenerse al tanto de las " -"mejoras a la <abbr title=\"autenticación en dos fases\">A2F</abbr> en <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">discuss.python.org</a>.</p>" +"<em>something you own</em>. </p> <p> In PyPI's case, \"something you " +"know\" is your username and password, while \"something you own\" can be " +"<a href=\"#totp\">an application to generate a temporary code</a>, or a " +"<a href=\"#utfkey\">security device</a> (most commonly a USB key). </p> " +"<p> It is strongly recommended that you set up two factor authentication " +"on your PyPI account. </p> <p> Users who have chosen to set up two factor" +" authentication will be asked to provide their second method of identity " +"verification during the log in process. This only affects logging in via " +"a web browser, and not (yet) package uploads. </p> <p>You can follow the " +"improvements to <abbr title=\"two factor authentication\">2FA</abbr> on " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">discuss.python.org</a>.</p>" +msgstr "" +"<p> La autenticación en dos fases (A2F) hace que su cuenta sea más segura" +" exigiendo dos cosas para poder acceder: <em>algo que sabe</em> y " +"<em>algo que posee</em>. </p> <p> En el caso de PyPI, «algo que sabe» es " +"su usuario y contraseña, y «algo que posee» puede ser <a " +"href=\"#totp\">una aplicación generadora de códigos temporales</a> o un " +"<a href=\"#utfkey\">aparato de seguridad</a> (más frecuentemente, una " +"llave USB). </p> <p> Exhortamos a que configure la autenticación en dos " +"fases para su cuenta de PyPI. </p> <p> A los usuarios que han elegido " +"configurar la autenticación en dos fases se les solicitará que provean su" +" segundo método de comprobación identitaria durante el proceso de acceso." +" Esto afecta solo a los accesos a través del navegador; (aún) no a las " +"cargas de paquetes. </p> <p>Puede mantenerse al tanto de las mejoras a la" +" <abbr title=\"autenticación en dos fases\">A2F</abbr> en <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">discuss.python.org</a>.</p>" #: warehouse/templates/pages/help.html:290 #, python-format msgid "" "PyPI users can set up two-factor authentication using any authentication " "application that supports the <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based one-time password" -"\">TOTP</abbr> standard</a>." +"target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based one-time " +"password\">TOTP</abbr> standard</a>." msgstr "" -"Los usuarios de PyPI puede configurar la autenticación en dos fases a través " -"de cualquier aplicación que admita la <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">norma <abbr title=\"contraseña " -"temporal de un solo uso\">TOTP</abbr></a>." +"Los usuarios de PyPI puede configurar la autenticación en dos fases a " +"través de cualquier aplicación que admita la <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">norma <abbr " +"title=\"contraseña temporal de un solo uso\">TOTP</abbr></a>." #: warehouse/templates/pages/help.html:291 msgid "" "<abbr title=\"time-based one-time password\">TOTP</abbr> authentication " -"applications generate a regularly changing authentication code to use when " -"logging into your account." +"applications generate a regularly changing authentication code to use " +"when logging into your account." msgstr "" -"Las aplicaciones de autenticación <abbr title=\"contraseña temporal de un " -"solo uso\">TOTP</abbr> generan un código que cambia constantemente para " +"Las aplicaciones de autenticación <abbr title=\"contraseña temporal de un" +" solo uso\">TOTP</abbr> generan un código que cambia constantemente para " "utilizarlo al momento de acceder a su cuenta." #: warehouse/templates/pages/help.html:292 msgid "" -"Because <abbr title=\"time-based one-time password\">TOTP</abbr> is an open " -"standard, there are many applications that are compatible with your PyPI " -"account. Popular applications include:" +"Because <abbr title=\"time-based one-time password\">TOTP</abbr> is an " +"open standard, there are many applications that are compatible with your " +"PyPI account. Popular applications include:" msgstr "" "<abbr title=\"contraseña temporal de un solo uso\">TOTP</abbr> es un " -"estándar abierto; por ello, existen muchas aplicaciones compatibles con su " -"cuenta de PyPI. Entre las más populares se encuentran:" +"estándar abierto; por ello, existen muchas aplicaciones compatibles con " +"su cuenta de PyPI. Entre las más populares se encuentran:" #: warehouse/templates/pages/help.html:295 #, python-format msgid "" -"Google Authenticator for <a href=\"%(android_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Google Authenticator for <a href=\"%(android_href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Android</a> or <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" msgstr "" -"Google Authenticator para <a href=\"%(android_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Android</a> y <a href=\"%(ios_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Google Authenticator para <a href=\"%(android_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Android</a> y <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/help.html:298 #: warehouse/templates/pages/help.html:300 @@ -4229,13 +4241,14 @@ msgstr "(privativa)" #: warehouse/templates/pages/help.html:302 #, python-format msgid "" -"Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Android</a> or <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" msgstr "" -"Duo Mobile para <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Android</a> y <a href=\"%(ios_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Duo Mobile para <a href=\"%(android_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Android</a> y <a href=\"%(ios_href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/help.html:308 #: warehouse/templates/pages/help.html:309 @@ -4245,71 +4258,72 @@ msgstr "(de código abierto)" #: warehouse/templates/pages/help.html:313 #, python-format msgid "" -"Some password managers (e.g. <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">1Password</a>) can also generate authentication " -"codes. For security reasons, PyPI only allows you to set up one application " -"per account." +"Some password managers (e.g. <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">1Password</a>) can also generate " +"authentication codes. For security reasons, PyPI only allows you to set " +"up one application per account." msgstr "" -"Algunos gestores de contraseñas (como <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">1Password</a>) permiten además generar " -"códigos de autenticación. Por motivos de seguridad, PyPI le permite " -"configurar solo una aplicación por cuenta." +"Algunos gestores de contraseñas (como <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">1Password</a>) " +"permiten además generar códigos de autenticación. Por motivos de " +"seguridad, PyPI le permite configurar solo una aplicación por cuenta." #: warehouse/templates/pages/help.html:321 msgid "" "To set up <abbr title=\"two factor authentication\">2FA</abbr> with an " "authentication application:" msgstr "" -"Para configurar la <abbr title=\"autenticación en dos fases\">A2F</abbr> con " -"una aplicación de autenticación:" +"Para configurar la <abbr title=\"autenticación en dos fases\">A2F</abbr> " +"con una aplicación de autenticación:" #: warehouse/templates/pages/help.html:323 msgid "" -"Open an authentication (<abbr title=\"time-based one-time password\">TOTP</" -"abbr>) application" +"Open an authentication (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>) application" msgstr "" -"Abra una aplicación de autenticación (<abbr title=\"contraseña temporal de " -"un solo uso\">TOTP</abbr>)" +"Abra una aplicación de autenticación (<abbr title=\"contraseña temporal " +"de un solo uso\">TOTP</abbr>)" #: warehouse/templates/pages/help.html:324 msgid "" -"Log in to your PyPI account, go to your account settings, and choose \"Add " -"<abbr title=\"two factor authentication\">2FA</abbr> with authentication " -"application\"" +"Log in to your PyPI account, go to your account settings, and choose " +"\"Add <abbr title=\"two factor authentication\">2FA</abbr> with " +"authentication application\"" msgstr "" "Acceda a su cuenta de PyPI, diríjase a la configuración de la cuenta y " -"seleccione «Añadir <abbr title=\"autenticación en dos fases\">A2F</abbr> con " -"una aplicación de autenticación»" +"seleccione «Añadir <abbr title=\"autenticación en dos fases\">A2F</abbr> " +"con una aplicación de autenticación»" #: warehouse/templates/pages/help.html:325 msgid "" -"PyPI will generate a secret key, specific to your account. This is displayed " -"as a QR code, and as a text code." +"PyPI will generate a secret key, specific to your account. This is " +"displayed as a QR code, and as a text code." msgstr "" -"PyPI generará una clave secreta, específica para su cuenta. Esta se muestra " -"como un código QR y uno de texto." +"PyPI generará una clave secreta, específica para su cuenta. Esta se " +"muestra como un código QR y uno de texto." #: warehouse/templates/pages/help.html:326 msgid "" "Scan the QR code with your authentication application, or type it in " -"manually. The method of input will depend on the application you have chosen." +"manually. The method of input will depend on the application you have " +"chosen." msgstr "" -"Escanee con la aplicación el código QR o ingrese el de texto manualmente. El " -"método depende de la aplicación que haya elegido." +"Escanee con la aplicación el código QR o ingrese el de texto manualmente." +" El método depende de la aplicación que haya elegido." #: warehouse/templates/pages/help.html:327 msgid "" -"Your application will generate an authentication code - use this to verify " -"your set up on PyPI" +"Your application will generate an authentication code - use this to " +"verify your set up on PyPI" msgstr "" -"Su aplicación generará un código de autenticación, que deberá emplear para " -"verificar su configuración en PyPI" +"Su aplicación generará un código de autenticación, que deberá emplear " +"para verificar su configuración en PyPI" #: warehouse/templates/pages/help.html:330 msgid "" "The PyPI server and your application now share your PyPI secret key, " -"allowing your application to generate valid authentication codes for your " -"PyPI account." +"allowing your application to generate valid authentication codes for your" +" PyPI account." msgstr "" "Ahora, el servidor de PyPI y su aplicación comparten su clave secreta de " "PyPI, lo que permitirá a la aplicación generar códigos de autenticación " @@ -4335,34 +4349,34 @@ msgstr "Utilizar este código para finalizar el proceso de acceso a PyPI" #: warehouse/templates/pages/help.html:342 msgid "" -"A security device is a USB key or <a href=\"#utfdevices\">other device</a> " -"that generates a one-time password and sends that password to the browser. " -"This password is then used by PyPI to authenticate you as a user." +"A security device is a USB key or <a href=\"#utfdevices\">other " +"device</a> that generates a one-time password and sends that password to " +"the browser. This password is then used by PyPI to authenticate you as a " +"user." msgstr "" "Un aparato de seguridad es una llave USB u <a href=\"#utfdevices\">otro " "dispositivo</a> que genera una contraseña de un solo uso y la envía al " -"navegador. Posteriormente, PyPI utiliza esta contraseña para autenticarle " -"como usuario/a." +"navegador. Posteriormente, PyPI utiliza esta contraseña para autenticarle" +" como usuario/a." #: warehouse/templates/pages/help.html:344 -msgid "" -"To set up two factor authentication with a <em>USB key</em>, you'll need:" +msgid "To set up two factor authentication with a <em>USB key</em>, you'll need:" msgstr "" -"Para configurar la autenticación en dos fases con una <em>llave USB</em>, " -"necesita:" +"Para configurar la autenticación en dos fases con una <em>llave USB</em>," +" necesita:" #: warehouse/templates/pages/help.html:346 #, python-format msgid "" -"To use a <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">browser that supports <abbr title=\"web authentication" -"\">WebAuthn</abbr> and PublicKeyCredential</a>, as this is the standard " -"implemented by PyPI." +"To use a <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">browser that supports <abbr title=\"web " +"authentication\">WebAuthn</abbr> and PublicKeyCredential</a>, as this is " +"the standard implemented by PyPI." msgstr "" -"Utilizar un <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">navegador que admita <abbr title=\"autenticación web" -"\">WebAuthn</abbr> y PublicKeyCredential</a>, ya que esta es la norma que " -"PyPI implementa." +"Utilizar un <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">navegador que admita <abbr title=\"autenticación " +"web\">WebAuthn</abbr> y PublicKeyCredential</a>, ya que esta es la norma " +"que PyPI implementa." #: warehouse/templates/pages/help.html:347 msgid "To be running JavaScript on your browser" @@ -4371,35 +4385,37 @@ msgstr "Ejecutar JavaScript en el navegador" #: warehouse/templates/pages/help.html:348 #, python-format msgid "" -"To use a USB key that adheres to the <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">FIDO U2F specification</a>:" +"To use a USB key that adheres to the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO U2F " +"specification</a>:" msgstr "" -"Utilizar una llave USB que se apegue a la <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">especificación U2F de FIDO</" -"a>:" +"Utilizar una llave USB que se apegue a la <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">especificación U2F" +" de FIDO</a>:" #: warehouse/templates/pages/help.html:351 #, python-format msgid "" -"Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</a> and <a " -"href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Thetis</a>." +"Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> and <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." msgstr "" -"Entre las llaves más populares pueden contarse <a href=\"%(yubikey_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=" -"\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Google Titan</a> y <a href=\"%(thetis_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Thetis</a>." +"Entre las llaves más populares pueden contarse <a " +"href=\"%(yubikey_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</a> y" +" <a href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Thetis</a>." #: warehouse/templates/pages/help.html:358 msgid "" "Note that some older Yubico USB keys <strong>do not follow the FIDO " "specification</strong>, and will therefore not work with PyPI" msgstr "" -"Observe que algunas llaves USB Yubico antiguas <strong>no se ajustan a la " -"especificación FIDO</strong> y, por ende, no funcionan con PyPI" +"Observe que algunas llaves USB Yubico antiguas <strong>no se ajustan a la" +" especificación FIDO</strong> y, por ende, no funcionan con PyPI" #: warehouse/templates/pages/help.html:363 msgid "Follow these steps:" @@ -4408,22 +4424,22 @@ msgstr "Siga estos pasos:" #: warehouse/templates/pages/help.html:365 msgid "" "\n" -" <li>Log in to your PyPI account, go to your account settings, and " -"choose \"Add <abbr title=\"two factor authentication\">2FA</abbr> with " -"security device (e.g. USB key)\"</li>\n" -" <li>Give your key a name. This is necessary because it's possible " -"to add more than one security device to your account.</li>\n" +" <li>Log in to your PyPI account, go to your account settings, " +"and choose \"Add <abbr title=\"two factor authentication\">2FA</abbr> " +"with security device (e.g. USB key)\"</li>\n" +" <li>Give your key a name. This is necessary because it's " +"possible to add more than one security device to your account.</li>\n" " <li>Click on the \"Set up security device\" button</li>\n" -" <li>Insert and touch your USB key, as instructed by your browser</" -"li>\n" +" <li>Insert and touch your USB key, as instructed by your " +"browser</li>\n" " " msgstr "" "\n" -" <li>Acceda a su cuenta de PyPI, diríjase a la configuración de la " -"cuenta y seleccione «Añadir <abbr title=\"autenticación en dos fases\">A2F</" -"abbr> con aparato de seguridad (p. ej., llave USB)»</li>\n" -" <li>Dé un nombre a su llave. Esto es necesario porque es posible " -"añadir más de un aparato de seguridad a su cuenta.</li>\n" +" <li>Acceda a su cuenta de PyPI, diríjase a la configuración de " +"la cuenta y seleccione «Añadir <abbr title=\"autenticación en dos " +"fases\">A2F</abbr> con aparato de seguridad (p. ej., llave USB)»</li>\n" +" <li>Dé un nombre a su llave. Esto es necesario porque es " +"posible añadir más de un aparato de seguridad a su cuenta.</li>\n" " <li>Pulse en el botón «Configurar aparato de seguridad»</li>\n" " <li>Inserte y toque su llave de seguridad, como indica el " "navegador</li>\n" @@ -4431,81 +4447,82 @@ msgstr "" #: warehouse/templates/pages/help.html:372 msgid "" -"Once complete, your USB key will be registered to your PyPI account and can " -"be used during the log in process." +"Once complete, your USB key will be registered to your PyPI account and " +"can be used during the log in process." msgstr "" -"Cuando termine, su llave USB quedará registrada en su cuenta de PyPI y podrá " -"utilizarla durante el proceso de acceso." +"Cuando termine, su llave USB quedará registrada en su cuenta de PyPI y " +"podrá utilizarla durante el proceso de acceso." #: warehouse/templates/pages/help.html:376 msgid "" "\n" " <li>Provide your username and password, as normal</li>\n" -" <li>Insert and touch your USB key to finish logging into PyPI</" -"li>\n" +" <li>Insert and touch your USB key to finish logging into " +"PyPI</li>\n" " " msgstr "" "\n" " <li>Proporcione su nombre de usuario y su contraseña, como de " "costumbre</li>\n" -" <li>Inserte y toque su llave USB para finalizar la entrada a PyPI</" -"li>\n" +" <li>Inserte y toque su llave USB para finalizar la entrada a " +"PyPI</li>\n" " " #: warehouse/templates/pages/help.html:387 #, python-format msgid "" "There is a growing ecosystem of <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">devices that are FIDO compliant</a>, and " -"can therefore be used with PyPI." +"target=\"_blank\" rel=\"noopener\">devices that are FIDO compliant</a>, " +"and can therefore be used with PyPI." msgstr "" -"Existe un ecosistema creciente de <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">aparatos compatibles con FIDO</a> y PyPI." +"Existe un ecosistema creciente de <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">aparatos " +"compatibles con FIDO</a> y PyPI." #: warehouse/templates/pages/help.html:392 #, python-format msgid "" -"Emerging solutions include biometric (facial and fingerprint) scanners and " -"FIDO compatible credit cards. There is also growing support for <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">mobile " -"phones to act as security devices</a>." +"Emerging solutions include biometric (facial and fingerprint) scanners " +"and FIDO compatible credit cards. There is also growing support for <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">mobile phones to act as security devices</a>." msgstr "" "Entre algunas de las soluciones nuevas figuran escáneres biométricos " -"(faciales y dactilares) y tarjetas de crédito habilitadas para FIDO. Además, " -"hay una compatibilidad cada vez mayor con <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">teléfonos móviles que " -"actúan como dispositivos de seguridad</a>." +"(faciales y dactilares) y tarjetas de crédito habilitadas para FIDO. " +"Además, hay una compatibilidad cada vez mayor con <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">teléfonos móviles " +"que actúan como dispositivos de seguridad</a>." #: warehouse/templates/pages/help.html:398 #, python-format msgid "" -"As PyPI's two factor implementation follows the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"web " -"authentication\">WebAuthn</abbr> standard</a>, PyPI users will be able to " -"take advantage of any future developments in this field." +"As PyPI's two factor implementation follows the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"web " +"authentication\">WebAuthn</abbr> standard</a>, PyPI users will be able to" +" take advantage of any future developments in this field." msgstr "" "Dado que la implementación de la autenticación en dos fases de PyPI se " -"adhiere a la <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">norma <abbr title=\"autenticación web\">WebAuthn</abbr></a>, " -"los usuarios de PyPI podrán sacar provecho de cualquier desarrollo futuro en " -"este terreno." +"adhiere a la <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">norma <abbr title=\"autenticación " +"web\">WebAuthn</abbr></a>, los usuarios de PyPI podrán sacar provecho de " +"cualquier desarrollo futuro en este terreno." #: warehouse/templates/pages/help.html:407 msgid "" -"If you lose access to your <a href=\"#totp\">authentication application</a> " -"or <a href=\"#utfkey\">security device</a>, you can use these codes to sign " -"into PyPI." +"If you lose access to your <a href=\"#totp\">authentication " +"application</a> or <a href=\"#utfkey\">security device</a>, you can use " +"these codes to sign into PyPI." msgstr "" -"Si pierde el acceso a su <a href=\"#totp\">aplicación de autenticación</a> o " -"<a href=\"#utfkey\">aparato de seguridad</a>, puede emplear estos códigos " -"para acceder a PyPI." +"Si pierde el acceso a su <a href=\"#totp\">aplicación de " +"autenticación</a> o <a href=\"#utfkey\">aparato de seguridad</a>, puede " +"emplear estos códigos para acceder a PyPI." #: warehouse/templates/pages/help.html:410 msgid "" -"Recovery codes are <strong>one time use</strong>. They are not a substitute " -"for a <a href=\"#totp\">authentication application</a> or <a href=\"#utfkey" -"\">security device</a> and should only be used for recovery. After using a " -"recovery code to sign in, it becomes inactive." +"Recovery codes are <strong>one time use</strong>. They are not a " +"substitute for a <a href=\"#totp\">authentication application</a> or <a " +"href=\"#utfkey\">security device</a> and should only be used for " +"recovery. After using a recovery code to sign in, it becomes inactive." msgstr "" "Los códigos de recuperación <strong>funcionan una sola vez</strong>. No " "constituyen sustitutos para una <a href=\"#totp\">aplicación de " @@ -4527,8 +4544,8 @@ msgstr "" #: warehouse/templates/pages/help.html:419 msgid "" -"Securely store the displayed recovery codes! Consider printing them out and " -"storing them in a safe location or saving them in a password manager." +"Securely store the displayed recovery codes! Consider printing them out " +"and storing them in a safe location or saving them in a password manager." msgstr "" "Almacene cuidadosamente los códigos de recuperación mostrados. Considere " "imprimirlos y almacenarlos en un lugar seguro, o bien, guardarlos en un " @@ -4536,13 +4553,13 @@ msgstr "" #: warehouse/templates/pages/help.html:422 msgid "" -"If you lose access to your stored recovery codes or use all of them, you can " -"get new ones by selecting \"Regenerate recovery codes\" in your account " -"settings." +"If you lose access to your stored recovery codes or use all of them, you " +"can get new ones by selecting \"Regenerate recovery codes\" in your " +"account settings." msgstr "" -"Si pierde sus códigos de recuperación almacenados o los utiliza todos, puede " -"obtener unos nuevos mediante la herramienta «Volver a generar códigos de " -"recuperación» en la configuración de la cuenta." +"Si pierde sus códigos de recuperación almacenados o los utiliza todos, " +"puede obtener unos nuevos mediante la herramienta «Volver a generar " +"códigos de recuperación» en la configuración de la cuenta." #: warehouse/templates/pages/help.html:424 msgid "To sign in with a recovery code:" @@ -4550,35 +4567,36 @@ msgstr "Para acceder con un código de recuperación:" #: warehouse/templates/pages/help.html:427 msgid "" -"When prompted for Two-Factor Authentication, select \"Login using a Recovery " -"Code\"" +"When prompted for Two-Factor Authentication, select \"Login using a " +"Recovery Code\"" msgstr "" -"Cuando se le solicite la autenticación en dos fases, seleccione «Acceder con " -"código de recuperación»" +"Cuando se le solicite la autenticación en dos fases, seleccione «Acceder " +"con código de recuperación»" #: warehouse/templates/pages/help.html:428 msgid "" -"As each code can be used only once, you might want to mark the code as used" +"As each code can be used only once, you might want to mark the code as " +"used" msgstr "" "Puesto que cada código puede utilizarse solo una vez, puede que quiera " "marcar el código como usado" #: warehouse/templates/pages/help.html:429 msgid "" -"If you have few recovery codes remaining, you may also want to generate a " -"new set using the \"Regenerate recovery codes\" button in your account " +"If you have few recovery codes remaining, you may also want to generate a" +" new set using the \"Regenerate recovery codes\" button in your account " "settings." msgstr "" "Si le quedan pocos códigos de recuperación, tal vez quiera generar un " -"conjunto nuevo mediante el botón «Volver a generar códigos de recuperación» " -"que se encuentra en la configuración de su cuenta." +"conjunto nuevo mediante el botón «Volver a generar códigos de " +"recuperación» que se encuentra en la configuración de su cuenta." #: warehouse/templates/pages/help.html:434 msgid "" "\n" -" <p>API tokens provide an alternative way (instead of username and " -"password) to authenticate when <strong>uploading packages</strong> to PyPI.</" -"p>\n" +" <p>API tokens provide an alternative way (instead of username " +"and password) to authenticate when <strong>uploading packages</strong> to" +" PyPI.</p>\n" " <p>You can create a token for an entire PyPI account, in which " "case, the token will work for all projects associated with that account. " "Alternatively, you can limit a token's scope to a specific project.</p>\n" @@ -4595,8 +4613,8 @@ msgstr "" "caso la ficha funcionará en todos los proyectos asociados con la cuenta. " "Como alternativa, puede limitar el margen de actuación de la ficha a un " "proyecto determinado.</p>\n" -" <p><strong>Recomendamos encarecidamente que se autentique a través " -"de una ficha de API cuando sea posible.</strong></p>\n" +" <p><strong>Recomendamos encarecidamente que se autentique a " +"través de una ficha de API cuando sea posible.</strong></p>\n" "\n" " " @@ -4619,8 +4637,8 @@ msgid "" "In your <a href=\"%(href)s\">account settings</a>, go to the API tokens " "section and select \"Add API token\"" msgstr "" -"En la <a href=\"%(href)s\">configuración de su cuenta</a>, vaya a la sección " -"Fichas de API y seleccione «Añadir ficha de API»" +"En la <a href=\"%(href)s\">configuración de su cuenta</a>, vaya a la " +"sección Fichas de API y seleccione «Añadir ficha de API»" #: warehouse/templates/pages/help.html:448 msgid "To use an API token:" @@ -4632,7 +4650,8 @@ msgstr "Establezca su nombre de usuario a <code>__token__</code>" #: warehouse/templates/pages/help.html:452 msgid "" -"Set your password to the token value, including the <code>pypi-</code> prefix" +"Set your password to the token value, including the <code>pypi-</code> " +"prefix" msgstr "" "Establezca su contraseña al valor de la ficha, incluido el prefijo " "<code>pypi-</code>" @@ -4640,34 +4659,37 @@ msgstr "" #: warehouse/templates/pages/help.html:456 #, python-format msgid "" -"Where you edit or add these values will depend on your individual use case. " -"For example, some users may need to edit <a href=\"%(pypirc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">their <code>.pypirc</code> " -"file</a>, while others may need to update their CI configuration file (e.g. " -"<a href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\"><code>.travis.yml</code> if you are using Travis</a>)." +"Where you edit or add these values will depend on your individual use " +"case. For example, some users may need to edit <a " +"href=\"%(pypirc_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">their <code>.pypirc</code> file</a>, while others may " +"need to update their CI configuration file (e.g. <a " +"href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>.travis.yml</code> if you are using Travis</a>)." msgstr "" -"El sitio donde deberá editar o añadir estos valores dependerá de su caso de " -"uso particular. Por ejemplo, es posible que algunos usuarios necesiten " -"editar <a href=\"%(pypirc_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">su archivo <code>.pypirc</code></a>, mientras que otros quizás " -"deban actualizar su archivo de configuración de CI (por ejemplo, <a href=" -"\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><code>.travis.yml</code> en el caso de Travis</a>)." +"El sitio donde deberá editar o añadir estos valores dependerá de su caso " +"de uso particular. Por ejemplo, es posible que algunos usuarios necesiten" +" editar <a href=\"%(pypirc_href)s\" title=\"%(title)s\" target=\"_blank\"" +" rel=\"noopener\">su archivo <code>.pypirc</code></a>, mientras que otros" +" quizás deban actualizar su archivo de configuración de CI (por ejemplo, " +"<a href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>.travis.yml</code> en el caso de Travis</a>)." #: warehouse/templates/pages/help.html:460 msgid "" -"Advanced users may wish to inspect their token by decoding it with base64, " -"and checking the output against the unique identifier displayed on PyPI." +"Advanced users may wish to inspect their token by decoding it with " +"base64, and checking the output against the unique identifier displayed " +"on PyPI." msgstr "" -"Los usuarios avanzados tal vez deseen inspeccionar su ficha descodificándola " -"con base64 y comprobando que la salida coincida con el identificador único " -"que PyPI muestra." +"Los usuarios avanzados tal vez deseen inspeccionar su ficha " +"descodificándola con base64 y comprobando que la salida coincida con el " +"identificador único que PyPI muestra." #: warehouse/templates/pages/help.html:468 msgid "Yes, including RSS feeds of new packages and new releases." msgstr "" -"Sí, incluidos los suministros RSS de paquetes nuevos y de versiones nuevas." +"Sí, incluidos los suministros RSS de paquetes nuevos y de versiones " +"nuevas." #: warehouse/templates/pages/help.html:468 msgid "See the API reference." @@ -4676,127 +4698,132 @@ msgstr "Consulte la referencia de la API." #: warehouse/templates/pages/help.html:471 #, python-format msgid "" -"If you need to run your own mirror of PyPI, the <a href=\"%(href)s" -"\">bandersnatch project</a> is the recommended solution. Note that the " -"storage requirements for a PyPI mirror would exceed 1 terabyte—and growing!" +"If you need to run your own mirror of PyPI, the <a " +"href=\"%(href)s\">bandersnatch project</a> is the recommended solution. " +"Note that the storage requirements for a PyPI mirror would exceed 1 " +"terabyte—and growing!" msgstr "" -"Si ha de operar su propia réplica de PyPI, la solución recomendada es el <a " -"href=\"%(href)s\">proyecto bandersnatch</a>. Observe que los requisitos de " -"almacenamiento de una réplica de PyPI superan 1 terabyte, y esta cantidad va " -"en aumento." +"Si ha de operar su propia réplica de PyPI, la solución recomendada es el " +"<a href=\"%(href)s\">proyecto bandersnatch</a>. Observe que los " +"requisitos de almacenamiento de una réplica de PyPI superan 1 terabyte, y" +" esta cantidad va en aumento." #: warehouse/templates/pages/help.html:474 #, python-format msgid "" -"PyPI itself does not offer a way to get notified when a project uploads new " -"releases. However, there are several third-party services that offer " +"PyPI itself does not offer a way to get notified when a project uploads " +"new releases. However, there are several third-party services that offer " "comprehensive monitoring and notifications for project releases and " -"vulnerabilities listed as <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">GitHub apps</a>." +"vulnerabilities listed as <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">GitHub apps</a>." msgstr "" -"PyPI no ofrece por sí mismo un mecanismo para recibir notificaciones cuando " -"un proyecto carga versiones nuevas. Sin embargo, existen varios servicios de " -"terceros que brindan monitorizaciones exhaustivas y notificaciones ante " -"versiones y vulnerabilidades nuevas, disponibles como <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">aplicaciones de " -"GitHub</a>." +"PyPI no ofrece por sí mismo un mecanismo para recibir notificaciones " +"cuando un proyecto carga versiones nuevas. Sin embargo, existen varios " +"servicios de terceros que brindan monitorizaciones exhaustivas y " +"notificaciones ante versiones y vulnerabilidades nuevas, disponibles como" +" <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">aplicaciones de GitHub</a>." #: warehouse/templates/pages/help.html:477 #, python-format msgid "" -"You can <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">analyze PyPI download usage statistics via our public dataset " -"on Google BigQuery</a>." +"You can <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">analyze PyPI download usage statistics via our public " +"dataset on Google BigQuery</a>." msgstr "" -"Es posible <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">analizar las estadísticas de descargas de PyPI a través de " -"nuestro conjunto de datos público en Google BigQuery</a>." +"Es posible <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">analizar las estadísticas de descargas de PyPI a través " +"de nuestro conjunto de datos público en Google BigQuery</a>." #: warehouse/templates/pages/help.html:479 #, python-format msgid "" -"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.io provides statistics for PyPI projects</a> (<a href=" -"\"%(libs_io_example_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">example</a>, <a href=\"%(libs_io_api_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">API</a>) including GitHub stars and " -"forks, dependency tracking (<a href=\"%(in_progress_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">in progress</a>), and <a " -"href=\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">other relevant factors</a>." -msgstr "" -"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.io brinda estadísticas para los proyectos en PyPI</a> " -"(<a href=\"%(libs_io_example_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">ejemplo</a>, <a href=\"%(libs_io_api_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">API</a>) entre otras, " -"cantidad de estrellas y bifurcaciones en GitHub, seguimiento de dependencias " -"(<a href=\"%(in_progress_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">en curso</a>) y <a href=\"%(other_factors_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">otros factores relevantes</" -"a>." +"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io provides statistics for PyPI projects</a> " +"(<a href=\"%(libs_io_example_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">example</a>, <a " +"href=\"%(libs_io_api_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">API</a>) including GitHub stars and forks, dependency " +"tracking (<a href=\"%(in_progress_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">in progress</a>), and <a " +"href=\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">other relevant factors</a>." +msgstr "" +"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io brinda estadísticas para los proyectos en " +"PyPI</a> (<a href=\"%(libs_io_example_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">ejemplo</a>, <a " +"href=\"%(libs_io_api_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">API</a>) entre otras, cantidad de estrellas y " +"bifurcaciones en GitHub, seguimiento de dependencias (<a " +"href=\"%(in_progress_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">en curso</a>) y <a href=\"%(other_factors_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">otros factores " +"relevantes</a>." #: warehouse/templates/pages/help.html:488 #, python-format msgid "" -"For recent statistics on uptime and performance, see <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status page</a>." +"For recent statistics on uptime and performance, see <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status " +"page</a>." msgstr "" "Para obtener estadísticas recientes sobre el tiempo de actividad y el " -"rendimiento, vea <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">nuestra página de estado</a>." +"rendimiento, vea <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">nuestra página de estado</a>." #: warehouse/templates/pages/help.html:495 #, python-format msgid "" -"PyPI does not support publishing private packages. If you need to publish " -"your private package to a package index, the recommended solution is to run " -"your own deployment of the <a href=\"%(href)s\">devpi project</a>." +"PyPI does not support publishing private packages. If you need to publish" +" your private package to a package index, the recommended solution is to " +"run your own deployment of the <a href=\"%(href)s\">devpi project</a>." msgstr "" -"PyPI no permite la publicación de paquetes privados. Si necesita publicar su " -"paquete privado en un índice de paquetes, la solución recomendada es operar " -"su propio servidor con <a href=\"%(href)s\">devpi</a>." +"PyPI no permite la publicación de paquetes privados. Si necesita publicar" +" su paquete privado en un índice de paquetes, la solución recomendada es " +"operar su propio servidor con <a href=\"%(href)s\">devpi</a>." #: warehouse/templates/pages/help.html:498 msgid "" "Your publishing tool may return an error that your new project can't be " -"created with your desired name, despite no evidence of a project or release " -"of the same name on PyPI. Currently, there are three primary reasons this " -"may occur:" +"created with your desired name, despite no evidence of a project or " +"release of the same name on PyPI. Currently, there are three primary " +"reasons this may occur:" msgstr "" "La herramienta de publicación puede devolver un error de que el nuevo " "proyecto no se puede crear con el nombre deseado, aunque no exista un " -"proyecto o lanzamiento con el mismo nombre en PyPI. Actualmente, hay tres " -"razones principales por lo que esto ocurre:" +"proyecto o lanzamiento con el mismo nombre en PyPI. Actualmente, hay tres" +" razones principales por lo que esto ocurre:" #: warehouse/templates/pages/help.html:500 #, python-format msgid "" -"The project name conflicts with a <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Standard Library</a> module from " -"any major version from 2.5 to present." +"The project name conflicts with a <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Standard " +"Library</a> module from any major version from 2.5 to present." msgstr "" -"El nombre del proyecto entra en conflicto con algún módulo de la <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">biblioteca estándar de Python</a>, a partir de la versión 2.5 de esta." +"El nombre del proyecto entra en conflicto con algún módulo de la <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">biblioteca estándar de Python</a>, a partir de la " +"versión 2.5 de esta." #: warehouse/templates/pages/help.html:501 #, python-format msgid "" -"The project name has been explicitly prohibited by the PyPI administrators. " -"For example, <code>%(incorrect_code)s</code> is a common typo for <code>" -"%(correct_code)s</code>, and should not surprise the user with a malicious " -"package." +"The project name has been explicitly prohibited by the PyPI " +"administrators. For example, <code>%(incorrect_code)s</code> is a common " +"typo for <code>%(correct_code)s</code>, and should not surprise the user " +"with a malicious package." msgstr "" "Los administradores de PyPI han prohibido expresamente el nombre del " -"proyecto. Por ejemplo, <code>%(incorrect_code)s</code> es un error común al " -"intentar escribir <code>%(correct_code)s</code>; si no se prohibiese, " +"proyecto. Por ejemplo, <code>%(incorrect_code)s</code> es un error común " +"al intentar escribir <code>%(correct_code)s</code>; si no se prohibiese, " "alguien podría instalarse inadvertidamente un paquete malicioso." #: warehouse/templates/pages/help.html:502 msgid "" -"The project name has been registered by another user, but no releases have " -"been created." +"The project name has been registered by another user, but no releases " +"have been created." msgstr "" "Otro usuario ha registrado el nombre del proyecto, pero no se ha creado " "ninguna versión." @@ -4804,13 +4831,14 @@ msgstr "" #: warehouse/templates/pages/help.html:506 #, python-format msgid "" -"Follow the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">\"How to request a name transfer\"</a> section of <abbr title=" -"\"Python enhancement proposal\">PEP</abbr> 541." +"Follow the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">\"How to request a name transfer\"</a> section of <abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 541." msgstr "" -"Consulte la sección <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">«Cómo solicitar una transferencia de nombre»</a> de la " -"<abbr title=\"Propuesta de mejora de Python\">PEP</abbr> 541." +"Consulte la sección <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">«Cómo solicitar una transferencia de " +"nombre»</a> de la <abbr title=\"Propuesta de mejora de " +"Python\">PEP</abbr> 541." #: warehouse/templates/pages/help.html:511 msgid "Owner:" @@ -4818,82 +4846,86 @@ msgstr "Propietario:" #: warehouse/templates/pages/help.html:514 msgid "" -"Only the current owners of a project have the ability to add new owners or " -"maintainers. If you need to request ownership, you should contact the " -"current owner(s) of the project directly. Many project owners provide their " -"contact details in the 'Author' field of the 'Meta' details on the project " -"page." +"Only the current owners of a project have the ability to add new owners " +"or maintainers. If you need to request ownership, you should contact the " +"current owner(s) of the project directly. Many project owners provide " +"their contact details in the 'Author' field of the 'Meta' details on the " +"project page." msgstr "" -"Únicamente los propietarios actuales de un proyecto son capaces de añadir " -"más propietarios o responsables. Si quiere solicitar la titularidad, póngase " -"en contacto directamente con los propietarios del proyecto. Muchos " -"propietarios de proyecto proporcionan sus datos de contacto en el campo " -"«Autor» del apartado «Meta» de la página del proyecto." +"Únicamente los propietarios actuales de un proyecto son capaces de añadir" +" más propietarios o responsables. Si quiere solicitar la titularidad, " +"póngase en contacto directamente con los propietarios del proyecto. " +"Muchos propietarios de proyecto proporcionan sus datos de contacto en el " +"campo «Autor» del apartado «Meta» de la página del proyecto." #: warehouse/templates/pages/help.html:515 #, python-format -msgid "" -"If the owner is unresponsive, see <a href=\"%(href)s\">%(anchor_text)s</a>" +msgid "If the owner is unresponsive, see <a href=\"%(href)s\">%(anchor_text)s</a>" msgstr "" -"Si el propietario no contesta, vea <a href=\"%(href)s\">%(anchor_text)s</a>" +"Si el propietario no contesta, vea <a " +"href=\"%(href)s\">%(anchor_text)s</a>" #: warehouse/templates/pages/help.html:518 #, python-format msgid "" -"By default, an upload's description will render with <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">reStructuredText</a>. " -"If the description is in an alternate format like Markdown, a package may " -"set the <code>long_description_content_type</code> in <code>setup.py</code> " -"to the alternate format." +"By default, an upload's description will render with <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">reStructuredText</a>. If the description is in an " +"alternate format like Markdown, a package may set the " +"<code>long_description_content_type</code> in <code>setup.py</code> to " +"the alternate format." msgstr "" -"De manera predeterminada, la descripción de una carga se representará con <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">reStructuredText</a>. Si la descripción está en un formato alterno como " -"Markdown, un paquete puede establecer el formato alternativo en la clave " -"<code>long_description_content_type</code> de <code>setup.py</code>." +"De manera predeterminada, la descripción de una carga se representará con" +" <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">reStructuredText</a>. Si la descripción está en un " +"formato alterno como Markdown, un paquete puede establecer el formato " +"alternativo en la clave <code>long_description_content_type</code> de " +"<code>setup.py</code>." #: warehouse/templates/pages/help.html:519 #, python-format msgid "" -"Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging User Guide</a> for details on the available " -"formats." +"Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a> for details on the " +"available formats." msgstr "" -"Consulte el <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">manual de uso del empaquetamiento de Python</a> para conocer " -"detalles sobre los formatos disponibles." +"Consulte el <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">manual de uso del empaquetamiento de Python</a> para " +"conocer detalles sobre los formatos disponibles." #: warehouse/templates/pages/help.html:520 #, python-format msgid "" "PyPI will reject uploads if the description fails to render. To check a " -"description locally for validity, you may use <a href=\"%(href)s" -"\">readme_renderer</a>, which is the same description renderer used by PyPI." +"description locally for validity, you may use <a " +"href=\"%(href)s\">readme_renderer</a>, which is the same description " +"renderer used by PyPI." msgstr "" -"PyPI rechazará cargas si la descripción no puede representarse. Para revisar " -"la validez de la descripción localmente, puede emplear <a href=\"%(href)s" -"\">readme_renderer</a>, que es el mismo procesador de descripciones que PyPI " -"usa." +"PyPI rechazará cargas si la descripción no puede representarse. Para " +"revisar la validez de la descripción localmente, puede emplear <a " +"href=\"%(href)s\">readme_renderer</a>, que es el mismo procesador de " +"descripciones que PyPI usa." #: warehouse/templates/pages/help.html:524 #, python-format msgid "" -"If you can't upload your project's release to PyPI because you're hitting " -"the upload file size limit, we can sometimes increase your limit. Make sure " -"you've uploaded at least one release for the project that's <em>under</em> " -"the limit (a <a href=\"%(dev_release_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">developmental release version number</a> is " -"fine). Then, <a href=\"%(file_issue_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">file an issue</a> and tell us:</p>" -msgstr "" -"Si no puede cargar la versión de su proyecto en PyPI porque ha superado el " -"límite de tamaño de archivo de carga, en ocasiones podremos incrementar su " -"límite. Asegúrese de cargar por lo menos una versión del proyecto que esté " -"<em>debajo</em> del límite (es útil un <a href=\"%(dev_release_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">número de versión de " -"desarrollo</a>). Después, <a href=\"%(file_issue_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">cree un informe</a> y avísenos del " -"problema:</p>" +"If you can't upload your project's release to PyPI because you're hitting" +" the upload file size limit, we can sometimes increase your limit. Make " +"sure you've uploaded at least one release for the project that's " +"<em>under</em> the limit (a <a href=\"%(dev_release_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">developmental " +"release version number</a> is fine). Then, <a " +"href=\"%(file_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">file an issue</a> and tell us:</p>" +msgstr "" +"Si no puede cargar la versión de su proyecto en PyPI porque ha superado " +"el límite de tamaño de archivo de carga, en ocasiones podremos " +"incrementar su límite. Asegúrese de cargar por lo menos una versión del " +"proyecto que esté <em>debajo</em> del límite (es útil un <a " +"href=\"%(dev_release_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">número de versión de desarrollo</a>). Después, <a " +"href=\"%(file_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">cree un informe</a> y avísenos del problema:</p>" #: warehouse/templates/pages/help.html:532 msgid "A link to your project on PyPI (or Test PyPI)" @@ -4904,27 +4936,26 @@ msgid "The size of your release, in megabytes" msgstr "El tamaño de su versión, en megabytes" #: warehouse/templates/pages/help.html:534 -msgid "" -"Which index/indexes you need the increase for (PyPI, Test PyPI, or both)" +msgid "Which index/indexes you need the increase for (PyPI, Test PyPI, or both)" msgstr "" -"Para qué índice o índices necesita el aumento (PyPI, Entorno de pruebas de " -"PyPI o ambos)" +"Para qué índice o índices necesita el aumento (PyPI, Entorno de pruebas " +"de PyPI o ambos)" #: warehouse/templates/pages/help.html:535 msgid "" -"A brief description of your project, including the reason for the additional " -"size." +"A brief description of your project, including the reason for the " +"additional size." msgstr "" "Una descripción breve de su proyecto, el motivo del tamaño adicional " "incluido." #: warehouse/templates/pages/help.html:544 msgid "" -"If you've forgotten your PyPI password but you remember your email address " -"or username, follow these steps to reset your password:" +"If you've forgotten your PyPI password but you remember your email " +"address or username, follow these steps to reset your password:" msgstr "" -"Si ha olvidado su contraseña de PyPI pero recuerda su dirección de correo o " -"su nombre de usuario, siga estos pasos para restablecer la contraseña:" +"Si ha olvidado su contraseña de PyPI pero recuerda su dirección de correo" +" o su nombre de usuario, siga estos pasos para restablecer la contraseña:" #: warehouse/templates/pages/help.html:546 #, python-format @@ -4932,8 +4963,7 @@ msgid "Go to <a href=\"%(href)s\">reset your password</a>." msgstr "Diríjase a <a href=\"%(href)s\">Restablecimiento de contraseña</a>." #: warehouse/templates/pages/help.html:547 -msgid "" -"Enter the email address or username you used for PyPI and submit the form." +msgid "Enter the email address or username you used for PyPI and submit the form." msgstr "" "Proporcione la dirección de correo o el nombre de usuario que utiliza en " "PyPI y envíe el formulario." @@ -4948,39 +4978,38 @@ msgstr "Si ya no puede acceder a su cuenta de PyPI debido a:" #: warehouse/templates/pages/help.html:555 msgid "Lost access to the email address associated with your account" -msgstr "" -"Pérdida de acceso al buzón de correo electrónico asociado con su cuenta" +msgstr "Pérdida de acceso al buzón de correo electrónico asociado con su cuenta" #: warehouse/templates/pages/help.html:556 msgid "" -"Lost two factor authentication <a href=\"#totp\">application</a>, <a href=" -"\"#utfkey\">device</a>, and <a href=\"#recoverycodes\">recovery codes</a>" +"Lost two factor authentication <a href=\"#totp\">application</a>, <a " +"href=\"#utfkey\">device</a>, and <a href=\"#recoverycodes\">recovery " +"codes</a>" msgstr "" -"Pérdida de <a href=\"#totp\">aplicación</a>, <a href=\"#utfkey\">aparato</a> " -"y <a href=\"#recoverycodes\">códigos de recuperación</a> para la " -"autenticación en dos fases" +"Pérdida de <a href=\"#totp\">aplicación</a>, <a " +"href=\"#utfkey\">aparato</a> y <a href=\"#recoverycodes\">códigos de " +"recuperación</a> para la autenticación en dos fases" #: warehouse/templates/pages/help.html:559 #, python-format msgid "" -"You can proceed to, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">file an issue on our tracker</a> to request assistance " -"with account recovery." +"You can proceed to, <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">file an issue on our tracker</a> to " +"request assistance with account recovery." msgstr "" -"Puede <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">crear un informe en nuestro sitio de seguimiento de errores</a> " -"para solicitar ayuda con la recuperación de la cuenta." +"Puede <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">crear un informe en nuestro sitio de seguimiento de " +"errores</a> para solicitar ayuda con la recuperación de la cuenta." #: warehouse/templates/pages/help.html:566 msgid "If you are using a username and password for uploads:" msgstr "" -"Si utiliza una combinación de nombre de usuario y contraseña para realizar " -"cargas:" +"Si utiliza una combinación de nombre de usuario y contraseña para " +"realizar cargas:" #: warehouse/templates/pages/help.html:568 msgid "Check to see if your username or password are incorrect." -msgstr "" -"Compruebe que el nombre de usuario y la contraseña no sean incorrectos." +msgstr "Compruebe que el nombre de usuario y la contraseña no sean incorrectos." #: warehouse/templates/pages/help.html:569 msgid "" @@ -5000,159 +5029,164 @@ msgstr "Revise que la ficha de API sea válida y que no se haya revocado." #: warehouse/templates/pages/help.html:574 msgid "" -"Ensure that your API Token is <a href=\"#apitoken\">properly formatted</a> " -"and does not contain any trailing characters such as newlines." +"Ensure that your API Token is <a href=\"#apitoken\">properly " +"formatted</a> and does not contain any trailing characters such as " +"newlines." msgstr "" "Cerciórese de que la ficha de API esté <a href=\"#apitoken\">formateada " -"adecuadamente</a> y no contenga caracteres tales como saltos de renglón al " -"final." +"adecuadamente</a> y no contenga caracteres tales como saltos de renglón " +"al final." #: warehouse/templates/pages/help.html:579 #, python-format msgid "" -"Transport Layer Security, or TLS, is part of how we make sure connections " -"between your computer and PyPI are private and secure. It's a cryptographic " -"protocol that's had several versions over time. PyPI <a href=" -"\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">turned off support for TLS versions 1.0 and 1.1</a> in April " -"2018. <a href=\"%(reason_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Learn why on the PSF blog</a>." +"Transport Layer Security, or TLS, is part of how we make sure connections" +" between your computer and PyPI are private and secure. It's a " +"cryptographic protocol that's had several versions over time. PyPI <a " +"href=\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">turned off support for TLS versions 1.0 and 1.1</a> in " +"April 2018. <a href=\"%(reason_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Learn why on the PSF blog</a>." msgstr "" "Transport Layer Security, o TLS, es parte del proceso con el cual nos " "aseguramos de que las conexiones entre su equipo y PyPI sean privadas y " -"seguras. Es un protocolo criptográfico que ha tenido varias versiones a lo " -"largo del tiempo. PyPI <a href=\"%(announcement_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">ha desactivado la compatibilidad con las " -"versiones 1.0 y 1.1 de TLS</a> en abril de 2018. <a href=\"%(reason_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Sepa por qué en el " -"blog de la PSF</a>." +"seguras. Es un protocolo criptográfico que ha tenido varias versiones a " +"lo largo del tiempo. PyPI <a href=\"%(announcement_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">ha desactivado la " +"compatibilidad con las versiones 1.0 y 1.1 de TLS</a> en abril de 2018. " +"<a href=\"%(reason_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Sepa por qué en el blog de la PSF</a>." #: warehouse/templates/pages/help.html:586 #, python-format msgid "" -"If you are having trouble with <code>%(command)s</code> and get a <code>No " -"matching distribution found</code> or <code>Could not fetch URL</code> " -"error, try adding <code>-v</code> to the command to get more information:" +"If you are having trouble with <code>%(command)s</code> and get a " +"<code>No matching distribution found</code> or <code>Could not fetch " +"URL</code> error, try adding <code>-v</code> to the command to get more " +"information:" msgstr "" -"Si tiene problemas con <code>%(command)s</code> y recibe un error <code>No " -"se encontró ninguna distribución coincidente</code> o <code>No se pudo " -"recuperar el URL</code>, intente añadir <code>-v</code> a la orden para " -"obtener más información:" +"Si tiene problemas con <code>%(command)s</code> y recibe un error " +"<code>No se encontró ninguna distribución coincidente</code> o <code>No " +"se pudo recuperar el URL</code>, intente añadir <code>-v</code> a la " +"orden para obtener más información:" #: warehouse/templates/pages/help.html:588 msgid "" "If you see an error like <code>There was a problem confirming the ssl " "certificate</code> or <code>tlsv1 alert protocol version</code> or " -"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, you need to be connecting to PyPI " -"with a newer TLS support library." +"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, you need to be connecting to " +"PyPI with a newer TLS support library." msgstr "" -"Si ve un error como <code>Se produjo un problema al confirmar el certificado " -"SSL</code>, <code>Alerta de versión de protocolo TLSv1</code> o " -"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, ha de conectarse con PyPI con una " -"biblioteca de compatibilidad con TLS más reciente." +"Si ve un error como <code>Se produjo un problema al confirmar el " +"certificado SSL</code>, <code>Alerta de versión de protocolo TLSv1</code>" +" o <code>TLSV1_ALERT_PROTOCOL_VERSION</code>, ha de conectarse con PyPI " +"con una biblioteca de compatibilidad con TLS más reciente." #: warehouse/templates/pages/help.html:589 msgid "" "The specific steps you need to take will depend on your operating system " -"version, where your installation of Python originated (python.org, your OS " -"vendor, or an intermediate distributor), and the installed versions of " -"Python, <code>setuptools</code>, and <code>pip</code>." +"version, where your installation of Python originated (python.org, your " +"OS vendor, or an intermediate distributor), and the installed versions of" +" Python, <code>setuptools</code>, and <code>pip</code>." msgstr "" "Los pasos específicos que se deben seguir dependerán de la versión del " -"sistema operativo, donde se originó su instalación de Python (python.org, " -"proveedor de SO, o un distribuidor intermediario), y las versiones " -"instaladas de Python, <code>herramientas de instalación</code>, y <code>pip</" -"code>." +"sistema operativo, donde se originó su instalación de Python (python.org," +" proveedor de SO, o un distribuidor intermediario), y las versiones " +"instaladas de Python, <code>herramientas de instalación</code>, y " +"<code>pip</code>." #: warehouse/templates/pages/help.html:591 #, python-format msgid "" -"For help, go to <a href=\"%(irc_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">the <code>#pypa</code> IRC channel on Freenode</a>, file " -"an issue at <a href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">pypa/packaging-problems/issues</a>, or <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">post to the python-help mailing list</a>, including your OS and " -"installation details and the output of <code>%(command)s</code>." +"For help, go to <a href=\"%(irc_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">the <code>#pypa</code> IRC channel on " +"Freenode</a>, file an issue at <a href=\"%(issue_tracker_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">pypa/packaging-" +"problems/issues</a>, or <a href=\"%(mailing_list_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">post to the " +"python-help mailing list</a>, including your OS and installation details " +"and the output of <code>%(command)s</code>." msgstr "" "Para obtener ayuda, visite <a href=\"%(irc_href)s\" title=\"%(title)s\" " "target=\"_blank\" rel=\"noopener\">el canal <code>#pypa</code> de IRC en " -"Freenode</a>, cree un informe en <a href=\"%(issue_tracker_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">pypa/packaging-problems/" -"issues</a> o <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">publique un mensaje en la lista de correo python-" -"help</a>; incluya su SO, detalles de la instalación y la salida de <code>" -"%(command)s</code>." +"Freenode</a>, cree un informe en <a href=\"%(issue_tracker_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">pypa/packaging-" +"problems/issues</a> o <a href=\"%(mailing_list_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">publique un " +"mensaje en la lista de correo python-help</a>; incluya su SO, detalles de" +" la instalación y la salida de <code>%(command)s</code>." #: warehouse/templates/pages/help.html:602 #, python-format msgid "" -"We take <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">accessibility</a> very seriously and want to make the website " -"easy to use for everyone." +"We take <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">accessibility</a> very seriously and want to make the " +"website easy to use for everyone." msgstr "" -"Tomamos <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">la accesibilidad </a> muy en serio y queremos que el sitio web " -"sea fácil de usar para todos." +"Tomamos <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">la accesibilidad </a> muy en serio y queremos que el " +"sitio web sea fácil de usar para todos." #: warehouse/templates/pages/help.html:607 #, python-format msgid "" -"If you are experiencing an accessibility problem, <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">report it to us on GitHub</" -"a>, so we can try to fix the problem, for you and others." +"If you are experiencing an accessibility problem, <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">report it to us on" +" GitHub</a>, so we can try to fix the problem, for you and others." msgstr "" -"Si tiene un problema de accesibilidad, <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">infórmenos de ello en GitHub</a>, de " -"modo que podamos intentar resolverlo, para usted y para otros." +"Si tiene un problema de accesibilidad, <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">infórmenos de ello" +" en GitHub</a>, de modo que podamos intentar resolverlo, para usted y " +"para otros." #: warehouse/templates/pages/help.html:615 #, python-format msgid "" "In a previous version of PyPI, it used to be possible for maintainers to " -"upload releases to PyPI using a form in the web browser. This feature was " -"deprecated with the new version of PyPI – we instead recommend that you <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">use " -"twine to upload your project to PyPI</a>." +"upload releases to PyPI using a form in the web browser. This feature was" +" deprecated with the new version of PyPI – we instead recommend that you " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">use twine to upload your project to PyPI</a>." msgstr "" "En una versión anterior de PyPI, los responsables eran capaces de cargar " "versiones en PyPI a través de un formulario en el navegador web. Esta " "funcionalidad se ha obsoletado en la versión nueva de PyPI; en su lugar, " -"recomendamos que <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">se sirva de Twine para cargar su proyecto en PyPI</a>." +"recomendamos que <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">se sirva de Twine para cargar su " +"proyecto en PyPI</a>." #: warehouse/templates/pages/help.html:624 msgid "" -"Spammers return to PyPI with some regularity hoping to place their Search " -"Engine Optimized phishing, scam, and click-farming content on the site. " +"Spammers return to PyPI with some regularity hoping to place their Search" +" Engine Optimized phishing, scam, and click-farming content on the site. " "Since PyPI allows for indexing of the Long Description and other data " "related to projects and has a generally solid search reputation, it is a " "prime target." msgstr "" -"Los emisores de <em>spam</em> vuelven a PyPI con cierta regularidad con la " -"esperanza de colocar en el sitio su contenido de suplantación de identidad, " -"estafas y optimización de clics para buscadores. PyPI es un blanco principal " -"dado que permite la indización de la descripción larga y otros datos " -"vinculados a los proyectos y tiene una reputación de búsqueda en general " -"sólida." +"Los emisores de <em>spam</em> vuelven a PyPI con cierta regularidad con " +"la esperanza de colocar en el sitio su contenido de suplantación de " +"identidad, estafas y optimización de clics para buscadores. PyPI es un " +"blanco principal dado que permite la indización de la descripción larga y" +" otros datos vinculados a los proyectos y tiene una reputación de " +"búsqueda en general sólida." #: warehouse/templates/pages/help.html:626 #, python-format msgid "" "When the PyPI administrators are overwhelmed by spam <strong>or</strong> " -"determine that there is some other threat to PyPI, new user registration and/" -"or new project registration may be disabled. Check <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status page</a> " -"for more details, as we'll likely have updated it with reasoning for the " -"intervention." +"determine that there is some other threat to PyPI, new user registration " +"and/or new project registration may be disabled. Check <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">our status page</a> for more details, as we'll likely " +"have updated it with reasoning for the intervention." msgstr "" "Cuando el <em>spam</em> supera la capacidad de respuesta de los " "administradores de PyPI, <strong>o bien</strong> si estos determinan que " -"existe alguna otra amenaza a la plataforma, es posible que se desactiven las " -"altas de usuarios y proyectos nuevos. En tales casos, revise <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">la " -"página de estado</a> para obtener detalles, pues probablemente habrémosla " -"actualizado con el motivo de la intervención." +"existe alguna otra amenaza a la plataforma, es posible que se desactiven " +"las altas de usuarios y proyectos nuevos. En tales casos, revise <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">la página de estado</a> para obtener detalles, pues " +"probablemente habrémosla actualizado con el motivo de la intervención." #: warehouse/templates/pages/help.html:635 msgid "PyPI will return these errors for one of these reasons:" @@ -5181,171 +5215,181 @@ msgstr "" #: warehouse/templates/pages/help.html:643 #, python-format msgid "" -"To avoid this situation, <a href=\"%(test_pypi_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">use Test PyPI to perform and check your " -"upload first</a>, before uploading to <a href=\"%(pypi_href)s\">pypi.org</a>." +"To avoid this situation, <a href=\"%(test_pypi_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">use Test PyPI to " +"perform and check your upload first</a>, before uploading to <a " +"href=\"%(pypi_href)s\">pypi.org</a>." msgstr "" -"Para evitar esta situación, <a href=\"%(test_pypi_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">utilice el entorno de pruebas de PyPI " -"para cargar y revisar su archivo</a> antes de cargarlo en <a href=" -"\"%(pypi_href)s\">pypi.org</a>." +"Para evitar esta situación, <a href=\"%(test_pypi_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">utilice el entorno" +" de pruebas de PyPI para cargar y revisar su archivo</a> antes de " +"cargarlo en <a href=\"%(pypi_href)s\">pypi.org</a>." +# | msgid "" +# | "If you would like to request a new trove classifier file a bug on our <a +# " +# | "href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" +# | "\">issue tracker</a>. Include the name of the requested classifier and a +# | "brief justification of why it is important." #: warehouse/templates/pages/help.html:650 #, fuzzy, python-format -#| msgid "" -#| "If you would like to request a new trove classifier file a bug on our <a " -#| "href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -#| "\">issue tracker</a>. Include the name of the requested classifier and a " -#| "brief justification of why it is important." msgid "" -"If you would like to request a new trove classifier file a pull request on " -"the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><code>pypa/trove-classifiers</code> project</a>. Be sure to include a " -"brief justification of why it is important." +"If you would like to request a new trove classifier file a pull request " +"on the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>pypa/trove-classifiers</code> project</a>. Be sure" +" to include a brief justification of why it is important." msgstr "" "Si quiere solicitar un clasificador de interés nuevo, cree un informe en " -"nuestro <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">sitio de seguimiento de errores</a>. Incluya el nombre del " -"clasificador solicitado y una justificación breve de por qué es importante." +"nuestro <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">sitio de seguimiento de errores</a>. Incluya el nombre " +"del clasificador solicitado y una justificación breve de por qué es " +"importante." #: warehouse/templates/pages/help.html:658 #, python-format msgid "" "If you're experiencing an issue with PyPI itself, we welcome " -"<strong>constructive</strong> feedback and bug reports via our <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">issue " -"tracker</a>. Please note that this tracker is only for issues with the " -"software that runs PyPI. Before writing a new issue, first check that a " -"similar issue does not already exist." -msgstr "" -"Si está encontrando problemas con PyPI, recibimos de buen grado comentarios " -"<strong>constructivos</strong> e informes de error en nuestro <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">sitio de " -"seguimiento de errores</a>. Tenga presente que este sitio es para " -"seguimiento de errores relacionados solo con el <em>software</em> utilizado " -"para PyPI. Antes de crear un informe de error error, verifique antes si no " -"existe ya." +"<strong>constructive</strong> feedback and bug reports via our <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">issue tracker</a>. Please note that this tracker is only" +" for issues with the software that runs PyPI. Before writing a new issue," +" first check that a similar issue does not already exist." +msgstr "" +"Si está encontrando problemas con PyPI, recibimos de buen grado " +"comentarios <strong>constructivos</strong> e informes de error en nuestro" +" <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">sitio de seguimiento de errores</a>. Tenga presente que " +"este sitio es para seguimiento de errores relacionados solo con el " +"<em>software</em> utilizado para PyPI. Antes de crear un informe de error" +" error, verifique antes si no existe ya." #: warehouse/templates/pages/help.html:665 msgid "" -"If you are having an issue is with a specific package installed from PyPI, " -"you should reach out to the maintainers of that project directly instead." +"If you are having an issue is with a specific package installed from " +"PyPI, you should reach out to the maintainers of that project directly " +"instead." msgstr "" -"Si ha experimentado un problema con un paquete específico instalado desde " -"PyPI, debe comunicarse directamente con los responsables del mantenimiento " -"de ese proyecto." +"Si ha experimentado un problema con un paquete específico instalado desde" +" PyPI, debe comunicarse directamente con los responsables del " +"mantenimiento de ese proyecto." #: warehouse/templates/pages/help.html:674 #, python-format msgid "" -"PyPI is powered by the Warehouse project; <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> is an open " -"source project developed under the umbrella of the Python Packaging " -"Authority (PyPA) and supported by the Python Packaging Working Group " -"(PackagingWG)." +"PyPI is powered by the Warehouse project; <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> is " +"an open source project developed under the umbrella of the Python " +"Packaging Authority (PyPA) and supported by the Python Packaging Working " +"Group (PackagingWG)." msgstr "" -"PyPI es impulsado por el proyecto Warehouse; <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> es un " -"proyecto de código abierto desarrollado bajo el paraguas de Python Packaging " -"Authority (PyPA) y respaldado por Python Packaging Working Group " -"(PackagingWG)." +"PyPI es impulsado por el proyecto Warehouse; <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> es " +"un proyecto de código abierto desarrollado bajo el paraguas de Python " +"Packaging Authority (PyPA) y respaldado por Python Packaging Working " +"Group (PackagingWG)." #: warehouse/templates/pages/help.html:679 #, python-format msgid "" -"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPA</a> is an independent group of developers whose goal is to improve " -"and maintain many of the core projects related to Python packaging." +"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA</a> is an independent group of developers whose " +"goal is to improve and maintain many of the core projects related to " +"Python packaging." msgstr "" -"El <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPA</a> es un grupo independiente de desarrolladores cuyo objetivo es " -"mejorar y mantener muchos de los proyectos centrales relacionados con el " -"empaquetado de Python." +"El <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA</a> es un grupo independiente de desarrolladores " +"cuyo objetivo es mejorar y mantener muchos de los proyectos centrales " +"relacionados con el empaquetado de Python." #: warehouse/templates/pages/help.html:684 #, python-format msgid "" -"The <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">PackagingWG</a> is a working group of the Python Software " -"Foundation (PSF) whose goal is to raise and disburse funds to support the " -"ongoing improvement of Python packaging. Most recently it <a href=" -"\"%(otf_award_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">secured an award from the Open Technology Fund</a> whose funding is " -"enabling developers to improve Warehouse's security and accessibility." -msgstr "" -"<a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">PackagingWG</a> es un grupo de trabajo de la Python Software " -"Foundation (PSF) cuyo objetivo es recaudar y desembolsar fondos para " -"respaldar la mejora continua del empaquetamiento de Python. En fecha " -"reciente hemos <a href=\"%(otf_award_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">conseguido una adjudicación del Open Technology " -"Fund</a> cuya inversión ha permitido a los desarrolladores de Warehouse " -"mejorar la seguridad y la accesibilidad de la plataforma." +"The <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">PackagingWG</a> is a working group of " +"the Python Software Foundation (PSF) whose goal is to raise and disburse " +"funds to support the ongoing improvement of Python packaging. Most " +"recently it <a href=\"%(otf_award_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">secured an award from the Open " +"Technology Fund</a> whose funding is enabling developers to improve " +"Warehouse's security and accessibility." +msgstr "" +"<a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PackagingWG</a> es un grupo de trabajo de la Python " +"Software Foundation (PSF) cuyo objetivo es recaudar y desembolsar fondos " +"para respaldar la mejora continua del empaquetamiento de Python. En fecha" +" reciente hemos <a href=\"%(otf_award_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">conseguido una adjudicación del Open " +"Technology Fund</a> cuya inversión ha permitido a los desarrolladores de " +"Warehouse mejorar la seguridad y la accesibilidad de la plataforma." #: warehouse/templates/pages/help.html:694 #, python-format msgid "" -"PyPI is powered by <a href=\"%(warehouse_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Warehouse</a> and by a variety of tools and " -"services provided by our <a href=\"%(sponsors_href)s\">generous sponsors</a>." +"PyPI is powered by <a href=\"%(warehouse_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Warehouse</a> and by a variety of " +"tools and services provided by our <a href=\"%(sponsors_href)s\">generous" +" sponsors</a>." msgstr "" -"PyPI funciona con <a href=\"%(warehouse_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Warehouse</a> y diversas herramientas y " -"servicios que nos brindan nuestros <a href=\"%(sponsors_href)s\">generosos " -"patrocinadores</a>." +"PyPI funciona con <a href=\"%(warehouse_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Warehouse</a> y diversas herramientas " +"y servicios que nos brindan nuestros <a " +"href=\"%(sponsors_href)s\">generosos patrocinadores</a>." #: warehouse/templates/pages/help.html:701 msgid "" -"As of April 16, 2018, PyPI.org is at \"production\" status, meaning that it " -"has moved out of beta and replaced the old site (pypi.python.org). It is now " -"robust, tested, and ready for expected browser and API traffic." +"As of April 16, 2018, PyPI.org is at \"production\" status, meaning that " +"it has moved out of beta and replaced the old site (pypi.python.org). It " +"is now robust, tested, and ready for expected browser and API traffic." msgstr "" "Desde el 16 de abril de 2018, PyPI.org se encuentra en estatus «de " -"producción», lo que significa que ha finalizado su condición de «beta» y ha " -"sustituido el sitio antiguo (pypi.python.org). Ahora es una plataforma " -"robusta, probada y preparada para manejar el tráfico y los navegadores " +"producción», lo que significa que ha finalizado su condición de «beta» y " +"ha sustituido el sitio antiguo (pypi.python.org). Ahora es una plataforma" +" robusta, probada y preparada para manejar el tráfico y los navegadores " "esperados." #: warehouse/templates/pages/help.html:703 #, python-format msgid "" -"PyPI is heavily cached and distributed via <abbr title=\"content delivery " -"network\">CDN</abbr> thanks to our sponsor <a href=\"%(fastly_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Fastly</a> and thus is " -"generally available globally. However, the site is mostly maintained by " -"volunteers, we do not provide any specific Service Level Agreement, and as " -"could be expected for a giant distributed system, things can and sometimes " -"do go wrong. See <a href=\"%(status_page_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">our status page</a> for current and past outages " -"and incidents. If you have high availability requirements for your package " -"index, consider either a <a href=\"%(mirror_href)s\">mirror</a> or a <a href=" -"\"%(private_index_href)s\">private index</a>." -msgstr "" -"PyPI en gran medida se almacena en antememoria y se distribuye a través de " -"<abbr title=\"red de entrega de contenido\">CDN</abbr> gracias a nuestro " -"patrocinador <a href=\"%(fastly_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">Fastly</a>; por tanto, está generalmente disponible a " -"nivel mundial. Sin embargo, el sitio es mantenido principalmente por " -"voluntarios, no proporcionamos ningún acuerdo de nivel de servicio en " -"concreto y, como podría esperarse de un sistema distribuido de gran tamaño, " -"las cosas pueden, como a veces sucede, salir mal. En <a href=" -"\"%(status_page_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">nuestra página de estado</a> hallará las interrupciones de servicio y los " -"incidentes actuales y pasados. Si tiene requisitos de disponibilidad alta " -"para su índice de paquetes, contemple utilizar un <a href=\"%(mirror_href)s" -"\">servidor réplica</a> o un <a href=\"%(private_index_href)s\">índice " -"privado</a>." +"PyPI is heavily cached and distributed via <abbr title=\"content delivery" +" network\">CDN</abbr> thanks to our sponsor <a href=\"%(fastly_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Fastly</a> and " +"thus is generally available globally. However, the site is mostly " +"maintained by volunteers, we do not provide any specific Service Level " +"Agreement, and as could be expected for a giant distributed system, " +"things can and sometimes do go wrong. See <a " +"href=\"%(status_page_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">our status page</a> for current and past outages and " +"incidents. If you have high availability requirements for your package " +"index, consider either a <a href=\"%(mirror_href)s\">mirror</a> or a <a " +"href=\"%(private_index_href)s\">private index</a>." +msgstr "" +"PyPI en gran medida se almacena en antememoria y se distribuye a través " +"de <abbr title=\"red de entrega de contenido\">CDN</abbr> gracias a " +"nuestro patrocinador <a href=\"%(fastly_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Fastly</a>; por tanto, está " +"generalmente disponible a nivel mundial. Sin embargo, el sitio es " +"mantenido principalmente por voluntarios, no proporcionamos ningún " +"acuerdo de nivel de servicio en concreto y, como podría esperarse de un " +"sistema distribuido de gran tamaño, las cosas pueden, como a veces " +"sucede, salir mal. En <a href=\"%(status_page_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">nuestra página de " +"estado</a> hallará las interrupciones de servicio y los incidentes " +"actuales y pasados. Si tiene requisitos de disponibilidad alta para su " +"índice de paquetes, contemple utilizar un <a " +"href=\"%(mirror_href)s\">servidor réplica</a> o un <a " +"href=\"%(private_index_href)s\">índice privado</a>." #: warehouse/templates/pages/help.html:717 #, python-format msgid "" -"We have a huge amount of work to do to continue to maintain and improve PyPI " -"(also known as <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">the Warehouse project</a>)." +"We have a huge amount of work to do to continue to maintain and improve " +"PyPI (also known as <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">the Warehouse project</a>)." msgstr "" -"Tenemos mucho trabajo pendiente para continuar dando mantenimiento y creando " -"mejoras para PyPI (conocido también como <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">el proyecto Warehouse</a>)." +"Tenemos mucho trabajo pendiente para continuar dando mantenimiento y " +"creando mejoras para PyPI (conocido también como <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">el proyecto " +"Warehouse</a>)." #: warehouse/templates/pages/help.html:722 msgid "Financial:" @@ -5357,8 +5401,8 @@ msgid "" "We would deeply appreciate <a href=\"%(href)s\">your donations to fund " "development and maintenance</a>." msgstr "" -"Agradeceremos enormemente <a href=\"%(href)s\">sus donativos para financiar " -"el desarrollo y el mantenimiento</a>." +"Agradeceremos enormemente <a href=\"%(href)s\">sus donativos para " +"financiar el desarrollo y el mantenimiento</a>." #: warehouse/templates/pages/help.html:723 msgid "Development:" @@ -5366,51 +5410,54 @@ msgstr "Desarrollo:" #: warehouse/templates/pages/help.html:723 msgid "" -"Warehouse is open source, and we would love to see some new faces working on " -"the project. You <strong>do not</strong> need to be an experienced open-" -"source developer to make a contribution – in fact, we'd love to help you " -"make your first open source pull request!" +"Warehouse is open source, and we would love to see some new faces working" +" on the project. You <strong>do not</strong> need to be an experienced " +"open-source developer to make a contribution – in fact, we'd love to help" +" you make your first open source pull request!" msgstr "" -"Warehouse es de código abierto; nos encantaría ver caras nuevas trabajando " -"en el proyecto. <strong>No</strong> es necesario que cuente con experiencia " -"de desarrollo de código abierto para contribuir: sin ir más lejos, " -"¡estaremos encantados de ayudarle a crear su primera <em>pull request</em>!" +"Warehouse es de código abierto; nos encantaría ver caras nuevas " +"trabajando en el proyecto. <strong>No</strong> es necesario que cuente " +"con experiencia de desarrollo de código abierto para contribuir: sin ir " +"más lejos, ¡estaremos encantados de ayudarle a crear su primera <em>pull " +"request</em>!" #: warehouse/templates/pages/help.html:725 #, python-format msgid "" "If you have skills in Python, ElasticSearch, HTML, SCSS, JavaScript, or " -"SQLAlchemy then skim our <a href=\"%(getting_started_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">\"Getting started\" guide</" -"a>, then take a look at the <a href=\"%(issue_tracker_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">issue tracker</a>. We've " -"created a <a href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">'Good first issue'</a> label – we recommend you " -"start here." +"SQLAlchemy then skim our <a href=\"%(getting_started_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">\"Getting " +"started\" guide</a>, then take a look at the <a " +"href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">issue tracker</a>. We've created a <a " +"href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">'Good first issue'</a> label – we recommend you start " +"here." msgstr "" "Si tiene habilidades en Python, ElasticSearch, HTML, SCSS, JavaScript o " -"SQLAlchemy, lea nuestra <a href=\"%(getting_started_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">guía de «Por dónde " -"empezar»</a>; después mire el <a href=\"%(issue_tracker_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">rastreador de problemas</" -"a>. Hemos creado una etiqueta <a href=\"%(good_first_issue_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">«Buen primer problema»</a>; " -"recomendamos que empiece por ahí." +"SQLAlchemy, lea nuestra <a href=\"%(getting_started_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">guía de «Por dónde" +" empezar»</a>; después mire el <a href=\"%(issue_tracker_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">rastreador de " +"problemas</a>. Hemos creado una etiqueta <a " +"href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">«Buen primer problema»</a>; recomendamos que empiece por" +" ahí." #: warehouse/templates/pages/help.html:733 #, python-format msgid "" -"Issues are grouped into <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">milestones</a>; working on issues in the current " -"milestone is a great way to help push the project forward. If you're " -"interested in working on a particular issue, leave a comment and we can " -"guide you through the contribution process." +"Issues are grouped into <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">milestones</a>; working on issues in " +"the current milestone is a great way to help push the project forward. If" +" you're interested in working on a particular issue, leave a comment and " +"we can guide you through the contribution process." msgstr "" -"Los problemos están agrupados en <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">metas</a>; trabajar en problemas de la " -"meta actual es una excelente manera de ayudar a impulsar el proyecto. Si te " -"interesa trabajar en algún problema en particular, deja un comentario y " -"podemos guiarte en todo e proceso de contribución." +"Los problemos están agrupados en <a href=\"%(href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">metas</a>; trabajar en problemas de " +"la meta actual es una excelente manera de ayudar a impulsar el proyecto. " +"Si te interesa trabajar en algún problema en particular, deja un " +"comentario y podemos guiarte en todo e proceso de contribución." #: warehouse/templates/pages/help.html:740 msgid "Stay updated:" @@ -5419,50 +5466,52 @@ msgstr "Manténgase al día:" #: warehouse/templates/pages/help.html:741 #, python-format msgid "" -"You can also follow the ongoing development of the project on the <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">distutils-sig mailing list</a> and the <a href=" -"\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">PyPA Dev message group</a>." +"You can also follow the ongoing development of the project on the <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">distutils-sig mailing list</a> and the <a " +"href=\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA Dev message group</a>." msgstr "" -"También puede mantenerse al corriente del desarrollo del proyecto a través " -"de la <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">lista de correo distutils-sig</a> y el <a href=" -"\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">grupo de mensajes PyPA Dev</a>." +"También puede mantenerse al corriente del desarrollo del proyecto a " +"través de la <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">lista de correo distutils-sig</a> y el" +" <a href=\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\"" +" rel=\"noopener\">grupo de mensajes PyPA Dev</a>." #: warehouse/templates/pages/help.html:751 #, python-format msgid "" -"Changes to PyPI are generally announced on both the <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">pypi-announce mailing list</a> and the <a href=\"%(blog_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PSF blog</a> under " -"the label \"pypi\". The PSF blog also has <a href=\"%(atom_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Atom</a> and <a href=" -"\"%(rss_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</" -"a> feeds for the \"pypi\" label." -msgstr "" -"Los cambios a PyPI generalmente se anuncian en <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">la lista de correos pypi-announce</a> y el <a href=" -"\"%(blog_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">blog de la PSF</a> bajo la etiqueta «pypi». El blog de la PSF también " -"cuenta con suministros <a href=\"%(atom_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Atom</a> y <a href=\"%(rss_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</a> para la etiqueta " -"«pypi»." +"Changes to PyPI are generally announced on both the <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">pypi-announce mailing list</a> and the <a " +"href=\"%(blog_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PSF blog</a> under the label \"pypi\". The PSF blog also" +" has <a href=\"%(atom_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Atom</a> and <a href=\"%(rss_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</a> feeds for " +"the \"pypi\" label." +msgstr "" +"Los cambios a PyPI generalmente se anuncian en <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">la lista de correos pypi-announce</a> y el <a " +"href=\"%(blog_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">blog de la PSF</a> bajo la etiqueta «pypi». El blog de " +"la PSF también cuenta con suministros <a href=\"%(atom_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Atom</a> y <a " +"href=\"%(rss_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">RSS</a> para la etiqueta «pypi»." #: warehouse/templates/pages/help.html:761 msgid "" -"When Warehouse's maintainers are deploying new features, at first we mark " -"them with a small \"beta feature\" symbol to tell you: this should probably " -"work fine, but it's new and less tested than other site functionality." +"When Warehouse's maintainers are deploying new features, at first we mark" +" them with a small \"beta feature\" symbol to tell you: this should " +"probably work fine, but it's new and less tested than other site " +"functionality." msgstr "" "Cuando los mantenedores de Warehouse implementamos funciones nuevas, al " "principio las marcamos con un pequeño símbolo de «función beta» para " -"decirle: esto probablemente funcione bien, pero es nuevo y no se ha probado " -"con el mismo rigor que otras funciones del sitio." +"decirle: esto probablemente funcione bien, pero es nuevo y no se ha " +"probado con el mismo rigor que otras funciones del sitio." #: warehouse/templates/pages/help.html:762 msgid "Currently, no features are in beta." @@ -5471,16 +5520,17 @@ msgstr "Actualmente, no hay ninguna función en beta." #: warehouse/templates/pages/help.html:766 #, python-format msgid "" -"\"PyPI\" should be pronounced like \"pie pea eye\", specifically with the " -"\"PI\" pronounced as individual letters, rather as a single sound. This " -"minimizes confusion with the <a href=\"%(href)s\" title=\"%(title)s\">PyPy</" -"a> project, which is a popular alternative implementation of the Python " -"language." +"\"PyPI\" should be pronounced like \"pie pea eye\", specifically with the" +" \"PI\" pronounced as individual letters, rather as a single sound. This " +"minimizes confusion with the <a href=\"%(href)s\" " +"title=\"%(title)s\">PyPy</a> project, which is a popular alternative " +"implementation of the Python language." msgstr "" "En inglés, «PyPI» debe pronunciarse como «pie pea eye»: /paɪ piː aɪ/; " -"observe que las letras «PI» se pronuncian separadamente. Esto minimiza la " -"confusión con el proyecto <a href=\"%(href)s\" title=\"%(title)s\">PyPy</a>, " -"una popular implementación alternativa del lenguaje Python." +"observe que las letras «PI» se pronuncian separadamente. Esto minimiza la" +" confusión con el proyecto <a href=\"%(href)s\" " +"title=\"%(title)s\">PyPy</a>, una popular implementación alternativa del " +"lenguaje Python." #: warehouse/templates/pages/help.html:778 msgid "Resources" @@ -5517,22 +5567,23 @@ msgstr "Contacto" #: warehouse/templates/pages/help.html:789 #, python-format msgid "" -"The <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging Authority (PyPA)</a> is a working group who " -"work together to improve Python packaging. If you'd like to get in touch " -"with a core packaging developer, use <a href=\"%(irc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">#pypa on IRC (freenode)</" -"a>, or <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">join the distutils-sig mailing list</a>." -msgstr "" -"<a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging Authority (PyPA)</a> es un grupo de trabajo " -"que trabaja en conjunto para mejorar el empaque de Python. Para ponerse en " -"contacto con un desarrollador principal de empaques, conéctese a <a href=" -"\"%(irc_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">#pypa en IRC (freenode)</a> o <a href=\"%(mailing_list_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">únase a la lista de correos " -"distutils-sig</a>." +"The <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging Authority (PyPA)</a> is a working group" +" who work together to improve Python packaging. If you'd like to get in " +"touch with a core packaging developer, use <a href=\"%(irc_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">#pypa on IRC " +"(freenode)</a>, or <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">join the distutils-sig mailing " +"list</a>." +msgstr "" +"<a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging Authority (PyPA)</a> es un grupo de " +"trabajo que trabaja en conjunto para mejorar el empaque de Python. Para " +"ponerse en contacto con un desarrollador principal de empaques, conéctese" +" a <a href=\"%(irc_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">#pypa en IRC (freenode)</a> o <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">únase a la lista de correos distutils-sig</a>." #: warehouse/templates/pages/security.html:15 msgid "Security" @@ -5544,11 +5595,11 @@ msgstr "Informar de un problema de seguridad" #: warehouse/templates/pages/security.html:22 msgid "" -"We take security very seriously and ask that you follow our security policy " -"carefully." +"We take security very seriously and ask that you follow our security " +"policy carefully." msgstr "" -"Nos tomamos muy en serio la seguridad y le pedimos que siga cuidadosamente " -"nuestra normativa de seguridad." +"Nos tomamos muy en serio la seguridad y le pedimos que siga " +"cuidadosamente nuestra normativa de seguridad." #: warehouse/templates/pages/security.html:24 msgid "Important!" @@ -5556,9 +5607,9 @@ msgstr "¡Importante!" #: warehouse/templates/pages/security.html:24 msgid "" -"If you believe you've identified a security issue with Warehouse, <strong>DO " -"NOT</strong> report the issue in any public forum, including (but not " -"limited to):" +"If you believe you've identified a security issue with Warehouse, " +"<strong>DO NOT</strong> report the issue in any public forum, including " +"(but not limited to):" msgstr "" "Si cree que ha identificado un problema de seguridad con Warehouse, " "<strong>NO</strong> informe del problema en un foro público, entre otros:" @@ -5578,23 +5629,24 @@ msgstr "Listas de correo oficiales o no oficiales" #: warehouse/templates/pages/security.html:35 #, python-format msgid "" -"Instead, email <a href=\"%(href)s\">security at python dot org</a> directly, " -"providing as much relevant information as possible." +"Instead, email <a href=\"%(href)s\">security at python dot org</a> " +"directly, providing as much relevant information as possible." msgstr "" -"En su lugar, envíe un mensaje (en inglés) a <a href=\"%(href)s\">security " -"arroba python punto org</a> directamente, proporcionando tanta información " -"relevante como sea posible." +"En su lugar, envíe un mensaje (en inglés) a <a href=\"%(href)s\">security" +" arroba python punto org</a> directamente, proporcionando tanta " +"información relevante como sea posible." #: warehouse/templates/pages/security.html:36 #, python-format msgid "" "Messages may be optionally encrypted with GPG using key fingerprints " -"available <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">at the Python Security page</a>." +"available <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">at the Python Security page</a>." msgstr "" -"Los mensajes se pueden cifrar opcionalmente con GPG usando huellas digitales " -"clave disponibles <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">en la página de seguridad de Python</a>." +"Los mensajes se pueden cifrar opcionalmente con GPG usando huellas " +"digitales clave disponibles <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">en la página de seguridad de " +"Python</a>." #: warehouse/templates/pages/security.html:38 msgid "What happens next?" @@ -5605,8 +5657,8 @@ msgid "" "Once you've submitted an issue via email, you should receive an " "acknowledgment within 48 hours." msgstr "" -"Una vez que haya enviado un problema por correo electrónico, recibirá acuse " -"de recibido en un plazo de 48 horas." +"Una vez que haya enviado un problema por correo electrónico, recibirá " +"acuse de recibido en un plazo de 48 horas." #: warehouse/templates/pages/security.html:41 msgid "" @@ -5619,8 +5671,8 @@ msgstr "" #: warehouse/templates/pages/security.html:44 msgid "This security policy was last updated on March 14, 2018." msgstr "" -"Esta normativa de seguridad se actualizó por última vez el 14 de marzo de " -"2018." +"Esta normativa de seguridad se actualizó por última vez el 14 de marzo de" +" 2018." #: warehouse/templates/pages/sitemap.html:21 msgid "PyPI site map" @@ -5666,15 +5718,15 @@ msgstr "Donar al grupo de trabajo de empaquetamiento" #: warehouse/templates/pages/sponsor.html:27 #, python-format msgid "" -"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Packaging Working Group</a> is a work group of the Python Software " -"Foundation which raises and distributes funds to improve Python's packaging " -"ecosystem." +"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Packaging Working Group</a> is a work group of the " +"Python Software Foundation which raises and distributes funds to improve " +"Python's packaging ecosystem." msgstr "" -"El <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">grupo de trabajo de empaquetamiento</a> es un equipo de la Python " -"Software Foundation que recauda y distribuye fondos para mejorar el " -"ecosistema de paquetes de Python." +"El <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">grupo de trabajo de empaquetamiento</a> es un equipo de " +"la Python Software Foundation que recauda y distribuye fondos para " +"mejorar el ecosistema de paquetes de Python." #: warehouse/templates/pages/sponsor.html:29 msgid "Recent projects funded through the working group include:" @@ -5685,39 +5737,41 @@ msgid "" "The successful relaunch of the Python Package Index, powered by the new " "'Warehouse' codebase" msgstr "" -"El exitoso relanzamiento del Índice de paquetes de Python, que funciona con " -"la nueva base de código fuente «Warehouse»" +"El exitoso relanzamiento del Índice de paquetes de Python, que funciona " +"con la nueva base de código fuente «Warehouse»" #: warehouse/templates/pages/sponsor.html:33 #, python-format msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$170,000 in funding</a> from the <a href=\"%(funder_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Mozilla Open Source " -"Support Program</a> in 2018" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$170,000 in funding</a> from the <a " +"href=\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Mozilla Open Source Support Program</a> in 2018" msgstr "" -"Con <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">170 000 USD de dotación</a> por parte del <a href=" -"\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">programa de apoyo al código abierto de Mozilla</a> en 2018" +"Con <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">170 000 USD de dotación</a> por parte del <a " +"href=\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">programa de apoyo al código abierto de Mozilla</a> en " +"2018" #: warehouse/templates/pages/sponsor.html:36 msgid "" -"Improving PyPI's security and accessibility, and adding support for multiple " -"locales" +"Improving PyPI's security and accessibility, and adding support for " +"multiple locales" msgstr "" -"Mejora de la seguridad y la accesibilidad de PyPI y adición de varios idiomas" +"Mejora de la seguridad y la accesibilidad de PyPI y adición de varios " +"idiomas" #: warehouse/templates/pages/sponsor.html:37 #, python-format msgid "" -"With $80,000 in funding from the <a href=\"%(funder_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology Fund</a> in " -"2019" +"With $80,000 in funding from the <a href=\"%(funder_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology " +"Fund</a> in 2019" msgstr "" -"Con 80 000 USD de dotación por parte del <a href=\"%(funder_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology Fund</a> en " -"2019" +"Con 80 000 USD de dotación por parte del <a href=\"%(funder_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology " +"Fund</a> en 2019" #: warehouse/templates/pages/sponsor.html:40 msgid "Additional security-focused features for PyPI" @@ -5726,37 +5780,39 @@ msgstr "Prestaciones adicionales centradas en la seguridad para PyPI" #: warehouse/templates/pages/sponsor.html:41 #, python-format msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$100,000 in funding</a> from <a href=\"%(funder_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Facebook Research</a> in " -"2019 and 2020" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$100,000 in funding</a> from <a href=\"%(funder_href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Facebook " +"Research</a> in 2019 and 2020" msgstr "" -"Con <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">100 000 USD de dotación</a> por parte de <a href=" -"\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Facebook Research</a> en 2019 y 2020" +"Con <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">100 000 USD de dotación</a> por parte de <a " +"href=\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Facebook Research</a> en 2019 y 2020" #: warehouse/templates/pages/sponsor.html:44 msgid "Overhauling pip's user experience and dependency resolver" msgstr "" -"Modernización de la experiencia de uso de pip y el resolvedor de dependencias" +"Modernización de la experiencia de uso de pip y el resolvedor de " +"dependencias" #: warehouse/templates/pages/sponsor.html:45 #, python-format msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$407,000 in funding</a> from the <a href=\"%(funder0_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Chan Zuckerberg " -"Initiative</a> and the <a href=\"%(funder1_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Mozilla Open Source Support Program</a> " -"in 2020" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$407,000 in funding</a> from the <a " +"href=\"%(funder0_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Chan Zuckerberg Initiative</a> and the <a " +"href=\"%(funder1_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Mozilla Open Source Support Program</a> in 2020" msgstr "" -"Con <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">407 000 de dotación</a> por parte de la <a href=" -"\"%(funder0_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Chan Zuckerberg Initiative</a> y el <a href=\"%(funder1_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">programa de apoyo al código " -"abierto de Mozilla</a> en 2020" +"Con <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">407 000 de dotación</a> por parte de la <a " +"href=\"%(funder0_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Chan Zuckerberg Initiative</a> y el <a " +"href=\"%(funder1_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">programa de apoyo al código abierto de Mozilla</a> en " +"2020" #: warehouse/templates/pages/sponsor.html:49 msgid "" @@ -5778,12 +5834,13 @@ msgstr "Apreciamos enormemente los donativos, sean puntuales o periódicos." #: warehouse/templates/pages/sponsor.html:61 #, python-format msgid "" -"For US taxpayers, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">your donation may be tax-deductible</a>." +"For US taxpayers, <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">your donation may be tax-" +"deductible</a>." msgstr "" -"Para los contribuyentes estadounidenses, <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">su donativo puede ser " -"deducible de impuestos</a>." +"Para los contribuyentes estadounidenses, <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">su donativo puede " +"ser deducible de impuestos</a>." #: warehouse/templates/pages/sponsor.html:62 msgid "Every donation counts!" @@ -5795,11 +5852,10 @@ msgstr "Done aquí" #: warehouse/templates/pages/sponsor.html:66 #, python-format -msgid "" -"Donating over $5,000? <a href=\"%(href)s\">Become a sponsor</a> instead." +msgid "Donating over $5,000? <a href=\"%(href)s\">Become a sponsor</a> instead." msgstr "" -"¿Va a donar más de 5000 USD? <a href=\"%(href)s\">Vuélvase auspiciante</a> " -"mejor." +"¿Va a donar más de 5000 USD? <a href=\"%(href)s\">Vuélvase " +"auspiciante</a> mejor." #: warehouse/templates/pages/sponsor.html:77 msgid "Get your logo on PyPI.org" @@ -5807,8 +5863,8 @@ msgstr "Haga que su logo aparezca en PyPI.org" #: warehouse/templates/pages/sponsor.html:78 msgid "" -"Looking for brand visibility? In the last year*, 21.1 million people from " -"237 countries visited PyPI.org." +"Looking for brand visibility? In the last year*, 21.1 million people from" +" 237 countries visited PyPI.org." msgstr "" "¿Busca visibilidad de marca? Durante el año pasado*, 21,1 millones de " "personas de 237 países y territorios visitaron PyPI.org." @@ -5823,12 +5879,12 @@ msgstr "Fortalezca el ecosistema de Python" #: warehouse/templates/pages/sponsor.html:83 msgid "" -"Funds raised by the packaging working group go directly towards improving " -"the tools your company uses every day." +"Funds raised by the packaging working group go directly towards improving" +" the tools your company uses every day." msgstr "" "Los fondos recaudados por el grupo de trabajo de empaquetamiento van " -"directamente a la mejora de las herramientas que su empresa utiliza todos " -"los días." +"directamente a la mejora de las herramientas que su empresa utiliza todos" +" los días." #: warehouse/templates/pages/sponsor.html:86 msgid "Boost your reputation" @@ -5836,11 +5892,11 @@ msgstr "Dé un impulso a su reputación" #: warehouse/templates/pages/sponsor.html:87 msgid "" -"Enhance your company's reputation by investing in Python and the open source " -"community." +"Enhance your company's reputation by investing in Python and the open " +"source community." msgstr "" -"Mejore la reputación de su empresa al invertir en Python y la comunidad de " -"código abierto." +"Mejore la reputación de su empresa al invertir en Python y la comunidad " +"de código abierto." #: warehouse/templates/pages/sponsor.html:96 msgid "Sponsorship packages" @@ -5864,16 +5920,17 @@ msgid "" "perpetuity</strong>" msgstr "" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:112 #: warehouse/templates/pages/sponsor.html:133 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" -"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation " -"blog</a>" +"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation blog</a>" msgstr "" "Aprenda a cargar archivos en el <a href=\"%(href)s\" title=\"%(title)s\" " "target=\"_blank\" rel=\"noopener\">manual de uso del empaquetamiento de " @@ -5899,7 +5956,8 @@ msgstr "50 000 USD al año o equivalente en servicios donados" #: warehouse/templates/pages/sponsor.html:130 msgid "" -"Logo in a <strong>prominent position</strong> on the PyPI project detail page" +"Logo in a <strong>prominent position</strong> on the PyPI project detail " +"page" msgstr "" #: warehouse/templates/pages/sponsor.html:131 @@ -5914,17 +5972,18 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:243 #, python-format msgid "" -"Logo <strong>and write up</strong> on the <a href=\"%(href)s\">PyPI sponsors " -"page</a>" +"Logo <strong>and write up</strong> on the <a href=\"%(href)s\">PyPI " +"sponsors page</a>" msgstr "" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:134 #: warehouse/templates/pages/sponsor.html:157 #: warehouse/templates/pages/sponsor.html:180 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" "<strong>Quarterly</strong> thank you tweet from the <a href=\"%(href)s\" " "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " @@ -5934,20 +5993,20 @@ msgstr "" "target=\"_blank\" rel=\"noopener\">manual de uso del empaquetamiento de " "Python</a>" +# | msgid "" +# | "PyPI supports any device that adheres to the <a href=\"%(href)s\" title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." #: warehouse/templates/pages/sponsor.html:135 #: warehouse/templates/pages/sponsor.html:158 #: warehouse/templates/pages/sponsor.html:181 #, fuzzy, python-format -#| msgid "" -#| "PyPI supports any device that adheres to the <a href=\"%(href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." msgid "" "<strong>Quarterly</strong> thank you tweet from the <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</" -"a>" +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" -"PyPI admite cualquier aparato que cumpla con la <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">norma FIDO</a>." +"PyPI admite cualquier aparato que cumpla con la <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">norma FIDO</a>." #: warehouse/templates/pages/sponsor.html:148 msgid "Platinum" @@ -5959,28 +6018,28 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:153 msgid "" -"Logo on <strong>high rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>high rotation</strong> in a prominent position on the " +"PyPI project detail page" msgstr "" +# | msgid "" +# | "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +# | "rel=\"noopener\">Python Packaging User Guide</a> for details on the " +# | "available formats." #: warehouse/templates/pages/sponsor.html:156 #: warehouse/templates/pages/sponsor.html:179 #: warehouse/templates/pages/sponsor.html:201 #: warehouse/templates/pages/sponsor.html:222 #, fuzzy, python-format -#| msgid "" -#| "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Python Packaging User Guide</a> for details on the " -#| "available formats." msgid "" "Inclusion in a blog post on the <a href=\"%(href)s\" title=\"%(title)s\" " "target=\"_blank\" rel=\"noopener\">Python Software Foundation blog</a>, " -"<strong>with other sponsors</strong> whose sponsorship commenced during the " -"same quarter" +"<strong>with other sponsors</strong> whose sponsorship commenced during " +"the same quarter" msgstr "" -"Consulte el <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">manual de uso del empaquetamiento de Python</a> para conocer " -"detalles sobre los formatos disponibles." +"Consulte el <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">manual de uso del empaquetamiento de Python</a> para " +"conocer detalles sobre los formatos disponibles." #: warehouse/templates/pages/sponsor.html:171 msgid "Gold" @@ -5992,8 +6051,8 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:176 msgid "" -"Logo on <strong>medium rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>medium rotation</strong> in a prominent position on the " +"PyPI project detail page" msgstr "" #: warehouse/templates/pages/sponsor.html:194 @@ -6006,22 +6065,23 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:199 msgid "" -"Logo on <strong>low rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>low rotation</strong> in a prominent position on the PyPI" +" project detail page" msgstr "" +# | msgid "Go to <a href=\"%(href)s\">reset your password</a>." #: warehouse/templates/pages/sponsor.html:200 #: warehouse/templates/pages/sponsor.html:221 #, fuzzy, python-format -#| msgid "Go to <a href=\"%(href)s\">reset your password</a>." msgid "Logo on the <a href=\"%(href)s\">PyPI sponsors page</a>" msgstr "Diríjase a <a href=\"%(href)s\">Restablecimiento de contraseña</a>." +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:202 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" "<strong>Bi-yearly</strong> thank you tweet from the <a href=\"%(href)s\" " "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " @@ -6031,15 +6091,16 @@ msgstr "" "target=\"_blank\" rel=\"noopener\">manual de uso del empaquetamiento de " "Python</a>" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:203 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" "<strong>Bi-yearly</strong> thank you tweet from the <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</" -"a>" +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" "Aprenda a cargar archivos en el <a href=\"%(href)s\" title=\"%(title)s\" " "target=\"_blank\" rel=\"noopener\">manual de uso del empaquetamiento de " @@ -6053,90 +6114,92 @@ msgstr "Bronce" msgid "$5,000 per year, or equivalent in donated services" msgstr "" +# | msgid "" +# | "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +# | "rel=\"noopener\">Python Packaging User Guide</a> for details on the " +# | "available formats." #: warehouse/templates/pages/sponsor.html:223 #, fuzzy, python-format -#| msgid "" -#| "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Python Packaging User Guide</a> for details on the " -#| "available formats." msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a> (on initial sponsorship, and on each subsequent renewal)" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a> (on initial sponsorship, and on each subsequent renewal)" msgstr "" -"Consulte el <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">manual de uso del empaquetamiento de Python</a> para conocer " -"detalles sobre los formatos disponibles." +"Consulte el <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">manual de uso del empaquetamiento de Python</a> para " +"conocer detalles sobre los formatos disponibles." +# | msgid "" +# | "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +# | "rel=\"noopener\">Python Packaging User Guide</a> for details on the " +# | "available formats." #: warehouse/templates/pages/sponsor.html:224 #, fuzzy, python-format -#| msgid "" -#| "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Python Packaging User Guide</a> for details on the " -#| "available formats." msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</a> " -"(on initial sponsorship, and on each subsequent renewal)" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a> (on initial sponsorship, and on each subsequent renewal)" msgstr "" -"Consulte el <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">manual de uso del empaquetamiento de Python</a> para conocer " -"detalles sobre los formatos disponibles." +"Consulte el <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">manual de uso del empaquetamiento de Python</a> para " +"conocer detalles sobre los formatos disponibles." #: warehouse/templates/pages/sponsor.html:238 msgid "One time grants / custom donations" msgstr "" +# | msgid "" +# | "Learn how to create a new release on the <a href=\"%(href)s\" title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " +# | "Guide</a>" #: warehouse/templates/pages/sponsor.html:239 #, fuzzy, python-format -#| msgid "" -#| "Learn how to create a new release on the <a href=\"%(href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -#| "Guide</a>" msgid "" -"Sponsorship of a specific feature, feature set, or community sprint, valued " -"at over $50,000. See <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">fundable packaging improvements</a> for ideas." +"Sponsorship of a specific feature, feature set, or community sprint, " +"valued at over $50,000. See <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">fundable packaging improvements</a> " +"for ideas." msgstr "" -"Aprenda a crear versiones nuevas en el <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">manual de uso del empaquetamiento de " -"Python</a>" +"Aprenda a crear versiones nuevas en el <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">manual de uso del " +"empaquetamiento de Python</a>" +# | msgid "" +# | "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +# | "rel=\"noopener\">Python Packaging User Guide</a> for details on the " +# | "available formats." #: warehouse/templates/pages/sponsor.html:244 #, fuzzy, python-format -#| msgid "" -#| "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Python Packaging User Guide</a> for details on the " -#| "available formats." msgid "" -"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation " -"blog</a>, explaining what the funds will be used for" +"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation blog</a>, explaining what the funds will be used for" msgstr "" -"Consulte el <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">manual de uso del empaquetamiento de Python</a> para conocer " -"detalles sobre los formatos disponibles." +"Consulte el <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">manual de uso del empaquetamiento de Python</a> para " +"conocer detalles sobre los formatos disponibles." #: warehouse/templates/pages/sponsor.html:245 #, python-format msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a>" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a>" msgstr "" -"Tuit <strong>único</strong> de agradecimiento por parte de la <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python " -"Software Foundation</a>" +"Tuit <strong>único</strong> de agradecimiento por parte de la <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Software Foundation</a>" #: warehouse/templates/pages/sponsor.html:246 #, python-format msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</a>" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" -"Tuit <strong>único</strong> de agradecimiento por parte de la <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">cuenta " -"de Twitter de PyPI</a>" +"Tuit <strong>único</strong> de agradecimiento por parte de la <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">cuenta de Twitter de PyPI</a>" #: warehouse/templates/pages/sponsor.html:248 msgid "" @@ -6151,12 +6214,12 @@ msgstr "Estadísticas de PyPI" #: warehouse/templates/pages/stats.html:23 msgid "" "We all love stats, so here are some useful statistics about PyPI. The " -"statistics page is cached for 24 hours, so don't expect the numbers to be " -"realtime." +"statistics page is cached for 24 hours, so don't expect the numbers to be" +" realtime." msgstr "" "A todos nos encantan las estadísticas, así que presentamos algunas de " -"utilidad. La página de estadísticas se almacena en antememoria por 24 horas; " -"no espere que las cifras reflejen datos en tiempo real." +"utilidad. La página de estadísticas se almacena en antememoria por 24 " +"horas; no espere que las cifras reflejen datos en tiempo real." #: warehouse/templates/pages/stats.html:30 msgid "Top projects by total package size" @@ -6164,11 +6227,11 @@ msgstr "Principales proyectos por tamaño total de paquete" #: warehouse/templates/pages/stats.html:32 msgid "" -"Here is a list of the top 100 projects based on the sum of their packages' " -"sizes (in bytes)." +"Here is a list of the top 100 projects based on the sum of their " +"packages' sizes (in bytes)." msgstr "" -"Aquí hay una lista de los primeros 100 proyectos según la suma del tamaño de " -"sus paquetes (en bytes)." +"Aquí hay una lista de los primeros 100 proyectos según la suma del tamaño" +" de sus paquetes (en bytes)." #: warehouse/templates/pages/stats.html:39 msgid "Statistics by project" @@ -6210,8 +6273,7 @@ msgstr "" #: warehouse/templates/search/results.html:110 msgid "Enter a search query, or add a filter by clicking on the button." -msgstr "" -"Ingrese una consulta de búsqueda o agregue un filtro pulsando en el botón." +msgstr "Ingrese una consulta de búsqueda o agregue un filtro pulsando en el botón." #: warehouse/templates/search/results.html:111 msgid "You can combine searches and classifier filters. Examples:" @@ -6316,13 +6378,15 @@ msgstr[0] "" " " msgstr[1] "" "\n" -" Los filtros «%(filters)s» no produjeron ningún resultado\n" +" Los filtros «%(filters)s» no produjeron ningún " +"resultado\n" " " #~ msgid "A new collaborator has been added to a project you own on PyPI:" #~ msgstr "" -#~ "Se añadió un colaborador nuevo a un proyecto del que es propietario en " -#~ "PyPI:" +#~ "Se añadió un colaborador nuevo a " +#~ "un proyecto del que es propietario " +#~ "en PyPI:" #~ msgid "<strong>Username</strong>: %(username)s" #~ msgstr "<strong>Nombre de usuario</strong>: %(username)s" @@ -6337,16 +6401,20 @@ msgstr[1] "" #~ msgstr "<strong>Incorporado/a por</strong>: %(submitter)s" #~ msgid "" -#~ "If this was a mistake, you can email <a href=\"%(href)s\">" -#~ "%(email_address)s</a> to communicate with the PyPI administrators." +#~ "If this was a mistake, you can " +#~ "email <a href=\"%(href)s\">%(email_address)s</a> to" +#~ " communicate with the PyPI administrators." #~ msgstr "" -#~ "Si esto fue un error, puede enviar un mensaje a <a href=\"%(href)s\">" -#~ "%(email_address)s</a> (en inglés) para ponerse en contacto con los " +#~ "Si esto fue un error, puede enviar" +#~ " un mensaje a <a " +#~ "href=\"%(href)s\">%(email_address)s</a> (en inglés) " +#~ "para ponerse en contacto con los " #~ "administradores de PyPI." #~ msgid "You are receiving this because you are an owner of this project." #~ msgstr "" -#~ "Ha recibido esto porque forma parte de los propietarios de este proyecto." +#~ "Ha recibido esto porque forma parte " +#~ "de los propietarios de este proyecto." #~ msgid "The project %(project)s has been deleted." #~ msgstr "Se eliminó el proyecto %(project)s." @@ -6360,28 +6428,29 @@ msgstr[1] "" #~ msgid "" #~ "If this was a mistake, you can email <a\n" -#~ " href=\"%(href)s\">%(email_address)s</a> to communicate with the PyPI " -#~ "administrators." +#~ " href=\"%(href)s\">%(email_address)s</a> to " +#~ "communicate with the PyPI administrators." #~ msgstr "" -#~ "Si esto fue un error, puede enviar un mensaje a <a href=\"%(href)s\">" -#~ "%(email_address)s</a> (en inglés) para ponerse en contacto con los " +#~ "Si esto fue un error, puede enviar" +#~ " un mensaje a <a " +#~ "href=\"%(href)s\">%(email_address)s</a> (en inglés) " +#~ "para ponerse en contacto con los " #~ "administradores de PyPI." #~ msgid "" -#~ "You are receiving this because you are %(recipient_role_descr)s of this " -#~ "project." -#~ msgstr "" -#~ "Ha recibido esto porque es %(recipient_role_descr)s de este proyecto." +#~ "You are receiving this because you " +#~ "are %(recipient_role_descr)s of this project." +#~ msgstr "Ha recibido esto porque es %(recipient_role_descr)s de este proyecto." #~ msgid "" -#~ "The %(project)s release %(release)s released on %(date)s has been deleted." -#~ msgstr "" -#~ "Se eliminó la versión %(release)s de %(project)s publicada el %(date)s." +#~ "The %(project)s release %(release)s released" +#~ " on %(date)s has been deleted." +#~ msgstr "Se eliminó la versión %(release)s de %(project)s publicada el %(date)s." #~ msgid "" #~ "\n" -#~ "You are receiving this because you are %(recipient_role_descr)s of this " -#~ "project." +#~ "You are receiving this because you " +#~ "are %(recipient_role_descr)s of this project." #~ msgstr "" #~ "\n" #~ "Ha recibido esto porque es %(recipient_role_descr)s de este proyecto." @@ -6393,67 +6462,91 @@ msgstr[1] "" #~ msgstr "Función beta" #~ msgid "" -#~ "If you lose your %(method)s and can no longer log in, the PyPI team " -#~ "<strong>cannot</strong> currently help you recover your account. We plan " -#~ "to develop a <a href=\"%(policy_href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">manual account recovery policy</a> and " -#~ "implement <a href=\"%(recovery_codes_href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">account recovery codes</a> to address this " -#~ "issue." +#~ "If you lose your %(method)s and " +#~ "can no longer log in, the PyPI " +#~ "team <strong>cannot</strong> currently help " +#~ "you recover your account. We plan " +#~ "to develop a <a href=\"%(policy_href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">manual account recovery policy</a>" +#~ " and implement <a " +#~ "href=\"%(recovery_codes_href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\">account recovery " +#~ "codes</a> to address this issue." #~ msgstr "" -#~ "Si pierde su %(method)s y ya no puede acceder a su cuenta, el equipo de " -#~ "PyPI por el momento <strong>no podrá</strong> ayudarle a recuperar su " -#~ "cuenta. Pretendemos desarrollar una <a href=\"%(policy_href)s\" title=" -#~ "\"%(title)s\" target=\"_blank\" rel=\"noopener\">normativa de " -#~ "recuperación manual de cuentas</a> e implementar <a href=" -#~ "\"%(recovery_codes_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -#~ "\"noopener\">códigos de recuperación</a> para solucionar este problema." +#~ "Si pierde su %(method)s y ya no" +#~ " puede acceder a su cuenta, el " +#~ "equipo de PyPI por el momento " +#~ "<strong>no podrá</strong> ayudarle a recuperar" +#~ " su cuenta. Pretendemos desarrollar una " +#~ "<a href=\"%(policy_href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\">normativa de " +#~ "recuperación manual de cuentas</a> e " +#~ "implementar <a href=\"%(recovery_codes_href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">códigos de recuperación</a> para" +#~ " solucionar este problema." #~ msgid "" #~ "\n" -#~ " In the short term, we recommend that all PyPI users set up " -#~ "<em>both</em>\n" -#~ " supported two factor authentication methods - using an " -#~ "authentication\n" -#~ " application <em>and</em> setting up a security device (e.g. USB " -#~ "key).\n" +#~ " In the short term, we " +#~ "recommend that all PyPI users set " +#~ "up <em>both</em>\n" +#~ " supported two factor authentication" +#~ " methods - using an authentication\n" +#~ " application <em>and</em> setting up" +#~ " a security device (e.g. USB key)." +#~ "\n" #~ " " #~ msgstr "" #~ "\n" -#~ " A corto plazo, recomendamos que todos los usuarios de PyPI " +#~ " A corto plazo, recomendamos que" +#~ " todos los usuarios de PyPI " #~ "configuren <em>los dos</em>\n" -#~ " métodos de autenticación en dos fases compatibles: una aplicación " -#~ "de\n" -#~ " autenticación <em>y</em> un aparato de seguridad (p. ej., una " -#~ "llave USB).\n" +#~ " métodos de autenticación en dos" +#~ " fases compatibles: una aplicación de\n" +#~ "" +#~ " autenticación <em>y</em> un aparato" +#~ " de seguridad (p. ej., una llave " +#~ "USB).\n" #~ " " #~ msgid "Top storage users" #~ msgstr "Principales usuarios de almacenamiento" #~ msgid "" -#~ "There is currently no established process for performing this " -#~ "administrative task that is explicit and fair for all parties. However, " -#~ "one is currently in development per <a href=\"%(href)s\" title=\"%(title)s" -#~ "\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python enhancement " +#~ "There is currently no established " +#~ "process for performing this administrative " +#~ "task that is explicit and fair for" +#~ " all parties. However, one is " +#~ "currently in development per <a " +#~ "href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\"" +#~ " rel=\"noopener\"><abbr title=\"Python enhancement " #~ "proposal\">PEP</abbr> 541</a>." #~ msgstr "" -#~ "No hay actualmente ningún proceso establecido para realizar esta tarea " -#~ "administrativa que sea explícito y justo para todas las partes. Sin " -#~ "embargo, se está desarrollando uno; véase la <a href=\"%(href)s\" title=" -#~ "\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Propuesta " -#~ "de mejora de Python\">PEP</abbr> 541</a>." +#~ "No hay actualmente ningún proceso " +#~ "establecido para realizar esta tarea " +#~ "administrativa que sea explícito y justo" +#~ " para todas las partes. Sin embargo," +#~ " se está desarrollando uno; véase la" +#~ " <a href=\"%(href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\"><abbr title=\"Propuesta" +#~ " de mejora de Python\">PEP</abbr> 541</a>." #~ msgid "" -#~ "<abbr title=\"Python enhancement proposal\">PEP</abbr> 541 has been " -#~ "accepted, and PyPI is <a href=\"%(href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">creating a workflow</a> which will be " -#~ "documented here." +#~ "<abbr title=\"Python enhancement " +#~ "proposal\">PEP</abbr> 541 has been accepted," +#~ " and PyPI is <a href=\"%(href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">creating a workflow</a> which " +#~ "will be documented here." #~ msgstr "" -#~ "<abbr title=\"Propuesta de mejora de Python\">PEP</abbr> 541 se ha " -#~ "aceptado, y PyPI está <a href=\"%(href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">creando un flujo de trabajo</a> que se " -#~ "documentará aquí." +#~ "<abbr title=\"Propuesta de mejora de " +#~ "Python\">PEP</abbr> 541 se ha aceptado, " +#~ "y PyPI está <a href=\"%(href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">creando un flujo de " +#~ "trabajo</a> que se documentará aquí." #~ msgid "Log Out" #~ msgstr "Salir" @@ -6464,11 +6557,10 @@ msgstr[1] "" #~ msgid "Simple index" #~ msgstr "Índice sencillo" -#~ msgid "" -#~ "There have been too many unsuccessful login attempts, try again later." +#~ msgid "There have been too many unsuccessful login attempts, try again later." #~ msgstr "" -#~ "Hubo demasiados intentos infructuosos de acceso. Inténtelo de nuevo más " -#~ "tarde." +#~ "Hubo demasiados intentos infructuosos de " +#~ "acceso. Inténtelo de nuevo más tarde." #~ msgid "Created on" #~ msgstr "Creación" @@ -6477,10 +6569,13 @@ msgstr[1] "" #~ msgstr "Nombre de usuario" #~ msgid "" -#~ "Filter by <a href=\"%(href)s\" class=\"%(classes)s\" aria-label=" -#~ "\"%(aria_label)s\" data-original-label=\"%(data_original_label)s\"> " +#~ "Filter by <a href=\"%(href)s\" " +#~ "class=\"%(classes)s\" aria-label=\"%(aria_label)s\" " +#~ "data-original-label=\"%(data_original_label)s\"> " #~ "classifier </a>" #~ msgstr "" -#~ "Filtrar por <a href=\"%(href)s\" class=\"%(classes)s\" aria-label=" -#~ "\"%(aria_label)s\" data-original-label=\"%(data_original_label)s\"> " +#~ "Filtrar por <a href=\"%(href)s\" " +#~ "class=\"%(classes)s\" aria-label=\"%(aria_label)s\" " +#~ "data-original-label=\"%(data_original_label)s\"> " #~ "clasificador </a>" + diff --git a/warehouse/locale/fr/LC_MESSAGES/messages.mo b/warehouse/locale/fr/LC_MESSAGES/messages.mo index b13d04803ca8..acde99944f29 100644 Binary files a/warehouse/locale/fr/LC_MESSAGES/messages.mo and b/warehouse/locale/fr/LC_MESSAGES/messages.mo differ diff --git a/warehouse/locale/fr/LC_MESSAGES/messages.po b/warehouse/locale/fr/LC_MESSAGES/messages.po index 3964d1704c8c..90e5a0f02bef 100644 --- a/warehouse/locale/fr/LC_MESSAGES/messages.po +++ b/warehouse/locale/fr/LC_MESSAGES/messages.po @@ -1,34 +1,3 @@ -# Translations template for Warehouse. -# Copyright (C) 2019 PyPA -# This file is distributed under the same license as the Warehouse project. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2019. -# Laurent LAPORTE <laurent.laporte.pro@gmail.com>, 2019. -# Julia Duimovich <duimovich.julia@gmail.com>, 2019. -# Maelle <maellevance@gmail.com>, 2019. -# Xavier Fernandez <xav.fernandez@gmail.com>, 2019. -# Allan Nordhøy <epost@anotheragency.no>, 2019. -# gabriel-tessier <tessier@luxeys.com>, 2019. -# Matthieu Melot <matthieu.melot@gmail.com>, 2019. -# Nathan <bonnemainsnathan@gmail.com>, 2019, 2020. -# Adolfo Jayme Barrientos <fitojb@ubuntu.com>, 2020. -# Bruno Alla <alla.brunoo@gmail.com>, 2020. -msgid "" -msgstr "" -"Project-Id-Version: Warehouse VERSION\n" -"Report-Msgid-Bugs-To: https://github.com/pypa/warehouse/issues/new\n" -"POT-Creation-Date: 2020-01-15 20:11+0200\n" -"PO-Revision-Date: 2020-04-05 13:40+0000\n" -"Last-Translator: Nathan <bonnemainsnathan@gmail.com>\n" -"Language-Team: French <https://hosted.weblate.org/projects/pypa/warehouse/fr/" -">\n" -"Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 4.0-dev\n" -"Generated-By: Babel 2.7.0\n" - #: warehouse/views.py:254 msgid "Locale updated" msgstr "Langue mise à jour" @@ -48,21 +17,21 @@ msgstr "Choisissez un nom d’utilisateur d’au plus 50 caractères." #: warehouse/accounts/forms.py:85 msgid "" "The username is invalid. Usernames must be composed of letters, numbers, " -"dots, hyphens and underscores. And must also start and finish with a letter " -"or number. Choose a different username." +"dots, hyphens and underscores. And must also start and finish with a " +"letter or number. Choose a different username." msgstr "" -"Le nom d’utilisateur est invalide. Un nom d’utilisateur doit être composé de " -"lettres, nombres, points, tirets ou tirets bas. Il doit aussi commencer et " -"se terminer par une lettre ou un nombre. Choisissez un nom d’utilisateur " -"différent." +"Le nom d’utilisateur est invalide. Un nom d’utilisateur doit être composé" +" de lettres, nombres, points, tirets ou tirets bas. Il doit aussi " +"commencer et se terminer par une lettre ou un nombre. Choisissez un nom " +"d’utilisateur différent." #: warehouse/accounts/forms.py:99 msgid "" -"This username is already being used by another account. Choose a different " -"username." +"This username is already being used by another account. Choose a " +"different username." msgstr "" -"Ce nom d’utilisateur est déjà utilisé par un autre compte. Choisissez un nom " -"d’utilisateur différent." +"Ce nom d’utilisateur est déjà utilisé par un autre compte. Choisissez un " +"nom d’utilisateur différent." #: warehouse/accounts/forms.py:122 msgid "The password is invalid. Try again." @@ -71,8 +40,8 @@ msgstr "Le mot de passe est invalide. Veuillez réessayer." #: warehouse/accounts/forms.py:126 warehouse/accounts/views.py:65 msgid "There have been too many unsuccessful login attempts. Try again later." msgstr "" -"Il y a eu trop de tentative de connexions infructueuses. Veuillez réessayer " -"plus tard." +"Il y a eu trop de tentative de connexions infructueuses. Veuillez " +"réessayer plus tard." #: warehouse/accounts/forms.py:148 msgid "Your passwords don't match. Try again." @@ -90,16 +59,16 @@ msgstr "" #: warehouse/accounts/forms.py:209 msgid "" -"This email address is already being used by this account. Use a different " -"email." +"This email address is already being used by this account. Use a different" +" email." msgstr "" -"Cette adresse e-mail est déjà utilisée par ce compte. Veuillez utiliser une " -"adresse e-mail différente." +"Cette adresse e-mail est déjà utilisée par ce compte. Veuillez utiliser " +"une adresse e-mail différente." #: warehouse/accounts/forms.py:216 msgid "" -"This email address is already being used by another account. Use a different " -"email." +"This email address is already being used by another account. Use a " +"different email." msgstr "" "Cette adresse e-mail est déjà utilisée par un autre compte. Veuillez " "utiliser une adresse e-mail différente." @@ -140,26 +109,27 @@ msgstr "Assertion WebAuthn réussie" #: warehouse/accounts/views.py:371 msgid "Recovery code accepted. The supplied code cannot be used again." -msgstr "" -"Code de récupération accepté. Le code fourni ne peut plus être utilisé." +msgstr "Code de récupération accepté. Le code fourni ne peut plus être utilisé." #: warehouse/accounts/views.py:455 msgid "" -"New user registration temporarily disabled. See https://pypi.org/help#admin-" -"intervention for details." +"New user registration temporarily disabled. See https://pypi.org/help" +"#admin-intervention for details." msgstr "" -"L’enregistrement d’un nouvel utilisateur est temporairement désactivé. Voir " -"https://pypi.org/help#admin-intervention pour plus de détails." +"L’enregistrement d’un nouvel utilisateur est temporairement désactivé. " +"Voir https://pypi.org/help#admin-intervention pour plus de détails." #: warehouse/accounts/views.py:552 msgid "Expired token: request a new password reset link" msgstr "" -"Jeton expiré : demandez un nouveau lien de réinitialisation de mot de passe" +"Jeton expiré : demandez un nouveau lien de réinitialisation de mot de " +"passe" #: warehouse/accounts/views.py:554 msgid "Invalid token: request a new password reset link" msgstr "" -"Jeton invalide : demandez un nouveau lien de réinitialisation de mot de passe" +"Jeton invalide : demandez un nouveau lien de réinitialisation de mot de " +"passe" #: warehouse/accounts/views.py:556 warehouse/accounts/views.py:634 msgid "Invalid token: no token supplied" @@ -167,8 +137,7 @@ msgstr "Jeton invalide : aucun jeton fourni" #: warehouse/accounts/views.py:560 msgid "Invalid token: not a password reset token" -msgstr "" -"Jeton invalide : ce n’est pas un jeton de réinitialisation de mot de passe" +msgstr "Jeton invalide : ce n’est pas un jeton de réinitialisation de mot de passe" #: warehouse/accounts/views.py:565 msgid "Invalid token: user not found" @@ -185,8 +154,8 @@ msgid "" "Invalid token: password has already been changed since this token was " "requested" msgstr "" -"Jeton invalide : mot de passe a déjà été changé depuis que ce jeton a été " -"demandé" +"Jeton invalide : mot de passe a déjà été changé depuis que ce jeton a été" +" demandé" #: warehouse/accounts/views.py:605 msgid "You have reset your password" @@ -215,7 +184,8 @@ msgstr "E-mail déjà vérifié" #: warehouse/accounts/views.py:662 msgid "You can now set this email as your primary address" msgstr "" -"Vous pouvez dorénavant configurer cet e-mail comme votre adresse principale" +"Vous pouvez dorénavant configurer cet e-mail comme votre adresse " +"principale" #: warehouse/accounts/views.py:664 msgid "This is your primary address" @@ -230,15 +200,16 @@ msgstr "" #: warehouse/manage/views.py:186 msgid "Email ${email_address} added - check your email for a verification link" msgstr "" -"E-mail ${email_address} ajouté - consultez votre boîte mail pour le lien de " -"vérification" +"E-mail ${email_address} ajouté - consultez votre boîte mail pour le lien " +"de vérification" #: warehouse/manage/views.py:667 warehouse/manage/views.py:703 msgid "" -"You must provision a two factor method before recovery codes can be generated" +"You must provision a two factor method before recovery codes can be " +"generated" msgstr "" -"Vous devez définir une méthode d'authentification à deux facteurs avant de " -"pouvoir générer des codes de récupération" +"Vous devez définir une méthode d'authentification à deux facteurs avant " +"de pouvoir générer des codes de récupération" #: warehouse/manage/views.py:678 msgid "Recovery codes already generated" @@ -247,8 +218,8 @@ msgstr "Les codes de récupération ont déjà été générés" #: warehouse/manage/views.py:679 msgid "Generating new recovery codes will invalidate your existing codes." msgstr "" -"La génération de nouveaux codes de récupération rendra invalide vos codes " -"existants." +"La génération de nouveaux codes de récupération rendra invalide vos codes" +" existants." #: warehouse/manage/views.py:729 msgid "Invalid credentials. Try again" @@ -425,9 +396,9 @@ msgstr "Quelque chose s'est mal passé" #: warehouse/templates/500.html:22 msgid "" -"<p>We are experiencing technical issues that are affecting our ability to " -"serve you this site.</p> <p>We are aware of the problem and are working to " -"resolve it as soon as possible.</p>" +"<p>We are experiencing technical issues that are affecting our ability to" +" serve you this site.</p> <p>We are aware of the problem and are working " +"to resolve it as soon as possible.</p>" msgstr "" "<p>Nous éprouvons des difficultés techniques qui nous empêchent de vous " "donner accès à ce site.</p><p>Nous sommes au courant du problème et nous " @@ -451,21 +422,22 @@ msgstr "Utilisez-vous PyPI pour le travail ?" #: warehouse/templates/500.html:37 msgid "" -"Consider <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\" rel=" -"\"noopener\"> contributing </a> or <a href=\"https://psfmember.org/civicrm/" -"contribute/transact?reset=1&id=13\" target=\"_blank\" rel=\"noopener\"> " -"donating </a> to help us build a more stable and secure platform." +"Consider <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\" " +"rel=\"noopener\"> contributing </a> or <a " +"href=\"https://psfmember.org/civicrm/contribute/transact?reset=1&id=13\" " +"target=\"_blank\" rel=\"noopener\"> donating </a> to help us build a more" +" stable and secure platform." msgstr "" -"Considérez <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\" " -"rel=\"noopener\"> une contribution </a> ou<a href=\"https://psfmember.org/" -"civicrm/contribute/transact?reset=1&id=13\" target=\"_blank\" rel=\"noopener" -"\"> un don</a> pour nous aider à construire une plateforme plus stable et " -"plus sûre." +"Considérez <a href=\"https://github.com/pypa/warehouse\" " +"target=\"_blank\" rel=\"noopener\"> une contribution </a> ou<a " +"href=\"https://psfmember.org/civicrm/contribute/transact?reset=1&id=13\" " +"target=\"_blank\" rel=\"noopener\"> un don</a> pour nous aider à " +"construire une plateforme plus stable et plus sûre." #: warehouse/templates/base.html:23 msgid "" -"Choose a strong password that contains letters (uppercase and lowercase), " -"numbers and special characters. Avoid common words or repetition." +"Choose a strong password that contains letters (uppercase and lowercase)," +" numbers and special characters. Avoid common words or repetition." msgstr "" "Choisissez un mot de passe fort contenant des lettres (majuscules et " "minuscules), des chiffres et des caractères spéciaux. Évitez les mots " @@ -524,11 +496,11 @@ msgstr "Menu principal" #: warehouse/templates/base.html:76 warehouse/templates/index.html:79 msgid "" -"The Python Package Index (PyPI) is a repository of software for the Python " -"programming language." +"The Python Package Index (PyPI) is a repository of software for the " +"Python programming language." msgstr "" -"L'Index des Paquets Python (PyPI) est une collection de programmes pour le " -"langage de programmation Python." +"L'Index des Paquets Python (PyPI) est une collection de programmes pour " +"le langage de programmation Python." #: warehouse/templates/base.html:92 msgid "RSS: 40 latest updates" @@ -561,23 +533,23 @@ msgstr "Avertissement" #: warehouse/templates/base.html:158 msgid "You are using an unsupported browser, upgrade to a newer version." msgstr "" -"Vous utilisez un navigateur non supporté, veuillez effectuer la mise à jour " -"vers une version plus récente." +"Vous utilisez un navigateur non supporté, veuillez effectuer la mise à " +"jour vers une version plus récente." #: warehouse/templates/base.html:167 msgid "" "You are using TestPyPI – a separate instance of the Python Package Index " -"that allows you to try distribution tools and processes without affecting " -"the real index." +"that allows you to try distribution tools and processes without affecting" +" the real index." msgstr "" -"Vous utilisez TestPyPI, une instance distincte de l'Index des Paquets Python " -"qui vous permet d'essayer les outils de publication et processus sans " -"affecter le véritable index." +"Vous utilisez TestPyPI, une instance distincte de l'Index des Paquets " +"Python qui vous permet d'essayer les outils de publication et processus " +"sans affecter le véritable index." #: warehouse/templates/base.html:177 msgid "" -"Some features may not work without JavaScript. Please try enabling it if you " -"encounter problems." +"Some features may not work without JavaScript. Please try enabling it if " +"you encounter problems." msgstr "" "Certaines fonctionnalités pourraient ne pas fonctionner sans JavaScript. " "Veuillez essayer de l'activer si vous rencontrez des problèmes." @@ -702,9 +674,11 @@ msgstr "Tous les systèmes sont opérationnels" #: warehouse/templates/base.html:311 msgid "" -"Developed and maintained by the Python community, for the Python community." +"Developed and maintained by the Python community, for the Python " +"community." msgstr "" -"Développé est maintenu par la communauté Python, pour la communauté Python." +"Développé est maintenu par la communauté Python, pour la communauté " +"Python." #: warehouse/templates/base.html:313 msgid "Donate today!" @@ -733,14 +707,14 @@ msgstr "L'Index des paquets Python" #: warehouse/templates/index.html:42 msgid "Test Python package publishing with the Test Python Package Index" msgstr "" -"Testez la publication de paquets Python avec le l'Index des Paquets Python " -"Test" +"Testez la publication de paquets Python avec le l'Index des Paquets " +"Python Test" #: warehouse/templates/index.html:44 msgid "Find, install and publish Python packages with the Python Package Index" msgstr "" -"Recherchez, installez et publiez des paquets Python avec l'Index des Paquets " -"Python" +"Recherchez, installez et publiez des paquets Python avec l'Index des " +"Paquets Python" #: warehouse/templates/index.html:60 #, python-format @@ -769,11 +743,11 @@ msgstr "%(num_users)s utilisateurs" #: warehouse/templates/index.html:81 msgid "" -"PyPI helps you find and install software developed and shared by the Python " -"community." +"PyPI helps you find and install software developed and shared by the " +"Python community." msgstr "" -"PyPI vous aide à trouver et installer des logiciels développés et partagés " -"par la communauté Python." +"PyPI vous aide à trouver et installer des logiciels développés et " +"partagés par la communauté Python." #: warehouse/templates/index.html:82 msgid "Learn about installing packages</a>." @@ -781,8 +755,7 @@ msgstr "Apprenez à installer des paquets</a>." #: warehouse/templates/index.html:85 msgid "Package authors use PyPI to distribute their software." -msgstr "" -"Les créateurs de paquets utilisent PyPI pour distribuer leurs logiciels." +msgstr "Les créateurs de paquets utilisent PyPI pour distribuer leurs logiciels." #: warehouse/templates/index.html:86 msgid "Learn how to package your Python code for PyPI</a>." @@ -815,18 +788,19 @@ msgstr "" #: warehouse/templates/upload.html:26 #, python-format msgid "" -"For more information on uploading projects to PyPI, visit the <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python " -"Packaging User Guide</a>." +"For more information on uploading projects to PyPI, visit the <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" -"Pour plus d’informations à propos du téléchargement des projets sur PyPI, " -"consultez le <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Guide Utilisateur de l'Empaquetage Python</a>." +"Pour plus d’informations à propos du téléchargement des projets sur PyPI," +" consultez le <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Guide Utilisateur de l'Empaquetage Python</a>." #: warehouse/templates/upload.html:28 #, python-format msgid "" -"Otherwise, we suggest you <a href=\"%(href)s\">go to the PyPI homepage</a>." +"Otherwise, we suggest you <a href=\"%(href)s\">go to the PyPI " +"homepage</a>." msgstr "" "Sinon, nous vous suggérons de <a href=\"%(href)s\">consulter la page " "d’accueil de PyPI</a>." @@ -994,22 +968,23 @@ msgstr "Vérifier" #: warehouse/templates/accounts/recovery-code.html:58 msgid "" -"PyPI allows for generating recovery codes to be stored securely offline in " -"the event that your device or application is lost. Enter one of these codes " -"in the form to verify your identity. Once used, the recovery code will no " -"longer be valid." +"PyPI allows for generating recovery codes to be stored securely offline " +"in the event that your device or application is lost. Enter one of these " +"codes in the form to verify your identity. Once used, the recovery code " +"will no longer be valid." msgstr "" "PyPI permet de générer des codes de récupération qui seront stockés hors " "ligne en toute sécurité en cas de perte de votre appareil ou de votre " -"application. Saisissez l'un de ces codes dans le formulaire pour vérifier " -"votre identité. Une fois utilisé, le code de récupération ne sera plus " +"application. Saisissez l'un de ces codes dans le formulaire pour vérifier" +" votre identité. Une fois utilisé, le code de récupération ne sera plus " "valide." #: warehouse/templates/accounts/recovery-code.html:59 #, python-format msgid "<p>Not working? <a href=\"%(href)s\">Get help</a>.</p>" msgstr "" -"<p>Cela ne fonctionne pas ? <a href=\"%(href)s\">Obtenir de l'aide</a>.</p>" +"<p>Cela ne fonctionne pas ? <a href=\"%(href)s\">Obtenir de " +"l'aide</a>.</p>" #: warehouse/templates/accounts/register.html:18 msgid "Create an account" @@ -1069,12 +1044,12 @@ msgstr "Confirmez le mot de passe" #: warehouse/templates/accounts/register.html:157 msgid "" "This password appears in a security breach or has been compromised and " -"cannot be used. Please refer to the <a href=\"/help/#compromised-password" -"\">FAQ</a> for more information." +"cannot be used. Please refer to the <a href=\"/help/#compromised-" +"password\">FAQ</a> for more information." msgstr "" -"Ce mot de passe apparaît dans une faille de sécurité ou bien a été compromis " -"et ne peut pas être utilisé. Veuillez vous référer à la <a href=\"/help/" -"#compromised-password\">FAQ</a> pour plus d'informations." +"Ce mot de passe apparaît dans une faille de sécurité ou bien a été " +"compromis et ne peut pas être utilisé. Veuillez vous référer à la <a " +"href=\"/help/#compromised-password\">FAQ</a> pour plus d'informations." #: warehouse/templates/accounts/register.html:162 msgid "Create account" @@ -1110,8 +1085,8 @@ msgstr "Un e-mail a été envoyé à votre adresse électronique d’inscription #: warehouse/templates/accounts/request-password-reset.html:52 #, python-format msgid "" -"The email contains a link to reset your password. This link will expire in " -"%(n_hours)s hours." +"The email contains a link to reset your password. This link will expire " +"in %(n_hours)s hours." msgstr "" "L’e-mail contient un lien pour réinitialiser votre mot de passe. Ce lien " "expirera dans %(n_hours)s heures." @@ -1161,19 +1136,20 @@ msgstr "S’authentifier avec le périphérique" #: warehouse/templates/accounts/two-factor.html:55 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" rel=\"%(rel)s" -"\">Upgrade your browser</a> to log in with a security device (e.g. USB key)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" " +"rel=\"%(rel)s\">Upgrade your browser</a> to log in with a security device" +" (e.g. USB key)" msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" rel=\"%(rel)s" -"\">Mettez à jour votre navigateur</a> pour vous connecter avec un dispositif " -"de sécurité (ex : clé USB)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" " +"rel=\"%(rel)s\">Mettez à jour votre navigateur</a> pour vous connecter " +"avec un dispositif de sécurité (ex : clé USB)" #: warehouse/templates/accounts/two-factor.html:60 #, python-format msgid "Lost your device? Not working? <a href=\"%(href)s\">Get help</a>." msgstr "" -"Périphérique perdu ? Cela ne fonctionne pas ? <a href=\"%(href)s\">Obtenir " -"de l'aide</a>." +"Périphérique perdu ? Cela ne fonctionne pas ? <a " +"href=\"%(href)s\">Obtenir de l'aide</a>." #: warehouse/templates/accounts/two-factor.html:72 msgid "Authenticate with an app" @@ -1186,14 +1162,15 @@ msgstr "Entrez le code d'authentification" #: warehouse/templates/accounts/two-factor.html:105 #, python-format msgid "" -"<p>Generate a code using the authentication application connected to your " -"PyPI account. Enter this code in the form to verify your identity.</p> " -"<p>Lost your application? Not working? <a href=\"%(href)s\">Get help</a>.</p>" +"<p>Generate a code using the authentication application connected to your" +" PyPI account. Enter this code in the form to verify your identity.</p> " +"<p>Lost your application? Not working? <a href=\"%(href)s\">Get " +"help</a>.</p>" msgstr "" -"<p>Générez un code en utilisant une application d'authentification connectée " -"à votre compte PyPI. Entrez ce code dans le formulaire pour vérifier votre " -"identité.</p> <p>Application perdue ? Cela ne fonctionne pas ? <a href=" -"\"%(href)s\">Obtenir de l'aide</a>.</p>" +"<p>Générez un code en utilisant une application d'authentification " +"connectée à votre compte PyPI. Entrez ce code dans le formulaire pour " +"vérifier votre identité.</p> <p>Application perdue ? Cela ne fonctionne " +"pas ? <a href=\"%(href)s\">Obtenir de l'aide</a>.</p>" #: warehouse/templates/accounts/two-factor.html:117 msgid "Lost your security key or application?" @@ -1206,14 +1183,15 @@ msgstr "Se connecter avec un code de récupération" #: warehouse/templates/accounts/two-factor.html:122 #, python-format msgid "" -"<p><strong>You have not generated account recovery codes.</strong></p> <p>If " -"you lose access to your two factor methods, you may lose access to your " -"account. <a href=\"%(href)s\">Get help with recovery codes.</a></p>" +"<p><strong>You have not generated account recovery codes.</strong></p> " +"<p>If you lose access to your two factor methods, you may lose access to " +"your account. <a href=\"%(href)s\">Get help with recovery codes.</a></p>" msgstr "" -"<p><strong>Vous n'avez pas généré de codes de récupération de compte.</" -"strong></p> <p>Si vous perdez l'accès à votre méthode d'authentification à " -"deux facteurs, vous pourriez perdre l'accès à votre compte.<a href=\"%(href)s" -"\">Obtenir de l'aide sur les codes de récupération.</a></p>" +"<p><strong>Vous n'avez pas généré de codes de récupération de " +"compte.</strong></p> <p>Si vous perdez l'accès à votre méthode " +"d'authentification à deux facteurs, vous pourriez perdre l'accès à votre " +"compte.<a href=\"%(href)s\">Obtenir de l'aide sur les codes de " +"récupération.</a></p>" #: warehouse/templates/email/account-deleted/body.html:18 #, python-format @@ -1227,11 +1205,12 @@ msgstr "Votre compte PyPI <strong>%(username)s</strong> a été supprimé." #: warehouse/templates/email/two-factor-removed/body.html:20 #, python-format msgid "" -"If you did not make this change, you can email <a href=\"%(href)s\">" -"%(email_address)s</a> to communicate with the PyPI administrators." +"If you did not make this change, you can email <a " +"href=\"%(href)s\">%(email_address)s</a> to communicate with the PyPI " +"administrators." msgstr "" -"Si vous n'avez pas effectué ces modifications, vous pouvez nous écrire à <a " -"href=\"%(href)s\">%(email_address)s</a> pour communiquer avec les " +"Si vous n'avez pas effectué ces modifications, vous pouvez nous écrire à " +"<a href=\"%(href)s\">%(email_address)s</a> pour communiquer avec les " "administrateurs de PyPI." #: warehouse/templates/email/added-as-collaborator/body.html:19 @@ -1255,11 +1234,11 @@ msgstr "" #: warehouse/templates/email/password-change/body.html:18 #, python-format msgid "" -"Someone, perhaps you, has changed the password for your PyPI account <strong>" -"%(username)s</strong>." -msgstr "" -"Quelqu'un, peut-être vous, à modifié le mot de passe de votre compte PyPI " +"Someone, perhaps you, has changed the password for your PyPI account " "<strong>%(username)s</strong>." +msgstr "" +"Quelqu'un, peut-être vous, à modifié le mot de passe de votre compte PyPI" +" <strong>%(username)s</strong>." #: warehouse/templates/email/password-compromised-hibp/body.html:18 #: warehouse/templates/email/password-compromised/body.html:18 @@ -1268,9 +1247,10 @@ msgstr "Quoi ?" #: warehouse/templates/email/password-compromised/body.html:20 msgid "" -"PyPI administrators have determined that your password is compromised. To\n" -" protect you and other users, we have preemptively reset your password and " -"you\n" +"PyPI administrators have determined that your password is compromised. To" +"\n" +" protect you and other users, we have preemptively reset your password " +"and you\n" " will no longer be able to log in or upload to PyPI with your existing\n" " password." msgstr "" @@ -1288,8 +1268,8 @@ msgid "" "reduce the\n" " risk for PyPI and its users." msgstr "" -"PyPI n'a pas subi de violation. Il s'agit d'une mesure de protection pour " -"réduire les\n" +"PyPI n'a pas subi de violation. Il s'agit d'une mesure de protection pour" +" réduire les\n" " risques pour PyPI et ses utilisateurs." #: warehouse/templates/email/password-compromised-hibp/body.html:32 @@ -1300,11 +1280,11 @@ msgstr "Que dois-je faire ?" #: warehouse/templates/email/password-compromised/body.html:33 #, python-format msgid "" -"To regain access to your account, <a href=\"%(href)s\">reset your password</" -"a> on PyPI." +"To regain access to your account, <a href=\"%(href)s\">reset your " +"password</a> on PyPI." msgstr "" -"Pour récupérer l'accès à votre compte, veuillez <a href=\"%(href)s" -"\">réinitialiser votre mot de passe</a> sur PyPI." +"Pour récupérer l'accès à votre compte, veuillez <a " +"href=\"%(href)s\">réinitialiser votre mot de passe</a> sur PyPI." #: warehouse/templates/email/password-compromised/body.html:39 msgid "How can I contact you?" @@ -1313,7 +1293,8 @@ msgstr "Comment puis-je vous contacter ?" #: warehouse/templates/email/password-compromised/body.html:41 #, python-format msgid "" -"For more information, you can email %(email_address)s to communicate with\n" +"For more information, you can email %(email_address)s to communicate with" +"\n" " the PyPI administrators." msgstr "" "Pour plus d'informations, vous pouvez écrire à %(email_address)s pour " @@ -1326,14 +1307,14 @@ msgid "" "password appears\n" " in public data breaches. To protect you and other users, we have " "preemptively reset your\n" -" password and you will no longer be able to log in or upload to PyPI with " -"your existing\n" +" password and you will no longer be able to log in or upload to PyPI " +"with your existing\n" " password." msgstr "" -"Lors de votre dernière tentative de connexion ou de publication sur PyPI, " -"nous avons remarqué que votre mot de passe apparaît\n" -" dans des violations de données publiques. Pour vous protéger vous et les " -"autres utilisateurs, nous avons réinitialisé votre \n" +"Lors de votre dernière tentative de connexion ou de publication sur PyPI," +" nous avons remarqué que votre mot de passe apparaît\n" +" dans des violations de données publiques. Pour vous protéger vous et " +"les autres utilisateurs, nous avons réinitialisé votre \n" " mot de passe par mesure de sécurité et vous ne serez pourrez plus vous " "connecter ou publier sur PyPI avec votre mot de passe\n" " existant." @@ -1346,24 +1327,25 @@ msgid "" " risk of <a href=\"%(href)s\">credential stuffing</a>\n" " attacks against PyPI and its users." msgstr "" -"PyPI n'a pas subi de violation. Il s'agit d'une mesure de protection pour " -"réduire le\n" +"PyPI n'a pas subi de violation. Il s'agit d'une mesure de protection pour" +" réduire le\n" " risque d'attaque <a href=\"%(href)s\">au vol d'identifiants</a>\n" " envers PyPI et ses utilisateurs." #: warehouse/templates/email/password-compromised-hibp/body.html:34 #, python-format msgid "" -"To regain access to your account, <a href=\"%(reset_pw_url)s\">reset your " -"password</a> on PyPI. We also recommend that you go to <a href=" -"\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> and check your other " -"passwords and get yourself familiar with good password practices." +"To regain access to your account, <a href=\"%(reset_pw_url)s\">reset your" +" password</a> on PyPI. We also recommend that you go to <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> and check your " +"other passwords and get yourself familiar with good password practices." msgstr "" -"Pour récupérer l'accès à votre compte, veuillez <a href=\"%(reset_pw_url)s" -"\">réinitialiser votre mot de passe</a> sur PyPI. Nous vous recommandons " -"également de vous rendre sur <a href=\"%(have_i_been_pwned_url)s" -"\">HaveIBeenPwned</a> afin de vérifier vos autres mots de passe et vous " -"rendre plus familier avec les bonnes pratiques pour un bon mot de passe." +"Pour récupérer l'accès à votre compte, veuillez <a " +"href=\"%(reset_pw_url)s\">réinitialiser votre mot de passe</a> sur PyPI. " +"Nous vous recommandons également de vous rendre sur <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> afin de vérifier " +"vos autres mots de passe et vous rendre plus familier avec les bonnes " +"pratiques pour un bon mot de passe." #: warehouse/templates/email/password-compromised-hibp/body.html:40 msgid "How do you know this?" @@ -1372,30 +1354,32 @@ msgstr "Comment le savez-vous ?" #: warehouse/templates/email/password-compromised-hibp/body.html:42 #, python-format msgid "" -"We use a free security service from <a href=\"%(have_i_been_pwned_url)s" -"\">HaveIBeenPwned</a>. When registering, authenticating, or updating your " -"password, we generate a SHA1 hash of your password and use the first 5 " -"characters of the hash to decide if the password is compromised. The " -"plaintext password is never stored by PyPI or sent to HaveIBeenPwned." +"We use a free security service from <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>. When registering, " +"authenticating, or updating your password, we generate a SHA1 hash of " +"your password and use the first 5 characters of the hash to decide if the" +" password is compromised. The plaintext password is never stored by PyPI " +"or sent to HaveIBeenPwned." msgstr "" -"Nous utilisons un service de sécurité gratuit de <a href=" -"\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>. Lors de l'inscription, " -"l'authentification ou la mise à jour de votre mot de passe, nous générons un " -"hachage SHA1 de votre mot de passe et nous utilisons les 5 premiers " -"caractères de ce hachage pour décider si le mot de passe est compromis ou " -"non. Le mot de passe brut n'est jamais stocké par PyPI ou envoyé à " -"HaveIBeenPwned." +"Nous utilisons un service de sécurité gratuit de <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>. Lors de " +"l'inscription, l'authentification ou la mise à jour de votre mot de " +"passe, nous générons un hachage SHA1 de votre mot de passe et nous " +"utilisons les 5 premiers caractères de ce hachage pour décider si le mot " +"de passe est compromis ou non. Le mot de passe brut n'est jamais stocké " +"par PyPI ou envoyé à HaveIBeenPwned." #: warehouse/templates/email/password-compromised-hibp/body.html:47 #, python-format msgid "" -"For more information, see our <a href=\"%(faq_url)s\">FAQ</a>. For help, you " -"can email <a href=\"%(email_href)s\">%(email_address)s</a> to communicate " -"with the PyPI administrators." +"For more information, see our <a href=\"%(faq_url)s\">FAQ</a>. For help, " +"you can email <a href=\"%(email_href)s\">%(email_address)s</a> to " +"communicate with the PyPI administrators." msgstr "" -"Pour plus d'informations, consultez notre <a href=\"%(faq_url)s\">FAQ</a>. " -"Pour obtenir de l'aide, vous pouvez écrire à <a href=\"%(email_href)s\">" -"%(email_address)s</a> pour communiquer avec les administrateurs de PyPI." +"Pour plus d'informations, consultez notre <a " +"href=\"%(faq_url)s\">FAQ</a>. Pour obtenir de l'aide, vous pouvez écrire " +"à <a href=\"%(email_href)s\">%(email_address)s</a> pour communiquer avec " +"les administrateurs de PyPI." #: warehouse/templates/email/password-reset/body.html:18 #, python-format @@ -1403,8 +1387,8 @@ msgid "" "Someone, perhaps you, has made a password reset request for your PyPI " "account '%(username)s'." msgstr "" -"Quelqu'un, peut-être vous, a fait une demande de réinitialisation de mot de " -"passe pour votre comte PyPO « %(username)s »." +"Quelqu'un, peut-être vous, a fait une demande de réinitialisation de mot " +"de passe pour votre comte PyPO « %(username)s »." #: warehouse/templates/email/password-reset/body.html:20 #, python-format @@ -1433,12 +1417,13 @@ msgstr "" #: warehouse/templates/email/primary-email-change/body.html:18 #, python-format msgid "" -"The primary email for your PyPI account <strong>%(username)s</strong> has " -"been changed from <code>%(old_email)s</code> to <code>%(new_email)s</code>" +"The primary email for your PyPI account <strong>%(username)s</strong> has" +" been changed from <code>%(old_email)s</code> to " +"<code>%(new_email)s</code>" msgstr "" -"L'adresse e-mail principale de votre compte PyPI <strong>%(username)s</" -"strong> a été modifié de <code>%(old_email)s</code> à <code>%(new_email)s</" -"code>" +"L'adresse e-mail principale de votre compte PyPI " +"<strong>%(username)s</strong> a été modifié de <code>%(old_email)s</code>" +" à <code>%(new_email)s</code>" #: warehouse/templates/email/two-factor-added/body.html:18 #, python-format @@ -1446,8 +1431,8 @@ msgid "" "Someone, perhaps you, has added a %(method)s two-factor authentication " "method to your PyPI account <strong>%(username)s</strong>." msgstr "" -"Quelqu'un, peut-être vous, à ajouté une méthode d'authentification à deux " -"facteurs (%(method)s) à votre compte PyPI <strong>%(username)s</strong>." +"Quelqu'un, peut-être vous, à ajouté une méthode d'authentification à deux" +" facteurs (%(method)s) à votre compte PyPI <strong>%(username)s</strong>." #: warehouse/templates/email/two-factor-removed/body.html:18 #, python-format @@ -1455,26 +1440,27 @@ msgid "" "Someone, perhaps you, has removed a %(method)s two-factor authentication " "method from your PyPI account <strong>%(username)s</strong>." msgstr "" -"Quelqu'un, peut-être vous, à supprimé une méthode d'authentification à deux " -"facteurs (%(method)s) de votre compte PyPI <strong>%(username)s</strong>." +"Quelqu'un, peut-être vous, à supprimé une méthode d'authentification à " +"deux facteurs (%(method)s) de votre compte PyPI " +"<strong>%(username)s</strong>." #: warehouse/templates/email/verify-email/body.html:18 #, python-format msgid "" -"Someone, perhaps you, has added this email address (<code>%(email_address)s</" -"code>) to their PyPI account." +"Someone, perhaps you, has added this email address " +"(<code>%(email_address)s</code>) to their PyPI account." msgstr "" -"Quelqu'un, peut-être vous, a ajouté cette adresse e-mail (<code>" -"%(email_address)s</code>) à son compte PyPI." +"Quelqu'un, peut-être vous, a ajouté cette adresse e-mail " +"(<code>%(email_address)s</code>) à son compte PyPI." #: warehouse/templates/email/verify-email/body.html:20 #, python-format msgid "" -"If you wish to proceed with this request, <a href=\"%(href)s\">click this " -"link to verify your email address</a>." +"If you wish to proceed with this request, <a href=\"%(href)s\">click this" +" link to verify your email address</a>." msgstr "" -"Si vous souhaiter procéder à cette demande, <a href=\"%(href)s\">cliquez ici " -"pour vérifier l'adresse e-mail</a>." +"Si vous souhaiter procéder à cette demande, <a href=\"%(href)s\">cliquez " +"ici pour vérifier l'adresse e-mail</a>." #: warehouse/templates/includes/current-user-indicator.html:29 msgid "Admin" @@ -1535,11 +1521,11 @@ msgstr "Succès" #: warehouse/templates/includes/hash-modal.html:23 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Hashes</a> for %(filename)s" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Hashes</a> for %(filename)s" msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Hachages</a> pour %(filename)s" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Hachages</a> pour %(filename)s" #: warehouse/templates/includes/hash-modal.html:28 #, python-format @@ -1592,8 +1578,7 @@ msgstr "Suivant" #: warehouse/templates/includes/session-notifications.html:23 #, python-format msgid "Your primary email address (%(email_address)s) is unverified." -msgstr "" -"Votre adresse e-mail principale (%(email_address)s) n'est pas vérifiée." +msgstr "Votre adresse e-mail principale (%(email_address)s) n'est pas vérifiée." #: warehouse/templates/includes/session-notifications.html:25 msgid "You do not have a primary email address." @@ -1606,11 +1591,11 @@ msgstr "Vérifiez votre adresse e-mail ou ajoutez une nouvelle adresse." #: warehouse/templates/includes/session-notifications.html:37 #, python-format msgid "" -"Two factor authentication is available, <a href=\"%(href)s\">enable it now " -"for your account.</a>" +"Two factor authentication is available, <a href=\"%(href)s\">enable it " +"now for your account.</a>" msgstr "" -"L'authentification à deux facteurs est disponible, <a href=\"%(href)s" -"\">l'activer maintenant pour votre compte.</a>" +"L'authentification à deux facteurs est disponible, <a " +"href=\"%(href)s\">l'activer maintenant pour votre compte.</a>" #: warehouse/templates/includes/accounts/profile-actions.html:16 msgid "Edit profile" @@ -1627,40 +1612,43 @@ msgstr "Statistiques" #: warehouse/templates/includes/accounts/profile-actions.html:21 #, python-format msgid "" -"View statistics for your projects via <a href=\"%(libs_io_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or by " -"using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our public " -"dataset on Google BigQuery</a>" +"View statistics for your projects via <a href=\"%(libs_io_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, " +"or by using <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">our public dataset on Google BigQuery</a>" msgstr "" -"Consultez les statistiques pour vos projets via <a href=\"%(libs_io_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Librairies.io</a>, ou " -"bien en utilisant <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener" -"\">notre ensemble de données publiques sur Google BigQuery</a>" +"Consultez les statistiques pour vos projets via <a " +"href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Librairies.io</a>, ou bien en utilisant <a " +"href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">notre ensemble " +"de données publiques sur Google BigQuery</a>" #: warehouse/templates/includes/accounts/profile-actions.html:30 #, python-format msgid "" -"View statistics for %(username)s's projects via <a href=\"%(libs_io_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or " -"by using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our " -"public dataset on Google BigQuery</a>" -msgstr "" -"Consultez les statistiques pour les projets de %(username)s via <a href=" -"\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Librairies.io</a>, ou bien en utilisant <a href=\"%(gbq_href)s\" target=" -"\"_blank\" rel=\"noopener\">notre ensemble de données publiques sur Google " +"View statistics for %(username)s's projects via <a " +"href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io</a>, or by using <a href=\"%(gbq_href)s\" " +"target=\"_blank\" rel=\"noopener\">our public dataset on Google " "BigQuery</a>" +msgstr "" +"Consultez les statistiques pour les projets de %(username)s via <a " +"href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Librairies.io</a>, ou bien en utilisant <a " +"href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">notre ensemble " +"de données publiques sur Google BigQuery</a>" #: warehouse/templates/includes/accounts/profile-callout.html:18 #, python-format msgid "" "You have not uploaded any projects to PyPI, yet. To learn how to get " -"started, visit the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">Python Packaging User Guide</a>" +"started, visit the <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" "Vous n'avez pas encore publié de projet sur PyPI. Pour savoir comment " -"commencer, consultez le <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Guide Utilisateur de l'Empaquetage Python</a>" +"commencer, consultez le <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Guide Utilisateur de l'Empaquetage " +"Python</a>" #: warehouse/templates/includes/accounts/profile-callout.html:23 #, python-format @@ -1727,15 +1715,16 @@ msgstr "Issues ouvertes / PR :" #: warehouse/templates/includes/packaging/project-data.html:66 #, python-format msgid "" -"View statistics for this project via <a href=\"%(libs_io_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or by " -"using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our public " -"dataset on Google BigQuery</a>" +"View statistics for this project via <a href=\"%(libs_io_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, " +"or by using <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">our public dataset on Google BigQuery</a>" msgstr "" -"Consultez les statistiques pour ce projet via <a href=\"%(libs_io_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Librairies.io</a>, ou " -"bien en utilisant <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener" -"\">notre ensemble de données publiques sur Google BigQuery</a>" +"Consultez les statistiques pour ce projet via <a " +"href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Librairies.io</a>, ou bien en utilisant <a " +"href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">notre ensemble " +"de données publiques sur Google BigQuery</a>" #: warehouse/templates/includes/packaging/project-data.html:74 msgid "Meta" @@ -1858,19 +1847,19 @@ msgstr "Supprimer l'e-mail" #: warehouse/templates/manage/account.html:138 msgid "" -"Add <abbr title=\"two factor authentication\">2FA</abbr> with authentication " -"application" +"Add <abbr title=\"two factor authentication\">2FA</abbr> with " +"authentication application" msgstr "" -"Ajouter l'<abbr title=\"Authentification à Deux Facteurs\">A2F</abbr> avec " -"une application d'authentification" +"Ajouter l'<abbr title=\"Authentification à Deux Facteurs\">A2F</abbr> " +"avec une application d'authentification" #: warehouse/templates/manage/account.html:140 msgid "" "Add <abbr title=\"two factor authentication\">2FA</abbr> with security " "device (e.g. USB key)" msgstr "" -"Ajouter l'<abbr title=\"Authentification à Deux Facteurs\">A2F</abbr> avec " -"un périphérique de sécurité (ex : clé USB)" +"Ajouter l'<abbr title=\"Authentification à Deux Facteurs\">A2F</abbr> " +"avec un périphérique de sécurité (ex : clé USB)" #: warehouse/templates/manage/account.html:142 msgid "Generate Recovery Codes" @@ -1879,23 +1868,24 @@ msgstr "Générer des codes de récupération" #: warehouse/templates/manage/account.html:147 #: warehouse/templates/manage/account/webauthn-provision.html:37 msgid "" -"Enable JavaScript to set up two factor authentication with a security device " -"(e.g. USB key)" +"Enable JavaScript to set up two factor authentication with a security " +"device (e.g. USB key)" msgstr "" -"Activez JavaScript pour activer l'authentification à deux facteurs avec un " -"périphérique de sécurité (ex : clé USB)" +"Activez JavaScript pour activer l'authentification à deux facteurs avec " +"un périphérique de sécurité (ex : clé USB)" #: warehouse/templates/manage/account.html:152 #: warehouse/templates/manage/account/webauthn-provision.html:53 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Upgrade your browser</a> to set up two factor authentication with a " -"security device (e.g. USB key)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Upgrade your browser</a> to set up two factor " +"authentication with a security device (e.g. USB key)" msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Mettez à jour votre navigateur</a> pour définir l'authentification à deux " -"facteurs avec un appareil de sécurité (ex : clé USB)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Mettez à jour votre navigateur</a> pour définir " +"l'authentification à deux facteurs avec un appareil de sécurité (ex : clé" +" USB)" #: warehouse/templates/manage/account.html:166 #: warehouse/templates/manage/account.html:528 @@ -1944,7 +1934,8 @@ msgstr "Supprimer le jeton d'API" #: warehouse/templates/manage/account.html:216 #: warehouse/templates/manage/token.html:59 msgid "" -"Applications or scripts using this token will no longer have access to PyPI." +"Applications or scripts using this token will no longer have access to " +"PyPI." msgstr "" "Les applications ou les scripts utilisant ce jeton n'auront plus accès à " "PyPI." @@ -1961,12 +1952,12 @@ msgstr "Photo de profil" #: warehouse/templates/manage/account.html:250 #, python-format msgid "" -"We use <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">gravatar.com</a> to generate your profile picture based on your " -"primary email address" +"We use <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">gravatar.com</a> to generate your profile picture based " +"on your primary email address" msgstr "" -"Nous utilisons <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">gravatar.com</a> pour générer votre photo de profil à " +"Nous utilisons <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\"" +" rel=\"noopener\">gravatar.com</a> pour générer votre photo de profil à " "partir de votre adresse e-mail principale" #: warehouse/templates/manage/account.html:257 @@ -1984,10 +1975,11 @@ msgstr "Date d'inscription" #: warehouse/templates/manage/account.html:279 #, python-format msgid "" -"Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be changed." +"Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be " +"changed." msgstr "" -"Affiché sur votre <a href=\"%(href)s\">profil public</a>. Ne peut pas être " -"modifié." +"Affiché sur votre <a href=\"%(href)s\">profil public</a>. Ne peut pas " +"être modifié." #: warehouse/templates/manage/account.html:290 msgid "Full name" @@ -2009,11 +2001,12 @@ msgstr "E-mail public" #: warehouse/templates/manage/account.html:319 #, python-format msgid "" -"One of your verified emails can be displayed on your <a href=\"%(href)s" -"\">public profile</a> to logged-in users." +"One of your verified emails can be displayed on your <a " +"href=\"%(href)s\">public profile</a> to logged-in users." msgstr "" -"L'une de vos adresses e-mail vérifiées peut être affichée sur votre <a href=" -"\"%(href)s\">profil public</a>, visible par les utilisateurs connectés." +"L'une de vos adresses e-mail vérifiées peut être affichée sur votre <a " +"href=\"%(href)s\">profil public</a>, visible par les utilisateurs " +"connectés." #: warehouse/templates/manage/account.html:324 msgid "Update account" @@ -2025,16 +2018,18 @@ msgstr "E-mails du compte" #: warehouse/templates/manage/account.html:334 msgid "" -"You can associate several emails with your account. You can use any <span " -"class=\"badge badge--success\"><i class=\"fa fa-check\" aria-hidden=\"true" -"\"></i> Verified</span> email to recover your account, but only your <span " -"class=\"badge\">Primary</span> email will receive notifications." +"You can associate several emails with your account. You can use any <span" +" class=\"badge badge--success\"><i class=\"fa fa-check\" aria-" +"hidden=\"true\"></i> Verified</span> email to recover your account, but " +"only your <span class=\"badge\">Primary</span> email will receive " +"notifications." msgstr "" "Vous pouvez associer plusieurs e-mails avec votre compte. Vous pouvez " -"utiliser n'importe quelle adresse e-mail <span class=\"badge badge--success" -"\"><i class=\"fa fa-check\" aria-hidden=\"true\">vérifiée</i></span> pour " -"récupérer votre compte, mais seule votre adresse e-mail <span class=\"badge" -"\">principale</span> recevra des notifications." +"utiliser n'importe quelle adresse e-mail <span class=\"badge badge--" +"success\"><i class=\"fa fa-check\" aria-" +"hidden=\"true\">vérifiée</i></span> pour récupérer votre compte, mais " +"seule votre adresse e-mail <span class=\"badge\">principale</span> " +"recevra des notifications." #: warehouse/templates/manage/account.html:345 msgid "Emails associated with your account" @@ -2095,11 +2090,11 @@ msgstr "Méthode d'authentification à deux facteurs" #: warehouse/templates/manage/account.html:460 #: warehouse/templates/manage/account.html:570 msgid "" -"Authentication application (<abbr title=\"time-based one-time password" -"\">TOTP</abbr>)" +"Authentication application (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>)" msgstr "" -"Application d'authentification (<abbr title=\"Time-based One-Time Password" -"\">TOTP</abbr>)" +"Application d'authentification (<abbr title=\"Time-based One-Time " +"Password\">TOTP</abbr>)" #: warehouse/templates/manage/account.html:462 #: warehouse/templates/manage/account.html:476 @@ -2119,7 +2114,8 @@ msgstr "Supprimer l'application" #: warehouse/templates/manage/account.html:568 msgid "Security device (<abbr title=\"web authentication\">WebAuthn</abbr>)" msgstr "" -"Périphérique de sécurité (<abbr title=\"Web Authentication\">WebAuthn</abbr>)" +"Périphérique de sécurité (<abbr title=\"Web " +"Authentication\">WebAuthn</abbr>)" #: warehouse/templates/manage/account.html:477 msgid "Remove two factor security device" @@ -2152,13 +2148,14 @@ msgstr "Régénérer des codes de récupération" #: warehouse/templates/manage/account.html:507 msgid "You have not enabled two factor authentication on your account." msgstr "" -"Vous n'avez pas activé l'authentification à deux facteurs pour votre compte." +"Vous n'avez pas activé l'authentification à deux facteurs pour votre " +"compte." #: warehouse/templates/manage/account.html:512 #, python-format msgid "" -"<a href=\"%(href)s\">Verify your primary email address</a> to add two factor " -"authentication to your account." +"<a href=\"%(href)s\">Verify your primary email address</a> to add two " +"factor authentication to your account." msgstr "" "<a href=\"%(href)s\">Vérifiez votre adresse e-mail principale</a> pour " "ajouter l'authentification à deux facteurs à votre compte." @@ -2174,8 +2171,8 @@ msgid "" "API tokens provide an alternative way to authenticate when uploading " "packages to PyPI." msgstr "" -"Les jetons d'API fournissent une alternative d'authentification lors de la " -"publication de paquets sur PyPI." +"Les jetons d'API fournissent une alternative d'authentification lors de " +"la publication de paquets sur PyPI." #: warehouse/templates/manage/account.html:520 msgid "Learn more about API tokens" @@ -2193,8 +2190,8 @@ msgstr "Ajouter un jeton d'API" #: warehouse/templates/manage/account.html:544 #, python-format msgid "" -"<a href=\"%(href)s\">Verify your primary email address</a> to add API tokens " -"to your account." +"<a href=\"%(href)s\">Verify your primary email address</a> to add API " +"tokens to your account." msgstr "" "<a href=\"%(href)s\">Vérifiez votre adresse e-mail principale</a> pour " "ajouter des jetons d'API à votre compte." @@ -2272,10 +2269,11 @@ msgstr "Authentification à deux facteurs ajoutée" #: warehouse/templates/manage/account.html:613 #: warehouse/templates/manage/account.html:623 msgid "" -"Method: Security device (<abbr title=\"web authentication\">WebAuthn</abbr>)" +"Method: Security device (<abbr title=\"web " +"authentication\">WebAuthn</abbr>)" msgstr "" -"Méthode : Périphérique de sécurité (<abbr title=\"Web Authentication" -"\">WebAuthn</abbr>)" +"Méthode : Périphérique de sécurité (<abbr title=\"Web " +"Authentication\">WebAuthn</abbr>)" #: warehouse/templates/manage/account.html:614 #: warehouse/templates/manage/account.html:624 @@ -2288,8 +2286,8 @@ msgid "" "Method: Authentication application (<abbr title=\"time-based one-time " "password\">TOTP</abbr>)" msgstr "" -"Méthode : Application d'authentification (<abbr title=\"Time-based One-Time " -"Password\">TOTP</abbr>)" +"Méthode : Application d'authentification (<abbr title=\"Time-based One-" +"Time Password\">TOTP</abbr>)" #: warehouse/templates/manage/account.html:620 msgid "Two factor authentication removed" @@ -2339,8 +2337,8 @@ msgstr "Identifiant unique :" #: warehouse/templates/manage/account.html:662 msgid "Events appear here as security-related actions occur on your account." msgstr "" -"Les événements apparaissent ici comme des occurrences des actions liées à la " -"sécurité sur votre compte." +"Les événements apparaissent ici comme des occurrences des actions liées à" +" la sécurité sur votre compte." #: warehouse/templates/manage/account.html:664 msgid "Recent account activity" @@ -2366,11 +2364,10 @@ msgid "IP address" msgstr "Adresse IP" #: warehouse/templates/manage/account.html:687 -msgid "" -"Events will appear here as security-related actions occur on your account." +msgid "Events will appear here as security-related actions occur on your account." msgstr "" -"Les événements apparaîtront ici comme des occurrences des actions liées à la " -"sécurité sur votre compte." +"Les événements apparaîtront ici comme des occurrences des actions liées à" +" la sécurité sur votre compte." #: warehouse/templates/manage/account.html:694 msgid "Delete account" @@ -2394,45 +2391,45 @@ msgid_plural "" " " msgstr[0] "" "\n" -" Votre compte est actuellement <strong>l'unique propriétaire</" -"strong> de %(count)s projet.\n" +" Votre compte est actuellement <strong>l'unique " +"propriétaire</strong> de %(count)s projet.\n" " " msgstr[1] "" "\n" -" Votre compte est actuellement <strong>l'unique propriétaire</" -"strong> de %(count)s projets.\n" +" Votre compte est actuellement <strong>l'unique " +"propriétaire</strong> de %(count)s projets.\n" " " #: warehouse/templates/manage/account.html:704 msgid "" "\n" -" You must transfer ownership or delete this project before you can " -"delete your account.\n" +" You must transfer ownership or delete this project before you " +"can delete your account.\n" " " msgid_plural "" "\n" -" You must transfer ownership or delete these projects before you " -"can delete your account.\n" +" You must transfer ownership or delete these projects before you" +" can delete your account.\n" " " msgstr[0] "" "\n" -" Vous devez transférer la propriété ou supprimer ce projet avant de " -"pouvoir supprimer votre compte.\n" +" Vous devez transférer la propriété ou supprimer ce projet avant" +" de pouvoir supprimer votre compte.\n" " " msgstr[1] "" "\n" -" Vous devez transférer la propriété ou supprimer ces projets avant " -"de pouvoir supprimer votre compte.\n" +" Vous devez transférer la propriété ou supprimer ces projets " +"avant de pouvoir supprimer votre compte.\n" " " #: warehouse/templates/manage/account.html:714 #, python-format msgid "" -"<a href=\"%(transfer_href)s\">transfer ownership</a> or <a href=" -"\"%(delete_href)s\">delete project</a>" +"<a href=\"%(transfer_href)s\">transfer ownership</a> or <a " +"href=\"%(delete_href)s\">delete project</a>" msgstr "" -"<a href=\"%(transfer_href)s\">transférer la propriété</a> ou <a href=" -"\"%(delete_href)s\">supprimer le projet</a>" +"<a href=\"%(transfer_href)s\">transférer la propriété</a> ou <a " +"href=\"%(delete_href)s\">supprimer le projet</a>" #: warehouse/templates/manage/account.html:723 #: warehouse/templates/manage/token.html:162 @@ -2442,7 +2439,8 @@ msgstr "Procédez avec précaution !" #: warehouse/templates/manage/account.html:726 msgid "You will not be able to recover your account after you delete it" msgstr "" -"Vous ne serez pas en mesure de récupérer votre compte après l'avoir supprimé" +"Vous ne serez pas en mesure de récupérer votre compte après l'avoir " +"supprimé" #: warehouse/templates/manage/account.html:728 msgid "Delete your PyPI account" @@ -2460,13 +2458,14 @@ msgstr "Détruire la documentation" #: warehouse/templates/manage/documentation.html:28 #, python-format msgid "" -"If you would like to DESTROY any existing documentation hosted at <a href=" -"\"%(url)s\">%(url)s</a> there is <strong>no</strong> undo, as uploading new " -"documentation is no longer supported." +"If you would like to DESTROY any existing documentation hosted at <a " +"href=\"%(url)s\">%(url)s</a> there is <strong>no</strong> undo, as " +"uploading new documentation is no longer supported." msgstr "" -"Si vous souhaitez DÉTRUIRE toute documentation hébergée sur <a href=\"%(url)s" -"\">%(url)s</a> il n'y a <strong>pas</strong> d'annulation possible, depuis " -"que la publication d'une nouvelle documentation n'est plus pris en charge." +"Si vous souhaitez DÉTRUIRE toute documentation hébergée sur <a " +"href=\"%(url)s\">%(url)s</a> il n'y a <strong>pas</strong> d'annulation " +"possible, depuis que la publication d'une nouvelle documentation n'est " +"plus pris en charge." #: warehouse/templates/manage/documentation.html:35 msgid "Destroy Documentation for project" @@ -2493,11 +2492,11 @@ msgstr "Historique du projet « %(project_name)s »" #: warehouse/templates/manage/history.html:25 msgid "" -"Each time you (or your collaborators) perform a security action related to " -"this project, the action is recorded and displayed here." +"Each time you (or your collaborators) perform a security action related " +"to this project, the action is recorded and displayed here." msgstr "" -"Chaque fois que vous (ou vos collaborateurs) effectue une action de sécurité " -"liée à ce projet, l'action est enregistrée et affichée ici." +"Chaque fois que vous (ou vos collaborateurs) effectue une action de " +"sécurité liée à ce projet, l'action est enregistrée et affichée ici." #: warehouse/templates/manage/history.html:29 msgid "Project created" @@ -2542,21 +2541,22 @@ msgstr "Nom du fichier :" #, python-format msgid "<a href=\"%(href)s\">%(username)s</a> added as project %(role_name)s" msgstr "" -"<a href=\"%(href)s\">%(username)s</a> a été ajouté en tant que %(role_name)s " -"de projet" +"<a href=\"%(href)s\">%(username)s</a> a été ajouté en tant que " +"%(role_name)s de projet" #: warehouse/templates/manage/history.html:55 #, python-format msgid "<a href=\"%(href)s\">%(username)s</a> removed as project %(role_name)s" msgstr "" -"<a href=\"%(href)s\">%(username)s</a> n'est plus %(role_name)s pour le projet" +"<a href=\"%(href)s\">%(username)s</a> n'est plus %(role_name)s pour le " +"projet" #: warehouse/templates/manage/history.html:60 #, python-format msgid "<a href=\"%(href)s\">%(username)s</a> changed to project %(role_name)s" msgstr "" -"<a href=\"%(href)s\">%(username)s</a> a été promu en tant que %(role_name)s " -"du projet" +"<a href=\"%(href)s\">%(username)s</a> a été promu en tant que " +"%(role_name)s du projet" #: warehouse/templates/manage/history.html:62 msgid "Changed by:" @@ -2597,11 +2597,11 @@ msgstr "" #: warehouse/templates/manage/journal.html:28 #, python-format msgid "" -"This feature will be deprecated in the future, replaced by the <a href=" -"\"%(href)s\">security history page</a>." +"This feature will be deprecated in the future, replaced by the <a " +"href=\"%(href)s\">security history page</a>." msgstr "" -"Cette fonctionnalité sera dépréciée à l'avenir, remplacée par la <a href=" -"\"%(href)s\">page de l'historique de sécurité</a>." +"Cette fonctionnalité sera dépréciée à l'avenir, remplacée par la <a " +"href=\"%(href)s\">page de l'historique de sécurité</a>." #: warehouse/templates/manage/journal.html:32 #, python-format @@ -2727,12 +2727,12 @@ msgstr "Voir" #, python-format msgid "" "You have not uploaded any projects to PyPI, yet. To learn how to get " -"started, visit the <a href=\"%(href)s\" target=\"_blank\" rel=\"noopener" -"\">Python Packaging User Guide</a>" +"started, visit the <a href=\"%(href)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" "Vous n'avez pas encore publié de projet sur PyPI. Pour savoir comment " -"commencer, consultez le <a href=\"%(href)s\" target=\"_blank\" rel=\"noopener" -"\">Guide Utilisateur de l'Empaquetage Python</a>" +"commencer, consultez le <a href=\"%(href)s\" target=\"_blank\" " +"rel=\"noopener\">Guide Utilisateur de l'Empaquetage Python</a>" #: warehouse/templates/manage/release.html:18 #, python-format @@ -2836,12 +2836,12 @@ msgstr "Masquer" #: warehouse/templates/manage/release.html:119 #, python-format msgid "" -"Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" +"Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" -"Découvrez comment publier des fichiers dans le <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Guide Utilisateur de " -"l'Empaquetage Python</a>" +"Découvrez comment publier des fichiers dans le <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Guide Utilisateur " +"de l'Empaquetage Python</a>" #: warehouse/templates/manage/release.html:122 msgid "Release settings" @@ -2856,43 +2856,42 @@ msgstr "Supprimer la version" #, python-format msgid "" "\n" -" Deleting will irreversibly delete this release along with %(count)s " -"file.\n" +" Deleting will irreversibly delete this release along with " +"%(count)s file.\n" " " msgid_plural "" "\n" -" Deleting will irreversibly delete this release along with %(count)s " -"files.\n" +" Deleting will irreversibly delete this release along with " +"%(count)s files.\n" " " msgstr[0] "" "\n" -" La suppression entraînera la suppression irréversible de %(count)s " -"fichier.\n" +" La suppression entraînera la suppression irréversible de " +"%(count)s fichier.\n" " " msgstr[1] "" "\n" -" La suppression entraînera la suppression irréversible de %(count)s " -"fichiers.\n" +" La suppression entraînera la suppression irréversible de " +"%(count)s fichiers.\n" " " #: warehouse/templates/manage/release.html:135 msgid "Deleting will irreversibly delete this release." -msgstr "" -"La suppression entraînera la suppression irréversible de cette version." +msgstr "La suppression entraînera la suppression irréversible de cette version." #: warehouse/templates/manage/release.html:137 #: warehouse/templates/manage/releases.html:91 #, python-format msgid "" -"You will not be able to re-upload a new distribution of the same type with " -"the same version number. Consider making a new release or a <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">post " -"release</a> instead." +"You will not be able to re-upload a new distribution of the same type " +"with the same version number. Consider making a new release or a <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">post release</a> instead." msgstr "" -"Vous ne serez pas en mesure de republier une nouvelle distribution du même " -"type avec le même numéro de version. Considérez faire une nouvelle version " -"ou plutôt une <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">post-version</a>." +"Vous ne serez pas en mesure de republier une nouvelle distribution du " +"même type avec le même numéro de version. Considérez faire une nouvelle " +"version ou plutôt une <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">post-version</a>." #: warehouse/templates/manage/release.html:142 #: warehouse/templates/manage/releases.html:27 @@ -2974,13 +2973,13 @@ msgstr "Aucune version trouvée" #: warehouse/templates/manage/releases.html:109 #, python-format msgid "" -"Learn how to create a new release on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>" +"Learn how to create a new release on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" msgstr "" -"Découvrez comment créer une nouvelle version dans le <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Guide Utilisateur de " -"l'Empaquetage Python</a>" +"Découvrez comment créer une nouvelle version dans le <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Guide Utilisateur" +" de l'Empaquetage Python</a>" #: warehouse/templates/manage/roles.html:18 #, python-format @@ -2993,8 +2992,8 @@ msgid "" "Use this page to control which PyPI users can help you to manage " "%(project_name)s" msgstr "" -"Utilisez cette page pour contrôler quels utilisateurs de PyPI peuvent vous " -"aider à gérer %(project_name)s" +"Utilisez cette page pour contrôler quels utilisateurs de PyPI peuvent " +"vous aider à gérer %(project_name)s" #: warehouse/templates/manage/roles.html:25 #: warehouse/templates/pages/help.html:509 @@ -3010,8 +3009,8 @@ msgstr "Mainteneur" #: warehouse/templates/manage/roles.html:28 #: warehouse/templates/pages/help.html:510 msgid "" -"Can upload releases for a package. Cannot add collaborators. Cannot delete " -"files, releases, or the project." +"Can upload releases for a package. Cannot add collaborators. Cannot " +"delete files, releases, or the project." msgstr "" "Peut publier des versions pour un paquet. Ne peut pas ajouter de " "collaborateurs. Ne peut pas supprimer de fichiers, versions ou le projet." @@ -3095,27 +3094,30 @@ msgstr "Description du projet et barre latérale" #: warehouse/templates/manage/settings.html:43 #, python-format msgid "" -"To set the '%(project_name)s' description, author, links, classifiers, and " -"other details for your next release, use the <a href=\"%(setup_args_href)s\" " -"rel=\"noopener\" target=\"_blank\"><code>setup()</code> arguments in your " -"<code>setup.py</code> file</a>. Updating these fields will not change the " -"metadata for past releases. Additionally, you <strong>must</strong> use <a " -"href=\"%(twine_docs_href)s\" rel=\"noopener\" target=\"_blank\">Twine</a> to " -"upload your files in order to get full support for these fields. See <a href=" -"\"%(distribution_href)s\" rel=\"noopener\" target=\"_blank\">the Python " -"Packaging User Guide</a> for more help." +"To set the '%(project_name)s' description, author, links, classifiers, " +"and other details for your next release, use the <a " +"href=\"%(setup_args_href)s\" rel=\"noopener\" " +"target=\"_blank\"><code>setup()</code> arguments in your " +"<code>setup.py</code> file</a>. Updating these fields will not change the" +" metadata for past releases. Additionally, you <strong>must</strong> use " +"<a href=\"%(twine_docs_href)s\" rel=\"noopener\" " +"target=\"_blank\">Twine</a> to upload your files in order to get full " +"support for these fields. See <a href=\"%(distribution_href)s\" " +"rel=\"noopener\" target=\"_blank\">the Python Packaging User Guide</a> " +"for more help." msgstr "" "Pour définir la description, l'auteur, les liens, les classificateurs et " -"d'autres de détails de « %(project_name)s » pour votre prochaine version, " -"utilisez les arguments de <a href=\"%(setup_args_href)s\" rel=\"noopener\" " -"target=\"_blank\"><code>setup()</code> dans votre fichier <code>setup.py</" -"code></a>. Mettre à jour ces champs ne modifiera pas les métadonnées des " -"versions passées. De plus, vous <strong>devez</strong> utiliser <a href=" -"\"%(twine_docs_href)s\" rel=\"noopener\" target=\"_blank\">Twine</a> pour " -"publier vos fichiers afin d'obtenir une prise en charge complète de ces " -"champs. Consultez le <a href=\"%(distribution_href)s\" rel=\"noopener\" " -"target=\"_blank\">Guide Utilisateur de l'Empaquetage Python</a> pour plus " -"d'aide." +"d'autres de détails de « %(project_name)s » pour votre prochaine version," +" utilisez les arguments de <a href=\"%(setup_args_href)s\" " +"rel=\"noopener\" target=\"_blank\"><code>setup()</code> dans votre " +"fichier <code>setup.py</code></a>. Mettre à jour ces champs ne modifiera " +"pas les métadonnées des versions passées. De plus, vous " +"<strong>devez</strong> utiliser <a href=\"%(twine_docs_href)s\" " +"rel=\"noopener\" target=\"_blank\">Twine</a> pour publier vos fichiers " +"afin d'obtenir une prise en charge complète de ces champs. Consultez le " +"<a href=\"%(distribution_href)s\" rel=\"noopener\" " +"target=\"_blank\">Guide Utilisateur de l'Empaquetage Python</a> pour plus" +" d'aide." #: warehouse/templates/manage/settings.html:54 #: warehouse/templates/manage/settings.html:85 @@ -3129,17 +3131,17 @@ msgstr "Supprimer ce projet va :" #: warehouse/templates/manage/settings.html:62 #, python-format msgid "" -"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s " -"release</a>" +"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s" +" release</a>" msgid_plural "" -"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s " -"releases</a>" +"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s" +" releases</a>" msgstr[0] "" -"Supprimer de façon irréversible le projet et <a href=\"%(href)s\">%(count)s " -"version</a>" +"Supprimer de façon irréversible le projet et <a " +"href=\"%(href)s\">%(count)s version</a>" msgstr[1] "" -"Supprimer de façon irréversible le projet et <a href=\"%(href)s\">%(count)s " -"versions</a>" +"Supprimer de façon irréversible le projet et <a " +"href=\"%(href)s\">%(count)s versions</a>" #: warehouse/templates/manage/settings.html:68 msgid "Irreversibly delete the project" @@ -3148,22 +3150,22 @@ msgstr "Supprimer irréversiblement le projet" #: warehouse/templates/manage/settings.html:72 msgid "Make the project name available to <strong>any other PyPI</strong> user" msgstr "" -"Rendre le nom du projet disponible à <strong>tout autre utilisateur de PyPI</" -"strong>" +"Rendre le nom du projet disponible à <strong>tout autre utilisateur de " +"PyPI</strong>" #: warehouse/templates/manage/settings.html:74 msgid "" -"This user will be able to make new releases under this project name, so long " -"as the distribution filenames do not match filenames from a previously " -"released distribution (all PyPI distribution filenames are unique, as they " -"are generated by combining the project name + version number + distribution " -"type)" +"This user will be able to make new releases under this project name, so " +"long as the distribution filenames do not match filenames from a " +"previously released distribution (all PyPI distribution filenames are " +"unique, as they are generated by combining the project name + version " +"number + distribution type)" msgstr "" -"Cet utilisateur pourra faire de nouvelles versions sous ce nom de projet, " -"tant que les noms de fichiers de distribution ne correspondent pas aux noms " -"de fichiers d'une distribution déjà publiée (tous les noms de fichiers de " -"distribution PyPI sont uniques, car ils sont générés en combinant le nom du " -"projet + numéro de version + type de distribution)" +"Cet utilisateur pourra faire de nouvelles versions sous ce nom de projet," +" tant que les noms de fichiers de distribution ne correspondent pas aux " +"noms de fichiers d'une distribution déjà publiée (tous les noms de " +"fichiers de distribution PyPI sont uniques, car ils sont générés en " +"combinant le nom du projet + numéro de version + type de distribution)" #: warehouse/templates/manage/settings.html:85 msgid "Project Name" @@ -3200,8 +3202,8 @@ msgstr "Projet « %(project)s »" #: warehouse/templates/manage/token.html:44 msgid "" -"For security reasons this token will only appear once. <strong>Copy it now.</" -"strong>" +"For security reasons this token will only appear once. <strong>Copy it " +"now.</strong>" msgstr "" "Pour des raisons de sécurité, ce jeton n'apparaîtra qu\"une seule fois. " "<strong>Copiez-le maintenant.</strong>" @@ -3230,21 +3232,22 @@ msgstr "Définissez votre nom d'utilisateur à <code>%(token)s</code>" #: warehouse/templates/manage/token.html:71 #, python-format msgid "" -"Set your password to the token value, including the <code>%(prefix)s</code> " -"prefix" +"Set your password to the token value, including the " +"<code>%(prefix)s</code> prefix" msgstr "" -"Définissez votre mot de passer à la valeur du jeton, en incluant le préfixe " -"<code>%(prefix)s-</code>" +"Définissez votre mot de passer à la valeur du jeton, en incluant le " +"préfixe <code>%(prefix)s-</code>" #: warehouse/templates/manage/token.html:77 #, python-format msgid "" -"For example, if you are using <a href=\"%(href)s\">Twine</a> to upload your " -"projects to PyPI, set up your <code>%(filename)s</code> file like this:" +"For example, if you are using <a href=\"%(href)s\">Twine</a> to upload " +"your projects to PyPI, set up your <code>%(filename)s</code> file like " +"this:" msgstr "" -"Par exemple, si vous utilisez <a href=\"%(href)s\">Twine</a> pour publier " -"vos projets sur PyPI, définissez votre fichier <code>%(filename)s</code> " -"comme ceci :" +"Par exemple, si vous utilisez <a href=\"%(href)s\">Twine</a> pour publier" +" vos projets sur PyPI, définissez votre fichier <code>%(filename)s</code>" +" comme ceci :" #: warehouse/templates/manage/token.html:87 #, python-format @@ -3253,17 +3256,17 @@ msgid "" "multiple projects to PyPI, you can set up your <code>%(filename)s</code> " "file like this:" msgstr "" -"Par exemple, si vous utilisez <a href=\"%(href)s\">Twine</a> pour publier de " -"multiples projets sur PyPI, vous pouvez définir votre fichier <code>" -"%(filename)s</code> comme ceci :" +"Par exemple, si vous utilisez <a href=\"%(href)s\">Twine</a> pour publier" +" de multiples projets sur PyPI, vous pouvez définir votre fichier " +"<code>%(filename)s</code> comme ceci :" #: warehouse/templates/manage/token.html:99 msgid "" -"either a user-scoped token or a project-scoped token you want to set as the " -"default" +"either a user-scoped token or a project-scoped token you want to set as " +"the default" msgstr "" -"soit un jeton à portée d'un utilisateur soit un jeton à portée d'un projet " -"que vous souhaitez définir comme par défaut" +"soit un jeton à portée d'un utilisateur soit un jeton à portée d'un " +"projet que vous souhaitez définir comme par défaut" #: warehouse/templates/manage/token.html:104 msgid "a project token" @@ -3281,11 +3284,11 @@ msgstr "" #: warehouse/templates/manage/token.html:112 #, python-format msgid "" -"For further instructions on how to use this token, <a href=\"%(href)s" -"\">visit the PyPI help page</a>." +"For further instructions on how to use this token, <a " +"href=\"%(href)s\">visit the PyPI help page</a>." msgstr "" -"Pour plus d'instructions sur la façon d'utiliser ce token, <a href=\"%(href)s" -"\">consultez la page d'aide de PyPI</a>." +"Pour plus d'instructions sur la façon d'utiliser ce token, <a " +"href=\"%(href)s\">consultez la page d'aide de PyPI</a>." #: warehouse/templates/manage/token.html:120 msgid "Add another token" @@ -3313,8 +3316,8 @@ msgstr "Projet :" #: warehouse/templates/manage/token.html:163 msgid "" -"An API token scoped to your entire account will have upload permissions for " -"all of your current and future projects." +"An API token scoped to your entire account will have upload permissions " +"for all of your current and future projects." msgstr "" "Un jeton d'API avec une portée sur l'ensemble de votre compte aura la " "permission de publier pour l'ensemble de vos projets actuels et futurs." @@ -3333,33 +3336,34 @@ msgstr "Régénérer des codes de récupération" #: warehouse/templates/manage/account/recovery_codes-provision.html:46 msgid "" -"If you lose access to your authentication application or security key(s), " -"you’ll need to use one of these recovery codes to log into your PyPI " +"If you lose access to your authentication application or security key(s)," +" you’ll need to use one of these recovery codes to log into your PyPI " "account. Each code can only be used <strong>once</strong>." msgstr "" -"Si vous perdez l'accès à votre application d'authentification ou votre/vos " -"clé(s) de sécurité, vous devrez utiliser l'un de ces codes pour vous " -"connecter à votre compte PyPI. Chaque code ne peut être utilisé " +"Si vous perdez l'accès à votre application d'authentification ou " +"votre/vos clé(s) de sécurité, vous devrez utiliser l'un de ces codes pour" +" vous connecter à votre compte PyPI. Chaque code ne peut être utilisé " "qu'<strong>une seule fois</strong>." #: warehouse/templates/manage/account/recovery_codes-provision.html:47 msgid "" -"These codes should <strong>only</strong> be used for account recovery, not " -"for typical logins." +"These codes should <strong>only</strong> be used for account recovery, " +"not for typical logins." msgstr "" -"Ces codes ne doivent être utilisés <strong>que</strong> pour la récupération " -"du compte, pas pour les connexions habituelles." +"Ces codes ne doivent être utilisés <strong>que</strong> pour la " +"récupération du compte, pas pour les connexions habituelles." #: warehouse/templates/manage/account/recovery_codes-provision.html:48 msgid "" -"<strong>Keep these somewhere safe</strong>. If you lose your authentication " -"application or security key(s) and do not have access to these recovery " -"codes, you may permanently lose access to your PyPI account!" +"<strong>Keep these somewhere safe</strong>. If you lose your " +"authentication application or security key(s) and do not have access to " +"these recovery codes, you may permanently lose access to your PyPI " +"account!" msgstr "" -"<strong>Conservez-les dans un endroit sûr</strong>. Si vous perdez l'accès à " -"votre application ou à votre/vos clé(s) de sécurité et n'avez plus accès à " -"ces codes de récupération, vous pourriez perdre définitivement l'accès à " -"votre compte PyPI !" +"<strong>Conservez-les dans un endroit sûr</strong>. Si vous perdez " +"l'accès à votre application ou à votre/vos clé(s) de sécurité et n'avez " +"plus accès à ces codes de récupération, vous pourriez perdre " +"définitivement l'accès à votre compte PyPI !" #: warehouse/templates/manage/account/recovery_codes-provision.html:52 msgid "Save your Recovery Codes" @@ -3381,8 +3385,7 @@ msgstr "Ces codes ne seront plus visibles." #: warehouse/templates/manage/account/recovery_codes-provision.html:79 msgid "Ensure that you have securely stored them before continuing." -msgstr "" -"Assurez-vous de les avoir stocké dans un endroit sûr avant de continuer." +msgstr "Assurez-vous de les avoir stocké dans un endroit sûr avant de continuer." #: warehouse/templates/manage/account/totp-provision.html:17 msgid "Set up 2FA with an authentication application (TOTP)" @@ -3393,13 +3396,13 @@ msgstr "" #: warehouse/templates/manage/account/totp-provision.html:32 #, python-format msgid "" -"PyPI supports any application that follows the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based " -"one-time password\">TOTP</abbr> standard</a>." +"PyPI supports any application that follows the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title" +"=\"time-based one-time password\">TOTP</abbr> standard</a>." msgstr "" "PyPI prend en charge toute application qui suit le <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">standard <abbr title=" -"\"Time-based One-Time Password\">TOTP</abbr></a>." +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">standard <abbr " +"title=\"Time-based One-Time Password\">TOTP</abbr></a>." #: warehouse/templates/manage/account/totp-provision.html:36 #, python-format @@ -3407,8 +3410,8 @@ msgid "" "Visit <a href=\"%(href)s\">PyPI's help page</a> for a list of compatible " "applications." msgstr "" -"Visitez <a href=\"%(href)s\">la page d'aide de PyPI</a> pour une liste des " -"applications compatibles." +"Visitez <a href=\"%(href)s\">la page d'aide de PyPI</a> pour une liste " +"des applications compatibles." #: warehouse/templates/manage/account/totp-provision.html:42 msgid "Set up your application" @@ -3416,13 +3419,12 @@ msgstr "Configurer votre application" #: warehouse/templates/manage/account/totp-provision.html:45 msgid "Scan the QR code with the authentication application of your choice." -msgstr "" -"Scannez le code QR avec l'application d'authentification de votre choix." +msgstr "Scannez le code QR avec l'application d'authentification de votre choix." #: warehouse/templates/manage/account/totp-provision.html:46 msgid "" -"For security reasons, you can only associate one authentication application " -"per PyPI account." +"For security reasons, you can only associate one authentication " +"application per PyPI account." msgstr "" "Pour des raisons de sécurité, vous ne pouvez associer qu'une seule " "application d'authentification par compte PyPI." @@ -3434,8 +3436,8 @@ msgstr "Code QR pour la configuration d'une application d'authentification" #: warehouse/templates/manage/account/totp-provision.html:55 msgid "<strong>No QR scanner?</strong> Manually enter the code instead:" msgstr "" -"<strong>Pas de lecteur de code QR ?</strong> Entrez manuellement le code à " -"la place :" +"<strong>Pas de lecteur de code QR ?</strong> Entrez manuellement le code " +"à la place :" #: warehouse/templates/manage/account/totp-provision.html:67 msgid "Verify application" @@ -3447,8 +3449,8 @@ msgstr "Code d'authentification" #: warehouse/templates/manage/account/totp-provision.html:73 msgid "" -"To finalize the set up process, enter the authentication code provided by " -"your application." +"To finalize the set up process, enter the authentication code provided by" +" your application." msgstr "" "Pour finaliser le processus de configuration, entrez le code " "d'authentification fourni par votre application." @@ -3460,32 +3462,32 @@ msgstr "Configurer l'application" #: warehouse/templates/manage/account/webauthn-provision.html:17 msgid "Set up 2FA with a security device (e.g. USB key)" msgstr "" -"Configurer la double authentification avec un périphérique de sécurité (ex : " -"clé USB)" +"Configurer la double authentification avec un périphérique de sécurité " +"(ex : clé USB)" #: warehouse/templates/manage/account/webauthn-provision.html:26 #, python-format msgid "" -"PyPI supports any device that adheres to the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." +"PyPI supports any device that adheres to the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." msgstr "" -"PyPI prend en charge tout appareil qui adhère au <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">standard FIDO</a>." +"PyPI prend en charge tout appareil qui adhère au <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">standard FIDO</a>." #: warehouse/templates/manage/account/webauthn-provision.html:28 #, python-format msgid "" -"Popular <em>USB keys</em> include <a href=\"%(yubico_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=" -"\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Google Titan</a> and <a href=\"%(thetis_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Thetis</a>." +"Popular <em>USB keys</em> include <a href=\"%(yubico_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> and <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." msgstr "" -"Les <em>clés USB</em> populaires incluent <a href=\"%(yubico_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=" -"\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Google Titan</a> et <a href=\"%(thetis_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Thetis</a>." +"Les <em>clés USB</em> populaires incluent <a href=\"%(yubico_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> et <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." #: warehouse/templates/manage/account/webauthn-provision.html:43 msgid "Name your device to begin" @@ -3500,8 +3502,8 @@ msgid "" "Please give this device a name. 64 characters or fewer. All Unicode is " "valid, including spaces." msgstr "" -"Veuillez donner un nom à ce périphérique. 64 caractères ou moins. Tous les " -"caractères Unicode sont valides, espaces inclus." +"Veuillez donner un nom à ce périphérique. 64 caractères ou moins. Tous " +"les caractères Unicode sont valides, espaces inclus." #: warehouse/templates/manage/account/webauthn-provision.html:65 msgid "Set up security device" @@ -3510,21 +3512,22 @@ msgstr "Configurer un périphérique de sécurité" #: warehouse/templates/manage/account/webauthn-provision.html:74 #, python-format msgid "" -"<strong>Not working?</strong> Check you're using a device that follows the " -"<a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">FIDO specification</a> and a <a href=\"%(mozilla_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">compatible browser</a>." +"<strong>Not working?</strong> Check you're using a device that follows " +"the <a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">FIDO specification</a> and a <a " +"href=\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">compatible browser</a>." msgstr "" "<strong>Cela ne fonctionne pas ?</strong> Vérifiez que vous utilisez un " "périphérique qui suit la <a href=\"%(fido_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">spécification FIDO</a> et un <a href=" -"\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">navigateur compatible</a>." +"target=\"_blank\" rel=\"noopener\">spécification FIDO</a> et un <a " +"href=\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">navigateur compatible</a>." #: warehouse/templates/manage/account/webauthn-provision.html:78 msgid "" -"Note that some older USB keys do not adhere to the FIDO standard and will " -"not work with PyPI." +"Note that some older USB keys do not adhere to the FIDO standard and will" +" not work with PyPI." msgstr "" "Veuillez noter que certaines clés USB plus anciennes n'adhèrent pas au " "standard FIDO, et ne fonctionneront pas avec PyPI." @@ -3628,12 +3631,13 @@ msgstr "pré-version" #, python-format msgid "" "Download the file for your platform. If you're not sure which to choose, " -"learn more about <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">installing packages</a>." +"learn more about <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">installing packages</a>." msgstr "" "Téléchargez le fichier pour votre plateforme. Si vous n'êtes pas sûr de " -"savoir lequel choisir, apprenez-en plus sur l'<a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">installation de paquets</a>." +"savoir lequel choisir, apprenez-en plus sur l'<a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">installation de " +"paquets</a>." #: warehouse/templates/packaging/detail.html:273 #, python-format @@ -3652,40 +3656,41 @@ msgstr "Hachages" #: warehouse/templates/pages/classifiers.html:22 msgid "" -"Each project's maintainers provide PyPI with a list of \"trove classifiers\" " -"to categorize each release, describing who it's for, what systems it can run " -"on, and how mature it is." +"Each project's maintainers provide PyPI with a list of \"trove " +"classifiers\" to categorize each release, describing who it's for, what " +"systems it can run on, and how mature it is." msgstr "" "Les mainteneurs de chaque projet fournissent à PyPI une liste de « " -"classificateurs » pour catégoriser chaque version, en décrivant à qui elle " -"s'adresse, quel système peut l’exécuter et à quel niveau de maturité elle se " -"positionne." +"classificateurs » pour catégoriser chaque version, en décrivant à qui " +"elle s'adresse, quel système peut l’exécuter et à quel niveau de maturité" +" elle se positionne." #: warehouse/templates/pages/classifiers.html:23 msgid "" -"These standardized classifiers can then be used by community members to find " -"projects based on their desired criteria." +"These standardized classifiers can then be used by community members to " +"find projects based on their desired criteria." msgstr "" -"Ces classificateurs standardisés peuvent être utilisés par les membres de la " -"communauté pour trouver des projets basés sur leurs critères souhaités." +"Ces classificateurs standardisés peuvent être utilisés par les membres de" +" la communauté pour trouver des projets basés sur leurs critères " +"souhaités." #: warehouse/templates/pages/classifiers.html:25 #, python-format msgid "" -"Instructions for how to add trove classifiers to a project can be found on " -"the <a href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging User Guide</a>. To read the original " -"classifier specification, refer to <a href=\"%(pep301_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python " -"enhancement proposal\">PEP</abbr> 301</a>." +"Instructions for how to add trove classifiers to a project can be found " +"on the <a href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>. To read the original " +"classifier specification, refer to <a href=\"%(pep301_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 301</a>." msgstr "" "Des instructions sur la façon d'ajouter des classificateurs à un projet " -"peuvent être trouvées dans le <a href=\"%(ppug_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Guide Utilisateur de l'Empaquetage " -"Python</a>. Pour lire la spécification originale des classificateurs, " -"référez vous au <a href=\"%(pep301_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\"><abbr title=\"Python Enhancement Proposal\">PEP</" -"abbr> 301</a>." +"peuvent être trouvées dans le <a href=\"%(ppug_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Guide Utilisateur " +"de l'Empaquetage Python</a>. Pour lire la spécification originale des " +"classificateurs, référez vous au <a href=\"%(pep301_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " +"title=\"Python Enhancement Proposal\">PEP</abbr> 301</a>." #: warehouse/templates/pages/classifiers.html:31 msgid "List of classifiers" @@ -3699,49 +3704,51 @@ msgstr "Remarque :" #: warehouse/templates/pages/help.html:20 #, python-format msgid "" -"All users submitting feedback, reporting issues or contributing to Warehouse " -"are expected to follow the <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">PyPA Code of Conduct</a>." +"All users submitting feedback, reporting issues or contributing to " +"Warehouse are expected to follow the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPA Code of " +"Conduct</a>." msgstr "" -"Tous les utilisateurs soumettant des commentaires, signalant des problèmes " -"ou contribuant au Warehouse sont tenus de suivre le <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Code de conduite de " -"PyPA</a>." +"Tous les utilisateurs soumettant des commentaires, signalant des " +"problèmes ou contribuant au Warehouse sont tenus de suivre le <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Code de conduite de PyPA</a>." #: warehouse/templates/pages/help.html:31 #, python-format msgid "" "If you lose your %(method)s and can no longer log in, you may " "<strong>permanently lose access to your account</strong>. You should " -"generate and securely store <a href=\"#recoverycodes\">recovery codes</a> to " -"regain access in that event.." +"generate and securely store <a href=\"#recoverycodes\">recovery codes</a>" +" to regain access in that event.." msgstr "" "Si vous perdez votre %(method)s et ne pouvez plus vous connecter, vous " -"pourriez <strong>perdre définitivement l'accès à votre compte</strong>. Vous " -"devriez générer et stocker <a href=\"#recoverycodes\">des codes de " -"récupération</a> dans un endroit sûr afin de récupérer votre compte si cela " -"se produit." +"pourriez <strong>perdre définitivement l'accès à votre compte</strong>. " +"Vous devriez générer et stocker <a href=\"#recoverycodes\">des codes de " +"récupération</a> dans un endroit sûr afin de récupérer votre compte si " +"cela se produit." #: warehouse/templates/pages/help.html:37 msgid "" -"We recommend that all PyPI users set up <em>at least two</em> supported two " -"factor authentication methods and provision <a href=\"#recoverycodes" -"\">recovery codes</a>." +"We recommend that all PyPI users set up <em>at least two</em> supported " +"two factor authentication methods and provision <a " +"href=\"#recoverycodes\">recovery codes</a>." msgstr "" -"Nous recommandons à tous les utilisateurs de PyPI de définir <em>au moins " -"deux</em> méthodes d'authentification à deux facteurs et de générer <a href=" -"\"#recoverycodes\">des codes de récupération</a>." +"Nous recommandons à tous les utilisateurs de PyPI de définir <em>au moins" +" deux</em> méthodes d'authentification à deux facteurs et de générer <a " +"href=\"#recoverycodes\">des codes de récupération</a>." #: warehouse/templates/pages/help.html:43 msgid "" -"If you've lost access to all two factor methods for your account and do not " -"have <a href=\"#recoverycodes\">recovery codes</a>, you can request help <a " -"href=\"#account-recovery\">with account recovery</a>." +"If you've lost access to all two factor methods for your account and do " +"not have <a href=\"#recoverycodes\">recovery codes</a>, you can request " +"help <a href=\"#account-recovery\">with account recovery</a>." msgstr "" -"Si vous avez perdu l'accès à toutes les méthodes d'authentification à deux " -"facteurs de votre compte et que vous n'avez pas de <a href=\"#recoverycodes" -"\">codes de récupération</a>, vous pouvez demander de l'aide <a href=" -"\"#account-recovery\">sur la récupération de compte</a>." +"Si vous avez perdu l'accès à toutes les méthodes d'authentification à " +"deux facteurs de votre compte et que vous n'avez pas de <a " +"href=\"#recoverycodes\">codes de récupération</a>, vous pouvez demander " +"de l'aide <a href=\"#account-recovery\">sur la récupération de " +"compte</a>." #: warehouse/templates/pages/help.html:52 msgid "What's a package, project, or release?" @@ -3770,26 +3777,28 @@ msgstr "Pourquoi PyPI me dit que mon mot de passe est compromis ?" #: warehouse/templates/pages/help.html:59 msgid "What is two factor authentication and how does it work on PyPI?" msgstr "" -"Qu'est-ce que l'authentification à deux facteurs et comment cela fonctionne " -"sur PyPI ?" +"Qu'est-ce que l'authentification à deux facteurs et comment cela " +"fonctionne sur PyPI ?" #: warehouse/templates/pages/help.html:60 msgid "" -"How does two factor authentication with an authentication application (<abbr " -"title=\"time-based one-time password\">TOTP</abbr>) work? How do I set it up " -"on PyPI?" +"How does two factor authentication with an authentication application " +"(<abbr title=\"time-based one-time password\">TOTP</abbr>) work? How do I" +" set it up on PyPI?" msgstr "" "Comment l'authentification à deux facteurs avec une application " -"d'authentification (<abbr title=\"Time-based One-Time Password\">TOTP</" -"abbr>) fonctionne-t'elle ? Comment la configurer sur PyPI ?" +"d'authentification (<abbr title=\"Time-based One-Time " +"Password\">TOTP</abbr>) fonctionne-t'elle ? Comment la configurer sur " +"PyPI ?" #: warehouse/templates/pages/help.html:61 msgid "" "How does two factor authentication with a security device (e.g. USB key) " "work? How do I set it up on PyPI?" msgstr "" -"Comment l'authentification à deux facteurs avec un périphérique de sécurité " -"(ex : clé USB) fonctionne-t'elle ? Comment la configurer sur PyPI ?" +"Comment l'authentification à deux facteurs avec un périphérique de " +"sécurité (ex : clé USB) fonctionne-t'elle ? Comment la configurer sur " +"PyPI ?" #: warehouse/templates/pages/help.html:62 msgid "What devices (other than a USB key) can I use as a security device?" @@ -3799,16 +3808,15 @@ msgstr "" #: warehouse/templates/pages/help.html:63 msgid "" -"How does two factor authentication with a recovery code work? How do I set " -"it up on PyPI?" +"How does two factor authentication with a recovery code work? How do I " +"set it up on PyPI?" msgstr "" -"Comment l'authentification avec un code de récupération fonctionne-t'elle ? " -"Comment la configurer sur PyPI ?" +"Comment l'authentification avec un code de récupération fonctionne-t'elle" +" ? Comment la configurer sur PyPI ?" #: warehouse/templates/pages/help.html:64 msgid "How can I use API tokens to authenticate with PyPI?" -msgstr "" -"Comment puis-je utiliser les jetons d'API pour m'authentifier avec PyPI ?" +msgstr "Comment puis-je utiliser les jetons d'API pour m'authentifier avec PyPI ?" #: warehouse/templates/pages/help.html:66 msgid "How can I run a mirror of PyPI?" @@ -3821,14 +3829,16 @@ msgstr "Est-ce que PyPI possède des API que je peux utiliser ?" #: warehouse/templates/pages/help.html:68 msgid "How do I get notified when a new version of a project is released?" msgstr "" -"Comment suis-je notifié lorsqu'une nouvelle version d'un projet est sortie ?" +"Comment suis-je notifié lorsqu'une nouvelle version d'un projet est " +"sortie ?" #: warehouse/templates/pages/help.html:69 msgid "" -"Where can I see statistics about PyPI, downloads, and project/package usage?" +"Where can I see statistics about PyPI, downloads, and project/package " +"usage?" msgstr "" -"Où puis-je voir des statistiques à propos de PyPI, des téléchargements et de " -"l'utilisation des projets et paquets ?" +"Où puis-je voir des statistiques à propos de PyPI, des téléchargements et" +" de l'utilisation des projets et paquets ?" #: warehouse/templates/pages/help.html:71 msgid "I forgot my PyPI password. Can you help me?" @@ -3840,16 +3850,16 @@ msgstr "J'ai perdu l'accès à mon compte PyPI. Pouvez-vous m'aider ?" #: warehouse/templates/pages/help.html:73 msgid "" -"Why am I getting a \"Invalid or non-existent authentication information.\" " -"error when uploading files?" +"Why am I getting a \"Invalid or non-existent authentication " +"information.\" error when uploading files?" msgstr "" "Pourquoi est-ce que j'obtiens l'erreur « Informations d'authentification " "invalides ou inexistantes. » lors de la publication de fichiers ?" #: warehouse/templates/pages/help.html:74 msgid "" -"Why am I getting \"No matching distribution found\" or \"Could not fetch URL" -"\" errors during <code>pip install</code>?" +"Why am I getting \"No matching distribution found\" or \"Could not fetch " +"URL\" errors during <code>pip install</code>?" msgstr "" "Pourquoi est-ce que j'obtiens les erreurs « Aucune distribution " "correspondante trouvée » ou « Impossible de récupérer l'URL » lors de " @@ -3860,11 +3870,10 @@ msgid "I am having trouble using the PyPI website. Can you help me?" msgstr "J'ai des problèmes avec le site de PyPI. Pouvez-vous m'aider ?" #: warehouse/templates/pages/help.html:76 -msgid "" -"Why can't I manually upload files to PyPI, through the browser interface?" +msgid "Why can't I manually upload files to PyPI, through the browser interface?" msgstr "" -"Pourquoi ne puis-je pas publier manuellement mes fichiers sur PyPi, via le " -"navigateur Web ?" +"Pourquoi ne puis-je pas publier manuellement mes fichiers sur PyPi, via " +"le navigateur Web ?" #: warehouse/templates/pages/help.html:77 msgid "How can I publish my private packages to PyPI?" @@ -3877,13 +3886,13 @@ msgstr "Pourquoi mon paquet ou mon inscription ont-ils été bloqués ?" #: warehouse/templates/pages/help.html:79 msgid "How do I get a file size limit exemption or increase for my project?" msgstr "" -"Comment puis-je obtenir une exemption ou une augmentation de la limite de " -"taille de fichier pour mon projet ?" +"Comment puis-je obtenir une exemption ou une augmentation de la limite de" +" taille de fichier pour mon projet ?" #: warehouse/templates/pages/help.html:81 msgid "" -"Why am I getting a \"Filename or contents already exists\" or \"Filename has " -"been previously used\" error?" +"Why am I getting a \"Filename or contents already exists\" or \"Filename " +"has been previously used\" error?" msgstr "" "Pourquoi est-ce que j'obtiens l'erreur « Le nom de fichier ou le contenu " "existe déjà » ou « Le nom du fichier a déjà été utilisé » ?" @@ -3900,8 +3909,7 @@ msgstr "" #: warehouse/templates/pages/help.html:84 msgid "What collaborator roles are available for a project on PyPI?" -msgstr "" -"Quels rôles de collaborateurs sont disponibles pour un projet sur PyPI ?" +msgstr "Quels rôles de collaborateurs sont disponibles pour un projet sur PyPI ?" #: warehouse/templates/pages/help.html:85 msgid "How do I become an owner/maintainer of a project on PyPI?" @@ -3910,7 +3918,8 @@ msgstr "Comment puis-je devenir propriétaire/mainteneur d'un projet sur PyPI ?" #: warehouse/templates/pages/help.html:86 msgid "How can I upload a project description in a different format?" msgstr "" -"Comment puis-je publier une description de projet dans un format différent ?" +"Comment puis-je publier une description de projet dans un format " +"différent ?" #: warehouse/templates/pages/help.html:87 msgid "How do I request a new trove classifier?" @@ -3942,11 +3951,11 @@ msgstr "Comment puis-je suivre les modifications de PyPi à venir ?" #: warehouse/templates/pages/help.html:95 msgid "" -"What does the \"beta feature\" badge mean? What are Warehouse's current beta " -"features?" +"What does the \"beta feature\" badge mean? What are Warehouse's current " +"beta features?" msgstr "" -"Qu'est-ce que le badge « fonctionnalité bêta » signifie ? Quelles sont les " -"fonctionnalités bêta actuelles de Warehouse ?" +"Qu'est-ce que le badge « fonctionnalité bêta » signifie ? Quelles sont " +"les fonctionnalités bêta actuelles de Warehouse ?" #: warehouse/templates/pages/help.html:96 msgid "How do I pronounce \"PyPI\"?" @@ -3990,82 +3999,83 @@ msgstr "À propos" msgid "" "\n" " <p>We use a number of terms to describe software available on " -"PyPI, like \"project\", \"release\", \"file\", and \"package\". Sometimes " -"those terms are confusing because they're used to describe different things " -"in other contexts. Here's how we use them on PyPI:</p>\n" -" <p>A \"project\" on PyPI is the name of a collection of releases " -"and files, and information about them. Projects on PyPI are made and shared " -"by other members of the Python community so that you can use them.</p>\n" -" <p>A \"release\" on PyPI is a specific version of a project. For " -"example, the <a href=\"%(requests_href)s\">requests</a> project has many " -"releases, like \"requests 2.10\" and \"requests 1.2.1\". A release consists " -"of one or more \"files\".</p>\n" -" <p>A \"file\", also known as a \"package\", on PyPI is something " -"that you can download and install. Because of different hardware, operating " -"systems, and file formats, a release may have several files (packages), like " -"an archive containing source code or a binary <a href=\"%(wheel_href)s" -"\">wheel</a>.</p>\n" +"PyPI, like \"project\", \"release\", \"file\", and \"package\". Sometimes" +" those terms are confusing because they're used to describe different " +"things in other contexts. Here's how we use them on PyPI:</p>\n" +" <p>A \"project\" on PyPI is the name of a collection of " +"releases and files, and information about them. Projects on PyPI are made" +" and shared by other members of the Python community so that you can use " +"them.</p>\n" +" <p>A \"release\" on PyPI is a specific version of a project. " +"For example, the <a href=\"%(requests_href)s\">requests</a> project has " +"many releases, like \"requests 2.10\" and \"requests 1.2.1\". A release " +"consists of one or more \"files\".</p>\n" +" <p>A \"file\", also known as a \"package\", on PyPI is " +"something that you can download and install. Because of different " +"hardware, operating systems, and file formats, a release may have several" +" files (packages), like an archive containing source code or a binary <a " +"href=\"%(wheel_href)s\">wheel</a>.</p>\n" " " msgstr "" "\n" " <p>Nous utilisons un certain nombre de termes pour décrire les " -"logiciels disponibles sur PyPI, tels que « projet », « version », « fichier " -"» et « paquet ». Parfois ces termes portent à confusion car ils sont " -"utilisés pour décrire des choses différentes dans d'autres contextes. Voici " -"comment nous les utilisons sur PyPI :</p>\n" -" <p>Un « projet » sur PyPI est le nom d'un ensemble de versions et " -"fichiers, ainsi que d'informations à leur propos. Les projets sur PyPI sont " -"créés et partagés par d'autres membres de la communauté Python afin que vous " -"puissiez les utiliser.</p>\n" +"logiciels disponibles sur PyPI, tels que « projet », « version », « " +"fichier » et « paquet ». Parfois ces termes portent à confusion car ils " +"sont utilisés pour décrire des choses différentes dans d'autres " +"contextes. Voici comment nous les utilisons sur PyPI :</p>\n" +" <p>Un « projet » sur PyPI est le nom d'un ensemble de versions " +"et fichiers, ainsi que d'informations à leur propos. Les projets sur PyPI" +" sont créés et partagés par d'autres membres de la communauté Python afin" +" que vous puissiez les utiliser.</p>\n" " <p>Une « version » sur PyPI est une version spécifique d'un " -"projet. Par exemple, le projet <a href=\"%(requests_href)s\">requests</a> " -"possède de nombreuses versions, telles que « request 2.10 » et « request " -"1.2.1 ». Un version consiste en un ou plusieurs « fichiers ».</p>\n" -" <p>Un « fichier », aussi connu sous le nom de « paquet », sur PyPI " -"est quelque chose que vous pouvez télécharger et installer. En raison de " -"matériels, de systèmes d'exploitation et de formats de fichiers différents, " -"une version peut comprendre différents fichiers (paquets), tels q'une " -"archive contenant le code source ou un fichier binaire <a href=" -"\"%(wheel_href)s\">wheel</a>.</p>\n" +"projet. Par exemple, le projet <a href=\"%(requests_href)s\">requests</a>" +" possède de nombreuses versions, telles que « request 2.10 » et « request" +" 1.2.1 ». Un version consiste en un ou plusieurs « fichiers ».</p>\n" +" <p>Un « fichier », aussi connu sous le nom de « paquet », sur " +"PyPI est quelque chose que vous pouvez télécharger et installer. En " +"raison de matériels, de systèmes d'exploitation et de formats de fichiers" +" différents, une version peut comprendre différents fichiers (paquets), " +"tels q'une archive contenant le code source ou un fichier binaire <a " +"href=\"%(wheel_href)s\">wheel</a>.</p>\n" " " #: warehouse/templates/pages/help.html:194 #, python-format msgid "" -"To learn how to install a file from PyPI, visit the <a href=" -"\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">installation tutorial</a> on the <a href=\"%(user_guide_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " -"User Guide</a>." +"To learn how to install a file from PyPI, visit the <a " +"href=\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">installation tutorial</a> on the <a " +"href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" -"Pour apprendre à installer un fichier depuis PyPI, consultez le <a href=" -"\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">tutoriel d'installation</a> dans le <a href=" -"\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Guide Utilisateur de l'Empaquetage Python</a>." +"Pour apprendre à installer un fichier depuis PyPI, consultez le <a " +"href=\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">tutoriel d'installation</a> dans le <a " +"href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Guide Utilisateur de l'Empaquetage Python</a>." #: warehouse/templates/pages/help.html:201 #, python-format msgid "" -"For full instructions on configuring, packaging and distributing your Python " -"project, refer to the <a href=\"%(packaging_tutorial_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">packaging tutorial</a> on " -"the <a href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Python Packaging User Guide</a>." +"For full instructions on configuring, packaging and distributing your " +"Python project, refer to the <a href=\"%(packaging_tutorial_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">packaging " +"tutorial</a> on the <a href=\"%(user_guide_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" -"Pour des instructions complètes sur la configuration, l'empaquetage et la " -"distribution de votre projet Python, référez vous au <a href=" -"\"%(packaging_tutorial_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">tutoriel d'empaquetage</a> dans le <a href=\"%(user_guide_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Guide Utilisateur " -"de l'Empaquetage Python</a>." +"Pour des instructions complètes sur la configuration, l'empaquetage et la" +" distribution de votre projet Python, référez vous au <a " +"href=\"%(packaging_tutorial_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">tutoriel d'empaquetage</a> dans le <a " +"href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Guide Utilisateur de l'Empaquetage Python</a>." #: warehouse/templates/pages/help.html:208 #, python-format msgid "" -"Classifiers are used to categorize projects on PyPI. See <a href=\"%(href)s" -"\">the classifiers page</a> for more information, as well as a list of valid " -"classifiers." +"Classifiers are used to categorize projects on PyPI. See <a " +"href=\"%(href)s\">the classifiers page</a> for more information, as well " +"as a list of valid classifiers." msgstr "" "Les classificateurs sont utilisés pour catégoriser les projets sur PyPI. " "Consultez <a href=\"%(href)s\">la page des classificateurs</a> pour plus " @@ -4077,11 +4087,11 @@ msgstr "Mon compte" #: warehouse/templates/pages/help.html:218 msgid "" -"Currently, PyPI requires a verified email address to perform the following " -"operations:" +"Currently, PyPI requires a verified email address to perform the " +"following operations:" msgstr "" -"Pour le moment, PyPI à besoin d'une adresse e-mail valide pour effectuer les " -"opérations suivantes :" +"Pour le moment, PyPI à besoin d'une adresse e-mail valide pour effectuer " +"les opérations suivantes :" #: warehouse/templates/pages/help.html:220 msgid "Register a new project." @@ -4093,8 +4103,8 @@ msgstr "Publier une nouvelle version ou un nouveau fichier." #: warehouse/templates/pages/help.html:223 msgid "" -"The list of activities that require a verified email address is likely to " -"grow over time." +"The list of activities that require a verified email address is likely to" +" grow over time." msgstr "" "La liste des activités qui nécessitent une adresse e-mail vérifiée est " "susceptible de s'allonger au fil du temps." @@ -4102,131 +4112,139 @@ msgstr "" #: warehouse/templates/pages/help.html:224 #, python-format msgid "" -"This policy will allow us to enforce a key policy of <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python " -"enhancement proposal\">PEP</abbr> 541</a> regarding maintainer reachability. " -"It also reduces the viability of spam attacks to create many accounts in an " -"automated fashion." +"This policy will allow us to enforce a key policy of <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 541</a> regarding " +"maintainer reachability. It also reduces the viability of spam attacks to" +" create many accounts in an automated fashion." msgstr "" -"Cette politique nous permettra mettre en œuvre une politique clé du <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " -"title=\"Python Enhancement Proposal\">PEP</abbr> 541</a> relative à la " -"disponibilité des mainteneurs. Elle réduit également la capacité des " -"attaques de spam à créer de nombreux comptes de manière automatisée." +"Cette politique nous permettra mettre en œuvre une politique clé du <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><abbr title=\"Python Enhancement Proposal\">PEP</abbr> " +"541</a> relative à la disponibilité des mainteneurs. Elle réduit " +"également la capacité des attaques de spam à créer de nombreux comptes de" +" manière automatisée." #: warehouse/templates/pages/help.html:225 #, python-format msgid "" -"You can manage your account's email addresses in your <a href=\"%(href)s" -"\">account settings</a>. This also allows for sending a new confirmation " -"email for users who signed up in the past, before we began enforcing this " -"policy." +"You can manage your account's email addresses in your <a " +"href=\"%(href)s\">account settings</a>. This also allows for sending a " +"new confirmation email for users who signed up in the past, before we " +"began enforcing this policy." msgstr "" -"Vous pouvez gérer les adresses e-mail de votre compte dans vos <a href=" -"\"%(href)s\">paramètres de compte</a>. Cela permet également d'envoyer un " -"nouvel e-mail de confirmation aux utilisateurs qui se sont inscrits par le " -"passé, avant que nous ne commencions à appliquer cette politique." +"Vous pouvez gérer les adresses e-mail de votre compte dans vos <a " +"href=\"%(href)s\">paramètres de compte</a>. Cela permet également " +"d'envoyer un nouvel e-mail de confirmation aux utilisateurs qui se sont " +"inscrits par le passé, avant que nous ne commencions à appliquer cette " +"politique." #: warehouse/templates/pages/help.html:228 #, python-format msgid "" -"<p> PyPI itself has not suffered a breach. This is a protective measure to " -"reduce the risk of <a href=\"%(credential_stuffing_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">credential stuffing</a> attacks " -"against PyPI and its users. </p> <p> Each time a user supplies a password — " -"while registering, authenticating, or updating their password — PyPI " -"securely checks whether that password has appeared in public data breaches. " -"</p> <p> During each of these processes, PyPI generates a SHA-1 hash of the " -"supplied password and uses the first five (5) characters of the hash to " -"check the <a href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Have I Been Pwned API</a> and determine if the " -"password has been previously compromised. The plaintext password is never " -"stored by PyPI or submitted to the Have I Been Pwned API. </p> <p> PyPI will " -"not allow such passwords to be used when setting a password at registration " -"or updating your password. </p> <p> If you receive an error message saying " -"that \"This password appears in a breach or has been compromised and cannot " -"be used\", you should change it all other places that you use it as soon as " -"possible. </p> <p> If you have received this error while attempting to log " -"in or upload to PyPI, then your password has been reset and you cannot log " -"in to PyPI until you <a href=\"%(reset_pwd_href)s\">reset your password</a>. " -"</p>" +"<p> PyPI itself has not suffered a breach. This is a protective measure " +"to reduce the risk of <a href=\"%(credential_stuffing_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">credential " +"stuffing</a> attacks against PyPI and its users. </p> <p> Each time a " +"user supplies a password — while registering, authenticating, or updating" +" their password — PyPI securely checks whether that password has appeared" +" in public data breaches. </p> <p> During each of these processes, PyPI " +"generates a SHA-1 hash of the supplied password and uses the first five " +"(5) characters of the hash to check the <a " +"href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Have I Been Pwned API</a> and determine if the password " +"has been previously compromised. The plaintext password is never stored " +"by PyPI or submitted to the Have I Been Pwned API. </p> <p> PyPI will not" +" allow such passwords to be used when setting a password at registration " +"or updating your password. </p> <p> If you receive an error message " +"saying that \"This password appears in a breach or has been compromised " +"and cannot be used\", you should change it all other places that you use " +"it as soon as possible. </p> <p> If you have received this error while " +"attempting to log in or upload to PyPI, then your password has been reset" +" and you cannot log in to PyPI until you <a " +"href=\"%(reset_pwd_href)s\">reset your password</a>. </p>" msgstr "" "<p> PyPI lui-même n'a pas subi de violation. Il s'agit d'une mesure de " -"protection pour réduire le risque d'attaque <a href=" -"\"%(credential_stuffing_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">au vol identifiants</a> envers PyPI et ses utilisateurs. </p> " -"<p> Chaque fois qu'un utilisateur fournit un mot de passe - lors de " -"l'inscription, de l'authentification ou de la mise à jour du mot de passe - " -"PyPI vérifie en toute sécurité si ce mot de passe est apparu dans des " -"violations de données publiques. </p> <p> Pendant chacun de ces processus, " -"PyPI génère un hachage SHA-1 du mot de passe fourni et utilise les cinq (5) " -"premiers caractères du hachage pour vérifier dans <a href=" -"\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">l'API de HaveIBeenPwned</a> et déterminer si le mot de passe " -"est déjà compromis. Le mot de passe en clair n'est jamais stocké par PyPI ou " -"envoyé à l'API de HaveIBeenPwned. </p> <p> PyPI n'autorisera pas " -"l'utilisation de tels mots de passe lors de la définition d'un mot de passe " -"à l'inscription ou à la mise à jour de votre mot de passe. </p> <p> Si vous " -"recevez un message d'erreur indiquant que « Ce mot de passe apparaît dans " -"une violation de données ou a été compromis et ne peut pas être utilisé », " -"vous devez le modifier dès que possible à tous les autres endroits où vous " -"l'utilisez. </p> <p> Si vous avez reçu cette erreur en essayant de vous " -"connecter ou de publier sur PyPI, votre mot de passe a été réinitialisé et " -"vous ne pouvez pas vous connecter à PyPI avant de <a href=" -"\"%(reset_pwd_href)s\">réinitialiser votre mot de passe</a> . </p>" +"protection pour réduire le risque d'attaque <a " +"href=\"%(credential_stuffing_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">au vol identifiants</a> envers PyPI et" +" ses utilisateurs. </p> <p> Chaque fois qu'un utilisateur fournit un mot " +"de passe - lors de l'inscription, de l'authentification ou de la mise à " +"jour du mot de passe - PyPI vérifie en toute sécurité si ce mot de passe " +"est apparu dans des violations de données publiques. </p> <p> Pendant " +"chacun de ces processus, PyPI génère un hachage SHA-1 du mot de passe " +"fourni et utilise les cinq (5) premiers caractères du hachage pour " +"vérifier dans <a href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">l'API de HaveIBeenPwned</a> et " +"déterminer si le mot de passe est déjà compromis. Le mot de passe en " +"clair n'est jamais stocké par PyPI ou envoyé à l'API de HaveIBeenPwned. " +"</p> <p> PyPI n'autorisera pas l'utilisation de tels mots de passe lors " +"de la définition d'un mot de passe à l'inscription ou à la mise à jour de" +" votre mot de passe. </p> <p> Si vous recevez un message d'erreur " +"indiquant que « Ce mot de passe apparaît dans une violation de données ou" +" a été compromis et ne peut pas être utilisé », vous devez le modifier " +"dès que possible à tous les autres endroits où vous l'utilisez. </p> <p> " +"Si vous avez reçu cette erreur en essayant de vous connecter ou de " +"publier sur PyPI, votre mot de passe a été réinitialisé et vous ne pouvez" +" pas vous connecter à PyPI avant de <a " +"href=\"%(reset_pwd_href)s\">réinitialiser votre mot de passe</a> . </p>" #: warehouse/templates/pages/help.html:263 #, python-format msgid "" "<p> Two factor authentication (2FA) makes your account more secure by " "requiring two things in order to log in: <em>something you know</em> and " -"<em>something you own</em>. </p> <p> In PyPI's case, \"something you know\" " -"is your username and password, while \"something you own\" can be <a href=" -"\"#totp\">an application to generate a temporary code</a>, or a <a href=" -"\"#utfkey\">security device</a> (most commonly a USB key). </p> <p> It is " -"strongly recommended that you set up two factor authentication on your PyPI " -"account. </p> <p> Users who have chosen to set up two factor authentication " -"will be asked to provide their second method of identity verification during " -"the log in process. This only affects logging in via a web browser, and not " -"(yet) package uploads. </p> <p>You can follow the improvements to <abbr " -"title=\"two factor authentication\">2FA</abbr> on <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">discuss.python.org</a>.</p>" -msgstr "" -"<p> L'authentification à deux facteurs (A2F) rend votre compte plus sécurisé " -"en exigeant deux choses pour pouvoir vous connecter : <em>quelque chose que " -"vous savez</em> et <em>quelque chose que vous possédez</em>. </p> <p> Dans " -"le cas de PyPI, « quelque chose que vous savez » sont votre identifiant et " -"votre mot de passe, tandis que « quelque chose que vous possédez » peut être " -"<a href=\"#totp\">une application pour générer un code temporaire</a>, ou " -"bien un <a href=\"#utfkey\">périphérique de sécurité</a> (le plus souvent " -"une clé USB). </p> <p> Il est fortement recommandé de configurer " +"<em>something you own</em>. </p> <p> In PyPI's case, \"something you " +"know\" is your username and password, while \"something you own\" can be " +"<a href=\"#totp\">an application to generate a temporary code</a>, or a " +"<a href=\"#utfkey\">security device</a> (most commonly a USB key). </p> " +"<p> It is strongly recommended that you set up two factor authentication " +"on your PyPI account. </p> <p> Users who have chosen to set up two factor" +" authentication will be asked to provide their second method of identity " +"verification during the log in process. This only affects logging in via " +"a web browser, and not (yet) package uploads. </p> <p>You can follow the " +"improvements to <abbr title=\"two factor authentication\">2FA</abbr> on " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">discuss.python.org</a>.</p>" +msgstr "" +"<p> L'authentification à deux facteurs (A2F) rend votre compte plus " +"sécurisé en exigeant deux choses pour pouvoir vous connecter : " +"<em>quelque chose que vous savez</em> et <em>quelque chose que vous " +"possédez</em>. </p> <p> Dans le cas de PyPI, « quelque chose que vous " +"savez » sont votre identifiant et votre mot de passe, tandis que « " +"quelque chose que vous possédez » peut être <a href=\"#totp\">une " +"application pour générer un code temporaire</a>, ou bien un <a " +"href=\"#utfkey\">périphérique de sécurité</a> (le plus souvent une clé " +"USB). </p> <p> Il est fortement recommandé de configurer " "l'authentification à deux facteurs sur votre compte PyPI. </p> <p> Les " -"utilisateurs qui ont choisi de configurer l'authentification à deux facteurs " -"devront fournir leur deuxième méthode de vérification d'identité pendant le " -"processus de connexion. Cela affecte uniquement la connexion via un " -"navigateur Web, et pas (encore) la publication des paquets. </p> <p> Vous " -"pouvez suivre les améliorations de l'<abbr title=\"Authentification à Deux " -"Facteurs\">A2F</abbr> sur <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\"></a>. </p>" +"utilisateurs qui ont choisi de configurer l'authentification à deux " +"facteurs devront fournir leur deuxième méthode de vérification d'identité" +" pendant le processus de connexion. Cela affecte uniquement la connexion " +"via un navigateur Web, et pas (encore) la publication des paquets. </p> " +"<p> Vous pouvez suivre les améliorations de l'<abbr " +"title=\"Authentification à Deux Facteurs\">A2F</abbr> sur <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"></a>. </p>" #: warehouse/templates/pages/help.html:290 #, python-format msgid "" "PyPI users can set up two-factor authentication using any authentication " "application that supports the <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based one-time password" -"\">TOTP</abbr> standard</a>." +"target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based one-time " +"password\">TOTP</abbr> standard</a>." msgstr "" "Les utilisateurs de PyPI peuvent configurer l'authentification à deux " -"facteurs en utilisant une application d'authentification qui prend en charge " -"le standard <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\"><abbr title=\"Time-based One-Time Password\">TOTP</abbr></a>." +"facteurs en utilisant une application d'authentification qui prend en " +"charge le standard <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\"><abbr title=\"Time-based One-Time " +"Password\">TOTP</abbr></a>." #: warehouse/templates/pages/help.html:291 msgid "" "<abbr title=\"time-based one-time password\">TOTP</abbr> authentication " -"applications generate a regularly changing authentication code to use when " -"logging into your account." +"applications generate a regularly changing authentication code to use " +"when logging into your account." msgstr "" "Les applications d'authentification <abbr title=\"Time-based One-Time " "Password\">TOTP</abbr> génèrent un code d'authentification changeant " @@ -4234,24 +4252,27 @@ msgstr "" #: warehouse/templates/pages/help.html:292 msgid "" -"Because <abbr title=\"time-based one-time password\">TOTP</abbr> is an open " -"standard, there are many applications that are compatible with your PyPI " -"account. Popular applications include:" +"Because <abbr title=\"time-based one-time password\">TOTP</abbr> is an " +"open standard, there are many applications that are compatible with your " +"PyPI account. Popular applications include:" msgstr "" -"Étant donné que <abbr title=\"Time-based One-Time Password\">TOTP</abbr> est " -"un standard ouvert, il y a de nombreuses applications qui sont compatibles " -"avec votre compte PyPI. Les applications les plus populaires incluent :" +"Étant donné que <abbr title=\"Time-based One-Time Password\">TOTP</abbr> " +"est un standard ouvert, il y a de nombreuses applications qui sont " +"compatibles avec votre compte PyPI. Les applications les plus populaires " +"incluent :" #: warehouse/templates/pages/help.html:295 #, python-format msgid "" -"Google Authenticator for <a href=\"%(android_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Google Authenticator for <a href=\"%(android_href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Android</a> or <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" msgstr "" -"Google Authentificator pour <a href=\"%(android_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Android</a> ou <a href=\"%(ios_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Google Authentificator pour <a href=\"%(android_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Android</a> ou <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/help.html:298 #: warehouse/templates/pages/help.html:300 @@ -4263,13 +4284,15 @@ msgstr "(propriétaire)" #: warehouse/templates/pages/help.html:302 #, python-format msgid "" -"Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Android</a> or <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" msgstr "" -"Duo Mobile pour <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Android</a> ou <a href=\"%(ios_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Duo Mobile pour <a href=\"%(android_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Android</a> ou <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/help.html:308 #: warehouse/templates/pages/help.html:309 @@ -4279,38 +4302,38 @@ msgstr "(libre)" #: warehouse/templates/pages/help.html:313 #, python-format msgid "" -"Some password managers (e.g. <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">1Password</a>) can also generate authentication " -"codes. For security reasons, PyPI only allows you to set up one application " -"per account." +"Some password managers (e.g. <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">1Password</a>) can also generate " +"authentication codes. For security reasons, PyPI only allows you to set " +"up one application per account." msgstr "" -"Certains gestionnaires de mots de passe (ex : <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">1Password</a>) peuvent " -"également générer des codes d'authentification. Pour des raisons de " -"sécurité, PyPI ne vous autorise à configurer qu'une seule application par " -"compte." +"Certains gestionnaires de mots de passe (ex : <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">1Password</a>) " +"peuvent également générer des codes d'authentification. Pour des raisons " +"de sécurité, PyPI ne vous autorise à configurer qu'une seule application " +"par compte." #: warehouse/templates/pages/help.html:321 msgid "" "To set up <abbr title=\"two factor authentication\">2FA</abbr> with an " "authentication application:" msgstr "" -"Pour configurer l'<abbr title=\"Authentification à Deux Facteurs\">A2F</" -"abbr> avec une application d'authentification :" +"Pour configurer l'<abbr title=\"Authentification à Deux " +"Facteurs\">A2F</abbr> avec une application d'authentification :" #: warehouse/templates/pages/help.html:323 msgid "" -"Open an authentication (<abbr title=\"time-based one-time password\">TOTP</" -"abbr>) application" +"Open an authentication (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>) application" msgstr "" -"Ouvrez une application d'authentification (<abbr title=\"Time-based One-Time " -"Password\">TOTP</abbr>)" +"Ouvrez une application d'authentification (<abbr title=\"Time-based One-" +"Time Password\">TOTP</abbr>)" #: warehouse/templates/pages/help.html:324 msgid "" -"Log in to your PyPI account, go to your account settings, and choose \"Add " -"<abbr title=\"two factor authentication\">2FA</abbr> with authentication " -"application\"" +"Log in to your PyPI account, go to your account settings, and choose " +"\"Add <abbr title=\"two factor authentication\">2FA</abbr> with " +"authentication application\"" msgstr "" "Connectez-vous à votre compte PyPI, rendez-vous dans vos paramètre de " "compte, et choisissez « Ajouter l'<abbr title=\"Authentification à Deux " @@ -4318,8 +4341,8 @@ msgstr "" #: warehouse/templates/pages/help.html:325 msgid "" -"PyPI will generate a secret key, specific to your account. This is displayed " -"as a QR code, and as a text code." +"PyPI will generate a secret key, specific to your account. This is " +"displayed as a QR code, and as a text code." msgstr "" "PyPI générera une clé secrète, spécifique pour votre compte. Elle sera " "affichée sous la forme d'un code QR et d'un code textuel." @@ -4327,16 +4350,17 @@ msgstr "" #: warehouse/templates/pages/help.html:326 msgid "" "Scan the QR code with your authentication application, or type it in " -"manually. The method of input will depend on the application you have chosen." +"manually. The method of input will depend on the application you have " +"chosen." msgstr "" -"Scannez le code QR avec votre application d'authentification, ou tapez-le " -"manuellement. La méthode d'entrée dépendra de l'application que vous avez " -"choisi." +"Scannez le code QR avec votre application d'authentification, ou tapez-le" +" manuellement. La méthode d'entrée dépendra de l'application que vous " +"avez choisi." #: warehouse/templates/pages/help.html:327 msgid "" -"Your application will generate an authentication code - use this to verify " -"your set up on PyPI" +"Your application will generate an authentication code - use this to " +"verify your set up on PyPI" msgstr "" "Votre application générera un code d'authentification - utilisez-le pour " "vérifiez votre configuration sur PyPI" @@ -4344,8 +4368,8 @@ msgstr "" #: warehouse/templates/pages/help.html:330 msgid "" "The PyPI server and your application now share your PyPI secret key, " -"allowing your application to generate valid authentication codes for your " -"PyPI account." +"allowing your application to generate valid authentication codes for your" +" PyPI account." msgstr "" "Le serveur de PyPI et votre application partagent désormais votre clé " "secrète PyPI, autorisant votre application à générer des codes " @@ -4359,8 +4383,7 @@ msgstr "La prochaine fois que vous vous connecterez à PyPI vous devrez :" #: warehouse/templates/pages/help.html:334 #: warehouse/templates/pages/help.html:426 msgid "Provide your username and password, as normal" -msgstr "" -"Fournir votre nom d'utilisateur et votre mot de passe, comme d'habitude" +msgstr "Fournir votre nom d'utilisateur et votre mot de passe, comme d'habitude" #: warehouse/templates/pages/help.html:335 msgid "Open your authentication application to generate an authentication code" @@ -4374,34 +4397,34 @@ msgstr "Utiliser ce code pour terminer la connexion à PyPI" #: warehouse/templates/pages/help.html:342 msgid "" -"A security device is a USB key or <a href=\"#utfdevices\">other device</a> " -"that generates a one-time password and sends that password to the browser. " -"This password is then used by PyPI to authenticate you as a user." +"A security device is a USB key or <a href=\"#utfdevices\">other " +"device</a> that generates a one-time password and sends that password to " +"the browser. This password is then used by PyPI to authenticate you as a " +"user." msgstr "" -"Un périphérique de sécurité est une clé USB ou <a href=\"#utfdevices\">un " -"autre périphérique</a> qui génère un mot de passe à usage unique et l'envoie " -"au navigateur. Ce mot de passe est ensuite utilisé par PyPI pour vous " -"authentifier en tant qu'utilisateur." +"Un périphérique de sécurité est une clé USB ou <a href=\"#utfdevices\">un" +" autre périphérique</a> qui génère un mot de passe à usage unique et " +"l'envoie au navigateur. Ce mot de passe est ensuite utilisé par PyPI pour" +" vous authentifier en tant qu'utilisateur." #: warehouse/templates/pages/help.html:344 -msgid "" -"To set up two factor authentication with a <em>USB key</em>, you'll need:" +msgid "To set up two factor authentication with a <em>USB key</em>, you'll need:" msgstr "" -"Pour configurer l'authentification à deux facteurs avec une <em>clé USB</" -"em>, vous devrez :" +"Pour configurer l'authentification à deux facteurs avec une <em>clé " +"USB</em>, vous devrez :" #: warehouse/templates/pages/help.html:346 #, python-format msgid "" -"To use a <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">browser that supports <abbr title=\"web authentication" -"\">WebAuthn</abbr> and PublicKeyCredential</a>, as this is the standard " -"implemented by PyPI." +"To use a <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">browser that supports <abbr title=\"web " +"authentication\">WebAuthn</abbr> and PublicKeyCredential</a>, as this is " +"the standard implemented by PyPI." msgstr "" -"Utiliser un <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">navigateur qui prend en charge <abbr title=\"Web Authentication" -"\">WebAuthn</abbr> et PublicKeyCredential</a>, car il s'agit du standard " -"implémenté par PyPI." +"Utiliser un <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">navigateur qui prend en charge <abbr title=\"Web " +"Authentication\">WebAuthn</abbr> et PublicKeyCredential</a>, car il " +"s'agit du standard implémenté par PyPI." #: warehouse/templates/pages/help.html:347 msgid "To be running JavaScript on your browser" @@ -4410,26 +4433,28 @@ msgstr "Exécuter JavaScript dans votre navigateur" #: warehouse/templates/pages/help.html:348 #, python-format msgid "" -"To use a USB key that adheres to the <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">FIDO U2F specification</a>:" +"To use a USB key that adheres to the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO U2F " +"specification</a>:" msgstr "" -"Utiliser une clé USB qui adhère à la <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">spécification FIDO U2F</a> :" +"Utiliser une clé USB qui adhère à la <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">spécification FIDO" +" U2F</a> :" #: warehouse/templates/pages/help.html:351 #, python-format msgid "" -"Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</a> and <a " -"href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Thetis</a>." +"Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> and <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." msgstr "" -"Les clés populaires incluent <a href=\"%(yubikey_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</a> " -"et <a href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Thetis</a>." +"Les clés populaires incluent <a href=\"%(yubikey_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> et <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." #: warehouse/templates/pages/help.html:358 msgid "" @@ -4437,8 +4462,8 @@ msgid "" "specification</strong>, and will therefore not work with PyPI" msgstr "" "Veuillez noter que certaines clés USB Yubico plus anciennes <strong>ne " -"suivent pas la spécification FIDO</strong>, et ne fonctionneront donc pas " -"avec PyPI" +"suivent pas la spécification FIDO</strong>, et ne fonctionneront donc pas" +" avec PyPI" #: warehouse/templates/pages/help.html:363 msgid "Follow these steps:" @@ -4447,97 +4472,98 @@ msgstr "Suivez ces étapes :" #: warehouse/templates/pages/help.html:365 msgid "" "\n" -" <li>Log in to your PyPI account, go to your account settings, and " -"choose \"Add <abbr title=\"two factor authentication\">2FA</abbr> with " -"security device (e.g. USB key)\"</li>\n" -" <li>Give your key a name. This is necessary because it's possible " -"to add more than one security device to your account.</li>\n" +" <li>Log in to your PyPI account, go to your account settings, " +"and choose \"Add <abbr title=\"two factor authentication\">2FA</abbr> " +"with security device (e.g. USB key)\"</li>\n" +" <li>Give your key a name. This is necessary because it's " +"possible to add more than one security device to your account.</li>\n" " <li>Click on the \"Set up security device\" button</li>\n" -" <li>Insert and touch your USB key, as instructed by your browser</" -"li>\n" +" <li>Insert and touch your USB key, as instructed by your " +"browser</li>\n" " " msgstr "" "\n" " <li>Connectez-vous à votre compte PyPI, rendez-vous dans vos " -"paramètres de compte et choisissez « Ajouter l'<abbr title=" -"\"Authentification à Deux Facteurs\">A2F</abbr> avec un périphérique de " -"sécurité »</li>\n" +"paramètres de compte et choisissez « Ajouter l'<abbr " +"title=\"Authentification à Deux Facteurs\">A2F</abbr> avec un " +"périphérique de sécurité »</li>\n" " <li>Donnez un nom à votre clé. C'est nécessaire car il est " -"possible d'ajouter plus d'un seul périphérique de sécurité à votre compte.</" -"li>\n" -" <li>Cliquez sur le bouton « Configurer le périphérique de sécurité " -"» </li>\n" +"possible d'ajouter plus d'un seul périphérique de sécurité à votre " +"compte.</li>\n" +" <li>Cliquez sur le bouton « Configurer le périphérique de " +"sécurité » </li>\n" " <li>Insérez et touchez votre clé USB, comme indiqué par votre " "navigateur</li>\n" " " #: warehouse/templates/pages/help.html:372 msgid "" -"Once complete, your USB key will be registered to your PyPI account and can " -"be used during the log in process." +"Once complete, your USB key will be registered to your PyPI account and " +"can be used during the log in process." msgstr "" -"Une fois terminé, votre clé USB sera enregistrée dans votre compte PyPI et " -"peut être utilisée pendant le processus de connexion." +"Une fois terminé, votre clé USB sera enregistrée dans votre compte PyPI " +"et peut être utilisée pendant le processus de connexion." #: warehouse/templates/pages/help.html:376 msgid "" "\n" " <li>Provide your username and password, as normal</li>\n" -" <li>Insert and touch your USB key to finish logging into PyPI</" -"li>\n" +" <li>Insert and touch your USB key to finish logging into " +"PyPI</li>\n" " " msgstr "" "\n" " <li>Fournissez votre nom d'utilisateur et votre mot de passe, " "comme d'habitude</li>\n" -" <li>Insérez et touchez votre clé USB pour terminer la connexion à " -"PyPI</li>\n" +" <li>Insérez et touchez votre clé USB pour terminer la connexion" +" à PyPI</li>\n" " " #: warehouse/templates/pages/help.html:387 #, python-format msgid "" "There is a growing ecosystem of <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">devices that are FIDO compliant</a>, and " -"can therefore be used with PyPI." +"target=\"_blank\" rel=\"noopener\">devices that are FIDO compliant</a>, " +"and can therefore be used with PyPI." msgstr "" -"Il y a un écosystème croissant de <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">dispositifs qui sont conformes FIDO</a>, " -"et qui peuvent donc être utilisés avec PyPI." +"Il y a un écosystème croissant de <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">dispositifs qui " +"sont conformes FIDO</a>, et qui peuvent donc être utilisés avec PyPI." #: warehouse/templates/pages/help.html:392 #, python-format msgid "" -"Emerging solutions include biometric (facial and fingerprint) scanners and " -"FIDO compatible credit cards. There is also growing support for <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">mobile " -"phones to act as security devices</a>." +"Emerging solutions include biometric (facial and fingerprint) scanners " +"and FIDO compatible credit cards. There is also growing support for <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">mobile phones to act as security devices</a>." msgstr "" "Parmi les solutions émergentes, citons les scanners biométriques " "(reconnaissance faciale et empreintes digitales) et les cartes de crédit " -"compatibles FIDO. Il y a aussi un intérêt croissant pour <a href=\"%(href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">les téléphones " -"portables comme dispositifs de sécurité</a>." +"compatibles FIDO. Il y a aussi un intérêt croissant pour <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">les téléphones portables comme dispositifs de " +"sécurité</a>." #: warehouse/templates/pages/help.html:398 #, python-format msgid "" -"As PyPI's two factor implementation follows the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"web " -"authentication\">WebAuthn</abbr> standard</a>, PyPI users will be able to " -"take advantage of any future developments in this field." +"As PyPI's two factor implementation follows the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"web " +"authentication\">WebAuthn</abbr> standard</a>, PyPI users will be able to" +" take advantage of any future developments in this field." msgstr "" -"Comme l'implémentation de l'authentification à deux facteurs par PyPI suit " -"le <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">standard <abbr title=\"Web Authentication\">WebAuthn</abbr></a>, les " -"utilisateurs de PyPI seront en mesure de prendre l'avantage de tout " -"développement futur dans ce domaine." +"Comme l'implémentation de l'authentification à deux facteurs par PyPI " +"suit le <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">standard <abbr title=\"Web " +"Authentication\">WebAuthn</abbr></a>, les utilisateurs de PyPI seront en " +"mesure de prendre l'avantage de tout développement futur dans ce domaine." #: warehouse/templates/pages/help.html:407 msgid "" -"If you lose access to your <a href=\"#totp\">authentication application</a> " -"or <a href=\"#utfkey\">security device</a>, you can use these codes to sign " -"into PyPI." +"If you lose access to your <a href=\"#totp\">authentication " +"application</a> or <a href=\"#utfkey\">security device</a>, you can use " +"these codes to sign into PyPI." msgstr "" "Si vous perdez l'accès à votre <a href=\"#totp\">application " "d'authentification</a> ou à votre <a href=\"#utfkey\">périphérique de " @@ -4545,16 +4571,16 @@ msgstr "" #: warehouse/templates/pages/help.html:410 msgid "" -"Recovery codes are <strong>one time use</strong>. They are not a substitute " -"for a <a href=\"#totp\">authentication application</a> or <a href=\"#utfkey" -"\">security device</a> and should only be used for recovery. After using a " -"recovery code to sign in, it becomes inactive." +"Recovery codes are <strong>one time use</strong>. They are not a " +"substitute for a <a href=\"#totp\">authentication application</a> or <a " +"href=\"#utfkey\">security device</a> and should only be used for " +"recovery. After using a recovery code to sign in, it becomes inactive." msgstr "" "Les codes de récupération sont <strong>à usage unique</strong>. Ils ne " -"remplacent pas une <a href=\"#totp\">application d'authentification</a> ou " -"un <a href=\"#utfkey\">périphérique de sécurité</a> et ne doivent être " -"utilisés que pour la récupération du compte. Après l'utilisation d'un code " -"de récupération pour la connexion, celui-ci devient inactif." +"remplacent pas une <a href=\"#totp\">application d'authentification</a> " +"ou un <a href=\"#utfkey\">périphérique de sécurité</a> et ne doivent être" +" utilisés que pour la récupération du compte. Après l'utilisation d'un " +"code de récupération pour la connexion, celui-ci devient inactif." #: warehouse/templates/pages/help.html:416 msgid "To provision recovery codes:" @@ -4570,8 +4596,8 @@ msgstr "" #: warehouse/templates/pages/help.html:419 msgid "" -"Securely store the displayed recovery codes! Consider printing them out and " -"storing them in a safe location or saving them in a password manager." +"Securely store the displayed recovery codes! Consider printing them out " +"and storing them in a safe location or saving them in a password manager." msgstr "" "Conservez les codes de récupération affichés dans un endroit sûr ! Vous " "pouvez les imprimer et les conserver dans un endroit sûr ou bien les " @@ -4579,14 +4605,14 @@ msgstr "" #: warehouse/templates/pages/help.html:422 msgid "" -"If you lose access to your stored recovery codes or use all of them, you can " -"get new ones by selecting \"Regenerate recovery codes\" in your account " -"settings." +"If you lose access to your stored recovery codes or use all of them, you " +"can get new ones by selecting \"Regenerate recovery codes\" in your " +"account settings." msgstr "" -"Si vous perdez l'accès à votre copie des codes de récupération ou que vous " -"les avez tous utilisés, vous pouvez en obtenir de nouveaux en sélectionnant " -"l'option « Régénérer des codes de récupération » dans les paramètres de " -"votre compte." +"Si vous perdez l'accès à votre copie des codes de récupération ou que " +"vous les avez tous utilisés, vous pouvez en obtenir de nouveaux en " +"sélectionnant l'option « Régénérer des codes de récupération » dans les " +"paramètres de votre compte." #: warehouse/templates/pages/help.html:424 msgid "To sign in with a recovery code:" @@ -4594,35 +4620,36 @@ msgstr "Pour se connecter avec un code de récupération :" #: warehouse/templates/pages/help.html:427 msgid "" -"When prompted for Two-Factor Authentication, select \"Login using a Recovery " -"Code\"" +"When prompted for Two-Factor Authentication, select \"Login using a " +"Recovery Code\"" msgstr "" -"Au moment de la demande d'authentification à deux facteurs, sélectionnez « " -"Se connecter avec un code de récupération »" +"Au moment de la demande d'authentification à deux facteurs, sélectionnez " +"« Se connecter avec un code de récupération »" #: warehouse/templates/pages/help.html:428 msgid "" -"As each code can be used only once, you might want to mark the code as used" +"As each code can be used only once, you might want to mark the code as " +"used" msgstr "" "Comme chaque code ne peut être utilisé qu'une seule fois, vous devriez " "marquer le code comme étant utilisé" #: warehouse/templates/pages/help.html:429 msgid "" -"If you have few recovery codes remaining, you may also want to generate a " -"new set using the \"Regenerate recovery codes\" button in your account " +"If you have few recovery codes remaining, you may also want to generate a" +" new set using the \"Regenerate recovery codes\" button in your account " "settings." msgstr "" -"S'il ne vous reste plus beaucoup de codes de récupération, vous pouvez aussi " -"en générer un nouveau jeu en utilisant le bouton « Régénérer des codes de " -"récupération » dans les paramètres de votre compte." +"S'il ne vous reste plus beaucoup de codes de récupération, vous pouvez " +"aussi en générer un nouveau jeu en utilisant le bouton « Régénérer des " +"codes de récupération » dans les paramètres de votre compte." #: warehouse/templates/pages/help.html:434 msgid "" "\n" -" <p>API tokens provide an alternative way (instead of username and " -"password) to authenticate when <strong>uploading packages</strong> to PyPI.</" -"p>\n" +" <p>API tokens provide an alternative way (instead of username " +"and password) to authenticate when <strong>uploading packages</strong> to" +" PyPI.</p>\n" " <p>You can create a token for an entire PyPI account, in which " "case, the token will work for all projects associated with that account. " "Alternatively, you can limit a token's scope to a specific project.</p>\n" @@ -4632,15 +4659,15 @@ msgid "" " " msgstr "" "\n" -" <p>Les jetons d'API fournissent une alternative (au lieu d'un nom " -"d'utilisateur et d'un mot de passe) à l'authentification sur PyPI lors de la " -"<strong>publication de paquets</strong></p>\n" -" <p>Vous pouvez créer un jeton pour l'ensemble d'un compte PyPI, " -"dans ce cas, le jeton fonctionnera pour tous les projets associés à ce " +" <p>Les jetons d'API fournissent une alternative (au lieu d'un " +"nom d'utilisateur et d'un mot de passe) à l'authentification sur PyPI " +"lors de la <strong>publication de paquets</strong></p>\n" +" <p>Vous pouvez créer un jeton pour l'ensemble d'un compte PyPI," +" dans ce cas, le jeton fonctionnera pour tous les projets associés à ce " "compte. Autrement, vous pouvez limiter la portée d'un jeton à un projet " "spécifique.</p>\n" -" <p><strong>Nous vous recommandons fortement de vous connecter avec " -"un jeton d'API lorsque c'est possible.</strong></p>\n" +" <p><strong>Nous vous recommandons fortement de vous connecter " +"avec un jeton d'API lorsque c'est possible.</strong></p>\n" "\n" " " @@ -4663,8 +4690,8 @@ msgid "" "In your <a href=\"%(href)s\">account settings</a>, go to the API tokens " "section and select \"Add API token\"" msgstr "" -"Dans vos <a href=\"%(href)s\">paramètres de compte</a>, rendez-vous dans la " -"section des jetons d'API et sélectionnez « Ajouter un jeton d'API »" +"Dans vos <a href=\"%(href)s\">paramètres de compte</a>, rendez-vous dans " +"la section des jetons d'API et sélectionnez « Ajouter un jeton d'API »" #: warehouse/templates/pages/help.html:448 msgid "To use an API token:" @@ -4676,7 +4703,8 @@ msgstr "Définissez votre nom d'utilisateur à <code>__token__</code>" #: warehouse/templates/pages/help.html:452 msgid "" -"Set your password to the token value, including the <code>pypi-</code> prefix" +"Set your password to the token value, including the <code>pypi-</code> " +"prefix" msgstr "" "Définissez votre mot de passer à la valeur du jeton, incluant le préfixe " "<code>pypi-</code>" @@ -4684,34 +4712,36 @@ msgstr "" #: warehouse/templates/pages/help.html:456 #, python-format msgid "" -"Where you edit or add these values will depend on your individual use case. " -"For example, some users may need to edit <a href=\"%(pypirc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">their <code>.pypirc</code> " -"file</a>, while others may need to update their CI configuration file (e.g. " -"<a href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\"><code>.travis.yml</code> if you are using Travis</a>)." +"Where you edit or add these values will depend on your individual use " +"case. For example, some users may need to edit <a " +"href=\"%(pypirc_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">their <code>.pypirc</code> file</a>, while others may " +"need to update their CI configuration file (e.g. <a " +"href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>.travis.yml</code> if you are using Travis</a>)." msgstr "" "Lorsque vous modifiez ou ajoutez ces valeurs, cela dépendra de votre " -"utilisation. Par exemple, certains utilisateurs pourrait devoir modifier <a " -"href=\"%(pypirc_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">leur fichier <code>.pypirc</code></a>, tandis que d'autres utilisateurs " -"devraient mettre à jour le fichier de configuration CI (ex : <a href=" -"\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><code>.travis.yml</code> si vous utilisez Travis</a>)." +"utilisation. Par exemple, certains utilisateurs pourrait devoir modifier " +"<a href=\"%(pypirc_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">leur fichier <code>.pypirc</code></a>, tandis que " +"d'autres utilisateurs devraient mettre à jour le fichier de configuration" +" CI (ex : <a href=\"%(travis_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\"><code>.travis.yml</code> si vous " +"utilisez Travis</a>)." #: warehouse/templates/pages/help.html:460 msgid "" -"Advanced users may wish to inspect their token by decoding it with base64, " -"and checking the output against the unique identifier displayed on PyPI." +"Advanced users may wish to inspect their token by decoding it with " +"base64, and checking the output against the unique identifier displayed " +"on PyPI." msgstr "" -"Les utilisateurs avancés peuvent vouloir inspecter leur jeton en le décodant " -"avec base64, et en vérifiant la sortie par rapport à l'identifiant unique " -"affiché sur PyPI." +"Les utilisateurs avancés peuvent vouloir inspecter leur jeton en le " +"décodant avec base64, et en vérifiant la sortie par rapport à " +"l'identifiant unique affiché sur PyPI." #: warehouse/templates/pages/help.html:468 msgid "Yes, including RSS feeds of new packages and new releases." -msgstr "" -"Oui, y compris les flux RSS des nouveaux paquets et nouvelles versions." +msgstr "Oui, y compris les flux RSS des nouveaux paquets et nouvelles versions." #: warehouse/templates/pages/help.html:468 msgid "See the API reference." @@ -4720,141 +4750,148 @@ msgstr "Voir la référence de l'API." #: warehouse/templates/pages/help.html:471 #, python-format msgid "" -"If you need to run your own mirror of PyPI, the <a href=\"%(href)s" -"\">bandersnatch project</a> is the recommended solution. Note that the " -"storage requirements for a PyPI mirror would exceed 1 terabyte—and growing!" +"If you need to run your own mirror of PyPI, the <a " +"href=\"%(href)s\">bandersnatch project</a> is the recommended solution. " +"Note that the storage requirements for a PyPI mirror would exceed 1 " +"terabyte—and growing!" msgstr "" -"Si vous avez besoin d’exécuter votre propre miroir de PyPI, le <a href=" -"\"%(href)s\">projet bandersnatch</a> est la solution recommandée. Notez que " -"les exigences de stockage pour un miroir de PyPI dépasseraient 1 téraoctet - " -"et continuerons d'augmenter !" +"Si vous avez besoin d’exécuter votre propre miroir de PyPI, le <a " +"href=\"%(href)s\">projet bandersnatch</a> est la solution recommandée. " +"Notez que les exigences de stockage pour un miroir de PyPI dépasseraient " +"1 téraoctet - et continuerons d'augmenter !" #: warehouse/templates/pages/help.html:474 #, python-format msgid "" -"PyPI itself does not offer a way to get notified when a project uploads new " -"releases. However, there are several third-party services that offer " +"PyPI itself does not offer a way to get notified when a project uploads " +"new releases. However, there are several third-party services that offer " "comprehensive monitoring and notifications for project releases and " -"vulnerabilities listed as <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">GitHub apps</a>." +"vulnerabilities listed as <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">GitHub apps</a>." msgstr "" -"PyPi lui-même n'offre pas de moyen d'être notifié lors de la publication de " -"projets ou de nouvelles versions. En revanche, il y a plusieurs services " -"tiers qui offrent un suivi complet et des notifications pour les versions de " -"projet et les vulnérabilités listée comme <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">applications GitHub</a>." +"PyPi lui-même n'offre pas de moyen d'être notifié lors de la publication " +"de projets ou de nouvelles versions. En revanche, il y a plusieurs " +"services tiers qui offrent un suivi complet et des notifications pour les" +" versions de projet et les vulnérabilités listée comme <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">applications GitHub</a>." #: warehouse/templates/pages/help.html:477 #, python-format msgid "" -"You can <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">analyze PyPI download usage statistics via our public dataset " -"on Google BigQuery</a>." +"You can <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">analyze PyPI download usage statistics via our public " +"dataset on Google BigQuery</a>." msgstr "" -"Vous pouvez <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">analyser les statistiques d'utilisation des téléchargements " -"PyPI via notre ensemble de données publiques sur Google BigQuery</a>." +"Vous pouvez <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">analyser les statistiques d'utilisation des " +"téléchargements PyPI via notre ensemble de données publiques sur Google " +"BigQuery</a>." #: warehouse/templates/pages/help.html:479 #, python-format msgid "" -"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.io provides statistics for PyPI projects</a> (<a href=" -"\"%(libs_io_example_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">example</a>, <a href=\"%(libs_io_api_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">API</a>) including GitHub stars and " -"forks, dependency tracking (<a href=\"%(in_progress_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">in progress</a>), and <a " -"href=\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">other relevant factors</a>." -msgstr "" -"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.io fournit des statistiques pour les projets PyPI</a> " -"(<a href=\"%(libs_io_example_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">exemple</a>, <a href=\"%(libs_io_api_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">API</a>), y compris les " -"stars et les forks GitHub, le suivi des dépendances (<a href=" -"\"%(in_progress_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">en cours</a>), et <a href=\"%(other_factors_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">autres facteurs pertinents</a>." +"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io provides statistics for PyPI projects</a> " +"(<a href=\"%(libs_io_example_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">example</a>, <a " +"href=\"%(libs_io_api_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">API</a>) including GitHub stars and forks, dependency " +"tracking (<a href=\"%(in_progress_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">in progress</a>), and <a " +"href=\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">other relevant factors</a>." +msgstr "" +"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io fournit des statistiques pour les projets " +"PyPI</a> (<a href=\"%(libs_io_example_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">exemple</a>, <a " +"href=\"%(libs_io_api_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">API</a>), y compris les stars et les forks GitHub, le " +"suivi des dépendances (<a href=\"%(in_progress_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">en cours</a>), et " +"<a href=\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">autres facteurs pertinents</a>." #: warehouse/templates/pages/help.html:488 #, python-format msgid "" -"For recent statistics on uptime and performance, see <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status page</a>." +"For recent statistics on uptime and performance, see <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status " +"page</a>." msgstr "" "Pour des statistiques récentes sur la disponibilité de service et la " -"performance, consultez <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">notre page de statut</a>." +"performance, consultez <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">notre page de statut</a>." #: warehouse/templates/pages/help.html:495 #, python-format msgid "" -"PyPI does not support publishing private packages. If you need to publish " -"your private package to a package index, the recommended solution is to run " -"your own deployment of the <a href=\"%(href)s\">devpi project</a>." +"PyPI does not support publishing private packages. If you need to publish" +" your private package to a package index, the recommended solution is to " +"run your own deployment of the <a href=\"%(href)s\">devpi project</a>." msgstr "" -"PyPi ne prend pas en charge la publication de paquets privés. Si vous avez " -"besoin de publier votre paquet privé dans un index de paquets, la solution " -"recommandée est d'exécuter votre propre déploiement du <a href=\"%(href)s" -"\">projet devpi</a>." +"PyPi ne prend pas en charge la publication de paquets privés. Si vous " +"avez besoin de publier votre paquet privé dans un index de paquets, la " +"solution recommandée est d'exécuter votre propre déploiement du <a " +"href=\"%(href)s\">projet devpi</a>." #: warehouse/templates/pages/help.html:498 msgid "" "Your publishing tool may return an error that your new project can't be " -"created with your desired name, despite no evidence of a project or release " -"of the same name on PyPI. Currently, there are three primary reasons this " -"may occur:" +"created with your desired name, despite no evidence of a project or " +"release of the same name on PyPI. Currently, there are three primary " +"reasons this may occur:" msgstr "" "Votre outil de publication peut renvoyer une erreur indiquant que votre " -"nouveau projet ne peut pas être créé avec le nom désiré, malgré l'absence de " -"preuve d'un projet ou d'une version du même nom sur PyPI. Actuellement, il y " -"a trois raisons principales pour lesquelles cela peut se produire :" +"nouveau projet ne peut pas être créé avec le nom désiré, malgré l'absence" +" de preuve d'un projet ou d'une version du même nom sur PyPI. " +"Actuellement, il y a trois raisons principales pour lesquelles cela peut " +"se produire :" #: warehouse/templates/pages/help.html:500 #, python-format msgid "" -"The project name conflicts with a <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Standard Library</a> module from " -"any major version from 2.5 to present." +"The project name conflicts with a <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Standard " +"Library</a> module from any major version from 2.5 to present." msgstr "" "Le nom du projet entre en conflit avec un module de <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">bibliothèque standard " -"Python</a> à partir de toute version majeure depuis la version 2.5 jusqu'à " -"aujourd'hui." +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">bibliothèque " +"standard Python</a> à partir de toute version majeure depuis la version " +"2.5 jusqu'à aujourd'hui." #: warehouse/templates/pages/help.html:501 #, python-format msgid "" -"The project name has been explicitly prohibited by the PyPI administrators. " -"For example, <code>%(incorrect_code)s</code> is a common typo for <code>" -"%(correct_code)s</code>, and should not surprise the user with a malicious " -"package." +"The project name has been explicitly prohibited by the PyPI " +"administrators. For example, <code>%(incorrect_code)s</code> is a common " +"typo for <code>%(correct_code)s</code>, and should not surprise the user " +"with a malicious package." msgstr "" "Le nom du projet a été explicitement interdit par les administrateurs de " -"PyPI. Par exemple, <code>%(incorrect_code)s</code> est une coquille commune " -"pour <code>%(correct_code)s</code>, et ne devrait pas surprendre " +"PyPI. Par exemple, <code>%(incorrect_code)s</code> est une coquille " +"commune pour <code>%(correct_code)s</code>, et ne devrait pas surprendre " "l'utilisateur avec un paquet malveillant." #: warehouse/templates/pages/help.html:502 msgid "" -"The project name has been registered by another user, but no releases have " -"been created." +"The project name has been registered by another user, but no releases " +"have been created." msgstr "" -"Le nom du projet a déjà été enregistré par un autre utilisateur, mais aucune " -"version n'a été créée." +"Le nom du projet a déjà été enregistré par un autre utilisateur, mais " +"aucune version n'a été créée." #: warehouse/templates/pages/help.html:506 #, python-format msgid "" -"Follow the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">\"How to request a name transfer\"</a> section of <abbr title=" -"\"Python enhancement proposal\">PEP</abbr> 541." +"Follow the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">\"How to request a name transfer\"</a> section of <abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 541." msgstr "" -"Suivez la section <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">« Comment demander un transfert de nom »</a> du <abbr title=" -"\"Python enhancement proposal\">PEP</abbr> 541." +"Suivez la section <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">« Comment demander un transfert de nom" +" »</a> du <abbr title=\"Python enhancement proposal\">PEP</abbr> 541." #: warehouse/templates/pages/help.html:511 msgid "Owner:" @@ -4862,85 +4899,88 @@ msgstr "Propriétaire :" #: warehouse/templates/pages/help.html:514 msgid "" -"Only the current owners of a project have the ability to add new owners or " -"maintainers. If you need to request ownership, you should contact the " -"current owner(s) of the project directly. Many project owners provide their " -"contact details in the 'Author' field of the 'Meta' details on the project " -"page." +"Only the current owners of a project have the ability to add new owners " +"or maintainers. If you need to request ownership, you should contact the " +"current owner(s) of the project directly. Many project owners provide " +"their contact details in the 'Author' field of the 'Meta' details on the " +"project page." msgstr "" -"Seuls les propriétaires actuels d'un projet ont la possibilité d'ajouter de " -"nouveaux propriétaires ou mainteneurs. Si vous devez faire une demande de " -"propriété, vous devez communiquer directement avec le ou les propriétaires " -"actuels du projet. De nombreux propriétaires de projets fournissent leurs " -"coordonnées dans le champ « Auteur » des détails « Métadonnées » sur la page " -"du projet." +"Seuls les propriétaires actuels d'un projet ont la possibilité d'ajouter " +"de nouveaux propriétaires ou mainteneurs. Si vous devez faire une demande" +" de propriété, vous devez communiquer directement avec le ou les " +"propriétaires actuels du projet. De nombreux propriétaires de projets " +"fournissent leurs coordonnées dans le champ « Auteur » des détails « " +"Métadonnées » sur la page du projet." #: warehouse/templates/pages/help.html:515 #, python-format -msgid "" -"If the owner is unresponsive, see <a href=\"%(href)s\">%(anchor_text)s</a>" +msgid "If the owner is unresponsive, see <a href=\"%(href)s\">%(anchor_text)s</a>" msgstr "" -"Si le propriétaire ne répond pas, voir <a href=\"%(href)s\">%(anchor_text)s</" -"a>" +"Si le propriétaire ne répond pas, voir <a " +"href=\"%(href)s\">%(anchor_text)s</a>" #: warehouse/templates/pages/help.html:518 #, python-format msgid "" -"By default, an upload's description will render with <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">reStructuredText</a>. " -"If the description is in an alternate format like Markdown, a package may " -"set the <code>long_description_content_type</code> in <code>setup.py</code> " -"to the alternate format." +"By default, an upload's description will render with <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">reStructuredText</a>. If the description is in an " +"alternate format like Markdown, a package may set the " +"<code>long_description_content_type</code> in <code>setup.py</code> to " +"the alternate format." msgstr "" "Par défaut, une description de la publication sera mise en forme avec <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">reStructuredText</a>. Si la description est dans un format différent " -"comme le Markdown, un paquet peut définir le " -"<code>long_description_content_type</code> dans le fichier <code>setup.py</" -"code> dans un autre format." +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">reStructuredText</a>. Si la description est dans un " +"format différent comme le Markdown, un paquet peut définir le " +"<code>long_description_content_type</code> dans le fichier " +"<code>setup.py</code> dans un autre format." #: warehouse/templates/pages/help.html:519 #, python-format msgid "" -"Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging User Guide</a> for details on the available " -"formats." +"Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a> for details on the " +"available formats." msgstr "" -"Référez vous au <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Guide Utilisateur de l'Empaquetage Python</a> pour plus de " -"détails sur les formats disponibles." +"Référez vous au <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Guide Utilisateur de l'Empaquetage " +"Python</a> pour plus de détails sur les formats disponibles." #: warehouse/templates/pages/help.html:520 #, python-format msgid "" "PyPI will reject uploads if the description fails to render. To check a " -"description locally for validity, you may use <a href=\"%(href)s" -"\">readme_renderer</a>, which is the same description renderer used by PyPI." +"description locally for validity, you may use <a " +"href=\"%(href)s\">readme_renderer</a>, which is the same description " +"renderer used by PyPI." msgstr "" -"PyPI rejette les publications si la mise en forme de la description échoue. " -"Pour vérifier la validité d'une description en local, vous pouvez utiliser " -"<a href=\"%(href)s\">readme_renderer</a>, qui utilise le même système de " -"mise en forme des descriptions que PyPI." +"PyPI rejette les publications si la mise en forme de la description " +"échoue. Pour vérifier la validité d'une description en local, vous pouvez" +" utiliser <a href=\"%(href)s\">readme_renderer</a>, qui utilise le même " +"système de mise en forme des descriptions que PyPI." #: warehouse/templates/pages/help.html:524 #, python-format msgid "" -"If you can't upload your project's release to PyPI because you're hitting " -"the upload file size limit, we can sometimes increase your limit. Make sure " -"you've uploaded at least one release for the project that's <em>under</em> " -"the limit (a <a href=\"%(dev_release_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">developmental release version number</a> is " -"fine). Then, <a href=\"%(file_issue_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">file an issue</a> and tell us:</p>" -msgstr "" -"Si vous ne pouvez pas publier la version de votre projet dans PyPI parce que " -"vous atteignez la limite de taille du fichier publié, nous pouvons parfois " -"augmenter votre limite. Assurez-vous d'avoir téléchargé au moins une version " -"pour le projet qui est <em>en dessous</em> de la limite (un <a href=" -"\"%(dev_release_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">numéro de version de développement</a> est suffisant). Ensuite, <a href=" -"\"%(file_issue_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">déposez un problème</a> et donnez-nous :</p>" +"If you can't upload your project's release to PyPI because you're hitting" +" the upload file size limit, we can sometimes increase your limit. Make " +"sure you've uploaded at least one release for the project that's " +"<em>under</em> the limit (a <a href=\"%(dev_release_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">developmental " +"release version number</a> is fine). Then, <a " +"href=\"%(file_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">file an issue</a> and tell us:</p>" +msgstr "" +"Si vous ne pouvez pas publier la version de votre projet dans PyPI parce " +"que vous atteignez la limite de taille du fichier publié, nous pouvons " +"parfois augmenter votre limite. Assurez-vous d'avoir téléchargé au moins " +"une version pour le projet qui est <em>en dessous</em> de la limite (un " +"<a href=\"%(dev_release_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">numéro de version de développement</a> est suffisant). " +"Ensuite, <a href=\"%(file_issue_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">déposez un problème</a> et donnez-nous" +" :</p>" #: warehouse/templates/pages/help.html:532 msgid "A link to your project on PyPI (or Test PyPI)" @@ -4951,40 +4991,36 @@ msgid "The size of your release, in megabytes" msgstr "La taille de votre version, en mégaoctets" #: warehouse/templates/pages/help.html:534 -msgid "" -"Which index/indexes you need the increase for (PyPI, Test PyPI, or both)" -msgstr "" -"Quel(s) index vous avez besoin d'augmenter (PyPI, Test PyPI ou les deux)" +msgid "Which index/indexes you need the increase for (PyPI, Test PyPI, or both)" +msgstr "Quel(s) index vous avez besoin d'augmenter (PyPI, Test PyPI ou les deux)" #: warehouse/templates/pages/help.html:535 msgid "" -"A brief description of your project, including the reason for the additional " -"size." +"A brief description of your project, including the reason for the " +"additional size." msgstr "" "Un brève description de votre projet, incluant la raison pour la taille " "supplémentaire." #: warehouse/templates/pages/help.html:544 msgid "" -"If you've forgotten your PyPI password but you remember your email address " -"or username, follow these steps to reset your password:" +"If you've forgotten your PyPI password but you remember your email " +"address or username, follow these steps to reset your password:" msgstr "" -"Si vous avez oublié votre mot de passe PyPI mais que vous vous souvenez de " -"votre adresse e-mail ou de votre nom d'utilisateur, suivez ces étapes pour " -"réinitialiser votre mot de passe :" +"Si vous avez oublié votre mot de passe PyPI mais que vous vous souvenez " +"de votre adresse e-mail ou de votre nom d'utilisateur, suivez ces étapes " +"pour réinitialiser votre mot de passe :" #: warehouse/templates/pages/help.html:546 #, python-format msgid "Go to <a href=\"%(href)s\">reset your password</a>." -msgstr "" -"Rendez-vous sur <a href=\"%(href)s\">réinitialiser votre mot de passe</a>." +msgstr "Rendez-vous sur <a href=\"%(href)s\">réinitialiser votre mot de passe</a>." #: warehouse/templates/pages/help.html:547 -msgid "" -"Enter the email address or username you used for PyPI and submit the form." +msgid "Enter the email address or username you used for PyPI and submit the form." msgstr "" -"Entrez l'adresse e-mail ou le nom d'utilisateur que vous avez utilisé pour " -"PyPI et soumettez le formulaire." +"Entrez l'adresse e-mail ou le nom d'utilisateur que vous avez utilisé " +"pour PyPI et soumettez le formulaire." #: warehouse/templates/pages/help.html:548 msgid "You'll receive an email with a password reset link." @@ -5002,33 +5038,32 @@ msgstr "Vous avez perdu l'accès à l'adresse e-mail associés à votre compte" #: warehouse/templates/pages/help.html:556 msgid "" -"Lost two factor authentication <a href=\"#totp\">application</a>, <a href=" -"\"#utfkey\">device</a>, and <a href=\"#recoverycodes\">recovery codes</a>" +"Lost two factor authentication <a href=\"#totp\">application</a>, <a " +"href=\"#utfkey\">device</a>, and <a href=\"#recoverycodes\">recovery " +"codes</a>" msgstr "" "Vous avez perdu l'accès à votre <a href=\"#totp\">application " -"d'authentification</a>, <a href=\"#utfkey\">périphérique de sécurité</a> et " -"à vos <a href=\"#recoverycodes\">codes de récupération</a>" +"d'authentification</a>, <a href=\"#utfkey\">périphérique de sécurité</a> " +"et à vos <a href=\"#recoverycodes\">codes de récupération</a>" #: warehouse/templates/pages/help.html:559 #, python-format msgid "" -"You can proceed to, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">file an issue on our tracker</a> to request assistance " -"with account recovery." +"You can proceed to, <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">file an issue on our tracker</a> to " +"request assistance with account recovery." msgstr "" -"Vous pouvez, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">déposer un problème</a> pour demander de l'aide sur la " +"Vous pouvez, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">déposer un problème</a> pour demander de l'aide sur la " "récupération de compte." #: warehouse/templates/pages/help.html:566 msgid "If you are using a username and password for uploads:" -msgstr "" -"SI vous utilisez un nom d'utilisateur et un mot de passe pour publier :" +msgstr "SI vous utilisez un nom d'utilisateur et un mot de passe pour publier :" #: warehouse/templates/pages/help.html:568 msgid "Check to see if your username or password are incorrect." -msgstr "" -"Vérifiez si votre nom d'utilisateur et votre mot de passe sont corrects." +msgstr "Vérifiez si votre nom d'utilisateur et votre mot de passe sont corrects." #: warehouse/templates/pages/help.html:569 msgid "" @@ -5040,8 +5075,7 @@ msgstr "" #: warehouse/templates/pages/help.html:571 msgid "If you are using an <a href=\"#apitoken\">API Token</a> for uploads:" -msgstr "" -"Si vous utilisez un <a href=\"#apitoken\">jeton d'API</a> pour publier :" +msgstr "Si vous utilisez un <a href=\"#apitoken\">jeton d'API</a> pour publier :" #: warehouse/templates/pages/help.html:573 msgid "Ensure that your API Token is valid and has not been revoked." @@ -5049,159 +5083,164 @@ msgstr "Assurez-vous que votre jeton d'API est valide et n'a pas été révoqué #: warehouse/templates/pages/help.html:574 msgid "" -"Ensure that your API Token is <a href=\"#apitoken\">properly formatted</a> " -"and does not contain any trailing characters such as newlines." +"Ensure that your API Token is <a href=\"#apitoken\">properly " +"formatted</a> and does not contain any trailing characters such as " +"newlines." msgstr "" -"Assurez-vous que votre jeton d'API est <a href=\"#apitoken\">correctement " -"formaté</a> et ne contient pas de caractères de fin de ligne." +"Assurez-vous que votre jeton d'API est <a href=\"#apitoken\">correctement" +" formaté</a> et ne contient pas de caractères de fin de ligne." #: warehouse/templates/pages/help.html:579 #, python-format msgid "" -"Transport Layer Security, or TLS, is part of how we make sure connections " -"between your computer and PyPI are private and secure. It's a cryptographic " -"protocol that's had several versions over time. PyPI <a href=" -"\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">turned off support for TLS versions 1.0 and 1.1</a> in April " -"2018. <a href=\"%(reason_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Learn why on the PSF blog</a>." -msgstr "" -"Le protocole Transport Layer Security, ou TLS, fait partie de la façon dont " -"nous assurons la confidentialité et la sécurité des connexions entre votre " -"ordinateur et PyPI. Il s'agit un protocole cryptographique qui a eu " -"plusieurs versions au fil du temps. PyPI <a href=\"%(announcement_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">a arrêté de prendre " -"en charge les versions 1.0 et 1.1 de TLS</a> en avril 2018. <a href=" -"\"%(reason_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Découvrez pourquoi sur le blog de PSF</a>." +"Transport Layer Security, or TLS, is part of how we make sure connections" +" between your computer and PyPI are private and secure. It's a " +"cryptographic protocol that's had several versions over time. PyPI <a " +"href=\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">turned off support for TLS versions 1.0 and 1.1</a> in " +"April 2018. <a href=\"%(reason_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Learn why on the PSF blog</a>." +msgstr "" +"Le protocole Transport Layer Security, ou TLS, fait partie de la façon " +"dont nous assurons la confidentialité et la sécurité des connexions entre" +" votre ordinateur et PyPI. Il s'agit un protocole cryptographique qui a " +"eu plusieurs versions au fil du temps. PyPI <a " +"href=\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">a arrêté de prendre en charge les versions 1.0 et 1.1 de" +" TLS</a> en avril 2018. <a href=\"%(reason_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Découvrez pourquoi sur le blog de " +"PSF</a>." #: warehouse/templates/pages/help.html:586 #, python-format msgid "" -"If you are having trouble with <code>%(command)s</code> and get a <code>No " -"matching distribution found</code> or <code>Could not fetch URL</code> " -"error, try adding <code>-v</code> to the command to get more information:" +"If you are having trouble with <code>%(command)s</code> and get a " +"<code>No matching distribution found</code> or <code>Could not fetch " +"URL</code> error, try adding <code>-v</code> to the command to get more " +"information:" msgstr "" -"Si vous avez des problèmes avec <code>%(command)s</code> et obtenez l'erreur " -"<code>Aucune distribution correspondante trouvée</code> ou <code>Impossible " -"de récupérer l'URL</code>, essayer d'ajouter <code>-v</code> à la commande " -"pour obtenir plus d'informations :" +"Si vous avez des problèmes avec <code>%(command)s</code> et obtenez " +"l'erreur <code>Aucune distribution correspondante trouvée</code> ou " +"<code>Impossible de récupérer l'URL</code>, essayer d'ajouter " +"<code>-v</code> à la commande pour obtenir plus d'informations :" #: warehouse/templates/pages/help.html:588 msgid "" "If you see an error like <code>There was a problem confirming the ssl " "certificate</code> or <code>tlsv1 alert protocol version</code> or " -"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, you need to be connecting to PyPI " -"with a newer TLS support library." +"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, you need to be connecting to " +"PyPI with a newer TLS support library." msgstr "" "Si vous voyez une erreur comme <code>Un problème est survenu lors de la " -"confirmation du certificat SSL</code> ou <code>tlsv1 alert protocol version</" -"code> ou <code>TLSV1_ALERT_PROTOCOL_VERSION</code>, vous devrez vous " -"connecter à PyPI avec une bibliothèque TLS plus récente." +"confirmation du certificat SSL</code> ou <code>tlsv1 alert protocol " +"version</code> ou <code>TLSV1_ALERT_PROTOCOL_VERSION</code>, vous devrez " +"vous connecter à PyPI avec une bibliothèque TLS plus récente." #: warehouse/templates/pages/help.html:589 msgid "" "The specific steps you need to take will depend on your operating system " -"version, where your installation of Python originated (python.org, your OS " -"vendor, or an intermediate distributor), and the installed versions of " -"Python, <code>setuptools</code>, and <code>pip</code>." +"version, where your installation of Python originated (python.org, your " +"OS vendor, or an intermediate distributor), and the installed versions of" +" Python, <code>setuptools</code>, and <code>pip</code>." msgstr "" -"Les étapes spécifiques que vous devrez suivre dépendront de la version de " -"votre système d'exploitation, de l'origine de votre installation de Python " -"(python.org, votre fournisseur de SE ou un distributeur intermédiaire) et " -"des versions de Python, de <code>setuptools</code>, et de <code>pip</code> " -"installées." +"Les étapes spécifiques que vous devrez suivre dépendront de la version de" +" votre système d'exploitation, de l'origine de votre installation de " +"Python (python.org, votre fournisseur de SE ou un distributeur " +"intermédiaire) et des versions de Python, de <code>setuptools</code>, et " +"de <code>pip</code> installées." #: warehouse/templates/pages/help.html:591 #, python-format msgid "" -"For help, go to <a href=\"%(irc_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">the <code>#pypa</code> IRC channel on Freenode</a>, file " -"an issue at <a href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">pypa/packaging-problems/issues</a>, or <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">post to the python-help mailing list</a>, including your OS and " -"installation details and the output of <code>%(command)s</code>." -msgstr "" -"Pour obtenir de l'aide, rendez-vous sur <a href=\"%(irc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">le canal IRC <code>#pypa</" -"code> sur Freenode</a>, déposez un problème sur <a href=" -"\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">pypa/packaging-problems/issues</a>, ou <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">postez un message sur la liste de diffusion python-help</a>, en " -"indiquant votre système d'exploitation et les détails de votre installation " -"ainsi que la sortie de <code>%(command)s</code>." +"For help, go to <a href=\"%(irc_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">the <code>#pypa</code> IRC channel on " +"Freenode</a>, file an issue at <a href=\"%(issue_tracker_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">pypa/packaging-" +"problems/issues</a>, or <a href=\"%(mailing_list_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">post to the " +"python-help mailing list</a>, including your OS and installation details " +"and the output of <code>%(command)s</code>." +msgstr "" +"Pour obtenir de l'aide, rendez-vous sur <a href=\"%(irc_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">le canal IRC " +"<code>#pypa</code> sur Freenode</a>, déposez un problème sur <a " +"href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">pypa/packaging-problems/issues</a>, ou <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">postez un message sur la liste de diffusion python-" +"help</a>, en indiquant votre système d'exploitation et les détails de " +"votre installation ainsi que la sortie de <code>%(command)s</code>." #: warehouse/templates/pages/help.html:602 #, python-format msgid "" -"We take <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">accessibility</a> very seriously and want to make the website " -"easy to use for everyone." +"We take <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">accessibility</a> very seriously and want to make the " +"website easy to use for everyone." msgstr "" -"Nous prenons <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">l'accessibilité</a> très au sérieux et nous voulons rendre le " -"site simple d'utilisation pour tout le monde." +"Nous prenons <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">l'accessibilité</a> très au sérieux et nous voulons " +"rendre le site simple d'utilisation pour tout le monde." #: warehouse/templates/pages/help.html:607 #, python-format msgid "" -"If you are experiencing an accessibility problem, <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">report it to us on GitHub</" -"a>, so we can try to fix the problem, for you and others." +"If you are experiencing an accessibility problem, <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">report it to us on" +" GitHub</a>, so we can try to fix the problem, for you and others." msgstr "" -"Si vous rencontrez un problème d'accessibilité, <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">signalez-le nous sur " -"GitHub</a>, afin que nous puissions essayer de corriger le problème, pour " -"vous et les autres." +"Si vous rencontrez un problème d'accessibilité, <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">signalez-le nous " +"sur GitHub</a>, afin que nous puissions essayer de corriger le problème, " +"pour vous et les autres." #: warehouse/templates/pages/help.html:615 #, python-format msgid "" "In a previous version of PyPI, it used to be possible for maintainers to " -"upload releases to PyPI using a form in the web browser. This feature was " -"deprecated with the new version of PyPI – we instead recommend that you <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">use " -"twine to upload your project to PyPI</a>." -msgstr "" -"Dans une version précédente de PyPI, il a été possible pour les mainteneurs " -"de publier des versions sur PyPI en utilisant un formulaire dans le " -"navigateur Web. Cette fonctionnalité est désormais dépréciée dans la " -"nouvelle version de PyPI - nous vous recommandons plutôt d'<a href=\"%(href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">utiliser twine " -"pour publier vos projets sur PyPI</a>." +"upload releases to PyPI using a form in the web browser. This feature was" +" deprecated with the new version of PyPI – we instead recommend that you " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">use twine to upload your project to PyPI</a>." +msgstr "" +"Dans une version précédente de PyPI, il a été possible pour les " +"mainteneurs de publier des versions sur PyPI en utilisant un formulaire " +"dans le navigateur Web. Cette fonctionnalité est désormais dépréciée dans" +" la nouvelle version de PyPI - nous vous recommandons plutôt d'<a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">utiliser twine pour publier vos projets sur PyPI</a>." #: warehouse/templates/pages/help.html:624 msgid "" -"Spammers return to PyPI with some regularity hoping to place their Search " -"Engine Optimized phishing, scam, and click-farming content on the site. " +"Spammers return to PyPI with some regularity hoping to place their Search" +" Engine Optimized phishing, scam, and click-farming content on the site. " "Since PyPI allows for indexing of the Long Description and other data " "related to projects and has a generally solid search reputation, it is a " "prime target." msgstr "" -"Les spammeurs reviennent régulièrement sur PyPI dans l'espoir de placer leur " -"contenu de hameçonnage, d'escroquerie et de ferme à clics. Étant donné que " -"PyPI permet l'indexation de la description longue et d'autres données liées " -"aux projets et qu'il jouit d'une solide réputation en matière de recherche, " -"il constitue une cible de choix." +"Les spammeurs reviennent régulièrement sur PyPI dans l'espoir de placer " +"leur contenu de hameçonnage, d'escroquerie et de ferme à clics. Étant " +"donné que PyPI permet l'indexation de la description longue et d'autres " +"données liées aux projets et qu'il jouit d'une solide réputation en " +"matière de recherche, il constitue une cible de choix." #: warehouse/templates/pages/help.html:626 #, python-format msgid "" "When the PyPI administrators are overwhelmed by spam <strong>or</strong> " -"determine that there is some other threat to PyPI, new user registration and/" -"or new project registration may be disabled. Check <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status page</a> " -"for more details, as we'll likely have updated it with reasoning for the " -"intervention." -msgstr "" -"Lorsque les administrateurs de PyPI sont submergés par le spam <strong>ou</" -"strong> déterminent qu'il y a une autre menace pour PyPI, l'enregistrement " -"de nouveaux utilisateurs et/ou de nouveaux projets peut être désactivé. " -"Consultez <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">notre page de statut</a> pour plus de détails, car nous " -"l'aurons probablement actualisée avec le motif de l'intervention." +"determine that there is some other threat to PyPI, new user registration " +"and/or new project registration may be disabled. Check <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">our status page</a> for more details, as we'll likely " +"have updated it with reasoning for the intervention." +msgstr "" +"Lorsque les administrateurs de PyPI sont submergés par le spam " +"<strong>ou</strong> déterminent qu'il y a une autre menace pour PyPI, " +"l'enregistrement de nouveaux utilisateurs et/ou de nouveaux projets peut " +"être désactivé. Consultez <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">notre page de statut</a> pour plus de " +"détails, car nous l'aurons probablement actualisée avec le motif de " +"l'intervention." #: warehouse/templates/pages/help.html:635 msgid "PyPI will return these errors for one of these reasons:" @@ -5224,168 +5263,179 @@ msgid "" "PyPI does not allow for a filename to be reused, even once a project has " "been deleted and recreated." msgstr "" -"PyPI n'autorise pas la réutilisation d'un nom de fichier, même une fois un " -"projet supprimé et recréé." +"PyPI n'autorise pas la réutilisation d'un nom de fichier, même une fois " +"un projet supprimé et recréé." #: warehouse/templates/pages/help.html:643 #, python-format msgid "" -"To avoid this situation, <a href=\"%(test_pypi_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">use Test PyPI to perform and check your " -"upload first</a>, before uploading to <a href=\"%(pypi_href)s\">pypi.org</a>." +"To avoid this situation, <a href=\"%(test_pypi_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">use Test PyPI to " +"perform and check your upload first</a>, before uploading to <a " +"href=\"%(pypi_href)s\">pypi.org</a>." msgstr "" -"Pour éviter cette situation, <a href=\"%(test_pypi_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">utilisez Test PyPI pour procéder et " -"vérifier votre publication dans un premier temps</a>, avant de la publier " -"sur <a href=\"%(pypi_href)s\">pypi.org</a>." +"Pour éviter cette situation, <a href=\"%(test_pypi_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">utilisez Test PyPI" +" pour procéder et vérifier votre publication dans un premier temps</a>, " +"avant de la publier sur <a href=\"%(pypi_href)s\">pypi.org</a>." #: warehouse/templates/pages/help.html:650 #, python-format msgid "" -"If you would like to request a new trove classifier file a pull request on " -"the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><code>pypa/trove-classifiers</code> project</a>. Be sure to include a " -"brief justification of why it is important." +"If you would like to request a new trove classifier file a pull request " +"on the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>pypa/trove-classifiers</code> project</a>. Be sure" +" to include a brief justification of why it is important." msgstr "" -"Si vous souhaitez demander un nouveau classificateur, déposez une demande de " -"fusion (pull request) sur le <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">projet <code>pypa/trove-classifiers</code></a>. " -"Incluez le nom du classificateur demandé et une brève justification de son " -"importance." +"Si vous souhaitez demander un nouveau classificateur, déposez une demande" +" de fusion (pull request) sur le <a href=\"%(href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">projet <code>pypa/trove-" +"classifiers</code></a>. Incluez le nom du classificateur demandé et une " +"brève justification de son importance." #: warehouse/templates/pages/help.html:658 #, python-format msgid "" "If you're experiencing an issue with PyPI itself, we welcome " -"<strong>constructive</strong> feedback and bug reports via our <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">issue " -"tracker</a>. Please note that this tracker is only for issues with the " -"software that runs PyPI. Before writing a new issue, first check that a " -"similar issue does not already exist." -msgstr "" -"Si vous rencontre un problème avec PyPI lui-même, nous vous invitons à nous " -"envoyer des commentaires <strong>constructifs</strong> et des rapports de " -"bugs via notre <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">suivi des problèmes</a>. Veuillez notez que ce suivi " -"concerne uniquement PyPI. Avant d'écrire un nouveau problème, vérifiez " -"d'abord si un problème similaire n'existe pas déjà." +"<strong>constructive</strong> feedback and bug reports via our <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">issue tracker</a>. Please note that this tracker is only" +" for issues with the software that runs PyPI. Before writing a new issue," +" first check that a similar issue does not already exist." +msgstr "" +"Si vous rencontre un problème avec PyPI lui-même, nous vous invitons à " +"nous envoyer des commentaires <strong>constructifs</strong> et des " +"rapports de bugs via notre <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">suivi des problèmes</a>. Veuillez " +"notez que ce suivi concerne uniquement PyPI. Avant d'écrire un nouveau " +"problème, vérifiez d'abord si un problème similaire n'existe pas déjà." #: warehouse/templates/pages/help.html:665 msgid "" -"If you are having an issue is with a specific package installed from PyPI, " -"you should reach out to the maintainers of that project directly instead." +"If you are having an issue is with a specific package installed from " +"PyPI, you should reach out to the maintainers of that project directly " +"instead." msgstr "" -"Si vous rencontrez des problèmes avec un paquet spécifique installé depuis " -"PyPI, vous devriez plutôt contacter directement les mainteneurs de ce projet." +"Si vous rencontrez des problèmes avec un paquet spécifique installé " +"depuis PyPI, vous devriez plutôt contacter directement les mainteneurs de" +" ce projet." #: warehouse/templates/pages/help.html:674 #, python-format msgid "" -"PyPI is powered by the Warehouse project; <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> is an open " -"source project developed under the umbrella of the Python Packaging " -"Authority (PyPA) and supported by the Python Packaging Working Group " -"(PackagingWG)." +"PyPI is powered by the Warehouse project; <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> is " +"an open source project developed under the umbrella of the Python " +"Packaging Authority (PyPA) and supported by the Python Packaging Working " +"Group (PackagingWG)." msgstr "" -"PyPI est propulsé par le projet Warehouse ; <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> est un projet " -"libre développé sous la tutelle de l'Autorité des Paquets Python (PyPA) et " -"soutenu par le Groupe de Travail des Paquets Python (PackagingWG)." +"PyPI est propulsé par le projet Warehouse ; <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> est " +"un projet libre développé sous la tutelle de l'Autorité des Paquets " +"Python (PyPA) et soutenu par le Groupe de Travail des Paquets Python " +"(PackagingWG)." #: warehouse/templates/pages/help.html:679 #, python-format msgid "" -"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPA</a> is an independent group of developers whose goal is to improve " -"and maintain many of the core projects related to Python packaging." +"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA</a> is an independent group of developers whose " +"goal is to improve and maintain many of the core projects related to " +"Python packaging." msgstr "" -"La <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPA</a> est un groupe indépendant de développeurs pour lesquels le but " -"est d'améliorer et de maintenir de nombreux projets relatifs à l'empaquetage " -"Python." +"La <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA</a> est un groupe indépendant de développeurs pour " +"lesquels le but est d'améliorer et de maintenir de nombreux projets " +"relatifs à l'empaquetage Python." #: warehouse/templates/pages/help.html:684 #, python-format msgid "" -"The <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">PackagingWG</a> is a working group of the Python Software " -"Foundation (PSF) whose goal is to raise and disburse funds to support the " -"ongoing improvement of Python packaging. Most recently it <a href=" -"\"%(otf_award_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">secured an award from the Open Technology Fund</a> whose funding is " -"enabling developers to improve Warehouse's security and accessibility." -msgstr "" -"Le <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">PackagingWG</a> est un groupe de travail de la Python " -"Software Foundation (PSF) pour lequel le but est de lever et de débourser " -"des fonds pour prendre en charge le développement de l'empaquetage Python. " -"Plus récemment, elle a <a href=\"%(otf_award_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">obtenu un prix de l'Open Technology Fund</" -"a> dont le financement permet aux développeurs d'améliorer la sécurité et " +"The <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">PackagingWG</a> is a working group of " +"the Python Software Foundation (PSF) whose goal is to raise and disburse " +"funds to support the ongoing improvement of Python packaging. Most " +"recently it <a href=\"%(otf_award_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">secured an award from the Open " +"Technology Fund</a> whose funding is enabling developers to improve " +"Warehouse's security and accessibility." +msgstr "" +"Le <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">PackagingWG</a> est un groupe de " +"travail de la Python Software Foundation (PSF) pour lequel le but est de " +"lever et de débourser des fonds pour prendre en charge le développement " +"de l'empaquetage Python. Plus récemment, elle a <a " +"href=\"%(otf_award_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">obtenu un prix de l'Open Technology Fund</a> dont le " +"financement permet aux développeurs d'améliorer la sécurité et " "l'accessibilité de Warehouse." #: warehouse/templates/pages/help.html:694 #, python-format msgid "" -"PyPI is powered by <a href=\"%(warehouse_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Warehouse</a> and by a variety of tools and " -"services provided by our <a href=\"%(sponsors_href)s\">generous sponsors</a>." +"PyPI is powered by <a href=\"%(warehouse_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Warehouse</a> and by a variety of " +"tools and services provided by our <a href=\"%(sponsors_href)s\">generous" +" sponsors</a>." msgstr "" -"PyPI est propulsé par <a href=\"%(warehouse_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Warehouse</a> et par une variété d'outils " -"et de services fournis par nos <a href=\"%(sponsors_href)s\">généreux " -"sponsors</a>." +"PyPI est propulsé par <a href=\"%(warehouse_href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Warehouse</a> et par une variété " +"d'outils et de services fournis par nos <a " +"href=\"%(sponsors_href)s\">généreux sponsors</a>." #: warehouse/templates/pages/help.html:701 msgid "" -"As of April 16, 2018, PyPI.org is at \"production\" status, meaning that it " -"has moved out of beta and replaced the old site (pypi.python.org). It is now " -"robust, tested, and ready for expected browser and API traffic." +"As of April 16, 2018, PyPI.org is at \"production\" status, meaning that " +"it has moved out of beta and replaced the old site (pypi.python.org). It " +"is now robust, tested, and ready for expected browser and API traffic." msgstr "" "Depuis le 16 avril 2018, PyPI.org est en statut « production », ce qui " -"signifie qu'il a quitté la version bêta et remplacé l'ancien site (pypi." -"python.org). Il est maintenant robuste, testé et prêt pour le trafic attendu " -"depuis les navigateurs et l'API." +"signifie qu'il a quitté la version bêta et remplacé l'ancien site " +"(pypi.python.org). Il est maintenant robuste, testé et prêt pour le " +"trafic attendu depuis les navigateurs et l'API." #: warehouse/templates/pages/help.html:703 #, python-format msgid "" -"PyPI is heavily cached and distributed via <abbr title=\"content delivery " -"network\">CDN</abbr> thanks to our sponsor <a href=\"%(fastly_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Fastly</a> and thus is " -"generally available globally. However, the site is mostly maintained by " -"volunteers, we do not provide any specific Service Level Agreement, and as " -"could be expected for a giant distributed system, things can and sometimes " -"do go wrong. See <a href=\"%(status_page_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">our status page</a> for current and past outages " -"and incidents. If you have high availability requirements for your package " -"index, consider either a <a href=\"%(mirror_href)s\">mirror</a> or a <a href=" -"\"%(private_index_href)s\">private index</a>." +"PyPI is heavily cached and distributed via <abbr title=\"content delivery" +" network\">CDN</abbr> thanks to our sponsor <a href=\"%(fastly_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Fastly</a> and " +"thus is generally available globally. However, the site is mostly " +"maintained by volunteers, we do not provide any specific Service Level " +"Agreement, and as could be expected for a giant distributed system, " +"things can and sometimes do go wrong. See <a " +"href=\"%(status_page_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">our status page</a> for current and past outages and " +"incidents. If you have high availability requirements for your package " +"index, consider either a <a href=\"%(mirror_href)s\">mirror</a> or a <a " +"href=\"%(private_index_href)s\">private index</a>." msgstr "" "PyPI est largement mis en cache et distribué via <abbr title=\"Content " -"Delivery Network\">CDN</abbr> grâce à notre sponsor <a href=\"%(fastly_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Fastly</a> et est " -"donc généralement disponible dans le monde entier. Cependant, le site est en " -"grande partie maintenu par des bénévoles, nous ne fournissons pas d'accord " -"de niveau de service spécifique, et comme on pouvait s'y attendre pour un " -"gigantesque système distribué, les choses peuvent mal tourner et parfois " -"même se détraquer. Consultez <a href=\"%(status_page_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">notre page de statut</a> " -"pour les pannes et incidents actuels et passés. Si vous avez des exigences " -"élevées en matière de disponibilité pour votre index de forfaits, envisagez " -"soit un <a href=\"%(mirror_href)s\">miroir</a>, soit un <a href=" -"\"%(private_index_href)s\">index privé</a>." +"Delivery Network\">CDN</abbr> grâce à notre sponsor <a " +"href=\"%(fastly_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Fastly</a> et est donc généralement disponible dans le " +"monde entier. Cependant, le site est en grande partie maintenu par des " +"bénévoles, nous ne fournissons pas d'accord de niveau de service " +"spécifique, et comme on pouvait s'y attendre pour un gigantesque système " +"distribué, les choses peuvent mal tourner et parfois même se détraquer. " +"Consultez <a href=\"%(status_page_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">notre page de statut</a> pour les " +"pannes et incidents actuels et passés. Si vous avez des exigences élevées" +" en matière de disponibilité pour votre index de forfaits, envisagez soit" +" un <a href=\"%(mirror_href)s\">miroir</a>, soit un <a " +"href=\"%(private_index_href)s\">index privé</a>." #: warehouse/templates/pages/help.html:717 #, python-format msgid "" -"We have a huge amount of work to do to continue to maintain and improve PyPI " -"(also known as <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">the Warehouse project</a>)." +"We have a huge amount of work to do to continue to maintain and improve " +"PyPI (also known as <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">the Warehouse project</a>)." msgstr "" "Nous avons énormément de travail à faire pour continuer de maintenir et " -"d'améliorer PyPI (aussi connu sous le nom <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">the Warehouse project</a>)." +"d'améliorer PyPI (aussi connu sous le nom <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">the Warehouse " +"project</a>)." #: warehouse/templates/pages/help.html:722 msgid "Financial:" @@ -5397,8 +5447,8 @@ msgid "" "We would deeply appreciate <a href=\"%(href)s\">your donations to fund " "development and maintenance</a>." msgstr "" -"Nous vous serions profondément reconnaissants de <a href=\"%(href)s\">vos " -"dons pour financer le développement et la maintenance</a>." +"Nous vous serions profondément reconnaissants de <a href=\"%(href)s\">vos" +" dons pour financer le développement et la maintenance</a>." #: warehouse/templates/pages/help.html:723 msgid "Development:" @@ -5406,52 +5456,54 @@ msgstr "Développement :" #: warehouse/templates/pages/help.html:723 msgid "" -"Warehouse is open source, and we would love to see some new faces working on " -"the project. You <strong>do not</strong> need to be an experienced open-" -"source developer to make a contribution – in fact, we'd love to help you " -"make your first open source pull request!" +"Warehouse is open source, and we would love to see some new faces working" +" on the project. You <strong>do not</strong> need to be an experienced " +"open-source developer to make a contribution – in fact, we'd love to help" +" you make your first open source pull request!" msgstr "" -"Warehouse est libre, et nous aimerions voir de nouveaux visages travailler " -"sur le projet. Vous <strong>n'avez pas</strong> besoin d'être un développeur " -"libre pour apporter une contribution - en réalité, nous serions ravi de vous " -"aider à réaliser votre première pull request libre !" +"Warehouse est libre, et nous aimerions voir de nouveaux visages " +"travailler sur le projet. Vous <strong>n'avez pas</strong> besoin d'être " +"un développeur libre pour apporter une contribution - en réalité, nous " +"serions ravi de vous aider à réaliser votre première pull request libre !" #: warehouse/templates/pages/help.html:725 #, python-format msgid "" "If you have skills in Python, ElasticSearch, HTML, SCSS, JavaScript, or " -"SQLAlchemy then skim our <a href=\"%(getting_started_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">\"Getting started\" guide</" -"a>, then take a look at the <a href=\"%(issue_tracker_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">issue tracker</a>. We've " -"created a <a href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">'Good first issue'</a> label – we recommend you " -"start here." +"SQLAlchemy then skim our <a href=\"%(getting_started_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">\"Getting " +"started\" guide</a>, then take a look at the <a " +"href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">issue tracker</a>. We've created a <a " +"href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">'Good first issue'</a> label – we recommend you start " +"here." msgstr "" "Si vous avez des compétences en Python, ElasticSearch, HTML, SCSS, " -"JavaScript ou SQLAlchemy alors lisez notre <a href=\"%(getting_started_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Guide de " -"démarrage</a>, puis jetez un oeil à notre <a href=\"%(issue_tracker_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">suivi des problèmes</" -"a>. Nous avons créé une étiquette <a href=\"%(good_first_issue_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">« Good first issue »</" -"a> – nous vous recommandons de commencer par là." +"JavaScript ou SQLAlchemy alors lisez notre <a " +"href=\"%(getting_started_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Guide de démarrage</a>, puis jetez un oeil à notre <a " +"href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">suivi des problèmes</a>. Nous avons créé une étiquette " +"<a href=\"%(good_first_issue_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">« Good first issue »</a> – nous vous " +"recommandons de commencer par là." #: warehouse/templates/pages/help.html:733 #, python-format msgid "" -"Issues are grouped into <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">milestones</a>; working on issues in the current " -"milestone is a great way to help push the project forward. If you're " -"interested in working on a particular issue, leave a comment and we can " -"guide you through the contribution process." +"Issues are grouped into <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">milestones</a>; working on issues in " +"the current milestone is a great way to help push the project forward. If" +" you're interested in working on a particular issue, leave a comment and " +"we can guide you through the contribution process." msgstr "" "Les problèmes sont groupés en <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">jalons</a> ; Travailler sur les problèmes " -"du jalon courant est une bonne façon d'aider à faire avancer le projet. Si " -"vous êtes intéressé pour travailler sur un problème en particulier, laissez " -"un commentaire et nous pouvons vous aider à travers le processus de " -"contribution." +"target=\"_blank\" rel=\"noopener\">jalons</a> ; Travailler sur les " +"problèmes du jalon courant est une bonne façon d'aider à faire avancer le" +" projet. Si vous êtes intéressé pour travailler sur un problème en " +"particulier, laissez un commentaire et nous pouvons vous aider à travers " +"le processus de contribution." #: warehouse/templates/pages/help.html:740 msgid "Stay updated:" @@ -5460,50 +5512,53 @@ msgstr "Restez informé :" #: warehouse/templates/pages/help.html:741 #, python-format msgid "" -"You can also follow the ongoing development of the project on the <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">distutils-sig mailing list</a> and the <a href=" -"\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">PyPA Dev message group</a>." +"You can also follow the ongoing development of the project on the <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">distutils-sig mailing list</a> and the <a " +"href=\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA Dev message group</a>." msgstr "" -"Vous pouvez aussi suivre le développement en cours du projet via la <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">liste de diffusion distutils-sig</a> et le <a href=" -"\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">groupe de discussion de PyPA Dev</a>." +"Vous pouvez aussi suivre le développement en cours du projet via la <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">liste de diffusion distutils-sig</a> et le <a " +"href=\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">groupe de discussion de PyPA Dev</a>." #: warehouse/templates/pages/help.html:751 #, python-format msgid "" -"Changes to PyPI are generally announced on both the <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">pypi-announce mailing list</a> and the <a href=\"%(blog_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PSF blog</a> under " -"the label \"pypi\". The PSF blog also has <a href=\"%(atom_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Atom</a> and <a href=" -"\"%(rss_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</" -"a> feeds for the \"pypi\" label." -msgstr "" -"Les modifications de PyPI sont généralement annoncées à la fois via la <a " -"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">liste de diffusion pypi-announce</a> et le <a href=" -"\"%(blog_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">blog de la PSF</a> avec l'étiquette « pypi ». Le blog de la PSF possède " -"également des flux <a href=\"%(atom_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Atom</a> et <a href=\"%(rss_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</a> alimentés par " -"l'étiquette « pypi »." +"Changes to PyPI are generally announced on both the <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">pypi-announce mailing list</a> and the <a " +"href=\"%(blog_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PSF blog</a> under the label \"pypi\". The PSF blog also" +" has <a href=\"%(atom_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Atom</a> and <a href=\"%(rss_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</a> feeds for " +"the \"pypi\" label." +msgstr "" +"Les modifications de PyPI sont généralement annoncées à la fois via la <a" +" href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">liste de diffusion pypi-announce</a> et le <a " +"href=\"%(blog_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">blog de la PSF</a> avec l'étiquette « pypi ». Le blog de" +" la PSF possède également des flux <a href=\"%(atom_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Atom</a> et <a " +"href=\"%(rss_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">RSS</a> alimentés par l'étiquette « pypi »." #: warehouse/templates/pages/help.html:761 msgid "" -"When Warehouse's maintainers are deploying new features, at first we mark " -"them with a small \"beta feature\" symbol to tell you: this should probably " -"work fine, but it's new and less tested than other site functionality." +"When Warehouse's maintainers are deploying new features, at first we mark" +" them with a small \"beta feature\" symbol to tell you: this should " +"probably work fine, but it's new and less tested than other site " +"functionality." msgstr "" -"Lorsque les mainteneurs de Warehouse déploient de nouvelles fonctionnalités, " -"dans un premier temps nous les marquons comme des « fonctionnalités bêta » " -"pour vous dire : Cela devrait probablement très bien fonctionner, mais c'est " -"nouveau et moins testé que les autres fonctionnalités du site." +"Lorsque les mainteneurs de Warehouse déploient de nouvelles " +"fonctionnalités, dans un premier temps nous les marquons comme des « " +"fonctionnalités bêta » pour vous dire : Cela devrait probablement très " +"bien fonctionner, mais c'est nouveau et moins testé que les autres " +"fonctionnalités du site." #: warehouse/templates/pages/help.html:762 msgid "Currently, no features are in beta." @@ -5512,17 +5567,17 @@ msgstr "Actuellement, aucune fonctionnalité n'est en version bêta." #: warehouse/templates/pages/help.html:766 #, python-format msgid "" -"\"PyPI\" should be pronounced like \"pie pea eye\", specifically with the " -"\"PI\" pronounced as individual letters, rather as a single sound. This " -"minimizes confusion with the <a href=\"%(href)s\" title=\"%(title)s\">PyPy</" -"a> project, which is a popular alternative implementation of the Python " -"language." +"\"PyPI\" should be pronounced like \"pie pea eye\", specifically with the" +" \"PI\" pronounced as individual letters, rather as a single sound. This " +"minimizes confusion with the <a href=\"%(href)s\" " +"title=\"%(title)s\">PyPy</a> project, which is a popular alternative " +"implementation of the Python language." msgstr "" -"« PyPI » devrait être prononcé comme « pie pea eye », en particulier le « PI " -"» prononcé comme des lettres individuelles plutôt que comme un son unique. " -"Cela réduit la confusion avec le projet <a href=\"%(href)s\" title=" -"\"%(title)s\">PyPy</a>, qui est une alternative populaire à l'implémentation " -"du langage Python." +"« PyPI » devrait être prononcé comme « pie pea eye », en particulier le «" +" PI » prononcé comme des lettres individuelles plutôt que comme un son " +"unique. Cela réduit la confusion avec le projet <a href=\"%(href)s\" " +"title=\"%(title)s\">PyPy</a>, qui est une alternative populaire à " +"l'implémentation du langage Python." #: warehouse/templates/pages/help.html:778 msgid "Resources" @@ -5530,8 +5585,7 @@ msgstr "Ressources" #: warehouse/templates/pages/help.html:779 msgid "Looking for something else? Perhaps these links will help:" -msgstr "" -"Vous cherchez autre chose ? Peut-être que ces liens vous seront utiles :" +msgstr "Vous cherchez autre chose ? Peut-être que ces liens vous seront utiles :" #: warehouse/templates/pages/help.html:781 msgid "Python Packaging User Guide" @@ -5560,22 +5614,23 @@ msgstr "Contact" #: warehouse/templates/pages/help.html:789 #, python-format msgid "" -"The <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging Authority (PyPA)</a> is a working group who " -"work together to improve Python packaging. If you'd like to get in touch " -"with a core packaging developer, use <a href=\"%(irc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">#pypa on IRC (freenode)</" -"a>, or <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">join the distutils-sig mailing list</a>." -msgstr "" -"L <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Autorité des Paquets Python (PyPA)</a> est un groupe de travail " -"qui travaille à l'amélioration de l'empaquetage Python. Si vous souhaitez " -"entrer en contact avec un développeur de paquets noyaux, utilisez <a href=" -"\"%(irc_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">le " -"canal IRC #pypa (freenode)</a>, ou <a href=\"%(mailing_list_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">rejoignez la liste de " -"diffusion distutils-sig</a>." +"The <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging Authority (PyPA)</a> is a working group" +" who work together to improve Python packaging. If you'd like to get in " +"touch with a core packaging developer, use <a href=\"%(irc_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">#pypa on IRC " +"(freenode)</a>, or <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">join the distutils-sig mailing " +"list</a>." +msgstr "" +"L <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Autorité des Paquets Python (PyPA)</a> est un groupe de " +"travail qui travaille à l'amélioration de l'empaquetage Python. Si vous " +"souhaitez entrer en contact avec un développeur de paquets noyaux, " +"utilisez <a href=\"%(irc_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">le canal IRC #pypa (freenode)</a>, ou <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">rejoignez la liste de diffusion distutils-sig</a>." #: warehouse/templates/pages/security.html:15 msgid "Security" @@ -5587,11 +5642,11 @@ msgstr "Signaler un problème de sécurité" #: warehouse/templates/pages/security.html:22 msgid "" -"We take security very seriously and ask that you follow our security policy " -"carefully." +"We take security very seriously and ask that you follow our security " +"policy carefully." msgstr "" -"Nous prenons la sécurité très au sérieux et nous vous demandons de suivre " -"attentivement notre politique de sécurité." +"Nous prenons la sécurité très au sérieux et nous vous demandons de suivre" +" attentivement notre politique de sécurité." #: warehouse/templates/pages/security.html:24 msgid "Important!" @@ -5599,13 +5654,13 @@ msgstr "Important !" #: warehouse/templates/pages/security.html:24 msgid "" -"If you believe you've identified a security issue with Warehouse, <strong>DO " -"NOT</strong> report the issue in any public forum, including (but not " -"limited to):" +"If you believe you've identified a security issue with Warehouse, " +"<strong>DO NOT</strong> report the issue in any public forum, including " +"(but not limited to):" msgstr "" "Si vous pensez avoir identifié un problème de sécurité avec Warehouse, " -"<strong>NE</strong> signalez <strong>PAS</strong> ce problème sur un forum " -"public, y compris (mais sans s'y limiter) :" +"<strong>NE</strong> signalez <strong>PAS</strong> ce problème sur un " +"forum public, y compris (mais sans s'y limiter) :" #: warehouse/templates/pages/security.html:27 msgid "Our GitHub issue tracker" @@ -5622,8 +5677,8 @@ msgstr "Listes de diffusion officielles ou non officielles" #: warehouse/templates/pages/security.html:35 #, python-format msgid "" -"Instead, email <a href=\"%(href)s\">security at python dot org</a> directly, " -"providing as much relevant information as possible." +"Instead, email <a href=\"%(href)s\">security at python dot org</a> " +"directly, providing as much relevant information as possible." msgstr "" "Envoyez plutôt directement un message à <a href=\"%(href)s\">security at " "python dot org</a>, en fournissant le plus d'informations pertinentes " @@ -5633,12 +5688,13 @@ msgstr "" #, python-format msgid "" "Messages may be optionally encrypted with GPG using key fingerprints " -"available <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">at the Python Security page</a>." +"available <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">at the Python Security page</a>." msgstr "" -"Les messages peuvent potentiellement être cryptés avec GPG en utilisant les " -"empreintes de clés disponibles <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">sur la page de sécurité de Python</a>." +"Les messages peuvent potentiellement être cryptés avec GPG en utilisant " +"les empreintes de clés disponibles <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">sur la page de " +"sécurité de Python</a>." #: warehouse/templates/pages/security.html:38 msgid "What happens next?" @@ -5649,22 +5705,22 @@ msgid "" "Once you've submitted an issue via email, you should receive an " "acknowledgment within 48 hours." msgstr "" -"Une fois que vous avez envoyé un problème par e-mail, vous devriez recevoir " -"un accusé de réception dans les 48 heures." +"Une fois que vous avez envoyé un problème par e-mail, vous devriez " +"recevoir un accusé de réception dans les 48 heures." #: warehouse/templates/pages/security.html:41 msgid "" "Depending on the action to be taken, you may receive further follow-up " "emails." msgstr "" -"En fonction des mesures à prendre, vous pourriez recevoir d'autres e-mails " -"de suivi." +"En fonction des mesures à prendre, vous pourriez recevoir d'autres " +"e-mails de suivi." #: warehouse/templates/pages/security.html:44 msgid "This security policy was last updated on March 14, 2018." msgstr "" -"Cette politique de sécurité a été mise à jour pour la dernière fois le 14 " -"mars 2018." +"Cette politique de sécurité a été mise à jour pour la dernière fois le 14" +" mars 2018." #: warehouse/templates/pages/sitemap.html:21 msgid "PyPI site map" @@ -5710,15 +5766,15 @@ msgstr "Faire une donation au Packaging Working Group" #: warehouse/templates/pages/sponsor.html:27 #, python-format msgid "" -"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Packaging Working Group</a> is a work group of the Python Software " -"Foundation which raises and distributes funds to improve Python's packaging " -"ecosystem." +"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Packaging Working Group</a> is a work group of the " +"Python Software Foundation which raises and distributes funds to improve " +"Python's packaging ecosystem." msgstr "" -"Le <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Packaging Working Group</a> est un groupe de travail de la Python " -"Software Foundation qui lève et distribue des fonds pour améliorer " -"l'ecosystème d'empaquetage Python." +"Le <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Packaging Working Group</a> est un groupe de travail de " +"la Python Software Foundation qui lève et distribue des fonds pour " +"améliorer l'ecosystème d'empaquetage Python." #: warehouse/templates/pages/sponsor.html:29 msgid "Recent projects funded through the working group include:" @@ -5729,40 +5785,41 @@ msgid "" "The successful relaunch of the Python Package Index, powered by the new " "'Warehouse' codebase" msgstr "" -"La relance réussie de l’indice Python Package, propulsé par la nouvelle base " -"de code 'Warehouse'" +"La relance réussie de l’indice Python Package, propulsé par la nouvelle " +"base de code 'Warehouse'" #: warehouse/templates/pages/sponsor.html:33 #, python-format msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$170,000 in funding</a> from the <a href=\"%(funder_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Mozilla Open Source " -"Support Program</a> in 2018" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$170,000 in funding</a> from the <a " +"href=\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Mozilla Open Source Support Program</a> in 2018" msgstr "" -"Avec <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$170,000 de financement</a> de la part du <a href=" -"\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">programme de support Mozilla pour le logicel libre</a> en 2018" +"Avec <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$170,000 de financement</a> de la part du <a " +"href=\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">programme de support Mozilla pour le logicel libre</a> " +"en 2018" #: warehouse/templates/pages/sponsor.html:36 msgid "" -"Improving PyPI's security and accessibility, and adding support for multiple " -"locales" +"Improving PyPI's security and accessibility, and adding support for " +"multiple locales" msgstr "" -"Améliorer la securité et l'accessibilité de PyPI, et ajouter le support pour " -"de multiples localisations" +"Améliorer la securité et l'accessibilité de PyPI, et ajouter le support " +"pour de multiples localisations" #: warehouse/templates/pages/sponsor.html:37 #, python-format msgid "" -"With $80,000 in funding from the <a href=\"%(funder_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology Fund</a> in " -"2019" +"With $80,000 in funding from the <a href=\"%(funder_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology " +"Fund</a> in 2019" msgstr "" -"Avec $80,000 de finacement de la part du <a href=\"%(funder_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology Fund</a> en " -"2019" +"Avec $80,000 de finacement de la part du <a href=\"%(funder_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology " +"Fund</a> en 2019" #: warehouse/templates/pages/sponsor.html:40 msgid "Additional security-focused features for PyPI" @@ -5771,37 +5828,37 @@ msgstr "Des fonctionnalités supplémentaires axées sur la sécurité pour PyPI #: warehouse/templates/pages/sponsor.html:41 #, python-format msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$100,000 in funding</a> from <a href=\"%(funder_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Facebook Research</a> in " -"2019 and 2020" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$100,000 in funding</a> from <a href=\"%(funder_href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Facebook " +"Research</a> in 2019 and 2020" msgstr "" -"Avec <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">100 000 dollars de financement</a> de la part de<a href=" -"\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Facebook Research</a> en 2019 et 2020" +"Avec <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">100 000 dollars de financement</a> de la part de<a " +"href=\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Facebook Research</a> en 2019 et 2020" #: warehouse/templates/pages/sponsor.html:44 msgid "Overhauling pip's user experience and dependency resolver" -msgstr "" -"Refonte de l’expérience utilisateur et du résolveur de dépendance de pip" +msgstr "Refonte de l’expérience utilisateur et du résolveur de dépendance de pip" #: warehouse/templates/pages/sponsor.html:45 #, python-format msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$407,000 in funding</a> from the <a href=\"%(funder0_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Chan Zuckerberg " -"Initiative</a> and the <a href=\"%(funder1_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Mozilla Open Source Support Program</a> " -"in 2020" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$407,000 in funding</a> from the <a " +"href=\"%(funder0_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Chan Zuckerberg Initiative</a> and the <a " +"href=\"%(funder1_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Mozilla Open Source Support Program</a> in 2020" msgstr "" -"Avec <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$407.000 de financement</a> de la part de <a href=" -"\"%(funder0_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">l'initiative Chan Zuckerberg</a> et du <a href=\"%(funder1_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Programme de soutien aux " -"logiciels libres de Mozilla</a> en 2020" +"Avec <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$407.000 de financement</a> de la part de <a " +"href=\"%(funder0_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">l'initiative Chan Zuckerberg</a> et du <a " +"href=\"%(funder1_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Programme de soutien aux logiciels libres de Mozilla</a>" +" en 2020" #: warehouse/templates/pages/sponsor.html:49 msgid "" @@ -5823,12 +5880,13 @@ msgstr "Nous apprécions grandement les dons ponctuels et récurrents." #: warehouse/templates/pages/sponsor.html:61 #, python-format msgid "" -"For US taxpayers, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">your donation may be tax-deductible</a>." +"For US taxpayers, <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">your donation may be tax-" +"deductible</a>." msgstr "" -"Pour les contribuables américains, <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\"> votre don peut être déductible d'impôt </" -"a>." +"Pour les contribuables américains, <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"> votre don peut " +"être déductible d'impôt </a>." #: warehouse/templates/pages/sponsor.html:62 msgid "Every donation counts!" @@ -5840,11 +5898,10 @@ msgstr "Faites un don ici" #: warehouse/templates/pages/sponsor.html:66 #, python-format -msgid "" -"Donating over $5,000? <a href=\"%(href)s\">Become a sponsor</a> instead." +msgid "Donating over $5,000? <a href=\"%(href)s\">Become a sponsor</a> instead." msgstr "" -"Vous donnez plus de $5 000 ? <a href=\"%(href)s\"> Devenez plutôt un sponsor " -"</a>." +"Vous donnez plus de $5 000 ? <a href=\"%(href)s\"> Devenez plutôt un " +"sponsor </a>." #: warehouse/templates/pages/sponsor.html:77 msgid "Get your logo on PyPI.org" @@ -5852,8 +5909,8 @@ msgstr "Obtenez votre logo sur PyPI.org" #: warehouse/templates/pages/sponsor.html:78 msgid "" -"Looking for brand visibility? In the last year*, 21.1 million people from " -"237 countries visited PyPI.org." +"Looking for brand visibility? In the last year*, 21.1 million people from" +" 237 countries visited PyPI.org." msgstr "" "Vous cherchez une visibilité pour une marque ? Au cours de l'année " "dernière*, 21,1 millions de personnes de 237 pays ont visité PyPI.org." @@ -5868,8 +5925,8 @@ msgstr "Renforcer l’écosystème Python" #: warehouse/templates/pages/sponsor.html:83 msgid "" -"Funds raised by the packaging working group go directly towards improving " -"the tools your company uses every day." +"Funds raised by the packaging working group go directly towards improving" +" the tools your company uses every day." msgstr "" "Les fonds recueillis par le groupe de travail sur l’empaquetage sont " "directement consacrés à l’amélioration des outils que votre entreprise " @@ -5881,11 +5938,11 @@ msgstr "Renforcez votre réputation" #: warehouse/templates/pages/sponsor.html:87 msgid "" -"Enhance your company's reputation by investing in Python and the open source " -"community." +"Enhance your company's reputation by investing in Python and the open " +"source community." msgstr "" -"Améliorez la réputation de votre entreprise en investissant dans Python et " -"la communauté open source." +"Améliorez la réputation de votre entreprise en investissant dans Python " +"et la communauté open source." #: warehouse/templates/pages/sponsor.html:96 msgid "Sponsorship packages" @@ -5908,24 +5965,24 @@ msgid "" "Logo in a prominent position on the PyPI project detail page, <strong>in " "perpetuity</strong>" msgstr "" -"Logo bien en vue sur la page de détail du projet PyPI, <strong> à perpétuité " -"</strong>" +"Logo bien en vue sur la page de détail du projet PyPI, <strong> à " +"perpétuité </strong>" +# | msgid "" +# | "<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Sofware " +# | "Foundation blog</a>" #: warehouse/templates/pages/sponsor.html:112 #: warehouse/templates/pages/sponsor.html:133 #, fuzzy, python-format -#| msgid "" -#| "<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Sofware " -#| "Foundation blog</a>" msgid "" -"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation " -"blog</a>" +"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation blog</a>" msgstr "" -"Article de blog <strong> individuel </strong> sur le <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"> blog de la Python " -"Software Fondation </a>" +"Article de blog <strong> individuel </strong> sur le <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"> blog de la " +"Python Software Fondation </a>" #: warehouse/templates/pages/sponsor.html:116 #: warehouse/templates/pages/sponsor.html:139 @@ -5947,10 +6004,11 @@ msgstr "50 000 $ par année, soit l’équivalent en services donnés" #: warehouse/templates/pages/sponsor.html:130 msgid "" -"Logo in a <strong>prominent position</strong> on the PyPI project detail page" +"Logo in a <strong>prominent position</strong> on the PyPI project detail " +"page" msgstr "" -"Logo dans une position <strong>prominente</strong> sur la page de détail du " -"projet PyPI" +"Logo dans une position <strong>prominente</strong> sur la page de détail " +"du projet PyPI" #: warehouse/templates/pages/sponsor.html:131 #: warehouse/templates/pages/sponsor.html:154 @@ -5964,8 +6022,8 @@ msgstr "Logo sur le pied de page PyPI" #: warehouse/templates/pages/sponsor.html:243 #, python-format msgid "" -"Logo <strong>and write up</strong> on the <a href=\"%(href)s\">PyPI sponsors " -"page</a>" +"Logo <strong>and write up</strong> on the <a href=\"%(href)s\">PyPI " +"sponsors page</a>" msgstr "" "Logo <strong>et une note </strong> sur la <a href=\"%(href)s\"> page de " "sponsors PyPI </a>" @@ -5980,8 +6038,8 @@ msgid "" "Foundation</a>" msgstr "" "Tweet de remerciement <strong> trimestriel </strong> de la part de la <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"> " -"Python Software Foundation </a>" +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">" +" Python Software Foundation </a>" #: warehouse/templates/pages/sponsor.html:135 #: warehouse/templates/pages/sponsor.html:158 @@ -5989,12 +6047,12 @@ msgstr "" #, python-format msgid "" "<strong>Quarterly</strong> thank you tweet from the <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</" -"a>" +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" -"Tweet de remerciement <strong>trimestriel</strong> de la part du <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Compte " -"Twitter PyPI</a>" +"Tweet de remerciement <strong>trimestriel</strong> de la part du <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Compte Twitter PyPI</a>" #: warehouse/templates/pages/sponsor.html:148 msgid "Platinum" @@ -6006,32 +6064,33 @@ msgstr "30 000 $ par an, ou l'équivalent en services donnés" #: warehouse/templates/pages/sponsor.html:153 msgid "" -"Logo on <strong>high rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>high rotation</strong> in a prominent position on the " +"PyPI project detail page" msgstr "" -"Logo à <strong> rotation élevée </strong> dans une position proéminente sur " -"la page de détail du projet PyPI" +"Logo à <strong> rotation élevée </strong> dans une position proéminente " +"sur la page de détail du projet PyPI" +# | msgid "" +# | "Inclusion in a blog post on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Sofware Foundation blog</a>, " +# | "<strong>with other sponsors</strong> whose sponsorship commenced during " +# | "the same quarter" #: warehouse/templates/pages/sponsor.html:156 #: warehouse/templates/pages/sponsor.html:179 #: warehouse/templates/pages/sponsor.html:201 #: warehouse/templates/pages/sponsor.html:222 #, fuzzy, python-format -#| msgid "" -#| "Inclusion in a blog post on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Sofware Foundation blog</a>, " -#| "<strong>with other sponsors</strong> whose sponsorship commenced during " -#| "the same quarter" msgid "" "Inclusion in a blog post on the <a href=\"%(href)s\" title=\"%(title)s\" " "target=\"_blank\" rel=\"noopener\">Python Software Foundation blog</a>, " -"<strong>with other sponsors</strong> whose sponsorship commenced during the " -"same quarter" +"<strong>with other sponsors</strong> whose sponsorship commenced during " +"the same quarter" msgstr "" -"Inclusion dans un article de blog sur le <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"> blog de la Python Sofware " -"Foundation </a>, <strong> avec d'autres sponsors </strong> dont le " -"parrainage a commencé au cours du même trimestre" +"Inclusion dans un article de blog sur le <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"> blog de la Python" +" Sofware Foundation </a>, <strong> avec d'autres sponsors </strong> dont " +"le parrainage a commencé au cours du même trimestre" #: warehouse/templates/pages/sponsor.html:171 msgid "Gold" @@ -6043,11 +6102,11 @@ msgstr "20 000 $ par an, ou l'équivalent en services donnés" #: warehouse/templates/pages/sponsor.html:176 msgid "" -"Logo on <strong>medium rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>medium rotation</strong> in a prominent position on the " +"PyPI project detail page" msgstr "" -"Logo en <strong> rotation moyenne </strong> dans une position proéminente " -"sur la page de détail du projet PyPI" +"Logo en <strong> rotation moyenne </strong> dans une position proéminente" +" sur la page de détail du projet PyPI" #: warehouse/templates/pages/sponsor.html:194 msgid "Silver" @@ -6059,18 +6118,17 @@ msgstr "10 000 $ par an, ou l'équivalent en services donnés" #: warehouse/templates/pages/sponsor.html:199 msgid "" -"Logo on <strong>low rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>low rotation</strong> in a prominent position on the PyPI" +" project detail page" msgstr "" -"Logo en <strong>faible rotation</strong> à un endroit bien visible sur la " -"page de détail du projet PyPI" +"Logo en <strong>faible rotation</strong> à un endroit bien visible sur la" +" page de détail du projet PyPI" #: warehouse/templates/pages/sponsor.html:200 #: warehouse/templates/pages/sponsor.html:221 #, python-format msgid "Logo on the <a href=\"%(href)s\">PyPI sponsors page</a>" -msgstr "" -"Rendez-vous sur <a href=\"%(href)s\">réinitialiser votre mot de passe</a>" +msgstr "Rendez-vous sur <a href=\"%(href)s\">réinitialiser votre mot de passe</a>" #: warehouse/templates/pages/sponsor.html:202 #, python-format @@ -6079,20 +6137,20 @@ msgid "" "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " "Foundation</a>" msgstr "" -"Tweet de remerciement <strong>bi-annuel</strong> de la part de la <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python " -"Software Foundation</a>" +"Tweet de remerciement <strong>bi-annuel</strong> de la part de la <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Software Foundation</a>" #: warehouse/templates/pages/sponsor.html:203 #, python-format msgid "" "<strong>Bi-yearly</strong> thank you tweet from the <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</" -"a>" +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" -"Tweet de remerciement <strong>bi-annuel</strong> de la part du <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Compte " -"Twitter PyPI</a>" +"Tweet de remerciement <strong>bi-annuel</strong> de la part du <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Compte Twitter PyPI</a>" #: warehouse/templates/pages/sponsor.html:216 msgid "Bronze" @@ -6105,25 +6163,25 @@ msgstr "5 000 $ par année, ou l'équivalent en services donnés" #: warehouse/templates/pages/sponsor.html:223 #, python-format msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a> (on initial sponsorship, and on each subsequent renewal)" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a> (on initial sponsorship, and on each subsequent renewal)" msgstr "" -"Tweet de remerciement <strong>unique</strong> de la part de la <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python " -"Software Foundation</a> (au moment du parrainage initial, et à chaque " -"renouvellement)" +"Tweet de remerciement <strong>unique</strong> de la part de la <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Software Foundation</a> (au moment du parrainage " +"initial, et à chaque renouvellement)" #: warehouse/templates/pages/sponsor.html:224 #, python-format msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</a> " -"(on initial sponsorship, and on each subsequent renewal)" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a> (on initial sponsorship, and on each subsequent renewal)" msgstr "" -"Tweet de remerciement <strong>unique</strong> du <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">compte Twitter PyPI</a> (au " -"moment du parrainage initial, et à chaque renouvellement)" +"Tweet de remerciement <strong>unique</strong> du <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">compte Twitter " +"PyPI</a> (au moment du parrainage initial, et à chaque renouvellement)" #: warehouse/templates/pages/sponsor.html:238 msgid "One time grants / custom donations" @@ -6132,36 +6190,39 @@ msgstr "Subventions ponctuelles / dons personnalisés" #: warehouse/templates/pages/sponsor.html:239 #, python-format msgid "" -"Sponsorship of a specific feature, feature set, or community sprint, valued " -"at over $50,000. See <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">fundable packaging improvements</a> for ideas." +"Sponsorship of a specific feature, feature set, or community sprint, " +"valued at over $50,000. See <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">fundable packaging improvements</a> " +"for ideas." msgstr "" -"Parrainage d’une fonctionnalité spécifique, d’un ensemble de fonctionnalités " -"ou d’un sprint communautaire, évalué à plus de 50 000 $. Voir <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"> " -"améliorations d'empaquetage financables </a> pour les idées." +"Parrainage d’une fonctionnalité spécifique, d’un ensemble de " +"fonctionnalités ou d’un sprint communautaire, évalué à plus de 50 000 $. " +"Voir <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"> améliorations d'empaquetage financables </a> pour les " +"idées." +# | msgid "" +# | "<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Sofware " +# | "Foundation blog</a>, explaining what the funds will be used for" #: warehouse/templates/pages/sponsor.html:244 #, fuzzy, python-format -#| msgid "" -#| "<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Sofware " -#| "Foundation blog</a>, explaining what the funds will be used for" msgid "" -"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation " -"blog</a>, explaining what the funds will be used for" +"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation blog</a>, explaining what the funds will be used for" msgstr "" -"Article de blog <strong> individuel </strong> sur le <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"> blog de la Python " -"Sofware Foundation </a>, expliquant à quoi les fonds seront utilisés" +"Article de blog <strong> individuel </strong> sur le <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"> blog de la " +"Python Sofware Foundation </a>, expliquant à quoi les fonds seront " +"utilisés" #: warehouse/templates/pages/sponsor.html:245 #, python-format msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a>" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a>" msgstr "" "Tweet de remerciement <strong>unique</strong> de la <a href=\"%(href)s\" " "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " @@ -6170,19 +6231,21 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:246 #, python-format msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</a>" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" -"Tweet de remerciement <strong>unique</strong> du <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">compte Twitter PyPI</a>" +"Tweet de remerciement <strong>unique</strong> du <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">compte Twitter " +"PyPI</a>" #: warehouse/templates/pages/sponsor.html:248 msgid "" "Note: A record of working group grants will be listed on the PyPI " "sponsorship page in perpetuity." msgstr "" -"Remarque : Un dossier des subventions des groupes de travail sera inscrit à " -"perpétuité sur la page de parrainage pyPI." +"Remarque : Un dossier des subventions des groupes de travail sera inscrit" +" à perpétuité sur la page de parrainage pyPI." #: warehouse/templates/pages/stats.html:21 msgid "PyPI statistics" @@ -6191,12 +6254,13 @@ msgstr "Statistiques de PyPI" #: warehouse/templates/pages/stats.html:23 msgid "" "We all love stats, so here are some useful statistics about PyPI. The " -"statistics page is cached for 24 hours, so don't expect the numbers to be " -"realtime." +"statistics page is cached for 24 hours, so don't expect the numbers to be" +" realtime." msgstr "" -"Nous aimons tous les statistiques, alors voici quelques statistiques utiles " -"sur PyPI. La page de statistiques est mise en cache pendant 24 heures, alors " -"ne vous attendez pas à ce que les chiffres soient en temps réel." +"Nous aimons tous les statistiques, alors voici quelques statistiques " +"utiles sur PyPI. La page de statistiques est mise en cache pendant 24 " +"heures, alors ne vous attendez pas à ce que les chiffres soient en temps " +"réel." #: warehouse/templates/pages/stats.html:30 msgid "Top projects by total package size" @@ -6204,11 +6268,11 @@ msgstr "Principaux projets par taille totale de paquet" #: warehouse/templates/pages/stats.html:32 msgid "" -"Here is a list of the top 100 projects based on the sum of their packages' " -"sizes (in bytes)." +"Here is a list of the top 100 projects based on the sum of their " +"packages' sizes (in bytes)." msgstr "" -"Voici une liste des 100 meilleurs projets basée sur la somme des tailles de " -"leurs paquets (en octets)." +"Voici une liste des 100 meilleurs projets basée sur la somme des tailles " +"de leurs paquets (en octets)." #: warehouse/templates/pages/stats.html:39 msgid "Statistics by project" @@ -6231,8 +6295,7 @@ msgstr "Résultats de recherche" #: warehouse/templates/search/results.html:41 #, python-format msgid "Did you mean '<a class=\"link\" href=\"%(link)s\">%(text)s</a>'?" -msgstr "" -"Voulez-vous dire « <a class=\"link\" href=\"%(link)s\">%(text)s</a> » ?" +msgstr "Voulez-vous dire « <a class=\"link\" href=\"%(link)s\">%(text)s</a> » ?" #: warehouse/templates/search/results.html:74 msgid "Close panel" @@ -6363,8 +6426,9 @@ msgstr[1] "" #~ msgid "A new collaborator has been added to a project you own on PyPI:" #~ msgstr "" -#~ "Un nouveau collaborateur a été ajouté à un projet que vous posséder sur " -#~ "PyPI :" +#~ "Un nouveau collaborateur a été ajouté" +#~ " à un projet que vous posséder " +#~ "sur PyPI :" #~ msgid "<strong>Username</strong>: %(username)s" #~ msgstr "<strong>Nom d'utilisateur</strong> : %(username)s" @@ -6379,11 +6443,14 @@ msgstr[1] "" #~ msgstr "<strong>Ajouté par</strong> : %(submitter)s" #~ msgid "" -#~ "If this was a mistake, you can email <a href=\"%(href)s\">" -#~ "%(email_address)s</a> to communicate with the PyPI administrators." +#~ "If this was a mistake, you can " +#~ "email <a href=\"%(href)s\">%(email_address)s</a> to" +#~ " communicate with the PyPI administrators." #~ msgstr "" -#~ "S'il s'agit d'une erreur, vous pouvez écrire à <a href=\"%(href)s\">" -#~ "%(email_address)s</a> pour communiquer avec les administrateurs de PyPI." +#~ "S'il s'agit d'une erreur, vous pouvez" +#~ " écrire à <a " +#~ "href=\"%(href)s\">%(email_address)s</a> pour communiquer" +#~ " avec les administrateurs de PyPI." #~ msgid "You are receiving this because you are an owner of this project." #~ msgstr "Vous recevez ceci car vous êtes propriétaire de ce projet." @@ -6400,29 +6467,31 @@ msgstr[1] "" #~ msgid "" #~ "If this was a mistake, you can email <a\n" -#~ " href=\"%(href)s\">%(email_address)s</a> to communicate with the PyPI " -#~ "administrators." +#~ " href=\"%(href)s\">%(email_address)s</a> to " +#~ "communicate with the PyPI administrators." #~ msgstr "" #~ "S'il s'agit d'une erreur, vous pouvez écrire à <a \n" -#~ " href=\"%(href)s\">%(email_address)s</a> pour communiquer avec les " -#~ "administrateurs de PyPI." +#~ " href=\"%(href)s\">%(email_address)s</a> pour " +#~ "communiquer avec les administrateurs de " +#~ "PyPI." #~ msgid "" -#~ "You are receiving this because you are %(recipient_role_descr)s of this " -#~ "project." -#~ msgstr "" -#~ "Vous recevez ceci car vous êtes %(recipient_role_descr)s de ce projet." +#~ "You are receiving this because you " +#~ "are %(recipient_role_descr)s of this project." +#~ msgstr "Vous recevez ceci car vous êtes %(recipient_role_descr)s de ce projet." #~ msgid "" -#~ "The %(project)s release %(release)s released on %(date)s has been deleted." +#~ "The %(project)s release %(release)s released" +#~ " on %(date)s has been deleted." #~ msgstr "" -#~ "La version %(release)s du projet %(project)s sortie le %(date)s a été " +#~ "La version %(release)s du projet " +#~ "%(project)s sortie le %(date)s a été " #~ "supprimée." #~ msgid "" #~ "\n" -#~ "You are receiving this because you are %(recipient_role_descr)s of this " -#~ "project." +#~ "You are receiving this because you " +#~ "are %(recipient_role_descr)s of this project." #~ msgstr "" #~ "\n" #~ "Vous recevez ceci car vous êtes %(recipient_role_descr)s de ce projet." @@ -6434,68 +6503,93 @@ msgstr[1] "" #~ msgstr "En version bêta" #~ msgid "" -#~ "If you lose your %(method)s and can no longer log in, the PyPI team " -#~ "<strong>cannot</strong> currently help you recover your account. We plan " -#~ "to develop a <a href=\"%(policy_href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">manual account recovery policy</a> and " -#~ "implement <a href=\"%(recovery_codes_href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">account recovery codes</a> to address this " -#~ "issue." +#~ "If you lose your %(method)s and " +#~ "can no longer log in, the PyPI " +#~ "team <strong>cannot</strong> currently help " +#~ "you recover your account. We plan " +#~ "to develop a <a href=\"%(policy_href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">manual account recovery policy</a>" +#~ " and implement <a " +#~ "href=\"%(recovery_codes_href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\">account recovery " +#~ "codes</a> to address this issue." #~ msgstr "" -#~ "Si vous perdez votre %(method)s et que vous ne pouvez plus vous " -#~ "connecter, l'équipe de PyPI <strong>ne pourra pas</strong> vous aider à " -#~ "récupérer votre compte. Nous avons l'intention de développer une <a href=" -#~ "\"%(policy_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -#~ "\">politique de récupération manuelle de compte</a> et d'implémenter des " -#~ "<a href=\"%(recovery_codes_href)s\" title=\"%(title)s\" target=\"_blank\" " -#~ "rel=\"noopener\">codes de réupération de compte</a> pour régler ce " -#~ "problème." +#~ "Si vous perdez votre %(method)s et " +#~ "que vous ne pouvez plus vous " +#~ "connecter, l'équipe de PyPI <strong>ne " +#~ "pourra pas</strong> vous aider à " +#~ "récupérer votre compte. Nous avons " +#~ "l'intention de développer une <a " +#~ "href=\"%(policy_href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\">politique de " +#~ "récupération manuelle de compte</a> et " +#~ "d'implémenter des <a " +#~ "href=\"%(recovery_codes_href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\">codes de " +#~ "réupération de compte</a> pour régler ce" +#~ " problème." #~ msgid "" #~ "\n" -#~ " In the short term, we recommend that all PyPI users set up " -#~ "<em>both</em>\n" -#~ " supported two factor authentication methods - using an " -#~ "authentication\n" -#~ " application <em>and</em> setting up a security device (e.g. USB " -#~ "key).\n" +#~ " In the short term, we " +#~ "recommend that all PyPI users set " +#~ "up <em>both</em>\n" +#~ " supported two factor authentication" +#~ " methods - using an authentication\n" +#~ " application <em>and</em> setting up" +#~ " a security device (e.g. USB key)." +#~ "\n" #~ " " #~ msgstr "" #~ "\n" -#~ " À court terme, nous recommandons que tous les utilisateurs de " -#~ "PyPI configurent <em>les deux</em>\n" -#~ " méthodes d'authentification à deux facteurs - utiliser une " -#~ "application\n" -#~ " d'authentification <em>et</em> configurer un périphérique de " -#~ "sécurité (ex : clé USB).\n" +#~ " À court terme, nous recommandons" +#~ " que tous les utilisateurs de PyPI" +#~ " configurent <em>les deux</em>\n" +#~ " méthodes d'authentification à deux " +#~ "facteurs - utiliser une application\n" +#~ " d'authentification <em>et</em> configurer" +#~ " un périphérique de sécurité (ex :" +#~ " clé USB).\n" #~ " " #~ msgid "Top storage users" #~ msgstr "Principaux utilisateurs de stockage" #~ msgid "" -#~ "There is currently no established process for performing this " -#~ "administrative task that is explicit and fair for all parties. However, " -#~ "one is currently in development per <a href=\"%(href)s\" title=\"%(title)s" -#~ "\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python enhancement " +#~ "There is currently no established " +#~ "process for performing this administrative " +#~ "task that is explicit and fair for" +#~ " all parties. However, one is " +#~ "currently in development per <a " +#~ "href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\"" +#~ " rel=\"noopener\"><abbr title=\"Python enhancement " #~ "proposal\">PEP</abbr> 541</a>." #~ msgstr "" -#~ "Il n'existe actuellement aucun processus établi pour l'exécution de cette " -#~ "tâche administrative qui soit explicite et juste pour toutes les parties. " -#~ "Cependant, un est actuellement en cours d'élaboration par le <a href=" -#~ "\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " -#~ "title=\"Python Enhancement Proposal\">PEP</abbr> 541</a>." +#~ "Il n'existe actuellement aucun processus " +#~ "établi pour l'exécution de cette tâche" +#~ " administrative qui soit explicite et " +#~ "juste pour toutes les parties. " +#~ "Cependant, un est actuellement en cours" +#~ " d'élaboration par le <a href=\"%(href)s\"" +#~ " title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\"><abbr title=\"Python Enhancement " +#~ "Proposal\">PEP</abbr> 541</a>." #~ msgid "" -#~ "<abbr title=\"Python enhancement proposal\">PEP</abbr> 541 has been " -#~ "accepted, and PyPI is <a href=\"%(href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">creating a workflow</a> which will be " -#~ "documented here." +#~ "<abbr title=\"Python enhancement " +#~ "proposal\">PEP</abbr> 541 has been accepted," +#~ " and PyPI is <a href=\"%(href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">creating a workflow</a> which " +#~ "will be documented here." #~ msgstr "" -#~ "Le <abbr title=\"Python Enhancement Proposal\">PEP</abbr> 541 a été " -#~ "accepté et PyPI est <a href=\"%(href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">en train de créer un processus de traitement</" -#~ "a> qui sera documenté ici." +#~ "Le <abbr title=\"Python Enhancement " +#~ "Proposal\">PEP</abbr> 541 a été accepté " +#~ "et PyPI est <a href=\"%(href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">en" +#~ " train de créer un processus de " +#~ "traitement</a> qui sera documenté ici." #~ msgid "Log Out" #~ msgstr "Se déconnecter" @@ -6506,10 +6600,11 @@ msgstr[1] "" #~ msgid "Simple index" #~ msgstr "Index simple" -#~ msgid "" -#~ "There have been too many unsuccessful login attempts, try again later." +#~ msgid "There have been too many unsuccessful login attempts, try again later." #~ msgstr "" -#~ "Il y a eu trop de tentatives de connexion, veuillez réessayer plus tard." +#~ "Il y a eu trop de tentatives " +#~ "de connexion, veuillez réessayer plus " +#~ "tard." #~ msgid "Created on" #~ msgstr "Créé le" @@ -6518,10 +6613,13 @@ msgstr[1] "" #~ msgstr "Nom de l'utilisateur" #~ msgid "" -#~ "Filter by <a href=\"%(href)s\" class=\"%(classes)s\" aria-label=" -#~ "\"%(aria_label)s\" data-original-label=\"%(data_original_label)s\"> " +#~ "Filter by <a href=\"%(href)s\" " +#~ "class=\"%(classes)s\" aria-label=\"%(aria_label)s\" " +#~ "data-original-label=\"%(data_original_label)s\"> " #~ "classifier </a>" #~ msgstr "" -#~ "Filtrer par <a href=\"%(href)s\" class=\"%(classes)s\" aria-label=" -#~ "\"%(aria_label)s\" data-original-label=\"%(data_original_label)s" -#~ "\">classificateur</a>" +#~ "Filtrer par <a href=\"%(href)s\" " +#~ "class=\"%(classes)s\" aria-label=\"%(aria_label)s\" " +#~ "data-original-" +#~ "label=\"%(data_original_label)s\">classificateur</a>" + diff --git a/warehouse/locale/ja/LC_MESSAGES/messages.mo b/warehouse/locale/ja/LC_MESSAGES/messages.mo index d304481170eb..288fa66d2d2f 100644 Binary files a/warehouse/locale/ja/LC_MESSAGES/messages.mo and b/warehouse/locale/ja/LC_MESSAGES/messages.mo differ diff --git a/warehouse/locale/ja/LC_MESSAGES/messages.po b/warehouse/locale/ja/LC_MESSAGES/messages.po index 5621cbf5a92e..d6a4c350bced 100644 --- a/warehouse/locale/ja/LC_MESSAGES/messages.po +++ b/warehouse/locale/ja/LC_MESSAGES/messages.po @@ -1,35 +1,6 @@ -# Japanese translations for Warehouse. -# Copyright (C) 2019 PyPA -# This file is distributed under the same license as the Warehouse project. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2019. -# Michael Myers <mike.myers@trailofbits.com>, 2019. -# komo_fr <komo.mdrms@gmail.com>, 2019, 2020. -# Yuta Kanzawa <ytknzw@gmail.com>, 2019. -# shinji uyama <uyaaan.event@gmail.com>, 2019. -# Ryo/Liàng KAJI <kaji@code.ac.jp>, 2019. -# Yuichi OMATA <yuichi.omata@gmail.com>, 2019. -# Masashi Kondo <m-kondo@safie.jp>, 2019. -# Dustin Ingram <dustin.ingram@gmail.com>, 2020. -msgid "" -msgstr "" -"Project-Id-Version: Warehouse VERSION\n" -"Report-Msgid-Bugs-To: https://github.com/pypa/warehouse/issues/new\n" -"POT-Creation-Date: 2020-01-15 20:11+0200\n" -"PO-Revision-Date: 2020-04-03 03:48+0000\n" -"Last-Translator: Dustin Ingram <dustin.ingram@gmail.com>\n" -"Language-Team: Japanese <https://hosted.weblate.org/projects/pypa/warehouse/" -"ja/>\n" -"Language: ja\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 4.0-dev\n" -"Generated-By: Babel 2.7.0\n" - +# | msgid "Stay updated:" #: warehouse/views.py:254 #, fuzzy -#| msgid "Stay updated:" msgid "Locale updated" msgstr "最新情報:" @@ -48,20 +19,15 @@ msgstr "50文字以下のユーザー名を選択してください。" #: warehouse/accounts/forms.py:85 msgid "" "The username is invalid. Usernames must be composed of letters, numbers, " -"dots, hyphens and underscores. And must also start and finish with a letter " -"or number. Choose a different username." -msgstr "" -"ユーザー名が無効です。ユーザー名は、文字、数字、ドット、ハイフン、アンダース" -"コアで構成する必要があります。また、文字または数字で開始および終了する必要が" -"あります。別のユーザー名を選択してください。" +"dots, hyphens and underscores. And must also start and finish with a " +"letter or number. Choose a different username." +msgstr "ユーザー名が無効です。ユーザー名は、文字、数字、ドット、ハイフン、アンダースコアで構成する必要があります。また、文字または数字で開始および終了する必要があります。別のユーザー名を選択してください。" #: warehouse/accounts/forms.py:99 msgid "" -"This username is already being used by another account. Choose a different " -"username." -msgstr "" -"このユーザー名はすでに別のアカウントで使用されています。別のユーザー名を選択" -"してください。" +"This username is already being used by another account. Choose a " +"different username." +msgstr "このユーザー名はすでに別のアカウントで使用されています。別のユーザー名を選択してください。" #: warehouse/accounts/forms.py:122 msgid "The password is invalid. Try again." @@ -81,25 +47,19 @@ msgstr "メールアドレスが無効です。もう一度やり直してくだ #: warehouse/accounts/forms.py:198 msgid "You can't use an email address from this domain. Use a different email." -msgstr "" -"このドメインからのメールアドレスは使用できません。別のメールアドレスを使用し" -"てください。" +msgstr "このドメインからのメールアドレスは使用できません。別のメールアドレスを使用してください。" #: warehouse/accounts/forms.py:209 msgid "" -"This email address is already being used by this account. Use a different " -"email." -msgstr "" -"このメールアドレスはすでにこのアカウントで使用されています。別のメールアドレ" -"スを使用してください。" +"This email address is already being used by this account. Use a different" +" email." +msgstr "このメールアドレスはすでにこのアカウントで使用されています。別のメールアドレスを使用してください。" #: warehouse/accounts/forms.py:216 msgid "" -"This email address is already being used by another account. Use a different " -"email." -msgstr "" -"このメールアドレスはすでに別のアカウントで使用されています。別のメールアドレ" -"スを使用してください。" +"This email address is already being used by another account. Use a " +"different email." +msgstr "このメールアドレスはすでに別のアカウントで使用されています。別のメールアドレスを使用してください。" #: warehouse/accounts/forms.py:238 msgid "The name is too long. Choose a name with 100 characters or less." @@ -113,9 +73,9 @@ msgstr "不正なTOTPコード。" msgid "Invalid WebAuthn assertion: Bad payload" msgstr "無効なWebAuthnアサーション：不正なペイロード" +# | msgid "Invalid TOTP code." #: warehouse/accounts/forms.py:344 #, fuzzy -#| msgid "Invalid TOTP code." msgid "Invalid Recovery Code." msgstr "不正なTOTPコード。" @@ -143,16 +103,15 @@ msgstr "" #: warehouse/accounts/views.py:455 msgid "" -"New user registration temporarily disabled. See https://pypi.org/help#admin-" -"intervention for details." +"New user registration temporarily disabled. See https://pypi.org/help" +"#admin-intervention for details." msgstr "" -"新規ユーザ登録が一時的に無効になっています。詳細については https://pypi.org/" -"help#admin-intervention を参照してください。" +"新規ユーザ登録が一時的に無効になっています。詳細については https://pypi.org/help#admin-intervention " +"を参照してください。" #: warehouse/accounts/views.py:552 msgid "Expired token: request a new password reset link" -msgstr "" -"期限切れのトークン: 新しいパスワード リセット リンクをリクエストして下さい" +msgstr "期限切れのトークン: 新しいパスワード リセット リンクをリクエストして下さい" #: warehouse/accounts/views.py:554 msgid "Invalid token: request a new password reset link" @@ -186,8 +145,7 @@ msgstr "パスワードをリセットしました" #: warehouse/accounts/views.py:630 msgid "Expired token: request a new email verification link" -msgstr "" -"期限切れのトークン: 新しいメールアドレス確認リンクをリクエストして下さい" +msgstr "期限切れのトークン: 新しいメールアドレス確認リンクをリクエストして下さい" #: warehouse/accounts/views.py:632 msgid "Invalid token: request a new email verification link" @@ -215,18 +173,16 @@ msgstr "これが主要メールアドレスです" #: warehouse/accounts/views.py:669 msgid "Email address ${email_address} verified. ${confirm_message}." -msgstr "" -"メールアドレス ${email_address} が確認されました。 ${confirm_message}。" +msgstr "メールアドレス ${email_address} が確認されました。 ${confirm_message}。" #: warehouse/manage/views.py:186 msgid "Email ${email_address} added - check your email for a verification link" -msgstr "" -"メールアドレス ${email_address} が追加されました - メールにある確認用のリンク" -"をチェックしてください" +msgstr "メールアドレス ${email_address} が追加されました - メールにある確認用のリンクをチェックしてください" #: warehouse/manage/views.py:667 warehouse/manage/views.py:703 msgid "" -"You must provision a two factor method before recovery codes can be generated" +"You must provision a two factor method before recovery codes can be " +"generated" msgstr "" #: warehouse/manage/views.py:678 @@ -412,12 +368,10 @@ msgstr "問題が発生しました" #: warehouse/templates/500.html:22 msgid "" -"<p>We are experiencing technical issues that are affecting our ability to " -"serve you this site.</p> <p>We are aware of the problem and are working to " -"resolve it as soon as possible.</p>" -msgstr "" -"<p>このサイトの提供について技術的な問題が発生しています。</p><p>我々は問題を" -"認識しており、できるだけ早く解決するよう取り組んでいます。</p>" +"<p>We are experiencing technical issues that are affecting our ability to" +" serve you this site.</p> <p>We are aware of the problem and are working " +"to resolve it as soon as possible.</p>" +msgstr "<p>このサイトの提供について技術的な問題が発生しています。</p><p>我々は問題を認識しており、できるだけ早く解決するよう取り組んでいます。</p>" #: warehouse/templates/500.html:28 msgid "Check our status page" @@ -437,23 +391,22 @@ msgstr "パッケージ管理に PyPI を使っていますか？" #: warehouse/templates/500.html:37 msgid "" -"Consider <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\" rel=" -"\"noopener\"> contributing </a> or <a href=\"https://psfmember.org/civicrm/" -"contribute/transact?reset=1&id=13\" target=\"_blank\" rel=\"noopener\"> " -"donating </a> to help us build a more stable and secure platform." +"Consider <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\" " +"rel=\"noopener\"> contributing </a> or <a " +"href=\"https://psfmember.org/civicrm/contribute/transact?reset=1&id=13\" " +"target=\"_blank\" rel=\"noopener\"> donating </a> to help us build a more" +" stable and secure platform." msgstr "" -"我々がより安定で安全なプラットフォームを作れるよう、<a href=\"https://github." -"com/pypa/warehouse\" target=\"_blank\" rel=\"noopener\">開発参加</a>または<a " +"我々がより安定で安全なプラットフォームを作れるよう、<a href=\"https://github.com/pypa/warehouse\" " +"target=\"_blank\" rel=\"noopener\">開発参加</a>または<a " "href=\"https://psfmember.org/civicrm/contribute/transact?reset=1&id=13\" " "target=\"_blank\" rel=\"noopener\">寄付</a>をご検討下さい。" #: warehouse/templates/base.html:23 msgid "" -"Choose a strong password that contains letters (uppercase and lowercase), " -"numbers and special characters. Avoid common words or repetition." -msgstr "" -"文字（大文字と小文字）、数字、特殊文字を含んだ強力なパスワードを入力してくだ" -"さい。一般的な単語や繰り返しは避けてください。" +"Choose a strong password that contains letters (uppercase and lowercase)," +" numbers and special characters. Avoid common words or repetition." +msgstr "文字（大文字と小文字）、数字、特殊文字を含んだ強力なパスワードを入力してください。一般的な単語や繰り返しは避けてください。" #: warehouse/templates/base.html:26 msgid "Password strength:" @@ -476,10 +429,10 @@ msgstr "メインナビゲーション" msgid "Help" msgstr "ヘルプ" +# | msgid "Sponsors" #: warehouse/templates/base.html:40 warehouse/templates/base.html:54 #: warehouse/templates/includes/current-user-indicator.html:60 #, fuzzy -#| msgid "Sponsors" msgid "Sponsor" msgstr "スポンサー" @@ -510,11 +463,9 @@ msgstr "メインメニュー" #: warehouse/templates/base.html:76 warehouse/templates/index.html:79 msgid "" -"The Python Package Index (PyPI) is a repository of software for the Python " -"programming language." -msgstr "" -"Python Package Index（PyPI）は、プログラミング言語Python用のソフトウェアのリ" -"ポジトリです。" +"The Python Package Index (PyPI) is a repository of software for the " +"Python programming language." +msgstr "Python Package Index（PyPI）は、プログラミング言語Python用のソフトウェアのリポジトリです。" #: warehouse/templates/base.html:92 msgid "RSS: 40 latest updates" @@ -546,27 +497,22 @@ msgstr "警告" #: warehouse/templates/base.html:158 msgid "You are using an unsupported browser, upgrade to a newer version." -msgstr "" -"サポートされていないブラウザを使用しています。新しいバージョンにアップグレー" -"ドしてください。" +msgstr "サポートされていないブラウザを使用しています。新しいバージョンにアップグレードしてください。" #: warehouse/templates/base.html:167 msgid "" "You are using TestPyPI – a separate instance of the Python Package Index " -"that allows you to try distribution tools and processes without affecting " -"the real index." +"that allows you to try distribution tools and processes without affecting" +" the real index." msgstr "" -"TestPyPIを使用しています - これはPython Package Indexの独立したインスタンス" -"で、実際のインデックスに影響を与えずにツールの配布やプロセスを試すことができ" -"ます。" +"TestPyPIを使用しています - これはPython Package " +"Indexの独立したインスタンスで、実際のインデックスに影響を与えずにツールの配布やプロセスを試すことができます。" #: warehouse/templates/base.html:177 msgid "" -"Some features may not work without JavaScript. Please try enabling it if you " -"encounter problems." -msgstr "" -"一部の機能は、JavaScriptなしでは動作しない場合があります。問題が発生した場合" -"は、有効にしてみてください。" +"Some features may not work without JavaScript. Please try enabling it if " +"you encounter problems." +msgstr "一部の機能は、JavaScriptなしでは動作しない場合があります。問題が発生した場合は、有効にしてみてください。" #: warehouse/templates/base.html:210 warehouse/templates/base.html:231 #: warehouse/templates/error-base-with-search.html:20 @@ -688,7 +634,8 @@ msgstr "全システム稼働" #: warehouse/templates/base.html:311 msgid "" -"Developed and maintained by the Python community, for the Python community." +"Developed and maintained by the Python community, for the Python " +"community." msgstr "PythonコミュニティによるPythonコミュニティのための開発と保守。" #: warehouse/templates/base.html:313 @@ -721,8 +668,7 @@ msgstr "Test Python Package Indexを使ってPythonパッケージの公開を #: warehouse/templates/index.html:44 msgid "Find, install and publish Python packages with the Python Package Index" -msgstr "" -"Python Package Indexを使ってPythonパッケージを検索・インストール・公開する" +msgstr "Python Package Indexを使ってPythonパッケージを検索・インストール・公開する" #: warehouse/templates/index.html:60 #, python-format @@ -751,11 +697,9 @@ msgstr "%(num_users)s ユーザ" #: warehouse/templates/index.html:81 msgid "" -"PyPI helps you find and install software developed and shared by the Python " -"community." -msgstr "" -"PyPIは、Pythonコミュニティによって開発・共有されているソフトウェアの検索とイ" -"ンストールに役立ちます。" +"PyPI helps you find and install software developed and shared by the " +"Python community." +msgstr "PyPIは、Pythonコミュニティによって開発・共有されているソフトウェアの検索とインストールに役立ちます。" #: warehouse/templates/index.html:82 msgid "Learn about installing packages</a>." @@ -787,27 +731,25 @@ msgstr "新着: 最新のプロジェクトリリース" #: warehouse/templates/upload.html:25 msgid "This URL is an API endpoint for uploading files to PyPI." -msgstr "" -"この URL は、PyPI にファイルをアップロードするための API エンドポイントです。" +msgstr "この URL は、PyPI にファイルをアップロードするための API エンドポイントです。" #: warehouse/templates/upload.html:26 #, python-format msgid "" -"For more information on uploading projects to PyPI, visit the <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python " -"Packaging User Guide</a>." +"For more information on uploading projects to PyPI, visit the <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" -"PyPI へのプロジェクトのアップロードの詳細については、<a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " +"PyPI へのプロジェクトのアップロードの詳細については、<a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User " "Guide</a>を参照してください。" #: warehouse/templates/upload.html:28 #, python-format msgid "" -"Otherwise, we suggest you <a href=\"%(href)s\">go to the PyPI homepage</a>." -msgstr "" -"それ以外の場合は、<a href=\"%(href)s\">PyPIのホームページ</a>を参照することを" -"お勧めします。" +"Otherwise, we suggest you <a href=\"%(href)s\">go to the PyPI " +"homepage</a>." +msgstr "それ以外の場合は、<a href=\"%(href)s\">PyPIのホームページ</a>を参照することをお勧めします。" #: warehouse/templates/accounts/login.html:17 #: warehouse/templates/accounts/recovery-code.html:17 @@ -955,9 +897,9 @@ msgstr "" msgid "Login using Recovery Code" msgstr "" +# | msgid "Error code" #: warehouse/templates/accounts/recovery-code.html:40 #, fuzzy -#| msgid "Error code" msgid "Enter recovery code" msgstr "エラーコード" @@ -968,19 +910,17 @@ msgstr "認証" #: warehouse/templates/accounts/recovery-code.html:58 msgid "" -"PyPI allows for generating recovery codes to be stored securely offline in " -"the event that your device or application is lost. Enter one of these codes " -"in the form to verify your identity. Once used, the recovery code will no " -"longer be valid." +"PyPI allows for generating recovery codes to be stored securely offline " +"in the event that your device or application is lost. Enter one of these " +"codes in the form to verify your identity. Once used, the recovery code " +"will no longer be valid." msgstr "" +# | msgid "Lost your device? Not working? <a href=\"%(href)s\">Get help</a>." #: warehouse/templates/accounts/recovery-code.html:59 #, fuzzy, python-format -#| msgid "Lost your device? Not working? <a href=\"%(href)s\">Get help</a>." msgid "<p>Not working? <a href=\"%(href)s\">Get help</a>.</p>" -msgstr "" -"端末を紛失しましたか？動作がおかしい？<a href=\"%(href)s\">ヘルプ</a>を参照し" -"て下さい。" +msgstr "端末を紛失しましたか？動作がおかしい？<a href=\"%(href)s\">ヘルプ</a>を参照して下さい。" #: warehouse/templates/accounts/register.html:18 msgid "Create an account" @@ -1040,12 +980,11 @@ msgstr "パスワードの確認" #: warehouse/templates/accounts/register.html:157 msgid "" "This password appears in a security breach or has been compromised and " -"cannot be used. Please refer to the <a href=\"/help/#compromised-password" -"\">FAQ</a> for more information." +"cannot be used. Please refer to the <a href=\"/help/#compromised-" +"password\">FAQ</a> for more information." msgstr "" -"このパスワードはセキュリティ違反または侵害を受けているため、使用できません。" -"より多くの情報を得るには、<a href=\"/help/#compromised-password\">FAQ</a>を参" -"照してください。" +"このパスワードはセキュリティ違反または侵害を受けているため、使用できません。より多くの情報を得るには、<a href=\"/help" +"/#compromised-password\">FAQ</a>を参照してください。" #: warehouse/templates/accounts/register.html:162 msgid "Create account" @@ -1058,9 +997,7 @@ msgstr "パスワードリセット" #: warehouse/templates/accounts/request-password-reset.html:27 msgid "To reset your password, enter your username or email." -msgstr "" -"パスワードをリセットするには、ユーザ名またはメールアドレスを入力してくださ" -"い。" +msgstr "パスワードをリセットするには、ユーザ名またはメールアドレスを入力してください。" #: warehouse/templates/accounts/request-password-reset.html:39 msgid "Username or email" @@ -1081,11 +1018,9 @@ msgstr "登録されたメールアドレスにメールを送信しました。 #: warehouse/templates/accounts/request-password-reset.html:52 #, python-format msgid "" -"The email contains a link to reset your password. This link will expire in " -"%(n_hours)s hours." -msgstr "" -"メールにはパスワードをリセットするためのリンクが含まれています。このリンクの" -"有効期限は%(n_hours)s 時間です。" +"The email contains a link to reset your password. This link will expire " +"in %(n_hours)s hours." +msgstr "メールにはパスワードをリセットするためのリンクが含まれています。このリンクの有効期限は%(n_hours)s 時間です。" #: warehouse/templates/accounts/reset-password.html:18 #: warehouse/templates/accounts/reset-password.html:24 @@ -1119,8 +1054,7 @@ msgstr "セキュリティ端末を接続し、「端末で認証」ボタンを #: warehouse/templates/accounts/two-factor.html:42 msgid "Enable JavaScript to log in with a security device (e.g. USB key)" -msgstr "" -"セキュリティ端末（USBキーなど）でログインするにはJavaScriptを有効にして下さい" +msgstr "セキュリティ端末（USBキーなど）でログインするにはJavaScriptを有効にして下さい" #: warehouse/templates/accounts/two-factor.html:51 msgid "Authenticate with device" @@ -1129,19 +1063,17 @@ msgstr "端末で認証" #: warehouse/templates/accounts/two-factor.html:55 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" rel=\"%(rel)s" -"\">Upgrade your browser</a> to log in with a security device (e.g. USB key)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" " +"rel=\"%(rel)s\">Upgrade your browser</a> to log in with a security device" +" (e.g. USB key)" msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" rel=\"%(rel)s" -"\">ブラウザをアップグレードして</a>セキュリティ端末（USBキーなど）でログイン" -"して下さい" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" " +"rel=\"%(rel)s\">ブラウザをアップグレードして</a>セキュリティ端末（USBキーなど）でログインして下さい" #: warehouse/templates/accounts/two-factor.html:60 #, python-format msgid "Lost your device? Not working? <a href=\"%(href)s\">Get help</a>." -msgstr "" -"端末を紛失しましたか？動作がおかしい？<a href=\"%(href)s\">ヘルプ</a>を参照し" -"て下さい。" +msgstr "端末を紛失しましたか？動作がおかしい？<a href=\"%(href)s\">ヘルプ</a>を参照して下さい。" #: warehouse/templates/accounts/two-factor.html:72 msgid "Authenticate with an app" @@ -1154,18 +1086,17 @@ msgstr "認証コードを入力" #: warehouse/templates/accounts/two-factor.html:105 #, python-format msgid "" -"<p>Generate a code using the authentication application connected to your " -"PyPI account. Enter this code in the form to verify your identity.</p> " -"<p>Lost your application? Not working? <a href=\"%(href)s\">Get help</a>.</p>" +"<p>Generate a code using the authentication application connected to your" +" PyPI account. Enter this code in the form to verify your identity.</p> " +"<p>Lost your application? Not working? <a href=\"%(href)s\">Get " +"help</a>.</p>" msgstr "" -"<p>PyPIアカウントに接続するために、認証アプリケーションを使ってコードを生成し" -"てください。本人確認のために、このコードをフォームに入力してください。</p><p>" -"アプリケーションを紛失しましたか？うまく動作しませんか？その場合は<a href=" -"\"%(href)s\">ヘルプを参照してください</a>。</p>" +"<p>PyPIアカウントに接続するために、認証アプリケーションを使ってコードを生成してください。本人確認のために、このコードをフォームに入力してください。</p><p>アプリケーションを紛失しましたか？うまく動作しませんか？その場合は<a" +" href=\"%(href)s\">ヘルプを参照してください</a>。</p>" +# | msgid "Set up your application" #: warehouse/templates/accounts/two-factor.html:117 #, fuzzy -#| msgid "Set up your application" msgid "Lost your security key or application?" msgstr "アプリケーションの設定" @@ -1176,9 +1107,9 @@ msgstr "" #: warehouse/templates/accounts/two-factor.html:122 #, python-format msgid "" -"<p><strong>You have not generated account recovery codes.</strong></p> <p>If " -"you lose access to your two factor methods, you may lose access to your " -"account. <a href=\"%(href)s\">Get help with recovery codes.</a></p>" +"<p><strong>You have not generated account recovery codes.</strong></p> " +"<p>If you lose access to your two factor methods, you may lose access to " +"your account. <a href=\"%(href)s\">Get help with recovery codes.</a></p>" msgstr "" #: warehouse/templates/email/account-deleted/body.html:18 @@ -1193,11 +1124,12 @@ msgstr "PyPIアカウント<strong>%(username)s</strong>は削除されました #: warehouse/templates/email/two-factor-removed/body.html:20 #, python-format msgid "" -"If you did not make this change, you can email <a href=\"%(href)s\">" -"%(email_address)s</a> to communicate with the PyPI administrators." +"If you did not make this change, you can email <a " +"href=\"%(href)s\">%(email_address)s</a> to communicate with the PyPI " +"administrators." msgstr "" -"もしあなたがこの変更を行っていない場合、<a href=\"%(href)s\">" -"%(email_address)s</a>にメールして PyPI 管理者に連絡して下さい。" +"もしあなたがこの変更を行っていない場合、<a href=\"%(href)s\">%(email_address)s</a>にメールして PyPI" +" 管理者に連絡して下さい。" #: warehouse/templates/email/added-as-collaborator/body.html:19 #, python-format @@ -1205,26 +1137,22 @@ msgid "" "You have been added as <strong>%(role)s</strong> to the %(site)s project " "%(project)s by %(submitter)s." msgstr "" -"%(submitter)s により、<strong>%(role)s</strong>として %(site)s のプロジェク" -"ト %(project)s に追加されました。" +"%(submitter)s により、<strong>%(role)s</strong>として %(site)s のプロジェクト " +"%(project)s に追加されました。" #: warehouse/templates/email/added-as-collaborator/body.html:24 #, python-format msgid "" "You are receiving this because you have been added by %(submitter)s to a " "project on %(site)s." -msgstr "" -"あなたがこのメールを受け取ったのは、%(submitter)s により %(site)s のプロジェ" -"クトに追加されたからです。" +msgstr "あなたがこのメールを受け取ったのは、%(submitter)s により %(site)s のプロジェクトに追加されたからです。" #: warehouse/templates/email/password-change/body.html:18 #, python-format msgid "" -"Someone, perhaps you, has changed the password for your PyPI account <strong>" -"%(username)s</strong>." -msgstr "" -"あなたか誰かが、あなたの PyPI アカウント <strong>%(username)s</strong> のパス" -"ワードを変更しました。" +"Someone, perhaps you, has changed the password for your PyPI account " +"<strong>%(username)s</strong>." +msgstr "あなたか誰かが、あなたの PyPI アカウント <strong>%(username)s</strong> のパスワードを変更しました。" #: warehouse/templates/email/password-compromised-hibp/body.html:18 #: warehouse/templates/email/password-compromised/body.html:18 @@ -1233,24 +1161,23 @@ msgstr "え？" #: warehouse/templates/email/password-compromised/body.html:20 msgid "" -"PyPI administrators have determined that your password is compromised. To\n" -" protect you and other users, we have preemptively reset your password and " -"you\n" +"PyPI administrators have determined that your password is compromised. To" +"\n" +" protect you and other users, we have preemptively reset your password " +"and you\n" " will no longer be able to log in or upload to PyPI with your existing\n" " password." msgstr "" -"PyPI 管理者はあなたのパスワードが流出していることを特定しました。あなたと他の" -"ユーザを守るため、予防措置としてあなたのパスワードをリセットしました。現在の" -"パスワードでは PyPI にログインしたりアップロードしたりすることはできません。" +"PyPI " +"管理者はあなたのパスワードが流出していることを特定しました。あなたと他のユーザを守るため、予防措置としてあなたのパスワードをリセットしました。現在のパスワードでは" +" PyPI にログインしたりアップロードしたりすることはできません。" #: warehouse/templates/email/password-compromised/body.html:26 msgid "" "PyPI itself has not suffered a breach. This is a protective measure to " "reduce the\n" " risk for PyPI and its users." -msgstr "" -"PyPI自体は侵害を受けていません。これは、PyPIとそのユーザに対するクレデンシャ" -"ルスタッフィング攻撃のリスクを減らすための保護手段です。" +msgstr "PyPI自体は侵害を受けていません。これは、PyPIとそのユーザに対するクレデンシャルスタッフィング攻撃のリスクを減らすための保護手段です。" #: warehouse/templates/email/password-compromised-hibp/body.html:32 #: warehouse/templates/email/password-compromised/body.html:31 @@ -1260,11 +1187,9 @@ msgstr "何をすべきですか？" #: warehouse/templates/email/password-compromised/body.html:33 #, python-format msgid "" -"To regain access to your account, <a href=\"%(href)s\">reset your password</" -"a> on PyPI." -msgstr "" -"あなたのアカウントへのアクセスを回復するには、 PyPI で<a href=\"%(href)s\">パ" -"スワードをリセット</a>して下さい。" +"To regain access to your account, <a href=\"%(href)s\">reset your " +"password</a> on PyPI." +msgstr "あなたのアカウントへのアクセスを回復するには、 PyPI で<a href=\"%(href)s\">パスワードをリセット</a>して下さい。" #: warehouse/templates/email/password-compromised/body.html:39 msgid "How can I contact you?" @@ -1273,11 +1198,10 @@ msgstr "どうしたら連絡できますか？" #: warehouse/templates/email/password-compromised/body.html:41 #, python-format msgid "" -"For more information, you can email %(email_address)s to communicate with\n" +"For more information, you can email %(email_address)s to communicate with" +"\n" " the PyPI administrators." -msgstr "" -"更に情報が必要でしたら、 %(email_address)s にメールして PyPI 管理者に連絡する" -"ことができます。" +msgstr "更に情報が必要でしたら、 %(email_address)s にメールして PyPI 管理者に連絡することができます。" #: warehouse/templates/email/password-compromised-hibp/body.html:20 msgid "" @@ -1285,14 +1209,13 @@ msgid "" "password appears\n" " in public data breaches. To protect you and other users, we have " "preemptively reset your\n" -" password and you will no longer be able to log in or upload to PyPI with " -"your existing\n" +" password and you will no longer be able to log in or upload to PyPI " +"with your existing\n" " password." msgstr "" -"直近の PyPI へのログインまたはアップロード中に、我々はあなたのパスワードが過" -"去に流出したデータに含まれていることを発見しました。あなたと他のユーザを守る" -"ため、予防措置としてあなたのパスワードをリセットしました。現在のパスワードで" -"は PyPI にログインしたりアップロードしたりすることはできません。" +"直近の PyPI " +"へのログインまたはアップロード中に、我々はあなたのパスワードが過去に流出したデータに含まれていることを発見しました。あなたと他のユーザを守るため、予防措置としてあなたのパスワードをリセットしました。現在のパスワードでは" +" PyPI にログインしたりアップロードしたりすることはできません。" #: warehouse/templates/email/password-compromised-hibp/body.html:26 #, python-format @@ -1302,22 +1225,20 @@ msgid "" " risk of <a href=\"%(href)s\">credential stuffing</a>\n" " attacks against PyPI and its users." msgstr "" -"PyPI自体は侵害を受けていません。これは、PyPIとそのユーザに対する<a href=" -"\"%(href)s\">クレデンシャルスタッフィング</a>攻撃のリスクを減らすための保護手" -"段です。" +"PyPI自体は侵害を受けていません。これは、PyPIとそのユーザに対する<a " +"href=\"%(href)s\">クレデンシャルスタッフィング</a>攻撃のリスクを減らすための保護手段です。" #: warehouse/templates/email/password-compromised-hibp/body.html:34 #, python-format msgid "" -"To regain access to your account, <a href=\"%(reset_pw_url)s\">reset your " -"password</a> on PyPI. We also recommend that you go to <a href=" -"\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> and check your other " -"passwords and get yourself familiar with good password practices." +"To regain access to your account, <a href=\"%(reset_pw_url)s\">reset your" +" password</a> on PyPI. We also recommend that you go to <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> and check your " +"other passwords and get yourself familiar with good password practices." msgstr "" -"あなたのアカウントへのアクセスを回復するには、 PyPI で<a href=" -"\"%(reset_pw_url)s\">パスワードをリセット</a>して下さい。<a href=" -"\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>にてあなたの他のパスワードを" -"確認するとともに良いパスワードの例について学ぶこともお勧めします。" +"あなたのアカウントへのアクセスを回復するには、 PyPI で<a " +"href=\"%(reset_pw_url)s\">パスワードをリセット</a>して下さい。<a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>にてあなたの他のパスワードを確認するとともに良いパスワードの例について学ぶこともお勧めします。" #: warehouse/templates/email/password-compromised-hibp/body.html:40 msgid "How do you know this?" @@ -1326,28 +1247,28 @@ msgstr "どのようにして分かったのですか？" #: warehouse/templates/email/password-compromised-hibp/body.html:42 #, python-format msgid "" -"We use a free security service from <a href=\"%(have_i_been_pwned_url)s" -"\">HaveIBeenPwned</a>. When registering, authenticating, or updating your " -"password, we generate a SHA1 hash of your password and use the first 5 " -"characters of the hash to decide if the password is compromised. The " -"plaintext password is never stored by PyPI or sent to HaveIBeenPwned." +"We use a free security service from <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>. When registering, " +"authenticating, or updating your password, we generate a SHA1 hash of " +"your password and use the first 5 characters of the hash to decide if the" +" password is compromised. The plaintext password is never stored by PyPI " +"or sent to HaveIBeenPwned." msgstr "" -"我々は<a href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>という無料セ" -"キュリティサービスを利用しています。あなたのパスワードを登録・認証・更新する" -"際に、そのパスワードの SHA1 ハッシュを生成し、その最初の5文字を使ってパスワー" -"ド流出の判定をしています。暗号化されていないパスワードが PyPI に保存されたり " +"我々は<a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>という無料セキュリティサービスを利用しています。あなたのパスワードを登録・認証・更新する際に、そのパスワードの" +" SHA1 ハッシュを生成し、その最初の5文字を使ってパスワード流出の判定をしています。暗号化されていないパスワードが PyPI に保存されたり " "HaveIBeenPwned に送信されることは決してありません。" #: warehouse/templates/email/password-compromised-hibp/body.html:47 #, python-format msgid "" -"For more information, see our <a href=\"%(faq_url)s\">FAQ</a>. For help, you " -"can email <a href=\"%(email_href)s\">%(email_address)s</a> to communicate " -"with the PyPI administrators." +"For more information, see our <a href=\"%(faq_url)s\">FAQ</a>. For help, " +"you can email <a href=\"%(email_href)s\">%(email_address)s</a> to " +"communicate with the PyPI administrators." msgstr "" -"更に情報が必要でしたら、<a href=\"%(faq_url)s\">FAQ</a>を参照して下さい。助け" -"が必要でしたら、 <a href=\"%(email_href)s\">%(email_address)s</a> にメールし" -"て PyPI 管理者に連絡することができます。" +"更に情報が必要でしたら、<a href=\"%(faq_url)s\">FAQ</a>を参照して下さい。助けが必要でしたら、 <a " +"href=\"%(email_href)s\">%(email_address)s</a> にメールして PyPI " +"管理者に連絡することができます。" #: warehouse/templates/email/password-reset/body.html:18 #, python-format @@ -1355,17 +1276,15 @@ msgid "" "Someone, perhaps you, has made a password reset request for your PyPI " "account '%(username)s'." msgstr "" -"あなたか誰かが、あなたの PyPI アカウント <strong>%(username)s</strong> のパス" -"ワード リセットをリクエストしました。" +"あなたか誰かが、あなたの PyPI アカウント <strong>%(username)s</strong> のパスワード " +"リセットをリクエストしました。" #: warehouse/templates/email/password-reset/body.html:20 #, python-format msgid "" "If you wish to proceed with this request, <a href=\"%(href)s\">click to " "reset your password</a>." -msgstr "" -"このリクエストを進めるには、<a href=\"%(href)s\">ここをクリックしてパスワード" -"をリセットして下さい</a>。" +msgstr "このリクエストを進めるには、<a href=\"%(href)s\">ここをクリックしてパスワードをリセットして下さい</a>。" #: warehouse/templates/email/password-reset/body.html:22 #: warehouse/templates/email/verify-email/body.html:22 @@ -1377,64 +1296,55 @@ msgstr[0] "このリンクの有効期限は %(n_hours)s 時間です。" #: warehouse/templates/email/password-reset/body.html:24 #: warehouse/templates/email/verify-email/body.html:24 msgid "If you did not make this request, you can safely ignore this email." -msgstr "" -"このリクエストをしたのがあなたでない場合は、このメールは無視して問題ありませ" -"ん。" +msgstr "このリクエストをしたのがあなたでない場合は、このメールは無視して問題ありません。" #: warehouse/templates/email/primary-email-change/body.html:18 #, python-format msgid "" -"The primary email for your PyPI account <strong>%(username)s</strong> has " -"been changed from <code>%(old_email)s</code> to <code>%(new_email)s</code>" +"The primary email for your PyPI account <strong>%(username)s</strong> has" +" been changed from <code>%(old_email)s</code> to " +"<code>%(new_email)s</code>" msgstr "" -"あなたの PyPI アカウント <strong>%(username)s</strong> の主要メールアドレス" -"は、 <code>%(old_email)s</code> から <code>%(new_email)s</code> へ変更されま" -"した" +"あなたの PyPI アカウント <strong>%(username)s</strong> の主要メールアドレスは、 " +"<code>%(old_email)s</code> から <code>%(new_email)s</code> へ変更されました" +# | msgid "" +# | "Someone, perhaps you, has changed the password for your PyPI account " +# | "<strong>%(username)s</strong>." #: warehouse/templates/email/two-factor-added/body.html:18 #, fuzzy, python-format -#| msgid "" -#| "Someone, perhaps you, has changed the password for your PyPI account " -#| "<strong>%(username)s</strong>." msgid "" "Someone, perhaps you, has added a %(method)s two-factor authentication " "method to your PyPI account <strong>%(username)s</strong>." -msgstr "" -"あなたか誰かが、あなたの PyPI アカウント <strong>%(username)s</strong> のパス" -"ワードを変更しました。" +msgstr "あなたか誰かが、あなたの PyPI アカウント <strong>%(username)s</strong> のパスワードを変更しました。" +# | msgid "" +# | "Someone, perhaps you, has changed the password for your PyPI account " +# | "<strong>%(username)s</strong>." #: warehouse/templates/email/two-factor-removed/body.html:18 #, fuzzy, python-format -#| msgid "" -#| "Someone, perhaps you, has changed the password for your PyPI account " -#| "<strong>%(username)s</strong>." msgid "" "Someone, perhaps you, has removed a %(method)s two-factor authentication " "method from your PyPI account <strong>%(username)s</strong>." -msgstr "" -"あなたか誰かが、あなたの PyPI アカウント <strong>%(username)s</strong> のパス" -"ワードを変更しました。" +msgstr "あなたか誰かが、あなたの PyPI アカウント <strong>%(username)s</strong> のパスワードを変更しました。" #: warehouse/templates/email/verify-email/body.html:18 #, python-format msgid "" -"Someone, perhaps you, has added this email address (<code>%(email_address)s</" -"code>) to their PyPI account." -msgstr "" -"あなたか誰かが、このメールアドレス ( <code>%(email_address)s</code> )を PyPI " -"アカウントに追加しました。" +"Someone, perhaps you, has added this email address " +"(<code>%(email_address)s</code>) to their PyPI account." +msgstr "あなたか誰かが、このメールアドレス ( <code>%(email_address)s</code> )を PyPI アカウントに追加しました。" +# | msgid "" +# | "If you wish to proceed with this request, <a href=\"%(href)s\">click this +# " +# | "link to verify your email address</a>" #: warehouse/templates/email/verify-email/body.html:20 #, fuzzy, python-format -#| msgid "" -#| "If you wish to proceed with this request, <a href=\"%(href)s\">click this " -#| "link to verify your email address</a>" msgid "" -"If you wish to proceed with this request, <a href=\"%(href)s\">click this " -"link to verify your email address</a>." -msgstr "" -"このリクエストを進めるには、<a href=\"%(href)s\">このリンクをクリックしてメー" -"ルアドレスを確認して下さい</a>" +"If you wish to proceed with this request, <a href=\"%(href)s\">click this" +" link to verify your email address</a>." +msgstr "このリクエストを進めるには、<a href=\"%(href)s\">このリンクをクリックしてメールアドレスを確認して下さい</a>" #: warehouse/templates/includes/current-user-indicator.html:29 msgid "Admin" @@ -1495,11 +1405,11 @@ msgstr "成功" #: warehouse/templates/includes/hash-modal.html:23 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Hashes</a> for %(filename)s" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Hashes</a> for %(filename)s" msgstr "" -"%(filename)sの<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">ハッシュ</a>" +"%(filename)sの<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">ハッシュ</a>" #: warehouse/templates/includes/hash-modal.html:28 #, python-format @@ -1565,11 +1475,9 @@ msgstr "メールアドレスを確認するか、新しいアドレスを追加 #: warehouse/templates/includes/session-notifications.html:37 #, python-format msgid "" -"Two factor authentication is available, <a href=\"%(href)s\">enable it now " -"for your account.</a>" -msgstr "" -"二要素認証を使用できます。<a href=\"%(href)s\">アカウントに対して今すぐ有効に" -"してください。</a>" +"Two factor authentication is available, <a href=\"%(href)s\">enable it " +"now for your account.</a>" +msgstr "二要素認証を使用できます。<a href=\"%(href)s\">アカウントに対して今すぐ有効にしてください。</a>" #: warehouse/templates/includes/accounts/profile-actions.html:16 msgid "Edit profile" @@ -1586,39 +1494,40 @@ msgstr "統計" #: warehouse/templates/includes/accounts/profile-actions.html:21 #, python-format msgid "" -"View statistics for your projects via <a href=\"%(libs_io_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or by " -"using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our public " -"dataset on Google BigQuery</a>" +"View statistics for your projects via <a href=\"%(libs_io_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, " +"or by using <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">our public dataset on Google BigQuery</a>" msgstr "" -"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.io</a>経由または <a href=\"%(gbq_href)s\" target=" -"\"_blank\" rel=\"noopener\">Google BigQuery上の公開データセット</a>を使ってプ" -"ロジェクトの統計を見る" +"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io</a>経由または <a href=\"%(gbq_href)s\" " +"target=\"_blank\" rel=\"noopener\">Google " +"BigQuery上の公開データセット</a>を使ってプロジェクトの統計を見る" #: warehouse/templates/includes/accounts/profile-actions.html:30 #, python-format msgid "" -"View statistics for %(username)s's projects via <a href=\"%(libs_io_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or " -"by using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our " -"public dataset on Google BigQuery</a>" +"View statistics for %(username)s's projects via <a " +"href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io</a>, or by using <a href=\"%(gbq_href)s\" " +"target=\"_blank\" rel=\"noopener\">our public dataset on Google " +"BigQuery</a>" msgstr "" -"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.io</a>経由または<a href=\"%(gbq_href)s\" target=" -"\"_blank\" rel=\"noopener\">Google BigQuery上の公開データセット</a>を使っ" -"て%(username)sのプロジェクトの統計を見る" +"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io</a>経由または<a href=\"%(gbq_href)s\" " +"target=\"_blank\" rel=\"noopener\">Google " +"BigQuery上の公開データセット</a>を使って%(username)sのプロジェクトの統計を見る" #: warehouse/templates/includes/accounts/profile-callout.html:18 #, python-format msgid "" "You have not uploaded any projects to PyPI, yet. To learn how to get " -"started, visit the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">Python Packaging User Guide</a>" +"started, visit the <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" -"あなたはまだPyPIにプロジェクトをアップロードしていません。はじめ方について学" -"ぶには、 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging User Guide</a>を参照してください" +"あなたはまだPyPIにプロジェクトをアップロードしていません。はじめ方について学ぶには、 <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>を参照してください" #: warehouse/templates/includes/accounts/profile-callout.html:23 #, python-format @@ -1685,15 +1594,15 @@ msgstr "オープンなissue/PR:" #: warehouse/templates/includes/packaging/project-data.html:66 #, python-format msgid "" -"View statistics for this project via <a href=\"%(libs_io_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or by " -"using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our public " -"dataset on Google BigQuery</a>" +"View statistics for this project via <a href=\"%(libs_io_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, " +"or by using <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">our public dataset on Google BigQuery</a>" msgstr "" -"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.io</a>経由または<a href=\"%(gbq_href)s\" target=" -"\"_blank\" rel=\"noopener\">Google BigQuery上の公開データセット</a>を使ってこ" -"のプロジェクトの統計を見る" +"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io</a>経由または<a href=\"%(gbq_href)s\" " +"target=\"_blank\" rel=\"noopener\">Google " +"BigQuery上の公開データセット</a>を使ってこのプロジェクトの統計を見る" #: warehouse/templates/includes/packaging/project-data.html:74 msgid "Meta" @@ -1814,19 +1723,17 @@ msgstr "メールアドレスの削除" #: warehouse/templates/manage/account.html:138 msgid "" -"Add <abbr title=\"two factor authentication\">2FA</abbr> with authentication " -"application" -msgstr "" -"認証アプリケーションによる<abbr title=\"two factor authentication\">2FA</" -"abbr>の追加" +"Add <abbr title=\"two factor authentication\">2FA</abbr> with " +"authentication application" +msgstr "認証アプリケーションによる<abbr title=\"two factor authentication\">2FA</abbr>の追加" #: warehouse/templates/manage/account.html:140 msgid "" "Add <abbr title=\"two factor authentication\">2FA</abbr> with security " "device (e.g. USB key)" msgstr "" -"セキュリティ端末（例: USBキー）による<abbr title=\"two factor authentication" -"\">2FA</abbr>の追加" +"セキュリティ端末（例: USBキー）による<abbr title=\"two factor " +"authentication\">2FA</abbr>の追加" #: warehouse/templates/manage/account.html:142 msgid "Generate Recovery Codes" @@ -1835,23 +1742,21 @@ msgstr "" #: warehouse/templates/manage/account.html:147 #: warehouse/templates/manage/account/webauthn-provision.html:37 msgid "" -"Enable JavaScript to set up two factor authentication with a security device " -"(e.g. USB key)" -msgstr "" -"セキュリティ端末（例えば USB キー）を用いた二要素認証を設定するには " -"JavaScript を有効にして下さい" +"Enable JavaScript to set up two factor authentication with a security " +"device (e.g. USB key)" +msgstr "セキュリティ端末（例えば USB キー）を用いた二要素認証を設定するには JavaScript を有効にして下さい" #: warehouse/templates/manage/account.html:152 #: warehouse/templates/manage/account/webauthn-provision.html:53 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Upgrade your browser</a> to set up two factor authentication with a " -"security device (e.g. USB key)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Upgrade your browser</a> to set up two factor " +"authentication with a security device (e.g. USB key)" msgstr "" -"セキュリティ端末（例えば USB キー）を用いた二要素認証を設定するには、<a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">ブラウザ" -"をアップグレード</a>して下さい" +"セキュリティ端末（例えば USB キー）を用いた二要素認証を設定するには、<a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">ブラウザをアップグレード</a>して下さい" #: warehouse/templates/manage/account.html:166 #: warehouse/templates/manage/account.html:528 @@ -1900,10 +1805,9 @@ msgstr "APIトークンの削除" #: warehouse/templates/manage/account.html:216 #: warehouse/templates/manage/token.html:59 msgid "" -"Applications or scripts using this token will no longer have access to PyPI." -msgstr "" -"このトークンを使っているアプリケーションやスクリプトはPyPIにアクセスできなく" -"なります。" +"Applications or scripts using this token will no longer have access to " +"PyPI." +msgstr "このトークンを使っているアプリケーションやスクリプトはPyPIにアクセスできなくなります。" #: warehouse/templates/manage/account.html:227 #, python-format @@ -1917,13 +1821,12 @@ msgstr "プロフィール画像" #: warehouse/templates/manage/account.html:250 #, python-format msgid "" -"We use <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">gravatar.com</a> to generate your profile picture based on your " -"primary email address" +"We use <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">gravatar.com</a> to generate your profile picture based " +"on your primary email address" msgstr "" -"主要メールアドレスに基づき<a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">gravatar.com</a>を利用してプロフィール画像を作成" -"します" +"主要メールアドレスに基づき<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">gravatar.com</a>を利用してプロフィール画像を作成します" #: warehouse/templates/manage/account.html:257 msgid "Change image on gravatar.com" @@ -1940,9 +1843,9 @@ msgstr "登録日" #: warehouse/templates/manage/account.html:279 #, python-format msgid "" -"Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be changed." -msgstr "" -"<a href=\"%(href)s\">公開プロフィール</a>に表示されます。変更できません。" +"Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be " +"changed." +msgstr "<a href=\"%(href)s\">公開プロフィール</a>に表示されます。変更できません。" #: warehouse/templates/manage/account.html:290 msgid "Full name" @@ -1957,22 +1860,21 @@ msgstr "名前が設定されていません" msgid "Displayed on your <a href=\"%(href)s\">public profile</a>" msgstr "<a href=\"%(href)s\">公開プロフィール</a>に表示されます" +# | msgid "Public profile" #: warehouse/templates/manage/account.html:307 #, fuzzy -#| msgid "Public profile" msgid "️Public email" msgstr "公開プロフィール" +# | msgid "" +# | "Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be " +# | "changed." #: warehouse/templates/manage/account.html:319 #, fuzzy, python-format -#| msgid "" -#| "Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be " -#| "changed." msgid "" -"One of your verified emails can be displayed on your <a href=\"%(href)s" -"\">public profile</a> to logged-in users." -msgstr "" -"<a href=\"%(href)s\">公開プロフィール</a>に表示されます。変更できません。" +"One of your verified emails can be displayed on your <a " +"href=\"%(href)s\">public profile</a> to logged-in users." +msgstr "<a href=\"%(href)s\">公開プロフィール</a>に表示されます。変更できません。" #: warehouse/templates/manage/account.html:324 msgid "Update account" @@ -1984,15 +1886,16 @@ msgstr "アカウントのメール" #: warehouse/templates/manage/account.html:334 msgid "" -"You can associate several emails with your account. You can use any <span " -"class=\"badge badge--success\"><i class=\"fa fa-check\" aria-hidden=\"true" -"\"></i> Verified</span> email to recover your account, but only your <span " -"class=\"badge\">Primary</span> email will receive notifications." +"You can associate several emails with your account. You can use any <span" +" class=\"badge badge--success\"><i class=\"fa fa-check\" aria-" +"hidden=\"true\"></i> Verified</span> email to recover your account, but " +"only your <span class=\"badge\">Primary</span> email will receive " +"notifications." msgstr "" -"アカウントには複数のメールを関連づけることができます。アカウントの回復には任" -"意の<span class=\"badge badge--success\"><i class=\"fa fa-check\" aria-" -"hidden=\"true\"></i>確認済</span>のアドレスを使用できますが、通知を受け取れる" -"のは<span class=\"badge\">主要</span>メールアドレスだけです。" +"アカウントには複数のメールを関連づけることができます。アカウントの回復には任意の<span class=\"badge badge--" +"success\"><i class=\"fa fa-check\" aria-" +"hidden=\"true\"></i>確認済</span>のアドレスを使用できますが、通知を受け取れるのは<span " +"class=\"badge\">主要</span>メールアドレスだけです。" #: warehouse/templates/manage/account.html:345 msgid "Emails associated with your account" @@ -2038,9 +1941,8 @@ msgid "" "account. <a href=\"%(href)s\">Learn more about <abbr title=\"two factor " "authentication\">2FA</abbr></a>." msgstr "" -"二要素認証はアカウントのセキュリティレベルを高めます。<a href=\"%(href)s" -"\"><abbr title=\"two factor authentication\">2FA</abbr>について詳細を学ぶ</" -"a>。" +"二要素認証はアカウントのセキュリティレベルを高めます。<a href=\"%(href)s\"><abbr title=\"two factor " +"authentication\">2FA</abbr>について詳細を学ぶ</a>。" #: warehouse/templates/manage/account.html:451 msgid "Two factor authentication methods enabled" @@ -2053,11 +1955,9 @@ msgstr "二要素認証の方法:" #: warehouse/templates/manage/account.html:460 #: warehouse/templates/manage/account.html:570 msgid "" -"Authentication application (<abbr title=\"time-based one-time password" -"\">TOTP</abbr>)" -msgstr "" -"認証アプリケーション (<abbr title=\"time-based one-time password\">TOTP</" -"abbr>)" +"Authentication application (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>)" +msgstr "認証アプリケーション (<abbr title=\"time-based one-time password\">TOTP</abbr>)" #: warehouse/templates/manage/account.html:462 #: warehouse/templates/manage/account.html:476 @@ -2113,11 +2013,9 @@ msgstr "このアカウントでは二要素認証が有効になっていませ #: warehouse/templates/manage/account.html:512 #, python-format msgid "" -"<a href=\"%(href)s\">Verify your primary email address</a> to add two factor " -"authentication to your account." -msgstr "" -"アカウントの二要素認証を有効にするには<a href=\"%(href)s\">主要メールアドレス" -"を確認してください</a>。" +"<a href=\"%(href)s\">Verify your primary email address</a> to add two " +"factor authentication to your account." +msgstr "アカウントの二要素認証を有効にするには<a href=\"%(href)s\">主要メールアドレスを確認してください</a>。" #: warehouse/templates/manage/account.html:519 #: warehouse/templates/manage/settings.html:23 @@ -2129,9 +2027,7 @@ msgstr "API トークン" msgid "" "API tokens provide an alternative way to authenticate when uploading " "packages to PyPI." -msgstr "" -"APIトークンは、PyPIにパッケージをアップロードする際の認証方法として（ユーザ名" -"とパスワードの代わりとなる）代替手段を提供しています。" +msgstr "APIトークンは、PyPIにパッケージをアップロードする際の認証方法として（ユーザ名とパスワードの代わりとなる）代替手段を提供しています。" #: warehouse/templates/manage/account.html:520 msgid "Learn more about API tokens" @@ -2149,11 +2045,9 @@ msgstr "APIトークンの追加" #: warehouse/templates/manage/account.html:544 #, python-format msgid "" -"<a href=\"%(href)s\">Verify your primary email address</a> to add API tokens " -"to your account." -msgstr "" -"アカウントに APIトークンを追加するには<a href=\"%(href)s\">主要メールアドレス" -"を確認してください</a>。" +"<a href=\"%(href)s\">Verify your primary email address</a> to add API " +"tokens to your account." +msgstr "アカウントに APIトークンを追加するには<a href=\"%(href)s\">主要メールアドレスを確認してください</a>。" #: warehouse/templates/manage/account.html:559 msgid "Account created" @@ -2228,9 +2122,9 @@ msgstr "二要素認証が追加されました" #: warehouse/templates/manage/account.html:613 #: warehouse/templates/manage/account.html:623 msgid "" -"Method: Security device (<abbr title=\"web authentication\">WebAuthn</abbr>)" -msgstr "" -"方式: セキュリティ端末 (<abbr title=\"web authentication\">WebAuthn</abbr>)" +"Method: Security device (<abbr title=\"web " +"authentication\">WebAuthn</abbr>)" +msgstr "方式: セキュリティ端末 (<abbr title=\"web authentication\">WebAuthn</abbr>)" #: warehouse/templates/manage/account.html:614 #: warehouse/templates/manage/account.html:624 @@ -2242,9 +2136,7 @@ msgstr "端末名:" msgid "" "Method: Authentication application (<abbr title=\"time-based one-time " "password\">TOTP</abbr>)" -msgstr "" -"方法: 認証アプリケーション（<abbr title=\"time-based one-time password" -"\">TOTP</abbr>）" +msgstr "方法: 認証アプリケーション（<abbr title=\"time-based one-time password\">TOTP</abbr>）" #: warehouse/templates/manage/account.html:620 msgid "Two factor authentication removed" @@ -2293,9 +2185,7 @@ msgstr "一意の識別子:" #: warehouse/templates/manage/account.html:662 msgid "Events appear here as security-related actions occur on your account." -msgstr "" -"アカウントでセキュリティ関連のアクションが発生すると、ここにイベントが表示さ" -"れます。" +msgstr "アカウントでセキュリティ関連のアクションが発生すると、ここにイベントが表示されます。" #: warehouse/templates/manage/account.html:664 msgid "Recent account activity" @@ -2321,11 +2211,8 @@ msgid "IP address" msgstr "IPアドレス" #: warehouse/templates/manage/account.html:687 -msgid "" -"Events will appear here as security-related actions occur on your account." -msgstr "" -"アカウントでセキュリティ関連のアクションが発生すると、ここにイベントが表示さ" -"れます。" +msgid "Events will appear here as security-related actions occur on your account." +msgstr "アカウントでセキュリティ関連のアクションが発生すると、ここにイベントが表示されます。" #: warehouse/templates/manage/account.html:694 msgid "Delete account" @@ -2349,35 +2236,34 @@ msgid_plural "" " " msgstr[0] "" "\n" -" あなたのアカウントは現在 %(count)s プロジェクトにおいて<strong>唯一" -"のオーナー</strong>となっています。\n" +" あなたのアカウントは現在 %(count)s " +"プロジェクトにおいて<strong>唯一のオーナー</strong>となっています。\n" " " #: warehouse/templates/manage/account.html:704 msgid "" "\n" -" You must transfer ownership or delete this project before you can " -"delete your account.\n" +" You must transfer ownership or delete this project before you " +"can delete your account.\n" " " msgid_plural "" "\n" -" You must transfer ownership or delete these projects before you " -"can delete your account.\n" +" You must transfer ownership or delete these projects before you" +" can delete your account.\n" " " msgstr[0] "" "\n" -" アカウントを削除する前に、これらのプロジェクトの所有権を移譲するか" -"これらのプロジェクトを削除しなければなりません。\n" +" アカウントを削除する前に、これらのプロジェクトの所有権を移譲するかこれらのプロジェクトを削除しなければなりません。\n" " " #: warehouse/templates/manage/account.html:714 #, python-format msgid "" -"<a href=\"%(transfer_href)s\">transfer ownership</a> or <a href=" -"\"%(delete_href)s\">delete project</a>" +"<a href=\"%(transfer_href)s\">transfer ownership</a> or <a " +"href=\"%(delete_href)s\">delete project</a>" msgstr "" -"<a href=\"%(transfer_href)s\">所有権の譲渡</a>または<a href=\"%(delete_href)s" -"\">プロジェクトの削除</a>" +"<a href=\"%(transfer_href)s\">所有権の譲渡</a>または<a " +"href=\"%(delete_href)s\">プロジェクトの削除</a>" #: warehouse/templates/manage/account.html:723 #: warehouse/templates/manage/token.html:162 @@ -2404,13 +2290,13 @@ msgstr "ドキュメントの破棄" #: warehouse/templates/manage/documentation.html:28 #, python-format msgid "" -"If you would like to DESTROY any existing documentation hosted at <a href=" -"\"%(url)s\">%(url)s</a> there is <strong>no</strong> undo, as uploading new " -"documentation is no longer supported." +"If you would like to DESTROY any existing documentation hosted at <a " +"href=\"%(url)s\">%(url)s</a> there is <strong>no</strong> undo, as " +"uploading new documentation is no longer supported." msgstr "" -"<a href=\"%(url)s\">%(url)s</a> にホスティングされている既存のドキュメントを" -"破棄する場合、新しいドキュメントのアップロードがサポートされなくなったため、" -"元に戻すことは <strong>できません</strong>。" +"<a href=\"%(url)s\">%(url)s</a> " +"にホスティングされている既存のドキュメントを破棄する場合、新しいドキュメントのアップロードがサポートされなくなったため、元に戻すことは " +"<strong>できません</strong>。" #: warehouse/templates/manage/documentation.html:35 msgid "Destroy Documentation for project" @@ -2437,11 +2323,9 @@ msgstr "'%(project_name)s' の履歴" #: warehouse/templates/manage/history.html:25 msgid "" -"Each time you (or your collaborators) perform a security action related to " -"this project, the action is recorded and displayed here." -msgstr "" -"ユーザー（または共同作業者）がこのプロジェクトに関連するセキュリティアクショ" -"ンを実行するたびに、各アクションが記録され、ここに表示されます。" +"Each time you (or your collaborators) perform a security action related " +"to this project, the action is recorded and displayed here." +msgstr "ユーザー（または共同作業者）がこのプロジェクトに関連するセキュリティアクションを実行するたびに、各アクションが記録され、ここに表示されます。" #: warehouse/templates/manage/history.html:29 msgid "Project created" @@ -2529,18 +2413,14 @@ msgstr "プロジェクトの履歴" msgid "" "Each time you or your collaborators update this project, the action is " "recorded and displayed here." -msgstr "" -"自分または共同編集者がこのプロジェクトを更新するたびに、アクションが記録さ" -"れ、ここに表示されます。" +msgstr "自分または共同編集者がこのプロジェクトを更新するたびに、アクションが記録され、ここに表示されます。" #: warehouse/templates/manage/journal.html:28 #, python-format msgid "" -"This feature will be deprecated in the future, replaced by the <a href=" -"\"%(href)s\">security history page</a>." -msgstr "" -"この機能は将来廃止され、<a href=\"%(href)s\">セキュリティ履歴</a>に置き換えら" -"れる予定です。" +"This feature will be deprecated in the future, replaced by the <a " +"href=\"%(href)s\">security history page</a>." +msgstr "この機能は将来廃止され、<a href=\"%(href)s\">セキュリティ履歴</a>に置き換えられる予定です。" #: warehouse/templates/manage/journal.html:32 #, python-format @@ -2666,12 +2546,12 @@ msgstr "表示" #, python-format msgid "" "You have not uploaded any projects to PyPI, yet. To learn how to get " -"started, visit the <a href=\"%(href)s\" target=\"_blank\" rel=\"noopener" -"\">Python Packaging User Guide</a>" +"started, visit the <a href=\"%(href)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" -"あなたはまだPyPIにプロジェクトをアップロードしていません。はじめ方について学" -"ぶには、<a href=\"%(href)s\" target=\"_blank\" rel=\"noopener\">Python " -"Packaging User Guide</a>を参照してください" +"あなたはまだPyPIにプロジェクトをアップロードしていません。はじめ方について学ぶには、<a href=\"%(href)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User " +"Guide</a>を参照してください" #: warehouse/templates/manage/release.html:18 #, python-format @@ -2775,12 +2655,12 @@ msgstr "無視" #: warehouse/templates/manage/release.html:119 #, python-format msgid "" -"Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" +"Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" "ファイルアップロード方法を学ぶには<a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> を参照して" -"ください" +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> " +"を参照してください" #: warehouse/templates/manage/release.html:122 msgid "Release settings" @@ -2795,18 +2675,17 @@ msgstr "リリース削除" #, python-format msgid "" "\n" -" Deleting will irreversibly delete this release along with %(count)s " -"file.\n" +" Deleting will irreversibly delete this release along with " +"%(count)s file.\n" " " msgid_plural "" "\n" -" Deleting will irreversibly delete this release along with %(count)s " -"files.\n" +" Deleting will irreversibly delete this release along with " +"%(count)s files.\n" " " msgstr[0] "" "\n" -" 削除すると、このリリースは %(count)s 個のファイルと共に元には戻せませ" -"ん。\n" +" 削除すると、このリリースは %(count)s 個のファイルと共に元には戻せません。\n" " " #: warehouse/templates/manage/release.html:135 @@ -2817,15 +2696,14 @@ msgstr "削除すると、このリリースは元に戻せません。" #: warehouse/templates/manage/releases.html:91 #, python-format msgid "" -"You will not be able to re-upload a new distribution of the same type with " -"the same version number. Consider making a new release or a <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">post " -"release</a> instead." +"You will not be able to re-upload a new distribution of the same type " +"with the same version number. Consider making a new release or a <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">post release</a> instead." msgstr "" -"同じバージョン番号で同じ種類の新しいディストリビューションをアップロードする" -"ことはできません。代わりに、新しいリリースまたは<a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">ポストリリース</a>を作成する" -"ことを検討してください。" +"同じバージョン番号で同じ種類の新しいディストリビューションをアップロードすることはできません。代わりに、新しいリリースまたは<a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">ポストリリース</a>を作成することを検討してください。" #: warehouse/templates/manage/release.html:142 #: warehouse/templates/manage/releases.html:27 @@ -2903,13 +2781,13 @@ msgstr "リリースが見つかりません" #: warehouse/templates/manage/releases.html:109 #, python-format msgid "" -"Learn how to create a new release on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>" +"Learn how to create a new release on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" msgstr "" -"新しいリリースを作成する方法を学ぶには<a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>を参照し" -"てください" +"新しいリリースを作成する方法を学ぶには<a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User " +"Guide</a>を参照してください" #: warehouse/templates/manage/roles.html:18 #, python-format @@ -2921,9 +2799,7 @@ msgstr "%(project_name)s の共同編集者を管理" msgid "" "Use this page to control which PyPI users can help you to manage " "%(project_name)s" -msgstr "" -"このページでは、%(project_name)s を管理する上でPyPIユーザがあなたを手伝えるど" -"うかを制御できます" +msgstr "このページでは、%(project_name)s を管理する上でPyPIユーザがあなたを手伝えるどうかを制御できます" #: warehouse/templates/manage/roles.html:25 #: warehouse/templates/pages/help.html:509 @@ -2939,11 +2815,9 @@ msgstr "メンテナ" #: warehouse/templates/manage/roles.html:28 #: warehouse/templates/pages/help.html:510 msgid "" -"Can upload releases for a package. Cannot add collaborators. Cannot delete " -"files, releases, or the project." -msgstr "" -"パッケージのリリースのアップロードができる。共同編集者の追加、ファイル・リ" -"リース・プロジェクトの削除はできない。" +"Can upload releases for a package. Cannot add collaborators. Cannot " +"delete files, releases, or the project." +msgstr "パッケージのリリースのアップロードができる。共同編集者の追加、ファイル・リリース・プロジェクトの削除はできない。" #: warehouse/templates/manage/roles.html:29 #: warehouse/templates/manage/roles.html:62 @@ -2956,9 +2830,7 @@ msgstr "オーナー" msgid "" "Can upload releases. Can add other collaborators. Can delete files, " "releases, or the entire project." -msgstr "" -"リリースのアップロード、他の共同編集者の追加、ファイル・リリース・プロジェク" -"ト全体の削除ができる。" +msgstr "リリースのアップロード、他の共同編集者の追加、ファイル・リリース・プロジェクト全体の削除ができる。" #: warehouse/templates/manage/roles.html:34 #, python-format @@ -3024,25 +2896,26 @@ msgstr "プロジェクトの説明とサイドバー" #: warehouse/templates/manage/settings.html:43 #, python-format msgid "" -"To set the '%(project_name)s' description, author, links, classifiers, and " -"other details for your next release, use the <a href=\"%(setup_args_href)s\" " -"rel=\"noopener\" target=\"_blank\"><code>setup()</code> arguments in your " -"<code>setup.py</code> file</a>. Updating these fields will not change the " -"metadata for past releases. Additionally, you <strong>must</strong> use <a " -"href=\"%(twine_docs_href)s\" rel=\"noopener\" target=\"_blank\">Twine</a> to " -"upload your files in order to get full support for these fields. See <a href=" -"\"%(distribution_href)s\" rel=\"noopener\" target=\"_blank\">the Python " -"Packaging User Guide</a> for more help." -msgstr "" -"次のリリースで「 %(project_name)s 」の説明、作成者、リンク、分類、およびその" -"他の詳細を設定するには、<a href=\"%(setup_args_href)s\" rel=\"noopener\" " +"To set the '%(project_name)s' description, author, links, classifiers, " +"and other details for your next release, use the <a " +"href=\"%(setup_args_href)s\" rel=\"noopener\" " +"target=\"_blank\"><code>setup()</code> arguments in your " +"<code>setup.py</code> file</a>. Updating these fields will not change the" +" metadata for past releases. Additionally, you <strong>must</strong> use " +"<a href=\"%(twine_docs_href)s\" rel=\"noopener\" " +"target=\"_blank\">Twine</a> to upload your files in order to get full " +"support for these fields. See <a href=\"%(distribution_href)s\" " +"rel=\"noopener\" target=\"_blank\">the Python Packaging User Guide</a> " +"for more help." +msgstr "" +"次のリリースで「 %(project_name)s 」の説明、作成者、リンク、分類、およびその他の詳細を設定するには、<a " +"href=\"%(setup_args_href)s\" rel=\"noopener\" " "target=\"_blank\"><code>setup.py</code> ファイルにある <code>setup()</code> " -"の引数</a>を使用してください。これらのフィールドを更新しても、過去のリリース" -"のメタデータは変更されません。さらに<strong>これらのフィールドを完全にサポー" -"トするには、<a href=\"%(twine_docs_href)s\" rel=\"noopener\" target=\"_blank" -"\">Twine</a>を使用してファイルをアップロードする必要があります</strong>。詳細" -"については、<a href=\"%(distribution_href)s\" rel=\"noopener\" target=" -"\"_blank\">Python Packaging User Guide</a>を参照してください。" +"の引数</a>を使用してください。これらのフィールドを更新しても、過去のリリースのメタデータは変更されません。さらに<strong>これらのフィールドを完全にサポートするには、<a" +" href=\"%(twine_docs_href)s\" rel=\"noopener\" " +"target=\"_blank\">Twine</a>を使用してファイルをアップロードする必要があります</strong>。詳細については、<a " +"href=\"%(distribution_href)s\" rel=\"noopener\" target=\"_blank\">Python " +"Packaging User Guide</a>を参照してください。" #: warehouse/templates/manage/settings.html:54 #: warehouse/templates/manage/settings.html:85 @@ -3056,14 +2929,12 @@ msgstr "このプロジェクトを削除することによって:" #: warehouse/templates/manage/settings.html:62 #, python-format msgid "" -"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s " -"release</a>" +"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s" +" release</a>" msgid_plural "" -"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s " -"releases</a>" -msgstr[0] "" -"このプロジェクトと<a href=\"%(href)s\">%(count)s 個のリリース</a>を完全に削除" -"します" +"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s" +" releases</a>" +msgstr[0] "このプロジェクトと<a href=\"%(href)s\">%(count)s 個のリリース</a>を完全に削除します" #: warehouse/templates/manage/settings.html:68 msgid "Irreversibly delete the project" @@ -3071,21 +2942,18 @@ msgstr "プロジェクトを完全に削除する" #: warehouse/templates/manage/settings.html:72 msgid "Make the project name available to <strong>any other PyPI</strong> user" -msgstr "" -"<strong>他の PyPI </strong>ユーザーがプロジェクト名を利用できるようになります" +msgstr "<strong>他の PyPI </strong>ユーザーがプロジェクト名を利用できるようになります" #: warehouse/templates/manage/settings.html:74 msgid "" -"This user will be able to make new releases under this project name, so long " -"as the distribution filenames do not match filenames from a previously " -"released distribution (all PyPI distribution filenames are unique, as they " -"are generated by combining the project name + version number + distribution " -"type)" +"This user will be able to make new releases under this project name, so " +"long as the distribution filenames do not match filenames from a " +"previously released distribution (all PyPI distribution filenames are " +"unique, as they are generated by combining the project name + version " +"number + distribution type)" msgstr "" -"このユーザは、ファイル名が以前にリリースされたディストリビューションのファイ" -"ル名と一致しない限り、このプロジェクト名の下で新しいリリースを行うことができ" -"ます（すべての PyPIファイル名は、プロジェクト名とバージョン番号、ディストリ" -"ビューションタイプを組み合わせて一意に生成されます）" +"このユーザは、ファイル名が以前にリリースされたディストリビューションのファイル名と一致しない限り、このプロジェクト名の下で新しいリリースを行うことができます（すべての" +" PyPIファイル名は、プロジェクト名とバージョン番号、ディストリビューションタイプを組み合わせて一意に生成されます）" #: warehouse/templates/manage/settings.html:85 msgid "Project Name" @@ -3122,11 +2990,9 @@ msgstr "プロジェクト %(project)s" #: warehouse/templates/manage/token.html:44 msgid "" -"For security reasons this token will only appear once. <strong>Copy it now.</" -"strong>" -msgstr "" -"セキュリティ上の理由により、このトークンは一度だけ表示されます。<strong>今す" -"ぐコピーしてください。</strong>" +"For security reasons this token will only appear once. <strong>Copy it " +"now.</strong>" +msgstr "セキュリティ上の理由により、このトークンは一度だけ表示されます。<strong>今すぐコピーしてください。</strong>" #: warehouse/templates/manage/token.html:46 msgid "Copy token to clipboard" @@ -3152,18 +3018,19 @@ msgstr "usernameに<code>%(token)s</code>を設定する" #: warehouse/templates/manage/token.html:71 #, python-format msgid "" -"Set your password to the token value, including the <code>%(prefix)s</code> " -"prefix" +"Set your password to the token value, including the " +"<code>%(prefix)s</code> prefix" msgstr "passwordに<code>%(prefix)s</code>を含むトークン値を設定する" #: warehouse/templates/manage/token.html:77 #, python-format msgid "" -"For example, if you are using <a href=\"%(href)s\">Twine</a> to upload your " -"projects to PyPI, set up your <code>%(filename)s</code> file like this:" +"For example, if you are using <a href=\"%(href)s\">Twine</a> to upload " +"your projects to PyPI, set up your <code>%(filename)s</code> file like " +"this:" msgstr "" -"例えば、<a href=\"%(href)s\">Twine</a>を使ってプロジェクトをPyPIにアップロー" -"ドする場合、次のように<code>%(filename)s</code>を設定してください:" +"例えば、<a " +"href=\"%(href)s\">Twine</a>を使ってプロジェクトをPyPIにアップロードする場合、次のように<code>%(filename)s</code>を設定してください:" #: warehouse/templates/manage/token.html:87 #, python-format @@ -3172,16 +3039,14 @@ msgid "" "multiple projects to PyPI, you can set up your <code>%(filename)s</code> " "file like this:" msgstr "" -"例えば、<a href=\"%(href)s\">Twine</a>を使ってプロジェクトをPyPIにアップロー" -"ドする場合、次のように<code>%(filename)s</code>を設定することができます:" +"例えば、<a " +"href=\"%(href)s\">Twine</a>を使ってプロジェクトをPyPIにアップロードする場合、次のように<code>%(filename)s</code>を設定することができます:" #: warehouse/templates/manage/token.html:99 msgid "" -"either a user-scoped token or a project-scoped token you want to set as the " -"default" -msgstr "" -"デフォルトとして設定したいユーザー・スコープ・トークンまたはプロジェクト・ス" -"コープ・トークンのどちらか" +"either a user-scoped token or a project-scoped token you want to set as " +"the default" +msgstr "デフォルトとして設定したいユーザー・スコープ・トークンまたはプロジェクト・スコープ・トークンのどちらか" #: warehouse/templates/manage/token.html:104 msgid "a project token" @@ -3192,18 +3057,14 @@ msgstr "プロジェクト・トークン" msgid "" "You can then use <code>%(command)s</code> to switch to the correct token " "when uploading to PyPI." -msgstr "" -"これで、PyPにアップロードするときに<code>%(command)s</code>を使って正しいトー" -"クンに切り替えることができます。" +msgstr "これで、PyPにアップロードするときに<code>%(command)s</code>を使って正しいトークンに切り替えることができます。" #: warehouse/templates/manage/token.html:112 #, python-format msgid "" -"For further instructions on how to use this token, <a href=\"%(href)s" -"\">visit the PyPI help page</a>." -msgstr "" -"このトークンの使い方に関するより知りたければ、<a href=\"%(href)s\">PyPIのヘル" -"プページ</a>を参照してください。" +"For further instructions on how to use this token, <a " +"href=\"%(href)s\">visit the PyPI help page</a>." +msgstr "このトークンの使い方に関するより知りたければ、<a href=\"%(href)s\">PyPIのヘルプページ</a>を参照してください。" #: warehouse/templates/manage/token.html:120 msgid "Add another token" @@ -3231,11 +3092,9 @@ msgstr "プロジェクト:" #: warehouse/templates/manage/token.html:163 msgid "" -"An API token scoped to your entire account will have upload permissions for " -"all of your current and future projects." -msgstr "" -"アカウント全体を対象範囲とするAPIトークンには、現在および将来のすべてのプロ" -"ジェクトに対するアップロード権限が与えられます。" +"An API token scoped to your entire account will have upload permissions " +"for all of your current and future projects." +msgstr "アカウント全体を対象範囲とするAPIトークンには、現在および将来のすべてのプロジェクトに対するアップロード権限が与えられます。" #: warehouse/templates/manage/token.html:166 msgid "Add token" @@ -3251,31 +3110,32 @@ msgstr "" #: warehouse/templates/manage/account/recovery_codes-provision.html:46 msgid "" -"If you lose access to your authentication application or security key(s), " -"you’ll need to use one of these recovery codes to log into your PyPI " +"If you lose access to your authentication application or security key(s)," +" you’ll need to use one of these recovery codes to log into your PyPI " "account. Each code can only be used <strong>once</strong>." msgstr "" #: warehouse/templates/manage/account/recovery_codes-provision.html:47 msgid "" -"These codes should <strong>only</strong> be used for account recovery, not " -"for typical logins." +"These codes should <strong>only</strong> be used for account recovery, " +"not for typical logins." msgstr "" #: warehouse/templates/manage/account/recovery_codes-provision.html:48 msgid "" -"<strong>Keep these somewhere safe</strong>. If you lose your authentication " -"application or security key(s) and do not have access to these recovery " -"codes, you may permanently lose access to your PyPI account!" +"<strong>Keep these somewhere safe</strong>. If you lose your " +"authentication application or security key(s) and do not have access to " +"these recovery codes, you may permanently lose access to your PyPI " +"account!" msgstr "" #: warehouse/templates/manage/account/recovery_codes-provision.html:52 msgid "Save your Recovery Codes" msgstr "" +# | msgid "Download files" #: warehouse/templates/manage/account/recovery_codes-provision.html:64 #, fuzzy -#| msgid "Download files" msgid "Download as file" msgstr "ファイルをダウンロード" @@ -3300,22 +3160,20 @@ msgstr "認証アプリケーションによる2FAの設定（TOTP）" #: warehouse/templates/manage/account/totp-provision.html:32 #, python-format msgid "" -"PyPI supports any application that follows the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based " -"one-time password\">TOTP</abbr> standard</a>." +"PyPI supports any application that follows the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title" +"=\"time-based one-time password\">TOTP</abbr> standard</a>." msgstr "" -"PyPIでは、<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\"><abbr title=\"time-based one-time password\">TOTP</abbr>標準</a>" -"に準拠するアプリケーションに対応しています。" +"PyPIでは、<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><abbr title=\"time-based one-time " +"password\">TOTP</abbr>標準</a>に準拠するアプリケーションに対応しています。" #: warehouse/templates/manage/account/totp-provision.html:36 #, python-format msgid "" "Visit <a href=\"%(href)s\">PyPI's help page</a> for a list of compatible " "applications." -msgstr "" -"互換性のあるアプリケーションのリストについては、<a href=\"%(href)s\">PyPIのヘ" -"ルプ・ページ</a>を参照してください。" +msgstr "互換性のあるアプリケーションのリストについては、<a href=\"%(href)s\">PyPIのヘルプ・ページ</a>を参照してください。" #: warehouse/templates/manage/account/totp-provision.html:42 msgid "Set up your application" @@ -3327,11 +3185,9 @@ msgstr "選択した認証アプリケーションでQRコードをスキャン #: warehouse/templates/manage/account/totp-provision.html:46 msgid "" -"For security reasons, you can only associate one authentication application " -"per PyPI account." -msgstr "" -"セキュリティ上の理由から、各PyPIアカウントに関連づけられる認証アプリケーショ" -"ンはひとつだけです。" +"For security reasons, you can only associate one authentication " +"application per PyPI account." +msgstr "セキュリティ上の理由から、各PyPIアカウントに関連づけられる認証アプリケーションはひとつだけです。" #: warehouse/templates/manage/account/totp-provision.html:52 msgid "QR code for setting up an authentication application" @@ -3339,9 +3195,7 @@ msgstr "認証アプリケーション設定用のQRコード" #: warehouse/templates/manage/account/totp-provision.html:55 msgid "<strong>No QR scanner?</strong> Manually enter the code instead:" -msgstr "" -"<strong>QRスキャナがありませんか？</strong> 代わりに、以下のコードを手動で入" -"力してください:" +msgstr "<strong>QRスキャナがありませんか？</strong> 代わりに、以下のコードを手動で入力してください:" #: warehouse/templates/manage/account/totp-provision.html:67 msgid "Verify application" @@ -3353,11 +3207,9 @@ msgstr "認証コード" #: warehouse/templates/manage/account/totp-provision.html:73 msgid "" -"To finalize the set up process, enter the authentication code provided by " -"your application." -msgstr "" -"設定処理を完了するには、アプリケーションから提供された認証コードを入力してく" -"ださい。" +"To finalize the set up process, enter the authentication code provided by" +" your application." +msgstr "設定処理を完了するには、アプリケーションから提供された認証コードを入力してください。" #: warehouse/templates/manage/account/totp-provision.html:85 msgid "Set up application" @@ -3370,26 +3222,26 @@ msgstr "セキュリティ端末による2FAの設定（例: USBキー）" #: warehouse/templates/manage/account/webauthn-provision.html:26 #, python-format msgid "" -"PyPI supports any device that adheres to the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." +"PyPI supports any device that adheres to the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." msgstr "" -"PyPIでは、<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">FIDO標準</a>に準拠する端末に対応しています。" +"PyPIでは、<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">FIDO標準</a>に準拠する端末に対応しています。" #: warehouse/templates/manage/account/webauthn-provision.html:28 #, python-format msgid "" -"Popular <em>USB keys</em> include <a href=\"%(yubico_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=" -"\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Google Titan</a> and <a href=\"%(thetis_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Thetis</a>." +"Popular <em>USB keys</em> include <a href=\"%(yubico_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> and <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." msgstr "" -"よく使われる<em>USBキー</em>には、<a href=\"%(yubico_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>、 <a href=" -"\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Google Titan</a>、<a href=\"%(thetis_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Thetis</a>があります。" +"よく使われる<em>USBキー</em>には、<a href=\"%(yubico_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Yubikey</a>、 <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a>、<a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>があります。" #: warehouse/templates/manage/account/webauthn-provision.html:43 msgid "Name your device to begin" @@ -3403,9 +3255,7 @@ msgstr "PyPIは、複数のセキュリティ端末の追加に対応してい msgid "" "Please give this device a name. 64 characters or fewer. All Unicode is " "valid, including spaces." -msgstr "" -"この端末に64字以下で名前をつけてください。空白を含むすべてのユニコードが有効" -"です。" +msgstr "この端末に64字以下で名前をつけてください。空白を含むすべてのユニコードが有効です。" #: warehouse/templates/manage/account/webauthn-provision.html:65 msgid "Set up security device" @@ -3414,23 +3264,22 @@ msgstr "セキュリティ端末を設定" #: warehouse/templates/manage/account/webauthn-provision.html:74 #, python-format msgid "" -"<strong>Not working?</strong> Check you're using a device that follows the " -"<a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">FIDO specification</a> and a <a href=\"%(mozilla_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">compatible browser</a>." +"<strong>Not working?</strong> Check you're using a device that follows " +"the <a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">FIDO specification</a> and a <a " +"href=\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">compatible browser</a>." msgstr "" -"<strong>うまく動作しませんか？</strong> <a href=\"%(fido_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO仕様</a> に準拠した端末" -"と<a href=\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">互換性のあるブラウザ</a>を使用しているか確認してください。" +"<strong>うまく動作しませんか？</strong> <a href=\"%(fido_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO仕様</a> " +"に準拠した端末と<a href=\"%(mozilla_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">互換性のあるブラウザ</a>を使用しているか確認してください。" #: warehouse/templates/manage/account/webauthn-provision.html:78 msgid "" -"Note that some older USB keys do not adhere to the FIDO standard and will " -"not work with PyPI." -msgstr "" -"一部の古いUSBキーはFIDO標準に準拠しておらず、PyPIで動作しないことに注意してく" -"ださい。" +"Note that some older USB keys do not adhere to the FIDO standard and will" +" not work with PyPI." +msgstr "一部の古いUSBキーはFIDO標準に準拠しておらず、PyPIで動作しないことに注意してください。" #: warehouse/templates/packaging/detail.html:94 msgid "Copy PIP instructions" @@ -3531,12 +3380,12 @@ msgstr "プレリリース" #, python-format msgid "" "Download the file for your platform. If you're not sure which to choose, " -"learn more about <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">installing packages</a>." +"learn more about <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">installing packages</a>." msgstr "" -"あなたのプラットフォームに合ったファイルをダウンロードします。詳しくは<a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">パッ" -"ケージのインストール</a>を参照してください。" +"あなたのプラットフォームに合ったファイルをダウンロードします。詳しくは<a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">パッケージのインストール</a>を参照してください。" #: warehouse/templates/packaging/detail.html:273 #, python-format @@ -3555,38 +3404,32 @@ msgstr "ハッシュ" #: warehouse/templates/pages/classifiers.html:22 msgid "" -"Each project's maintainers provide PyPI with a list of \"trove classifiers\" " -"to categorize each release, describing who it's for, what systems it can run " -"on, and how mature it is." -msgstr "" -"各プロジェクトのメンテナは、各リリースを分類するための\"Trove分類\"のリストを" -"PyPIに提供し、それが誰向けのものなのか、どのシステムで実行できるのか、どの程" -"度成熟しているのかを説明します。" +"Each project's maintainers provide PyPI with a list of \"trove " +"classifiers\" to categorize each release, describing who it's for, what " +"systems it can run on, and how mature it is." +msgstr "各プロジェクトのメンテナは、各リリースを分類するための\"Trove分類\"のリストをPyPIに提供し、それが誰向けのものなのか、どのシステムで実行できるのか、どの程度成熟しているのかを説明します。" #: warehouse/templates/pages/classifiers.html:23 msgid "" -"These standardized classifiers can then be used by community members to find " -"projects based on their desired criteria." -msgstr "" -"これらの標準化された分類は、コミュニティメンバが自分たちの望む基準でプロジェ" -"クトを探すために使われます。" +"These standardized classifiers can then be used by community members to " +"find projects based on their desired criteria." +msgstr "これらの標準化された分類は、コミュニティメンバが自分たちの望む基準でプロジェクトを探すために使われます。" #: warehouse/templates/pages/classifiers.html:25 #, python-format msgid "" -"Instructions for how to add trove classifiers to a project can be found on " -"the <a href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging User Guide</a>. To read the original " -"classifier specification, refer to <a href=\"%(pep301_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python " -"enhancement proposal\">PEP</abbr> 301</a>." +"Instructions for how to add trove classifiers to a project can be found " +"on the <a href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>. To read the original " +"classifier specification, refer to <a href=\"%(pep301_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 301</a>." msgstr "" -"プロジェクトにTrove分類を追加する方法の説明書は、<a href=\"%(ppug_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>で入手できます。もともとの分類仕様については、 <a href=" -"\"%(pep301_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><abbr title=\"Python enhancement proposal\">PEP</abbr> 301</a>を参照してく" -"ださい。" +"プロジェクトにTrove分類を追加する方法の説明書は、<a href=\"%(ppug_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User " +"Guide</a>で入手できます。もともとの分類仕様については、 <a href=\"%(pep301_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 301</a>を参照してください。" #: warehouse/templates/pages/classifiers.html:31 msgid "List of classifiers" @@ -3600,35 +3443,36 @@ msgstr "注意:" #: warehouse/templates/pages/help.html:20 #, python-format msgid "" -"All users submitting feedback, reporting issues or contributing to Warehouse " -"are expected to follow the <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">PyPA Code of Conduct</a>." +"All users submitting feedback, reporting issues or contributing to " +"Warehouse are expected to follow the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPA Code of " +"Conduct</a>." msgstr "" -"フィードバックの送信、問題の報告、Warehouseへの貢献を行う全てのユーザは、<a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPA" -"の行動規範</a>に従うことが求められます。" +"フィードバックの送信、問題の報告、Warehouseへの貢献を行う全てのユーザは、<a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPAの行動規範</a>に従うことが求められます。" #: warehouse/templates/pages/help.html:31 #, python-format msgid "" "If you lose your %(method)s and can no longer log in, you may " "<strong>permanently lose access to your account</strong>. You should " -"generate and securely store <a href=\"#recoverycodes\">recovery codes</a> to " -"regain access in that event.." +"generate and securely store <a href=\"#recoverycodes\">recovery codes</a>" +" to regain access in that event.." msgstr "" #: warehouse/templates/pages/help.html:37 msgid "" -"We recommend that all PyPI users set up <em>at least two</em> supported two " -"factor authentication methods and provision <a href=\"#recoverycodes" -"\">recovery codes</a>." +"We recommend that all PyPI users set up <em>at least two</em> supported " +"two factor authentication methods and provision <a " +"href=\"#recoverycodes\">recovery codes</a>." msgstr "" #: warehouse/templates/pages/help.html:43 msgid "" -"If you've lost access to all two factor methods for your account and do not " -"have <a href=\"#recoverycodes\">recovery codes</a>, you can request help <a " -"href=\"#account-recovery\">with account recovery</a>." +"If you've lost access to all two factor methods for your account and do " +"not have <a href=\"#recoverycodes\">recovery codes</a>, you can request " +"help <a href=\"#account-recovery\">with account recovery</a>." msgstr "" #: warehouse/templates/pages/help.html:52 @@ -3637,8 +3481,7 @@ msgstr "パッケージ、プロジェクト、リリースとは何ですか？ #: warehouse/templates/pages/help.html:53 msgid "How do I install a file (package) from PyPI?" -msgstr "" -"PyPIからファイル（パッケージ）をインストールするには、どうすればよいですか？" +msgstr "PyPIからファイル（パッケージ）をインストールするには、どうすればよいですか？" #: warehouse/templates/pages/help.html:54 msgid "How do I package and publish my code for PyPI?" @@ -3662,37 +3505,33 @@ msgstr "二要素認証とは何ですか？ また、PyPI上ではどのよう #: warehouse/templates/pages/help.html:60 msgid "" -"How does two factor authentication with an authentication application (<abbr " -"title=\"time-based one-time password\">TOTP</abbr>) work? How do I set it up " -"on PyPI?" +"How does two factor authentication with an authentication application " +"(<abbr title=\"time-based one-time password\">TOTP</abbr>) work? How do I" +" set it up on PyPI?" msgstr "" -"認証アプリケーション（<abbr title=\"time-based one-time password\">TOTP</" -"abbr>）による二要素認証は、どのように機能しますか？ PyPIで設定するにはどうす" -"ればよいですか？" +"認証アプリケーション（<abbr title=\"time-based one-time " +"password\">TOTP</abbr>）による二要素認証は、どのように機能しますか？ PyPIで設定するにはどうすればよいですか？" #: warehouse/templates/pages/help.html:61 msgid "" "How does two factor authentication with a security device (e.g. USB key) " "work? How do I set it up on PyPI?" -msgstr "" -"セキュリティ端末(例: USBキー)による二要素認証は、どのように機能しますか？ " -"PyPIで設定するにはどうすればよいですか？" +msgstr "セキュリティ端末(例: USBキー)による二要素認証は、どのように機能しますか？ PyPIで設定するにはどうすればよいですか？" #: warehouse/templates/pages/help.html:62 msgid "What devices (other than a USB key) can I use as a security device?" msgstr "セキュリティ端末として、USBキー以外に何を使えますか？" +# | msgid "" +# | "How does two factor authentication with a security device (e.g. USB key) +# " +# | "work? How do I set it up on PyPI?" #: warehouse/templates/pages/help.html:63 #, fuzzy -#| msgid "" -#| "How does two factor authentication with a security device (e.g. USB key) " -#| "work? How do I set it up on PyPI?" msgid "" -"How does two factor authentication with a recovery code work? How do I set " -"it up on PyPI?" -msgstr "" -"セキュリティ端末(例: USBキー)による二要素認証は、どのように機能しますか？ " -"PyPIで設定するにはどうすればよいですか？" +"How does two factor authentication with a recovery code work? How do I " +"set it up on PyPI?" +msgstr "セキュリティ端末(例: USBキー)による二要素認証は、どのように機能しますか？ PyPIで設定するにはどうすればよいですか？" #: warehouse/templates/pages/help.html:64 msgid "How can I use API tokens to authenticate with PyPI?" @@ -3708,52 +3547,46 @@ msgstr "PyPIには使用可能なAPIがありますか？" #: warehouse/templates/pages/help.html:68 msgid "How do I get notified when a new version of a project is released?" -msgstr "" -"プロジェクトの新しいバージョンがリリースされたとき、通知を受け取るにはどうす" -"ればよいですか?" +msgstr "プロジェクトの新しいバージョンがリリースされたとき、通知を受け取るにはどうすればよいですか?" #: warehouse/templates/pages/help.html:69 msgid "" -"Where can I see statistics about PyPI, downloads, and project/package usage?" -msgstr "" -"PyPI、ダウンロード、プロジェクトやパッケージの使用に関する統計は、どこで見ら" -"れますか？" +"Where can I see statistics about PyPI, downloads, and project/package " +"usage?" +msgstr "PyPI、ダウンロード、プロジェクトやパッケージの使用に関する統計は、どこで見られますか？" #: warehouse/templates/pages/help.html:71 msgid "I forgot my PyPI password. Can you help me?" msgstr "PyPIのパスワードを忘れてしまいました。手を貸してもらえますか？" +# | msgid "I forgot my PyPI password. Can you help me?" #: warehouse/templates/pages/help.html:72 #, fuzzy -#| msgid "I forgot my PyPI password. Can you help me?" msgid "I've lost access to my PyPI account. Can you help me?" msgstr "PyPIのパスワードを忘れてしまいました。手を貸してもらえますか？" #: warehouse/templates/pages/help.html:73 msgid "" -"Why am I getting a \"Invalid or non-existent authentication information.\" " -"error when uploading files?" +"Why am I getting a \"Invalid or non-existent authentication " +"information.\" error when uploading files?" msgstr "" #: warehouse/templates/pages/help.html:74 msgid "" -"Why am I getting \"No matching distribution found\" or \"Could not fetch URL" -"\" errors during <code>pip install</code>?" +"Why am I getting \"No matching distribution found\" or \"Could not fetch " +"URL\" errors during <code>pip install</code>?" msgstr "" -"なぜ、<code>pip install</code>の実行中に「一致するディストリビューションが見" -"つかりません（No matching distribution found）」または「URLを取得できませんで" -"した（Could not fetch URL）」というエラーが表示されるのですか？" +"なぜ、<code>pip install</code>の実行中に「一致するディストリビューションが見つかりません（No matching " +"distribution found）」または「URLを取得できませんでした（Could not fetch " +"URL）」というエラーが表示されるのですか？" #: warehouse/templates/pages/help.html:75 msgid "I am having trouble using the PyPI website. Can you help me?" msgstr "PyPIのウェブサイトを使うのに苦労しています。手を貸してもらえますか？" #: warehouse/templates/pages/help.html:76 -msgid "" -"Why can't I manually upload files to PyPI, through the browser interface?" -msgstr "" -"なぜ、ブラウザ・インタフェース経由でPyPIにファイルを手動でアップロードできな" -"いのですか？" +msgid "Why can't I manually upload files to PyPI, through the browser interface?" +msgstr "なぜ、ブラウザ・インタフェース経由でPyPIにファイルを手動でアップロードできないのですか？" #: warehouse/templates/pages/help.html:77 msgid "How can I publish my private packages to PyPI?" @@ -3765,18 +3598,16 @@ msgstr "私のパッケージまたはユーザ登録がブロックされたの #: warehouse/templates/pages/help.html:79 msgid "How do I get a file size limit exemption or increase for my project?" -msgstr "" -"プロジェクトのファイルサイズ制限を解除、または増やすには、どうすればよいです" -"か？" +msgstr "プロジェクトのファイルサイズ制限を解除、または増やすには、どうすればよいですか？" #: warehouse/templates/pages/help.html:81 msgid "" -"Why am I getting a \"Filename or contents already exists\" or \"Filename has " -"been previously used\" error?" +"Why am I getting a \"Filename or contents already exists\" or \"Filename " +"has been previously used\" error?" msgstr "" "「ファイル名または内容が既に存在します（Filename or contents already " -"exists）」または「そのファイル名は以前に使用されています（Filename has been " -"previously used）」というエラーが表示されるのはなぜですか？" +"exists）」または「そのファイル名は以前に使用されています（Filename has been previously " +"used）」というエラーが表示されるのはなぜですか？" #: warehouse/templates/pages/help.html:82 msgid "Why isn't my desired project name available?" @@ -3784,9 +3615,7 @@ msgstr "なぜ、希望するプロジェクト名を使えないのですか？ #: warehouse/templates/pages/help.html:83 msgid "How do I claim an abandoned or previously registered project name?" -msgstr "" -"放棄された、あるいは過去に登録されたプロジェクト名を獲得するには、どうすれば" -"よいですか？" +msgstr "放棄された、あるいは過去に登録されたプロジェクト名を獲得するには、どうすればよいですか？" #: warehouse/templates/pages/help.html:84 msgid "What collaborator roles are available for a project on PyPI?" @@ -3794,14 +3623,11 @@ msgstr "PyPI上のプロジェクトで使用可能な共同編集者の役割 #: warehouse/templates/pages/help.html:85 msgid "How do I become an owner/maintainer of a project on PyPI?" -msgstr "" -"PyPIでプロジェクトのオーナー/メンテナになるには、どうすればよいですか？" +msgstr "PyPIでプロジェクトのオーナー/メンテナになるには、どうすればよいですか？" #: warehouse/templates/pages/help.html:86 msgid "How can I upload a project description in a different format?" -msgstr "" -"プロジェクトの説明を別のフォーマットでアップロードするには、どうすればよいで" -"すか？" +msgstr "プロジェクトの説明を別のフォーマットでアップロードするには、どうすればよいですか？" #: warehouse/templates/pages/help.html:87 msgid "How do I request a new trove classifier?" @@ -3833,11 +3659,9 @@ msgstr "PyPIの今後の変更に対応するには、どうすればよいで #: warehouse/templates/pages/help.html:95 msgid "" -"What does the \"beta feature\" badge mean? What are Warehouse's current beta " -"features?" -msgstr "" -"「ベータ機能（beta feature）」のバッジは何を意味しますか？ Warehouseの現在の" -"ベータ機能には何がありますか？" +"What does the \"beta feature\" badge mean? What are Warehouse's current " +"beta features?" +msgstr "「ベータ機能（beta feature）」のバッジは何を意味しますか？ Warehouseの現在のベータ機能には何がありますか？" #: warehouse/templates/pages/help.html:96 msgid "How do I pronounce \"PyPI\"?" @@ -3881,84 +3705,77 @@ msgstr "PyPIについて" msgid "" "\n" " <p>We use a number of terms to describe software available on " -"PyPI, like \"project\", \"release\", \"file\", and \"package\". Sometimes " -"those terms are confusing because they're used to describe different things " -"in other contexts. Here's how we use them on PyPI:</p>\n" -" <p>A \"project\" on PyPI is the name of a collection of releases " -"and files, and information about them. Projects on PyPI are made and shared " -"by other members of the Python community so that you can use them.</p>\n" -" <p>A \"release\" on PyPI is a specific version of a project. For " -"example, the <a href=\"%(requests_href)s\">requests</a> project has many " -"releases, like \"requests 2.10\" and \"requests 1.2.1\". A release consists " -"of one or more \"files\".</p>\n" -" <p>A \"file\", also known as a \"package\", on PyPI is something " -"that you can download and install. Because of different hardware, operating " -"systems, and file formats, a release may have several files (packages), like " -"an archive containing source code or a binary <a href=\"%(wheel_href)s" -"\">wheel</a>.</p>\n" +"PyPI, like \"project\", \"release\", \"file\", and \"package\". Sometimes" +" those terms are confusing because they're used to describe different " +"things in other contexts. Here's how we use them on PyPI:</p>\n" +" <p>A \"project\" on PyPI is the name of a collection of " +"releases and files, and information about them. Projects on PyPI are made" +" and shared by other members of the Python community so that you can use " +"them.</p>\n" +" <p>A \"release\" on PyPI is a specific version of a project. " +"For example, the <a href=\"%(requests_href)s\">requests</a> project has " +"many releases, like \"requests 2.10\" and \"requests 1.2.1\". A release " +"consists of one or more \"files\".</p>\n" +" <p>A \"file\", also known as a \"package\", on PyPI is " +"something that you can download and install. Because of different " +"hardware, operating systems, and file formats, a release may have several" +" files (packages), like an archive containing source code or a binary <a " +"href=\"%(wheel_href)s\">wheel</a>.</p>\n" " " msgstr "" "\n" -" <p>PyPI上で入手できるソフトウェアを説明する上で、「プロジェクト」" -"「リリース」「ファイル」そして「パッケージ」といった多くの用語が使われます。" -"これらの用語は時折混乱を招くことがあります。なぜなら、これらは別の文脈では異" -"なるものを説明するために使われるからです。PyPIにおける使い方は、以下の通りで" -"す。</p>\n" -" <p>PyPIにおける「プロジェクト（project）」とは、リリースとファイ" -"ル、そしてこれらに関する情報のコレクションの名前です。PyPIのプロジェクトは、" -"あなたがこれらを使えるようにするために、Pythonコミュニティの他のメンバによっ" -"て作成・共有されます。</p>\n" -" <p>PyPIにおける「リリース（release）」とは、プロジェクトの特定の" -"バージョンのことです。例えば <a href=\"%(requests_href)s\">requests</a> プロ" -"ジェクトには、「requests 2.10」「requests 1.2.1」といった沢山のリリースがあり" -"ます。リリースは1つ以上の「ファイル」で構成されます。</p>\n" -" <p>PyPIにおける「ファイル」は「パッケージ」とも呼ばれ、ダウンロード" -"してインストールすることができるもののことです。 ハードウェア、オペレーティン" -"グ・システム、そしてファイル形式の違いにより、リリースにはソースコードを含む" -"アーカイブやバイナリ <a href=\"%(wheel_href)s\">ホイール</a>といった、複数の" -"ファイル（パッケージ）がある場合があります。</p>\n" +" " +"<p>PyPI上で入手できるソフトウェアを説明する上で、「プロジェクト」「リリース」「ファイル」そして「パッケージ」といった多くの用語が使われます。これらの用語は時折混乱を招くことがあります。なぜなら、これらは別の文脈では異なるものを説明するために使われるからです。PyPIにおける使い方は、以下の通りです。</p>" +"\n" +" " +"<p>PyPIにおける「プロジェクト（project）」とは、リリースとファイル、そしてこれらに関する情報のコレクションの名前です。PyPIのプロジェクトは、あなたがこれらを使えるようにするために、Pythonコミュニティの他のメンバによって作成・共有されます。</p>" +"\n" +" <p>PyPIにおける「リリース（release）」とは、プロジェクトの特定のバージョンのことです。例えば <a " +"href=\"%(requests_href)s\">requests</a> プロジェクトには、「requests 2.10」「requests" +" 1.2.1」といった沢山のリリースがあります。リリースは1つ以上の「ファイル」で構成されます。</p>\n" +" <p>PyPIにおける「ファイル」は「パッケージ」とも呼ばれ、ダウンロードしてインストールすることができるもののことです。 " +"ハードウェア、オペレーティング・システム、そしてファイル形式の違いにより、リリースにはソースコードを含むアーカイブやバイナリ <a " +"href=\"%(wheel_href)s\">ホイール</a>といった、複数のファイル（パッケージ）がある場合があります。</p>\n" " " #: warehouse/templates/pages/help.html:194 #, python-format msgid "" -"To learn how to install a file from PyPI, visit the <a href=" -"\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">installation tutorial</a> on the <a href=\"%(user_guide_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " -"User Guide</a>." +"To learn how to install a file from PyPI, visit the <a " +"href=\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">installation tutorial</a> on the <a " +"href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" -"PyPIからファイルをインストールする方法について学ぶには、<a href=" -"\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Python Packaging User Guide</a>にある<a href=\"%(installation_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">インストールチュートリ" -"アル</a>を参照してください。" +"PyPIからファイルをインストールする方法について学ぶには、<a href=\"%(user_guide_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>にある<a href=\"%(installation_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">インストールチュートリアル</a>を参照してください。" #: warehouse/templates/pages/help.html:201 #, python-format msgid "" -"For full instructions on configuring, packaging and distributing your Python " -"project, refer to the <a href=\"%(packaging_tutorial_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">packaging tutorial</a> on " -"the <a href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Python Packaging User Guide</a>." +"For full instructions on configuring, packaging and distributing your " +"Python project, refer to the <a href=\"%(packaging_tutorial_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">packaging " +"tutorial</a> on the <a href=\"%(user_guide_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" -"Pythonプロジェクトの設定、パッケージング、ディストリビューションの詳細につい" -"ては、<a href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Python Packaging User Guide</a>にある<a href=" -"\"%(packaging_tutorial_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">パッケージングのチュートリアル</a>を参照してください。" +"Pythonプロジェクトの設定、パッケージング、ディストリビューションの詳細については、<a " +"href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>にある<a " +"href=\"%(packaging_tutorial_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">パッケージングのチュートリアル</a>を参照してください。" #: warehouse/templates/pages/help.html:208 #, python-format msgid "" -"Classifiers are used to categorize projects on PyPI. See <a href=\"%(href)s" -"\">the classifiers page</a> for more information, as well as a list of valid " -"classifiers." +"Classifiers are used to categorize projects on PyPI. See <a " +"href=\"%(href)s\">the classifiers page</a> for more information, as well " +"as a list of valid classifiers." msgstr "" -"PyPIにおける分類は、プロジェクトをカテゴライズするために使われます。有効な分" -"類のリストの他、より多くの情報については、<a href=\"%(href)s\">分類ページ</a>" -"を参照してください。" +"PyPIにおける分類は、プロジェクトをカテゴライズするために使われます。有効な分類のリストの他、より多くの情報については、<a " +"href=\"%(href)s\">分類ページ</a>を参照してください。" #: warehouse/templates/pages/help.html:215 msgid "My account" @@ -3966,10 +3783,9 @@ msgstr "アカウント" #: warehouse/templates/pages/help.html:218 msgid "" -"Currently, PyPI requires a verified email address to perform the following " -"operations:" -msgstr "" -"現在、PyPIは次の操作を実行するために確認済みのメールアドレスを必要とします。" +"Currently, PyPI requires a verified email address to perform the " +"following operations:" +msgstr "現在、PyPIは次の操作を実行するために確認済みのメールアドレスを必要とします。" #: warehouse/templates/pages/help.html:220 msgid "Register a new project." @@ -3981,158 +3797,143 @@ msgstr "新しいバージョンやファイルをアップロードする。" #: warehouse/templates/pages/help.html:223 msgid "" -"The list of activities that require a verified email address is likely to " -"grow over time." -msgstr "" -"確認済みのメールアドレスを必要とするアクティビティのリストは、時間の経過とと" -"もに増える可能性があります。" +"The list of activities that require a verified email address is likely to" +" grow over time." +msgstr "確認済みのメールアドレスを必要とするアクティビティのリストは、時間の経過とともに増える可能性があります。" #: warehouse/templates/pages/help.html:224 #, python-format msgid "" -"This policy will allow us to enforce a key policy of <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python " -"enhancement proposal\">PEP</abbr> 541</a> regarding maintainer reachability. " -"It also reduces the viability of spam attacks to create many accounts in an " -"automated fashion." +"This policy will allow us to enforce a key policy of <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 541</a> regarding " +"maintainer reachability. It also reduces the viability of spam attacks to" +" create many accounts in an automated fashion." msgstr "" -"このポリシーは、メンテナの到達可能性（reachability: 連絡がつくこと）に関する" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><abbr title=\"Python enhancement proposal\">PEP</abbr> 541</a>の主要ポリ" -"シーを実現可能にします。また、大量のアカウントを自動生成するようなスパム攻撃" -"が行われる可能性を減らします。" +"このポリシーは、メンテナの到達可能性（reachability: 連絡がつくこと）に関する<a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " +"title=\"Python enhancement proposal\">PEP</abbr> " +"541</a>の主要ポリシーを実現可能にします。また、大量のアカウントを自動生成するようなスパム攻撃が行われる可能性を減らします。" #: warehouse/templates/pages/help.html:225 #, python-format msgid "" -"You can manage your account's email addresses in your <a href=\"%(href)s" -"\">account settings</a>. This also allows for sending a new confirmation " -"email for users who signed up in the past, before we began enforcing this " -"policy." +"You can manage your account's email addresses in your <a " +"href=\"%(href)s\">account settings</a>. This also allows for sending a " +"new confirmation email for users who signed up in the past, before we " +"began enforcing this policy." msgstr "" -"アカウントのメールアドレスは、<a href=\"%(href)s\">アカウント設定</a>で管理で" -"きます。また、このポリシーを適用する前に、以前サインアップしたユーザに対して" -"新しい確認メールを送信することもできます。" +"アカウントのメールアドレスは、<a " +"href=\"%(href)s\">アカウント設定</a>で管理できます。また、このポリシーを適用する前に、以前サインアップしたユーザに対して新しい確認メールを送信することもできます。" #: warehouse/templates/pages/help.html:228 #, python-format msgid "" -"<p> PyPI itself has not suffered a breach. This is a protective measure to " -"reduce the risk of <a href=\"%(credential_stuffing_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">credential stuffing</a> attacks " -"against PyPI and its users. </p> <p> Each time a user supplies a password — " -"while registering, authenticating, or updating their password — PyPI " -"securely checks whether that password has appeared in public data breaches. " -"</p> <p> During each of these processes, PyPI generates a SHA-1 hash of the " -"supplied password and uses the first five (5) characters of the hash to " -"check the <a href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Have I Been Pwned API</a> and determine if the " -"password has been previously compromised. The plaintext password is never " -"stored by PyPI or submitted to the Have I Been Pwned API. </p> <p> PyPI will " -"not allow such passwords to be used when setting a password at registration " -"or updating your password. </p> <p> If you receive an error message saying " -"that \"This password appears in a breach or has been compromised and cannot " -"be used\", you should change it all other places that you use it as soon as " -"possible. </p> <p> If you have received this error while attempting to log " -"in or upload to PyPI, then your password has been reset and you cannot log " -"in to PyPI until you <a href=\"%(reset_pwd_href)s\">reset your password</a>. " -"</p>" -msgstr "" -"<p>PyPI自体は侵害を受けていません。これは、PyPIとそのユーザーに対する<a href=" -"\"%(credential_stuffing_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">クレデンシャル・スタッフィング</a>攻撃のリスクを低減するための保" -"護手段です。</p><p>登録、認証、あるいはパスワードの更新など、ユーザがパスワー" -"ドを提供するたびに、PyPIはそのパスワードが公になっている情報漏えいに含まれて" -"いないどうか安全にチェックします。</p><p>これらの各プロセスの間に、PyPIは提供" -"されたパスワードとユーザのSHA-1ハッシュを生成し、ハッシュの最初の5文字を使っ" -"て <a href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Have I Been Pwned API</a>をチェックします。そして、パスワー" -"ドが過去に侵害されたことがあるかどうかを判断します。平文のパスワードがPyPIに" -"保存されたり、Have I Been Pwned APIに提供されたりすることはありません。</" -"p><p>PyPIでは、登録時のパスワード設定やパスワード更新の際に、このようなパス" -"ワードを使用することはできません。</p><p>もし「This password appears in a " -"breach or has been compromised and cannot be used（このパスワードは漏えいが生" -"じているか、危険に晒されているため使用できません）」というようなエラーメッ" -"セージを受けとった場合、可能な限り、そのパスワードを使用している他の全ての箇" -"所を変更すべきです。</p><p>PyPIにログインまたはアップロードしようとした際にこ" -"のエラーが発生した場合は、パスワードが初期化された状態になっているため、あな" -"たが <a href=\"%(reset_pwd_href)s\">パスワードのリセット</a>を行うまでログイ" -"ンできません。</p>" +"<p> PyPI itself has not suffered a breach. This is a protective measure " +"to reduce the risk of <a href=\"%(credential_stuffing_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">credential " +"stuffing</a> attacks against PyPI and its users. </p> <p> Each time a " +"user supplies a password — while registering, authenticating, or updating" +" their password — PyPI securely checks whether that password has appeared" +" in public data breaches. </p> <p> During each of these processes, PyPI " +"generates a SHA-1 hash of the supplied password and uses the first five " +"(5) characters of the hash to check the <a " +"href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Have I Been Pwned API</a> and determine if the password " +"has been previously compromised. The plaintext password is never stored " +"by PyPI or submitted to the Have I Been Pwned API. </p> <p> PyPI will not" +" allow such passwords to be used when setting a password at registration " +"or updating your password. </p> <p> If you receive an error message " +"saying that \"This password appears in a breach or has been compromised " +"and cannot be used\", you should change it all other places that you use " +"it as soon as possible. </p> <p> If you have received this error while " +"attempting to log in or upload to PyPI, then your password has been reset" +" and you cannot log in to PyPI until you <a " +"href=\"%(reset_pwd_href)s\">reset your password</a>. </p>" +msgstr "" +"<p>PyPI自体は侵害を受けていません。これは、PyPIとそのユーザーに対する<a " +"href=\"%(credential_stuffing_href)s\" title=\"%(title)s\" " +"target=\"_blank\" " +"rel=\"noopener\">クレデンシャル・スタッフィング</a>攻撃のリスクを低減するための保護手段です。</p><p>登録、認証、あるいはパスワードの更新など、ユーザがパスワードを提供するたびに、PyPIはそのパスワードが公になっている情報漏えいに含まれていないどうか安全にチェックします。</p><p>これらの各プロセスの間に、PyPIは提供されたパスワードとユーザのSHA-1ハッシュを生成し、ハッシュの最初の5文字を使って" +" <a href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Have I Been Pwned " +"API</a>をチェックします。そして、パスワードが過去に侵害されたことがあるかどうかを判断します。平文のパスワードがPyPIに保存されたり、Have" +" I Been Pwned " +"APIに提供されたりすることはありません。</p><p>PyPIでは、登録時のパスワード設定やパスワード更新の際に、このようなパスワードを使用することはできません。</p><p>もし「This" +" password appears in a breach or has been compromised and cannot be " +"used（このパスワードは漏えいが生じているか、危険に晒されているため使用できません）」というようなエラーメッセージを受けとった場合、可能な限り、そのパスワードを使用している他の全ての箇所を変更すべきです。</p><p>PyPIにログインまたはアップロードしようとした際にこのエラーが発生した場合は、パスワードが初期化された状態になっているため、あなたが" +" <a href=\"%(reset_pwd_href)s\">パスワードのリセット</a>を行うまでログインできません。</p>" #: warehouse/templates/pages/help.html:263 #, python-format msgid "" "<p> Two factor authentication (2FA) makes your account more secure by " "requiring two things in order to log in: <em>something you know</em> and " -"<em>something you own</em>. </p> <p> In PyPI's case, \"something you know\" " -"is your username and password, while \"something you own\" can be <a href=" -"\"#totp\">an application to generate a temporary code</a>, or a <a href=" -"\"#utfkey\">security device</a> (most commonly a USB key). </p> <p> It is " -"strongly recommended that you set up two factor authentication on your PyPI " -"account. </p> <p> Users who have chosen to set up two factor authentication " -"will be asked to provide their second method of identity verification during " -"the log in process. This only affects logging in via a web browser, and not " -"(yet) package uploads. </p> <p>You can follow the improvements to <abbr " -"title=\"two factor authentication\">2FA</abbr> on <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">discuss.python.org</a>.</p>" -msgstr "" -"<p>二要素認証（2FA: two factor authentication）は、ログイン時に2つのものを要" -"求することで、アカウントの安全性を高めます。<em>あなたが知っていること" -"（something you know）</em>と、<em>あなたが所持しているもの（something you " -"own）</em>です。</p><p>PyPIのケースでは、「あなたが知っていること」とはユーザ" -"名とパスワードです。「あなたが所持しているもの」としては、<a href=\"#totp\">" -"一時コードを生成するアプリケーション</a>や<a href=\"#utfkey\">セキュリティ端" -"末</a>（最も一般的なものはUSBキー）があり得ます。</p><p>PyPIのアカウントで" -"は、二要素認証の設定を行うことを強くお勧めします。</p><p>二要素認証の設定を選" -"択したユーザは、ログイン処理の中で2番目の本人確認方法を提供するよう求められる" -"でしょう。これはWebブラウザ経由でログインする時にだけ影響し、パッケージのアッ" -"プロードには（まだ）影響はありません。</p><p><abbr title=\"two factor " -"authentication\">2FA</abbr>の改善については、<a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">discuss.python.org</a>で把握" -"することができます。</p>" +"<em>something you own</em>. </p> <p> In PyPI's case, \"something you " +"know\" is your username and password, while \"something you own\" can be " +"<a href=\"#totp\">an application to generate a temporary code</a>, or a " +"<a href=\"#utfkey\">security device</a> (most commonly a USB key). </p> " +"<p> It is strongly recommended that you set up two factor authentication " +"on your PyPI account. </p> <p> Users who have chosen to set up two factor" +" authentication will be asked to provide their second method of identity " +"verification during the log in process. This only affects logging in via " +"a web browser, and not (yet) package uploads. </p> <p>You can follow the " +"improvements to <abbr title=\"two factor authentication\">2FA</abbr> on " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">discuss.python.org</a>.</p>" +msgstr "" +"<p>二要素認証（2FA: two factor " +"authentication）は、ログイン時に2つのものを要求することで、アカウントの安全性を高めます。<em>あなたが知っていること（something" +" you know）</em>と、<em>あなたが所持しているもの（something you " +"own）</em>です。</p><p>PyPIのケースでは、「あなたが知っていること」とはユーザ名とパスワードです。「あなたが所持しているもの」としては、<a" +" href=\"#totp\">一時コードを生成するアプリケーション</a>や<a " +"href=\"#utfkey\">セキュリティ端末</a>（最も一般的なものはUSBキー）があり得ます。</p><p>PyPIのアカウントでは、二要素認証の設定を行うことを強くお勧めします。</p><p>二要素認証の設定を選択したユーザは、ログイン処理の中で2番目の本人確認方法を提供するよう求められるでしょう。これはWebブラウザ経由でログインする時にだけ影響し、パッケージのアップロードには（まだ）影響はありません。</p><p><abbr" +" title=\"two factor authentication\">2FA</abbr>の改善については、<a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">discuss.python.org</a>で把握することができます。</p>" #: warehouse/templates/pages/help.html:290 #, python-format msgid "" "PyPI users can set up two-factor authentication using any authentication " "application that supports the <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based one-time password" -"\">TOTP</abbr> standard</a>." +"target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based one-time " +"password\">TOTP</abbr> standard</a>." msgstr "" -"PyPIユーザは、<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\"><abbr title=\"time-based one-time password\">TOTP</abbr>標準</a>" -"をサポートする任意の認証アプリケーションを使って、二要素認証を設定できます。" +"PyPIユーザは、<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><abbr title=\"time-based one-time " +"password\">TOTP</abbr>標準</a>をサポートする任意の認証アプリケーションを使って、二要素認証を設定できます。" #: warehouse/templates/pages/help.html:291 msgid "" "<abbr title=\"time-based one-time password\">TOTP</abbr> authentication " -"applications generate a regularly changing authentication code to use when " -"logging into your account." +"applications generate a regularly changing authentication code to use " +"when logging into your account." msgstr "" -"<abbr title=\"time-based one-time password\">TOTP</abbr>認証アプリケーション" -"は、アカウントへのログイン時に使うための、定期的に変更される認証コードを生成" -"します。" +"<abbr title=\"time-based one-time " +"password\">TOTP</abbr>認証アプリケーションは、アカウントへのログイン時に使うための、定期的に変更される認証コードを生成します。" #: warehouse/templates/pages/help.html:292 msgid "" -"Because <abbr title=\"time-based one-time password\">TOTP</abbr> is an open " -"standard, there are many applications that are compatible with your PyPI " -"account. Popular applications include:" +"Because <abbr title=\"time-based one-time password\">TOTP</abbr> is an " +"open standard, there are many applications that are compatible with your " +"PyPI account. Popular applications include:" msgstr "" -"<abbr title=\"time-based one-time password\">TOTP</abbr>はオープン・スタン" -"ダードであるため、PyPIのアカウントと互換性があるアプリケーションはたくさんあ" -"ります。以下は、人気のあるアプリケーションです。" +"<abbr title=\"time-based one-time " +"password\">TOTP</abbr>はオープン・スタンダードであるため、PyPIのアカウントと互換性があるアプリケーションはたくさんあります。以下は、人気のあるアプリケーションです。" #: warehouse/templates/pages/help.html:295 #, python-format msgid "" -"Google Authenticator for <a href=\"%(android_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Google Authenticator for <a href=\"%(android_href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Android</a> or <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" msgstr "" -"<a href=\"%(android_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Android</a> または <a href=\"%(ios_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">iOS</a> 対応の Google Authenticator" +"<a href=\"%(android_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Android</a> または <a href=\"%(ios_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a> 対応の Google" +" Authenticator" #: warehouse/templates/pages/help.html:298 #: warehouse/templates/pages/help.html:300 @@ -4144,13 +3945,15 @@ msgstr "（プロプライエタリ）" #: warehouse/templates/pages/help.html:302 #, python-format msgid "" -"Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Android</a> or <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" msgstr "" -"<a href=\"%(android_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Android</a> または <a href=\"%(ios_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">iOS</a> 対応の Duo Mobile" +"<a href=\"%(android_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Android</a> または <a href=\"%(ios_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a> 対応の Duo " +"Mobile" #: warehouse/templates/pages/help.html:308 #: warehouse/templates/pages/help.html:309 @@ -4160,73 +3963,61 @@ msgstr "（オープンソース）" #: warehouse/templates/pages/help.html:313 #, python-format msgid "" -"Some password managers (e.g. <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">1Password</a>) can also generate authentication " -"codes. For security reasons, PyPI only allows you to set up one application " -"per account." +"Some password managers (e.g. <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">1Password</a>) can also generate " +"authentication codes. For security reasons, PyPI only allows you to set " +"up one application per account." msgstr "" "一部のパスワードマネージャ（例: <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">1Password</a>）も、認証コードを生成できる" -"ことがあります。セキュリティ上の理由から、PyPIは、アカウントごとに1つのアプリ" -"ケーションしか設定できません。" +"target=\"_blank\" " +"rel=\"noopener\">1Password</a>）も、認証コードを生成できることがあります。セキュリティ上の理由から、PyPIは、アカウントごとに1つのアプリケーションしか設定できません。" #: warehouse/templates/pages/help.html:321 msgid "" "To set up <abbr title=\"two factor authentication\">2FA</abbr> with an " "authentication application:" -msgstr "" -"認証アプリケーションを使って<abbr title=\"two factor authentication\">2FA</" -"abbr>を設定するには:" +msgstr "認証アプリケーションを使って<abbr title=\"two factor authentication\">2FA</abbr>を設定するには:" #: warehouse/templates/pages/help.html:323 msgid "" -"Open an authentication (<abbr title=\"time-based one-time password\">TOTP</" -"abbr>) application" -msgstr "" -"認証（<abbr title=\"time-based one-time password\">TOTP</abbr>）アプリケー" -"ションを開く" +"Open an authentication (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>) application" +msgstr "認証（<abbr title=\"time-based one-time password\">TOTP</abbr>）アプリケーションを開く" #: warehouse/templates/pages/help.html:324 msgid "" -"Log in to your PyPI account, go to your account settings, and choose \"Add " -"<abbr title=\"two factor authentication\">2FA</abbr> with authentication " -"application\"" +"Log in to your PyPI account, go to your account settings, and choose " +"\"Add <abbr title=\"two factor authentication\">2FA</abbr> with " +"authentication application\"" msgstr "" -"PyPIのアカウントにログインし、アカウント設定に進み、「認証アプリケーションに" -"よる<abbr title=\"two factor authentication\">2FA</abbr>の追加」を選択する" +"PyPIのアカウントにログインし、アカウント設定に進み、「認証アプリケーションによる<abbr title=\"two factor " +"authentication\">2FA</abbr>の追加」を選択する" #: warehouse/templates/pages/help.html:325 msgid "" -"PyPI will generate a secret key, specific to your account. This is displayed " -"as a QR code, and as a text code." -msgstr "" -"PyPIはアカウント固有の秘密鍵を生成する。これはQRコードまたはテキストコードで" -"表示される。" +"PyPI will generate a secret key, specific to your account. This is " +"displayed as a QR code, and as a text code." +msgstr "PyPIはアカウント固有の秘密鍵を生成する。これはQRコードまたはテキストコードで表示される。" #: warehouse/templates/pages/help.html:326 msgid "" "Scan the QR code with your authentication application, or type it in " -"manually. The method of input will depend on the application you have chosen." -msgstr "" -"認証アプリケーションでQRコードをスキャンするか、手動で入力する。入力方法は、" -"選択したアプリケーションによって異なる。" +"manually. The method of input will depend on the application you have " +"chosen." +msgstr "認証アプリケーションでQRコードをスキャンするか、手動で入力する。入力方法は、選択したアプリケーションによって異なる。" #: warehouse/templates/pages/help.html:327 msgid "" -"Your application will generate an authentication code - use this to verify " -"your set up on PyPI" -msgstr "" -"アプリケーションによって認証コードが生成されるーーこれを使って、PyPI上での設" -"定を検証する" +"Your application will generate an authentication code - use this to " +"verify your set up on PyPI" +msgstr "アプリケーションによって認証コードが生成されるーーこれを使って、PyPI上での設定を検証する" #: warehouse/templates/pages/help.html:330 msgid "" "The PyPI server and your application now share your PyPI secret key, " -"allowing your application to generate valid authentication codes for your " -"PyPI account." -msgstr "" -"これで、PyPIサーバとあなたのアプリケーションはPyPIの秘密鍵を共有し、アプリ" -"ケーションがPyPIアカウントの有効な認証コードを生成できるようになります。" +"allowing your application to generate valid authentication codes for your" +" PyPI account." +msgstr "これで、PyPIサーバとあなたのアプリケーションはPyPIの秘密鍵を共有し、アプリケーションがPyPIアカウントの有効な認証コードを生成できるようになります。" #: warehouse/templates/pages/help.html:332 #: warehouse/templates/pages/help.html:374 @@ -4248,30 +4039,29 @@ msgstr "このコードを使ってPyPIへのログインを完了する" #: warehouse/templates/pages/help.html:342 msgid "" -"A security device is a USB key or <a href=\"#utfdevices\">other device</a> " -"that generates a one-time password and sends that password to the browser. " -"This password is then used by PyPI to authenticate you as a user." +"A security device is a USB key or <a href=\"#utfdevices\">other " +"device</a> that generates a one-time password and sends that password to " +"the browser. This password is then used by PyPI to authenticate you as a " +"user." msgstr "" -"セキュリティ端末とはUSBキーや、ワンタイム・パスワードを生成してブラウザに送信" -"する<a href=\"#utfdevices\">その他の端末</a>などのことです。このパスワード" -"は、あなたをユーザとして認証するためにPyPIで使われます。" +"セキュリティ端末とはUSBキーや、ワンタイム・パスワードを生成してブラウザに送信する<a " +"href=\"#utfdevices\">その他の端末</a>などのことです。このパスワードは、あなたをユーザとして認証するためにPyPIで使われます。" #: warehouse/templates/pages/help.html:344 -msgid "" -"To set up two factor authentication with a <em>USB key</em>, you'll need:" +msgid "To set up two factor authentication with a <em>USB key</em>, you'll need:" msgstr "<em>USBキー</em>を使った二要素認証を設定するには、以下が必要です:" #: warehouse/templates/pages/help.html:346 #, python-format msgid "" -"To use a <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">browser that supports <abbr title=\"web authentication" -"\">WebAuthn</abbr> and PublicKeyCredential</a>, as this is the standard " -"implemented by PyPI." +"To use a <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">browser that supports <abbr title=\"web " +"authentication\">WebAuthn</abbr> and PublicKeyCredential</a>, as this is " +"the standard implemented by PyPI." msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><abbr title=\"web authentication\">WebAuthn</abbr>とPublicKeyCredentialを" -"サポートするブラウザ</a>を使うこと。これはPyPIで実施されている標準である。" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><abbr title=\"web " +"authentication\">WebAuthn</abbr>とPublicKeyCredentialをサポートするブラウザ</a>を使うこと。これはPyPIで実施されている標準である。" #: warehouse/templates/pages/help.html:347 msgid "To be running JavaScript on your browser" @@ -4280,34 +4070,33 @@ msgstr "ブラウザ上でJavaScriptを実行できること" #: warehouse/templates/pages/help.html:348 #, python-format msgid "" -"To use a USB key that adheres to the <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">FIDO U2F specification</a>:" +"To use a USB key that adheres to the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO U2F " +"specification</a>:" msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">FIDO U2F仕様</a>に準拠したUSBキーを使用すること:" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">FIDO U2F仕様</a>に準拠したUSBキーを使用すること:" #: warehouse/templates/pages/help.html:351 #, python-format msgid "" -"Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</a> and <a " -"href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Thetis</a>." +"Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> and <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." msgstr "" "よく使われるキーには、<a href=\"%(yubikey_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Yubikey</a>、 <a href=\"%(titan_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</a>、 <a " -"href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Thetis</a>がある。" +"target=\"_blank\" rel=\"noopener\">Yubikey</a>、 <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a>、 <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>がある。" #: warehouse/templates/pages/help.html:358 msgid "" "Note that some older Yubico USB keys <strong>do not follow the FIDO " "specification</strong>, and will therefore not work with PyPI" -msgstr "" -"一部の古いYubicoのUSBキーは<strong>FIDO仕様に対応しておらず</strong>、PyPI上" -"では動作しないことに注意してください" +msgstr "一部の古いYubicoのUSBキーは<strong>FIDO仕様に対応しておらず</strong>、PyPI上では動作しないことに注意してください" #: warehouse/templates/pages/help.html:363 msgid "Follow these steps:" @@ -4316,41 +4105,36 @@ msgstr "以下の手順を実施します:" #: warehouse/templates/pages/help.html:365 msgid "" "\n" -" <li>Log in to your PyPI account, go to your account settings, and " -"choose \"Add <abbr title=\"two factor authentication\">2FA</abbr> with " -"security device (e.g. USB key)\"</li>\n" -" <li>Give your key a name. This is necessary because it's possible " -"to add more than one security device to your account.</li>\n" +" <li>Log in to your PyPI account, go to your account settings, " +"and choose \"Add <abbr title=\"two factor authentication\">2FA</abbr> " +"with security device (e.g. USB key)\"</li>\n" +" <li>Give your key a name. This is necessary because it's " +"possible to add more than one security device to your account.</li>\n" " <li>Click on the \"Set up security device\" button</li>\n" -" <li>Insert and touch your USB key, as instructed by your browser</" -"li>\n" +" <li>Insert and touch your USB key, as instructed by your " +"browser</li>\n" " " msgstr "" "\n" -" <li>PyPIのアカウントにログインし、アカウント設定に進み、「セキュリ" -"ティ端末（例: USBキー）による<abbr title=\"two factor authentication\">2FA</" -"abbr> の追加」を選択する</li>\n" -" <li>鍵に名前をつける。これは、アカウントに複数のセキュリティ端末を" -"追加するために必要です。</li>\n" -" <li>「セキュリティ端末を設定する（Set up security device）」ボタン" -"をクリックする</li>\n" +" <li>PyPIのアカウントにログインし、アカウント設定に進み、「セキュリティ端末（例: USBキー）による<abbr " +"title=\"two factor authentication\">2FA</abbr> の追加」を選択する</li>\n" +" <li>鍵に名前をつける。これは、アカウントに複数のセキュリティ端末を追加するために必要です。</li>\n" +" <li>「セキュリティ端末を設定する（Set up security device）」ボタンをクリックする</li>\n" " <li>ブラウザの指示に従って、USBキーを挿入しタッチする</li>\n" " " #: warehouse/templates/pages/help.html:372 msgid "" -"Once complete, your USB key will be registered to your PyPI account and can " -"be used during the log in process." -msgstr "" -"完了するとUSBキーがPyPIアカウントに登録され、ログイン処理中に使えるようになり" -"ます。" +"Once complete, your USB key will be registered to your PyPI account and " +"can be used during the log in process." +msgstr "完了するとUSBキーがPyPIアカウントに登録され、ログイン処理中に使えるようになります。" #: warehouse/templates/pages/help.html:376 msgid "" "\n" " <li>Provide your username and password, as normal</li>\n" -" <li>Insert and touch your USB key to finish logging into PyPI</" -"li>\n" +" <li>Insert and touch your USB key to finish logging into " +"PyPI</li>\n" " " msgstr "" "\n" @@ -4362,83 +4146,80 @@ msgstr "" #, python-format msgid "" "There is a growing ecosystem of <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">devices that are FIDO compliant</a>, and " -"can therefore be used with PyPI." +"target=\"_blank\" rel=\"noopener\">devices that are FIDO compliant</a>, " +"and can therefore be used with PyPI." msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">FIDO準拠の端末</a>のエコシステムが成長しており、PyPIで使用できます。" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">FIDO準拠の端末</a>のエコシステムが成長しており、PyPIで使用できます。" #: warehouse/templates/pages/help.html:392 #, python-format msgid "" -"Emerging solutions include biometric (facial and fingerprint) scanners and " -"FIDO compatible credit cards. There is also growing support for <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">mobile " -"phones to act as security devices</a>." +"Emerging solutions include biometric (facial and fingerprint) scanners " +"and FIDO compatible credit cards. There is also growing support for <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">mobile phones to act as security devices</a>." msgstr "" -"新しいソリューションには、生体認証（顔認証や指紋認証）スキャナとFIDO互換のク" -"レジットカードが含まれます。また、<a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">セキュリティ端末として機能する携帯電話</a>" -"もますますサポートされてきています。" +"新しいソリューションには、生体認証（顔認証や指紋認証）スキャナとFIDO互換のクレジットカードが含まれます。また、<a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">セキュリティ端末として機能する携帯電話</a>もますますサポートされてきています。" #: warehouse/templates/pages/help.html:398 #, python-format msgid "" -"As PyPI's two factor implementation follows the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"web " -"authentication\">WebAuthn</abbr> standard</a>, PyPI users will be able to " -"take advantage of any future developments in this field." +"As PyPI's two factor implementation follows the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"web " +"authentication\">WebAuthn</abbr> standard</a>, PyPI users will be able to" +" take advantage of any future developments in this field." msgstr "" -"PyPIの2要素実装はWebAuthn標準に準拠しているため、PyPIユーザーはこの分野におけ" -"る将来の開発を利用することができます。\n" -"PyPIの二要素の実装は<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\"><abbr title=\"web authentication\">WebAuthn</abbr>標準</" -"a>に準拠しているため、PyPIユーザはこの分野における将来的な開発の恩恵を受ける" -"ことができます。" +"PyPIの2要素実装はWebAuthn標準に準拠しているため、PyPIユーザーはこの分野における将来の開発を利用することができます。\n" +"PyPIの二要素の実装は<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><abbr title=\"web " +"authentication\">WebAuthn</abbr>標準</a>に準拠しているため、PyPIユーザはこの分野における将来的な開発の恩恵を受けることができます。" #: warehouse/templates/pages/help.html:407 msgid "" -"If you lose access to your <a href=\"#totp\">authentication application</a> " -"or <a href=\"#utfkey\">security device</a>, you can use these codes to sign " -"into PyPI." +"If you lose access to your <a href=\"#totp\">authentication " +"application</a> or <a href=\"#utfkey\">security device</a>, you can use " +"these codes to sign into PyPI." msgstr "" #: warehouse/templates/pages/help.html:410 msgid "" -"Recovery codes are <strong>one time use</strong>. They are not a substitute " -"for a <a href=\"#totp\">authentication application</a> or <a href=\"#utfkey" -"\">security device</a> and should only be used for recovery. After using a " -"recovery code to sign in, it becomes inactive." +"Recovery codes are <strong>one time use</strong>. They are not a " +"substitute for a <a href=\"#totp\">authentication application</a> or <a " +"href=\"#utfkey\">security device</a> and should only be used for " +"recovery. After using a recovery code to sign in, it becomes inactive." msgstr "" #: warehouse/templates/pages/help.html:416 msgid "To provision recovery codes:" msgstr "" +# | msgid "" +# | "Log in to your PyPI account, go to your account settings, and choose " +# | "\"Add <abbr title=\"two factor authentication\">2FA</abbr> with " +# | "authentication application\"" #: warehouse/templates/pages/help.html:418 #, fuzzy -#| msgid "" -#| "Log in to your PyPI account, go to your account settings, and choose " -#| "\"Add <abbr title=\"two factor authentication\">2FA</abbr> with " -#| "authentication application\"" msgid "" "Log in to your PyPI account, go to your account settings, and choose " "\"Generate recovery codes\"" msgstr "" -"PyPIのアカウントにログインし、アカウント設定に進み、「認証アプリケーションに" -"よる<abbr title=\"two factor authentication\">2FA</abbr>の追加」を選択する" +"PyPIのアカウントにログインし、アカウント設定に進み、「認証アプリケーションによる<abbr title=\"two factor " +"authentication\">2FA</abbr>の追加」を選択する" #: warehouse/templates/pages/help.html:419 msgid "" -"Securely store the displayed recovery codes! Consider printing them out and " -"storing them in a safe location or saving them in a password manager." +"Securely store the displayed recovery codes! Consider printing them out " +"and storing them in a safe location or saving them in a password manager." msgstr "" #: warehouse/templates/pages/help.html:422 msgid "" -"If you lose access to your stored recovery codes or use all of them, you can " -"get new ones by selecting \"Regenerate recovery codes\" in your account " -"settings." +"If you lose access to your stored recovery codes or use all of them, you " +"can get new ones by selecting \"Regenerate recovery codes\" in your " +"account settings." msgstr "" #: warehouse/templates/pages/help.html:424 @@ -4447,40 +4228,43 @@ msgstr "" #: warehouse/templates/pages/help.html:427 msgid "" -"When prompted for Two-Factor Authentication, select \"Login using a Recovery " -"Code\"" +"When prompted for Two-Factor Authentication, select \"Login using a " +"Recovery Code\"" msgstr "" #: warehouse/templates/pages/help.html:428 msgid "" -"As each code can be used only once, you might want to mark the code as used" +"As each code can be used only once, you might want to mark the code as " +"used" msgstr "" #: warehouse/templates/pages/help.html:429 msgid "" -"If you have few recovery codes remaining, you may also want to generate a " -"new set using the \"Regenerate recovery codes\" button in your account " +"If you have few recovery codes remaining, you may also want to generate a" +" new set using the \"Regenerate recovery codes\" button in your account " "settings." msgstr "" +# | msgid "" +# | "\n" +# | " <p>API tokens provide an alternative way (instead of username " +# | "and password) to authenticate when <strong>uploading packages</strong> to +# " +# | "PyPI.</p>\n" +# | " <p>You can create a token for an entire PyPI account, in which +# | "case, the token will work for all projects associated with that account. +# | "Alternatively, you can limit a token's scope to a specific +# project.</p>\n" +# | " <p><strong>We strongly recommend you authenticate with an API " +# | "token where possible.</strong></p>\n" +# | " " #: warehouse/templates/pages/help.html:434 #, fuzzy -#| msgid "" -#| "\n" -#| " <p>API tokens provide an alternative way (instead of username " -#| "and password) to authenticate when <strong>uploading packages</strong> to " -#| "PyPI.</p>\n" -#| " <p>You can create a token for an entire PyPI account, in which " -#| "case, the token will work for all projects associated with that account. " -#| "Alternatively, you can limit a token's scope to a specific project.</p>\n" -#| " <p><strong>We strongly recommend you authenticate with an API " -#| "token where possible.</strong></p>\n" -#| " " msgid "" "\n" -" <p>API tokens provide an alternative way (instead of username and " -"password) to authenticate when <strong>uploading packages</strong> to PyPI.</" -"p>\n" +" <p>API tokens provide an alternative way (instead of username " +"and password) to authenticate when <strong>uploading packages</strong> to" +" PyPI.</p>\n" " <p>You can create a token for an entire PyPI account, in which " "case, the token will work for all projects associated with that account. " "Alternatively, you can limit a token's scope to a specific project.</p>\n" @@ -4490,15 +4274,13 @@ msgid "" " " msgstr "" "\n" -" <p>APIトークンは、PyPIに<strong>パッケージをアップロードする</" -"strong>際の認証方法として（ユーザ名とパスワードの代わりとなる）代替手段を提供" -"しています。</p>\n" -" <p>トークンは、PyPIアカウント全体に対して作成できます。この場合、" -"トークンはアカウントに紐づく全てのプロジェクトに対して機能します。別の方法と" -"して、特定のプロジェクトに対してトークンのスコープを制限することも可能です。" -"</p>\n" -" <p><strong>可能であれば、APIトークンを使って認証することを強くお勧" -"めします。</strong></p>\n" +" " +"<p>APIトークンは、PyPIに<strong>パッケージをアップロードする</strong>際の認証方法として（ユーザ名とパスワードの代わりとなる）代替手段を提供しています。</p>" +"\n" +" " +"<p>トークンは、PyPIアカウント全体に対して作成できます。この場合、トークンはアカウントに紐づく全てのプロジェクトに対して機能します。別の方法として、特定のプロジェクトに対してトークンのスコープを制限することも可能です。</p>" +"\n" +" <p><strong>可能であれば、APIトークンを使って認証することを強くお勧めします。</strong></p>\n" " " #: warehouse/templates/pages/help.html:441 @@ -4520,8 +4302,8 @@ msgid "" "In your <a href=\"%(href)s\">account settings</a>, go to the API tokens " "section and select \"Add API token\"" msgstr "" -"<a href=\"%(href)s\">アカウント設定</a>でAPIトークンの選択に進み「APIトークン" -"の追加（Add API token）」を選択する" +"<a href=\"%(href)s\">アカウント設定</a>でAPIトークンの選択に進み「APIトークンの追加（Add API " +"token）」を選択する" #: warehouse/templates/pages/help.html:448 msgid "To use an API token:" @@ -4533,34 +4315,33 @@ msgstr "ユーザ名に、<code>__token__</code>を設定する" #: warehouse/templates/pages/help.html:452 msgid "" -"Set your password to the token value, including the <code>pypi-</code> prefix" +"Set your password to the token value, including the <code>pypi-</code> " +"prefix" msgstr "パスワードに、<code>pypi-</code>接頭辞を含むトークン値を設定する" #: warehouse/templates/pages/help.html:456 #, python-format msgid "" -"Where you edit or add these values will depend on your individual use case. " -"For example, some users may need to edit <a href=\"%(pypirc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">their <code>.pypirc</code> " -"file</a>, while others may need to update their CI configuration file (e.g. " -"<a href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\"><code>.travis.yml</code> if you are using Travis</a>)." +"Where you edit or add these values will depend on your individual use " +"case. For example, some users may need to edit <a " +"href=\"%(pypirc_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">their <code>.pypirc</code> file</a>, while others may " +"need to update their CI configuration file (e.g. <a " +"href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>.travis.yml</code> if you are using Travis</a>)." msgstr "" -"これらの値を編集・追加する場所は、個々のユースケースによって異なります。例え" -"ば、一部のユーザは<a href=\"%(pypirc_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\"><code>.pypirc</code>ファイル</a>を編集する必要が" -"あるかもしれません。あるいは他のユーザは、CIの設定ファイル（例: <a href=" -"\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Travisを使っている場合は<code>.travis.yml</code></a>）を更新する必要がある" -"かもしれません。" +"これらの値を編集・追加する場所は、個々のユースケースによって異なります。例えば、一部のユーザは<a " +"href=\"%(pypirc_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>.pypirc</code>ファイル</a>を編集する必要があるかもしれません。あるいは他のユーザは、CIの設定ファイル（例:" +" <a href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Travisを使っている場合は<code>.travis.yml</code></a>）を更新する必要があるかもしれません。" #: warehouse/templates/pages/help.html:460 msgid "" -"Advanced users may wish to inspect their token by decoding it with base64, " -"and checking the output against the unique identifier displayed on PyPI." -msgstr "" -"上級ユーザは、base64でデコードし、その出力とPyPIに表示される一意の識別子を照" -"合することでトークンを検査できます。" +"Advanced users may wish to inspect their token by decoding it with " +"base64, and checking the output against the unique identifier displayed " +"on PyPI." +msgstr "上級ユーザは、base64でデコードし、その出力とPyPIに表示される一意の識別子を照合することでトークンを検査できます。" #: warehouse/templates/pages/help.html:468 msgid "Yes, including RSS feeds of new packages and new releases." @@ -4573,136 +4354,127 @@ msgstr "APIリファレンスを参照してください。" #: warehouse/templates/pages/help.html:471 #, python-format msgid "" -"If you need to run your own mirror of PyPI, the <a href=\"%(href)s" -"\">bandersnatch project</a> is the recommended solution. Note that the " -"storage requirements for a PyPI mirror would exceed 1 terabyte—and growing!" +"If you need to run your own mirror of PyPI, the <a " +"href=\"%(href)s\">bandersnatch project</a> is the recommended solution. " +"Note that the storage requirements for a PyPI mirror would exceed 1 " +"terabyte—and growing!" msgstr "" -"PyPIのミラーを独自に実行する必要がある場合、お勧めの解決方法は<a href=" -"\"%(href)s\">bandersnatchプロジェクト</a>です。PyPIのミラーに必要なストレージ" -"要件は1テラバイトを超え、さらに増大することに注意してください！" +"PyPIのミラーを独自に実行する必要がある場合、お勧めの解決方法は<a " +"href=\"%(href)s\">bandersnatchプロジェクト</a>です。PyPIのミラーに必要なストレージ要件は1テラバイトを超え、さらに増大することに注意してください！" #: warehouse/templates/pages/help.html:474 #, python-format msgid "" -"PyPI itself does not offer a way to get notified when a project uploads new " -"releases. However, there are several third-party services that offer " +"PyPI itself does not offer a way to get notified when a project uploads " +"new releases. However, there are several third-party services that offer " "comprehensive monitoring and notifications for project releases and " -"vulnerabilities listed as <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">GitHub apps</a>." +"vulnerabilities listed as <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">GitHub apps</a>." msgstr "" -"PyPI自体は、プロジェクトが新しいリリースをアップロードしたときに通知を受け取" -"る方法を提供していません。しかし<a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">GitHubアプリ</a>のように、プロジェクトのリ" -"リースや脆弱性を包括的に監視・通知するサードパーティのサービスがいくつかあり" -"ます。" +"PyPI自体は、プロジェクトが新しいリリースをアップロードしたときに通知を受け取る方法を提供していません。しかし<a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">GitHubアプリ</a>のように、プロジェクトのリリースや脆弱性を包括的に監視・通知するサードパーティのサービスがいくつかあります。" #: warehouse/templates/pages/help.html:477 #, python-format msgid "" -"You can <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">analyze PyPI download usage statistics via our public dataset " -"on Google BigQuery</a>." +"You can <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">analyze PyPI download usage statistics via our public " +"dataset on Google BigQuery</a>." msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPIのダウンロード利用の統計は、Google BigQuery上の公開データセットを使っ" -"て分析することができます</a>。" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPIのダウンロード利用の統計は、Google " +"BigQuery上の公開データセットを使って分析することができます</a>。" #: warehouse/templates/pages/help.html:479 #, python-format msgid "" -"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.io provides statistics for PyPI projects</a> (<a href=" -"\"%(libs_io_example_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">example</a>, <a href=\"%(libs_io_api_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">API</a>) including GitHub stars and " -"forks, dependency tracking (<a href=\"%(in_progress_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">in progress</a>), and <a " -"href=\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">other relevant factors</a>." -msgstr "" -"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.ioは、PyPIプロジェクトの統計を提供しています</a>（<a " -"href=\"%(libs_io_example_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">例</a>、<a href=\"%(libs_io_api_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">API</a>）。GitHubのスターやフォーク、依存" -"関係の追跡（<a href=\"%(in_progress_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">進行中</a>）、<a href=\"%(other_factors_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">その他の関連要因</a>な" -"どが含まれます。" +"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io provides statistics for PyPI projects</a> " +"(<a href=\"%(libs_io_example_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">example</a>, <a " +"href=\"%(libs_io_api_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">API</a>) including GitHub stars and forks, dependency " +"tracking (<a href=\"%(in_progress_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">in progress</a>), and <a " +"href=\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">other relevant factors</a>." +msgstr "" +"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.ioは、PyPIプロジェクトの統計を提供しています</a>（<a " +"href=\"%(libs_io_example_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">例</a>、<a href=\"%(libs_io_api_href)s\" " +"title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">API</a>）。GitHubのスターやフォーク、依存関係の追跡（<a " +"href=\"%(in_progress_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">進行中</a>）、<a href=\"%(other_factors_href)s\" " +"title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">その他の関連要因</a>などが含まれます。" #: warehouse/templates/pages/help.html:488 #, python-format msgid "" -"For recent statistics on uptime and performance, see <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status page</a>." +"For recent statistics on uptime and performance, see <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status " +"page</a>." msgstr "" -"アップタイムとパフォーマンスに関する最近の統計情報については、<a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">ステータ" -"スページ</a>を参照してください。" +"アップタイムとパフォーマンスに関する最近の統計情報については、<a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">ステータスページ</a>を参照してください。" #: warehouse/templates/pages/help.html:495 #, python-format msgid "" -"PyPI does not support publishing private packages. If you need to publish " -"your private package to a package index, the recommended solution is to run " -"your own deployment of the <a href=\"%(href)s\">devpi project</a>." +"PyPI does not support publishing private packages. If you need to publish" +" your private package to a package index, the recommended solution is to " +"run your own deployment of the <a href=\"%(href)s\">devpi project</a>." msgstr "" -"PYPIはプライベートパッケージの公開をサポートしていません。もしプライベート" -"パッケージをパッケージインデックスで公開する必要がある場合は、<a href=" -"\"%(href)s\">devpiプロジェクト</a>を独自にデプロイすることをお勧めします。" +"PYPIはプライベートパッケージの公開をサポートしていません。もしプライベートパッケージをパッケージインデックスで公開する必要がある場合は、<a " +"href=\"%(href)s\">devpiプロジェクト</a>を独自にデプロイすることをお勧めします。" #: warehouse/templates/pages/help.html:498 msgid "" "Your publishing tool may return an error that your new project can't be " -"created with your desired name, despite no evidence of a project or release " -"of the same name on PyPI. Currently, there are three primary reasons this " -"may occur:" -msgstr "" -"PyPI上に同名のプロジェクトやリリースの形跡がないにもかかわらず、希望する名前" -"で新しいプロジェクトを作成できないエラーを公開ツールが返すかもしれません。現" -"在、これが発生する主な原因は以下の3つです。" +"created with your desired name, despite no evidence of a project or " +"release of the same name on PyPI. Currently, there are three primary " +"reasons this may occur:" +msgstr "PyPI上に同名のプロジェクトやリリースの形跡がないにもかかわらず、希望する名前で新しいプロジェクトを作成できないエラーを公開ツールが返すかもしれません。現在、これが発生する主な原因は以下の3つです。" #: warehouse/templates/pages/help.html:500 #, python-format msgid "" -"The project name conflicts with a <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Standard Library</a> module from " -"any major version from 2.5 to present." +"The project name conflicts with a <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Standard " +"Library</a> module from any major version from 2.5 to present." msgstr "" -"プロジェクト名が、2.5から現在までのすべてのメジャーバージョンの<a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python標" -"準ライブラリ</a>モジュールと競合している。" +"プロジェクト名が、2.5から現在までのすべてのメジャーバージョンの<a href=\"%(href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Python標準ライブラリ</a>モジュールと競合している。" #: warehouse/templates/pages/help.html:501 #, python-format msgid "" -"The project name has been explicitly prohibited by the PyPI administrators. " -"For example, <code>%(incorrect_code)s</code> is a common typo for <code>" -"%(correct_code)s</code>, and should not surprise the user with a malicious " -"package." -msgstr "" -"プロジェクト名が、PyPIの管理者によって明示的に禁止されている。例えば、<code>" -"%(incorrect_code)s</code>は<code>%(correct_code)s</code>のよくあるタイポであ" -"り、悪意のあるパッケージによってユーザを驚かせてはいけない。" +"The project name has been explicitly prohibited by the PyPI " +"administrators. For example, <code>%(incorrect_code)s</code> is a common " +"typo for <code>%(correct_code)s</code>, and should not surprise the user " +"with a malicious package." +msgstr "プロジェクト名が、PyPIの管理者によって明示的に禁止されている。例えば、<code>%(incorrect_code)s</code>は<code>%(correct_code)s</code>のよくあるタイポであり、悪意のあるパッケージによってユーザを驚かせてはいけない。" #: warehouse/templates/pages/help.html:502 msgid "" -"The project name has been registered by another user, but no releases have " -"been created." -msgstr "" -"別のユーザによってプロジェクト名が登録済みだが、リリースが作成されていない。" +"The project name has been registered by another user, but no releases " +"have been created." +msgstr "別のユーザによってプロジェクト名が登録済みだが、リリースが作成されていない。" #: warehouse/templates/pages/help.html:506 #, python-format msgid "" -"Follow the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">\"How to request a name transfer\"</a> section of <abbr title=" -"\"Python enhancement proposal\">PEP</abbr> 541." +"Follow the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">\"How to request a name transfer\"</a> section of <abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 541." msgstr "" -"<abbr title=\"Python enhancement proposal\">PEP</abbr> 541の <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">「How to " -"request a name transfer（名前の移行をリクエストする方法）」</a> の項に従って" -"ください。" +"<abbr title=\"Python enhancement proposal\">PEP</abbr> 541の <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">「How to request a name transfer（名前の移行をリクエストする方法）」</a> " +"の項に従ってください。" #: warehouse/templates/pages/help.html:511 msgid "Owner:" @@ -4710,81 +4482,71 @@ msgstr "オーナー（Owner）:" #: warehouse/templates/pages/help.html:514 msgid "" -"Only the current owners of a project have the ability to add new owners or " -"maintainers. If you need to request ownership, you should contact the " -"current owner(s) of the project directly. Many project owners provide their " -"contact details in the 'Author' field of the 'Meta' details on the project " -"page." -msgstr "" -"プロジェクトの現在のオーナーだけが、新しいオーナーやメンテナを追加できます。" -"もし所有権をリクエストする必要がある場合、プロジェクトの現在のオーナーに直接" -"連絡してください。多くのプロジェクトのオーナーは、プロジェクトページの「メタ" -"データ」詳細にある「作者」欄に問い合わせ先を記載しています。" +"Only the current owners of a project have the ability to add new owners " +"or maintainers. If you need to request ownership, you should contact the " +"current owner(s) of the project directly. Many project owners provide " +"their contact details in the 'Author' field of the 'Meta' details on the " +"project page." +msgstr "プロジェクトの現在のオーナーだけが、新しいオーナーやメンテナを追加できます。もし所有権をリクエストする必要がある場合、プロジェクトの現在のオーナーに直接連絡してください。多くのプロジェクトのオーナーは、プロジェクトページの「メタデータ」詳細にある「作者」欄に問い合わせ先を記載しています。" #: warehouse/templates/pages/help.html:515 #, python-format -msgid "" -"If the owner is unresponsive, see <a href=\"%(href)s\">%(anchor_text)s</a>" -msgstr "" -"オーナーから応答がない場合は、こちらを参照してください。<a href=\"%(href)s\">" -"%(anchor_text)s</a>" +msgid "If the owner is unresponsive, see <a href=\"%(href)s\">%(anchor_text)s</a>" +msgstr "オーナーから応答がない場合は、こちらを参照してください。<a href=\"%(href)s\">%(anchor_text)s</a>" #: warehouse/templates/pages/help.html:518 #, python-format msgid "" -"By default, an upload's description will render with <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">reStructuredText</a>. " -"If the description is in an alternate format like Markdown, a package may " -"set the <code>long_description_content_type</code> in <code>setup.py</code> " -"to the alternate format." +"By default, an upload's description will render with <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">reStructuredText</a>. If the description is in an " +"alternate format like Markdown, a package may set the " +"<code>long_description_content_type</code> in <code>setup.py</code> to " +"the alternate format." msgstr "" -"デフォルトでは、アップロードの説明文は<a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">reStructuredText</a>でレンダリングされ" -"ます。もしMarkdownのような代替フォーマットで説明文を記述したい場合は、" -"<code>setup.py</code>内の<code>long_description_content_type</code>を使って代" -"替フォーマットを設定できます。" +"デフォルトでは、アップロードの説明文は<a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" " +"rel=\"noopener\">reStructuredText</a>でレンダリングされます。もしMarkdownのような代替フォーマットで説明文を記述したい場合は、<code>setup.py</code>内の<code>long_description_content_type</code>を使って代替フォーマットを設定できます。" #: warehouse/templates/pages/help.html:519 #, python-format msgid "" -"Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging User Guide</a> for details on the available " -"formats." +"Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a> for details on the " +"available formats." msgstr "" -"使用可能なフォーマットの詳細については、<a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " +"使用可能なフォーマットの詳細については、<a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User " "Guide</a>を参照してください。" #: warehouse/templates/pages/help.html:520 #, python-format msgid "" "PyPI will reject uploads if the description fails to render. To check a " -"description locally for validity, you may use <a href=\"%(href)s" -"\">readme_renderer</a>, which is the same description renderer used by PyPI." +"description locally for validity, you may use <a " +"href=\"%(href)s\">readme_renderer</a>, which is the same description " +"renderer used by PyPI." msgstr "" -"説明文のレンダリングに失敗した場合、PyPIはアップロードを拒否するでしょう。" -"ローカルで説明文の妥当性をチェックするには、<a href=\"%(href)s" -"\">readme_renderer</a>を使用できます。これは、PyPIで使われている説明文のレン" -"ダラと同じものです。" +"説明文のレンダリングに失敗した場合、PyPIはアップロードを拒否するでしょう。ローカルで説明文の妥当性をチェックするには、<a " +"href=\"%(href)s\">readme_renderer</a>を使用できます。これは、PyPIで使われている説明文のレンダラと同じものです。" #: warehouse/templates/pages/help.html:524 #, python-format msgid "" -"If you can't upload your project's release to PyPI because you're hitting " -"the upload file size limit, we can sometimes increase your limit. Make sure " -"you've uploaded at least one release for the project that's <em>under</em> " -"the limit (a <a href=\"%(dev_release_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">developmental release version number</a> is " -"fine). Then, <a href=\"%(file_issue_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">file an issue</a> and tell us:</p>" -msgstr "" -"アップロードファイルのサイズ制限が原因でプロジェクトのリリースをPyPIにアップ" -"ロードできない場合、上限を増やせることがあります。\n" -"そのプロジェクトにおいて、最低でも1つ以上サイズ制限 <em>未満</em>でリリースを" -"アップロードしたことがあることを確認してください（<a href=" -"\"%(dev_release_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">開発リリースのバージョン番号</a>で構いません）。次に、以下のことを私たちに" -"伝えて <a href=\"%(file_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"If you can't upload your project's release to PyPI because you're hitting" +" the upload file size limit, we can sometimes increase your limit. Make " +"sure you've uploaded at least one release for the project that's " +"<em>under</em> the limit (a <a href=\"%(dev_release_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">developmental " +"release version number</a> is fine). Then, <a " +"href=\"%(file_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">file an issue</a> and tell us:</p>" +msgstr "" +"アップロードファイルのサイズ制限が原因でプロジェクトのリリースをPyPIにアップロードできない場合、上限を増やせることがあります。\n" +"そのプロジェクトにおいて、最低でも1つ以上サイズ制限 <em>未満</em>でリリースをアップロードしたことがあることを確認してください（<a " +"href=\"%(dev_release_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">開発リリースのバージョン番号</a>で構いません）。次に、以下のことを私たちに伝えて <a " +"href=\"%(file_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " "rel=\"noopener\">問題を報告してください</a>。</p>" #: warehouse/templates/pages/help.html:532 @@ -4796,24 +4558,20 @@ msgid "The size of your release, in megabytes" msgstr "リリースのサイズ （MB単位）" #: warehouse/templates/pages/help.html:534 -msgid "" -"Which index/indexes you need the increase for (PyPI, Test PyPI, or both)" -msgstr "" -"どのインデックスを増やす必要があるのか（PyPI, Test PyPI, あるいはその両方）" +msgid "Which index/indexes you need the increase for (PyPI, Test PyPI, or both)" +msgstr "どのインデックスを増やす必要があるのか（PyPI, Test PyPI, あるいはその両方）" #: warehouse/templates/pages/help.html:535 msgid "" -"A brief description of your project, including the reason for the additional " -"size." +"A brief description of your project, including the reason for the " +"additional size." msgstr "プロジェクトの短い説明（追加サイズを必要とする理由を含む）。" #: warehouse/templates/pages/help.html:544 msgid "" -"If you've forgotten your PyPI password but you remember your email address " -"or username, follow these steps to reset your password:" -msgstr "" -"PyPIのパスワードを忘れたけれどメールアドレスまたはユーザ名を覚えている場合" -"は、以下のステップを踏んでパスワードをリセットしてください。" +"If you've forgotten your PyPI password but you remember your email " +"address or username, follow these steps to reset your password:" +msgstr "PyPIのパスワードを忘れたけれどメールアドレスまたはユーザ名を覚えている場合は、以下のステップを踏んでパスワードをリセットしてください。" #: warehouse/templates/pages/help.html:546 #, python-format @@ -4821,8 +4579,7 @@ msgid "Go to <a href=\"%(href)s\">reset your password</a>." msgstr "<a href=\"%(href)s\">パスワードのリセット</a>に進む。" #: warehouse/templates/pages/help.html:547 -msgid "" -"Enter the email address or username you used for PyPI and submit the form." +msgid "Enter the email address or username you used for PyPI and submit the form." msgstr "PyPIで使っているメールアドレスまたはユーザ名を入力して送信する。" #: warehouse/templates/pages/help.html:548 @@ -4833,42 +4590,43 @@ msgstr "パスワード リセット リンクが載ったメールを受け取 msgid "If you've lost access to your PyPI account due to:" msgstr "" +# | msgid "Emails associated with your account" #: warehouse/templates/pages/help.html:555 #, fuzzy -#| msgid "Emails associated with your account" msgid "Lost access to the email address associated with your account" msgstr "アカウントに関連づけられたメールアドレス" #: warehouse/templates/pages/help.html:556 msgid "" -"Lost two factor authentication <a href=\"#totp\">application</a>, <a href=" -"\"#utfkey\">device</a>, and <a href=\"#recoverycodes\">recovery codes</a>" +"Lost two factor authentication <a href=\"#totp\">application</a>, <a " +"href=\"#utfkey\">device</a>, and <a href=\"#recoverycodes\">recovery " +"codes</a>" msgstr "" +# | msgid "" +# | "If you no longer have access to the email address associated with your " +# | "account, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" +# | "\"noopener\">file an issue on our tracker</a>." #: warehouse/templates/pages/help.html:559 #, fuzzy, python-format -#| msgid "" -#| "If you no longer have access to the email address associated with your " -#| "account, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -#| "\"noopener\">file an issue on our tracker</a>." msgid "" -"You can proceed to, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">file an issue on our tracker</a> to request assistance " -"with account recovery." +"You can proceed to, <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">file an issue on our tracker</a> to " +"request assistance with account recovery." msgstr "" -"アカウントに関連づけられているメールアドレスにアクセスできなくなった場合は、" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">" -"トラッカーに問題を報告してください</a>。" +"アカウントに関連づけられているメールアドレスにアクセスできなくなった場合は、<a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">トラッカーに問題を報告してください</a>。" +# | msgid "Provide your username and password, as normal" #: warehouse/templates/pages/help.html:566 #, fuzzy -#| msgid "Provide your username and password, as normal" msgid "If you are using a username and password for uploads:" msgstr "通常どおり、ユーザ名とパスワードを入力する" +# | msgid "Provide your username and password, as normal" #: warehouse/templates/pages/help.html:568 #, fuzzy -#| msgid "Provide your username and password, as normal" msgid "Check to see if your username or password are incorrect." msgstr "通常どおり、ユーザ名とパスワードを入力する" @@ -4888,150 +4646,136 @@ msgstr "" #: warehouse/templates/pages/help.html:574 msgid "" -"Ensure that your API Token is <a href=\"#apitoken\">properly formatted</a> " -"and does not contain any trailing characters such as newlines." +"Ensure that your API Token is <a href=\"#apitoken\">properly " +"formatted</a> and does not contain any trailing characters such as " +"newlines." msgstr "" #: warehouse/templates/pages/help.html:579 #, python-format msgid "" -"Transport Layer Security, or TLS, is part of how we make sure connections " -"between your computer and PyPI are private and secure. It's a cryptographic " -"protocol that's had several versions over time. PyPI <a href=" -"\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">turned off support for TLS versions 1.0 and 1.1</a> in April " -"2018. <a href=\"%(reason_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Learn why on the PSF blog</a>." +"Transport Layer Security, or TLS, is part of how we make sure connections" +" between your computer and PyPI are private and secure. It's a " +"cryptographic protocol that's had several versions over time. PyPI <a " +"href=\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">turned off support for TLS versions 1.0 and 1.1</a> in " +"April 2018. <a href=\"%(reason_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Learn why on the PSF blog</a>." msgstr "" -"Transport Layer Security（TLS）は、あなたのコンピュータとPyPI間の接続をプライ" -"ベートで安全であることを確実にする方法のひとつです。これは、長い間いくつかの" -"バージョンがあった暗号化プロトコルです。PyPIは<a href=\"%(announcement_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">2018年4月にTLS 1.0" -"と1.1のサポートを停止</a>しました。<a href=\"%(reason_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">理由については、PSF blogを参" -"照してください</a>。" +"Transport Layer " +"Security（TLS）は、あなたのコンピュータとPyPI間の接続をプライベートで安全であることを確実にする方法のひとつです。これは、長い間いくつかのバージョンがあった暗号化プロトコルです。PyPIは<a" +" href=\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">2018年4月にTLS 1.0と1.1のサポートを停止</a>しました。<a " +"href=\"%(reason_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">理由については、PSF blogを参照してください</a>。" #: warehouse/templates/pages/help.html:586 #, python-format msgid "" -"If you are having trouble with <code>%(command)s</code> and get a <code>No " -"matching distribution found</code> or <code>Could not fetch URL</code> " -"error, try adding <code>-v</code> to the command to get more information:" +"If you are having trouble with <code>%(command)s</code> and get a " +"<code>No matching distribution found</code> or <code>Could not fetch " +"URL</code> error, try adding <code>-v</code> to the command to get more " +"information:" msgstr "" -"もし<code>%(command)s</code> でトラブルが発生し、<code>一致するディストリ" -"ビューションが見つかりません（No matching distribution found）</code>または" -"<code>URLを取得できませんでした（Could not fetch URL）</code> というエラーが" -"起きた場合は、コマンドに<code>-v</code>を追加して詳細情報を取得してください。" +"もし<code>%(command)s</code> でトラブルが発生し、<code>一致するディストリビューションが見つかりません（No " +"matching distribution found）</code>または<code>URLを取得できませんでした（Could not " +"fetch URL）</code> というエラーが起きた場合は、コマンドに<code>-v</code>を追加して詳細情報を取得してください。" #: warehouse/templates/pages/help.html:588 msgid "" "If you see an error like <code>There was a problem confirming the ssl " "certificate</code> or <code>tlsv1 alert protocol version</code> or " -"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, you need to be connecting to PyPI " -"with a newer TLS support library." +"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, you need to be connecting to " +"PyPI with a newer TLS support library." msgstr "" -"もし<code>SSL証明書の確認中に問題が発生しました（There was a problem " -"confirming the ssl certificate）</code>、<code>tlsv1 alert protocol version</" -"code>、<code>TLSV1_ALERT_PROTOCOL_VERSION</code>などのエラーが表示された場合" -"は、新しいTLSをサポートするライブラリを使ってPyPIに接続する必要があります。" +"もし<code>SSL証明書の確認中に問題が発生しました（There was a problem confirming the ssl " +"certificate）</code>、<code>tlsv1 alert protocol " +"version</code>、<code>TLSV1_ALERT_PROTOCOL_VERSION</code>などのエラーが表示された場合は、新しいTLSをサポートするライブラリを使ってPyPIに接続する必要があります。" #: warehouse/templates/pages/help.html:589 msgid "" "The specific steps you need to take will depend on your operating system " -"version, where your installation of Python originated (python.org, your OS " -"vendor, or an intermediate distributor), and the installed versions of " -"Python, <code>setuptools</code>, and <code>pip</code>." -msgstr "" -"実行する必要がある具体的な手順は、オペレーティング・システムのバージョン、" -"Pythonのインストール元（python.org、OSベンダ、あるいは中間のディストリビュー" -"タ）、そしてPython、<code>setuptools</code>、および<code>pip</code>のバージョ" -"ンによって異なります。" +"version, where your installation of Python originated (python.org, your " +"OS vendor, or an intermediate distributor), and the installed versions of" +" Python, <code>setuptools</code>, and <code>pip</code>." +msgstr "実行する必要がある具体的な手順は、オペレーティング・システムのバージョン、Pythonのインストール元（python.org、OSベンダ、あるいは中間のディストリビュータ）、そしてPython、<code>setuptools</code>、および<code>pip</code>のバージョンによって異なります。" #: warehouse/templates/pages/help.html:591 #, python-format msgid "" -"For help, go to <a href=\"%(irc_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">the <code>#pypa</code> IRC channel on Freenode</a>, file " -"an issue at <a href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">pypa/packaging-problems/issues</a>, or <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">post to the python-help mailing list</a>, including your OS and " -"installation details and the output of <code>%(command)s</code>." +"For help, go to <a href=\"%(irc_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">the <code>#pypa</code> IRC channel on " +"Freenode</a>, file an issue at <a href=\"%(issue_tracker_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">pypa/packaging-" +"problems/issues</a>, or <a href=\"%(mailing_list_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">post to the " +"python-help mailing list</a>, including your OS and installation details " +"and the output of <code>%(command)s</code>." msgstr "" -"助けが必要な場合は、<a href=\"%(irc_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">FreenodeのIRCチャンネル<code>#pypa</code></a>にア" -"クセスする、<a href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">pypa/packaging-problems/issues</a>でイシューを報" -"告する、あるいは<a href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">python-helpメーリングリストに投稿</a>してくださ" -"い。その際には、あなたのOSとインストールの詳細と<code>%(command)s</code>の出" -"力結果を含めてください。" +"助けが必要な場合は、<a href=\"%(irc_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">FreenodeのIRCチャンネル<code>#pypa</code></a>にアクセスする、<a " +"href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">pypa/packaging-problems/issues</a>でイシューを報告する、あるいは<a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">python-" +"helpメーリングリストに投稿</a>してください。その際には、あなたのOSとインストールの詳細と<code>%(command)s</code>の出力結果を含めてください。" #: warehouse/templates/pages/help.html:602 #, python-format msgid "" -"We take <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">accessibility</a> very seriously and want to make the website " -"easy to use for everyone." +"We take <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">accessibility</a> very seriously and want to make the " +"website easy to use for everyone." msgstr "" -"私たちは<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">アクセサビリティ</a>を非常に重視しており、誰もが使いやすいWebサ" -"イトを作りたいと思っています。" +"私たちは<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">アクセサビリティ</a>を非常に重視しており、誰もが使いやすいWebサイトを作りたいと思っています。" #: warehouse/templates/pages/help.html:607 #, python-format msgid "" -"If you are experiencing an accessibility problem, <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">report it to us on GitHub</" -"a>, so we can try to fix the problem, for you and others." +"If you are experiencing an accessibility problem, <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">report it to us on" +" GitHub</a>, so we can try to fix the problem, for you and others." msgstr "" -"もしアクセサビリティに関する問題に遭遇した場合は、<a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">GitHub上で報告してください。" -"</a> そうすれば私たちは、あなたや他の人たちのために問題の解決を試みることがで" -"きます。" +"もしアクセサビリティに関する問題に遭遇した場合は、<a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">GitHub上で報告してください。</a> " +"そうすれば私たちは、あなたや他の人たちのために問題の解決を試みることができます。" #: warehouse/templates/pages/help.html:615 #, python-format msgid "" "In a previous version of PyPI, it used to be possible for maintainers to " -"upload releases to PyPI using a form in the web browser. This feature was " -"deprecated with the new version of PyPI – we instead recommend that you <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">use " -"twine to upload your project to PyPI</a>." +"upload releases to PyPI using a form in the web browser. This feature was" +" deprecated with the new version of PyPI – we instead recommend that you " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">use twine to upload your project to PyPI</a>." msgstr "" -"この機能はPyPIの新しいバージョンによって廃止されました。私たちは代わりに、<a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">twineを使ってPyPIへプロジェクトをアップロードする</a>ことを推奨していま" -"す。" +"この機能はPyPIの新しいバージョンによって廃止されました。私たちは代わりに、<a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">twineを使ってPyPIへプロジェクトをアップロードする</a>ことを推奨しています。" #: warehouse/templates/pages/help.html:624 msgid "" -"Spammers return to PyPI with some regularity hoping to place their Search " -"Engine Optimized phishing, scam, and click-farming content on the site. " +"Spammers return to PyPI with some regularity hoping to place their Search" +" Engine Optimized phishing, scam, and click-farming content on the site. " "Since PyPI allows for indexing of the Long Description and other data " "related to projects and has a generally solid search reputation, it is a " "prime target." -msgstr "" -"スパマーは、検索エンジン最適化されたフィッシング、詐欺、Webサイト上のクリック" -"フォームをしにPyPIに戻ってきます。PyPIを使うとプロジェクトに関連する詳細およ" -"びその他のデータのインデックスを作成でき、検索に対する評判もおおむね堅実なの" -"で、格好の的です。" +msgstr "スパマーは、検索エンジン最適化されたフィッシング、詐欺、Webサイト上のクリックフォームをしにPyPIに戻ってきます。PyPIを使うとプロジェクトに関連する詳細およびその他のデータのインデックスを作成でき、検索に対する評判もおおむね堅実なので、格好の的です。" #: warehouse/templates/pages/help.html:626 #, python-format msgid "" "When the PyPI administrators are overwhelmed by spam <strong>or</strong> " -"determine that there is some other threat to PyPI, new user registration and/" -"or new project registration may be disabled. Check <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status page</a> " -"for more details, as we'll likely have updated it with reasoning for the " -"intervention." -msgstr "" -"PyPIの管理者がスパムに悩まされたり、<strong>あるいは</strong>PyPIに対する他の" -"脅威があると判断した場合、新規のユーザ登録および（または）新規プロジェクトの" -"登録は無効になるかもしれません。より詳細については <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">ステータスページ</a>を" -"チェックしてください。介入した理由で更新されていることがあります。" +"determine that there is some other threat to PyPI, new user registration " +"and/or new project registration may be disabled. Check <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">our status page</a> for more details, as we'll likely " +"have updated it with reasoning for the intervention." +msgstr "" +"PyPIの管理者がスパムに悩まされたり、<strong>あるいは</strong>PyPIに対する他の脅威があると判断した場合、新規のユーザ登録および（または）新規プロジェクトの登録は無効になるかもしれません。より詳細については" +" <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">ステータスページ</a>をチェックしてください。介入した理由で更新されていることがあります。" #: warehouse/templates/pages/help.html:635 msgid "PyPI will return these errors for one of these reasons:" @@ -5053,169 +4797,157 @@ msgstr "まったく同じ内容のファイルが存在する" msgid "" "PyPI does not allow for a filename to be reused, even once a project has " "been deleted and recreated." -msgstr "" -"PyPIでは、プロジェクトを一度削除して再作成した場合でも、ファイル名を再利用で" -"きません。" +msgstr "PyPIでは、プロジェクトを一度削除して再作成した場合でも、ファイル名を再利用できません。" #: warehouse/templates/pages/help.html:643 #, python-format msgid "" -"To avoid this situation, <a href=\"%(test_pypi_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">use Test PyPI to perform and check your " -"upload first</a>, before uploading to <a href=\"%(pypi_href)s\">pypi.org</a>." +"To avoid this situation, <a href=\"%(test_pypi_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">use Test PyPI to " +"perform and check your upload first</a>, before uploading to <a " +"href=\"%(pypi_href)s\">pypi.org</a>." msgstr "" -"このような状況を避けるために、<a href=\"%(pypi_href)s\">pypi.org</a>にアップ" -"ロードする前に、<a href=\"%(test_pypi_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">まずTest PyPIを使ってアップロードのチェックを行っ" -"てください</a>。" +"このような状況を避けるために、<a href=\"%(pypi_href)s\">pypi.org</a>にアップロードする前に、<a " +"href=\"%(test_pypi_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">まずTest PyPIを使ってアップロードのチェックを行ってください</a>。" +# | msgid "" +# | "If you would like to request a new trove classifier file a bug on our <a +# " +# | "href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" +# | "\">issue tracker</a>. Include the name of the requested classifier and a +# | "brief justification of why it is important." #: warehouse/templates/pages/help.html:650 #, fuzzy, python-format -#| msgid "" -#| "If you would like to request a new trove classifier file a bug on our <a " -#| "href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -#| "\">issue tracker</a>. Include the name of the requested classifier and a " -#| "brief justification of why it is important." -msgid "" -"If you would like to request a new trove classifier file a pull request on " -"the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><code>pypa/trove-classifiers</code> project</a>. Be sure to include a " -"brief justification of why it is important." -msgstr "" -"もし新しいTrove分類を要求する場合は、<a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">イシュートラッカー</a>で不具合を報告し" -"てください。要求する分類の名前と、それがなぜ重要なのか正当性を簡潔に含めてく" -"ださい。" +msgid "" +"If you would like to request a new trove classifier file a pull request " +"on the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>pypa/trove-classifiers</code> project</a>. Be sure" +" to include a brief justification of why it is important." +msgstr "" +"もし新しいTrove分類を要求する場合は、<a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" " +"rel=\"noopener\">イシュートラッカー</a>で不具合を報告してください。要求する分類の名前と、それがなぜ重要なのか正当性を簡潔に含めてください。" #: warehouse/templates/pages/help.html:658 #, python-format msgid "" "If you're experiencing an issue with PyPI itself, we welcome " -"<strong>constructive</strong> feedback and bug reports via our <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">issue " -"tracker</a>. Please note that this tracker is only for issues with the " -"software that runs PyPI. Before writing a new issue, first check that a " -"similar issue does not already exist." -msgstr "" -"PyPI自体に問題が発生している場合は、 <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\"> イシュートラッカー </a> を通じて " -"<strong> 建設的な </strong> フィードバックとバグレポートを送って頂くことを" -"歓迎します。このトラッカーで扱うのは、PyPIを実行するソフトウェアに関するイ" -"シューだけであることに注意してください。新しいイシューを書くときは、まず既に" -"似たようなイシューがないことを確認してください。" +"<strong>constructive</strong> feedback and bug reports via our <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">issue tracker</a>. Please note that this tracker is only" +" for issues with the software that runs PyPI. Before writing a new issue," +" first check that a similar issue does not already exist." +msgstr "" +"PyPI自体に問題が発生している場合は、 <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\"> イシュートラッカー </a> を通じて <strong> 建設的な " +"</strong> " +"フィードバックとバグレポートを送って頂くことを歓迎します。このトラッカーで扱うのは、PyPIを実行するソフトウェアに関するイシューだけであることに注意してください。新しいイシューを書くときは、まず既に似たようなイシューがないことを確認してください。" #: warehouse/templates/pages/help.html:665 msgid "" -"If you are having an issue is with a specific package installed from PyPI, " -"you should reach out to the maintainers of that project directly instead." -msgstr "" -"もしPyPIからインストールした特定のパッケージで問題がある場合は、あなたはプロ" -"ジェクトのメンテナに連絡するべきです。" +"If you are having an issue is with a specific package installed from " +"PyPI, you should reach out to the maintainers of that project directly " +"instead." +msgstr "もしPyPIからインストールした特定のパッケージで問題がある場合は、あなたはプロジェクトのメンテナに連絡するべきです。" #: warehouse/templates/pages/help.html:674 #, python-format msgid "" -"PyPI is powered by the Warehouse project; <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> is an open " -"source project developed under the umbrella of the Python Packaging " -"Authority (PyPA) and supported by the Python Packaging Working Group " -"(PackagingWG)." +"PyPI is powered by the Warehouse project; <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> is " +"an open source project developed under the umbrella of the Python " +"Packaging Authority (PyPA) and supported by the Python Packaging Working " +"Group (PackagingWG)." msgstr "" -"PyPIは、Warehouseプロジェクトによって機能しています。<a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a>とは、" -"Python Packaging Authority（PyPA）の傘下で開発されているオープンソースプロ" -"ジェクトであり、Packaging Working Group（PackagingWG）によってサポートされて" -"います。" +"PyPIは、Warehouseプロジェクトによって機能しています。<a href=\"%(href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Warehouse</a>とは、Python Packaging " +"Authority（PyPA）の傘下で開発されているオープンソースプロジェクトであり、Packaging Working " +"Group（PackagingWG）によってサポートされています。" #: warehouse/templates/pages/help.html:679 #, python-format msgid "" -"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPA</a> is an independent group of developers whose goal is to improve " -"and maintain many of the core projects related to Python packaging." +"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA</a> is an independent group of developers whose " +"goal is to improve and maintain many of the core projects related to " +"Python packaging." msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPA</a>とは、Pythonのパッケージングに関連する多くのコアプロジェクトの改" -"善・保守を目的とした、開発者たちの独立したグループです。" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA</a>とは、Pythonのパッケージングに関連する多くのコアプロジェクトの改善・保守を目的とした、開発者たちの独立したグループです。" #: warehouse/templates/pages/help.html:684 #, python-format msgid "" -"The <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">PackagingWG</a> is a working group of the Python Software " -"Foundation (PSF) whose goal is to raise and disburse funds to support the " -"ongoing improvement of Python packaging. Most recently it <a href=" -"\"%(otf_award_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">secured an award from the Open Technology Fund</a> whose funding is " -"enabling developers to improve Warehouse's security and accessibility." +"The <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">PackagingWG</a> is a working group of " +"the Python Software Foundation (PSF) whose goal is to raise and disburse " +"funds to support the ongoing improvement of Python packaging. Most " +"recently it <a href=\"%(otf_award_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">secured an award from the Open " +"Technology Fund</a> whose funding is enabling developers to improve " +"Warehouse's security and accessibility." msgstr "" -"<a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">PackagingWG</a>とは、Python Software Foundation（PSF）のワーキン" -"ググループであり、Pythonのパッケージングの継続的な改善を支援するための資金の" -"調達・支払いを目的としています。最近では、開発者がWarehouseのセキュリティとア" -"クセサビリティを向上するための<a href=\"%(otf_award_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">資金をOpen Technology Fundか" -"ら獲得</a>しました。" +"<a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PackagingWG</a>とは、Python Software " +"Foundation（PSF）のワーキンググループであり、Pythonのパッケージングの継続的な改善を支援するための資金の調達・支払いを目的としています。最近では、開発者がWarehouseのセキュリティとアクセサビリティを向上するための<a" +" href=\"%(otf_award_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">資金をOpen Technology Fundから獲得</a>しました。" #: warehouse/templates/pages/help.html:694 #, python-format msgid "" -"PyPI is powered by <a href=\"%(warehouse_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Warehouse</a> and by a variety of tools and " -"services provided by our <a href=\"%(sponsors_href)s\">generous sponsors</a>." +"PyPI is powered by <a href=\"%(warehouse_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Warehouse</a> and by a variety of " +"tools and services provided by our <a href=\"%(sponsors_href)s\">generous" +" sponsors</a>." msgstr "" -"PyPIは<a href=\"%(warehouse_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Warehouse</a>と、<a href=\"%(sponsors_href)s\">寛大なスポン" -"サーたち</a>が提供する様々なツールとサービスによって支えられています。" +"PyPIは<a href=\"%(warehouse_href)s\" title=\"%(title)s\" target=\"_blank\"" +" rel=\"noopener\">Warehouse</a>と、<a " +"href=\"%(sponsors_href)s\">寛大なスポンサーたち</a>が提供する様々なツールとサービスによって支えられています。" #: warehouse/templates/pages/help.html:701 msgid "" -"As of April 16, 2018, PyPI.org is at \"production\" status, meaning that it " -"has moved out of beta and replaced the old site (pypi.python.org). It is now " -"robust, tested, and ready for expected browser and API traffic." -msgstr "" -"2018年4月16日現在、PyPI.orgは\"production\"の状態にあります。これは、ベータ版" -"を脱して旧サイト（pypi.python.org)）から置き換わったことを意味します。今は堅" -"牢で、テストされており、ブラウザやAPIのトラフィックに対応しています。" +"As of April 16, 2018, PyPI.org is at \"production\" status, meaning that " +"it has moved out of beta and replaced the old site (pypi.python.org). It " +"is now robust, tested, and ready for expected browser and API traffic." +msgstr "2018年4月16日現在、PyPI.orgは\"production\"の状態にあります。これは、ベータ版を脱して旧サイト（pypi.python.org)）から置き換わったことを意味します。今は堅牢で、テストされており、ブラウザやAPIのトラフィックに対応しています。" #: warehouse/templates/pages/help.html:703 #, python-format msgid "" -"PyPI is heavily cached and distributed via <abbr title=\"content delivery " -"network\">CDN</abbr> thanks to our sponsor <a href=\"%(fastly_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Fastly</a> and thus is " -"generally available globally. However, the site is mostly maintained by " -"volunteers, we do not provide any specific Service Level Agreement, and as " -"could be expected for a giant distributed system, things can and sometimes " -"do go wrong. See <a href=\"%(status_page_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">our status page</a> for current and past outages " -"and incidents. If you have high availability requirements for your package " -"index, consider either a <a href=\"%(mirror_href)s\">mirror</a> or a <a href=" -"\"%(private_index_href)s\">private index</a>." -msgstr "" -"スポンサーである<a href=\"%(fastly_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Fastly</a>のおかげで、PyPIは<abbr title=" -"\"content delivery network\">CDN</abbr>経由で大量にキャッシュされて配布されて" -"います。そのため、一般的にグローバルに利用できます。しかしながら、このサイト" -"はほとんどボランティアによって維持されており、私たちは特定のサービス水準合意" -"（Service Level Agreement）は提供しません。巨大な分散システムで予想されるよう" -"に、時には物事がうまくいかないこともあります。現在および過去におけるシステム" -"停止とインシデントについては、 <a href=\"%(status_page_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">ステータスページ</a>を参照し" -"てください。もしパッケージインデックスに対して高可用性を求める場合は、<a " -"href=\"%(mirror_href)s\">ミラー</a>や<a href=\"%(private_index_href)s\">プラ" -"イベートのインデックス</a>を使うことを検討してください。" +"PyPI is heavily cached and distributed via <abbr title=\"content delivery" +" network\">CDN</abbr> thanks to our sponsor <a href=\"%(fastly_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Fastly</a> and " +"thus is generally available globally. However, the site is mostly " +"maintained by volunteers, we do not provide any specific Service Level " +"Agreement, and as could be expected for a giant distributed system, " +"things can and sometimes do go wrong. See <a " +"href=\"%(status_page_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">our status page</a> for current and past outages and " +"incidents. If you have high availability requirements for your package " +"index, consider either a <a href=\"%(mirror_href)s\">mirror</a> or a <a " +"href=\"%(private_index_href)s\">private index</a>." +msgstr "" +"スポンサーである<a href=\"%(fastly_href)s\" title=\"%(title)s\" target=\"_blank\"" +" rel=\"noopener\">Fastly</a>のおかげで、PyPIは<abbr title=\"content delivery " +"network\">CDN</abbr>経由で大量にキャッシュされて配布されています。そのため、一般的にグローバルに利用できます。しかしながら、このサイトはほとんどボランティアによって維持されており、私たちは特定のサービス水準合意（Service" +" Level " +"Agreement）は提供しません。巨大な分散システムで予想されるように、時には物事がうまくいかないこともあります。現在および過去におけるシステム停止とインシデントについては、" +" <a href=\"%(status_page_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">ステータスページ</a>を参照してください。もしパッケージインデックスに対して高可用性を求める場合は、<a " +"href=\"%(mirror_href)s\">ミラー</a>や<a " +"href=\"%(private_index_href)s\">プライベートのインデックス</a>を使うことを検討してください。" #: warehouse/templates/pages/help.html:717 #, python-format msgid "" -"We have a huge amount of work to do to continue to maintain and improve PyPI " -"(also known as <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">the Warehouse project</a>)." +"We have a huge amount of work to do to continue to maintain and improve " +"PyPI (also known as <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">the Warehouse project</a>)." msgstr "" -"私たちは（<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Warehouseプロジェクト</a>としても知られるように）PyPIの維持・改" -"善を続けるために必要な仕事を、大量に抱えています。" +"私たちは（<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Warehouseプロジェクト</a>としても知られるように）PyPIの維持・改善を続けるために必要な仕事を、大量に抱えています。" #: warehouse/templates/pages/help.html:722 msgid "Financial:" @@ -5226,9 +4958,7 @@ msgstr "資金:" msgid "" "We would deeply appreciate <a href=\"%(href)s\">your donations to fund " "development and maintenance</a>." -msgstr "" -"<a href=\"%(href)s\">開発とメンテナンスに必要な資金を寄付</a>していただける" -"と、大変ありがたいです。" +msgstr "<a href=\"%(href)s\">開発とメンテナンスに必要な資金を寄付</a>していただけると、大変ありがたいです。" #: warehouse/templates/pages/help.html:723 msgid "Development:" @@ -5236,50 +4966,46 @@ msgstr "開発:" #: warehouse/templates/pages/help.html:723 msgid "" -"Warehouse is open source, and we would love to see some new faces working on " -"the project. You <strong>do not</strong> need to be an experienced open-" -"source developer to make a contribution – in fact, we'd love to help you " -"make your first open source pull request!" +"Warehouse is open source, and we would love to see some new faces working" +" on the project. You <strong>do not</strong> need to be an experienced " +"open-source developer to make a contribution – in fact, we'd love to help" +" you make your first open source pull request!" msgstr "" -"貢献するにあたって、あなたが経験豊富なオープンソース開発者である必要は" -"<strong>ありません</strong>。実際私たちは、あなたがオープンソースに初めて" -"pull requestを送ることに手を貸したいと思っています！" +"貢献するにあたって、あなたが経験豊富なオープンソース開発者である必要は<strong>ありません</strong>。実際私たちは、あなたがオープンソースに初めてpull" +" requestを送ることに手を貸したいと思っています！" #: warehouse/templates/pages/help.html:725 #, python-format msgid "" "If you have skills in Python, ElasticSearch, HTML, SCSS, JavaScript, or " -"SQLAlchemy then skim our <a href=\"%(getting_started_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">\"Getting started\" guide</" -"a>, then take a look at the <a href=\"%(issue_tracker_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">issue tracker</a>. We've " -"created a <a href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">'Good first issue'</a> label – we recommend you " -"start here." -msgstr "" -"もしあなたがPython、ElasticSearch、HTML、SCSS、JavaScript、またはSQLAlchemyの" -"スキルを持っている場合、<a href=\"%(getting_started_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">\"Getting started\"ガイド</" -"a>に目を通し、 <a href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">イシュートラッカー</a>を見てください。私たちは<a " -"href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">'Good first issue'</a>ラベルを作っており、ここから始めることを推" -"奨しています。" +"SQLAlchemy then skim our <a href=\"%(getting_started_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">\"Getting " +"started\" guide</a>, then take a look at the <a " +"href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">issue tracker</a>. We've created a <a " +"href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">'Good first issue'</a> label – we recommend you start " +"here." +msgstr "" +"もしあなたがPython、ElasticSearch、HTML、SCSS、JavaScript、またはSQLAlchemyのスキルを持っている場合、<a" +" href=\"%(getting_started_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">\"Getting started\"ガイド</a>に目を通し、 <a " +"href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">イシュートラッカー</a>を見てください。私たちは<a " +"href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">'Good first issue'</a>ラベルを作っており、ここから始めることを推奨しています。" #: warehouse/templates/pages/help.html:733 #, python-format msgid "" -"Issues are grouped into <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">milestones</a>; working on issues in the current " -"milestone is a great way to help push the project forward. If you're " -"interested in working on a particular issue, leave a comment and we can " -"guide you through the contribution process." +"Issues are grouped into <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">milestones</a>; working on issues in " +"the current milestone is a great way to help push the project forward. If" +" you're interested in working on a particular issue, leave a comment and " +"we can guide you through the contribution process." msgstr "" -"イシューは、<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">マイルストン</a>ごとにグルーピングされています。現在のマイルスト" -"ン上のイシューに取り組むことは、プロジェクトを前進させる素晴らしい方法です。" -"もしあなたが特定のイシューに取り組むことに関心がある場合、コメントを残してい" -"ただけると、私たちは貢献のプロセスを案内できます。" +"イシューは、<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">マイルストン</a>ごとにグルーピングされています。現在のマイルストン上のイシューに取り組むことは、プロジェクトを前進させる素晴らしい方法です。もしあなたが特定のイシューに取り組むことに関心がある場合、コメントを残していただけると、私たちは貢献のプロセスを案内できます。" #: warehouse/templates/pages/help.html:740 msgid "Stay updated:" @@ -5288,68 +5014,68 @@ msgstr "最新情報:" #: warehouse/templates/pages/help.html:741 #, python-format msgid "" -"You can also follow the ongoing development of the project on the <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">distutils-sig mailing list</a> and the <a href=" -"\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">PyPA Dev message group</a>." +"You can also follow the ongoing development of the project on the <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">distutils-sig mailing list</a> and the <a " +"href=\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA Dev message group</a>." msgstr "" -"<a href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">distutil-sigメーリングリスト</a>と <a href=" -"\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">PyPA Devメッセージグループ</a>上で、プロジェクトの進行中の開発を" -"フォローすることもできます。" +"<a href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">distutil-sigメーリングリスト</a>と <a " +"href=\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA Devメッセージグループ</a>上で、プロジェクトの進行中の開発をフォローすることもできます。" #: warehouse/templates/pages/help.html:751 #, python-format msgid "" -"Changes to PyPI are generally announced on both the <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">pypi-announce mailing list</a> and the <a href=\"%(blog_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PSF blog</a> under " -"the label \"pypi\". The PSF blog also has <a href=\"%(atom_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Atom</a> and <a href=" -"\"%(rss_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</" -"a> feeds for the \"pypi\" label." -msgstr "" -"PyPIに対する変更は通常、<a href=\"%(mailing_list_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">pypi-announceメーリングリスト</a>や" -"\"pypi\"ラベルがついた<a href=\"%(blog_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">PSF blog</a>の両方でアナウンスされます。PSF blog" -"には、\"pypi\"ラベル用の <a href=\"%(atom_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Atom</a>フィードと <a href=\"%(rss_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</a>フィードの両" -"方があります。" +"Changes to PyPI are generally announced on both the <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">pypi-announce mailing list</a> and the <a " +"href=\"%(blog_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PSF blog</a> under the label \"pypi\". The PSF blog also" +" has <a href=\"%(atom_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Atom</a> and <a href=\"%(rss_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</a> feeds for " +"the \"pypi\" label." +msgstr "" +"PyPIに対する変更は通常、<a href=\"%(mailing_list_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">pypi-" +"announceメーリングリスト</a>や\"pypi\"ラベルがついた<a href=\"%(blog_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PSF " +"blog</a>の両方でアナウンスされます。PSF blogには、\"pypi\"ラベル用の <a href=\"%(atom_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Atom</a>フィードと <a " +"href=\"%(rss_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">RSS</a>フィードの両方があります。" #: warehouse/templates/pages/help.html:761 msgid "" -"When Warehouse's maintainers are deploying new features, at first we mark " -"them with a small \"beta feature\" symbol to tell you: this should probably " -"work fine, but it's new and less tested than other site functionality." +"When Warehouse's maintainers are deploying new features, at first we mark" +" them with a small \"beta feature\" symbol to tell you: this should " +"probably work fine, but it's new and less tested than other site " +"functionality." msgstr "" -"Warehouseのメンテナが新しい機能を開発するとき、最初に小さな\"ベータ機能" -"（beta feature）\"記号をつけて、次のことを伝えます: これは正常に動作するはず" -"ですが、新しい機能であり、他のサイトの機能よりもテストが不十分です。" +"Warehouseのメンテナが新しい機能を開発するとき、最初に小さな\"ベータ機能（beta " +"feature）\"記号をつけて、次のことを伝えます: " +"これは正常に動作するはずですが、新しい機能であり、他のサイトの機能よりもテストが不十分です。" +# | msgid "Currently, the following features are in beta:" #: warehouse/templates/pages/help.html:762 #, fuzzy -#| msgid "Currently, the following features are in beta:" msgid "Currently, no features are in beta." msgstr "現在、以下の機能がベータ版です。" #: warehouse/templates/pages/help.html:766 #, python-format msgid "" -"\"PyPI\" should be pronounced like \"pie pea eye\", specifically with the " -"\"PI\" pronounced as individual letters, rather as a single sound. This " -"minimizes confusion with the <a href=\"%(href)s\" title=\"%(title)s\">PyPy</" -"a> project, which is a popular alternative implementation of the Python " -"language." +"\"PyPI\" should be pronounced like \"pie pea eye\", specifically with the" +" \"PI\" pronounced as individual letters, rather as a single sound. This " +"minimizes confusion with the <a href=\"%(href)s\" " +"title=\"%(title)s\">PyPy</a> project, which is a popular alternative " +"implementation of the Python language." msgstr "" -"「PyPI」は「パイ・ピー・アイ（pie pea eye）」のように発音します。特に「PI」は" -"単一の音ではなく、個々の文字として発音します。これは、Python言語による一般的" -"な代替実装である<a href=\"%(href)s\" title=\"%(title)s\">PyPy</a>プロジェクト" -"との混乱を最小限にします。" +"「PyPI」は「パイ・ピー・アイ（pie pea " +"eye）」のように発音します。特に「PI」は単一の音ではなく、個々の文字として発音します。これは、Python言語による一般的な代替実装である<a" +" href=\"%(href)s\" title=\"%(title)s\">PyPy</a>プロジェクトとの混乱を最小限にします。" #: warehouse/templates/pages/help.html:778 msgid "Resources" @@ -5386,22 +5112,22 @@ msgstr "問い合わせ先" #: warehouse/templates/pages/help.html:789 #, python-format msgid "" -"The <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging Authority (PyPA)</a> is a working group who " -"work together to improve Python packaging. If you'd like to get in touch " -"with a core packaging developer, use <a href=\"%(irc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">#pypa on IRC (freenode)</" -"a>, or <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">join the distutils-sig mailing list</a>." +"The <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging Authority (PyPA)</a> is a working group" +" who work together to improve Python packaging. If you'd like to get in " +"touch with a core packaging developer, use <a href=\"%(irc_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">#pypa on IRC " +"(freenode)</a>, or <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">join the distutils-sig mailing " +"list</a>." msgstr "" -"<a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging Authority（PyPA）</a>は、Pythonのパッケージング" -"の改善に一緒に取り組んでいくためのワーキンググループです。もしあなたがコア" -"パッケージ開発者と連絡を取りたい場合は、<a href=\"%(irc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">IRC（freenode）上の#pypa</a>" -"を使うか、<a href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">distutils-sigメーリングリストに参加</a>してくださ" -"い。" +"<a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging " +"Authority（PyPA）</a>は、Pythonのパッケージングの改善に一緒に取り組んでいくためのワーキンググループです。もしあなたがコアパッケージ開発者と連絡を取りたい場合は、<a" +" href=\"%(irc_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">IRC（freenode）上の#pypa</a>を使うか、<a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">distutils-sigメーリングリストに参加</a>してください。" #: warehouse/templates/pages/security.html:15 msgid "Security" @@ -5413,11 +5139,9 @@ msgstr "セキュリティ問題の報告" #: warehouse/templates/pages/security.html:22 msgid "" -"We take security very seriously and ask that you follow our security policy " -"carefully." -msgstr "" -"私たちはセキュリティを非常に真剣に考えています。セキュリティポリシーを厳守す" -"るようお願いいたします。" +"We take security very seriously and ask that you follow our security " +"policy carefully." +msgstr "私たちはセキュリティを非常に真剣に考えています。セキュリティポリシーを厳守するようお願いいたします。" #: warehouse/templates/pages/security.html:24 msgid "Important!" @@ -5425,13 +5149,10 @@ msgstr "重要！" #: warehouse/templates/pages/security.html:24 msgid "" -"If you believe you've identified a security issue with Warehouse, <strong>DO " -"NOT</strong> report the issue in any public forum, including (but not " -"limited to):" -msgstr "" -"Warehouseでセキュリティの問題が確認されたと思われる場合は、以下のような（ただ" -"し、以下のものに限らず）公開フォーラムなどでイシューを報告<strong>しないでく" -"ださい</strong>:" +"If you believe you've identified a security issue with Warehouse, " +"<strong>DO NOT</strong> report the issue in any public forum, including " +"(but not limited to):" +msgstr "Warehouseでセキュリティの問題が確認されたと思われる場合は、以下のような（ただし、以下のものに限らず）公開フォーラムなどでイシューを報告<strong>しないでください</strong>:" #: warehouse/templates/pages/security.html:27 msgid "Our GitHub issue tracker" @@ -5448,22 +5169,22 @@ msgstr "公式または非公式のメーリングリスト" #: warehouse/templates/pages/security.html:35 #, python-format msgid "" -"Instead, email <a href=\"%(href)s\">security at python dot org</a> directly, " -"providing as much relevant information as possible." +"Instead, email <a href=\"%(href)s\">security at python dot org</a> " +"directly, providing as much relevant information as possible." msgstr "" -"その代わり、<a href=\"%(href)s\">Python dot orgのセキュリティ</a>に直接メール" -"をして、可能な限り多くの関連情報を提供してください。" +"その代わり、<a href=\"%(href)s\">Python dot " +"orgのセキュリティ</a>に直接メールをして、可能な限り多くの関連情報を提供してください。" #: warehouse/templates/pages/security.html:36 #, python-format msgid "" "Messages may be optionally encrypted with GPG using key fingerprints " -"available <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">at the Python Security page</a>." +"available <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">at the Python Security page</a>." msgstr "" -"メッセージは、<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Securityページ</a>にある鍵のフィンガープリントを使ってGPG" -"で暗号化することができます。" +"メッセージは、<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python " +"Securityページ</a>にある鍵のフィンガープリントを使ってGPGで暗号化することができます。" #: warehouse/templates/pages/security.html:38 msgid "What happens next?" @@ -5479,9 +5200,7 @@ msgstr "一度メール経由で問題を提出したら、48時間以内に通 msgid "" "Depending on the action to be taken, you may receive further follow-up " "emails." -msgstr "" -"実行するアクションに応じて、フォローアップのメールが追加で送られることがあり" -"ます。" +msgstr "実行するアクションに応じて、フォローアップのメールが追加で送られることがあります。" #: warehouse/templates/pages/security.html:44 msgid "This security policy was last updated on March 14, 2018." @@ -5520,9 +5239,9 @@ msgstr "セキュリティポリシー" msgid "Sponsor the Packaging Working Group" msgstr "" +# | msgid "Search and filter projects" #: warehouse/templates/pages/sponsor.html:23 #, fuzzy -#| msgid "Search and filter projects" msgid "Sponsor PyPI and related projects" msgstr "プロジェクトの検索とフィルタ" @@ -5530,22 +5249,22 @@ msgstr "プロジェクトの検索とフィルタ" msgid "Donate to the Packaging Working Group" msgstr "" +# | msgid "" +# | "The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" +# | "\"noopener\">PyPA</a> is an independent group of developers whose goal is +# " +# | "to improve and maintain many of the core projects related to Python " +# | "packaging." #: warehouse/templates/pages/sponsor.html:27 #, fuzzy, python-format -#| msgid "" -#| "The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -#| "\"noopener\">PyPA</a> is an independent group of developers whose goal is " -#| "to improve and maintain many of the core projects related to Python " -#| "packaging." msgid "" -"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Packaging Working Group</a> is a work group of the Python Software " -"Foundation which raises and distributes funds to improve Python's packaging " -"ecosystem." +"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Packaging Working Group</a> is a work group of the " +"Python Software Foundation which raises and distributes funds to improve " +"Python's packaging ecosystem." msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPA</a>とは、Pythonのパッケージングに関連する多くのコアプロジェクトの改" -"善・保守を目的とした、開発者たちの独立したグループです。" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA</a>とは、Pythonのパッケージングに関連する多くのコアプロジェクトの改善・保守を目的とした、開発者たちの独立したグループです。" #: warehouse/templates/pages/sponsor.html:29 msgid "Recent projects funded through the working group include:" @@ -5557,87 +5276,93 @@ msgid "" "'Warehouse' codebase" msgstr "" +# | msgid "" +# | "Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" +# | "\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" +# title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/sponsor.html:33 #, fuzzy, python-format -#| msgid "" -#| "Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -#| "\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$170,000 in funding</a> from the <a href=\"%(funder_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Mozilla Open Source " -"Support Program</a> in 2018" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$170,000 in funding</a> from the <a " +"href=\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Mozilla Open Source Support Program</a> in 2018" msgstr "" -"<a href=\"%(android_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Android</a> または <a href=\"%(ios_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">iOS</a> 対応の Duo Mobile" +"<a href=\"%(android_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Android</a> または <a href=\"%(ios_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a> 対応の Duo " +"Mobile" #: warehouse/templates/pages/sponsor.html:36 msgid "" -"Improving PyPI's security and accessibility, and adding support for multiple " -"locales" +"Improving PyPI's security and accessibility, and adding support for " +"multiple locales" msgstr "" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:37 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" -"With $80,000 in funding from the <a href=\"%(funder_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology Fund</a> in " -"2019" +"With $80,000 in funding from the <a href=\"%(funder_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology " +"Fund</a> in 2019" msgstr "" "ファイルアップロード方法を学ぶには<a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> を参照して" -"ください" +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> " +"を参照してください" #: warehouse/templates/pages/sponsor.html:40 msgid "Additional security-focused features for PyPI" msgstr "" +# | msgid "" +# | "Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" +# | "\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" +# title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/sponsor.html:41 #, fuzzy, python-format -#| msgid "" -#| "Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -#| "\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$100,000 in funding</a> from <a href=\"%(funder_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Facebook Research</a> in " -"2019 and 2020" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$100,000 in funding</a> from <a href=\"%(funder_href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Facebook " +"Research</a> in 2019 and 2020" msgstr "" -"<a href=\"%(android_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Android</a> または <a href=\"%(ios_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">iOS</a> 対応の Duo Mobile" +"<a href=\"%(android_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Android</a> または <a href=\"%(ios_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a> 対応の Duo " +"Mobile" #: warehouse/templates/pages/sponsor.html:44 msgid "Overhauling pip's user experience and dependency resolver" msgstr "" +# | msgid "" +# | "Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" " +# | "target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s" +# | "\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</" +# | "a> and <a href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" +# " +# | "rel=\"noopener\">Thetis</a>." #: warehouse/templates/pages/sponsor.html:45 #, fuzzy, python-format -#| msgid "" -#| "Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s" -#| "\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</" -#| "a> and <a href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Thetis</a>." -msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$407,000 in funding</a> from the <a href=\"%(funder0_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Chan Zuckerberg " -"Initiative</a> and the <a href=\"%(funder1_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Mozilla Open Source Support Program</a> " -"in 2020" +msgid "" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$407,000 in funding</a> from the <a " +"href=\"%(funder0_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Chan Zuckerberg Initiative</a> and the <a " +"href=\"%(funder1_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Mozilla Open Source Support Program</a> in 2020" msgstr "" "よく使われるキーには、<a href=\"%(yubikey_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Yubikey</a>、 <a href=\"%(titan_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</a>、 <a " -"href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Thetis</a>がある。" +"target=\"_blank\" rel=\"noopener\">Yubikey</a>、 <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a>、 <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>がある。" #: warehouse/templates/pages/sponsor.html:49 msgid "" @@ -5645,9 +5370,9 @@ msgid "" "improvements, benefiting millions of Python users around the world." msgstr "" +# | msgid "Common questions" #: warehouse/templates/pages/sponsor.html:57 #, fuzzy -#| msgid "Common questions" msgid "Community donations" msgstr "よくある質問" @@ -5655,34 +5380,35 @@ msgstr "よくある質問" msgid "We greatly appreciate both one-time and recurring donations." msgstr "" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:61 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" -"For US taxpayers, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">your donation may be tax-deductible</a>." +"For US taxpayers, <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">your donation may be tax-" +"deductible</a>." msgstr "" "ファイルアップロード方法を学ぶには<a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> を参照して" -"ください" +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> " +"を参照してください" #: warehouse/templates/pages/sponsor.html:62 msgid "Every donation counts!" msgstr "" +# | msgid "Donate" #: warehouse/templates/pages/sponsor.html:65 #, fuzzy -#| msgid "Donate" msgid "Donate here" msgstr "寄付" +# | msgid "Go to <a href=\"%(href)s\">reset your password</a>." #: warehouse/templates/pages/sponsor.html:66 #, fuzzy, python-format -#| msgid "Go to <a href=\"%(href)s\">reset your password</a>." -msgid "" -"Donating over $5,000? <a href=\"%(href)s\">Become a sponsor</a> instead." +msgid "Donating over $5,000? <a href=\"%(href)s\">Become a sponsor</a> instead." msgstr "<a href=\"%(href)s\">パスワードのリセット</a>に進む。" #: warehouse/templates/pages/sponsor.html:77 @@ -5691,8 +5417,8 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:78 msgid "" -"Looking for brand visibility? In the last year*, 21.1 million people from " -"237 countries visited PyPI.org." +"Looking for brand visibility? In the last year*, 21.1 million people from" +" 237 countries visited PyPI.org." msgstr "" #: warehouse/templates/pages/sponsor.html:79 @@ -5705,8 +5431,8 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:83 msgid "" -"Funds raised by the packaging working group go directly towards improving " -"the tools your company uses every day." +"Funds raised by the packaging working group go directly towards improving" +" the tools your company uses every day." msgstr "" #: warehouse/templates/pages/sponsor.html:86 @@ -5715,13 +5441,13 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:87 msgid "" -"Enhance your company's reputation by investing in Python and the open source " -"community." +"Enhance your company's reputation by investing in Python and the open " +"source community." msgstr "" +# | msgid "Uploading packages" #: warehouse/templates/pages/sponsor.html:96 #, fuzzy -#| msgid "Uploading packages" msgid "Sponsorship packages" msgstr "パッケージのアップロード" @@ -5743,20 +5469,21 @@ msgid "" "perpetuity</strong>" msgstr "" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:112 #: warehouse/templates/pages/sponsor.html:133 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" -"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation " -"blog</a>" +"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation blog</a>" msgstr "" "ファイルアップロード方法を学ぶには<a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> を参照して" -"ください" +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> " +"を参照してください" #: warehouse/templates/pages/sponsor.html:116 #: warehouse/templates/pages/sponsor.html:139 @@ -5778,7 +5505,8 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:130 msgid "" -"Logo in a <strong>prominent position</strong> on the PyPI project detail page" +"Logo in a <strong>prominent position</strong> on the PyPI project detail " +"page" msgstr "" #: warehouse/templates/pages/sponsor.html:131 @@ -5787,51 +5515,51 @@ msgstr "" msgid "Logo on the PyPI footer" msgstr "" +# | msgid "" +# | "For instructions on how to use this token, <a href=\"%(href)s\">visit the +# " +# | "PyPI help page</a>." #: warehouse/templates/pages/sponsor.html:132 #: warehouse/templates/pages/sponsor.html:155 #: warehouse/templates/pages/sponsor.html:178 #: warehouse/templates/pages/sponsor.html:243 #, fuzzy, python-format -#| msgid "" -#| "For instructions on how to use this token, <a href=\"%(href)s\">visit the " -#| "PyPI help page</a>." msgid "" -"Logo <strong>and write up</strong> on the <a href=\"%(href)s\">PyPI sponsors " -"page</a>" -msgstr "" -"このトークンの使用方法の説明は、<a href=\"%(href)s\">PyPIのヘルプページを参照" -"してください</a>。" +"Logo <strong>and write up</strong> on the <a href=\"%(href)s\">PyPI " +"sponsors page</a>" +msgstr "このトークンの使用方法の説明は、<a href=\"%(href)s\">PyPIのヘルプページを参照してください</a>。" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:134 #: warehouse/templates/pages/sponsor.html:157 #: warehouse/templates/pages/sponsor.html:180 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" "<strong>Quarterly</strong> thank you tweet from the <a href=\"%(href)s\" " "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " "Foundation</a>" msgstr "" "ファイルアップロード方法を学ぶには<a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> を参照して" -"ください" +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> " +"を参照してください" +# | msgid "" +# | "PyPI supports any device that adheres to the <a href=\"%(href)s\" title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." #: warehouse/templates/pages/sponsor.html:135 #: warehouse/templates/pages/sponsor.html:158 #: warehouse/templates/pages/sponsor.html:181 #, fuzzy, python-format -#| msgid "" -#| "PyPI supports any device that adheres to the <a href=\"%(href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." msgid "" "<strong>Quarterly</strong> thank you tweet from the <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</" -"a>" +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" -"PyPIでは、<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">FIDO標準</a>に準拠する端末に対応しています。" +"PyPIでは、<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">FIDO標準</a>に準拠する端末に対応しています。" #: warehouse/templates/pages/sponsor.html:148 msgid "Platinum" @@ -5843,27 +5571,27 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:153 msgid "" -"Logo on <strong>high rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>high rotation</strong> in a prominent position on the " +"PyPI project detail page" msgstr "" +# | msgid "" +# | "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +# | "rel=\"noopener\">Python Packaging User Guide</a> for details on the " +# | "available formats." #: warehouse/templates/pages/sponsor.html:156 #: warehouse/templates/pages/sponsor.html:179 #: warehouse/templates/pages/sponsor.html:201 #: warehouse/templates/pages/sponsor.html:222 #, fuzzy, python-format -#| msgid "" -#| "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Python Packaging User Guide</a> for details on the " -#| "available formats." msgid "" "Inclusion in a blog post on the <a href=\"%(href)s\" title=\"%(title)s\" " "target=\"_blank\" rel=\"noopener\">Python Software Foundation blog</a>, " -"<strong>with other sponsors</strong> whose sponsorship commenced during the " -"same quarter" +"<strong>with other sponsors</strong> whose sponsorship commenced during " +"the same quarter" msgstr "" -"使用可能なフォーマットの詳細については、<a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " +"使用可能なフォーマットの詳細については、<a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User " "Guide</a>を参照してください。" #: warehouse/templates/pages/sponsor.html:171 @@ -5876,8 +5604,8 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:176 msgid "" -"Logo on <strong>medium rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>medium rotation</strong> in a prominent position on the " +"PyPI project detail page" msgstr "" #: warehouse/templates/pages/sponsor.html:194 @@ -5890,44 +5618,46 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:199 msgid "" -"Logo on <strong>low rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>low rotation</strong> in a prominent position on the PyPI" +" project detail page" msgstr "" +# | msgid "Go to <a href=\"%(href)s\">reset your password</a>." #: warehouse/templates/pages/sponsor.html:200 #: warehouse/templates/pages/sponsor.html:221 #, fuzzy, python-format -#| msgid "Go to <a href=\"%(href)s\">reset your password</a>." msgid "Logo on the <a href=\"%(href)s\">PyPI sponsors page</a>" msgstr "<a href=\"%(href)s\">パスワードのリセット</a>に進む。" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:202 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" "<strong>Bi-yearly</strong> thank you tweet from the <a href=\"%(href)s\" " "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " "Foundation</a>" msgstr "" "ファイルアップロード方法を学ぶには<a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> を参照して" -"ください" +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> " +"を参照してください" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:203 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" "<strong>Bi-yearly</strong> thank you tweet from the <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</" -"a>" +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" "ファイルアップロード方法を学ぶには<a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> を参照して" -"ください" +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> " +"を参照してください" #: warehouse/templates/pages/sponsor.html:216 msgid "Bronze" @@ -5937,96 +5667,100 @@ msgstr "" msgid "$5,000 per year, or equivalent in donated services" msgstr "" +# | msgid "" +# | "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +# | "rel=\"noopener\">Python Packaging User Guide</a> for details on the " +# | "available formats." #: warehouse/templates/pages/sponsor.html:223 #, fuzzy, python-format -#| msgid "" -#| "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Python Packaging User Guide</a> for details on the " -#| "available formats." msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a> (on initial sponsorship, and on each subsequent renewal)" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a> (on initial sponsorship, and on each subsequent renewal)" msgstr "" -"使用可能なフォーマットの詳細については、<a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " +"使用可能なフォーマットの詳細については、<a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User " "Guide</a>を参照してください。" +# | msgid "" +# | "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +# | "rel=\"noopener\">Python Packaging User Guide</a> for details on the " +# | "available formats." #: warehouse/templates/pages/sponsor.html:224 #, fuzzy, python-format -#| msgid "" -#| "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Python Packaging User Guide</a> for details on the " -#| "available formats." msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</a> " -"(on initial sponsorship, and on each subsequent renewal)" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a> (on initial sponsorship, and on each subsequent renewal)" msgstr "" -"使用可能なフォーマットの詳細については、<a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " +"使用可能なフォーマットの詳細については、<a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User " "Guide</a>を参照してください。" #: warehouse/templates/pages/sponsor.html:238 msgid "One time grants / custom donations" msgstr "" +# | msgid "" +# | "Learn how to create a new release on the <a href=\"%(href)s\" title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " +# | "Guide</a>" #: warehouse/templates/pages/sponsor.html:239 #, fuzzy, python-format -#| msgid "" -#| "Learn how to create a new release on the <a href=\"%(href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -#| "Guide</a>" msgid "" -"Sponsorship of a specific feature, feature set, or community sprint, valued " -"at over $50,000. See <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">fundable packaging improvements</a> for ideas." +"Sponsorship of a specific feature, feature set, or community sprint, " +"valued at over $50,000. See <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">fundable packaging improvements</a> " +"for ideas." msgstr "" -"新しいリリースを作成する方法を学ぶには<a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>を参照し" -"てください" +"新しいリリースを作成する方法を学ぶには<a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User " +"Guide</a>を参照してください" +# | msgid "" +# | "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +# | "rel=\"noopener\">Python Packaging User Guide</a> for details on the " +# | "available formats." #: warehouse/templates/pages/sponsor.html:244 #, fuzzy, python-format -#| msgid "" -#| "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Python Packaging User Guide</a> for details on the " -#| "available formats." msgid "" -"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation " -"blog</a>, explaining what the funds will be used for" +"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation blog</a>, explaining what the funds will be used for" msgstr "" -"使用可能なフォーマットの詳細については、<a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " +"使用可能なフォーマットの詳細については、<a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User " "Guide</a>を参照してください。" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:245 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a>" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a>" msgstr "" "ファイルアップロード方法を学ぶには<a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> を参照して" -"ください" +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> " +"を参照してください" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:246 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</a>" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" "ファイルアップロード方法を学ぶには<a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> を参照して" -"ください" +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a> " +"を参照してください" #: warehouse/templates/pages/sponsor.html:248 msgid "" @@ -6041,27 +5775,23 @@ msgstr "PyPIの統計" #: warehouse/templates/pages/stats.html:23 msgid "" "We all love stats, so here are some useful statistics about PyPI. The " -"statistics page is cached for 24 hours, so don't expect the numbers to be " -"realtime." -msgstr "" -"私たちは皆、統計が大好きです。ここでは、PyPIに関する有用な統計をいくつか紹介" -"します。統計ページは24時間キャッシュされるため、リアルタイムの数値であること" -"を期待しないでください。" +"statistics page is cached for 24 hours, so don't expect the numbers to be" +" realtime." +msgstr "私たちは皆、統計が大好きです。ここでは、PyPIに関する有用な統計をいくつか紹介します。統計ページは24時間キャッシュされるため、リアルタイムの数値であることを期待しないでください。" #: warehouse/templates/pages/stats.html:30 msgid "Top projects by total package size" msgstr "" +# | msgid "" +# | "Here is a list of the top 100 packages based on sum of their packages " +# | "sizes (in bytes)." #: warehouse/templates/pages/stats.html:32 #, fuzzy -#| msgid "" -#| "Here is a list of the top 100 packages based on sum of their packages " -#| "sizes (in bytes)." msgid "" -"Here is a list of the top 100 projects based on the sum of their packages' " -"sizes (in bytes)." -msgstr "" -"パッケージサイズ合計（バイト単位）においてトップ100のパッケージのリストです。" +"Here is a list of the top 100 projects based on the sum of their " +"packages' sizes (in bytes)." +msgstr "パッケージサイズ合計（バイト単位）においてトップ100のパッケージのリストです。" #: warehouse/templates/pages/stats.html:39 msgid "Statistics by project" @@ -6101,13 +5831,11 @@ msgstr "検索クエリを入力するか、分類リストからフィルタを #: warehouse/templates/search/results.html:110 msgid "Enter a search query, or add a filter by clicking on the button." -msgstr "" -"検索クエリを入力するか、ボタンをクリックしてフィルタを追加してください。" +msgstr "検索クエリを入力するか、ボタンをクリックしてフィルタを追加してください。" #: warehouse/templates/search/results.html:111 msgid "You can combine searches and classifier filters. Examples:" -msgstr "" -"検索と分類フィルタは組み合わせることができます。例えば、以下のとおりです。" +msgstr "検索と分類フィルタは組み合わせることができます。例えば、以下のとおりです。" #: warehouse/templates/search/results.html:115 msgid "Python 3 compatible projects" @@ -6215,59 +5943,42 @@ msgstr[0] "" #~ msgstr "<strong>追加した人</strong>: %(submitter)s" #~ msgid "" -#~ "If this was a mistake, you can email <a href=\"%(href)s\">" -#~ "%(email_address)s</a> to communicate with the PyPI administrators." +#~ "If this was a mistake, you can " +#~ "email <a href=\"%(href)s\">%(email_address)s</a> to" +#~ " communicate with the PyPI administrators." #~ msgstr "" -#~ "もしこれが間違いであれば、<a href=\"%(href)s\">%(email_address)s</a>にメー" -#~ "ルして PyPI の管理者に連絡して下さい。" +#~ "もしこれが間違いであれば、<a href=\"%(href)s\">%(email_address)s</a>にメールして" +#~ " PyPI の管理者に連絡して下さい。" #~ msgid "You are receiving this because you are an owner of this project." -#~ msgstr "" -#~ "あなたがこのメールを受け取ったのは、あなたがこのプロジェクトのオーナーだか" -#~ "らです。" +#~ msgstr "あなたがこのメールを受け取ったのは、あなたがこのプロジェクトのオーナーだからです。" -#, fuzzy -#~| msgid "This project has no releases" #~ msgid "The project %(project)s has been deleted." #~ msgstr "このプロジェクトにはリリースがありません" -#, fuzzy -#~| msgid "<strong>Added by</strong>: %(submitter)s" #~ msgid "" #~ "<strong>Deleted by:</strong> %(submitter)s with a role:\n" #~ " %(role)s." #~ msgstr "<strong>追加した人</strong>: %(submitter)s" -#, fuzzy -#~| msgid "" -#~| "If this was a mistake, you can email <a href=\"%(href)s\">" -#~| "%(email_address)s</a> to communicate with the PyPI administrators." #~ msgid "" #~ "If this was a mistake, you can email <a\n" -#~ " href=\"%(href)s\">%(email_address)s</a> to communicate with the PyPI " -#~ "administrators." +#~ " href=\"%(href)s\">%(email_address)s</a> to " +#~ "communicate with the PyPI administrators." #~ msgstr "" -#~ "もしこれが間違いであれば、<a href=\"%(href)s\">%(email_address)s</a>にメー" -#~ "ルして PyPI の管理者に連絡して下さい。" +#~ "もしこれが間違いであれば、<a href=\"%(href)s\">%(email_address)s</a>にメールして" +#~ " PyPI の管理者に連絡して下さい。" -#, fuzzy -#~| msgid "You are receiving this because you are an owner of this project." #~ msgid "" -#~ "You are receiving this because you are %(recipient_role_descr)s of this " -#~ "project." -#~ msgstr "" -#~ "あなたがこのメールを受け取ったのは、あなたがこのプロジェクトのオーナーだか" -#~ "らです。" +#~ "You are receiving this because you " +#~ "are %(recipient_role_descr)s of this project." +#~ msgstr "あなたがこのメールを受け取ったのは、あなたがこのプロジェクトのオーナーだからです。" -#, fuzzy -#~| msgid "You are receiving this because you are an owner of this project." #~ msgid "" #~ "\n" -#~ "You are receiving this because you are %(recipient_role_descr)s of this " -#~ "project." -#~ msgstr "" -#~ "あなたがこのメールを受け取ったのは、あなたがこのプロジェクトのオーナーだか" -#~ "らです。" +#~ "You are receiving this because you " +#~ "are %(recipient_role_descr)s of this project." +#~ msgstr "あなたがこのメールを受け取ったのは、あなたがこのプロジェクトのオーナーだからです。" #~ msgid "View <span>hashes</span>" #~ msgstr "<span>ハッシュ</span>を見る" @@ -6276,62 +5987,72 @@ msgstr[0] "" #~ msgstr "ベータ機能" #~ msgid "" -#~ "If you lose your %(method)s and can no longer log in, the PyPI team " -#~ "<strong>cannot</strong> currently help you recover your account. We plan " -#~ "to develop a <a href=\"%(policy_href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">manual account recovery policy</a> and " -#~ "implement <a href=\"%(recovery_codes_href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">account recovery codes</a> to address this " -#~ "issue." +#~ "If you lose your %(method)s and " +#~ "can no longer log in, the PyPI " +#~ "team <strong>cannot</strong> currently help " +#~ "you recover your account. We plan " +#~ "to develop a <a href=\"%(policy_href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">manual account recovery policy</a>" +#~ " and implement <a " +#~ "href=\"%(recovery_codes_href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\">account recovery " +#~ "codes</a> to address this issue." #~ msgstr "" -#~ "もし%(method)sを失ってログインできなくなった場合、現在PyPIチームはアカウン" -#~ "トの回復を支援<strong>できません</strong>。私たちはこの問題に対処するため" -#~ "に、<a href=\"%(policy_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -#~ "\"noopener\">手動によるアカウント回復ポリシー</a>を作成し、 <a href=" -#~ "\"%(recovery_codes_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -#~ "\"noopener\">アカウント回復コード</a>を実装する予定です。" +#~ "もし%(method)sを失ってログインできなくなった場合、現在PyPIチームはアカウントの回復を支援<strong>できません</strong>。私たちはこの問題に対処するために、<a" +#~ " href=\"%(policy_href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\">手動によるアカウント回復ポリシー</a>を作成し、 " +#~ "<a href=\"%(recovery_codes_href)s\" title=\"%(title)s\"" +#~ " target=\"_blank\" rel=\"noopener\">アカウント回復コード</a>を実装する予定です。" #~ msgid "" #~ "\n" -#~ " In the short term, we recommend that all PyPI users set up " -#~ "<em>both</em>\n" -#~ " supported two factor authentication methods - using an " -#~ "authentication\n" -#~ " application <em>and</em> setting up a security device (e.g. USB " -#~ "key).\n" +#~ " In the short term, we " +#~ "recommend that all PyPI users set " +#~ "up <em>both</em>\n" +#~ " supported two factor authentication" +#~ " methods - using an authentication\n" +#~ " application <em>and</em> setting up" +#~ " a security device (e.g. USB key)." +#~ "\n" #~ " " #~ msgstr "" #~ "\n" -#~ " 短期的には、私たちは全てのPyPIユーザに、サポートされている二要素認" -#~ "証方式ーーつまり、認証アプリケーションの使用<em>および</em>セキュリティ端" -#~ "末（USBキーなど）の<em>両方</em>の設定をお勧めします。\n" +#~ " " +#~ "短期的には、私たちは全てのPyPIユーザに、サポートされている二要素認証方式ーーつまり、認証アプリケーションの使用<em>および</em>セキュリティ端末（USBキーなど）の<em>両方</em>の設定をお勧めします。" +#~ "\n" #~ " " #~ msgid "Top storage users" #~ msgstr "トップのストレージ利用者" #~ msgid "" -#~ "There is currently no established process for performing this " -#~ "administrative task that is explicit and fair for all parties. However, " -#~ "one is currently in development per <a href=\"%(href)s\" title=\"%(title)s" -#~ "\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python enhancement " +#~ "There is currently no established " +#~ "process for performing this administrative " +#~ "task that is explicit and fair for" +#~ " all parties. However, one is " +#~ "currently in development per <a " +#~ "href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\"" +#~ " rel=\"noopener\"><abbr title=\"Python enhancement " #~ "proposal\">PEP</abbr> 541</a>." #~ msgstr "" -#~ "現在この管理タスクを実行する上で、すべての関係者にとって明確かつ公正なプロ" -#~ "セスは確立されていません。しかし、<a href=\"%(href)s\" title=\"%(title)s" -#~ "\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python enhancement " +#~ "現在この管理タスクを実行する上で、すべての関係者にとって明確かつ公正なプロセスは確立されていません。しかし、<a " +#~ "href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\"" +#~ " rel=\"noopener\"><abbr title=\"Python enhancement " #~ "proposal\">PEP</abbr> 541</a>によって現在作成中のものがあります。" #~ msgid "" -#~ "<abbr title=\"Python enhancement proposal\">PEP</abbr> 541 has been " -#~ "accepted, and PyPI is <a href=\"%(href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">creating a workflow</a> which will be " -#~ "documented here." +#~ "<abbr title=\"Python enhancement " +#~ "proposal\">PEP</abbr> 541 has been accepted," +#~ " and PyPI is <a href=\"%(href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">creating a workflow</a> which " +#~ "will be documented here." #~ msgstr "" -#~ "<abbr title=\"Python enhancement proposal\">PEP</abbr> 541は承認され、PyPI" -#~ "が<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -#~ "\"noopener\">ワークフローを作成</a>しており、ここでドキュメント化される予" -#~ "定です。" +#~ "<abbr title=\"Python enhancement " +#~ "proposal\">PEP</abbr> 541は承認され、PyPIが<a href=\"%(href)s\"" +#~ " title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">ワークフローを作成</a>しており、ここでドキュメント化される予定です。" #~ msgid "Log Out" #~ msgstr "ログアウト" @@ -6345,8 +6066,7 @@ msgstr[0] "" #~ msgid "User's username" #~ msgstr "ユーザーの名前" -#~ msgid "" -#~ "There have been too many unsuccessful login attempts, try again later." +#~ msgid "There have been too many unsuccessful login attempts, try again later." #~ msgstr "ログインの失敗が多数発生しました。後でやり直してください。" #~ msgid "We have sent an email to your registered email address." @@ -6356,27 +6076,33 @@ msgstr[0] "" #~ msgstr "作成日" #~ msgid "" -#~ "An API token scoped to your entire account will have upload permissions " +#~ "An API token scoped to your entire" +#~ " account will have upload permissions " #~ "for all of your projects." -#~ msgstr "" -#~ "アカウント全体をスコープとするAPIトークンには、すべてのプロジェクトに対す" -#~ "るアップロード権限が与えられます。" +#~ msgstr "アカウント全体をスコープとするAPIトークンには、すべてのプロジェクトに対するアップロード権限が与えられます。" #~ msgid "" -#~ "As PyPI's two factor implementation follows the <a href=\"%(href)s\" " -#~ "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"web " -#~ "authentication\">WebAuthn</abbr> standard</a> standard</a>, PyPI users " -#~ "will be able to take advantage of any future developments in this field." +#~ "As PyPI's two factor implementation " +#~ "follows the <a href=\"%(href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\"><abbr title=\"web " +#~ "authentication\">WebAuthn</abbr> standard</a> " +#~ "standard</a>, PyPI users will be able" +#~ " to take advantage of any future " +#~ "developments in this field." #~ msgstr "" -#~ "PyPIにおける二要素の実装は<a href=\"%(href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\"><abbr title=\"web authentication\">WebAuthn</" -#~ "abbr>標準</a>に準拠しているため、PyPIユーザはこの分野における将来的な開発" -#~ "の恩恵を受けることができます。" +#~ "PyPIにおける二要素の実装は<a href=\"%(href)s\" title=\"%(title)s\"" +#~ " target=\"_blank\" rel=\"noopener\"><abbr title=\"web" +#~ " " +#~ "authentication\">WebAuthn</abbr>標準</a>に準拠しているため、PyPIユーザはこの分野における将来的な開発の恩恵を受けることができます。" #~ msgid "" -#~ "Filter by <a href=\"%(href)s\" class=\"%(classes)s\" aria-label=" -#~ "\"%(aria_label)s\" data-original-label=\"%(data_original_label)s\"> " +#~ "Filter by <a href=\"%(href)s\" " +#~ "class=\"%(classes)s\" aria-label=\"%(aria_label)s\" " +#~ "data-original-label=\"%(data_original_label)s\"> " #~ "classifier </a>" #~ msgstr "" -#~ "<a href=\"%(href)s\" class=\"%(classes)s\" aria-label=\"%(aria_label)s\" " -#~ "data-original-label=\"%(data_original_label)s\">分類</a>によるフィルタ" +#~ "<a href=\"%(href)s\" class=\"%(classes)s\" aria-" +#~ "label=\"%(aria_label)s\" data-original-" +#~ "label=\"%(data_original_label)s\">分類</a>によるフィルタ" + diff --git a/warehouse/locale/pt_BR/LC_MESSAGES/messages.mo b/warehouse/locale/pt_BR/LC_MESSAGES/messages.mo index e7fd13b7428a..a5624198c0fc 100644 Binary files a/warehouse/locale/pt_BR/LC_MESSAGES/messages.mo and b/warehouse/locale/pt_BR/LC_MESSAGES/messages.mo differ diff --git a/warehouse/locale/pt_BR/LC_MESSAGES/messages.po b/warehouse/locale/pt_BR/LC_MESSAGES/messages.po index 7b1c546047cc..77eecc737931 100644 --- a/warehouse/locale/pt_BR/LC_MESSAGES/messages.po +++ b/warehouse/locale/pt_BR/LC_MESSAGES/messages.po @@ -1,25 +1,3 @@ -# Portuguese (Brazil) translations for Warehouse. -# Copyright (C) 2019 PyPA -# This file is distributed under the same license as the Warehouse project. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2019. -# Rafael Fontenelle <rafaelff@gnome.org>, 2019, 2020. -msgid "" -msgstr "" -"Project-Id-Version: Warehouse VERSION\n" -"Report-Msgid-Bugs-To: https://github.com/pypa/warehouse/issues/new\n" -"POT-Creation-Date: 2020-01-15 20:11+0200\n" -"PO-Revision-Date: 2020-04-04 21:24+0000\n" -"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n" -"Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/pypa/" -"warehouse/pt_BR/>\n" -"Language: pt_BR\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 4.0-dev\n" -"Generated-By: Babel 2.7.0\n" - #: warehouse/views.py:254 msgid "Locale updated" msgstr "Localidade atualizada" @@ -39,8 +17,8 @@ msgstr "Escolha um nome de usuário com 50 caracteres ou menos." #: warehouse/accounts/forms.py:85 msgid "" "The username is invalid. Usernames must be composed of letters, numbers, " -"dots, hyphens and underscores. And must also start and finish with a letter " -"or number. Choose a different username." +"dots, hyphens and underscores. And must also start and finish with a " +"letter or number. Choose a different username." msgstr "" "O nome de usuário é inválido. Os nomes de usuário devem ser compostos de " "letras, números, pontos, hífenes e sublinhados. E também devem começar e " @@ -48,11 +26,11 @@ msgstr "" #: warehouse/accounts/forms.py:99 msgid "" -"This username is already being used by another account. Choose a different " -"username." +"This username is already being used by another account. Choose a " +"different username." msgstr "" -"Esse nome de usuário já está sendo usado por outra conta. Escolha um nome de " -"usuário diferente." +"Esse nome de usuário já está sendo usado por outra conta. Escolha um nome" +" de usuário diferente." #: warehouse/accounts/forms.py:122 msgid "The password is invalid. Try again." @@ -61,8 +39,8 @@ msgstr "A senha é inválida. Tentar novamente." #: warehouse/accounts/forms.py:126 warehouse/accounts/views.py:65 msgid "There have been too many unsuccessful login attempts. Try again later." msgstr "" -"Houve muitas tentativas de autenticação malsucedidas. Tente novamente mais " -"tarde." +"Houve muitas tentativas de autenticação malsucedidas. Tente novamente " +"mais tarde." #: warehouse/accounts/forms.py:148 msgid "Your passwords don't match. Try again." @@ -80,19 +58,19 @@ msgstr "" #: warehouse/accounts/forms.py:209 msgid "" -"This email address is already being used by this account. Use a different " -"email." +"This email address is already being used by this account. Use a different" +" email." msgstr "" -"Este endereço de e-mail já está sendo usado por esta conta. Use um e-mail " -"diferente." +"Este endereço de e-mail já está sendo usado por esta conta. Use um e-mail" +" diferente." #: warehouse/accounts/forms.py:216 msgid "" -"This email address is already being used by another account. Use a different " -"email." +"This email address is already being used by another account. Use a " +"different email." msgstr "" -"Este endereço de e-mail já está sendo usado por outra conta. Use um e-mail " -"diferente." +"Este endereço de e-mail já está sendo usado por outra conta. Use um " +"e-mail diferente." #: warehouse/accounts/forms.py:238 msgid "The name is too long. Choose a name with 100 characters or less." @@ -136,11 +114,11 @@ msgstr "" #: warehouse/accounts/views.py:455 msgid "" -"New user registration temporarily disabled. See https://pypi.org/help#admin-" -"intervention for details." +"New user registration temporarily disabled. See https://pypi.org/help" +"#admin-intervention for details." msgstr "" -"Novo registro de usuário desativado temporariamente. Consulte https://pypi." -"org/help#admin-intervention para obter detalhes." +"Novo registro de usuário desativado temporariamente. Consulte " +"https://pypi.org/help#admin-intervention para obter detalhes." #: warehouse/accounts/views.py:552 msgid "Expired token: request a new password reset link" @@ -164,15 +142,15 @@ msgstr "Token inválido: usuário não encontrado" #: warehouse/accounts/views.py:572 msgid "Invalid token: user has logged in since this token was requested" -msgstr "" -"Token inválido: o usuário já entrou desde que esse token foi solicitado" +msgstr "Token inválido: o usuário já entrou desde que esse token foi solicitado" #: warehouse/accounts/views.py:579 msgid "" "Invalid token: password has already been changed since this token was " "requested" msgstr "" -"Token inválido: a senha já foi alterada desde que esse token foi solicitado" +"Token inválido: a senha já foi alterada desde que esse token foi " +"solicitado" #: warehouse/accounts/views.py:605 msgid "You have reset your password" @@ -213,15 +191,16 @@ msgstr "Endereço de e-mail ${email_address} verificado. ${confirm_message}." #: warehouse/manage/views.py:186 msgid "Email ${email_address} added - check your email for a verification link" msgstr "" -"E-mail ${email_address} adicionado - verifique seu e-mail para um link de " -"verificação" +"E-mail ${email_address} adicionado - verifique seu e-mail para um link de" +" verificação" #: warehouse/manage/views.py:667 warehouse/manage/views.py:703 msgid "" -"You must provision a two factor method before recovery codes can be generated" +"You must provision a two factor method before recovery codes can be " +"generated" msgstr "" -"O usuário deve fornecer um método de dois fatores antes que os códigos de " -"recuperação possam ser gerados" +"O usuário deve fornecer um método de dois fatores antes que os códigos de" +" recuperação possam ser gerados" #: warehouse/manage/views.py:678 msgid "Recovery codes already generated" @@ -251,8 +230,7 @@ msgstr "Página não encontrada (404)" #: warehouse/templates/404.html:18 msgid "We looked everywhere but couldn't find this page" -msgstr "" -"Nós olhamos em todos os lugares, mas não conseguimos encontrar esta página" +msgstr "Nós olhamos em todos os lugares, mas não conseguimos encontrar esta página" #: warehouse/templates/404.html:29 msgid "And now for something <br><span>completely different" @@ -409,9 +387,9 @@ msgstr "Algo deu errado" #: warehouse/templates/500.html:22 msgid "" -"<p>We are experiencing technical issues that are affecting our ability to " -"serve you this site.</p> <p>We are aware of the problem and are working to " -"resolve it as soon as possible.</p>" +"<p>We are experiencing technical issues that are affecting our ability to" +" serve you this site.</p> <p>We are aware of the problem and are working " +"to resolve it as soon as possible.</p>" msgstr "" "<p>Estamos enfrentando problemas técnicos que estão afetando a nossa " "capacidade de atendê-lo neste site.</p><p>Estamos cientes do problema e " @@ -435,20 +413,22 @@ msgstr "Confia no PyPI para fazer o seu trabalho?" #: warehouse/templates/500.html:37 msgid "" -"Consider <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\" rel=" -"\"noopener\"> contributing </a> or <a href=\"https://psfmember.org/civicrm/" -"contribute/transact?reset=1&id=13\" target=\"_blank\" rel=\"noopener\"> " -"donating </a> to help us build a more stable and secure platform." +"Consider <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\" " +"rel=\"noopener\"> contributing </a> or <a " +"href=\"https://psfmember.org/civicrm/contribute/transact?reset=1&id=13\" " +"target=\"_blank\" rel=\"noopener\"> donating </a> to help us build a more" +" stable and secure platform." msgstr "" -"Considere <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\" " -"rel=\"noopener\"> contribuir </a> ou <a href=\"https://psfmember.org/civicrm/" -"contribute/transact?reset=1&id=13\" target=\"_blank\" rel=\"noopener\"> doar " -"</a> para nos ajudar a construir uma plataforma mais estável e segura." +"Considere <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\"" +" rel=\"noopener\"> contribuir </a> ou <a " +"href=\"https://psfmember.org/civicrm/contribute/transact?reset=1&id=13\" " +"target=\"_blank\" rel=\"noopener\"> doar </a> para nos ajudar a construir" +" uma plataforma mais estável e segura." #: warehouse/templates/base.html:23 msgid "" -"Choose a strong password that contains letters (uppercase and lowercase), " -"numbers and special characters. Avoid common words or repetition." +"Choose a strong password that contains letters (uppercase and lowercase)," +" numbers and special characters. Avoid common words or repetition." msgstr "" "Escolha uma senha forte que contenha letras (maiúsculas e minúsculas), " "números e caracteres especiais. Evite palavras comuns ou repetição." @@ -506,11 +486,11 @@ msgstr "Menu principal" #: warehouse/templates/base.html:76 warehouse/templates/index.html:79 msgid "" -"The Python Package Index (PyPI) is a repository of software for the Python " -"programming language." +"The Python Package Index (PyPI) is a repository of software for the " +"Python programming language." msgstr "" -"O Python Package Index (PyPI) é um repositório de software para a linguagem " -"de programação Python." +"O Python Package Index (PyPI) é um repositório de software para a " +"linguagem de programação Python." #: warehouse/templates/base.html:92 msgid "RSS: 40 latest updates" @@ -543,23 +523,23 @@ msgstr "Aviso" #: warehouse/templates/base.html:158 msgid "You are using an unsupported browser, upgrade to a newer version." msgstr "" -"Você está usando um navegador incompatível, atualize para uma versão mais " -"nova." +"Você está usando um navegador incompatível, atualize para uma versão mais" +" nova." #: warehouse/templates/base.html:167 msgid "" "You are using TestPyPI – a separate instance of the Python Package Index " -"that allows you to try distribution tools and processes without affecting " -"the real index." +"that allows you to try distribution tools and processes without affecting" +" the real index." msgstr "" -"Você está usando TestPyPI – uma instância separada do Python Package Index " -"que lhe permite tentar ferramentas de distribuição e processos sem afetar o " -"índice real." +"Você está usando TestPyPI – uma instância separada do Python Package " +"Index que lhe permite tentar ferramentas de distribuição e processos sem " +"afetar o índice real." #: warehouse/templates/base.html:177 msgid "" -"Some features may not work without JavaScript. Please try enabling it if you " -"encounter problems." +"Some features may not work without JavaScript. Please try enabling it if " +"you encounter problems." msgstr "" "Alguns recursos podem não funcionar sem JavaScript. Tente habilitá-lo se " "você encontrar problemas." @@ -684,9 +664,9 @@ msgstr "todos os sistemas estão operacionais" #: warehouse/templates/base.html:311 msgid "" -"Developed and maintained by the Python community, for the Python community." -msgstr "" -"Desenvolvido e mantido pela comunidade Python, para a comunidade Python." +"Developed and maintained by the Python community, for the Python " +"community." +msgstr "Desenvolvido e mantido pela comunidade Python, para a comunidade Python." #: warehouse/templates/base.html:313 msgid "Donate today!" @@ -747,8 +727,8 @@ msgstr "%(num_users)s usuários" #: warehouse/templates/index.html:81 msgid "" -"PyPI helps you find and install software developed and shared by the Python " -"community." +"PyPI helps you find and install software developed and shared by the " +"Python community." msgstr "" "O PyPI ajuda você a encontrar e instalar softwares desenvolvidos e " "compartilhados pela comunidade do Python." @@ -788,18 +768,19 @@ msgstr "Essa URL é um ponto da API para enviar arquivos para o PyPI." #: warehouse/templates/upload.html:26 #, python-format msgid "" -"For more information on uploading projects to PyPI, visit the <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python " -"Packaging User Guide</a>." +"For more information on uploading projects to PyPI, visit the <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" -"Para mais informações sobre envio de projetos para o PyPI, visite o <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Guia de " -"Usuário para Empacotamento de Python</a>." +"Para mais informações sobre envio de projetos para o PyPI, visite o <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Guia de Usuário para Empacotamento de Python</a>." #: warehouse/templates/upload.html:28 #, python-format msgid "" -"Otherwise, we suggest you <a href=\"%(href)s\">go to the PyPI homepage</a>." +"Otherwise, we suggest you <a href=\"%(href)s\">go to the PyPI " +"homepage</a>." msgstr "" "Caso contrário, sugerimos que você <a href=\"%(href)s\">vá para a página " "inicial do PyPI</a>." @@ -965,15 +946,15 @@ msgstr "Verificar" #: warehouse/templates/accounts/recovery-code.html:58 msgid "" -"PyPI allows for generating recovery codes to be stored securely offline in " -"the event that your device or application is lost. Enter one of these codes " -"in the form to verify your identity. Once used, the recovery code will no " -"longer be valid." +"PyPI allows for generating recovery codes to be stored securely offline " +"in the event that your device or application is lost. Enter one of these " +"codes in the form to verify your identity. Once used, the recovery code " +"will no longer be valid." msgstr "" -"O PyPI permite que os códigos de recuperação de geração sejam armazenados " -"offline de maneira segura no caso de perda do seu dispositivo ou aplicativo. " -"Digite um desses códigos no formulário para verificar sua identidade. Uma " -"vez usado, o código de recuperação não será mais válido." +"O PyPI permite que os códigos de recuperação de geração sejam armazenados" +" offline de maneira segura no caso de perda do seu dispositivo ou " +"aplicativo. Digite um desses códigos no formulário para verificar sua " +"identidade. Uma vez usado, o código de recuperação não será mais válido." #: warehouse/templates/accounts/recovery-code.html:59 #, python-format @@ -1038,12 +1019,12 @@ msgstr "Confirmar senha" #: warehouse/templates/accounts/register.html:157 msgid "" "This password appears in a security breach or has been compromised and " -"cannot be used. Please refer to the <a href=\"/help/#compromised-password" -"\">FAQ</a> for more information." +"cannot be used. Please refer to the <a href=\"/help/#compromised-" +"password\">FAQ</a> for more information." msgstr "" -"Esta senha aparece em uma violação de segurança ou foi comprometida e não " -"pode ser usada. Por favor, consulte o <a href=\"/help/#compromised-password" -"\">FAQ</a> para obter mais informações." +"Esta senha aparece em uma violação de segurança ou foi comprometida e não" +" pode ser usada. Por favor, consulte o <a href=\"/help/#compromised-" +"password\">FAQ</a> para obter mais informações." #: warehouse/templates/accounts/register.html:162 msgid "Create account" @@ -1077,8 +1058,8 @@ msgstr "Um e-mail foi enviado para seu endereço de e-mail registrado." #: warehouse/templates/accounts/request-password-reset.html:52 #, python-format msgid "" -"The email contains a link to reset your password. This link will expire in " -"%(n_hours)s hours." +"The email contains a link to reset your password. This link will expire " +"in %(n_hours)s hours." msgstr "" "O e-mail contém um link para redefinir sua senha. Este link expirará em " "%(n_hours)s horas." @@ -1128,19 +1109,20 @@ msgstr "Autenticar com dispositivo" #: warehouse/templates/accounts/two-factor.html:55 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" rel=\"%(rel)s" -"\">Upgrade your browser</a> to log in with a security device (e.g. USB key)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" " +"rel=\"%(rel)s\">Upgrade your browser</a> to log in with a security device" +" (e.g. USB key)" msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" rel=\"%(rel)s" -"\">Atualize seu navegador</a> para entrar com um dispositivo de segurança " -"(por exemplo, chave USB)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" " +"rel=\"%(rel)s\">Atualize seu navegador</a> para entrar com um dispositivo" +" de segurança (por exemplo, chave USB)" #: warehouse/templates/accounts/two-factor.html:60 #, python-format msgid "Lost your device? Not working? <a href=\"%(href)s\">Get help</a>." msgstr "" -"Perdeu o seu dispositivo? Não está funcionando? <a href=\"%(href)s\">Obtenha " -"ajuda</a>." +"Perdeu o seu dispositivo? Não está funcionando? <a " +"href=\"%(href)s\">Obtenha ajuda</a>." #: warehouse/templates/accounts/two-factor.html:72 msgid "Authenticate with an app" @@ -1153,14 +1135,15 @@ msgstr "Digite o código de autenticação" #: warehouse/templates/accounts/two-factor.html:105 #, python-format msgid "" -"<p>Generate a code using the authentication application connected to your " -"PyPI account. Enter this code in the form to verify your identity.</p> " -"<p>Lost your application? Not working? <a href=\"%(href)s\">Get help</a>.</p>" +"<p>Generate a code using the authentication application connected to your" +" PyPI account. Enter this code in the form to verify your identity.</p> " +"<p>Lost your application? Not working? <a href=\"%(href)s\">Get " +"help</a>.</p>" msgstr "" -"<p>Gere um código usando o aplicativo de autenticação conectado à sua conta " -"PyPI. Digite este código no formulário para verificar sua identidade.</" -"p><p>Perdeu o seu aplicativo? Não está funcionando? <a href=\"%(href)s" -"\">Obtenha ajuda</a>.</p>" +"<p>Gere um código usando o aplicativo de autenticação conectado à sua " +"conta PyPI. Digite este código no formulário para verificar sua " +"identidade.</p><p>Perdeu o seu aplicativo? Não está funcionando? <a " +"href=\"%(href)s\">Obtenha ajuda</a>.</p>" #: warehouse/templates/accounts/two-factor.html:117 msgid "Lost your security key or application?" @@ -1173,14 +1156,14 @@ msgstr "Entrar usando um código de recuperação" #: warehouse/templates/accounts/two-factor.html:122 #, python-format msgid "" -"<p><strong>You have not generated account recovery codes.</strong></p> <p>If " -"you lose access to your two factor methods, you may lose access to your " -"account. <a href=\"%(href)s\">Get help with recovery codes.</a></p>" +"<p><strong>You have not generated account recovery codes.</strong></p> " +"<p>If you lose access to your two factor methods, you may lose access to " +"your account. <a href=\"%(href)s\">Get help with recovery codes.</a></p>" msgstr "" "<p><strong>Você não gerou códigos de recuperação da conta.</strong></p> " -"<p>Se você perder acesso ao seu método de autenticação de dois fatores, você " -"pode perder acesso à sua conta. <a href=\"%(href)s\">Obtenha ajuda com " -"códigos de recuperação.</a></p>" +"<p>Se você perder acesso ao seu método de autenticação de dois fatores, " +"você pode perder acesso à sua conta. <a href=\"%(href)s\">Obtenha ajuda " +"com códigos de recuperação.</a></p>" #: warehouse/templates/email/account-deleted/body.html:18 #, python-format @@ -1194,11 +1177,13 @@ msgstr "Sua conta PyPI <strong>%(username)s</strong> foi excluída." #: warehouse/templates/email/two-factor-removed/body.html:20 #, python-format msgid "" -"If you did not make this change, you can email <a href=\"%(href)s\">" -"%(email_address)s</a> to communicate with the PyPI administrators." +"If you did not make this change, you can email <a " +"href=\"%(href)s\">%(email_address)s</a> to communicate with the PyPI " +"administrators." msgstr "" -"Se você não fez essa alteração, você pode enviar um e-mail <a href=\"%(href)s" -"\">%(email_address)s</a> para se comunicar com os administradores do PyPI." +"Se você não fez essa alteração, você pode enviar um e-mail <a " +"href=\"%(href)s\">%(email_address)s</a> para se comunicar com os " +"administradores do PyPI." #: warehouse/templates/email/added-as-collaborator/body.html:19 #, python-format @@ -1215,17 +1200,17 @@ msgid "" "You are receiving this because you have been added by %(submitter)s to a " "project on %(site)s." msgstr "" -"Você está recebendo isso porque você foi adicionado por %(submitter)s a um " -"projeto em %(site)s." +"Você está recebendo isso porque você foi adicionado por %(submitter)s a " +"um projeto em %(site)s." #: warehouse/templates/email/password-change/body.html:18 #, python-format msgid "" -"Someone, perhaps you, has changed the password for your PyPI account <strong>" -"%(username)s</strong>." +"Someone, perhaps you, has changed the password for your PyPI account " +"<strong>%(username)s</strong>." msgstr "" -"Alguém, talvez você, mudou a senha para sua conta PyPI <strong>%(username)s</" -"strong>." +"Alguém, talvez você, mudou a senha para sua conta PyPI " +"<strong>%(username)s</strong>." #: warehouse/templates/email/password-compromised-hibp/body.html:18 #: warehouse/templates/email/password-compromised/body.html:18 @@ -1234,9 +1219,10 @@ msgstr "O quê?" #: warehouse/templates/email/password-compromised/body.html:20 msgid "" -"PyPI administrators have determined that your password is compromised. To\n" -" protect you and other users, we have preemptively reset your password and " -"you\n" +"PyPI administrators have determined that your password is compromised. To" +"\n" +" protect you and other users, we have preemptively reset your password " +"and you\n" " will no longer be able to log in or upload to PyPI with your existing\n" " password." msgstr "" @@ -1263,8 +1249,8 @@ msgstr "O que eu devo fazer?" #: warehouse/templates/email/password-compromised/body.html:33 #, python-format msgid "" -"To regain access to your account, <a href=\"%(href)s\">reset your password</" -"a> on PyPI." +"To regain access to your account, <a href=\"%(href)s\">reset your " +"password</a> on PyPI." msgstr "" "Para recuperar o acesso à sua conta, <a href=\"%(href)s\">redefina sua " "senha</a> no PyPI." @@ -1276,7 +1262,8 @@ msgstr "Como posso entrar em contato com vocês?" #: warehouse/templates/email/password-compromised/body.html:41 #, python-format msgid "" -"For more information, you can email %(email_address)s to communicate with\n" +"For more information, you can email %(email_address)s to communicate with" +"\n" " the PyPI administrators." msgstr "" "Para mais informações, você pode enviar um e-mail para %(email_address)s\n" @@ -1288,14 +1275,14 @@ msgid "" "password appears\n" " in public data breaches. To protect you and other users, we have " "preemptively reset your\n" -" password and you will no longer be able to log in or upload to PyPI with " -"your existing\n" +" password and you will no longer be able to log in or upload to PyPI " +"with your existing\n" " password." msgstr "" -"Durante sua recente tentativa de entrar ou fazer o envio no PyPI, notamos " -"que sua\n" -" senha aparece em violações de dados públicos. Para proteger você e outros " -"usuários,\n" +"Durante sua recente tentativa de entrar ou fazer o envio no PyPI, notamos" +" que sua\n" +" senha aparece em violações de dados públicos. Para proteger você e " +"outros usuários,\n" " redefinimos sua senha preventivamente e você não poderá mais entrar ou " "fazer envio\n" " no PyPI com sua senha existente." @@ -1310,22 +1297,23 @@ msgid "" msgstr "" "O PyPI em si não sofreu uma violação. Essa é uma medida de proteção para " "reduzir\n" -" o risco de ataques de <a href=\"%(href)s\">credenciais de preenchimento</" -"a>\n" +" o risco de ataques de <a href=\"%(href)s\">credenciais de " +"preenchimento</a>\n" " contra o PyPI e seus usuários." #: warehouse/templates/email/password-compromised-hibp/body.html:34 #, python-format msgid "" -"To regain access to your account, <a href=\"%(reset_pw_url)s\">reset your " -"password</a> on PyPI. We also recommend that you go to <a href=" -"\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> and check your other " -"passwords and get yourself familiar with good password practices." +"To regain access to your account, <a href=\"%(reset_pw_url)s\">reset your" +" password</a> on PyPI. We also recommend that you go to <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> and check your " +"other passwords and get yourself familiar with good password practices." msgstr "" -"Para recuperar o acesso à sua conta, <a href=\"%(reset_pw_url)s\">redefina " -"sua senha</a> no PyPI. Também recomendamos que você acesse o <a href=" -"\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> e verifique suas outras " -"senhas e se familiarizar com boas práticas de senha." +"Para recuperar o acesso à sua conta, <a " +"href=\"%(reset_pw_url)s\">redefina sua senha</a> no PyPI. Também " +"recomendamos que você acesse o <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> e verifique suas " +"outras senhas e se familiarizar com boas práticas de senha." #: warehouse/templates/email/password-compromised-hibp/body.html:40 msgid "How do you know this?" @@ -1334,29 +1322,31 @@ msgstr "Como você sabe disso?" #: warehouse/templates/email/password-compromised-hibp/body.html:42 #, python-format msgid "" -"We use a free security service from <a href=\"%(have_i_been_pwned_url)s" -"\">HaveIBeenPwned</a>. When registering, authenticating, or updating your " -"password, we generate a SHA1 hash of your password and use the first 5 " -"characters of the hash to decide if the password is compromised. The " -"plaintext password is never stored by PyPI or sent to HaveIBeenPwned." +"We use a free security service from <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>. When registering, " +"authenticating, or updating your password, we generate a SHA1 hash of " +"your password and use the first 5 characters of the hash to decide if the" +" password is compromised. The plaintext password is never stored by PyPI " +"or sent to HaveIBeenPwned." msgstr "" -"Nós usamos um serviço de segurança gratuito do <a href=" -"\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>. Ao registrar, autenticar " -"ou atualizar sua senha, geramos um hash SHA1 de sua senha e usamos os " -"primeiros 5 caracteres do hash para decidir se a senha está comprometida. A " -"senha em texto não criptografado nunca é armazenada pelo PyPI ou enviada " -"para HaveIBeenPwned." +"Nós usamos um serviço de segurança gratuito do <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>. Ao registrar, " +"autenticar ou atualizar sua senha, geramos um hash SHA1 de sua senha e " +"usamos os primeiros 5 caracteres do hash para decidir se a senha está " +"comprometida. A senha em texto não criptografado nunca é armazenada pelo " +"PyPI ou enviada para HaveIBeenPwned." #: warehouse/templates/email/password-compromised-hibp/body.html:47 #, python-format msgid "" -"For more information, see our <a href=\"%(faq_url)s\">FAQ</a>. For help, you " -"can email <a href=\"%(email_href)s\">%(email_address)s</a> to communicate " -"with the PyPI administrators." +"For more information, see our <a href=\"%(faq_url)s\">FAQ</a>. For help, " +"you can email <a href=\"%(email_href)s\">%(email_address)s</a> to " +"communicate with the PyPI administrators." msgstr "" -"Para obter mais informações, consulte nosso <a href=\"%(faq_url)s\">FAQ</a>. " -"Para obter ajuda, você pode enviar um e-mail para <a href=\"%(email_href)s\">" -"%(email_address)s</a> para se comunicar com os administradores do PyPI." +"Para obter mais informações, consulte nosso <a " +"href=\"%(faq_url)s\">FAQ</a>. Para obter ajuda, você pode enviar um " +"e-mail para <a href=\"%(email_href)s\">%(email_address)s</a> para se " +"comunicar com os administradores do PyPI." #: warehouse/templates/email/password-reset/body.html:18 #, python-format @@ -1364,8 +1354,8 @@ msgid "" "Someone, perhaps you, has made a password reset request for your PyPI " "account '%(username)s'." msgstr "" -"Alguém, talvez você, fez uma solicitação de redefinição de senha para sua " -"conta PyPI \"%(username)s\"." +"Alguém, talvez você, fez uma solicitação de redefinição de senha para sua" +" conta PyPI \"%(username)s\"." #: warehouse/templates/email/password-reset/body.html:20 #, python-format @@ -1373,8 +1363,8 @@ msgid "" "If you wish to proceed with this request, <a href=\"%(href)s\">click to " "reset your password</a>." msgstr "" -"Se você deseja prosseguir com este pedido, <a href=\"%(href)s\">clique para " -"redefinir sua senha</a>." +"Se você deseja prosseguir com este pedido, <a href=\"%(href)s\">clique " +"para redefinir sua senha</a>." #: warehouse/templates/email/password-reset/body.html:22 #: warehouse/templates/email/verify-email/body.html:22 @@ -1387,14 +1377,14 @@ msgstr[1] "Esse link vai expirar em %(n_hours)s horas." #: warehouse/templates/email/password-reset/body.html:24 #: warehouse/templates/email/verify-email/body.html:24 msgid "If you did not make this request, you can safely ignore this email." -msgstr "" -"Se você não fez esse pedido, você pode ignorar com segurança este e-mail." +msgstr "Se você não fez esse pedido, você pode ignorar com segurança este e-mail." #: warehouse/templates/email/primary-email-change/body.html:18 #, python-format msgid "" -"The primary email for your PyPI account <strong>%(username)s</strong> has " -"been changed from <code>%(old_email)s</code> to <code>%(new_email)s</code>" +"The primary email for your PyPI account <strong>%(username)s</strong> has" +" been changed from <code>%(old_email)s</code> to " +"<code>%(new_email)s</code>" msgstr "" "O e-mail principal da sua conta PyPI <strong>%(username)s</strong> foi " "alterado de <code>%(old_email)s</code> para <code>%(new_email)s</code>" @@ -1405,8 +1395,8 @@ msgid "" "Someone, perhaps you, has added a %(method)s two-factor authentication " "method to your PyPI account <strong>%(username)s</strong>." msgstr "" -"Alguém, talvez você, adicionou um %(method)s método de autenticação de dois " -"fatores à sua conta PyPI <strong>%(username)s</strong>." +"Alguém, talvez você, adicionou um %(method)s método de autenticação de " +"dois fatores à sua conta PyPI <strong>%(username)s</strong>." #: warehouse/templates/email/two-factor-removed/body.html:18 #, python-format @@ -1414,26 +1404,26 @@ msgid "" "Someone, perhaps you, has removed a %(method)s two-factor authentication " "method from your PyPI account <strong>%(username)s</strong>." msgstr "" -"Alguém, talvez você, removeu um %(method)s método de autenticação de dois " -"fatores da sua conta PyPI <strong>%(username)s</strong>." +"Alguém, talvez você, removeu um %(method)s método de autenticação de dois" +" fatores da sua conta PyPI <strong>%(username)s</strong>." #: warehouse/templates/email/verify-email/body.html:18 #, python-format msgid "" -"Someone, perhaps you, has added this email address (<code>%(email_address)s</" -"code>) to their PyPI account." +"Someone, perhaps you, has added this email address " +"(<code>%(email_address)s</code>) to their PyPI account." msgstr "" -"Alguém, talvez você, adicionou este endereço de e-mail (<code>" -"%(email_address)s</code>) à sua conta PyPI." +"Alguém, talvez você, adicionou este endereço de e-mail " +"(<code>%(email_address)s</code>) à sua conta PyPI." #: warehouse/templates/email/verify-email/body.html:20 #, python-format msgid "" -"If you wish to proceed with this request, <a href=\"%(href)s\">click this " -"link to verify your email address</a>." +"If you wish to proceed with this request, <a href=\"%(href)s\">click this" +" link to verify your email address</a>." msgstr "" -"Se você deseja prosseguir com este pedido, <a href=\"%(href)s\">clique neste " -"link para verificar o seu endereço de e-mail</a>." +"Se você deseja prosseguir com este pedido, <a href=\"%(href)s\">clique " +"neste link para verificar o seu endereço de e-mail</a>." #: warehouse/templates/includes/current-user-indicator.html:29 msgid "Admin" @@ -1494,11 +1484,11 @@ msgstr "Sucesso" #: warehouse/templates/includes/hash-modal.html:23 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Hashes</a> for %(filename)s" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Hashes</a> for %(filename)s" msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Hashes</a> para %(filename)s" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Hashes</a> para %(filename)s" #: warehouse/templates/includes/hash-modal.html:28 #, python-format @@ -1551,8 +1541,7 @@ msgstr "Próximo" #: warehouse/templates/includes/session-notifications.html:23 #, python-format msgid "Your primary email address (%(email_address)s) is unverified." -msgstr "" -"Seu endereço de e-mail principal (%(email_address)s) não foi verificado." +msgstr "Seu endereço de e-mail principal (%(email_address)s) não foi verificado." #: warehouse/templates/includes/session-notifications.html:25 msgid "You do not have a primary email address." @@ -1565,11 +1554,11 @@ msgstr "Verifique seu e-mail ou adicione um novo endereço." #: warehouse/templates/includes/session-notifications.html:37 #, python-format msgid "" -"Two factor authentication is available, <a href=\"%(href)s\">enable it now " -"for your account.</a>" +"Two factor authentication is available, <a href=\"%(href)s\">enable it " +"now for your account.</a>" msgstr "" -"A autenticação de dois fatores está disponível, <a href=\"%(href)s" -"\">habilite-a agora para sua conta.</a>" +"A autenticação de dois fatores está disponível, <a " +"href=\"%(href)s\">habilite-a agora para sua conta.</a>" #: warehouse/templates/includes/accounts/profile-actions.html:16 msgid "Edit profile" @@ -1586,39 +1575,43 @@ msgstr "Estatísticas" #: warehouse/templates/includes/accounts/profile-actions.html:21 #, python-format msgid "" -"View statistics for your projects via <a href=\"%(libs_io_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or by " -"using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our public " -"dataset on Google BigQuery</a>" +"View statistics for your projects via <a href=\"%(libs_io_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, " +"or by using <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">our public dataset on Google BigQuery</a>" msgstr "" -"Veja estatísticas para seus projetos por meio de <a href=\"%(libs_io_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a> " -"ou usando <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">nosso " -"conjunto de dados público no Google BigQuery</a>" +"Veja estatísticas para seus projetos por meio de <a " +"href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io</a> ou usando <a href=\"%(gbq_href)s\" " +"target=\"_blank\" rel=\"noopener\">nosso conjunto de dados público no " +"Google BigQuery</a>" #: warehouse/templates/includes/accounts/profile-actions.html:30 #, python-format msgid "" -"View statistics for %(username)s's projects via <a href=\"%(libs_io_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or " -"by using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our " -"public dataset on Google BigQuery</a>" +"View statistics for %(username)s's projects via <a " +"href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io</a>, or by using <a href=\"%(gbq_href)s\" " +"target=\"_blank\" rel=\"noopener\">our public dataset on Google " +"BigQuery</a>" msgstr "" -"Veja estatísticas para os projetos de %(username)s por meio de <a href=" -"\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Libraries.io</a> ou usando <a href=\"%(gbq_href)s\" target=\"_blank\" rel=" -"\"noopener\">nosso conjunto de dados público no Google BigQuery</a>" +"Veja estatísticas para os projetos de %(username)s por meio de <a " +"href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io</a> ou usando <a href=\"%(gbq_href)s\" " +"target=\"_blank\" rel=\"noopener\">nosso conjunto de dados público no " +"Google BigQuery</a>" #: warehouse/templates/includes/accounts/profile-callout.html:18 #, python-format msgid "" "You have not uploaded any projects to PyPI, yet. To learn how to get " -"started, visit the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">Python Packaging User Guide</a>" +"started, visit the <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" -"Você ainda não enviou nenhum projeto para o PyPI. Para saber como começar, " -"visite o <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Guia de Usuário para Empacotamento de Python</a>" +"Você ainda não enviou nenhum projeto para o PyPI. Para saber como " +"começar, visite o <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Guia de Usuário para Empacotamento de " +"Python</a>" #: warehouse/templates/includes/accounts/profile-callout.html:23 #, python-format @@ -1685,15 +1678,16 @@ msgstr "Abrir relatório de issues/PRs:" #: warehouse/templates/includes/packaging/project-data.html:66 #, python-format msgid "" -"View statistics for this project via <a href=\"%(libs_io_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or by " -"using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our public " -"dataset on Google BigQuery</a>" +"View statistics for this project via <a href=\"%(libs_io_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, " +"or by using <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">our public dataset on Google BigQuery</a>" msgstr "" -"Veja estatísticas para este projeto por meio de <a href=\"%(libs_io_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a> ou " -"usando <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">nosso " -"conjunto de dados público no Google BigQuery</a>" +"Veja estatísticas para este projeto por meio de <a " +"href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io</a> ou usando <a href=\"%(gbq_href)s\" " +"target=\"_blank\" rel=\"noopener\">nosso conjunto de dados público no " +"Google BigQuery</a>" #: warehouse/templates/includes/packaging/project-data.html:74 msgid "Meta" @@ -1814,8 +1808,8 @@ msgstr "Remover e-mail" #: warehouse/templates/manage/account.html:138 msgid "" -"Add <abbr title=\"two factor authentication\">2FA</abbr> with authentication " -"application" +"Add <abbr title=\"two factor authentication\">2FA</abbr> with " +"authentication application" msgstr "" "Adicionar <abbr title=\"autenticação de dois fatores\">2FA</abbr> com " "aplicativo de autenticação" @@ -1835,8 +1829,8 @@ msgstr "Gerar códigos de recuperação" #: warehouse/templates/manage/account.html:147 #: warehouse/templates/manage/account/webauthn-provision.html:37 msgid "" -"Enable JavaScript to set up two factor authentication with a security device " -"(e.g. USB key)" +"Enable JavaScript to set up two factor authentication with a security " +"device (e.g. USB key)" msgstr "" "Ative JavaScript para configurar autenticação de dois fatores com um " "dispositivo de segurança (por exemplo, chave USB)" @@ -1845,13 +1839,13 @@ msgstr "" #: warehouse/templates/manage/account/webauthn-provision.html:53 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Upgrade your browser</a> to set up two factor authentication with a " -"security device (e.g. USB key)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Upgrade your browser</a> to set up two factor " +"authentication with a security device (e.g. USB key)" msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Atualize seu navegador</a> para configurar autenticação de dois fatores " -"com um dispositivo de segurança (por exemplo, chave USB)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Atualize seu navegador</a> para configurar autenticação " +"de dois fatores com um dispositivo de segurança (por exemplo, chave USB)" #: warehouse/templates/manage/account.html:166 #: warehouse/templates/manage/account.html:528 @@ -1900,9 +1894,9 @@ msgstr "Remover token de API" #: warehouse/templates/manage/account.html:216 #: warehouse/templates/manage/token.html:59 msgid "" -"Applications or scripts using this token will no longer have access to PyPI." -msgstr "" -"Aplicativos ou scripts usando esse token não terão mais acesso ao PyPI." +"Applications or scripts using this token will no longer have access to " +"PyPI." +msgstr "Aplicativos ou scripts usando esse token não terão mais acesso ao PyPI." #: warehouse/templates/manage/account.html:227 #, python-format @@ -1916,13 +1910,13 @@ msgstr "Imagem de perfil" #: warehouse/templates/manage/account.html:250 #, python-format msgid "" -"We use <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">gravatar.com</a> to generate your profile picture based on your " -"primary email address" +"We use <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">gravatar.com</a> to generate your profile picture based " +"on your primary email address" msgstr "" -"Nós usamos <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">gravatar.com</a> para gerar sua imagem de perfil com base no " -"seu endereço de e-mail principal" +"Nós usamos <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">gravatar.com</a> para gerar sua imagem de perfil com " +"base no seu endereço de e-mail principal" #: warehouse/templates/manage/account.html:257 msgid "Change image on gravatar.com" @@ -1939,7 +1933,8 @@ msgstr "Data de entrada" #: warehouse/templates/manage/account.html:279 #, python-format msgid "" -"Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be changed." +"Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be " +"changed." msgstr "" "Exibido em seu <a href=\"%(href)s\">perfil público</a>. Não pode ser " "alterado." @@ -1964,11 +1959,11 @@ msgstr "E-mail público" #: warehouse/templates/manage/account.html:319 #, python-format msgid "" -"One of your verified emails can be displayed on your <a href=\"%(href)s" -"\">public profile</a> to logged-in users." +"One of your verified emails can be displayed on your <a " +"href=\"%(href)s\">public profile</a> to logged-in users." msgstr "" -"Um de seus e-mails verificados pode ser exibido em seu <a href=\"%(href)s" -"\">perfil público</a> para usuários autenticados." +"Um de seus e-mails verificados pode ser exibido em seu <a " +"href=\"%(href)s\">perfil público</a> para usuários autenticados." #: warehouse/templates/manage/account.html:324 msgid "Update account" @@ -1980,16 +1975,17 @@ msgstr "E-mails da conta" #: warehouse/templates/manage/account.html:334 msgid "" -"You can associate several emails with your account. You can use any <span " -"class=\"badge badge--success\"><i class=\"fa fa-check\" aria-hidden=\"true" -"\"></i> Verified</span> email to recover your account, but only your <span " -"class=\"badge\">Primary</span> email will receive notifications." +"You can associate several emails with your account. You can use any <span" +" class=\"badge badge--success\"><i class=\"fa fa-check\" aria-" +"hidden=\"true\"></i> Verified</span> email to recover your account, but " +"only your <span class=\"badge\">Primary</span> email will receive " +"notifications." msgstr "" "Você pode associar vários e-mails à sua conta. Você pode usar qualquer " -"classe e-mail <span class=\"badge badge--success\"><i class=\"fa fa-check\" " -"aria-hidden=\"true\"></i> Verificado</span> para recuperar sua conta, mas " -"apenas o seu e-mail <span class=\"badge\">Principal</span> receberá " -"notificações." +"classe e-mail <span class=\"badge badge--success\"><i class=\"fa fa-" +"check\" aria-hidden=\"true\"></i> Verificado</span> para recuperar sua " +"conta, mas apenas o seu e-mail <span class=\"badge\">Principal</span> " +"receberá notificações." #: warehouse/templates/manage/account.html:345 msgid "Emails associated with your account" @@ -2035,9 +2031,9 @@ msgid "" "account. <a href=\"%(href)s\">Learn more about <abbr title=\"two factor " "authentication\">2FA</abbr></a>." msgstr "" -"A autenticação de dois fatores adiciona uma camada adicional de segurança à " -"sua conta. <a href=\"%(href)s\">Saiba mais sobre <abbr title=\"autenticação " -"de dois fatores\">2FA</abbr></a>." +"A autenticação de dois fatores adiciona uma camada adicional de segurança" +" à sua conta. <a href=\"%(href)s\">Saiba mais sobre <abbr " +"title=\"autenticação de dois fatores\">2FA</abbr></a>." #: warehouse/templates/manage/account.html:451 msgid "Two factor authentication methods enabled" @@ -2050,11 +2046,11 @@ msgstr "Método de dois fatores" #: warehouse/templates/manage/account.html:460 #: warehouse/templates/manage/account.html:570 msgid "" -"Authentication application (<abbr title=\"time-based one-time password" -"\">TOTP</abbr>)" +"Authentication application (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>)" msgstr "" -"Aplicativo de autenticação (<abbr title=\"time-based one-time password" -"\">TOTP</abbr>)" +"Aplicativo de autenticação (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>)" #: warehouse/templates/manage/account.html:462 #: warehouse/templates/manage/account.html:476 @@ -2074,7 +2070,8 @@ msgstr "Remover aplicativo" #: warehouse/templates/manage/account.html:568 msgid "Security device (<abbr title=\"web authentication\">WebAuthn</abbr>)" msgstr "" -"Dispositivo de segurança (<abbr title=\"web authentication\">WebAuthn</abbr>)" +"Dispositivo de segurança (<abbr title=\"web " +"authentication\">WebAuthn</abbr>)" #: warehouse/templates/manage/account.html:477 msgid "Remove two factor security device" @@ -2111,8 +2108,8 @@ msgstr "Você não habilitou a autenticação de dois fatores na sua conta." #: warehouse/templates/manage/account.html:512 #, python-format msgid "" -"<a href=\"%(href)s\">Verify your primary email address</a> to add two factor " -"authentication to your account." +"<a href=\"%(href)s\">Verify your primary email address</a> to add two " +"factor authentication to your account." msgstr "" "<a href=\"%(href)s\">Verifique seu endereço de e-mail principal</a> para " "adicionar autenticação de dois fatores à sua conta." @@ -2128,8 +2125,8 @@ msgid "" "API tokens provide an alternative way to authenticate when uploading " "packages to PyPI." msgstr "" -"Os tokens de API fornecem uma maneira alternativa de autenticar ao enviar " -"pacotes para o PyPI." +"Os tokens de API fornecem uma maneira alternativa de autenticar ao enviar" +" pacotes para o PyPI." #: warehouse/templates/manage/account.html:520 msgid "Learn more about API tokens" @@ -2147,8 +2144,8 @@ msgstr "Adicionar token de API" #: warehouse/templates/manage/account.html:544 #, python-format msgid "" -"<a href=\"%(href)s\">Verify your primary email address</a> to add API tokens " -"to your account." +"<a href=\"%(href)s\">Verify your primary email address</a> to add API " +"tokens to your account." msgstr "" "<a href=\"%(href)s\">Verifique seu endereço de e-mail principal</a> para " "adicionar tokens de API à sua conta." @@ -2226,10 +2223,11 @@ msgstr "Autenticação de dois fatores adicionada" #: warehouse/templates/manage/account.html:613 #: warehouse/templates/manage/account.html:623 msgid "" -"Method: Security device (<abbr title=\"web authentication\">WebAuthn</abbr>)" +"Method: Security device (<abbr title=\"web " +"authentication\">WebAuthn</abbr>)" msgstr "" -"Método: Dispositivo de segurança (<abbr title=\"web authentication" -"\">WebAuthn</abbr>)" +"Método: Dispositivo de segurança (<abbr title=\"web " +"authentication\">WebAuthn</abbr>)" #: warehouse/templates/manage/account.html:614 #: warehouse/templates/manage/account.html:624 @@ -2293,8 +2291,8 @@ msgstr "Identificador único:" #: warehouse/templates/manage/account.html:662 msgid "Events appear here as security-related actions occur on your account." msgstr "" -"Os eventos aparecem aqui como as ações relacionadas à segurança que ocorrem " -"na sua conta." +"Os eventos aparecem aqui como as ações relacionadas à segurança que " +"ocorrem na sua conta." #: warehouse/templates/manage/account.html:664 msgid "Recent account activity" @@ -2320,8 +2318,7 @@ msgid "IP address" msgstr "Endereço IP" #: warehouse/templates/manage/account.html:687 -msgid "" -"Events will appear here as security-related actions occur on your account." +msgid "Events will appear here as security-related actions occur on your account." msgstr "" "Os eventos aparecerão aqui como as ações relacionadas à segurança que " "ocorrem na sua conta." @@ -2348,25 +2345,25 @@ msgid_plural "" " " msgstr[0] "" "\n" -" Sua conta é atualmente a <strong>única proprietária</strong> de " -"%(count)s projeto.\n" +" Sua conta é atualmente a <strong>única proprietária</strong> de" +" %(count)s projeto.\n" " " msgstr[1] "" "\n" -" Sua conta é atualmente a <strong>única proprietária</strong> de " -"%(count)s projetos.\n" +" Sua conta é atualmente a <strong>única proprietária</strong> de" +" %(count)s projetos.\n" " " #: warehouse/templates/manage/account.html:704 msgid "" "\n" -" You must transfer ownership or delete this project before you can " -"delete your account.\n" +" You must transfer ownership or delete this project before you " +"can delete your account.\n" " " msgid_plural "" "\n" -" You must transfer ownership or delete these projects before you " -"can delete your account.\n" +" You must transfer ownership or delete these projects before you" +" can delete your account.\n" " " msgstr[0] "" "\n" @@ -2375,18 +2372,18 @@ msgstr[0] "" " " msgstr[1] "" "\n" -" Você tem que transferir a propriedade ou excluir estes projetos " -"antes que você possa excluir sua conta.\n" +" Você tem que transferir a propriedade ou excluir estes projetos" +" antes que você possa excluir sua conta.\n" " " #: warehouse/templates/manage/account.html:714 #, python-format msgid "" -"<a href=\"%(transfer_href)s\">transfer ownership</a> or <a href=" -"\"%(delete_href)s\">delete project</a>" +"<a href=\"%(transfer_href)s\">transfer ownership</a> or <a " +"href=\"%(delete_href)s\">delete project</a>" msgstr "" -"<a href=\"%(transfer_href)s\">transferir propriedade</a> ou <a href=" -"\"%(delete_href)s\">excluir projeto</a>" +"<a href=\"%(transfer_href)s\">transferir propriedade</a> ou <a " +"href=\"%(delete_href)s\">excluir projeto</a>" #: warehouse/templates/manage/account.html:723 #: warehouse/templates/manage/token.html:162 @@ -2413,12 +2410,12 @@ msgstr "Destruir documentação" #: warehouse/templates/manage/documentation.html:28 #, python-format msgid "" -"If you would like to DESTROY any existing documentation hosted at <a href=" -"\"%(url)s\">%(url)s</a> there is <strong>no</strong> undo, as uploading new " -"documentation is no longer supported." +"If you would like to DESTROY any existing documentation hosted at <a " +"href=\"%(url)s\">%(url)s</a> there is <strong>no</strong> undo, as " +"uploading new documentation is no longer supported." msgstr "" -"Caso você queira DESTRUIR qualquer documentação existente hospedada em <a " -"href=\"%(url)s\">%(url)s</a> saiba que <strong>não</strong> tem como " +"Caso você queira DESTRUIR qualquer documentação existente hospedada em <a" +" href=\"%(url)s\">%(url)s</a> saiba que <strong>não</strong> tem como " "desfazer, pois não há mais suporte a envio de nova documentação." #: warehouse/templates/manage/documentation.html:35 @@ -2446,8 +2443,8 @@ msgstr "Histórico do projeto \"%(project_name)s\"" #: warehouse/templates/manage/history.html:25 msgid "" -"Each time you (or your collaborators) perform a security action related to " -"this project, the action is recorded and displayed here." +"Each time you (or your collaborators) perform a security action related " +"to this project, the action is recorded and displayed here." msgstr "" "Cada vez que você (ou seus colaboradores) executa uma ação de segurança " "relacionada a este projeto, a ação é registrada e exibida aqui." @@ -2502,13 +2499,15 @@ msgstr "" #, python-format msgid "<a href=\"%(href)s\">%(username)s</a> removed as project %(role_name)s" msgstr "" -"<a href=\"%(href)s\">%(username)s</a> removido como %(role_name)s do projeto" +"<a href=\"%(href)s\">%(username)s</a> removido como %(role_name)s do " +"projeto" #: warehouse/templates/manage/history.html:60 #, python-format msgid "<a href=\"%(href)s\">%(username)s</a> changed to project %(role_name)s" msgstr "" -"<a href=\"%(href)s\">%(username)s</a> alterado para %(role_name)s do projeto" +"<a href=\"%(href)s\">%(username)s</a> alterado para %(role_name)s do " +"projeto" #: warehouse/templates/manage/history.html:62 msgid "Changed by:" @@ -2549,11 +2548,11 @@ msgstr "" #: warehouse/templates/manage/journal.html:28 #, python-format msgid "" -"This feature will be deprecated in the future, replaced by the <a href=" -"\"%(href)s\">security history page</a>." +"This feature will be deprecated in the future, replaced by the <a " +"href=\"%(href)s\">security history page</a>." msgstr "" -"Este recurso ficará obsoleto no futuro, substituído pela <a href=\"%(href)s" -"\">página de histórico de segurança</a>." +"Este recurso ficará obsoleto no futuro, substituído pela <a " +"href=\"%(href)s\">página de histórico de segurança</a>." #: warehouse/templates/manage/journal.html:32 #, python-format @@ -2679,12 +2678,12 @@ msgstr "Ver" #, python-format msgid "" "You have not uploaded any projects to PyPI, yet. To learn how to get " -"started, visit the <a href=\"%(href)s\" target=\"_blank\" rel=\"noopener" -"\">Python Packaging User Guide</a>" +"started, visit the <a href=\"%(href)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" -"Você ainda não enviou nenhum projeto para o PyPI. Para saber como começar, " -"visite o <a href=\"%(href)s\" target=\"_blank\" rel=\"noopener\">Guia de " -"Usuário para Empacotamento de Python</a>" +"Você ainda não enviou nenhum projeto para o PyPI. Para saber como " +"começar, visite o <a href=\"%(href)s\" target=\"_blank\" " +"rel=\"noopener\">Guia de Usuário para Empacotamento de Python</a>" #: warehouse/templates/manage/release.html:18 #, python-format @@ -2788,12 +2787,12 @@ msgstr "Descartar" #: warehouse/templates/manage/release.html:119 #, python-format msgid "" -"Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" +"Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" -"Saiba mais sobre como enviar arquivos no <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Guia de Usuário para " -"Empacotamento de Python</a>" +"Saiba mais sobre como enviar arquivos no <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Guia de Usuário " +"para Empacotamento de Python</a>" #: warehouse/templates/manage/release.html:122 msgid "Release settings" @@ -2808,23 +2807,23 @@ msgstr "Excluir lançamento" #, python-format msgid "" "\n" -" Deleting will irreversibly delete this release along with %(count)s " -"file.\n" +" Deleting will irreversibly delete this release along with " +"%(count)s file.\n" " " msgid_plural "" "\n" -" Deleting will irreversibly delete this release along with %(count)s " -"files.\n" +" Deleting will irreversibly delete this release along with " +"%(count)s files.\n" " " msgstr[0] "" "\n" -" A exclusão vai excluir irreversivelmente este lançamento junto com " -"%(count)s arquivo.\n" +" A exclusão vai excluir irreversivelmente este lançamento junto " +"com %(count)s arquivo.\n" " " msgstr[1] "" "\n" -" A exclusão vai excluir irreversivelmente este lançamento junto com " -"%(count)s arquivos.\n" +" A exclusão vai excluir irreversivelmente este lançamento junto " +"com %(count)s arquivos.\n" " " #: warehouse/templates/manage/release.html:135 @@ -2835,15 +2834,15 @@ msgstr "A exclusão vai excluir irreversivelmente este lançamento." #: warehouse/templates/manage/releases.html:91 #, python-format msgid "" -"You will not be able to re-upload a new distribution of the same type with " -"the same version number. Consider making a new release or a <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">post " -"release</a> instead." +"You will not be able to re-upload a new distribution of the same type " +"with the same version number. Consider making a new release or a <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">post release</a> instead." msgstr "" -"Você não será capaz de enviar novamente uma nova distribuição do mesmo tipo " -"com o mesmo número de versão. Em vez disso, considere fazer um novo " -"lançamento ou um <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">pós-lançamento</a>." +"Você não será capaz de enviar novamente uma nova distribuição do mesmo " +"tipo com o mesmo número de versão. Em vez disso, considere fazer um novo " +"lançamento ou um <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">pós-lançamento</a>." #: warehouse/templates/manage/release.html:142 #: warehouse/templates/manage/releases.html:27 @@ -2925,13 +2924,13 @@ msgstr "Nenhum lançamento encontrado" #: warehouse/templates/manage/releases.html:109 #, python-format msgid "" -"Learn how to create a new release on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>" +"Learn how to create a new release on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" msgstr "" -"Saiba mais como criar um novo lançamento no <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Guia de Usuário para " -"Empacotamento de Python</a>" +"Saiba mais como criar um novo lançamento no <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Guia de Usuário " +"para Empacotamento de Python</a>" #: warehouse/templates/manage/roles.html:18 #, python-format @@ -2961,8 +2960,8 @@ msgstr "Mantenedor" #: warehouse/templates/manage/roles.html:28 #: warehouse/templates/pages/help.html:510 msgid "" -"Can upload releases for a package. Cannot add collaborators. Cannot delete " -"files, releases, or the project." +"Can upload releases for a package. Cannot add collaborators. Cannot " +"delete files, releases, or the project." msgstr "" "Pode enviar lançamentos para um pacote. Não consegue adicionar " "colaboradores. Não consegue excluir arquivos, lançamentos ou o projeto." @@ -2979,8 +2978,8 @@ msgid "" "Can upload releases. Can add other collaborators. Can delete files, " "releases, or the entire project." msgstr "" -"Pode enviar lançamentos. Pode adicionar outros colaboradores. Pode excluir " -"arquivos, lançamentos ou todo o projeto." +"Pode enviar lançamentos. Pode adicionar outros colaboradores. Pode " +"excluir arquivos, lançamentos ou todo o projeto." #: warehouse/templates/manage/roles.html:34 #, python-format @@ -3046,26 +3045,29 @@ msgstr "Descrição do projeto e barra lateral" #: warehouse/templates/manage/settings.html:43 #, python-format msgid "" -"To set the '%(project_name)s' description, author, links, classifiers, and " -"other details for your next release, use the <a href=\"%(setup_args_href)s\" " -"rel=\"noopener\" target=\"_blank\"><code>setup()</code> arguments in your " -"<code>setup.py</code> file</a>. Updating these fields will not change the " -"metadata for past releases. Additionally, you <strong>must</strong> use <a " -"href=\"%(twine_docs_href)s\" rel=\"noopener\" target=\"_blank\">Twine</a> to " -"upload your files in order to get full support for these fields. See <a href=" -"\"%(distribution_href)s\" rel=\"noopener\" target=\"_blank\">the Python " -"Packaging User Guide</a> for more help." -msgstr "" -"Para definir a descrição, autor, links, classificadores e outros detalhes " -"para seu próximo lançamento do \"%(project_name)s\", use os argumentos <a " -"href=\"%(setup_args_href)s\" rel=\"noopener\" target=\"_blank" -"\"><code>setup()</code> em seu arquivo <code>setup.py</code></a>. O " -"carregamento desses campos não vai alterar os metadados de lançamentos " -"anteriores. Além disso, você <strong>deve</strong> usar <a href=" -"\"%(twine_docs_href)s\" rel=\"noopener\" target=\"_blank\">Twine</a> para " -"enviar seus arquivos para ter total suporte a esses campos. Veja o <a href=" -"\"%(distribution_href)s\" rel=\"noopener\" target=\"_blank\">Guia de Usuário " -"para Empacotamento de Python</a> para mais ajuda." +"To set the '%(project_name)s' description, author, links, classifiers, " +"and other details for your next release, use the <a " +"href=\"%(setup_args_href)s\" rel=\"noopener\" " +"target=\"_blank\"><code>setup()</code> arguments in your " +"<code>setup.py</code> file</a>. Updating these fields will not change the" +" metadata for past releases. Additionally, you <strong>must</strong> use " +"<a href=\"%(twine_docs_href)s\" rel=\"noopener\" " +"target=\"_blank\">Twine</a> to upload your files in order to get full " +"support for these fields. See <a href=\"%(distribution_href)s\" " +"rel=\"noopener\" target=\"_blank\">the Python Packaging User Guide</a> " +"for more help." +msgstr "" +"Para definir a descrição, autor, links, classificadores e outros detalhes" +" para seu próximo lançamento do \"%(project_name)s\", use os argumentos " +"<a href=\"%(setup_args_href)s\" rel=\"noopener\" " +"target=\"_blank\"><code>setup()</code> em seu arquivo " +"<code>setup.py</code></a>. O carregamento desses campos não vai alterar " +"os metadados de lançamentos anteriores. Além disso, você " +"<strong>deve</strong> usar <a href=\"%(twine_docs_href)s\" " +"rel=\"noopener\" target=\"_blank\">Twine</a> para enviar seus arquivos " +"para ter total suporte a esses campos. Veja o <a " +"href=\"%(distribution_href)s\" rel=\"noopener\" target=\"_blank\">Guia de" +" Usuário para Empacotamento de Python</a> para mais ajuda." #: warehouse/templates/manage/settings.html:54 #: warehouse/templates/manage/settings.html:85 @@ -3079,17 +3081,17 @@ msgstr "A exclusão deste projeto vai:" #: warehouse/templates/manage/settings.html:62 #, python-format msgid "" -"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s " -"release</a>" +"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s" +" release</a>" msgid_plural "" -"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s " -"releases</a>" +"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s" +" releases</a>" msgstr[0] "" -"Excluir irreversivelmente o projeto junto com <a href=\"%(href)s\">%(count)s " -"lançamento</a>" +"Excluir irreversivelmente o projeto junto com <a " +"href=\"%(href)s\">%(count)s lançamento</a>" msgstr[1] "" -"Excluir irreversivelmente o projeto junto com <a href=\"%(href)s\">%(count)s " -"lançamentos</a>" +"Excluir irreversivelmente o projeto junto com <a " +"href=\"%(href)s\">%(count)s lançamentos</a>" #: warehouse/templates/manage/settings.html:68 msgid "Irreversibly delete the project" @@ -3103,17 +3105,18 @@ msgstr "" #: warehouse/templates/manage/settings.html:74 msgid "" -"This user will be able to make new releases under this project name, so long " -"as the distribution filenames do not match filenames from a previously " -"released distribution (all PyPI distribution filenames are unique, as they " -"are generated by combining the project name + version number + distribution " -"type)" +"This user will be able to make new releases under this project name, so " +"long as the distribution filenames do not match filenames from a " +"previously released distribution (all PyPI distribution filenames are " +"unique, as they are generated by combining the project name + version " +"number + distribution type)" msgstr "" "Esse usuário poderá fazer novos laçamentos com esse nome de projeto, " -"contanto que os nomes de arquivos de distribuição não correspondam a nomes " -"de arquivos de uma distribuição lançada anteriormente (todos os nomes de " -"arquivos de distribuição do PyPI são únicos, pois eles são gerados " -"combinando o nome do projeto + número de versão + tipo de distribuição)" +"contanto que os nomes de arquivos de distribuição não correspondam a " +"nomes de arquivos de uma distribuição lançada anteriormente (todos os " +"nomes de arquivos de distribuição do PyPI são únicos, pois eles são " +"gerados combinando o nome do projeto + número de versão + tipo de " +"distribuição)" #: warehouse/templates/manage/settings.html:85 msgid "Project Name" @@ -3150,8 +3153,8 @@ msgstr "Projeto \"%(project)s\"" #: warehouse/templates/manage/token.html:44 msgid "" -"For security reasons this token will only appear once. <strong>Copy it now.</" -"strong>" +"For security reasons this token will only appear once. <strong>Copy it " +"now.</strong>" msgstr "" "Por motivos de segurança, este token vai aparecer apenas uma vez. " "<strong>Copie-o agora.</strong>" @@ -3180,21 +3183,22 @@ msgstr "Definir seu nome de usuário para <code>%(token)s</code>" #: warehouse/templates/manage/token.html:71 #, python-format msgid "" -"Set your password to the token value, including the <code>%(prefix)s</code> " -"prefix" +"Set your password to the token value, including the " +"<code>%(prefix)s</code> prefix" msgstr "" -"Definir sua senha para o valor do token, incluindo o prefixo <code>" -"%(prefix)s</code>" +"Definir sua senha para o valor do token, incluindo o prefixo " +"<code>%(prefix)s</code>" #: warehouse/templates/manage/token.html:77 #, python-format msgid "" -"For example, if you are using <a href=\"%(href)s\">Twine</a> to upload your " -"projects to PyPI, set up your <code>%(filename)s</code> file like this:" +"For example, if you are using <a href=\"%(href)s\">Twine</a> to upload " +"your projects to PyPI, set up your <code>%(filename)s</code> file like " +"this:" msgstr "" -"Por exemplo, se você está usando <a href=\"%(href)s\">Twine</a> para enviar " -"seus projetos para o PyPI, configure seu arquivo <code>%(filename)s</code> " -"para algo como isso:" +"Por exemplo, se você está usando <a href=\"%(href)s\">Twine</a> para " +"enviar seus projetos para o PyPI, configure seu arquivo " +"<code>%(filename)s</code> para algo como isso:" #: warehouse/templates/manage/token.html:87 #, python-format @@ -3203,14 +3207,14 @@ msgid "" "multiple projects to PyPI, you can set up your <code>%(filename)s</code> " "file like this:" msgstr "" -"Por exemplo, se você está usando <a href=\"%(href)s\">Twine</a> para enviar " -"vários projetos para o PyPI, você pode configurar seu arquivo <code>" -"%(filename)s</code> para algo como:" +"Por exemplo, se você está usando <a href=\"%(href)s\">Twine</a> para " +"enviar vários projetos para o PyPI, você pode configurar seu arquivo " +"<code>%(filename)s</code> para algo como:" #: warehouse/templates/manage/token.html:99 msgid "" -"either a user-scoped token or a project-scoped token you want to set as the " -"default" +"either a user-scoped token or a project-scoped token you want to set as " +"the default" msgstr "" "um token de escopo do usuário ou um token de escopo de projeto que você " "deseja definir como o padrão" @@ -3225,17 +3229,17 @@ msgid "" "You can then use <code>%(command)s</code> to switch to the correct token " "when uploading to PyPI." msgstr "" -"Você pode usar <code>%(command)s</code> para trocar para o token correto ao " -"enviar para PyPI." +"Você pode usar <code>%(command)s</code> para trocar para o token correto " +"ao enviar para PyPI." #: warehouse/templates/manage/token.html:112 #, python-format msgid "" -"For further instructions on how to use this token, <a href=\"%(href)s" -"\">visit the PyPI help page</a>." +"For further instructions on how to use this token, <a " +"href=\"%(href)s\">visit the PyPI help page</a>." msgstr "" -"Para mais instruções sobre como usar este token, <a href=\"%(href)s\">visite " -"a página de ajuda do PyPI</a>." +"Para mais instruções sobre como usar este token, <a " +"href=\"%(href)s\">visite a página de ajuda do PyPI</a>." #: warehouse/templates/manage/token.html:120 msgid "Add another token" @@ -3263,11 +3267,11 @@ msgstr "Projeto:" #: warehouse/templates/manage/token.html:163 msgid "" -"An API token scoped to your entire account will have upload permissions for " -"all of your current and future projects." +"An API token scoped to your entire account will have upload permissions " +"for all of your current and future projects." msgstr "" -"Um token de API com escopo para toda a sua conta terá permissões de envio " -"para todos os seus projetos atuais e futuros." +"Um token de API com escopo para toda a sua conta terá permissões de envio" +" para todos os seus projetos atuais e futuros." #: warehouse/templates/manage/token.html:166 msgid "Add token" @@ -3283,32 +3287,34 @@ msgstr "Gerar novamente códigos de recuperação" #: warehouse/templates/manage/account/recovery_codes-provision.html:46 msgid "" -"If you lose access to your authentication application or security key(s), " -"you’ll need to use one of these recovery codes to log into your PyPI " +"If you lose access to your authentication application or security key(s)," +" you’ll need to use one of these recovery codes to log into your PyPI " "account. Each code can only be used <strong>once</strong>." msgstr "" "Se você perder o acesso ao seu aplicativo de autenticação ou chave(s) de " -"segurança, você precisará usar um desses códigos de recuperação para entrar " -"na sua conta PyPI. Cada código só pode ser usado <strong>uma vez</strong>." +"segurança, você precisará usar um desses códigos de recuperação para " +"entrar na sua conta PyPI. Cada código só pode ser usado <strong>uma " +"vez</strong>." #: warehouse/templates/manage/account/recovery_codes-provision.html:47 msgid "" -"These codes should <strong>only</strong> be used for account recovery, not " -"for typical logins." +"These codes should <strong>only</strong> be used for account recovery, " +"not for typical logins." msgstr "" -"Estes códigos devem <strong>somente</strong> ser usados para recuperação de " -"contas, não para início de sessão típicos." +"Estes códigos devem <strong>somente</strong> ser usados para recuperação " +"de contas, não para início de sessão típicos." #: warehouse/templates/manage/account/recovery_codes-provision.html:48 msgid "" -"<strong>Keep these somewhere safe</strong>. If you lose your authentication " -"application or security key(s) and do not have access to these recovery " -"codes, you may permanently lose access to your PyPI account!" +"<strong>Keep these somewhere safe</strong>. If you lose your " +"authentication application or security key(s) and do not have access to " +"these recovery codes, you may permanently lose access to your PyPI " +"account!" msgstr "" -"<strong>Mantenha estes em algum lugar seguro</strong>. Se você perder seu " -"aplicativo de autenticação ou chave(s) de segurança e não tiver acesso a " -"esses códigos de recuperação, poderá perder permanentemente o acesso à sua " -"conta PyPI!" +"<strong>Mantenha estes em algum lugar seguro</strong>. Se você perder seu" +" aplicativo de autenticação ou chave(s) de segurança e não tiver acesso a" +" esses códigos de recuperação, poderá perder permanentemente o acesso à " +"sua conta PyPI!" #: warehouse/templates/manage/account/recovery_codes-provision.html:52 msgid "Save your Recovery Codes" @@ -3339,13 +3345,14 @@ msgstr "Configurar 2FA com um aplicativo de autenticação (TOTP)" #: warehouse/templates/manage/account/totp-provision.html:32 #, python-format msgid "" -"PyPI supports any application that follows the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based " -"one-time password\">TOTP</abbr> standard</a>." +"PyPI supports any application that follows the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title" +"=\"time-based one-time password\">TOTP</abbr> standard</a>." msgstr "" -"PyPI possui suporte a qualquer aplicativo que segue o <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">padrão <abbr title=" -"\"time-based one-time password\">TOTP</abbr></a>." +"PyPI possui suporte a qualquer aplicativo que segue o <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">padrão <abbr title=\"time-based one-time " +"password\">TOTP</abbr></a>." #: warehouse/templates/manage/account/totp-provision.html:36 #, python-format @@ -3353,8 +3360,8 @@ msgid "" "Visit <a href=\"%(href)s\">PyPI's help page</a> for a list of compatible " "applications." msgstr "" -"Visite a <a href=\"%(href)s\">página de ajuda do PyPI</a> para uma lista de " -"aplicativos compatíveis." +"Visite a <a href=\"%(href)s\">página de ajuda do PyPI</a> para uma lista " +"de aplicativos compatíveis." #: warehouse/templates/manage/account/totp-provision.html:42 msgid "Set up your application" @@ -3362,13 +3369,12 @@ msgstr "Configurar seu aplicativo" #: warehouse/templates/manage/account/totp-provision.html:45 msgid "Scan the QR code with the authentication application of your choice." -msgstr "" -"Digitalize o código QR com o aplicativo de autenticação de sua escolha." +msgstr "Digitalize o código QR com o aplicativo de autenticação de sua escolha." #: warehouse/templates/manage/account/totp-provision.html:46 msgid "" -"For security reasons, you can only associate one authentication application " -"per PyPI account." +"For security reasons, you can only associate one authentication " +"application per PyPI account." msgstr "" "Por motivos de segurança, você só pode associar um aplicativo de " "autenticação por conta PyPI." @@ -3393,11 +3399,11 @@ msgstr "Código de autenticação" #: warehouse/templates/manage/account/totp-provision.html:73 msgid "" -"To finalize the set up process, enter the authentication code provided by " -"your application." +"To finalize the set up process, enter the authentication code provided by" +" your application." msgstr "" -"Para finalizar o processo de configuração, insira o código de autenticação " -"fornecido pelo seu aplicativo." +"Para finalizar o processo de configuração, insira o código de " +"autenticação fornecido pelo seu aplicativo." #: warehouse/templates/manage/account/totp-provision.html:85 msgid "Set up application" @@ -3405,32 +3411,32 @@ msgstr "Configurar aplicativo" #: warehouse/templates/manage/account/webauthn-provision.html:17 msgid "Set up 2FA with a security device (e.g. USB key)" -msgstr "" -"Configurar 2FA com um dispositivo de segurança (por exemplo, chave USB)" +msgstr "Configurar 2FA com um dispositivo de segurança (por exemplo, chave USB)" #: warehouse/templates/manage/account/webauthn-provision.html:26 #, python-format msgid "" -"PyPI supports any device that adheres to the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." +"PyPI supports any device that adheres to the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." msgstr "" -"PyPI possui suporte a qualquer dispositivo que adere ao <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">padrão FIDO</a>." +"PyPI possui suporte a qualquer dispositivo que adere ao <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">padrão FIDO</a>." #: warehouse/templates/manage/account/webauthn-provision.html:28 #, python-format msgid "" -"Popular <em>USB keys</em> include <a href=\"%(yubico_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=" -"\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Google Titan</a> and <a href=\"%(thetis_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Thetis</a>." +"Popular <em>USB keys</em> include <a href=\"%(yubico_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> and <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." msgstr "" -"<em>Chaves USB</em> populares incluem <a href=\"%(yubico_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=" -"\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Google Titan</a> e <a href=\"%(thetis_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Thetis</a>." +"<em>Chaves USB</em> populares incluem <a href=\"%(yubico_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> e <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." #: warehouse/templates/manage/account/webauthn-provision.html:43 msgid "Name your device to begin" @@ -3445,8 +3451,8 @@ msgid "" "Please give this device a name. 64 characters or fewer. All Unicode is " "valid, including spaces." msgstr "" -"Por favor, dê um nome a este dispositivo. 64 caracteres ou menos. Todos os " -"Unicode são válidos, incluindo espaços." +"Por favor, dê um nome a este dispositivo. 64 caracteres ou menos. Todos " +"os Unicode são válidos, incluindo espaços." #: warehouse/templates/manage/account/webauthn-provision.html:65 msgid "Set up security device" @@ -3455,21 +3461,22 @@ msgstr "Configurar dispositivo de segurança" #: warehouse/templates/manage/account/webauthn-provision.html:74 #, python-format msgid "" -"<strong>Not working?</strong> Check you're using a device that follows the " -"<a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">FIDO specification</a> and a <a href=\"%(mozilla_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">compatible browser</a>." +"<strong>Not working?</strong> Check you're using a device that follows " +"the <a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">FIDO specification</a> and a <a " +"href=\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">compatible browser</a>." msgstr "" "<strong>Não está funcionando?</strong> Verifique se você está usando um " -"dispositivo que segue a <a href=\"%(fido_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">especificação FIDO</a> e um <a href=" -"\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">navegador compatível</a>." +"dispositivo que segue a <a href=\"%(fido_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">especificação FIDO</a> e um <a " +"href=\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">navegador compatível</a>." #: warehouse/templates/manage/account/webauthn-provision.html:78 msgid "" -"Note that some older USB keys do not adhere to the FIDO standard and will " -"not work with PyPI." +"Note that some older USB keys do not adhere to the FIDO standard and will" +" not work with PyPI." msgstr "" "Note que algumas chaves USB mais antigas não aderem ao padrão FIDO e não " "funcionarão com o PyPI." @@ -3525,8 +3532,7 @@ msgstr "Descrição do projeto" #: warehouse/templates/packaging/detail.html:150 #: warehouse/templates/packaging/detail.html:186 msgid "Release history. Focus will be moved to the history panel." -msgstr "" -"Histórico de lançamentos. O foco será movido para o painel de histórico." +msgstr "Histórico de lançamentos. O foco será movido para o painel de histórico." #: warehouse/templates/packaging/detail.html:152 #: warehouse/templates/packaging/detail.html:188 @@ -3574,12 +3580,12 @@ msgstr "pré-lançamento" #, python-format msgid "" "Download the file for your platform. If you're not sure which to choose, " -"learn more about <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">installing packages</a>." +"learn more about <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">installing packages</a>." msgstr "" -"Baixe o arquivo para sua plataforma. Se você não tem certeza qual escolher, " -"saiba mais sobre <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">instalação de pacotes</a>." +"Baixe o arquivo para sua plataforma. Se você não tem certeza qual " +"escolher, saiba mais sobre <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">instalação de pacotes</a>." #: warehouse/templates/packaging/detail.html:273 #, python-format @@ -3598,38 +3604,41 @@ msgstr "Hashes" #: warehouse/templates/pages/classifiers.html:22 msgid "" -"Each project's maintainers provide PyPI with a list of \"trove classifiers\" " -"to categorize each release, describing who it's for, what systems it can run " -"on, and how mature it is." +"Each project's maintainers provide PyPI with a list of \"trove " +"classifiers\" to categorize each release, describing who it's for, what " +"systems it can run on, and how mature it is." msgstr "" "Os mantenedores de cada projeto fornecem ao PyPI uma lista de " -"\"classificadores de Trove\" para categorizar cada lançamento, descrevendo " -"para quem é, em que sistemas ele funciona e quão maduro ele está." +"\"classificadores de Trove\" para categorizar cada lançamento, " +"descrevendo para quem é, em que sistemas ele funciona e quão maduro ele " +"está." #: warehouse/templates/pages/classifiers.html:23 msgid "" -"These standardized classifiers can then be used by community members to find " -"projects based on their desired criteria." +"These standardized classifiers can then be used by community members to " +"find projects based on their desired criteria." msgstr "" -"Esses classificadores padronizados, em seguida, podem ser usados por membros " -"da comunidade para encontrar projetos com base em seus critérios desejados." +"Esses classificadores padronizados, em seguida, podem ser usados por " +"membros da comunidade para encontrar projetos com base em seus critérios " +"desejados." #: warehouse/templates/pages/classifiers.html:25 #, python-format msgid "" -"Instructions for how to add trove classifiers to a project can be found on " -"the <a href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging User Guide</a>. To read the original " -"classifier specification, refer to <a href=\"%(pep301_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python " -"enhancement proposal\">PEP</abbr> 301</a>." +"Instructions for how to add trove classifiers to a project can be found " +"on the <a href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>. To read the original " +"classifier specification, refer to <a href=\"%(pep301_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 301</a>." msgstr "" -"Instruções sobre como adicionar classificadores de Trove a um projeto podem " -"ser encontradas no <a href=\"%(ppug_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Guia de Usuário para Empacotamento de Python</" -"a>. Para ler a especificação de classificador original, consulte a <a href=" -"\"%(pep301_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><abbr title=\"Proposta de aprimoramento do Python\">PEP</abbr> 301</a>." +"Instruções sobre como adicionar classificadores de Trove a um projeto " +"podem ser encontradas no <a href=\"%(ppug_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Guia de Usuário para Empacotamento de " +"Python</a>. Para ler a especificação de classificador original, consulte " +"a <a href=\"%(pep301_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><abbr title=\"Proposta de aprimoramento do " +"Python\">PEP</abbr> 301</a>." #: warehouse/templates/pages/classifiers.html:31 msgid "List of classifiers" @@ -3643,21 +3652,23 @@ msgstr "Nota:" #: warehouse/templates/pages/help.html:20 #, python-format msgid "" -"All users submitting feedback, reporting issues or contributing to Warehouse " -"are expected to follow the <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">PyPA Code of Conduct</a>." +"All users submitting feedback, reporting issues or contributing to " +"Warehouse are expected to follow the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPA Code of " +"Conduct</a>." msgstr "" -"Todos os usuários que enviam comentários, relatam problemas ou contribuem " -"para o Warehouse deverão seguir o <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Código de Conduta do PyPA</a>." +"Todos os usuários que enviam comentários, relatam problemas ou contribuem" +" para o Warehouse deverão seguir o <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Código de Conduta " +"do PyPA</a>." #: warehouse/templates/pages/help.html:31 #, python-format msgid "" "If you lose your %(method)s and can no longer log in, you may " "<strong>permanently lose access to your account</strong>. You should " -"generate and securely store <a href=\"#recoverycodes\">recovery codes</a> to " -"regain access in that event.." +"generate and securely store <a href=\"#recoverycodes\">recovery codes</a>" +" to regain access in that event.." msgstr "" "Se você perder seu %(method)s e não puder mais entrar, você pode " "<strong>permanentemente perder o acesso à sua conta</strong>. Você deve " @@ -3666,23 +3677,24 @@ msgstr "" #: warehouse/templates/pages/help.html:37 msgid "" -"We recommend that all PyPI users set up <em>at least two</em> supported two " -"factor authentication methods and provision <a href=\"#recoverycodes" -"\">recovery codes</a>." +"We recommend that all PyPI users set up <em>at least two</em> supported " +"two factor authentication methods and provision <a " +"href=\"#recoverycodes\">recovery codes</a>." msgstr "" -"Recomendamos que todos os usuários PyPI configurem <em>pelo menos dois</em> " -"dois métodos de autenticação de fatores com suporte e emitam <a href=" -"\"#recoverycodes\">códigos de recuperação</a>." +"Recomendamos que todos os usuários PyPI configurem <em>pelo menos " +"dois</em> dois métodos de autenticação de fatores com suporte e emitam <a" +" href=\"#recoverycodes\">códigos de recuperação</a>." #: warehouse/templates/pages/help.html:43 msgid "" -"If you've lost access to all two factor methods for your account and do not " -"have <a href=\"#recoverycodes\">recovery codes</a>, you can request help <a " -"href=\"#account-recovery\">with account recovery</a>." +"If you've lost access to all two factor methods for your account and do " +"not have <a href=\"#recoverycodes\">recovery codes</a>, you can request " +"help <a href=\"#account-recovery\">with account recovery</a>." msgstr "" -"Se você perdeu o acesso aos dois métodos de fatores para sua conta e não tem " -"<a href=\"#recoverycodes\">códigos de recuperação</a>, você pode solicitar " -"ajuda <a href=\"#account-recovery\">com recuperação de conta</a>." +"Se você perdeu o acesso aos dois métodos de fatores para sua conta e não " +"tem <a href=\"#recoverycodes\">códigos de recuperação</a>, você pode " +"solicitar ajuda <a href=\"#account-recovery\">com recuperação de " +"conta</a>." #: warehouse/templates/pages/help.html:52 msgid "What's a package, project, or release?" @@ -3714,35 +3726,35 @@ msgstr "O que é a autenticação de dois fatores e como ela funciona no PyPI?" #: warehouse/templates/pages/help.html:60 msgid "" -"How does two factor authentication with an authentication application (<abbr " -"title=\"time-based one-time password\">TOTP</abbr>) work? How do I set it up " -"on PyPI?" +"How does two factor authentication with an authentication application " +"(<abbr title=\"time-based one-time password\">TOTP</abbr>) work? How do I" +" set it up on PyPI?" msgstr "" -"Como é que a autenticação de dois fatores com um aplicativo de autenticação " -"(<abbr title=\"time-based one-time password\">TOTP</abbr>) funciona? Como " -"faço para configurá-la no PyPI?" +"Como é que a autenticação de dois fatores com um aplicativo de " +"autenticação (<abbr title=\"time-based one-time password\">TOTP</abbr>) " +"funciona? Como faço para configurá-la no PyPI?" #: warehouse/templates/pages/help.html:61 msgid "" "How does two factor authentication with a security device (e.g. USB key) " "work? How do I set it up on PyPI?" msgstr "" -"Como funciona a autenticação de dois fatores com um dispositivo de segurança " -"(por exemplo, chave USB)? Como faço para configurá-la no PyPI?" +"Como funciona a autenticação de dois fatores com um dispositivo de " +"segurança (por exemplo, chave USB)? Como faço para configurá-la no PyPI?" #: warehouse/templates/pages/help.html:62 msgid "What devices (other than a USB key) can I use as a security device?" msgstr "" -"Quais dispositivos (além de uma chave USB) posso usar como dispositivo de " -"segurança?" +"Quais dispositivos (além de uma chave USB) posso usar como dispositivo de" +" segurança?" #: warehouse/templates/pages/help.html:63 msgid "" -"How does two factor authentication with a recovery code work? How do I set " -"it up on PyPI?" +"How does two factor authentication with a recovery code work? How do I " +"set it up on PyPI?" msgstr "" -"Como funciona a autenticação de dois fatores com um código de recuperação? " -"Como faço para configurá-la no PyPI?" +"Como funciona a autenticação de dois fatores com um código de " +"recuperação? Como faço para configurá-la no PyPI?" #: warehouse/templates/pages/help.html:64 msgid "How can I use API tokens to authenticate with PyPI?" @@ -3759,13 +3771,16 @@ msgstr "O PyPI tem APIs que posso usar?" #: warehouse/templates/pages/help.html:68 msgid "How do I get notified when a new version of a project is released?" msgstr "" -"Como faço para ser notificado quando uma nova versão de um projeto é lançada?" +"Como faço para ser notificado quando uma nova versão de um projeto é " +"lançada?" #: warehouse/templates/pages/help.html:69 msgid "" -"Where can I see statistics about PyPI, downloads, and project/package usage?" +"Where can I see statistics about PyPI, downloads, and project/package " +"usage?" msgstr "" -"Onde posso ver as estatísticas sobre PyPI, downloads e uso de projeto/pacote?" +"Onde posso ver as estatísticas sobre PyPI, downloads e uso de " +"projeto/pacote?" #: warehouse/templates/pages/help.html:71 msgid "I forgot my PyPI password. Can you help me?" @@ -3777,27 +3792,26 @@ msgstr "Perdi acesso à minha conta PyPI. Você pode me ajudar?" #: warehouse/templates/pages/help.html:73 msgid "" -"Why am I getting a \"Invalid or non-existent authentication information.\" " -"error when uploading files?" +"Why am I getting a \"Invalid or non-existent authentication " +"information.\" error when uploading files?" msgstr "" "Por que eu estou obtendo o erro \"Invalid or non-existent authentication " "information.\" ao enviar arquivos?" #: warehouse/templates/pages/help.html:74 msgid "" -"Why am I getting \"No matching distribution found\" or \"Could not fetch URL" -"\" errors during <code>pip install</code>?" +"Why am I getting \"No matching distribution found\" or \"Could not fetch " +"URL\" errors during <code>pip install</code>?" msgstr "" -"Por que estou recebendo erros \"No matching distribution found\" ou \"Could " -"not fetch URL\" durante <code>pip install</code>?" +"Por que estou recebendo erros \"No matching distribution found\" ou " +"\"Could not fetch URL\" durante <code>pip install</code>?" #: warehouse/templates/pages/help.html:75 msgid "I am having trouble using the PyPI website. Can you help me?" msgstr "Estou tendo problemas para usar o site do PyPI. Você pode me ajudar?" #: warehouse/templates/pages/help.html:76 -msgid "" -"Why can't I manually upload files to PyPI, through the browser interface?" +msgid "Why can't I manually upload files to PyPI, through the browser interface?" msgstr "" "Por que não consigo enviar arquivos manualmente para o PyPI, por meio da " "interface do navegador?" @@ -3813,16 +3827,16 @@ msgstr "Por que meu pacote ou registro de usuário foi bloqueado?" #: warehouse/templates/pages/help.html:79 msgid "How do I get a file size limit exemption or increase for my project?" msgstr "" -"Como faço para obter uma isenção de limite de tamanho de arquivo ou aumentar " -"para meu projeto?" +"Como faço para obter uma isenção de limite de tamanho de arquivo ou " +"aumentar para meu projeto?" #: warehouse/templates/pages/help.html:81 msgid "" -"Why am I getting a \"Filename or contents already exists\" or \"Filename has " -"been previously used\" error?" +"Why am I getting a \"Filename or contents already exists\" or \"Filename " +"has been previously used\" error?" msgstr "" -"Por que estou recebendo um erro \"Filename or contents already exists\" ou " -"\"Filename has been previously used\"?" +"Por que estou recebendo um erro \"Filename or contents already exists\" " +"ou \"Filename has been previously used\"?" #: warehouse/templates/pages/help.html:82 msgid "Why isn't my desired project name available?" @@ -3836,8 +3850,7 @@ msgstr "" #: warehouse/templates/pages/help.html:84 msgid "What collaborator roles are available for a project on PyPI?" -msgstr "" -"Quais funções de colaborador estão disponíveis para um projeto no PyPI?" +msgstr "Quais funções de colaborador estão disponíveis para um projeto no PyPI?" #: warehouse/templates/pages/help.html:85 msgid "How do I become an owner/maintainer of a project on PyPI?" @@ -3877,8 +3890,8 @@ msgstr "Como faço para acompanhar as próximas alterações no PyPI?" #: warehouse/templates/pages/help.html:95 msgid "" -"What does the \"beta feature\" badge mean? What are Warehouse's current beta " -"features?" +"What does the \"beta feature\" badge mean? What are Warehouse's current " +"beta features?" msgstr "" "O que significa o emblema \"recurso beta\"? Quais são os recursos beta " "atuais do Warehouse?" @@ -3925,84 +3938,86 @@ msgstr "Sobre" msgid "" "\n" " <p>We use a number of terms to describe software available on " -"PyPI, like \"project\", \"release\", \"file\", and \"package\". Sometimes " -"those terms are confusing because they're used to describe different things " -"in other contexts. Here's how we use them on PyPI:</p>\n" -" <p>A \"project\" on PyPI is the name of a collection of releases " -"and files, and information about them. Projects on PyPI are made and shared " -"by other members of the Python community so that you can use them.</p>\n" -" <p>A \"release\" on PyPI is a specific version of a project. For " -"example, the <a href=\"%(requests_href)s\">requests</a> project has many " -"releases, like \"requests 2.10\" and \"requests 1.2.1\". A release consists " -"of one or more \"files\".</p>\n" -" <p>A \"file\", also known as a \"package\", on PyPI is something " -"that you can download and install. Because of different hardware, operating " -"systems, and file formats, a release may have several files (packages), like " -"an archive containing source code or a binary <a href=\"%(wheel_href)s" -"\">wheel</a>.</p>\n" +"PyPI, like \"project\", \"release\", \"file\", and \"package\". Sometimes" +" those terms are confusing because they're used to describe different " +"things in other contexts. Here's how we use them on PyPI:</p>\n" +" <p>A \"project\" on PyPI is the name of a collection of " +"releases and files, and information about them. Projects on PyPI are made" +" and shared by other members of the Python community so that you can use " +"them.</p>\n" +" <p>A \"release\" on PyPI is a specific version of a project. " +"For example, the <a href=\"%(requests_href)s\">requests</a> project has " +"many releases, like \"requests 2.10\" and \"requests 1.2.1\". A release " +"consists of one or more \"files\".</p>\n" +" <p>A \"file\", also known as a \"package\", on PyPI is " +"something that you can download and install. Because of different " +"hardware, operating systems, and file formats, a release may have several" +" files (packages), like an archive containing source code or a binary <a " +"href=\"%(wheel_href)s\">wheel</a>.</p>\n" " " msgstr "" "\n" " <p>Usamos uma série de termos para descrever os softwares " -"disponíveis no PyPI, como \"projeto\", \"lançamento\", \"arquivo\" e \"pacote" -"\". Às vezes, esses termos são confusos porque eles são usados para " -"descrever coisas diferentes em outros contextos. Aqui está como nós os " -"usamos no PyPI: </p>\n" -" <p>Um \"projeto\" no PyPI é o nome de uma coleção de lançamentos e " -"arquivos e informações sobre eles. Os projetos no PyPI são feitos e " -"compartilhados por outros membros da comunidade Python para que você possa " -"usá-los.</p>\n" -" <p>O \"lançamento\" no PyPI é uma versão específica de um projeto. " -"Por exemplo, o projeto <a href=\"%(requests_href)s\">requests</a> tem muitos " -"lançamentos, como \"requests 2.10\" e \"requests 1.2.1\". Um lançamento " -"consiste em um ou mais \"arquivos\".</p>\n" -" <p>Um \"arquivo\", também conhecido como um \"pacote\", no PyPI é " -"algo que você pode baixar e instalar. Devido a diferentes hardware, sistemas " -"operacionais e formatos de arquivo, um lançamento pode ter vários arquivos " -"(pacotes), como um arquivo que contém o código-fonte ou um binário <a href=" -"\"%(wheel_href)s\">wheel</a>.</p>\n" +"disponíveis no PyPI, como \"projeto\", \"lançamento\", \"arquivo\" e " +"\"pacote\". Às vezes, esses termos são confusos porque eles são usados " +"para descrever coisas diferentes em outros contextos. Aqui está como nós " +"os usamos no PyPI: </p>\n" +" <p>Um \"projeto\" no PyPI é o nome de uma coleção de " +"lançamentos e arquivos e informações sobre eles. Os projetos no PyPI são " +"feitos e compartilhados por outros membros da comunidade Python para que " +"você possa usá-los.</p>\n" +" <p>O \"lançamento\" no PyPI é uma versão específica de um " +"projeto. Por exemplo, o projeto <a " +"href=\"%(requests_href)s\">requests</a> tem muitos lançamentos, como " +"\"requests 2.10\" e \"requests 1.2.1\". Um lançamento consiste em um ou " +"mais \"arquivos\".</p>\n" +" <p>Um \"arquivo\", também conhecido como um \"pacote\", no PyPI" +" é algo que você pode baixar e instalar. Devido a diferentes hardware, " +"sistemas operacionais e formatos de arquivo, um lançamento pode ter " +"vários arquivos (pacotes), como um arquivo que contém o código-fonte ou " +"um binário <a href=\"%(wheel_href)s\">wheel</a>.</p>\n" " " #: warehouse/templates/pages/help.html:194 #, python-format msgid "" -"To learn how to install a file from PyPI, visit the <a href=" -"\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">installation tutorial</a> on the <a href=\"%(user_guide_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " -"User Guide</a>." +"To learn how to install a file from PyPI, visit the <a " +"href=\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">installation tutorial</a> on the <a " +"href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" -"Saiba como instalar um arquivo do PyPI, visite o <a href=" -"\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">tutorial de instalação</a> no <a href=\"%(user_guide_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Guia de Usuário para " -"Empacotamento de Python</a>." +"Saiba como instalar um arquivo do PyPI, visite o <a " +"href=\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">tutorial de instalação</a> no <a " +"href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Guia de Usuário para Empacotamento de Python</a>." #: warehouse/templates/pages/help.html:201 #, python-format msgid "" -"For full instructions on configuring, packaging and distributing your Python " -"project, refer to the <a href=\"%(packaging_tutorial_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">packaging tutorial</a> on " -"the <a href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Python Packaging User Guide</a>." +"For full instructions on configuring, packaging and distributing your " +"Python project, refer to the <a href=\"%(packaging_tutorial_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">packaging " +"tutorial</a> on the <a href=\"%(user_guide_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" "Para obter instruções completas sobre como configurar, empacotar e " -"distribuir seu projeto Python, consulte o <a href=" -"\"%(packaging_tutorial_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">tutorial de empacotamento</a> no <a href=\"%(user_guide_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Guia de Usuário " -"para Empacotamento de Python</a>." +"distribuir seu projeto Python, consulte o <a " +"href=\"%(packaging_tutorial_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">tutorial de empacotamento</a> no <a " +"href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Guia de Usuário para Empacotamento de Python</a>." #: warehouse/templates/pages/help.html:208 #, python-format msgid "" -"Classifiers are used to categorize projects on PyPI. See <a href=\"%(href)s" -"\">the classifiers page</a> for more information, as well as a list of valid " -"classifiers." +"Classifiers are used to categorize projects on PyPI. See <a " +"href=\"%(href)s\">the classifiers page</a> for more information, as well " +"as a list of valid classifiers." msgstr "" -"Classificadores são usados para categorizar projetos no PyPI. Consulte a <a " -"href=\"%(href)s\">página dos classificadores</a> para obter mais " +"Classificadores são usados para categorizar projetos no PyPI. Consulte a " +"<a href=\"%(href)s\">página dos classificadores</a> para obter mais " "informações, bem como uma lista de classificadores válidos." #: warehouse/templates/pages/help.html:215 @@ -4011,11 +4026,11 @@ msgstr "Minha conta" #: warehouse/templates/pages/help.html:218 msgid "" -"Currently, PyPI requires a verified email address to perform the following " -"operations:" +"Currently, PyPI requires a verified email address to perform the " +"following operations:" msgstr "" -"Atualmente, o PyPI requer um endereço de e-mail verificado para executar as " -"seguintes operações:" +"Atualmente, o PyPI requer um endereço de e-mail verificado para executar " +"as seguintes operações:" #: warehouse/templates/pages/help.html:220 msgid "Register a new project." @@ -4027,8 +4042,8 @@ msgstr "Enviar uma nova versão ou arquivo." #: warehouse/templates/pages/help.html:223 msgid "" -"The list of activities that require a verified email address is likely to " -"grow over time." +"The list of activities that require a verified email address is likely to" +" grow over time." msgstr "" "A lista de atividades que exigem um endereço de e-mail verificado é " "susceptível de crescer ao longo do tempo." @@ -4036,152 +4051,160 @@ msgstr "" #: warehouse/templates/pages/help.html:224 #, python-format msgid "" -"This policy will allow us to enforce a key policy of <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python " -"enhancement proposal\">PEP</abbr> 541</a> regarding maintainer reachability. " -"It also reduces the viability of spam attacks to create many accounts in an " -"automated fashion." +"This policy will allow us to enforce a key policy of <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 541</a> regarding " +"maintainer reachability. It also reduces the viability of spam attacks to" +" create many accounts in an automated fashion." msgstr "" -"Esta política nos permitirá impor uma política chave de <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=" -"\"Proposta de aprimoramento do Python\">PEP</abbr> 541</a> sobre a " -"acessibilidade do mantenedor. Também reduz a viabilidade de ataques de spam " -"criarem muitas contas de forma automatizada." +"Esta política nos permitirá impor uma política chave de <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><abbr title=\"Proposta de aprimoramento do " +"Python\">PEP</abbr> 541</a> sobre a acessibilidade do mantenedor. Também " +"reduz a viabilidade de ataques de spam criarem muitas contas de forma " +"automatizada." #: warehouse/templates/pages/help.html:225 #, python-format msgid "" -"You can manage your account's email addresses in your <a href=\"%(href)s" -"\">account settings</a>. This also allows for sending a new confirmation " -"email for users who signed up in the past, before we began enforcing this " -"policy." +"You can manage your account's email addresses in your <a " +"href=\"%(href)s\">account settings</a>. This also allows for sending a " +"new confirmation email for users who signed up in the past, before we " +"began enforcing this policy." msgstr "" -"Você pode gerenciar os endereços de e-mail da sua conta na suas <a href=" -"\"%(href)s\">configurações de conta</a>. Isso também permite o envio de um " -"novo e-mail de confirmação para os usuários que se inscreveram no passado, " -"antes de iniciarmos a aplicação desta política." +"Você pode gerenciar os endereços de e-mail da sua conta na suas <a " +"href=\"%(href)s\">configurações de conta</a>. Isso também permite o envio" +" de um novo e-mail de confirmação para os usuários que se inscreveram no " +"passado, antes de iniciarmos a aplicação desta política." #: warehouse/templates/pages/help.html:228 #, python-format msgid "" -"<p> PyPI itself has not suffered a breach. This is a protective measure to " -"reduce the risk of <a href=\"%(credential_stuffing_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">credential stuffing</a> attacks " -"against PyPI and its users. </p> <p> Each time a user supplies a password — " -"while registering, authenticating, or updating their password — PyPI " -"securely checks whether that password has appeared in public data breaches. " -"</p> <p> During each of these processes, PyPI generates a SHA-1 hash of the " -"supplied password and uses the first five (5) characters of the hash to " -"check the <a href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Have I Been Pwned API</a> and determine if the " -"password has been previously compromised. The plaintext password is never " -"stored by PyPI or submitted to the Have I Been Pwned API. </p> <p> PyPI will " -"not allow such passwords to be used when setting a password at registration " -"or updating your password. </p> <p> If you receive an error message saying " -"that \"This password appears in a breach or has been compromised and cannot " -"be used\", you should change it all other places that you use it as soon as " -"possible. </p> <p> If you have received this error while attempting to log " -"in or upload to PyPI, then your password has been reset and you cannot log " -"in to PyPI until you <a href=\"%(reset_pwd_href)s\">reset your password</a>. " -"</p>" -msgstr "" -"<p> O PyPI em si não sofreu uma violação. Esta é uma medida protetiva para " -"reduzir o risco de ataques de <a href=\"%(credential_stuffing_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">credential stuffing</a> " -"contra PyPI e seus usuários. </p> <p> Cada vez que um usuário fornece uma " -"senha — ao registrar, autenticar ou atualizar sua senha — o PyPI verifica " -"com segurança se essa senha apareceu em violações de dados públicas. </p> " -"<p> Durante cada um desses processos, o PyPI gera um hash SHA-1 da senha " -"fornecida e usa os primeiros cinco (5) caracteres do hash para verificar a " -"<a href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">API do Have I Been Pwned</a> e determinar se a senha foi " -"comprometida anteriormente. A senha em texto simples não criptografada nunca " -"é armazenada pelo PyPI ou enviada para a API do Have I Been Pwned. </p> <p> " -"O PyPI não permitirá que essas senhas sejam usadas ao definir uma senha no " -"registro ou atualizar sua senha. </p> <p> Se você receber uma mensagem de " -"erro informando que \"This password appears in a breach or has been " -"compromised and cannot be used\", você deve alterar todos os outros lugares " -"que você usá-lo o mais rapidamente possível. </p> <p> Se você recebeu esse " -"erro ao tentar entrar ou enviar para o PyPI, sua senha foi redefinida e você " -"não pode entrar no PyPI até que você <a href=\"%(reset_pwd_href)s\">redefina " -"sua senha</a>. </p>" +"<p> PyPI itself has not suffered a breach. This is a protective measure " +"to reduce the risk of <a href=\"%(credential_stuffing_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">credential " +"stuffing</a> attacks against PyPI and its users. </p> <p> Each time a " +"user supplies a password — while registering, authenticating, or updating" +" their password — PyPI securely checks whether that password has appeared" +" in public data breaches. </p> <p> During each of these processes, PyPI " +"generates a SHA-1 hash of the supplied password and uses the first five " +"(5) characters of the hash to check the <a " +"href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Have I Been Pwned API</a> and determine if the password " +"has been previously compromised. The plaintext password is never stored " +"by PyPI or submitted to the Have I Been Pwned API. </p> <p> PyPI will not" +" allow such passwords to be used when setting a password at registration " +"or updating your password. </p> <p> If you receive an error message " +"saying that \"This password appears in a breach or has been compromised " +"and cannot be used\", you should change it all other places that you use " +"it as soon as possible. </p> <p> If you have received this error while " +"attempting to log in or upload to PyPI, then your password has been reset" +" and you cannot log in to PyPI until you <a " +"href=\"%(reset_pwd_href)s\">reset your password</a>. </p>" +msgstr "" +"<p> O PyPI em si não sofreu uma violação. Esta é uma medida protetiva " +"para reduzir o risco de ataques de <a " +"href=\"%(credential_stuffing_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">credential stuffing</a> contra PyPI e " +"seus usuários. </p> <p> Cada vez que um usuário fornece uma senha — ao " +"registrar, autenticar ou atualizar sua senha — o PyPI verifica com " +"segurança se essa senha apareceu em violações de dados públicas. </p> <p>" +" Durante cada um desses processos, o PyPI gera um hash SHA-1 da senha " +"fornecida e usa os primeiros cinco (5) caracteres do hash para verificar " +"a <a href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">API do Have I Been Pwned</a> e " +"determinar se a senha foi comprometida anteriormente. A senha em texto " +"simples não criptografada nunca é armazenada pelo PyPI ou enviada para a " +"API do Have I Been Pwned. </p> <p> O PyPI não permitirá que essas senhas " +"sejam usadas ao definir uma senha no registro ou atualizar sua senha. " +"</p> <p> Se você receber uma mensagem de erro informando que \"This " +"password appears in a breach or has been compromised and cannot be " +"used\", você deve alterar todos os outros lugares que você usá-lo o mais " +"rapidamente possível. </p> <p> Se você recebeu esse erro ao tentar entrar" +" ou enviar para o PyPI, sua senha foi redefinida e você não pode entrar " +"no PyPI até que você <a href=\"%(reset_pwd_href)s\">redefina sua " +"senha</a>. </p>" #: warehouse/templates/pages/help.html:263 #, python-format msgid "" "<p> Two factor authentication (2FA) makes your account more secure by " "requiring two things in order to log in: <em>something you know</em> and " -"<em>something you own</em>. </p> <p> In PyPI's case, \"something you know\" " -"is your username and password, while \"something you own\" can be <a href=" -"\"#totp\">an application to generate a temporary code</a>, or a <a href=" -"\"#utfkey\">security device</a> (most commonly a USB key). </p> <p> It is " -"strongly recommended that you set up two factor authentication on your PyPI " -"account. </p> <p> Users who have chosen to set up two factor authentication " -"will be asked to provide their second method of identity verification during " -"the log in process. This only affects logging in via a web browser, and not " -"(yet) package uploads. </p> <p>You can follow the improvements to <abbr " -"title=\"two factor authentication\">2FA</abbr> on <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">discuss.python.org</a>.</p>" +"<em>something you own</em>. </p> <p> In PyPI's case, \"something you " +"know\" is your username and password, while \"something you own\" can be " +"<a href=\"#totp\">an application to generate a temporary code</a>, or a " +"<a href=\"#utfkey\">security device</a> (most commonly a USB key). </p> " +"<p> It is strongly recommended that you set up two factor authentication " +"on your PyPI account. </p> <p> Users who have chosen to set up two factor" +" authentication will be asked to provide their second method of identity " +"verification during the log in process. This only affects logging in via " +"a web browser, and not (yet) package uploads. </p> <p>You can follow the " +"improvements to <abbr title=\"two factor authentication\">2FA</abbr> on " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">discuss.python.org</a>.</p>" msgstr "" "<p> A autenticação de dois fatores (2FA) torna sua conta mais segura, " "exigindo duas coisas para poder entrar: <em>algo que você sabe</em> e " -"<em>algo que você possui</em>. </p> <p> No caso do PyPI, \"algo que você sabe" -"\" é o seu nome de usuário e sua senha, enquanto \"algo que você possui\" " -"pode ser <a href=\"#totp\">um aplicativo para gerar um código temporário</a> " -"ou um <a href=\"#utfkey\">dispositivo de segurança</a> (mais comumente uma " -"chave USB). </p> <p> É altamente recomendável que você configure a " -"autenticação de dois fatores na sua conta PyPI. </p> <p> Os usuários que " -"optaram por configurar a autenticação de dois fatores serão solicitados a " -"fornecer seu segundo método de verificação de identidade durante o processo " -"autenticação. Isso só afeta a autenticação por meio de um navegador web, e " -"não (por ora) os envios de pacotes. </p> <p> Você pode acompanhar as " -"melhorias à <abbr title=\"autenticação de dois fatores\">2FA</abbr> em <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">discuss.python.org</a>.</p>" +"<em>algo que você possui</em>. </p> <p> No caso do PyPI, \"algo que você " +"sabe\" é o seu nome de usuário e sua senha, enquanto \"algo que você " +"possui\" pode ser <a href=\"#totp\">um aplicativo para gerar um código " +"temporário</a> ou um <a href=\"#utfkey\">dispositivo de segurança</a> " +"(mais comumente uma chave USB). </p> <p> É altamente recomendável que " +"você configure a autenticação de dois fatores na sua conta PyPI. </p> <p>" +" Os usuários que optaram por configurar a autenticação de dois fatores " +"serão solicitados a fornecer seu segundo método de verificação de " +"identidade durante o processo autenticação. Isso só afeta a autenticação " +"por meio de um navegador web, e não (por ora) os envios de pacotes. </p> " +"<p> Você pode acompanhar as melhorias à <abbr title=\"autenticação de " +"dois fatores\">2FA</abbr> em <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">discuss.python.org</a>.</p>" #: warehouse/templates/pages/help.html:290 #, python-format msgid "" "PyPI users can set up two-factor authentication using any authentication " "application that supports the <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based one-time password" -"\">TOTP</abbr> standard</a>." +"target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based one-time " +"password\">TOTP</abbr> standard</a>." msgstr "" -"Os usuários do PyPI podem configurar a autenticação de dois fatores usando " -"qualquer aplicativo de autenticação que ofereça suporte ao <a href=\"%(href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">padrão <abbr title=" -"\"time-based one-time password\">TOTP</abbr></a>." +"Os usuários do PyPI podem configurar a autenticação de dois fatores " +"usando qualquer aplicativo de autenticação que ofereça suporte ao <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">padrão <abbr title=\"time-based one-time " +"password\">TOTP</abbr></a>." #: warehouse/templates/pages/help.html:291 msgid "" "<abbr title=\"time-based one-time password\">TOTP</abbr> authentication " -"applications generate a regularly changing authentication code to use when " -"logging into your account." +"applications generate a regularly changing authentication code to use " +"when logging into your account." msgstr "" "<abbr title=\"time-based one-time password\">TOTP</abbr> aplicativos de " -"autenticação geram um código de autenticação que muda regularmente para usar " -"ao entrar em sua conta." +"autenticação geram um código de autenticação que muda regularmente para " +"usar ao entrar em sua conta." #: warehouse/templates/pages/help.html:292 msgid "" -"Because <abbr title=\"time-based one-time password\">TOTP</abbr> is an open " -"standard, there are many applications that are compatible with your PyPI " -"account. Popular applications include:" +"Because <abbr title=\"time-based one-time password\">TOTP</abbr> is an " +"open standard, there are many applications that are compatible with your " +"PyPI account. Popular applications include:" msgstr "" "Porque o <abbr title=\"time-based one-time password\">TOTP</abbr> é um " -"padrão aberto, há muitos aplicativos que são compatíveis com sua conta PyPI. " -"Aplicativos populares incluem:" +"padrão aberto, há muitos aplicativos que são compatíveis com sua conta " +"PyPI. Aplicativos populares incluem:" #: warehouse/templates/pages/help.html:295 #, python-format msgid "" -"Google Authenticator for <a href=\"%(android_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Google Authenticator for <a href=\"%(android_href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Android</a> or <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" msgstr "" -"Google Authenticator para <a href=\"%(android_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Android</a> ou <a href=\"%(ios_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Google Authenticator para <a href=\"%(android_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Android</a> ou <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/help.html:298 #: warehouse/templates/pages/help.html:300 @@ -4193,13 +4216,15 @@ msgstr "(proprietário)" #: warehouse/templates/pages/help.html:302 #, python-format msgid "" -"Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Android</a> or <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" msgstr "" -"Duo Mobile para <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Android</a> ou <a href=\"%(ios_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Duo Mobile para <a href=\"%(android_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Android</a> ou <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/help.html:308 #: warehouse/templates/pages/help.html:309 @@ -4209,37 +4234,37 @@ msgstr "(código aberto)" #: warehouse/templates/pages/help.html:313 #, python-format msgid "" -"Some password managers (e.g. <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">1Password</a>) can also generate authentication " -"codes. For security reasons, PyPI only allows you to set up one application " -"per account." +"Some password managers (e.g. <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">1Password</a>) can also generate " +"authentication codes. For security reasons, PyPI only allows you to set " +"up one application per account." msgstr "" -"Alguns gerenciadores de senhas (por exemplo, <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">1Password</a>) também podem " -"gerar códigos de autenticação. Por motivos de segurança, o PyPI permite " -"configurar apenas um aplicativo por conta." +"Alguns gerenciadores de senhas (por exemplo, <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">1Password</a>) " +"também podem gerar códigos de autenticação. Por motivos de segurança, o " +"PyPI permite configurar apenas um aplicativo por conta." #: warehouse/templates/pages/help.html:321 msgid "" "To set up <abbr title=\"two factor authentication\">2FA</abbr> with an " "authentication application:" msgstr "" -"Para configurar o <abbr title=\"autenticação de dois fatores\" >2FA</abbr> " -"com um aplicativo de autenticação:" +"Para configurar o <abbr title=\"autenticação de dois fatores\" " +">2FA</abbr> com um aplicativo de autenticação:" #: warehouse/templates/pages/help.html:323 msgid "" -"Open an authentication (<abbr title=\"time-based one-time password\">TOTP</" -"abbr>) application" +"Open an authentication (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>) application" msgstr "" "Abra um aplicativo de autenticação (<abbr title=\"time-based one-time " "password\">TOTP</abbr>)" #: warehouse/templates/pages/help.html:324 msgid "" -"Log in to your PyPI account, go to your account settings, and choose \"Add " -"<abbr title=\"two factor authentication\">2FA</abbr> with authentication " -"application\"" +"Log in to your PyPI account, go to your account settings, and choose " +"\"Add <abbr title=\"two factor authentication\">2FA</abbr> with " +"authentication application\"" msgstr "" "Entre na sua conta PyPI, vá para as configurações da sua conta e escolha " "\"Adicionar <abbr title=\"autenticação de dois fatores\">2FA</abbr> com " @@ -4247,8 +4272,8 @@ msgstr "" #: warehouse/templates/pages/help.html:325 msgid "" -"PyPI will generate a secret key, specific to your account. This is displayed " -"as a QR code, and as a text code." +"PyPI will generate a secret key, specific to your account. This is " +"displayed as a QR code, and as a text code." msgstr "" "O PyPI gerará uma chave secreta, específica da sua conta. Isso é exibido " "como um código QR e como um código de texto." @@ -4256,24 +4281,26 @@ msgstr "" #: warehouse/templates/pages/help.html:326 msgid "" "Scan the QR code with your authentication application, or type it in " -"manually. The method of input will depend on the application you have chosen." +"manually. The method of input will depend on the application you have " +"chosen." msgstr "" "Digitalize o código QR com seu aplicativo de autenticação ou digite-o " -"manualmente. O método de entrada dependerá do aplicativo que você escolheu." +"manualmente. O método de entrada dependerá do aplicativo que você " +"escolheu." #: warehouse/templates/pages/help.html:327 msgid "" -"Your application will generate an authentication code - use this to verify " -"your set up on PyPI" +"Your application will generate an authentication code - use this to " +"verify your set up on PyPI" msgstr "" -"Seu aplicativo irá gerar um código de autenticação - use isso para verificar " -"a sua configuração no PyPI" +"Seu aplicativo irá gerar um código de autenticação - use isso para " +"verificar a sua configuração no PyPI" #: warehouse/templates/pages/help.html:330 msgid "" "The PyPI server and your application now share your PyPI secret key, " -"allowing your application to generate valid authentication codes for your " -"PyPI account." +"allowing your application to generate valid authentication codes for your" +" PyPI account." msgstr "" "O servidor PyPI e seu aplicativo agora compartilham sua chave secreta do " "PyPI, permitindo que seu aplicativo gere códigos de autenticação válidos " @@ -4291,8 +4318,7 @@ msgstr "Fornecer seu nome de usuário e sua senha, como de costume" #: warehouse/templates/pages/help.html:335 msgid "Open your authentication application to generate an authentication code" -msgstr "" -"Abrir seu aplicativo de autenticação para gerar um código de autenticação" +msgstr "Abrir seu aplicativo de autenticação para gerar um código de autenticação" #: warehouse/templates/pages/help.html:336 msgid "Use this code to finish logging into PyPI" @@ -4300,34 +4326,34 @@ msgstr "Usar este código para finalizar sua autenticação no PyPI" #: warehouse/templates/pages/help.html:342 msgid "" -"A security device is a USB key or <a href=\"#utfdevices\">other device</a> " -"that generates a one-time password and sends that password to the browser. " -"This password is then used by PyPI to authenticate you as a user." +"A security device is a USB key or <a href=\"#utfdevices\">other " +"device</a> that generates a one-time password and sends that password to " +"the browser. This password is then used by PyPI to authenticate you as a " +"user." msgstr "" -"Um dispositivo de segurança é uma chave USB ou <a href=\"#utfdevices\">outro " -"dispositivo</a> que gera uma senha de um uso e envia essa senha para o " -"navegador. Essa senha é então usada pelo PyPI para lhe autenticar como um " -"usuário." +"Um dispositivo de segurança é uma chave USB ou <a " +"href=\"#utfdevices\">outro dispositivo</a> que gera uma senha de um uso e" +" envia essa senha para o navegador. Essa senha é então usada pelo PyPI " +"para lhe autenticar como um usuário." #: warehouse/templates/pages/help.html:344 -msgid "" -"To set up two factor authentication with a <em>USB key</em>, you'll need:" +msgid "To set up two factor authentication with a <em>USB key</em>, you'll need:" msgstr "" -"Para configurar a autenticação de dois fatores com uma <em>chave USB</em>, " -"você precisará:" +"Para configurar a autenticação de dois fatores com uma <em>chave " +"USB</em>, você precisará:" #: warehouse/templates/pages/help.html:346 #, python-format msgid "" -"To use a <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">browser that supports <abbr title=\"web authentication" -"\">WebAuthn</abbr> and PublicKeyCredential</a>, as this is the standard " -"implemented by PyPI." +"To use a <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">browser that supports <abbr title=\"web " +"authentication\">WebAuthn</abbr> and PublicKeyCredential</a>, as this is " +"the standard implemented by PyPI." msgstr "" -"Usar um <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">navegador que oferece suporte a <abbr title=\"web authentication" -"\">WebAuthn</abbr> e PublicKeyCredential</a>, pois isso é o padrão " -"implementado pelo PyPI." +"Usar um <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">navegador que oferece suporte a <abbr title=\"web " +"authentication\">WebAuthn</abbr> e PublicKeyCredential</a>, pois isso é o" +" padrão implementado pelo PyPI." #: warehouse/templates/pages/help.html:347 msgid "To be running JavaScript on your browser" @@ -4336,8 +4362,9 @@ msgstr "Estar executando JavaScript em seu navegador" #: warehouse/templates/pages/help.html:348 #, python-format msgid "" -"To use a USB key that adheres to the <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">FIDO U2F specification</a>:" +"To use a USB key that adheres to the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO U2F " +"specification</a>:" msgstr "" "Usar uma chave USB que adere à <a href=\"%(href)s\" title=\"%(title)s\" " "target=\"_blank\" rel=\"noopener\">especificação FIDO U2F</a>:" @@ -4345,17 +4372,17 @@ msgstr "" #: warehouse/templates/pages/help.html:351 #, python-format msgid "" -"Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</a> and <a " -"href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Thetis</a>." +"Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> and <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." msgstr "" -"Chaves populares incluem <a href=\"%(yubikey_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</a> e <a " -"href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Thetis</a>." +"Chaves populares incluem <a href=\"%(yubikey_href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> e <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." #: warehouse/templates/pages/help.html:358 msgid "" @@ -4372,41 +4399,43 @@ msgstr "Siga estes passos:" #: warehouse/templates/pages/help.html:365 msgid "" "\n" -" <li>Log in to your PyPI account, go to your account settings, and " -"choose \"Add <abbr title=\"two factor authentication\">2FA</abbr> with " -"security device (e.g. USB key)\"</li>\n" -" <li>Give your key a name. This is necessary because it's possible " -"to add more than one security device to your account.</li>\n" +" <li>Log in to your PyPI account, go to your account settings, " +"and choose \"Add <abbr title=\"two factor authentication\">2FA</abbr> " +"with security device (e.g. USB key)\"</li>\n" +" <li>Give your key a name. This is necessary because it's " +"possible to add more than one security device to your account.</li>\n" " <li>Click on the \"Set up security device\" button</li>\n" -" <li>Insert and touch your USB key, as instructed by your browser</" -"li>\n" +" <li>Insert and touch your USB key, as instructed by your " +"browser</li>\n" " " msgstr "" "\n" -" <li>Entre na sua conta PyPI, vá para as configurações da sua conta " -"e escolha \"Adicionar <abbr title=\"autenticação de dois fatores\">2FA</" -"abbr> com dispositivo de segurança (por exemplo, chave USB)\"</li>\n" -" <li>Dê um nome à sua chave. Isso é necessário porque é possível " -"adicionar mais de um dispositivo de segurança à sua conta.</li>\n" -" <li>Clique no botão \"Configurar dispositivo de segurança\" </li>\n" -" <li>Insira e toque na sua chave USB, conforme instruído pelo seu " -"navegador</li>\n" +" <li>Entre na sua conta PyPI, vá para as configurações da sua " +"conta e escolha \"Adicionar <abbr title=\"autenticação de dois " +"fatores\">2FA</abbr> com dispositivo de segurança (por exemplo, chave " +"USB)\"</li>\n" +" <li>Dê um nome à sua chave. Isso é necessário porque é possível" +" adicionar mais de um dispositivo de segurança à sua conta.</li>\n" +" <li>Clique no botão \"Configurar dispositivo de segurança\" " +"</li>\n" +" <li>Insira e toque na sua chave USB, conforme instruído pelo " +"seu navegador</li>\n" " " #: warehouse/templates/pages/help.html:372 msgid "" -"Once complete, your USB key will be registered to your PyPI account and can " -"be used during the log in process." +"Once complete, your USB key will be registered to your PyPI account and " +"can be used during the log in process." msgstr "" -"Uma vez concluído, sua chave USB será registrada em sua conta PyPI e pode " -"ser usada durante o processo de autenticação." +"Uma vez concluído, sua chave USB será registrada em sua conta PyPI e pode" +" ser usada durante o processo de autenticação." #: warehouse/templates/pages/help.html:376 msgid "" "\n" " <li>Provide your username and password, as normal</li>\n" -" <li>Insert and touch your USB key to finish logging into PyPI</" -"li>\n" +" <li>Insert and touch your USB key to finish logging into " +"PyPI</li>\n" " " msgstr "" "\n" @@ -4419,8 +4448,8 @@ msgstr "" #, python-format msgid "" "There is a growing ecosystem of <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">devices that are FIDO compliant</a>, and " -"can therefore be used with PyPI." +"target=\"_blank\" rel=\"noopener\">devices that are FIDO compliant</a>, " +"and can therefore be used with PyPI." msgstr "" "Há um ecossistema crescente de <a href=\"%(href)s\" title=\"%(title)s\" " "target=\"_blank\" rel=\"noopener\">dispositivos que são compatíveis com " @@ -4429,51 +4458,52 @@ msgstr "" #: warehouse/templates/pages/help.html:392 #, python-format msgid "" -"Emerging solutions include biometric (facial and fingerprint) scanners and " -"FIDO compatible credit cards. There is also growing support for <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">mobile " -"phones to act as security devices</a>." +"Emerging solutions include biometric (facial and fingerprint) scanners " +"and FIDO compatible credit cards. There is also growing support for <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">mobile phones to act as security devices</a>." msgstr "" -"As soluções emergentes incluem leitores biométricos (faciais e digitais) e " -"cartões de crédito compatíveis com FIDO. Há também um crescente suporte a <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">telefones celulares para atuar como dispositivos de segurança</a>." +"As soluções emergentes incluem leitores biométricos (faciais e digitais) " +"e cartões de crédito compatíveis com FIDO. Há também um crescente suporte" +" a <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">telefones celulares para atuar como dispositivos de " +"segurança</a>." #: warehouse/templates/pages/help.html:398 #, python-format msgid "" -"As PyPI's two factor implementation follows the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"web " -"authentication\">WebAuthn</abbr> standard</a>, PyPI users will be able to " -"take advantage of any future developments in this field." +"As PyPI's two factor implementation follows the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"web " +"authentication\">WebAuthn</abbr> standard</a>, PyPI users will be able to" +" take advantage of any future developments in this field." msgstr "" -"Como a implementação de dois fatores do PyPI segue o <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">padrão <abbr title=" -"\"autenticação web\">WebAuthn</abbr></a>, usuários do PyPI serão capazes de " -"tirar proveito de qualquer futuro desenvolvimentos nesta área." +"Como a implementação de dois fatores do PyPI segue o <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">padrão <abbr " +"title=\"autenticação web\">WebAuthn</abbr></a>, usuários do PyPI serão " +"capazes de tirar proveito de qualquer futuro desenvolvimentos nesta área." #: warehouse/templates/pages/help.html:407 msgid "" -"If you lose access to your <a href=\"#totp\">authentication application</a> " -"or <a href=\"#utfkey\">security device</a>, you can use these codes to sign " -"into PyPI." +"If you lose access to your <a href=\"#totp\">authentication " +"application</a> or <a href=\"#utfkey\">security device</a>, you can use " +"these codes to sign into PyPI." msgstr "" -"Se você perder o acesso ao seu <a href=\"#totp\">aplicativo de autenticação</" -"a> ou <a href=\"#utfkey\">dispositivo de segurança</a>, você pode usar estes " -"códigos para entrar no PyPI." +"Se você perder o acesso ao seu <a href=\"#totp\">aplicativo de " +"autenticação</a> ou <a href=\"#utfkey\">dispositivo de segurança</a>, " +"você pode usar estes códigos para entrar no PyPI." #: warehouse/templates/pages/help.html:410 msgid "" -"Recovery codes are <strong>one time use</strong>. They are not a substitute " -"for a <a href=\"#totp\">authentication application</a> or <a href=\"#utfkey" -"\">security device</a> and should only be used for recovery. After using a " -"recovery code to sign in, it becomes inactive." +"Recovery codes are <strong>one time use</strong>. They are not a " +"substitute for a <a href=\"#totp\">authentication application</a> or <a " +"href=\"#utfkey\">security device</a> and should only be used for " +"recovery. After using a recovery code to sign in, it becomes inactive." msgstr "" -"Os códigos de recuperação são de <strong>uso único</strong>. Eles não são um " -"substituto para um <a href=\"#totp\">aplicativo de autenticação</a> ou <a " -"href=\"#utfkey\">dispositivo de segurança</a> e só devem ser usados para " -"recuperação. Depois de usar um código de recuperação para entrar, ele se " -"torna inativo." +"Os códigos de recuperação são de <strong>uso único</strong>. Eles não são" +" um substituto para um <a href=\"#totp\">aplicativo de autenticação</a> " +"ou <a href=\"#utfkey\">dispositivo de segurança</a> e só devem ser usados" +" para recuperação. Depois de usar um código de recuperação para entrar, " +"ele se torna inativo." #: warehouse/templates/pages/help.html:416 msgid "To provision recovery codes:" @@ -4489,22 +4519,22 @@ msgstr "" #: warehouse/templates/pages/help.html:419 msgid "" -"Securely store the displayed recovery codes! Consider printing them out and " -"storing them in a safe location or saving them in a password manager." +"Securely store the displayed recovery codes! Consider printing them out " +"and storing them in a safe location or saving them in a password manager." msgstr "" -"Armazene com segurança os códigos de recuperação exibidos! Considere imprimi-" -"los e armazená-los em um local seguro ou salvá-los em um gerenciador de " -"senhas." +"Armazene com segurança os códigos de recuperação exibidos! Considere " +"imprimi-los e armazená-los em um local seguro ou salvá-los em um " +"gerenciador de senhas." #: warehouse/templates/pages/help.html:422 msgid "" -"If you lose access to your stored recovery codes or use all of them, you can " -"get new ones by selecting \"Regenerate recovery codes\" in your account " -"settings." +"If you lose access to your stored recovery codes or use all of them, you " +"can get new ones by selecting \"Regenerate recovery codes\" in your " +"account settings." msgstr "" -"Se você perder o acesso aos seus códigos de recuperação armazenados ou usar " -"todos eles, você pode obter novos códigos selecionando \"Gerar novamente " -"códigos de recuperação\" nas configurações da sua conta." +"Se você perder o acesso aos seus códigos de recuperação armazenados ou " +"usar todos eles, você pode obter novos códigos selecionando \"Gerar " +"novamente códigos de recuperação\" nas configurações da sua conta." #: warehouse/templates/pages/help.html:424 msgid "To sign in with a recovery code:" @@ -4512,35 +4542,36 @@ msgstr "Para entrar com um código de recuperação:" #: warehouse/templates/pages/help.html:427 msgid "" -"When prompted for Two-Factor Authentication, select \"Login using a Recovery " -"Code\"" +"When prompted for Two-Factor Authentication, select \"Login using a " +"Recovery Code\"" msgstr "" "Quando for solicitada a autenticação de dois fatores, selecione \"Entrar " "usando um código de recuperação\"" #: warehouse/templates/pages/help.html:428 msgid "" -"As each code can be used only once, you might want to mark the code as used" +"As each code can be used only once, you might want to mark the code as " +"used" msgstr "" -"Como cada código só pode ser usado uma vez, você pode querer marcar o código " -"como usado" +"Como cada código só pode ser usado uma vez, você pode querer marcar o " +"código como usado" #: warehouse/templates/pages/help.html:429 msgid "" -"If you have few recovery codes remaining, you may also want to generate a " -"new set using the \"Regenerate recovery codes\" button in your account " +"If you have few recovery codes remaining, you may also want to generate a" +" new set using the \"Regenerate recovery codes\" button in your account " "settings." msgstr "" "Se você tiver poucos códigos de recuperação restantes, você também pode " -"querer gerar um novo conjunto usando o botão \"Gerar novamente códigos de " -"recuperação\" nas configurações da sua conta." +"querer gerar um novo conjunto usando o botão \"Gerar novamente códigos de" +" recuperação\" nas configurações da sua conta." #: warehouse/templates/pages/help.html:434 msgid "" "\n" -" <p>API tokens provide an alternative way (instead of username and " -"password) to authenticate when <strong>uploading packages</strong> to PyPI.</" -"p>\n" +" <p>API tokens provide an alternative way (instead of username " +"and password) to authenticate when <strong>uploading packages</strong> to" +" PyPI.</p>\n" " <p>You can create a token for an entire PyPI account, in which " "case, the token will work for all projects associated with that account. " "Alternatively, you can limit a token's scope to a specific project.</p>\n" @@ -4550,15 +4581,15 @@ msgid "" " " msgstr "" "\n" -" <p>Tokens de API fornecem uma maneira alternativa (em vez de nome " -"de usuário e senha) para autenticar ao <strong>enviar pacotes</strong> para " -"o PyPI.</p>\n" -" <p>Você pode criar um token para toda uma conta PyPI, caso em que " -"o token funcionará para todos os projetos associados a essa conta. Como " -"alternativa, você pode limitar o escopo de um token para um projeto " +" <p>Tokens de API fornecem uma maneira alternativa (em vez de " +"nome de usuário e senha) para autenticar ao <strong>enviar " +"pacotes</strong> para o PyPI.</p>\n" +" <p>Você pode criar um token para toda uma conta PyPI, caso em " +"que o token funcionará para todos os projetos associados a essa conta. " +"Como alternativa, você pode limitar o escopo de um token para um projeto " "específico.</p>\n" -" <p><strong>Recomendamos fortemente que autentique com um token de " -"API sempre que possível.</strong></p>\n" +" <p><strong>Recomendamos fortemente que autentique com um token " +"de API sempre que possível.</strong></p>\n" "\n" " " @@ -4581,8 +4612,8 @@ msgid "" "In your <a href=\"%(href)s\">account settings</a>, go to the API tokens " "section and select \"Add API token\"" msgstr "" -"Em suas <a href=\"%(href)s\">configurações de conta</a>, vá para a seção de " -"tokens de API e selecione \"Adicionar token de API\"" +"Em suas <a href=\"%(href)s\">configurações de conta</a>, vá para a seção " +"de tokens de API e selecione \"Adicionar token de API\"" #: warehouse/templates/pages/help.html:448 msgid "To use an API token:" @@ -4594,37 +4625,41 @@ msgstr "Defina seu nome de usuário para <code>__token__</code>" #: warehouse/templates/pages/help.html:452 msgid "" -"Set your password to the token value, including the <code>pypi-</code> prefix" +"Set your password to the token value, including the <code>pypi-</code> " +"prefix" msgstr "" -"Defina sua senha como o valor do token, incluindo o prefixo <code>pypi-</" -"code>" +"Defina sua senha como o valor do token, incluindo o prefixo " +"<code>pypi-</code>" #: warehouse/templates/pages/help.html:456 #, python-format msgid "" -"Where you edit or add these values will depend on your individual use case. " -"For example, some users may need to edit <a href=\"%(pypirc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">their <code>.pypirc</code> " -"file</a>, while others may need to update their CI configuration file (e.g. " -"<a href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\"><code>.travis.yml</code> if you are using Travis</a>)." +"Where you edit or add these values will depend on your individual use " +"case. For example, some users may need to edit <a " +"href=\"%(pypirc_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">their <code>.pypirc</code> file</a>, while others may " +"need to update their CI configuration file (e.g. <a " +"href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>.travis.yml</code> if you are using Travis</a>)." msgstr "" "Onde você edita ou adiciona esses valores dependerá de seu caso de uso " -"individual. Por exemplo, alguns usuários podem precisar editar <a href=" -"\"%(pypirc_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">seu arquivo <code>.pypirc</code></a>, enquanto outros podem precisar " -"atualizar seu arquivo de configuração de CI (por exemplo, <a href=" -"\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><code>.travis.yml</code> se você estiver usando Travis</a>)." +"individual. Por exemplo, alguns usuários podem precisar editar <a " +"href=\"%(pypirc_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">seu arquivo <code>.pypirc</code></a>, enquanto outros " +"podem precisar atualizar seu arquivo de configuração de CI (por exemplo, " +"<a href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>.travis.yml</code> se você estiver usando " +"Travis</a>)." #: warehouse/templates/pages/help.html:460 msgid "" -"Advanced users may wish to inspect their token by decoding it with base64, " -"and checking the output against the unique identifier displayed on PyPI." +"Advanced users may wish to inspect their token by decoding it with " +"base64, and checking the output against the unique identifier displayed " +"on PyPI." msgstr "" -"Usuários avançados podem querer inspecionar seu token, decodificando-o com " -"base64 e verificando a saída contra o identificador exclusivo exibido no " -"PyPI." +"Usuários avançados podem querer inspecionar seu token, decodificando-o " +"com base64 e verificando a saída contra o identificador exclusivo exibido" +" no PyPI." #: warehouse/templates/pages/help.html:468 msgid "Yes, including RSS feeds of new packages and new releases." @@ -4637,140 +4672,145 @@ msgstr "Consulte a referência de API." #: warehouse/templates/pages/help.html:471 #, python-format msgid "" -"If you need to run your own mirror of PyPI, the <a href=\"%(href)s" -"\">bandersnatch project</a> is the recommended solution. Note that the " -"storage requirements for a PyPI mirror would exceed 1 terabyte—and growing!" +"If you need to run your own mirror of PyPI, the <a " +"href=\"%(href)s\">bandersnatch project</a> is the recommended solution. " +"Note that the storage requirements for a PyPI mirror would exceed 1 " +"terabyte—and growing!" msgstr "" -"Se você precisa executar seu próprio espelho do PyPI, o <a href=\"%(href)s" -"\">projeto bandersnatch</a> é a solução recomendada. Observe que os " -"requisitos de armazenamento para um espelho PyPI excederia 1 terabyte — e " -"crescendo!" +"Se você precisa executar seu próprio espelho do PyPI, o <a " +"href=\"%(href)s\">projeto bandersnatch</a> é a solução recomendada. " +"Observe que os requisitos de armazenamento para um espelho PyPI excederia" +" 1 terabyte — e crescendo!" #: warehouse/templates/pages/help.html:474 #, python-format msgid "" -"PyPI itself does not offer a way to get notified when a project uploads new " -"releases. However, there are several third-party services that offer " +"PyPI itself does not offer a way to get notified when a project uploads " +"new releases. However, there are several third-party services that offer " "comprehensive monitoring and notifications for project releases and " -"vulnerabilities listed as <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">GitHub apps</a>." +"vulnerabilities listed as <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">GitHub apps</a>." msgstr "" "O PyPI em si não oferece uma maneira de ser notificado quando um projeto " -"envia novas versões. No entanto, existem vários serviços de terceiros que " -"oferecem monitoramento abrangente e notificações para versões de projeto e " -"vulnerabilidades listadas como <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">aplicativos do GitHub</a>." +"envia novas versões. No entanto, existem vários serviços de terceiros que" +" oferecem monitoramento abrangente e notificações para versões de projeto" +" e vulnerabilidades listadas como <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">aplicativos do " +"GitHub</a>." #: warehouse/templates/pages/help.html:477 #, python-format msgid "" -"You can <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">analyze PyPI download usage statistics via our public dataset " -"on Google BigQuery</a>." +"You can <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">analyze PyPI download usage statistics via our public " +"dataset on Google BigQuery</a>." msgstr "" -"Você pode <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">analisar as estatísticas de uso de download do PyPI por meio de " -"nosso conjunto de dados público no Google BigQuery</a>." +"Você pode <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">analisar as estatísticas de uso de download do PyPI por " +"meio de nosso conjunto de dados público no Google BigQuery</a>." #: warehouse/templates/pages/help.html:479 #, python-format msgid "" -"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.io provides statistics for PyPI projects</a> (<a href=" -"\"%(libs_io_example_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">example</a>, <a href=\"%(libs_io_api_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">API</a>) including GitHub stars and " -"forks, dependency tracking (<a href=\"%(in_progress_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">in progress</a>), and <a " -"href=\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">other relevant factors</a>." -msgstr "" -"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.io fornece estatísticas para projetos do PyPI</a> (<a " -"href=\"%(libs_io_example_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">exemplo</a>, <a href=\"%(libs_io_api_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">API</a>) incluindo estrelas e forks do " -"GitHub, rastreamento de dependência (<a href=\"%(in_progress_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">em progresso</a>) e <a href=" -"\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">outros fatores relevantes</a>." +"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io provides statistics for PyPI projects</a> " +"(<a href=\"%(libs_io_example_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">example</a>, <a " +"href=\"%(libs_io_api_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">API</a>) including GitHub stars and forks, dependency " +"tracking (<a href=\"%(in_progress_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">in progress</a>), and <a " +"href=\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">other relevant factors</a>." +msgstr "" +"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io fornece estatísticas para projetos do " +"PyPI</a> (<a href=\"%(libs_io_example_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">exemplo</a>, <a " +"href=\"%(libs_io_api_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">API</a>) incluindo estrelas e forks do GitHub, " +"rastreamento de dependência (<a href=\"%(in_progress_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">em progresso</a>) " +"e <a href=\"%(other_factors_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">outros fatores relevantes</a>." #: warehouse/templates/pages/help.html:488 #, python-format msgid "" -"For recent statistics on uptime and performance, see <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status page</a>." +"For recent statistics on uptime and performance, see <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status " +"page</a>." msgstr "" -"Para estatísticas recentes sobre tempo de atividade e desempenho, consulte " -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">nossa página de status</a>." +"Para estatísticas recentes sobre tempo de atividade e desempenho, " +"consulte <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">nossa página de status</a>." #: warehouse/templates/pages/help.html:495 #, python-format msgid "" -"PyPI does not support publishing private packages. If you need to publish " -"your private package to a package index, the recommended solution is to run " -"your own deployment of the <a href=\"%(href)s\">devpi project</a>." +"PyPI does not support publishing private packages. If you need to publish" +" your private package to a package index, the recommended solution is to " +"run your own deployment of the <a href=\"%(href)s\">devpi project</a>." msgstr "" "O PyPI não oferece suporte a publicação de pacotes privados. Se você " "precisar publicar seu pacote privado em um índice de pacote, a solução " -"recomendada é executar sua própria implantação do <a href=\"%(href)s" -"\">projeto devpi</a>." +"recomendada é executar sua própria implantação do <a " +"href=\"%(href)s\">projeto devpi</a>." #: warehouse/templates/pages/help.html:498 msgid "" "Your publishing tool may return an error that your new project can't be " -"created with your desired name, despite no evidence of a project or release " -"of the same name on PyPI. Currently, there are three primary reasons this " -"may occur:" +"created with your desired name, despite no evidence of a project or " +"release of the same name on PyPI. Currently, there are three primary " +"reasons this may occur:" msgstr "" -"Sua ferramenta de publicação pode retornar um erro que seu novo projeto não " -"pode ser criado com o nome desejado, apesar de nenhuma evidência de um " -"projeto ou versão do mesmo nome no PyPI. Atualmente, há três razões " +"Sua ferramenta de publicação pode retornar um erro que seu novo projeto " +"não pode ser criado com o nome desejado, apesar de nenhuma evidência de " +"um projeto ou versão do mesmo nome no PyPI. Atualmente, há três razões " "principais que isso pode ocorrer:" #: warehouse/templates/pages/help.html:500 #, python-format msgid "" -"The project name conflicts with a <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Standard Library</a> module from " -"any major version from 2.5 to present." +"The project name conflicts with a <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Standard " +"Library</a> module from any major version from 2.5 to present." msgstr "" "O nome do projeto está em conflito com um módulo da <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Biblioteca Padrão do " -"Python</a> de qualquer versão principal de 2.5 até o presente." +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Biblioteca Padrão " +"do Python</a> de qualquer versão principal de 2.5 até o presente." #: warehouse/templates/pages/help.html:501 #, python-format msgid "" -"The project name has been explicitly prohibited by the PyPI administrators. " -"For example, <code>%(incorrect_code)s</code> is a common typo for <code>" -"%(correct_code)s</code>, and should not surprise the user with a malicious " -"package." +"The project name has been explicitly prohibited by the PyPI " +"administrators. For example, <code>%(incorrect_code)s</code> is a common " +"typo for <code>%(correct_code)s</code>, and should not surprise the user " +"with a malicious package." msgstr "" -"O nome do projeto foi explicitamente proibido pelos administradores do PyPI. " -"Por exemplo, <code>%(incorrect_code)s</code> é um erro de digitação comum " -"para <code>%(correct_code)s</code> e não deve surpreender o usuário com um " -"pacote mal-intencionado." +"O nome do projeto foi explicitamente proibido pelos administradores do " +"PyPI. Por exemplo, <code>%(incorrect_code)s</code> é um erro de digitação" +" comum para <code>%(correct_code)s</code> e não deve surpreender o " +"usuário com um pacote mal-intencionado." #: warehouse/templates/pages/help.html:502 msgid "" -"The project name has been registered by another user, but no releases have " -"been created." +"The project name has been registered by another user, but no releases " +"have been created." msgstr "" -"O nome do projeto foi registrado por outro usuário, mas não foram criados " -"lançamentos." +"O nome do projeto foi registrado por outro usuário, mas não foram criados" +" lançamentos." #: warehouse/templates/pages/help.html:506 #, python-format msgid "" -"Follow the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">\"How to request a name transfer\"</a> section of <abbr title=" -"\"Python enhancement proposal\">PEP</abbr> 541." +"Follow the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">\"How to request a name transfer\"</a> section of <abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 541." msgstr "" -"Siga a seção <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">\"How to request a name transfer\"</a> da <abbr title=" -"\"Proposta de aprimoramento do Python\">PEP</abbr> 541." +"Siga a seção <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">\"How to request a name transfer\"</a> da <abbr " +"title=\"Proposta de aprimoramento do Python\">PEP</abbr> 541." #: warehouse/templates/pages/help.html:511 msgid "Owner:" @@ -4778,84 +4818,88 @@ msgstr "Proprietário:" #: warehouse/templates/pages/help.html:514 msgid "" -"Only the current owners of a project have the ability to add new owners or " -"maintainers. If you need to request ownership, you should contact the " -"current owner(s) of the project directly. Many project owners provide their " -"contact details in the 'Author' field of the 'Meta' details on the project " -"page." +"Only the current owners of a project have the ability to add new owners " +"or maintainers. If you need to request ownership, you should contact the " +"current owner(s) of the project directly. Many project owners provide " +"their contact details in the 'Author' field of the 'Meta' details on the " +"project page." msgstr "" -"Somente os proprietários atuais de um projeto têm a capacidade de adicionar " -"novos proprietários ou mantenedores. Se você precisar solicitar a " -"propriedade, você deve entrar em contato com o(s) proprietário(s) atual(is) " -"do projeto diretamente. Muitos proprietários de projetos fornecem seus " -"detalhes de contato no campo \"Autor\" dos detalhes \"Meta\" na página do " -"projeto." +"Somente os proprietários atuais de um projeto têm a capacidade de " +"adicionar novos proprietários ou mantenedores. Se você precisar solicitar" +" a propriedade, você deve entrar em contato com o(s) proprietário(s) " +"atual(is) do projeto diretamente. Muitos proprietários de projetos " +"fornecem seus detalhes de contato no campo \"Autor\" dos detalhes " +"\"Meta\" na página do projeto." #: warehouse/templates/pages/help.html:515 #, python-format -msgid "" -"If the owner is unresponsive, see <a href=\"%(href)s\">%(anchor_text)s</a>" +msgid "If the owner is unresponsive, see <a href=\"%(href)s\">%(anchor_text)s</a>" msgstr "" -"Se o proprietário não responder, consulte <a href=\"%(href)s\">" -"%(anchor_text)s</a>" +"Se o proprietário não responder, consulte <a " +"href=\"%(href)s\">%(anchor_text)s</a>" #: warehouse/templates/pages/help.html:518 #, python-format msgid "" -"By default, an upload's description will render with <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">reStructuredText</a>. " -"If the description is in an alternate format like Markdown, a package may " -"set the <code>long_description_content_type</code> in <code>setup.py</code> " -"to the alternate format." +"By default, an upload's description will render with <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">reStructuredText</a>. If the description is in an " +"alternate format like Markdown, a package may set the " +"<code>long_description_content_type</code> in <code>setup.py</code> to " +"the alternate format." msgstr "" -"Por padrão, a descrição de um envio será renderizada com <a href=\"%(href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">reStructuredText</" -"a>. Se a descrição estiver em um formato alternativo, como Markdown, um " -"pacote pode definir o <code>long_description_content_type</code> em " -"<code>setup.py</code> para o formato alternativo." +"Por padrão, a descrição de um envio será renderizada com <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">reStructuredText</a>. Se a descrição estiver em um " +"formato alternativo, como Markdown, um pacote pode definir o " +"<code>long_description_content_type</code> em <code>setup.py</code> para " +"o formato alternativo." #: warehouse/templates/pages/help.html:519 #, python-format msgid "" -"Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging User Guide</a> for details on the available " -"formats." +"Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a> for details on the " +"available formats." msgstr "" -"Consulte o <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Guia de Usuário para Empacotamento de Python</a> para detalhes " -"sobre os formatos disponíveis." +"Consulte o <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Guia de Usuário para Empacotamento de Python</a> para " +"detalhes sobre os formatos disponíveis." #: warehouse/templates/pages/help.html:520 #, python-format msgid "" "PyPI will reject uploads if the description fails to render. To check a " -"description locally for validity, you may use <a href=\"%(href)s" -"\">readme_renderer</a>, which is the same description renderer used by PyPI." +"description locally for validity, you may use <a " +"href=\"%(href)s\">readme_renderer</a>, which is the same description " +"renderer used by PyPI." msgstr "" -"O PyPI rejeitará envios se a descrição não for renderizada. Para verificar " -"uma descrição localmente para validade, você pode usar <a href=\"%(href)s" -"\">readme_renderer</a>, que é o mesmo renderizador de descrição usado pelo " -"PyPI." +"O PyPI rejeitará envios se a descrição não for renderizada. Para " +"verificar uma descrição localmente para validade, você pode usar <a " +"href=\"%(href)s\">readme_renderer</a>, que é o mesmo renderizador de " +"descrição usado pelo PyPI." #: warehouse/templates/pages/help.html:524 #, python-format msgid "" -"If you can't upload your project's release to PyPI because you're hitting " -"the upload file size limit, we can sometimes increase your limit. Make sure " -"you've uploaded at least one release for the project that's <em>under</em> " -"the limit (a <a href=\"%(dev_release_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">developmental release version number</a> is " -"fine). Then, <a href=\"%(file_issue_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">file an issue</a> and tell us:</p>" +"If you can't upload your project's release to PyPI because you're hitting" +" the upload file size limit, we can sometimes increase your limit. Make " +"sure you've uploaded at least one release for the project that's " +"<em>under</em> the limit (a <a href=\"%(dev_release_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">developmental " +"release version number</a> is fine). Then, <a " +"href=\"%(file_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">file an issue</a> and tell us:</p>" msgstr "" "Se você não consegue enviar o lançamento do seu projeto para PyPI porque " "você está batendo o limite de tamanho de arquivo de envio, podemos, por " -"vezes, aumentar o seu limite. Certifique-se de ter enviado pelo menos uma " -"versão para o projeto que está <em>abaixo</em> do limite (a <a href=" -"\"%(dev_release_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">número de versão de lançamento de desenvolvimento</a> serve). Então, <a " -"href=\"%(file_issue_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">preencha um relatório de problemas</a> e novos fale:</p>" +"vezes, aumentar o seu limite. Certifique-se de ter enviado pelo menos uma" +" versão para o projeto que está <em>abaixo</em> do limite (a <a " +"href=\"%(dev_release_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">número de versão de lançamento de desenvolvimento</a> " +"serve). Então, <a href=\"%(file_issue_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">preencha um relatório de problemas</a>" +" e novos fale:</p>" #: warehouse/templates/pages/help.html:532 msgid "A link to your project on PyPI (or Test PyPI)" @@ -4866,25 +4910,24 @@ msgid "The size of your release, in megabytes" msgstr "O tamanho do seu lançamento, em megabytes" #: warehouse/templates/pages/help.html:534 -msgid "" -"Which index/indexes you need the increase for (PyPI, Test PyPI, or both)" -msgstr "" -"Qual índice/índices você precisa aumentar para (PyPI, Test PyPI ou ambos)" +msgid "Which index/indexes you need the increase for (PyPI, Test PyPI, or both)" +msgstr "Qual índice/índices você precisa aumentar para (PyPI, Test PyPI ou ambos)" #: warehouse/templates/pages/help.html:535 msgid "" -"A brief description of your project, including the reason for the additional " -"size." +"A brief description of your project, including the reason for the " +"additional size." msgstr "" -"Uma breve descrição do seu projeto, incluindo o motivo do tamanho adicional." +"Uma breve descrição do seu projeto, incluindo o motivo do tamanho " +"adicional." #: warehouse/templates/pages/help.html:544 msgid "" -"If you've forgotten your PyPI password but you remember your email address " -"or username, follow these steps to reset your password:" +"If you've forgotten your PyPI password but you remember your email " +"address or username, follow these steps to reset your password:" msgstr "" -"Se você esqueceu sua senha do PyPI, mas se lembra do seu endereço de e-mail " -"ou nome de usuário, siga estes passos para redefinir sua senha:" +"Se você esqueceu sua senha do PyPI, mas se lembra do seu endereço de " +"e-mail ou nome de usuário, siga estes passos para redefinir sua senha:" #: warehouse/templates/pages/help.html:546 #, python-format @@ -4892,11 +4935,10 @@ msgid "Go to <a href=\"%(href)s\">reset your password</a>." msgstr "Vá para <a href=\"%(href)s\">redefinir sua senha</a>." #: warehouse/templates/pages/help.html:547 -msgid "" -"Enter the email address or username you used for PyPI and submit the form." +msgid "Enter the email address or username you used for PyPI and submit the form." msgstr "" -"Digite o endereço de e-mail ou nome de usuário que você usou para o PyPI e " -"envie o formulário." +"Digite o endereço de e-mail ou nome de usuário que você usou para o PyPI " +"e envie o formulário." #: warehouse/templates/pages/help.html:548 msgid "You'll receive an email with a password reset link." @@ -4912,23 +4954,25 @@ msgstr "Perda de acesso ao endereço de e-mail associado à sua conta" #: warehouse/templates/pages/help.html:556 msgid "" -"Lost two factor authentication <a href=\"#totp\">application</a>, <a href=" -"\"#utfkey\">device</a>, and <a href=\"#recoverycodes\">recovery codes</a>" +"Lost two factor authentication <a href=\"#totp\">application</a>, <a " +"href=\"#utfkey\">device</a>, and <a href=\"#recoverycodes\">recovery " +"codes</a>" msgstr "" -"Perda do <a href=\"#totp\">aplicativo</a>, do <a href=\"#utfkey" -"\">dispositivo</a> e dos <a href=\"#recoverycodes\">códigos de recuperação</" -"a> de autenticação de dois factores" +"Perda do <a href=\"#totp\">aplicativo</a>, do <a " +"href=\"#utfkey\">dispositivo</a> e dos <a href=\"#recoverycodes\">códigos" +" de recuperação</a> de autenticação de dois factores" #: warehouse/templates/pages/help.html:559 #, python-format msgid "" -"You can proceed to, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">file an issue on our tracker</a> to request assistance " -"with account recovery." +"You can proceed to, <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">file an issue on our tracker</a> to " +"request assistance with account recovery." msgstr "" -"Você pode proceder com <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">preenchimento de um relatório de problema em " -"nosso rastreador</a> para solicitar assistência com a recuperação de conta." +"Você pode proceder com <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">preenchimento de um relatório de " +"problema em nosso rastreador</a> para solicitar assistência com a " +"recuperação de conta." #: warehouse/templates/pages/help.html:566 msgid "If you are using a username and password for uploads:" @@ -4948,8 +4992,7 @@ msgstr "" #: warehouse/templates/pages/help.html:571 msgid "If you are using an <a href=\"#apitoken\">API Token</a> for uploads:" -msgstr "" -"Se você está usando um <a href=\"#apitoken\">token de API</a> para envios:" +msgstr "Se você está usando um <a href=\"#apitoken\">token de API</a> para envios:" #: warehouse/templates/pages/help.html:573 msgid "Ensure that your API Token is valid and has not been revoked." @@ -4957,156 +5000,162 @@ msgstr "Certifique-se que seu token de API é válido e não foi revogado." #: warehouse/templates/pages/help.html:574 msgid "" -"Ensure that your API Token is <a href=\"#apitoken\">properly formatted</a> " -"and does not contain any trailing characters such as newlines." +"Ensure that your API Token is <a href=\"#apitoken\">properly " +"formatted</a> and does not contain any trailing characters such as " +"newlines." msgstr "" "Certifique-se que seu token de API está <a href=\"#apitoken\">formatado " -"adequadamente</a> e não contenha qualquer caractere ao final, tal como novas " -"linhas." +"adequadamente</a> e não contenha qualquer caractere ao final, tal como " +"novas linhas." #: warehouse/templates/pages/help.html:579 #, python-format msgid "" -"Transport Layer Security, or TLS, is part of how we make sure connections " -"between your computer and PyPI are private and secure. It's a cryptographic " -"protocol that's had several versions over time. PyPI <a href=" -"\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">turned off support for TLS versions 1.0 and 1.1</a> in April " -"2018. <a href=\"%(reason_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Learn why on the PSF blog</a>." +"Transport Layer Security, or TLS, is part of how we make sure connections" +" between your computer and PyPI are private and secure. It's a " +"cryptographic protocol that's had several versions over time. PyPI <a " +"href=\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">turned off support for TLS versions 1.0 and 1.1</a> in " +"April 2018. <a href=\"%(reason_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Learn why on the PSF blog</a>." msgstr "" -"Transport Layer Security, ou TLS, faz parte de como nós certificamos que as " -"conexões entre o seu computador e o PyPI são privadas e seguras. É um " -"protocolo criptográfico que teve várias versões ao longo do tempo. PyPI <a " -"href=\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">desligou o suporte para TLS versões 1.0 e 1.1</a> em abril de " -"2018. <a href=\"%(reason_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Saiba porque no blog da PSF</a>." +"Transport Layer Security, ou TLS, faz parte de como nós certificamos que " +"as conexões entre o seu computador e o PyPI são privadas e seguras. É um " +"protocolo criptográfico que teve várias versões ao longo do tempo. PyPI " +"<a href=\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">desligou o suporte para TLS versões 1.0 e 1.1</a> em " +"abril de 2018. <a href=\"%(reason_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Saiba porque no blog da PSF</a>." #: warehouse/templates/pages/help.html:586 #, python-format msgid "" -"If you are having trouble with <code>%(command)s</code> and get a <code>No " -"matching distribution found</code> or <code>Could not fetch URL</code> " -"error, try adding <code>-v</code> to the command to get more information:" +"If you are having trouble with <code>%(command)s</code> and get a " +"<code>No matching distribution found</code> or <code>Could not fetch " +"URL</code> error, try adding <code>-v</code> to the command to get more " +"information:" msgstr "" -"Se você está tendo problemas com <code>%(command)s</code> e recebe um erro " -"<code>No matching distribution found</code> or <code>Could not fetch URL</" -"code>, tente adicionar <code>-v</code> ao comando para obter mais " +"Se você está tendo problemas com <code>%(command)s</code> e recebe um " +"erro <code>No matching distribution found</code> or <code>Could not fetch" +" URL</code>, tente adicionar <code>-v</code> ao comando para obter mais " "informações:" #: warehouse/templates/pages/help.html:588 msgid "" "If you see an error like <code>There was a problem confirming the ssl " "certificate</code> or <code>tlsv1 alert protocol version</code> or " -"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, you need to be connecting to PyPI " -"with a newer TLS support library." +"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, you need to be connecting to " +"PyPI with a newer TLS support library." msgstr "" "Se você vir um erro como <code>There was a problem confirming the ssl " "certificate</code> ou <code>tlsv1 alert protocol version</code> ou " -"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, você precisa estar se conectando " -"ao PyPI com uma biblioteca com suporte a um TLS mais recente." +"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, você precisa estar se " +"conectando ao PyPI com uma biblioteca com suporte a um TLS mais recente." #: warehouse/templates/pages/help.html:589 msgid "" "The specific steps you need to take will depend on your operating system " -"version, where your installation of Python originated (python.org, your OS " -"vendor, or an intermediate distributor), and the installed versions of " -"Python, <code>setuptools</code>, and <code>pip</code>." +"version, where your installation of Python originated (python.org, your " +"OS vendor, or an intermediate distributor), and the installed versions of" +" Python, <code>setuptools</code>, and <code>pip</code>." msgstr "" "As etapas específicas que você precisa tomar dependerá de sua versão do " -"sistema operacional, onde a instalação do Python originou (python.org, seu " -"fornecedor de sistema operacional ou um distribuidor intermediário) e as " -"versões instaladas do Python, <code>setuptools</code> e <code>pip</code>." +"sistema operacional, onde a instalação do Python originou (python.org, " +"seu fornecedor de sistema operacional ou um distribuidor intermediário) e" +" as versões instaladas do Python, <code>setuptools</code> e " +"<code>pip</code>." #: warehouse/templates/pages/help.html:591 #, python-format msgid "" -"For help, go to <a href=\"%(irc_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">the <code>#pypa</code> IRC channel on Freenode</a>, file " -"an issue at <a href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">pypa/packaging-problems/issues</a>, or <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">post to the python-help mailing list</a>, including your OS and " -"installation details and the output of <code>%(command)s</code>." -msgstr "" -"Para obter ajuda, vá ao <a href=\"%(irc_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">canal IRC <code>#pypa</code> no Freenode</a>, " -"preencha um relatório de problema em <a href=\"%(issue_tracker_href)s\" " +"For help, go to <a href=\"%(irc_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">the <code>#pypa</code> IRC channel on " +"Freenode</a>, file an issue at <a href=\"%(issue_tracker_href)s\" " "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">pypa/packaging-" -"problems/issues</a> ou <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">publique na lista de discussão python-" -"help</a>, incluindo os detalhes do sistema operacional e da instalação e a " -"saída de <code>%(command)s</code>." +"problems/issues</a>, or <a href=\"%(mailing_list_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">post to the " +"python-help mailing list</a>, including your OS and installation details " +"and the output of <code>%(command)s</code>." +msgstr "" +"Para obter ajuda, vá ao <a href=\"%(irc_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">canal IRC <code>#pypa</code> no " +"Freenode</a>, preencha um relatório de problema em <a " +"href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">pypa/packaging-problems/issues</a> ou <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">publique na lista de discussão python-help</a>, " +"incluindo os detalhes do sistema operacional e da instalação e a saída de" +" <code>%(command)s</code>." #: warehouse/templates/pages/help.html:602 #, python-format msgid "" -"We take <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">accessibility</a> very seriously and want to make the website " -"easy to use for everyone." +"We take <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">accessibility</a> very seriously and want to make the " +"website easy to use for everyone." msgstr "" -"Levamos <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">acessibilidade</a> muito a sério e queremos tornar o site fácil " -"de usar para todos." +"Levamos <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">acessibilidade</a> muito a sério e queremos tornar o " +"site fácil de usar para todos." #: warehouse/templates/pages/help.html:607 #, python-format msgid "" -"If you are experiencing an accessibility problem, <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">report it to us on GitHub</" -"a>, so we can try to fix the problem, for you and others." +"If you are experiencing an accessibility problem, <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">report it to us on" +" GitHub</a>, so we can try to fix the problem, for you and others." msgstr "" -"Se você estiver enfrentando um problema de acessibilidade, <a href=\"%(href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">relate para nós no " -"GitHub</a>, para que possamos tentar corrigir o problema, para você e outros." +"Se você estiver enfrentando um problema de acessibilidade, <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">relate para nós no GitHub</a>, para que possamos tentar " +"corrigir o problema, para você e outros." #: warehouse/templates/pages/help.html:615 #, python-format msgid "" "In a previous version of PyPI, it used to be possible for maintainers to " -"upload releases to PyPI using a form in the web browser. This feature was " -"deprecated with the new version of PyPI – we instead recommend that you <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">use " -"twine to upload your project to PyPI</a>." -msgstr "" -"Em uma versão anterior do PyPI, costumava ser possível que os mantenedores " -"enviassem lançamentos para o PyPI usando um formulário no navegador da Web. " -"Este recurso foi preterido com a nova versão do PyPI – em vez disso, " -"recomendamos que você <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">use o twine para enviar seu projeto para PyPI</" -"a>." +"upload releases to PyPI using a form in the web browser. This feature was" +" deprecated with the new version of PyPI – we instead recommend that you " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">use twine to upload your project to PyPI</a>." +msgstr "" +"Em uma versão anterior do PyPI, costumava ser possível que os " +"mantenedores enviassem lançamentos para o PyPI usando um formulário no " +"navegador da Web. Este recurso foi preterido com a nova versão do PyPI – " +"em vez disso, recomendamos que você <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">use o twine para " +"enviar seu projeto para PyPI</a>." #: warehouse/templates/pages/help.html:624 msgid "" -"Spammers return to PyPI with some regularity hoping to place their Search " -"Engine Optimized phishing, scam, and click-farming content on the site. " +"Spammers return to PyPI with some regularity hoping to place their Search" +" Engine Optimized phishing, scam, and click-farming content on the site. " "Since PyPI allows for indexing of the Long Description and other data " "related to projects and has a generally solid search reputation, it is a " "prime target." msgstr "" -"Spammers retornam ao PyPI com alguma regularidade na esperança de colocar o " -"seu phishing, scam e conteúdo click-farming otimizado para motores de busca " -"em nosso site. Como o PyPI permite a indexação da descrição longa e outros " -"dados relacionados a projetos e tem uma reputação de pesquisa geralmente " -"sólida, é um alvo principal." +"Spammers retornam ao PyPI com alguma regularidade na esperança de colocar" +" o seu phishing, scam e conteúdo click-farming otimizado para motores de " +"busca em nosso site. Como o PyPI permite a indexação da descrição longa e" +" outros dados relacionados a projetos e tem uma reputação de pesquisa " +"geralmente sólida, é um alvo principal." #: warehouse/templates/pages/help.html:626 #, python-format msgid "" "When the PyPI administrators are overwhelmed by spam <strong>or</strong> " -"determine that there is some other threat to PyPI, new user registration and/" -"or new project registration may be disabled. Check <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status page</a> " -"for more details, as we'll likely have updated it with reasoning for the " -"intervention." -msgstr "" -"Quando os administradores do PyPI são sobrecarregados por spam <strong>ou</" -"strong> determinam que há alguma outra ameaça para PyPI, registro de novos " -"usuários e/ou de novos projetos pode ser desativado. Verifique <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">nossa " -"página de status </a> para mais detalhes, como provavelmente vamos ter " -"atualizado com o raciocínio para a intervenção." +"determine that there is some other threat to PyPI, new user registration " +"and/or new project registration may be disabled. Check <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">our status page</a> for more details, as we'll likely " +"have updated it with reasoning for the intervention." +msgstr "" +"Quando os administradores do PyPI são sobrecarregados por spam " +"<strong>ou</strong> determinam que há alguma outra ameaça para PyPI, " +"registro de novos usuários e/ou de novos projetos pode ser desativado. " +"Verifique <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">nossa página de status </a> para mais detalhes, como " +"provavelmente vamos ter atualizado com o raciocínio para a intervenção." #: warehouse/templates/pages/help.html:635 msgid "PyPI will return these errors for one of these reasons:" @@ -5129,56 +5178,59 @@ msgid "" "PyPI does not allow for a filename to be reused, even once a project has " "been deleted and recreated." msgstr "" -"O PyPI não permite que um nome de arquivo seja reutilizado, mesmo após um " -"projeto ser excluído e recriado." +"O PyPI não permite que um nome de arquivo seja reutilizado, mesmo após um" +" projeto ser excluído e recriado." #: warehouse/templates/pages/help.html:643 #, python-format msgid "" -"To avoid this situation, <a href=\"%(test_pypi_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">use Test PyPI to perform and check your " -"upload first</a>, before uploading to <a href=\"%(pypi_href)s\">pypi.org</a>." +"To avoid this situation, <a href=\"%(test_pypi_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">use Test PyPI to " +"perform and check your upload first</a>, before uploading to <a " +"href=\"%(pypi_href)s\">pypi.org</a>." msgstr "" -"Para evitar esta situação, <a href=\"%(test_pypi_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">use o Test PyPI para executar e " -"verificar o seu envio primeiro</a>, antes de enviar para o <a href=" -"\"%(pypi_href)s\">pypi.org</a>." +"Para evitar esta situação, <a href=\"%(test_pypi_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">use o Test PyPI " +"para executar e verificar o seu envio primeiro</a>, antes de enviar para " +"o <a href=\"%(pypi_href)s\">pypi.org</a>." #: warehouse/templates/pages/help.html:650 #, python-format msgid "" -"If you would like to request a new trove classifier file a pull request on " -"the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><code>pypa/trove-classifiers</code> project</a>. Be sure to include a " -"brief justification of why it is important." +"If you would like to request a new trove classifier file a pull request " +"on the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>pypa/trove-classifiers</code> project</a>. Be sure" +" to include a brief justification of why it is important." msgstr "" -"Caso você queira pedir um novo arquivo de classificador de trove, preencha " -"uma pull request no <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">projeto <code>pypa/trove-classifiers</code></a>. " -"Certifique-se de incluir uma breve justificativa do porquê ele é importante." +"Caso você queira pedir um novo arquivo de classificador de trove, " +"preencha uma pull request no <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">projeto <code>pypa/trove-" +"classifiers</code></a>. Certifique-se de incluir uma breve justificativa " +"do porquê ele é importante." #: warehouse/templates/pages/help.html:658 #, python-format msgid "" "If you're experiencing an issue with PyPI itself, we welcome " -"<strong>constructive</strong> feedback and bug reports via our <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">issue " -"tracker</a>. Please note that this tracker is only for issues with the " -"software that runs PyPI. Before writing a new issue, first check that a " -"similar issue does not already exist." +"<strong>constructive</strong> feedback and bug reports via our <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">issue tracker</a>. Please note that this tracker is only" +" for issues with the software that runs PyPI. Before writing a new issue," +" first check that a similar issue does not already exist." msgstr "" "Se você está enfrentando um problema com PyPI em si, agradeceríamos se " -"enviasse feedback <strong>construtivo</strong> e relatórios de erro através " -"do nosso <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">rastreador de problemas</a>. Por favor, note que este " -"rastreador é apenas para problemas com o software que executa PyPI. Antes de " -"escrever um novo relatório de problema, primeiro verifique se um relatório " -"semelhante ainda não existe." +"enviasse feedback <strong>construtivo</strong> e relatórios de erro " +"através do nosso <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">rastreador de problemas</a>. Por " +"favor, note que este rastreador é apenas para problemas com o software " +"que executa PyPI. Antes de escrever um novo relatório de problema, " +"primeiro verifique se um relatório semelhante ainda não existe." #: warehouse/templates/pages/help.html:665 msgid "" -"If you are having an issue is with a specific package installed from PyPI, " -"you should reach out to the maintainers of that project directly instead." +"If you are having an issue is with a specific package installed from " +"PyPI, you should reach out to the maintainers of that project directly " +"instead." msgstr "" "Se você está tendo um problema é com um pacote específico instalado pelo " "PyPI, você deve chegar aos mantenedores desse projeto diretamente." @@ -5186,112 +5238,117 @@ msgstr "" #: warehouse/templates/pages/help.html:674 #, python-format msgid "" -"PyPI is powered by the Warehouse project; <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> is an open " -"source project developed under the umbrella of the Python Packaging " -"Authority (PyPA) and supported by the Python Packaging Working Group " -"(PackagingWG)." -msgstr "" -"O PyPI funciona com a tecnologia do projeto Warehouse; <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> é um " -"projeto de código aberto desenvolvido sob a organização de projetos da " -"Python Packaging Authority (PyPA) e apoiado pelo Python Packaging Working " +"PyPI is powered by the Warehouse project; <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> is " +"an open source project developed under the umbrella of the Python " +"Packaging Authority (PyPA) and supported by the Python Packaging Working " "Group (PackagingWG)." +msgstr "" +"O PyPI funciona com a tecnologia do projeto Warehouse; <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Warehouse</a> é um projeto de código aberto desenvolvido" +" sob a organização de projetos da Python Packaging Authority (PyPA) e " +"apoiado pelo Python Packaging Working Group (PackagingWG)." #: warehouse/templates/pages/help.html:679 #, python-format msgid "" -"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPA</a> is an independent group of developers whose goal is to improve " -"and maintain many of the core projects related to Python packaging." +"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA</a> is an independent group of developers whose " +"goal is to improve and maintain many of the core projects related to " +"Python packaging." msgstr "" -"O <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPA</a> é um grupo independente de desenvolvedores cujo objetivo é " -"melhorar e manter muitos dos principais projetos relacionados a " -"empacotamento do Python." +"O <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA</a> é um grupo independente de desenvolvedores cujo" +" objetivo é melhorar e manter muitos dos principais projetos relacionados" +" a empacotamento do Python." #: warehouse/templates/pages/help.html:684 #, python-format msgid "" -"The <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">PackagingWG</a> is a working group of the Python Software " -"Foundation (PSF) whose goal is to raise and disburse funds to support the " -"ongoing improvement of Python packaging. Most recently it <a href=" -"\"%(otf_award_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">secured an award from the Open Technology Fund</a> whose funding is " -"enabling developers to improve Warehouse's security and accessibility." -msgstr "" -"O <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">PackagingWG</a> é um grupo de trabalho da Python Software " -"Foundation (PSF), cujo objetivo é levantar e desembolsar fundos para apoiar " -"a melhoria contínua do empacotamento do Python. Mais recentemente, ela <a " -"href=\"%(otf_award_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">recebeu um prêmio do Open Technology Fund</a> cujo " -"financiamento está permitindo aos desenvolvedores melhorar a segurança e a " -"acessibilidade do Warehouse." +"The <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">PackagingWG</a> is a working group of " +"the Python Software Foundation (PSF) whose goal is to raise and disburse " +"funds to support the ongoing improvement of Python packaging. Most " +"recently it <a href=\"%(otf_award_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">secured an award from the Open " +"Technology Fund</a> whose funding is enabling developers to improve " +"Warehouse's security and accessibility." +msgstr "" +"O <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\"" +" rel=\"noopener\">PackagingWG</a> é um grupo de trabalho da Python " +"Software Foundation (PSF), cujo objetivo é levantar e desembolsar fundos " +"para apoiar a melhoria contínua do empacotamento do Python. Mais " +"recentemente, ela <a href=\"%(otf_award_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">recebeu um prêmio do Open Technology " +"Fund</a> cujo financiamento está permitindo aos desenvolvedores melhorar " +"a segurança e a acessibilidade do Warehouse." #: warehouse/templates/pages/help.html:694 #, python-format msgid "" -"PyPI is powered by <a href=\"%(warehouse_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Warehouse</a> and by a variety of tools and " -"services provided by our <a href=\"%(sponsors_href)s\">generous sponsors</a>." +"PyPI is powered by <a href=\"%(warehouse_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Warehouse</a> and by a variety of " +"tools and services provided by our <a href=\"%(sponsors_href)s\">generous" +" sponsors</a>." msgstr "" -"O PyPI funciona com a tecnologia do <a href=\"%(warehouse_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> e por uma " -"variedade de ferramentas e serviços fornecidos por nossos <a href=" -"\"%(sponsors_href)s\">generosos patrocinadores</a>." +"O PyPI funciona com a tecnologia do <a href=\"%(warehouse_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> e " +"por uma variedade de ferramentas e serviços fornecidos por nossos <a " +"href=\"%(sponsors_href)s\">generosos patrocinadores</a>." #: warehouse/templates/pages/help.html:701 msgid "" -"As of April 16, 2018, PyPI.org is at \"production\" status, meaning that it " -"has moved out of beta and replaced the old site (pypi.python.org). It is now " -"robust, tested, and ready for expected browser and API traffic." +"As of April 16, 2018, PyPI.org is at \"production\" status, meaning that " +"it has moved out of beta and replaced the old site (pypi.python.org). It " +"is now robust, tested, and ready for expected browser and API traffic." msgstr "" -"A partir de 16 de abril de 2018, PyPI.org está no status de \"produção\", o " -"que significa que ele se mudou para fora do beta e substituiu o site antigo " -"(pypi.python.org). Agora é robusto, testado e pronto para o navegador " -"esperado e tráfego de API." +"A partir de 16 de abril de 2018, PyPI.org está no status de \"produção\"," +" o que significa que ele se mudou para fora do beta e substituiu o site " +"antigo (pypi.python.org). Agora é robusto, testado e pronto para o " +"navegador esperado e tráfego de API." #: warehouse/templates/pages/help.html:703 #, python-format msgid "" -"PyPI is heavily cached and distributed via <abbr title=\"content delivery " -"network\">CDN</abbr> thanks to our sponsor <a href=\"%(fastly_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Fastly</a> and thus is " -"generally available globally. However, the site is mostly maintained by " -"volunteers, we do not provide any specific Service Level Agreement, and as " -"could be expected for a giant distributed system, things can and sometimes " -"do go wrong. See <a href=\"%(status_page_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">our status page</a> for current and past outages " -"and incidents. If you have high availability requirements for your package " -"index, consider either a <a href=\"%(mirror_href)s\">mirror</a> or a <a href=" -"\"%(private_index_href)s\">private index</a>." +"PyPI is heavily cached and distributed via <abbr title=\"content delivery" +" network\">CDN</abbr> thanks to our sponsor <a href=\"%(fastly_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Fastly</a> and " +"thus is generally available globally. However, the site is mostly " +"maintained by volunteers, we do not provide any specific Service Level " +"Agreement, and as could be expected for a giant distributed system, " +"things can and sometimes do go wrong. See <a " +"href=\"%(status_page_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">our status page</a> for current and past outages and " +"incidents. If you have high availability requirements for your package " +"index, consider either a <a href=\"%(mirror_href)s\">mirror</a> or a <a " +"href=\"%(private_index_href)s\">private index</a>." msgstr "" "O PyPI possui um grande cache e é distribuído via <abbr title=\"rede de " -"entrega de conteúdo\">CDN</abbr> graças ao nosso patrocinador <a href=" -"\"%(fastly_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Fastly</a> e, portanto, geralmente está disponível globalmente. No " -"entanto, o site é mantido principalmente por voluntários, nós não fornecemos " -"qualquer Acordo de Nível de Serviço específico e como, poderia ser esperado " -"para um sistema gigante distribuído, as coisas podem e às vezes dar errado. " -"Consulte <a href=\"%(status_page_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">nossa página de status</a> para interrupções e " -"incidentes atuais e passados. Se você tiver requisitos de alta " -"disponibilidade para o índice do pacote, considere usar um <a href=" -"\"%(mirror_href)s\">espelho</a> ou um <a href=\"%(private_index_href)s" -"\">índice privado</a>." +"entrega de conteúdo\">CDN</abbr> graças ao nosso patrocinador <a " +"href=\"%(fastly_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Fastly</a> e, portanto, geralmente está disponível " +"globalmente. No entanto, o site é mantido principalmente por voluntários," +" nós não fornecemos qualquer Acordo de Nível de Serviço específico e " +"como, poderia ser esperado para um sistema gigante distribuído, as coisas" +" podem e às vezes dar errado. Consulte <a href=\"%(status_page_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">nossa página de " +"status</a> para interrupções e incidentes atuais e passados. Se você " +"tiver requisitos de alta disponibilidade para o índice do pacote, " +"considere usar um <a href=\"%(mirror_href)s\">espelho</a> ou um <a " +"href=\"%(private_index_href)s\">índice privado</a>." #: warehouse/templates/pages/help.html:717 #, python-format msgid "" -"We have a huge amount of work to do to continue to maintain and improve PyPI " -"(also known as <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">the Warehouse project</a>)." +"We have a huge amount of work to do to continue to maintain and improve " +"PyPI (also known as <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">the Warehouse project</a>)." msgstr "" -"Temos uma enorme quantidade de trabalho a fazer para continuar a manter e " -"melhorar PyPI (também conhecido como <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">o projeto Warehouse</a>)." +"Temos uma enorme quantidade de trabalho a fazer para continuar a manter e" +" melhorar PyPI (também conhecido como <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">o projeto " +"Warehouse</a>)." #: warehouse/templates/pages/help.html:722 msgid "Financial:" @@ -5312,53 +5369,55 @@ msgstr "Desenvolvimento:" #: warehouse/templates/pages/help.html:723 msgid "" -"Warehouse is open source, and we would love to see some new faces working on " -"the project. You <strong>do not</strong> need to be an experienced open-" -"source developer to make a contribution – in fact, we'd love to help you " -"make your first open source pull request!" +"Warehouse is open source, and we would love to see some new faces working" +" on the project. You <strong>do not</strong> need to be an experienced " +"open-source developer to make a contribution – in fact, we'd love to help" +" you make your first open source pull request!" msgstr "" "Warehouse é um código aberto, e gostaríamos de ver alguns rostos novos " "trabalhando no projeto. Você <strong>não</strong> precisa ser um " -"desenvolvedor de código aberto experiente para fazer uma contribuição - na " -"verdade, gostaríamos de ajudá-lo a fazer o seu primeiro pull request de " -"código aberto!" +"desenvolvedor de código aberto experiente para fazer uma contribuição - " +"na verdade, gostaríamos de ajudá-lo a fazer o seu primeiro pull request " +"de código aberto!" #: warehouse/templates/pages/help.html:725 #, python-format msgid "" "If you have skills in Python, ElasticSearch, HTML, SCSS, JavaScript, or " -"SQLAlchemy then skim our <a href=\"%(getting_started_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">\"Getting started\" guide</" -"a>, then take a look at the <a href=\"%(issue_tracker_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">issue tracker</a>. We've " -"created a <a href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">'Good first issue'</a> label – we recommend you " -"start here." -msgstr "" -"Se você tiver habilidades em Python, ElasticSearch, HTML, SCSS, JavaScript " -"ou SQLAlchemy, então dê uma olhada em nosso <a href=" -"\"%(getting_started_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">guia de \"Getting started\"</a> e confira o <a href=" -"\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">rastreador de problemas</a>. Nós criamos um rótulo <a href=" -"\"%(good_first_issue_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">\"Good first issue\"</a> – recomendamos que você comece aqui." +"SQLAlchemy then skim our <a href=\"%(getting_started_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">\"Getting " +"started\" guide</a>, then take a look at the <a " +"href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">issue tracker</a>. We've created a <a " +"href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">'Good first issue'</a> label – we recommend you start " +"here." +msgstr "" +"Se você tiver habilidades em Python, ElasticSearch, HTML, SCSS, " +"JavaScript ou SQLAlchemy, então dê uma olhada em nosso <a " +"href=\"%(getting_started_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">guia de \"Getting started\"</a> e confira o <a " +"href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">rastreador de problemas</a>. Nós criamos um rótulo <a " +"href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">\"Good first issue\"</a> – recomendamos que você comece " +"aqui." #: warehouse/templates/pages/help.html:733 #, python-format msgid "" -"Issues are grouped into <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">milestones</a>; working on issues in the current " -"milestone is a great way to help push the project forward. If you're " -"interested in working on a particular issue, leave a comment and we can " -"guide you through the contribution process." +"Issues are grouped into <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">milestones</a>; working on issues in " +"the current milestone is a great way to help push the project forward. If" +" you're interested in working on a particular issue, leave a comment and " +"we can guide you through the contribution process." msgstr "" -"Os relatórios de problemas são agrupados em <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">marcos</a>; trabalhar em " -"questões no marco atual é uma ótima maneira de ajudar a empurrar o projeto " -"para a frente. Se você estiver interessado em trabalhar em um determinado " -"problema, deixe um comentário e podemos guiá-lo através do processo de " -"contribuição." +"Os relatórios de problemas são agrupados em <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">marcos</a>; " +"trabalhar em questões no marco atual é uma ótima maneira de ajudar a " +"empurrar o projeto para a frente. Se você estiver interessado em " +"trabalhar em um determinado problema, deixe um comentário e podemos " +"guiá-lo através do processo de contribuição." #: warehouse/templates/pages/help.html:740 msgid "Stay updated:" @@ -5367,49 +5426,51 @@ msgstr "Mantenha-se atualizado:" #: warehouse/templates/pages/help.html:741 #, python-format msgid "" -"You can also follow the ongoing development of the project on the <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">distutils-sig mailing list</a> and the <a href=" -"\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">PyPA Dev message group</a>." +"You can also follow the ongoing development of the project on the <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">distutils-sig mailing list</a> and the <a " +"href=\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA Dev message group</a>." msgstr "" -"Você também pode acompanhar o desenvolvimento contínuo do projeto na <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">lista de discussão distutils-sig</a> e o <a href=" -"\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">grupo de mensagens PyPA Dev</a>." +"Você também pode acompanhar o desenvolvimento contínuo do projeto na <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">lista de discussão distutils-sig</a> e o <a " +"href=\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">grupo de mensagens PyPA Dev</a>." #: warehouse/templates/pages/help.html:751 #, python-format msgid "" -"Changes to PyPI are generally announced on both the <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">pypi-announce mailing list</a> and the <a href=\"%(blog_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PSF blog</a> under " -"the label \"pypi\". The PSF blog also has <a href=\"%(atom_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Atom</a> and <a href=" -"\"%(rss_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</" -"a> feeds for the \"pypi\" label." -msgstr "" -"As alterações no PyPI são geralmente anunciadas na <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">lista de discussão pypi-announce</a> e no <a href=" -"\"%(blog_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">blog PSF</a> sob o rótulo \"pypi\". O blog PSF também tem feeds <a href=" -"\"%(atom_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Atom</a> e <a href=\"%(rss_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">RSS</a> para o rótulo \"pypi\"." +"Changes to PyPI are generally announced on both the <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">pypi-announce mailing list</a> and the <a " +"href=\"%(blog_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PSF blog</a> under the label \"pypi\". The PSF blog also" +" has <a href=\"%(atom_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Atom</a> and <a href=\"%(rss_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</a> feeds for " +"the \"pypi\" label." +msgstr "" +"As alterações no PyPI são geralmente anunciadas na <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">lista de discussão pypi-announce</a> e no <a " +"href=\"%(blog_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">blog PSF</a> sob o rótulo \"pypi\". O blog PSF também " +"tem feeds <a href=\"%(atom_href)s\" title=\"%(title)s\" target=\"_blank\"" +" rel=\"noopener\">Atom</a> e <a href=\"%(rss_href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">RSS</a> para o rótulo \"pypi\"." #: warehouse/templates/pages/help.html:761 msgid "" -"When Warehouse's maintainers are deploying new features, at first we mark " -"them with a small \"beta feature\" symbol to tell you: this should probably " -"work fine, but it's new and less tested than other site functionality." +"When Warehouse's maintainers are deploying new features, at first we mark" +" them with a small \"beta feature\" symbol to tell you: this should " +"probably work fine, but it's new and less tested than other site " +"functionality." msgstr "" "Quando os mantenedores do Warehouse estão implantando novos recursos, no " -"início, nós marcamos tais recursos com um pequeno símbolo \"recurso beta\" " -"para dizer: isso provavelmente deve funcionar bem, mas é novo e menos " -"testado do que a outra funcionalidade do site." +"início, nós marcamos tais recursos com um pequeno símbolo \"recurso " +"beta\" para dizer: isso provavelmente deve funcionar bem, mas é novo e " +"menos testado do que a outra funcionalidade do site." #: warehouse/templates/pages/help.html:762 msgid "Currently, no features are in beta." @@ -5418,16 +5479,17 @@ msgstr "Atualmente, nenhum recurso está na versão beta." #: warehouse/templates/pages/help.html:766 #, python-format msgid "" -"\"PyPI\" should be pronounced like \"pie pea eye\", specifically with the " -"\"PI\" pronounced as individual letters, rather as a single sound. This " -"minimizes confusion with the <a href=\"%(href)s\" title=\"%(title)s\">PyPy</" -"a> project, which is a popular alternative implementation of the Python " -"language." +"\"PyPI\" should be pronounced like \"pie pea eye\", specifically with the" +" \"PI\" pronounced as individual letters, rather as a single sound. This " +"minimizes confusion with the <a href=\"%(href)s\" " +"title=\"%(title)s\">PyPy</a> project, which is a popular alternative " +"implementation of the Python language." msgstr "" -"\"PyPI\" deve ser pronunciado como \"pai pi ai\", especificamente com o \"PI" -"\" pronunciado como letras individuais, em vez de um único som. Isso " -"minimiza a confusão com o projeto <a href=\"%(href)s\" title=\"%(title)s" -"\">PyPy</a>, que é uma implementação alternativa popular da linguagem Python." +"\"PyPI\" deve ser pronunciado como \"pai pi ai\", especificamente com o " +"\"PI\" pronunciado como letras individuais, em vez de um único som. Isso " +"minimiza a confusão com o projeto <a href=\"%(href)s\" " +"title=\"%(title)s\">PyPy</a>, que é uma implementação alternativa popular" +" da linguagem Python." #: warehouse/templates/pages/help.html:778 msgid "Resources" @@ -5464,22 +5526,23 @@ msgstr "Contato" #: warehouse/templates/pages/help.html:789 #, python-format msgid "" -"The <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging Authority (PyPA)</a> is a working group who " -"work together to improve Python packaging. If you'd like to get in touch " -"with a core packaging developer, use <a href=\"%(irc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">#pypa on IRC (freenode)</" -"a>, or <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">join the distutils-sig mailing list</a>." -msgstr "" -"O <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging Authority (PyPA)</a> é um grupo de trabalho " -"que trabalha em conjunto para melhorar o empacotamento de Python. Se você " -"quiser entrar em contato com um desenvolvedor de empacotamento principal, " -"use<a href=\"%(irc_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">#pypa no IRC (freenode)</a> ou <a href=\"%(mailing_list_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">junte-se à lista " -"de discussão distutils-sig</a>." +"The <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging Authority (PyPA)</a> is a working group" +" who work together to improve Python packaging. If you'd like to get in " +"touch with a core packaging developer, use <a href=\"%(irc_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">#pypa on IRC " +"(freenode)</a>, or <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">join the distutils-sig mailing " +"list</a>." +msgstr "" +"O <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging Authority (PyPA)</a> é um grupo de " +"trabalho que trabalha em conjunto para melhorar o empacotamento de " +"Python. Se você quiser entrar em contato com um desenvolvedor de " +"empacotamento principal, use<a href=\"%(irc_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">#pypa no IRC (freenode)</a> ou <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">junte-se à lista de discussão distutils-sig</a>." #: warehouse/templates/pages/security.html:15 msgid "Security" @@ -5491,11 +5554,11 @@ msgstr "Relatando um problema de segurança" #: warehouse/templates/pages/security.html:22 msgid "" -"We take security very seriously and ask that you follow our security policy " -"carefully." +"We take security very seriously and ask that you follow our security " +"policy carefully." msgstr "" -"Levamos a segurança muito a sério e pedimos que sigam atentamente a nossa " -"política de segurança." +"Levamos a segurança muito a sério e pedimos que sigam atentamente a nossa" +" política de segurança." #: warehouse/templates/pages/security.html:24 msgid "Important!" @@ -5503,13 +5566,13 @@ msgstr "Importante!" #: warehouse/templates/pages/security.html:24 msgid "" -"If you believe you've identified a security issue with Warehouse, <strong>DO " -"NOT</strong> report the issue in any public forum, including (but not " -"limited to):" +"If you believe you've identified a security issue with Warehouse, " +"<strong>DO NOT</strong> report the issue in any public forum, including " +"(but not limited to):" msgstr "" -"Se você acredita ter identificado um problema de segurança com o Warehouse, " -"<strong>NÃO</strong> relate o problema em qualquer fórum público, incluindo " -"(mas não limitado a):" +"Se você acredita ter identificado um problema de segurança com o " +"Warehouse, <strong>NÃO</strong> relate o problema em qualquer fórum " +"público, incluindo (mas não limitado a):" #: warehouse/templates/pages/security.html:27 msgid "Our GitHub issue tracker" @@ -5526,8 +5589,8 @@ msgstr "Listas de discussão oficiais ou não oficiais" #: warehouse/templates/pages/security.html:35 #, python-format msgid "" -"Instead, email <a href=\"%(href)s\">security at python dot org</a> directly, " -"providing as much relevant information as possible." +"Instead, email <a href=\"%(href)s\">security at python dot org</a> " +"directly, providing as much relevant information as possible." msgstr "" "Em vez disso, envie um e-mail para <a href=\"%(href)s\">security arroba " "python ponto org</a> diretamente, fornecendo o máximo de informações " @@ -5537,13 +5600,13 @@ msgstr "" #, python-format msgid "" "Messages may be optionally encrypted with GPG using key fingerprints " -"available <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">at the Python Security page</a>." +"available <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">at the Python Security page</a>." msgstr "" "As mensagens podem ser opcionalmente criptografadas com GPG usando as " -"principais impressões digitais disponíveis <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">na página Python Security</" -"a>." +"principais impressões digitais disponíveis <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">na página Python " +"Security</a>." #: warehouse/templates/pages/security.html:38 msgid "What happens next?" @@ -5554,8 +5617,8 @@ msgid "" "Once you've submitted an issue via email, you should receive an " "acknowledgment within 48 hours." msgstr "" -"Depois de enviar um problema via e-mail, você deve receber uma confirmação " -"dentro de 48 horas." +"Depois de enviar um problema via e-mail, você deve receber uma " +"confirmação dentro de 48 horas." #: warehouse/templates/pages/security.html:41 msgid "" @@ -5568,8 +5631,8 @@ msgstr "" #: warehouse/templates/pages/security.html:44 msgid "This security policy was last updated on March 14, 2018." msgstr "" -"Esta política de segurança foi atualizada pela última vez em 14 de março de " -"2018." +"Esta política de segurança foi atualizada pela última vez em 14 de março " +"de 2018." #: warehouse/templates/pages/sitemap.html:21 msgid "PyPI site map" @@ -5615,15 +5678,15 @@ msgstr "Doe para o Packaging Working Group" #: warehouse/templates/pages/sponsor.html:27 #, python-format msgid "" -"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Packaging Working Group</a> is a work group of the Python Software " -"Foundation which raises and distributes funds to improve Python's packaging " -"ecosystem." +"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Packaging Working Group</a> is a work group of the " +"Python Software Foundation which raises and distributes funds to improve " +"Python's packaging ecosystem." msgstr "" -"O <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Packaging Working Group</a> é um grupo de trabalho da Python Software " -"Foundation que levanta e distribui fundos para melhorar o ecossistema de " -"empacotamento do Python." +"O <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Packaging Working Group</a> é um grupo de trabalho da " +"Python Software Foundation que levanta e distribui fundos para melhorar o" +" ecossistema de empacotamento do Python." #: warehouse/templates/pages/sponsor.html:29 msgid "Recent projects funded through the working group include:" @@ -5634,26 +5697,26 @@ msgid "" "The successful relaunch of the Python Package Index, powered by the new " "'Warehouse' codebase" msgstr "" -"O relançamento bem-sucedido do Python Package Index, alimentado pela nova " -"base de código \"Warehouse\"" +"O relançamento bem-sucedido do Python Package Index, alimentado pela nova" +" base de código \"Warehouse\"" #: warehouse/templates/pages/sponsor.html:33 #, python-format msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$170,000 in funding</a> from the <a href=\"%(funder_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Mozilla Open Source " -"Support Program</a> in 2018" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$170,000 in funding</a> from the <a " +"href=\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Mozilla Open Source Support Program</a> in 2018" msgstr "" -"Com <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">US$ 170.000 em financiamento</a> do <a href=\"%(funder_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Mozilla Open Source " -"Support Program</a> em 2018" +"Com <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">US$ 170.000 em financiamento</a> do <a " +"href=\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Mozilla Open Source Support Program</a> em 2018" #: warehouse/templates/pages/sponsor.html:36 msgid "" -"Improving PyPI's security and accessibility, and adding support for multiple " -"locales" +"Improving PyPI's security and accessibility, and adding support for " +"multiple locales" msgstr "" "Melhorando a segurança e acessibilidade do PyPI e adicionando suporte a " "várias localidades" @@ -5661,13 +5724,13 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:37 #, python-format msgid "" -"With $80,000 in funding from the <a href=\"%(funder_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology Fund</a> in " -"2019" +"With $80,000 in funding from the <a href=\"%(funder_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology " +"Fund</a> in 2019" msgstr "" -"Com US$ 80.000 em financiamento da <a href=\"%(funder_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology Fund</a> em " -"2019" +"Com US$ 80.000 em financiamento da <a href=\"%(funder_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology " +"Fund</a> em 2019" #: warehouse/templates/pages/sponsor.html:40 msgid "Additional security-focused features for PyPI" @@ -5676,44 +5739,45 @@ msgstr "Recursos adicionais focados em segurança para PyPI" #: warehouse/templates/pages/sponsor.html:41 #, python-format msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$100,000 in funding</a> from <a href=\"%(funder_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Facebook Research</a> in " -"2019 and 2020" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$100,000 in funding</a> from <a href=\"%(funder_href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Facebook " +"Research</a> in 2019 and 2020" msgstr "" -"Com <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">US$ 100.000 em financiamento</a> da <a href=\"%(funder_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Facebook Research</a> " -"em 2019 e 2020" +"Com <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">US$ 100.000 em financiamento</a> da <a " +"href=\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Facebook Research</a> em 2019 e 2020" #: warehouse/templates/pages/sponsor.html:44 msgid "Overhauling pip's user experience and dependency resolver" -msgstr "" -"Revisão da experiência de usuário e da resolução de dependências do pip" +msgstr "Revisão da experiência de usuário e da resolução de dependências do pip" #: warehouse/templates/pages/sponsor.html:45 #, python-format msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$407,000 in funding</a> from the <a href=\"%(funder0_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Chan Zuckerberg " -"Initiative</a> and the <a href=\"%(funder1_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Mozilla Open Source Support Program</a> " -"in 2020" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$407,000 in funding</a> from the <a " +"href=\"%(funder0_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Chan Zuckerberg Initiative</a> and the <a " +"href=\"%(funder1_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Mozilla Open Source Support Program</a> in 2020" msgstr "" -"Com <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">US$ 407.000 em financiamento</a> da <a href=\"%(funder0_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Chan Zuckerberg " -"Initiative</a> e o <a href=\"%(funder1_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Mozilla Open Source Support Program</a> em 2020" +"Com <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">US$ 407.000 em financiamento</a> da <a " +"href=\"%(funder0_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Chan Zuckerberg Initiative</a> e o <a " +"href=\"%(funder1_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Mozilla Open Source Support Program</a> em 2020" #: warehouse/templates/pages/sponsor.html:49 msgid "" "With your support, the working group can continue to fund packaging " "improvements, benefiting millions of Python users around the world." msgstr "" -"Com seu apoio, o grupo de trabalho pode continuar a financiar melhorias nos " -"empacotamentos, beneficiando milhões de usuários Python em todo o mundo." +"Com seu apoio, o grupo de trabalho pode continuar a financiar melhorias " +"nos empacotamentos, beneficiando milhões de usuários Python em todo o " +"mundo." #: warehouse/templates/pages/sponsor.html:57 msgid "Community donations" @@ -5726,8 +5790,9 @@ msgstr "Agradecemos muito as doações únicas e recorrentes." #: warehouse/templates/pages/sponsor.html:61 #, python-format msgid "" -"For US taxpayers, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">your donation may be tax-deductible</a>." +"For US taxpayers, <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">your donation may be tax-" +"deductible</a>." msgstr "" "Para os contribuintes dos EUA, <a href=\"%(href)s\" title=\"%(title)s\" " "target=\"_blank\" rel=\"noopener\">sua doação pode ser dedutível de " @@ -5743,10 +5808,10 @@ msgstr "Doe aqui" #: warehouse/templates/pages/sponsor.html:66 #, python-format -msgid "" -"Donating over $5,000? <a href=\"%(href)s\">Become a sponsor</a> instead." +msgid "Donating over $5,000? <a href=\"%(href)s\">Become a sponsor</a> instead." msgstr "" -"Doando acima de US$ 5.000? <a href=\"%(href)s\">Se torne um patrocinador</a>." +"Doando acima de US$ 5.000? <a href=\"%(href)s\">Se torne um " +"patrocinador</a>." #: warehouse/templates/pages/sponsor.html:77 msgid "Get your logo on PyPI.org" @@ -5754,11 +5819,11 @@ msgstr "Tenha sua logo no PyPI.org" #: warehouse/templates/pages/sponsor.html:78 msgid "" -"Looking for brand visibility? In the last year*, 21.1 million people from " -"237 countries visited PyPI.org." +"Looking for brand visibility? In the last year*, 21.1 million people from" +" 237 countries visited PyPI.org." msgstr "" -"Procurando visibilidade da marca? No último ano*, 21,1 milhões de pessoas de " -"237 países visitaram o PyPI.org." +"Procurando visibilidade da marca? No último ano*, 21,1 milhões de pessoas" +" de 237 países visitaram o PyPI.org." #: warehouse/templates/pages/sponsor.html:79 msgid "* Data as of March 2020" @@ -5770,11 +5835,12 @@ msgstr "Fortaleça o ecossistema do Python" #: warehouse/templates/pages/sponsor.html:83 msgid "" -"Funds raised by the packaging working group go directly towards improving " -"the tools your company uses every day." +"Funds raised by the packaging working group go directly towards improving" +" the tools your company uses every day." msgstr "" -"Os recursos arrecadados pelo grupo de trabalho de embalagens vão diretamente " -"para o aprimoramento das ferramentas que sua empresa usa todos os dias." +"Os recursos arrecadados pelo grupo de trabalho de embalagens vão " +"diretamente para o aprimoramento das ferramentas que sua empresa usa " +"todos os dias." #: warehouse/templates/pages/sponsor.html:86 msgid "Boost your reputation" @@ -5782,11 +5848,11 @@ msgstr "Impulsione a sua reputação" #: warehouse/templates/pages/sponsor.html:87 msgid "" -"Enhance your company's reputation by investing in Python and the open source " -"community." +"Enhance your company's reputation by investing in Python and the open " +"source community." msgstr "" -"Melhore a reputação da sua empresa investindo no Python e na comunidade de " -"código aberto." +"Melhore a reputação da sua empresa investindo no Python e na comunidade " +"de código aberto." #: warehouse/templates/pages/sponsor.html:96 msgid "Sponsorship packages" @@ -5809,24 +5875,24 @@ msgid "" "Logo in a prominent position on the PyPI project detail page, <strong>in " "perpetuity</strong>" msgstr "" -"Logotipo em uma posição proeminente na página de detalhes do projeto PyPI, " -"<strong>em perpetuidade</strong>" +"Logotipo em uma posição proeminente na página de detalhes do projeto " +"PyPI, <strong>em perpetuidade</strong>" +# | msgid "" +# | "<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Sofware " +# | "Foundation blog</a>" #: warehouse/templates/pages/sponsor.html:112 #: warehouse/templates/pages/sponsor.html:133 #, fuzzy, python-format -#| msgid "" -#| "<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Sofware " -#| "Foundation blog</a>" msgid "" -"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation " -"blog</a>" +"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation blog</a>" msgstr "" -"Publicação de blog <strong>individual</strong> no <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">blog da Python Sofware " -"Foundation</a>" +"Publicação de blog <strong>individual</strong> no <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">blog da Python " +"Sofware Foundation</a>" #: warehouse/templates/pages/sponsor.html:116 #: warehouse/templates/pages/sponsor.html:139 @@ -5848,10 +5914,11 @@ msgstr "$ 50.000 por ano, ou equivalente em serviços doados" #: warehouse/templates/pages/sponsor.html:130 msgid "" -"Logo in a <strong>prominent position</strong> on the PyPI project detail page" +"Logo in a <strong>prominent position</strong> on the PyPI project detail " +"page" msgstr "" -"Logotipo em uma posição <strong>proeminente</strong> na página de detalhes " -"do projeto PyPI" +"Logotipo em uma posição <strong>proeminente</strong> na página de " +"detalhes do projeto PyPI" #: warehouse/templates/pages/sponsor.html:131 #: warehouse/templates/pages/sponsor.html:154 @@ -5865,8 +5932,8 @@ msgstr "Logotipo no rodapé do PyPI" #: warehouse/templates/pages/sponsor.html:243 #, python-format msgid "" -"Logo <strong>and write up</strong> on the <a href=\"%(href)s\">PyPI sponsors " -"page</a>" +"Logo <strong>and write up</strong> on the <a href=\"%(href)s\">PyPI " +"sponsors page</a>" msgstr "" "Logo <strong>e informações</strong> na <a href=\"%(href)s\">página de " "patrocinadores do PyPI</a>" @@ -5880,9 +5947,9 @@ msgid "" "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " "Foundation</a>" msgstr "" -"Tweet <strong>trimestral</strong> de agradecimento da <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " -"Foundation</a>" +"Tweet <strong>trimestral</strong> de agradecimento da <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Software Foundation</a>" #: warehouse/templates/pages/sponsor.html:135 #: warehouse/templates/pages/sponsor.html:158 @@ -5890,12 +5957,12 @@ msgstr "" #, python-format msgid "" "<strong>Quarterly</strong> thank you tweet from the <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</" -"a>" +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" -"Tweet <strong>trimestral</strong> de agradecimento da <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">conta de Twitter do " -"PyPI</a>" +"Tweet <strong>trimestral</strong> de agradecimento da <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">conta de Twitter do PyPI</a>" #: warehouse/templates/pages/sponsor.html:148 msgid "Platinum" @@ -5907,32 +5974,33 @@ msgstr "$ 30.000 por ano, ou equivalente em serviços doados" #: warehouse/templates/pages/sponsor.html:153 msgid "" -"Logo on <strong>high rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>high rotation</strong> in a prominent position on the " +"PyPI project detail page" msgstr "" "Logotipo em <strong>alta rotação</strong> em uma posição proeminente na " "página de detalhes do projeto PyPI" +# | msgid "" +# | "Inclusion in a blog post on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Sofware Foundation blog</a>, " +# | "<strong>with other sponsors</strong> whose sponsorship commenced during " +# | "the same quarter" #: warehouse/templates/pages/sponsor.html:156 #: warehouse/templates/pages/sponsor.html:179 #: warehouse/templates/pages/sponsor.html:201 #: warehouse/templates/pages/sponsor.html:222 #, fuzzy, python-format -#| msgid "" -#| "Inclusion in a blog post on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Sofware Foundation blog</a>, " -#| "<strong>with other sponsors</strong> whose sponsorship commenced during " -#| "the same quarter" msgid "" "Inclusion in a blog post on the <a href=\"%(href)s\" title=\"%(title)s\" " "target=\"_blank\" rel=\"noopener\">Python Software Foundation blog</a>, " -"<strong>with other sponsors</strong> whose sponsorship commenced during the " -"same quarter" +"<strong>with other sponsors</strong> whose sponsorship commenced during " +"the same quarter" msgstr "" -"Inclusão em um post no <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">blog da Python Sofware Foundation</a>, " -"<strong>com outros patrocinadores</strong> cujo patrocínio começou durante o " -"mesmo trimestre" +"Inclusão em um post no <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">blog da Python Sofware Foundation</a>," +" <strong>com outros patrocinadores</strong> cujo patrocínio começou " +"durante o mesmo trimestre" #: warehouse/templates/pages/sponsor.html:171 msgid "Gold" @@ -5944,11 +6012,11 @@ msgstr "$ 20.000 por ano, ou equivalente em serviços doados" #: warehouse/templates/pages/sponsor.html:176 msgid "" -"Logo on <strong>medium rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>medium rotation</strong> in a prominent position on the " +"PyPI project detail page" msgstr "" -"Logotipo em <strong>rotação média</strong> em posição proeminente na página " -"de detalhes do projeto PyPI" +"Logotipo em <strong>rotação média</strong> em posição proeminente na " +"página de detalhes do projeto PyPI" #: warehouse/templates/pages/sponsor.html:194 msgid "Silver" @@ -5960,8 +6028,8 @@ msgstr "$ 10.000 por ano, ou equivalente em serviços doados" #: warehouse/templates/pages/sponsor.html:199 msgid "" -"Logo on <strong>low rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>low rotation</strong> in a prominent position on the PyPI" +" project detail page" msgstr "" "Logotipo em <strong>baixa rotação</strong> em uma posição proeminente na " "página de detalhes do projeto PyPI" @@ -5987,12 +6055,12 @@ msgstr "" #, python-format msgid "" "<strong>Bi-yearly</strong> thank you tweet from the <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</" -"a>" +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" "Tweet <strong>bianual</strong> de agradecimento da <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">conta de Twitter do " -"PyPI</a>" +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">conta de Twitter " +"do PyPI</a>" #: warehouse/templates/pages/sponsor.html:216 msgid "Bronze" @@ -6005,24 +6073,24 @@ msgstr "$ 5.000 por ano, ou equivalente em serviços doados" #: warehouse/templates/pages/sponsor.html:223 #, python-format msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a> (on initial sponsorship, and on each subsequent renewal)" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a> (on initial sponsorship, and on each subsequent renewal)" msgstr "" -"Tweet <strong>único</strong> de agradecimento da <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a> (no patrocínio inicial e em cada renovação subsequente)" +"Tweet <strong>único</strong> de agradecimento da <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a> (no patrocínio inicial e em cada renovação subsequente)" #: warehouse/templates/pages/sponsor.html:224 #, python-format msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</a> " -"(on initial sponsorship, and on each subsequent renewal)" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a> (on initial sponsorship, and on each subsequent renewal)" msgstr "" -"Tweet <strong>único</strong> de agradecimento da <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">conta de Twitter do PyPI</" -"a> (no patrocínio inicial e em cada renovação subsequente)" +"Tweet <strong>único</strong> de agradecimento da <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">conta de Twitter " +"do PyPI</a> (no patrocínio inicial e em cada renovação subsequente)" #: warehouse/templates/pages/sponsor.html:238 msgid "One time grants / custom donations" @@ -6031,57 +6099,60 @@ msgstr "Doações únicas / doações personalizadas" #: warehouse/templates/pages/sponsor.html:239 #, python-format msgid "" -"Sponsorship of a specific feature, feature set, or community sprint, valued " -"at over $50,000. See <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">fundable packaging improvements</a> for ideas." +"Sponsorship of a specific feature, feature set, or community sprint, " +"valued at over $50,000. See <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">fundable packaging improvements</a> " +"for ideas." msgstr "" "Patrocínio de um recurso específico, conjunto de recursos ou sprint " "comunitário, avaliado em mais de $ 50.000. Consulte <a href=\"%(href)s\" " "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">melhorias de " "empacotamento financiáveis</a> para ideias." +# | msgid "" +# | "<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Sofware " +# | "Foundation blog</a>, explaining what the funds will be used for" #: warehouse/templates/pages/sponsor.html:244 #, fuzzy, python-format -#| msgid "" -#| "<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Sofware " -#| "Foundation blog</a>, explaining what the funds will be used for" msgid "" -"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation " -"blog</a>, explaining what the funds will be used for" +"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation blog</a>, explaining what the funds will be used for" msgstr "" -"Post <strong>individual</strong> no <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">blog da Python Sofware Foundation</a>, " -"explicando para que os fundos serão usados" +"Post <strong>individual</strong> no <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">blog da Python " +"Sofware Foundation</a>, explicando para que os fundos serão usados" #: warehouse/templates/pages/sponsor.html:245 #, python-format msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a>" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a>" msgstr "" -"Tweet <strong>único</strong> de agradecimento da <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a>" +"Tweet <strong>único</strong> de agradecimento da <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a>" #: warehouse/templates/pages/sponsor.html:246 #, python-format msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</a>" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" -"Tweet <strong>único</strong> de agradecimento da <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">conta de Twitter do PyPI</a>" +"Tweet <strong>único</strong> de agradecimento da <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">conta de Twitter " +"do PyPI</a>" #: warehouse/templates/pages/sponsor.html:248 msgid "" "Note: A record of working group grants will be listed on the PyPI " "sponsorship page in perpetuity." msgstr "" -"Nota: Um registro das doações ao grupo de trabalho será listado na página de " -"patrocínio do PyPI em perpetuidade." +"Nota: Um registro das doações ao grupo de trabalho será listado na página" +" de patrocínio do PyPI em perpetuidade." #: warehouse/templates/pages/stats.html:21 msgid "PyPI statistics" @@ -6090,12 +6161,12 @@ msgstr "Estatísticas do PyPI" #: warehouse/templates/pages/stats.html:23 msgid "" "We all love stats, so here are some useful statistics about PyPI. The " -"statistics page is cached for 24 hours, so don't expect the numbers to be " -"realtime." +"statistics page is cached for 24 hours, so don't expect the numbers to be" +" realtime." msgstr "" -"Nós todos amamos estatísticas, então aqui estão algumas estatísticas úteis " -"sobre PyPI. A página de estatísticas é armazenada em cache por 24 horas, " -"portanto, não espere que os números sejam em tempo real." +"Nós todos amamos estatísticas, então aqui estão algumas estatísticas " +"úteis sobre PyPI. A página de estatísticas é armazenada em cache por 24 " +"horas, portanto, não espere que os números sejam em tempo real." #: warehouse/templates/pages/stats.html:30 msgid "Top projects by total package size" @@ -6103,11 +6174,11 @@ msgstr "Maiores projetos por tamanho total de pacotes" #: warehouse/templates/pages/stats.html:32 msgid "" -"Here is a list of the top 100 projects based on the sum of their packages' " -"sizes (in bytes)." +"Here is a list of the top 100 projects based on the sum of their " +"packages' sizes (in bytes)." msgstr "" -"Está aqui uma lista dos 100 maiores projetos com base na soma dos tamanhos " -"de seus pacotes (em bytes)." +"Está aqui uma lista dos 100 maiores projetos com base na soma dos " +"tamanhos de seus pacotes (em bytes)." #: warehouse/templates/pages/stats.html:39 msgid "Statistics by project" @@ -6149,8 +6220,7 @@ msgstr "" #: warehouse/templates/search/results.html:110 msgid "Enter a search query, or add a filter by clicking on the button." -msgstr "" -"Insira uma consulta de pesquisa ou adicione um filtro clicando no botão." +msgstr "Insira uma consulta de pesquisa ou adicione um filtro clicando no botão." #: warehouse/templates/search/results.html:111 msgid "You can combine searches and classifier filters. Examples:" @@ -6260,7 +6330,9 @@ msgstr[1] "" #~ msgid "A new collaborator has been added to a project you own on PyPI:" #~ msgstr "" -#~ "Um novo colaborador foi adicionado a um projeto que você possui no PyPI:" +#~ "Um novo colaborador foi adicionado a " +#~ "um projeto que você possui no " +#~ "PyPI:" #~ msgid "<strong>Username</strong>: %(username)s" #~ msgstr "<strong>Nome de usuário</strong>: %(username)s" @@ -6275,15 +6347,18 @@ msgstr[1] "" #~ msgstr "<strong>Adicionado por</strong>: %(submitter)s" #~ msgid "" -#~ "If this was a mistake, you can email <a href=\"%(href)s\">" -#~ "%(email_address)s</a> to communicate with the PyPI administrators." +#~ "If this was a mistake, you can " +#~ "email <a href=\"%(href)s\">%(email_address)s</a> to" +#~ " communicate with the PyPI administrators." #~ msgstr "" -#~ "Se isso foi um erro, você pode enviar um e-mail para <a href=\"%(href)s\">" -#~ "%(email_address)s</a> para se comunicar com os administradores do PyPI." +#~ "Se isso foi um erro, você pode " +#~ "enviar um e-mail para <a " +#~ "href=\"%(href)s\">%(email_address)s</a> para se " +#~ "comunicar com os administradores do " +#~ "PyPI." #~ msgid "You are receiving this because you are an owner of this project." -#~ msgstr "" -#~ "Você está recebendo isso porque você é um proprietário deste projeto." +#~ msgstr "Você está recebendo isso porque você é um proprietário deste projeto." #~ msgid "The project %(project)s has been deleted." #~ msgstr "O projeto %(project)s foi excluído." @@ -6297,33 +6372,34 @@ msgstr[1] "" #~ msgid "" #~ "If this was a mistake, you can email <a\n" -#~ " href=\"%(href)s\">%(email_address)s</a> to communicate with the PyPI " -#~ "administrators." +#~ " href=\"%(href)s\">%(email_address)s</a> to " +#~ "communicate with the PyPI administrators." #~ msgstr "" #~ "Se isso foi um erro, você pode enviar um e-mail para <a\n" -#~ " href=\"%(href)s\">%(email_address)s</a> para se comunicar com os " -#~ "administradores do PyPI." +#~ " href=\"%(href)s\">%(email_address)s</a> para se" +#~ " comunicar com os administradores do " +#~ "PyPI." #~ msgid "" -#~ "You are receiving this because you are %(recipient_role_descr)s of this " -#~ "project." +#~ "You are receiving this because you " +#~ "are %(recipient_role_descr)s of this project." #~ msgstr "" -#~ "Você está recebendo isso porque você é %(recipient_role_descr)s deste " -#~ "projeto." +#~ "Você está recebendo isso porque você " +#~ "é %(recipient_role_descr)s deste projeto." #~ msgid "" -#~ "The %(project)s release %(release)s released on %(date)s has been deleted." -#~ msgstr "" -#~ "A versão %(release)s do %(project)s lançada em %(date)s foi excluída." +#~ "The %(project)s release %(release)s released" +#~ " on %(date)s has been deleted." +#~ msgstr "A versão %(release)s do %(project)s lançada em %(date)s foi excluída." #~ msgid "" #~ "\n" -#~ "You are receiving this because you are %(recipient_role_descr)s of this " -#~ "project." +#~ "You are receiving this because you " +#~ "are %(recipient_role_descr)s of this project." #~ msgstr "" #~ "\n" -#~ "Você está recebendo isso porque você é %(recipient_role_descr)s deste " -#~ "projeto." +#~ "Você está recebendo isso porque você " +#~ "é %(recipient_role_descr)s deste projeto." #~ msgid "View <span>hashes</span>" #~ msgstr "Ver <span>hashes</span>" @@ -6332,38 +6408,51 @@ msgstr[1] "" #~ msgstr "Recurso beta" #~ msgid "" -#~ "If you lose your %(method)s and can no longer log in, the PyPI team " -#~ "<strong>cannot</strong> currently help you recover your account. We plan " -#~ "to develop a <a href=\"%(policy_href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">manual account recovery policy</a> and " -#~ "implement <a href=\"%(recovery_codes_href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">account recovery codes</a> to address this " -#~ "issue." +#~ "If you lose your %(method)s and " +#~ "can no longer log in, the PyPI " +#~ "team <strong>cannot</strong> currently help " +#~ "you recover your account. We plan " +#~ "to develop a <a href=\"%(policy_href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">manual account recovery policy</a>" +#~ " and implement <a " +#~ "href=\"%(recovery_codes_href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\">account recovery " +#~ "codes</a> to address this issue." #~ msgstr "" -#~ "Se você perder seu %(method)s e não conseguir mais entrar, a equipe do " -#~ "PyPI <strong>não poderá</strong> ajudá-lo a recuperar sua conta no " -#~ "momento. Pretendemos desenvolver uma <a href=\"%(policy_href)s\" title=" -#~ "\"%(title)s\" target=\"_blank\" rel=\"noopener\">política de recuperação " -#~ "manual de conta</a> e implementar <a href=\"%(recovery_codes_href)s\" " -#~ "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">códigos de " -#~ "recuperação de conta</a> para resolver este problema." +#~ "Se você perder seu %(method)s e " +#~ "não conseguir mais entrar, a equipe " +#~ "do PyPI <strong>não poderá</strong> ajudá-lo" +#~ " a recuperar sua conta no momento." +#~ " Pretendemos desenvolver uma <a " +#~ "href=\"%(policy_href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\">política de " +#~ "recuperação manual de conta</a> e " +#~ "implementar <a href=\"%(recovery_codes_href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">códigos de recuperação de " +#~ "conta</a> para resolver este problema." #~ msgid "" #~ "\n" -#~ " In the short term, we recommend that all PyPI users set up " -#~ "<em>both</em>\n" -#~ " supported two factor authentication methods - using an " -#~ "authentication\n" -#~ " application <em>and</em> setting up a security device (e.g. USB " -#~ "key).\n" +#~ " In the short term, we " +#~ "recommend that all PyPI users set " +#~ "up <em>both</em>\n" +#~ " supported two factor authentication" +#~ " methods - using an authentication\n" +#~ " application <em>and</em> setting up" +#~ " a security device (e.g. USB key)." +#~ "\n" #~ " " #~ msgstr "" #~ "\n" -#~ " A curto prazo, recomendamos que todos os usuários do PyPI " -#~ "configurem\n" -#~ " <em>ambos</em> métodos de autenticação de dois fator - usando um\n" -#~ " aplicativo de autenticação <em>e</em> configurando um dispositivo " -#~ "de\n" +#~ " A curto prazo, recomendamos que" +#~ " todos os usuários do PyPI configurem" +#~ "\n" +#~ " <em>ambos</em> métodos de autenticação" +#~ " de dois fator - usando um\n" +#~ " aplicativo de autenticação <em>e</em>" +#~ " configurando um dispositivo de\n" #~ " segurança (por exemplo, chave USB).\n" #~ " " @@ -6371,28 +6460,39 @@ msgstr[1] "" #~ msgstr "Principais usuários de armazenamento" #~ msgid "" -#~ "There is currently no established process for performing this " -#~ "administrative task that is explicit and fair for all parties. However, " -#~ "one is currently in development per <a href=\"%(href)s\" title=\"%(title)s" -#~ "\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python enhancement " +#~ "There is currently no established " +#~ "process for performing this administrative " +#~ "task that is explicit and fair for" +#~ " all parties. However, one is " +#~ "currently in development per <a " +#~ "href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\"" +#~ " rel=\"noopener\"><abbr title=\"Python enhancement " #~ "proposal\">PEP</abbr> 541</a>." #~ msgstr "" -#~ "Não há atualmente nenhum processo estabelecido para executar esta tarefa " -#~ "administrativa que é explícita e justa para todas as partes. No entanto, " -#~ "um está atualmente em desenvolvimento por <a href=\"%(href)s\" title=" -#~ "\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Proposta " -#~ "de aprimoramento do Python\">PEP</abbr> 541</a>." +#~ "Não há atualmente nenhum processo " +#~ "estabelecido para executar esta tarefa " +#~ "administrativa que é explícita e justa" +#~ " para todas as partes. No entanto," +#~ " um está atualmente em desenvolvimento " +#~ "por <a href=\"%(href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\"><abbr title=\"Proposta" +#~ " de aprimoramento do Python\">PEP</abbr> " +#~ "541</a>." #~ msgid "" -#~ "<abbr title=\"Python enhancement proposal\">PEP</abbr> 541 has been " -#~ "accepted, and PyPI is <a href=\"%(href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">creating a workflow</a> which will be " -#~ "documented here." +#~ "<abbr title=\"Python enhancement " +#~ "proposal\">PEP</abbr> 541 has been accepted," +#~ " and PyPI is <a href=\"%(href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">creating a workflow</a> which " +#~ "will be documented here." #~ msgstr "" -#~ "A <abbr title=\"Proposta de aprimoramento do Python\">PEP</abbr> 541 foi " -#~ "aceita e o PyPI está <a href=\"%(href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">criando um fluxo de trabalho</a> que será " -#~ "documentado aqui." +#~ "A <abbr title=\"Proposta de aprimoramento " +#~ "do Python\">PEP</abbr> 541 foi aceita e" +#~ " o PyPI está <a href=\"%(href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">criando um fluxo de " +#~ "trabalho</a> que será documentado aqui." #~ msgid "Log Out" #~ msgstr "Sair" @@ -6406,11 +6506,10 @@ msgstr[1] "" #~ msgid "User's username" #~ msgstr "Nome de usuário do usuário" -#~ msgid "" -#~ "There have been too many unsuccessful login attempts, try again later." +#~ msgid "There have been too many unsuccessful login attempts, try again later." #~ msgstr "" -#~ "Houve muitas tentativas de autenticação malsucedidas, tente novamente " -#~ "mais tarde." +#~ "Houve muitas tentativas de autenticação " +#~ "malsucedidas, tente novamente mais tarde." #~ msgid "We have sent an email to your registered email address." #~ msgstr "Enviamos um e-mail para o seu endereço de e-mail registado." @@ -6419,28 +6518,41 @@ msgstr[1] "" #~ msgstr "Criada em" #~ msgid "" -#~ "An API token scoped to your entire account will have upload permissions " +#~ "An API token scoped to your entire" +#~ " account will have upload permissions " #~ "for all of your projects." #~ msgstr "" -#~ "Um token de API com escopo para sua conta inteira terá permissões de " -#~ "carregamento para todos os seus projetos." +#~ "Um token de API com escopo para" +#~ " sua conta inteira terá permissões de" +#~ " carregamento para todos os seus " +#~ "projetos." #~ msgid "" -#~ "As PyPI's two factor implementation follows the <a href=\"%(href)s\" " -#~ "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"web " -#~ "authentication\">WebAuthn</abbr> standard</a> standard</a>, PyPI users " -#~ "will be able to take advantage of any future developments in this field." +#~ "As PyPI's two factor implementation " +#~ "follows the <a href=\"%(href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\"><abbr title=\"web " +#~ "authentication\">WebAuthn</abbr> standard</a> " +#~ "standard</a>, PyPI users will be able" +#~ " to take advantage of any future " +#~ "developments in this field." #~ msgstr "" -#~ "Como a implementação de dois fatores do PyPI segue o <a href=\"%(href)s\" " -#~ "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">padrão <abbr title=" -#~ "\"web authentication\">WebAuthn</abbr></a>, usuários PyPI poderão tirar " -#~ "proveito de qualquer desenvolvimentos futuros neste domínio." +#~ "Como a implementação de dois fatores " +#~ "do PyPI segue o <a href=\"%(href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">padrão <abbr title=\"web " +#~ "authentication\">WebAuthn</abbr></a>, usuários PyPI " +#~ "poderão tirar proveito de qualquer " +#~ "desenvolvimentos futuros neste domínio." #~ msgid "" -#~ "Filter by <a href=\"%(href)s\" class=\"%(classes)s\" aria-label=" -#~ "\"%(aria_label)s\" data-original-label=\"%(data_original_label)s\"> " +#~ "Filter by <a href=\"%(href)s\" " +#~ "class=\"%(classes)s\" aria-label=\"%(aria_label)s\" " +#~ "data-original-label=\"%(data_original_label)s\"> " #~ "classifier </a>" #~ msgstr "" -#~ "Filtrar por <a href=\"%(href)s\" class=\"%(classes)s\" aria-label=" -#~ "\"%(aria_label)s\" data-original-label=\"%(data_original_label)s\"> " +#~ "Filtrar por <a href=\"%(href)s\" " +#~ "class=\"%(classes)s\" aria-label=\"%(aria_label)s\" " +#~ "data-original-label=\"%(data_original_label)s\"> " #~ "classificador </a>" + diff --git a/warehouse/locale/ru/LC_MESSAGES/messages.mo b/warehouse/locale/ru/LC_MESSAGES/messages.mo new file mode 100644 index 000000000000..c60ba44928c4 Binary files /dev/null and b/warehouse/locale/ru/LC_MESSAGES/messages.mo differ diff --git a/warehouse/locale/ru/LC_MESSAGES/messages.po b/warehouse/locale/ru/LC_MESSAGES/messages.po index 66a1166dc6bb..aea132f3d88e 100644 --- a/warehouse/locale/ru/LC_MESSAGES/messages.po +++ b/warehouse/locale/ru/LC_MESSAGES/messages.po @@ -1,34 +1,3 @@ -# Translations template for Warehouse. -# Copyright (C) 2019 PyPA -# This file is distributed under the same license as the Warehouse project. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2019. -# Albert Tugushev <albert@tugushev.ru>, 2019. -# Sebastian Witowski <sebawitowski@yahoo.com>, 2019. -# Irina Saribekova <irina.saribekova@gmail.com>, 2019. -# Andrey Smelter <andrey.smelter@gmail.com>, 2019, 2020. -# Древ Брагкин <rokree@yahoo.com>, 2019. -# Aleksei Kozharin <1alekseik1@gmail.com>, 2019. -# Alexandr Artemyev <mogost@gmail.com>, 2019. -# Mingun <Alexander_Sergey@mail.ru>, 2020. -# anonymous <noreply@weblate.org>, 2020. -msgid "" -msgstr "" -"Project-Id-Version: Warehouse VERSION\n" -"Report-Msgid-Bugs-To: https://github.com/pypa/warehouse/issues/new\n" -"POT-Creation-Date: 2020-01-15 20:11+0200\n" -"PO-Revision-Date: 2020-04-05 13:41+0000\n" -"Last-Translator: Mingun <Alexander_Sergey@mail.ru>\n" -"Language-Team: Russian <https://hosted.weblate.org/projects/pypa/warehouse/" -"ru/>\n" -"Language: ru\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 4.0-dev\n" -"Generated-By: Babel 2.7.0\n" - #: warehouse/views.py:254 msgid "Locale updated" msgstr "Язык обновлён" @@ -48,8 +17,8 @@ msgstr "Выберите имя пользователя, используя н #: warehouse/accounts/forms.py:85 msgid "" "The username is invalid. Usernames must be composed of letters, numbers, " -"dots, hyphens and underscores. And must also start and finish with a letter " -"or number. Choose a different username." +"dots, hyphens and underscores. And must also start and finish with a " +"letter or number. Choose a different username." msgstr "" "Неверное имя пользователя. Имена пользователей должны состоять из букв, " "цифр, точек, дефисов и подчёркиваний. Также они должны начинаться и " @@ -57,8 +26,8 @@ msgstr "" #: warehouse/accounts/forms.py:99 msgid "" -"This username is already being used by another account. Choose a different " -"username." +"This username is already being used by another account. Choose a " +"different username." msgstr "" "Это имя пользователя уже используется другой учётной записью. Выберите " "другое имя." @@ -82,21 +51,21 @@ msgstr "Некорректный адрес электронной почты. #: warehouse/accounts/forms.py:198 msgid "You can't use an email address from this domain. Use a different email." msgstr "" -"Вы не можете использовать адрес электронной почты этого домена. Используйте " -"другой адрес электронной почты." +"Вы не можете использовать адрес электронной почты этого домена. " +"Используйте другой адрес электронной почты." #: warehouse/accounts/forms.py:209 msgid "" -"This email address is already being used by this account. Use a different " -"email." +"This email address is already being used by this account. Use a different" +" email." msgstr "" "Этот адрес электронной почты уже используется текущей учётной записью. " "Используйте другой адрес электронной почты." #: warehouse/accounts/forms.py:216 msgid "" -"This email address is already being used by another account. Use a different " -"email." +"This email address is already being used by another account. Use a " +"different email." msgstr "" "Этот адрес электронной почты уже используется другой учётной записью. " "Используйте другой адрес электронной почты." @@ -143,8 +112,8 @@ msgstr "" #: warehouse/accounts/views.py:455 msgid "" -"New user registration temporarily disabled. See https://pypi.org/help#admin-" -"intervention for details." +"New user registration temporarily disabled. See https://pypi.org/help" +"#admin-intervention for details." msgstr "" "Регистрация новых пользователей временно отключена. Подробнее смотрите " "здесь: https://pypi.org/help#admin-intervention." @@ -180,7 +149,8 @@ msgid "" "Invalid token: password has already been changed since this token was " "requested" msgstr "" -"Недействительный токен: пароль уже был изменен с момента запроса этого токена" +"Недействительный токен: пароль уже был изменен с момента запроса этого " +"токена" #: warehouse/accounts/views.py:605 msgid "You have reset your password" @@ -195,13 +165,14 @@ msgstr "" #: warehouse/accounts/views.py:632 msgid "Invalid token: request a new email verification link" msgstr "" -"Недействительный токен: запросите новую ссылку для верификации электронной " -"почты" +"Недействительный токен: запросите новую ссылку для верификации " +"электронной почты" #: warehouse/accounts/views.py:638 msgid "Invalid token: not an email verification token" msgstr "" -"Недействительный токен: не является токеном для верификации электронной почты" +"Недействительный токен: не является токеном для верификации электронной " +"почты" #: warehouse/accounts/views.py:647 msgid "Email not found" @@ -233,10 +204,11 @@ msgstr "" #: warehouse/manage/views.py:667 warehouse/manage/views.py:703 msgid "" -"You must provision a two factor method before recovery codes can be generated" +"You must provision a two factor method before recovery codes can be " +"generated" msgstr "" -"Прежде чем можно будет сгенерировать коды восстановления, вы должны задать " -"метод двухфакторной аутентификации" +"Прежде чем можно будет сгенерировать коды восстановления, вы должны " +"задать метод двухфакторной аутентификации" #: warehouse/manage/views.py:678 msgid "Recovery codes already generated" @@ -423,13 +395,13 @@ msgstr "Что-то пошло не так" #: warehouse/templates/500.html:22 msgid "" -"<p>We are experiencing technical issues that are affecting our ability to " -"serve you this site.</p> <p>We are aware of the problem and are working to " -"resolve it as soon as possible.</p>" +"<p>We are experiencing technical issues that are affecting our ability to" +" serve you this site.</p> <p>We are aware of the problem and are working " +"to resolve it as soon as possible.</p>" msgstr "" -"<p>У нас возникли технические проблемы, которые повлияли на нашу способность " -"обслуживать вас на этом сайте.</p> <p>Мы знаем об этой проблеме и работаем " -"над её скорейшим устранением.</p>" +"<p>У нас возникли технические проблемы, которые повлияли на нашу " +"способность обслуживать вас на этом сайте.</p> <p>Мы знаем об этой " +"проблеме и работаем над её скорейшим устранением.</p>" #: warehouse/templates/500.html:28 msgid "Check our status page" @@ -449,21 +421,22 @@ msgstr "Положились на PyPI для выполнения своей р #: warehouse/templates/500.html:37 msgid "" -"Consider <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\" rel=" -"\"noopener\"> contributing </a> or <a href=\"https://psfmember.org/civicrm/" -"contribute/transact?reset=1&id=13\" target=\"_blank\" rel=\"noopener\"> " -"donating </a> to help us build a more stable and secure platform." +"Consider <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\" " +"rel=\"noopener\"> contributing </a> or <a " +"href=\"https://psfmember.org/civicrm/contribute/transact?reset=1&id=13\" " +"target=\"_blank\" rel=\"noopener\"> donating </a> to help us build a more" +" stable and secure platform." msgstr "" -"Рассмотрите возможность <a href=\"https://github.com/pypa/warehouse\" target=" -"\"_blank\" rel=\"noopener\">внесения своего вклада</a> или <a href=\"https://" -"psfmember.org/civicrm/contribute/transact?reset=1&id=13\" target=\"_blank\" " -"rel=\"noopener\">внесения пожертвования</a>, чтобы помочь нам построить " -"более стабильную и защищённую платформу." +"Рассмотрите возможность <a href=\"https://github.com/pypa/warehouse\" " +"target=\"_blank\" rel=\"noopener\">внесения своего вклада</a> или <a " +"href=\"https://psfmember.org/civicrm/contribute/transact?reset=1&id=13\" " +"target=\"_blank\" rel=\"noopener\">внесения пожертвования</a>, чтобы " +"помочь нам построить более стабильную и защищённую платформу." #: warehouse/templates/base.html:23 msgid "" -"Choose a strong password that contains letters (uppercase and lowercase), " -"numbers and special characters. Avoid common words or repetition." +"Choose a strong password that contains letters (uppercase and lowercase)," +" numbers and special characters. Avoid common words or repetition." msgstr "" "Выберите пароль, который содержит буквы (заглавные и строчные), цифры и " "специальные символы. Избегайте простых слов или повторов символов." @@ -521,8 +494,8 @@ msgstr "Главное меню" #: warehouse/templates/base.html:76 warehouse/templates/index.html:79 msgid "" -"The Python Package Index (PyPI) is a repository of software for the Python " -"programming language." +"The Python Package Index (PyPI) is a repository of software for the " +"Python programming language." msgstr "" "Указатель пакетов Python’а (Python Package Index – PyPI) – это хранилище " "программного обеспечения для языка программирования Python." @@ -558,25 +531,27 @@ msgstr "Предупреждение" #: warehouse/templates/base.html:158 msgid "You are using an unsupported browser, upgrade to a newer version." msgstr "" -"Вы используете неподдерживаемый браузер, обновите его до более новой версии." +"Вы используете неподдерживаемый браузер, обновите его до более новой " +"версии." #: warehouse/templates/base.html:167 msgid "" "You are using TestPyPI – a separate instance of the Python Package Index " -"that allows you to try distribution tools and processes without affecting " -"the real index." +"that allows you to try distribution tools and processes without affecting" +" the real index." msgstr "" -"Вы используете TestPyPI – изолированную версию Указателя пакетов Python’а, " -"которая позволяет вам попробовать инструменты распространения программного " -"обеспечения и рабочие процессы, не влияя на реальный указатель." +"Вы используете TestPyPI – изолированную версию Указателя пакетов " +"Python’а, которая позволяет вам попробовать инструменты распространения " +"программного обеспечения и рабочие процессы, не влияя на реальный " +"указатель." #: warehouse/templates/base.html:177 msgid "" -"Some features may not work without JavaScript. Please try enabling it if you " -"encounter problems." +"Some features may not work without JavaScript. Please try enabling it if " +"you encounter problems." msgstr "" -"Некоторые функции могут не работать без JavaScript. Пожалуйста, попробуйте " -"включить его, если у вас возникнут проблемы." +"Некоторые функции могут не работать без JavaScript. Пожалуйста, " +"попробуйте включить его, если у вас возникнут проблемы." #: warehouse/templates/base.html:210 warehouse/templates/base.html:231 #: warehouse/templates/error-base-with-search.html:20 @@ -698,9 +673,9 @@ msgstr "все системы в рабочем состоянии" #: warehouse/templates/base.html:311 msgid "" -"Developed and maintained by the Python community, for the Python community." -msgstr "" -"Разработано и поддерживается сообществом Python’а для сообщества Python’а." +"Developed and maintained by the Python community, for the Python " +"community." +msgstr "Разработано и поддерживается сообществом Python’а для сообщества Python’а." #: warehouse/templates/base.html:313 msgid "Donate today!" @@ -765,11 +740,11 @@ msgstr "%(num_users)s пользователей" #: warehouse/templates/index.html:81 msgid "" -"PyPI helps you find and install software developed and shared by the Python " -"community." +"PyPI helps you find and install software developed and shared by the " +"Python community." msgstr "" -"PyPI помогает найти и установить программное обеспечение, разработанное и " -"разделяемое сообществом Python." +"PyPI помогает найти и установить программное обеспечение, разработанное и" +" разделяемое сообществом Python." #: warehouse/templates/index.html:82 msgid "Learn about installing packages</a>." @@ -808,21 +783,23 @@ msgstr "Этот URL-адрес является точкой выхода API #: warehouse/templates/upload.html:26 #, python-format msgid "" -"For more information on uploading projects to PyPI, visit the <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python " -"Packaging User Guide</a>." +"For more information on uploading projects to PyPI, visit the <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" -"Чтобы узнать больше о загрузке проектов на PyPI, обратитесь к <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Руководству пользователя по созданию Python’ьих пакетов</a>." +"Чтобы узнать больше о загрузке проектов на PyPI, обратитесь к <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Руководству пользователя по созданию Python’ьих " +"пакетов</a>." #: warehouse/templates/upload.html:28 #, python-format msgid "" -"Otherwise, we suggest you <a href=\"%(href)s\">go to the PyPI homepage</a>." +"Otherwise, we suggest you <a href=\"%(href)s\">go to the PyPI " +"homepage</a>." msgstr "" -"Иначе, советуем вам <a href=\"%(href)s\"> перейти на главную страницу PyPI </" -"a>." +"Иначе, советуем вам <a href=\"%(href)s\"> перейти на главную страницу " +"PyPI </a>." #: warehouse/templates/accounts/login.html:17 #: warehouse/templates/accounts/recovery-code.html:17 @@ -989,16 +966,16 @@ msgstr "Подтвердить" #: warehouse/templates/accounts/recovery-code.html:58 msgid "" -"PyPI allows for generating recovery codes to be stored securely offline in " -"the event that your device or application is lost. Enter one of these codes " -"in the form to verify your identity. Once used, the recovery code will no " -"longer be valid." +"PyPI allows for generating recovery codes to be stored securely offline " +"in the event that your device or application is lost. Enter one of these " +"codes in the form to verify your identity. Once used, the recovery code " +"will no longer be valid." msgstr "" "PyPI позволяет сгенерировать коды восстановления, которые можно надёжно " -"сохранить где-нибудь вне сети на случай потери вами вашего устройства или " -"доступа к приложению. Введите в форму один из этих кодов для подтверждения " -"вашей личности. После использования код восстановления станет " -"недействительным." +"сохранить где-нибудь вне сети на случай потери вами вашего устройства или" +" доступа к приложению. Введите в форму один из этих кодов для " +"подтверждения вашей личности. После использования код восстановления " +"станет недействительным." #: warehouse/templates/accounts/recovery-code.html:59 #, python-format @@ -1063,13 +1040,13 @@ msgstr "Подтвердите пароль" #: warehouse/templates/accounts/register.html:157 msgid "" "This password appears in a security breach or has been compromised and " -"cannot be used. Please refer to the <a href=\"/help/#compromised-password" -"\">FAQ</a> for more information." +"cannot be used. Please refer to the <a href=\"/help/#compromised-" +"password\">FAQ</a> for more information." msgstr "" -"Этот пароль «утёк» через брешь в безопасности или же он был скомпрометирован " -"и больше не может быть использован. Для получения более подробной " -"информации, пожалуйста, обратитесь к <a href=\"/help/#compromised-password" -"\">ЧаВо</a>." +"Этот пароль «утёк» через брешь в безопасности или же он был " +"скомпрометирован и больше не может быть использован. Для получения более " +"подробной информации, пожалуйста, обратитесь к <a href=\"/help" +"/#compromised-password\">ЧаВо</a>." #: warehouse/templates/accounts/register.html:162 msgid "Create account" @@ -1103,11 +1080,11 @@ msgstr "Сообщение отправлено на ваш электронны #: warehouse/templates/accounts/request-password-reset.html:52 #, python-format msgid "" -"The email contains a link to reset your password. This link will expire in " -"%(n_hours)s hours." +"The email contains a link to reset your password. This link will expire " +"in %(n_hours)s hours." msgstr "" -"Сообщение содержит ссылку для сброса пароля. Срок действия ссылки истечёт " -"через %(n_hours)s часов." +"Сообщение содержит ссылку для сброса пароля. Срок действия ссылки истечёт" +" через %(n_hours)s часов." #: warehouse/templates/accounts/reset-password.html:18 #: warehouse/templates/accounts/reset-password.html:24 @@ -1138,14 +1115,14 @@ msgid "" "Connect your security device and click the \"Authenticate with device\" " "button." msgstr "" -"Подключите устройство безопасности и кликните на кнопку «Авторизоваться с " -"помощью устройства»." +"Подключите устройство безопасности и кликните на кнопку «Авторизоваться с" +" помощью устройства»." #: warehouse/templates/accounts/two-factor.html:42 msgid "Enable JavaScript to log in with a security device (e.g. USB key)" msgstr "" -"Разрешите JavaScript для входа в систему с помощью устройства безопасности " -"(например, USB-ключа)" +"Разрешите JavaScript для входа в систему с помощью устройства " +"безопасности (например, USB-ключа)" #: warehouse/templates/accounts/two-factor.html:51 msgid "Authenticate with device" @@ -1154,18 +1131,20 @@ msgstr "Авторизуйтесь с помощью устройства" #: warehouse/templates/accounts/two-factor.html:55 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" rel=\"%(rel)s" -"\">Upgrade your browser</a> to log in with a security device (e.g. USB key)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" " +"rel=\"%(rel)s\">Upgrade your browser</a> to log in with a security device" +" (e.g. USB key)" msgstr "" -"Чтобы войти с помощью устройства безопасности (например, USB-ключа) <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" rel=\"%(rel)s" -"\">обновите свой веб-браузер</a>" +"Чтобы войти с помощью устройства безопасности (например, USB-ключа) <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" " +"rel=\"%(rel)s\">обновите свой веб-браузер</a>" #: warehouse/templates/accounts/two-factor.html:60 #, python-format msgid "Lost your device? Not working? <a href=\"%(href)s\">Get help</a>." msgstr "" -"Потеряли устройство? Не работает? <a href=\"%(href)s\">Получите помощь</a>." +"Потеряли устройство? Не работает? <a href=\"%(href)s\">Получите " +"помощь</a>." #: warehouse/templates/accounts/two-factor.html:72 msgid "Authenticate with an app" @@ -1178,13 +1157,14 @@ msgstr "Введите код аутентификации" #: warehouse/templates/accounts/two-factor.html:105 #, python-format msgid "" -"<p>Generate a code using the authentication application connected to your " -"PyPI account. Enter this code in the form to verify your identity.</p> " -"<p>Lost your application? Not working? <a href=\"%(href)s\">Get help</a>.</p>" +"<p>Generate a code using the authentication application connected to your" +" PyPI account. Enter this code in the form to verify your identity.</p> " +"<p>Lost your application? Not working? <a href=\"%(href)s\">Get " +"help</a>.</p>" msgstr "" -"<p>Создайте код с помощью приложения аутентификации, подключенного к вашей " -"учетной записи на PyPI.</p> <p>Потеряли своё приложение? Не работает? <a " -"href=\"%(href)s\">Получите помощь</a>.</p>" +"<p>Создайте код с помощью приложения аутентификации, подключенного к " +"вашей учетной записи на PyPI.</p> <p>Потеряли своё приложение? Не " +"работает? <a href=\"%(href)s\">Получите помощь</a>.</p>" #: warehouse/templates/accounts/two-factor.html:117 msgid "Lost your security key or application?" @@ -1197,14 +1177,15 @@ msgstr "Войти с помощью кода восстановления" #: warehouse/templates/accounts/two-factor.html:122 #, python-format msgid "" -"<p><strong>You have not generated account recovery codes.</strong></p> <p>If " -"you lose access to your two factor methods, you may lose access to your " -"account. <a href=\"%(href)s\">Get help with recovery codes.</a></p>" +"<p><strong>You have not generated account recovery codes.</strong></p> " +"<p>If you lose access to your two factor methods, you may lose access to " +"your account. <a href=\"%(href)s\">Get help with recovery codes.</a></p>" msgstr "" -"<p><strong>Вы не сгенерировали коды восстановления учётной записи.</strong></" -"p> <p>Если вы потеряете доступ к своим методам двухфакторной аутентификации, " -"вы можете потерять доступ к своей учётной записи. <a href=\"%(href)s" -"\">Получить справку по кодам восстановления.</a></p>" +"<p><strong>Вы не сгенерировали коды восстановления учётной " +"записи.</strong></p> <p>Если вы потеряете доступ к своим методам " +"двухфакторной аутентификации, вы можете потерять доступ к своей учётной " +"записи. <a href=\"%(href)s\">Получить справку по кодам " +"восстановления.</a></p>" #: warehouse/templates/email/account-deleted/body.html:18 #, python-format @@ -1218,11 +1199,13 @@ msgstr "Ваша учётная запись PyPI <strong>%(username)s</strong> #: warehouse/templates/email/two-factor-removed/body.html:20 #, python-format msgid "" -"If you did not make this change, you can email <a href=\"%(href)s\">" -"%(email_address)s</a> to communicate with the PyPI administrators." +"If you did not make this change, you can email <a " +"href=\"%(href)s\">%(email_address)s</a> to communicate with the PyPI " +"administrators." msgstr "" -"Если вы не делали этого изменения, вы можете написать письмо на <a href=" -"\"%(href)s\">%(email_address)s</a>, чтобы связаться с администраторами PyPI." +"Если вы не делали этого изменения, вы можете написать письмо на <a " +"href=\"%(href)s\">%(email_address)s</a>, чтобы связаться с " +"администраторами PyPI." #: warehouse/templates/email/added-as-collaborator/body.html:19 #, python-format @@ -1230,8 +1213,8 @@ msgid "" "You have been added as <strong>%(role)s</strong> to the %(site)s project " "%(project)s by %(submitter)s." msgstr "" -"Вы были добавлены в %(site)s проект %(project)s в качестве <strong>%(role)s</" -"strong> при помощи %(submitter)s." +"Вы были добавлены в %(site)s проект %(project)s в качестве " +"<strong>%(role)s</strong> при помощи %(submitter)s." #: warehouse/templates/email/added-as-collaborator/body.html:24 #, python-format @@ -1239,17 +1222,17 @@ msgid "" "You are receiving this because you have been added by %(submitter)s to a " "project on %(site)s." msgstr "" -"Вы получаете это сообщение, потому что %(submitter)s добавил вас в проект на " -"%(site)s." +"Вы получаете это сообщение, потому что %(submitter)s добавил вас в проект" +" на %(site)s." #: warehouse/templates/email/password-change/body.html:18 #, python-format msgid "" -"Someone, perhaps you, has changed the password for your PyPI account <strong>" -"%(username)s</strong>." +"Someone, perhaps you, has changed the password for your PyPI account " +"<strong>%(username)s</strong>." msgstr "" -"Кто-то, возможно вы, сменил пароль к учетной записи <strong>%(username)s</" -"strong> на PyPI." +"Кто-то, возможно вы, сменил пароль к учетной записи " +"<strong>%(username)s</strong> на PyPI." #: warehouse/templates/email/password-compromised-hibp/body.html:18 #: warehouse/templates/email/password-compromised/body.html:18 @@ -1258,15 +1241,16 @@ msgstr "Что?" #: warehouse/templates/email/password-compromised/body.html:20 msgid "" -"PyPI administrators have determined that your password is compromised. To\n" -" protect you and other users, we have preemptively reset your password and " -"you\n" +"PyPI administrators have determined that your password is compromised. To" +"\n" +" protect you and other users, we have preemptively reset your password " +"and you\n" " will no longer be able to log in or upload to PyPI with your existing\n" " password." msgstr "" "Администраторы PyPI выяснили, что ваш пароль скомпрометирован. Чтобы\n" -" защитить вас и других пользователей, мы превентивно сбросили ваш пароль, и " -"вы\n" +" защитить вас и других пользователей, мы превентивно сбросили ваш " +"пароль, и вы\n" " больше не сможете войти или загружать в PyPI с помощью своего " "существующего\n" "  пароля." @@ -1288,11 +1272,11 @@ msgstr "Что мне делать?" #: warehouse/templates/email/password-compromised/body.html:33 #, python-format msgid "" -"To regain access to your account, <a href=\"%(href)s\">reset your password</" -"a> on PyPI." +"To regain access to your account, <a href=\"%(href)s\">reset your " +"password</a> on PyPI." msgstr "" -"Чтобы восстановить доступ к учетной записи, <a href=\"%(href)s\">сбросьте " -"пароль</a> на PyPI." +"Чтобы восстановить доступ к учетной записи, <a href=\"%(href)s\">сбросьте" +" пароль</a> на PyPI." #: warehouse/templates/email/password-compromised/body.html:39 msgid "How can I contact you?" @@ -1301,11 +1285,12 @@ msgstr "Как я могу связаться с вами?" #: warehouse/templates/email/password-compromised/body.html:41 #, python-format msgid "" -"For more information, you can email %(email_address)s to communicate with\n" +"For more information, you can email %(email_address)s to communicate with" +"\n" " the PyPI administrators." msgstr "" -"Чтобы узнать больше, вы можете написать письмо на %(email_address)s, чтобы " -"связаться с\n" +"Чтобы узнать больше, вы можете написать письмо на %(email_address)s, " +"чтобы связаться с\n" "  администраторами PyPI." #: warehouse/templates/email/password-compromised-hibp/body.html:20 @@ -1314,14 +1299,14 @@ msgid "" "password appears\n" " in public data breaches. To protect you and other users, we have " "preemptively reset your\n" -" password and you will no longer be able to log in or upload to PyPI with " -"your existing\n" +" password and you will no longer be able to log in or upload to PyPI " +"with your existing\n" " password." msgstr "" -"Во время вашей последней попытки войти или загрузить в PyPI, мы заметили, " -"что ваш пароль появляется\n" -" в публичных источниках данных. Чтобы защитить вас и других пользователей, " -"мы превентивно сбросили ваш\n" +"Во время вашей последней попытки войти или загрузить в PyPI, мы заметили," +" что ваш пароль появляется\n" +" в публичных источниках данных. Чтобы защитить вас и других " +"пользователей, мы превентивно сбросили ваш\n" " пароль, и вы больше не сможете войти в систему или загрузить в PyPI с " "помощью существующего\n" " пароля." @@ -1335,20 +1320,21 @@ msgid "" " attacks against PyPI and its users." msgstr "" "PyPI не был взломан. Это защитная мера для снижения\n" -"   риска атак <a href=\"%(href)s\">подстановки учётных данных (credential " -"stuffing)</a>\n" +"   риска атак <a href=\"%(href)s\">подстановки учётных данных (credential" +" stuffing)</a>\n" "   против PyPI и его пользователей." #: warehouse/templates/email/password-compromised-hibp/body.html:34 #, python-format msgid "" -"To regain access to your account, <a href=\"%(reset_pw_url)s\">reset your " -"password</a> on PyPI. We also recommend that you go to <a href=" -"\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> and check your other " -"passwords and get yourself familiar with good password practices." +"To regain access to your account, <a href=\"%(reset_pw_url)s\">reset your" +" password</a> on PyPI. We also recommend that you go to <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> and check your " +"other passwords and get yourself familiar with good password practices." msgstr "" -"Чтобы восстановить доступ к учетной записи, <a href=\"%(reset_pw_url)s" -"\">сбросьте ваш пароль</a> на PyPI. Мы также рекомендуем вам перейти к <a " +"Чтобы восстановить доступ к учетной записи, <a " +"href=\"%(reset_pw_url)s\">сбросьте ваш пароль</a> на PyPI. Мы также " +"рекомендуем вам перейти к <a " "href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> и проверить ваши " "пароли, а также ознакомиться с методами создания надежных паролей." @@ -1359,30 +1345,31 @@ msgstr "Откуда вам это известно?" #: warehouse/templates/email/password-compromised-hibp/body.html:42 #, python-format msgid "" -"We use a free security service from <a href=\"%(have_i_been_pwned_url)s" -"\">HaveIBeenPwned</a>. When registering, authenticating, or updating your " -"password, we generate a SHA1 hash of your password and use the first 5 " -"characters of the hash to decide if the password is compromised. The " -"plaintext password is never stored by PyPI or sent to HaveIBeenPwned." +"We use a free security service from <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>. When registering, " +"authenticating, or updating your password, we generate a SHA1 hash of " +"your password and use the first 5 characters of the hash to decide if the" +" password is compromised. The plaintext password is never stored by PyPI " +"or sent to HaveIBeenPwned." msgstr "" -"Мы используем бесплатный сервис безопасности от <a href=" -"\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>. При регистрации, " -"аутентификации или обновлении пароля мы генерируем хэш SHA1 вашего пароля и " -"используем первые 5 символов хэша, чтобы решить, скомпрометирован ли пароль. " -"Открытый текстовый пароль никогда не сохраняется на PyPI и не отправляется в " -"HaveIBeenPwned." +"Мы используем бесплатный сервис безопасности от <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>. При регистрации, " +"аутентификации или обновлении пароля мы генерируем хэш SHA1 вашего пароля" +" и используем первые 5 символов хэша, чтобы решить, скомпрометирован ли " +"пароль. Открытый текстовый пароль никогда не сохраняется на PyPI и не " +"отправляется в HaveIBeenPwned." #: warehouse/templates/email/password-compromised-hibp/body.html:47 #, python-format msgid "" -"For more information, see our <a href=\"%(faq_url)s\">FAQ</a>. For help, you " -"can email <a href=\"%(email_href)s\">%(email_address)s</a> to communicate " -"with the PyPI administrators." +"For more information, see our <a href=\"%(faq_url)s\">FAQ</a>. For help, " +"you can email <a href=\"%(email_href)s\">%(email_address)s</a> to " +"communicate with the PyPI administrators." msgstr "" -"Чтобы узнать больше, ознакомьтесь с разделом <a href=\"%(faq_url)s\">FAQ</" -"a>. Чтобы получить помощь, вы можете отправить письмо на <a href=" -"\"%(email_href)s\">%(email_address)s</a>, чтобы связаться с администраторами " -"PyPI." +"Чтобы узнать больше, ознакомьтесь с разделом <a " +"href=\"%(faq_url)s\">FAQ</a>. Чтобы получить помощь, вы можете отправить " +"письмо на <a href=\"%(email_href)s\">%(email_address)s</a>, чтобы " +"связаться с администраторами PyPI." #: warehouse/templates/email/password-reset/body.html:18 #, python-format @@ -1390,8 +1377,8 @@ msgid "" "Someone, perhaps you, has made a password reset request for your PyPI " "account '%(username)s'." msgstr "" -"Кто-то, возможно, вы, сделал запрос на сброс пароля для вашей учетной записи " -"'%(username)s' на PyPI." +"Кто-то, возможно, вы, сделал запрос на сброс пароля для вашей учетной " +"записи '%(username)s' на PyPI." #: warehouse/templates/email/password-reset/body.html:20 #, python-format @@ -1399,8 +1386,8 @@ msgid "" "If you wish to proceed with this request, <a href=\"%(href)s\">click to " "reset your password</a>." msgstr "" -"Если вы хотите продолжить выполнение этого запроса, <a href=\"%(href)s" -"\">нажмите, чтобы сбросить пароль</a>." +"Если вы хотите продолжить выполнение этого запроса, <a " +"href=\"%(href)s\">нажмите, чтобы сбросить пароль</a>." #: warehouse/templates/email/password-reset/body.html:22 #: warehouse/templates/email/verify-email/body.html:22 @@ -1414,18 +1401,18 @@ msgstr[2] "Срок действия этой ссылки истечёт чер #: warehouse/templates/email/password-reset/body.html:24 #: warehouse/templates/email/verify-email/body.html:24 msgid "If you did not make this request, you can safely ignore this email." -msgstr "" -"Если вы не делали этого запроса, то можете проигнорировать это сообщение." +msgstr "Если вы не делали этого запроса, то можете проигнорировать это сообщение." #: warehouse/templates/email/primary-email-change/body.html:18 #, python-format msgid "" -"The primary email for your PyPI account <strong>%(username)s</strong> has " -"been changed from <code>%(old_email)s</code> to <code>%(new_email)s</code>" -msgstr "" -"Основной адрес электронной почты для вашей учетной записи <strong>" -"%(username)s</strong> на PyPI был изменен с <code>%(old_email)s</code> на " +"The primary email for your PyPI account <strong>%(username)s</strong> has" +" been changed from <code>%(old_email)s</code> to " "<code>%(new_email)s</code>" +msgstr "" +"Основной адрес электронной почты для вашей учетной записи " +"<strong>%(username)s</strong> на PyPI был изменен с " +"<code>%(old_email)s</code> на <code>%(new_email)s</code>" #: warehouse/templates/email/two-factor-added/body.html:18 #, python-format @@ -1433,8 +1420,9 @@ msgid "" "Someone, perhaps you, has added a %(method)s two-factor authentication " "method to your PyPI account <strong>%(username)s</strong>." msgstr "" -"Кто-то, возможно вы, добавил метод %(method)s двухфакторной аутентификации к " -"вашей учётной записи <strong>%(username)s</strong> на PyPI." +"Кто-то, возможно вы, добавил метод %(method)s двухфакторной " +"аутентификации к вашей учётной записи <strong>%(username)s</strong> на " +"PyPI." #: warehouse/templates/email/two-factor-removed/body.html:18 #, python-format @@ -1442,26 +1430,27 @@ msgid "" "Someone, perhaps you, has removed a %(method)s two-factor authentication " "method from your PyPI account <strong>%(username)s</strong>." msgstr "" -"Кто-то, возможно вы, удалил метод %(method)s двухфакторной аутентификации из " -"вашей учётной записи <strong>%(username)s</strong> на PyPI." +"Кто-то, возможно вы, удалил метод %(method)s двухфакторной аутентификации" +" из вашей учётной записи <strong>%(username)s</strong> на PyPI." #: warehouse/templates/email/verify-email/body.html:18 #, python-format msgid "" -"Someone, perhaps you, has added this email address (<code>%(email_address)s</" -"code>) to their PyPI account." +"Someone, perhaps you, has added this email address " +"(<code>%(email_address)s</code>) to their PyPI account." msgstr "" -"Кто-то, возможно вы, добавили этот адрес электронной почты (<code>" -"%(email_address)s</code>) к своей учетной записи PyPI." +"Кто-то, возможно вы, добавили этот адрес электронной почты " +"(<code>%(email_address)s</code>) к своей учетной записи PyPI." #: warehouse/templates/email/verify-email/body.html:20 #, python-format msgid "" -"If you wish to proceed with this request, <a href=\"%(href)s\">click this " -"link to verify your email address</a>." +"If you wish to proceed with this request, <a href=\"%(href)s\">click this" +" link to verify your email address</a>." msgstr "" -"Если вы хотите продолжить выполнение этого запроса, <a href=\"%(href)s" -"\">нажмите на эту ссылку, чтобы подтвердить свой адрес электронной почты</a>." +"Если вы хотите продолжить выполнение этого запроса, <a " +"href=\"%(href)s\">нажмите на эту ссылку, чтобы подтвердить свой адрес " +"электронной почты</a>." #: warehouse/templates/includes/current-user-indicator.html:29 msgid "Admin" @@ -1522,11 +1511,11 @@ msgstr "Успех" #: warehouse/templates/includes/hash-modal.html:23 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Hashes</a> for %(filename)s" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Hashes</a> for %(filename)s" msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Хэши</a> для %(filename)s" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Хэши</a> для %(filename)s" #: warehouse/templates/includes/hash-modal.html:28 #, python-format @@ -1592,8 +1581,8 @@ msgstr "Подтвердите свою электронную почту или #: warehouse/templates/includes/session-notifications.html:37 #, python-format msgid "" -"Two factor authentication is available, <a href=\"%(href)s\">enable it now " -"for your account.</a>" +"Two factor authentication is available, <a href=\"%(href)s\">enable it " +"now for your account.</a>" msgstr "" "Доступна двухфакторная аутентификация, <a href=\"%(href)s\">включите ее " "сейчас для своей учетной записи.</a>" @@ -1613,39 +1602,41 @@ msgstr "Статистика" #: warehouse/templates/includes/accounts/profile-actions.html:21 #, python-format msgid "" -"View statistics for your projects via <a href=\"%(libs_io_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or by " -"using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our public " -"dataset on Google BigQuery</a>" +"View statistics for your projects via <a href=\"%(libs_io_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, " +"or by using <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">our public dataset on Google BigQuery</a>" msgstr "" -"Смотрите статистику своих проектов на <a href=\"%(libs_io_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a> или в <a " -"href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">нашем общедоступном " -"наборе данных через Google BigQuery</a>" +"Смотрите статистику своих проектов на <a href=\"%(libs_io_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a> " +"или в <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">нашем " +"общедоступном наборе данных через Google BigQuery</a>" #: warehouse/templates/includes/accounts/profile-actions.html:30 #, python-format msgid "" -"View statistics for %(username)s's projects via <a href=\"%(libs_io_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or " -"by using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our " -"public dataset on Google BigQuery</a>" +"View statistics for %(username)s's projects via <a " +"href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io</a>, or by using <a href=\"%(gbq_href)s\" " +"target=\"_blank\" rel=\"noopener\">our public dataset on Google " +"BigQuery</a>" msgstr "" -"Смотрите статистику проектов %(username)s на <a href=\"%(libs_io_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a> или " -"в <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">нашем " +"Смотрите статистику проектов %(username)s на <a href=\"%(libs_io_href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a> " +"или в <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">нашем " "общедоступном наборе данных через Google BigQuery</a>" #: warehouse/templates/includes/accounts/profile-callout.html:18 #, python-format msgid "" "You have not uploaded any projects to PyPI, yet. To learn how to get " -"started, visit the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">Python Packaging User Guide</a>" +"started, visit the <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" -"Вы ещё не загрузили на PyPI ни одного проекта. Чтобы узнать, с чего начать, " -"прочтите <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Руководство пользователя по созданию Python’ьих пакетов</a>" +"Вы ещё не загрузили на PyPI ни одного проекта. Чтобы узнать, с чего " +"начать, прочтите <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Руководство пользователя по созданию " +"Python’ьих пакетов</a>" #: warehouse/templates/includes/accounts/profile-callout.html:23 #, python-format @@ -1712,15 +1703,15 @@ msgstr "Открытых проблем/запросов на вытягиван #: warehouse/templates/includes/packaging/project-data.html:66 #, python-format msgid "" -"View statistics for this project via <a href=\"%(libs_io_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or by " -"using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our public " -"dataset on Google BigQuery</a>" +"View statistics for this project via <a href=\"%(libs_io_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, " +"or by using <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">our public dataset on Google BigQuery</a>" msgstr "" -"Смотрите статистику этого проекта на <a href=\"%(libs_io_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a> или в <a " -"href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">нашем публичном " -"наборе данных через Google BigQuery</a>" +"Смотрите статистику этого проекта на <a href=\"%(libs_io_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a> " +"или в <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">нашем " +"публичном наборе данных через Google BigQuery</a>" #: warehouse/templates/includes/packaging/project-data.html:74 msgid "Meta" @@ -1770,8 +1761,7 @@ msgstr "Проверенный*" #: warehouse/templates/manage/account.html:35 msgid "*Intermittent delivery problems may lead to verification loss" -msgstr "" -"*Периодические проблемы с доставкой могут привести к потере подтверждения" +msgstr "*Периодические проблемы с доставкой могут привести к потере подтверждения" #: warehouse/templates/manage/account.html:39 msgid "Verified" @@ -1842,11 +1832,11 @@ msgstr "Удалить электронную почту" #: warehouse/templates/manage/account.html:138 msgid "" -"Add <abbr title=\"two factor authentication\">2FA</abbr> with authentication " -"application" +"Add <abbr title=\"two factor authentication\">2FA</abbr> with " +"authentication application" msgstr "" -"Добавить <abbr title=\"двухфакторная аутентификация\">2FA</abbr> с помощью " -"приложения аутентификации" +"Добавить <abbr title=\"двухфакторная аутентификация\">2FA</abbr> с " +"помощью приложения аутентификации" #: warehouse/templates/manage/account.html:140 msgid "" @@ -1863,8 +1853,8 @@ msgstr "Сгенерировать коды восстановления" #: warehouse/templates/manage/account.html:147 #: warehouse/templates/manage/account/webauthn-provision.html:37 msgid "" -"Enable JavaScript to set up two factor authentication with a security device " -"(e.g. USB key)" +"Enable JavaScript to set up two factor authentication with a security " +"device (e.g. USB key)" msgstr "" "Включите JavaScript для настройки двухфакторной аутентификации с помощью " "устройства безопасности (например, USB-ключа)" @@ -1873,13 +1863,13 @@ msgstr "" #: warehouse/templates/manage/account/webauthn-provision.html:53 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Upgrade your browser</a> to set up two factor authentication with a " -"security device (e.g. USB key)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Upgrade your browser</a> to set up two factor " +"authentication with a security device (e.g. USB key)" msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Обновите свой браузер</a>, чтобы настроить двухфакторную аутентификацию " -"через устройство безопасности (например, USB-ключ)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Обновите свой браузер</a>, чтобы настроить двухфакторную" +" аутентификацию через устройство безопасности (например, USB-ключ)" #: warehouse/templates/manage/account.html:166 #: warehouse/templates/manage/account.html:528 @@ -1928,7 +1918,8 @@ msgstr "Удалить API-токен" #: warehouse/templates/manage/account.html:216 #: warehouse/templates/manage/token.html:59 msgid "" -"Applications or scripts using this token will no longer have access to PyPI." +"Applications or scripts using this token will no longer have access to " +"PyPI." msgstr "" "Приложения или скрипты, которые пользуются этим токеном, больше не будут " "иметь доступа к PyPI." @@ -1945,13 +1936,13 @@ msgstr "Изображение профиля" #: warehouse/templates/manage/account.html:250 #, python-format msgid "" -"We use <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">gravatar.com</a> to generate your profile picture based on your " -"primary email address" +"We use <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">gravatar.com</a> to generate your profile picture based " +"on your primary email address" msgstr "" -"Мы используем <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">gravatar.com</a>, чтобы сгенерировать ваше изображение профиля " -"на основе вашей основной электронной почты" +"Мы используем <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">gravatar.com</a>, чтобы сгенерировать ваше изображение " +"профиля на основе вашей основной электронной почты" #: warehouse/templates/manage/account.html:257 msgid "Change image on gravatar.com" @@ -1968,10 +1959,11 @@ msgstr "Дата регистрации" #: warehouse/templates/manage/account.html:279 #, python-format msgid "" -"Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be changed." +"Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be " +"changed." msgstr "" -"Отображается в вашем <a href=\"%(href)s\">публичном профиле</a>. Не может " -"быть изменено." +"Отображается в вашем <a href=\"%(href)s\">публичном профиле</a>. Не может" +" быть изменено." #: warehouse/templates/manage/account.html:290 msgid "Full name" @@ -1993,11 +1985,11 @@ msgstr "Публичный адрес электронной почты" #: warehouse/templates/manage/account.html:319 #, python-format msgid "" -"One of your verified emails can be displayed on your <a href=\"%(href)s" -"\">public profile</a> to logged-in users." +"One of your verified emails can be displayed on your <a " +"href=\"%(href)s\">public profile</a> to logged-in users." msgstr "" -"Один из ваших подтверждённых адресов электронной почты может показываться " -"зарегистрированным пользователям в вашем <a href=\"%(href)s\">публичном " +"Один из ваших подтверждённых адресов электронной почты может показываться" +" зарегистрированным пользователям в вашем <a href=\"%(href)s\">публичном " "профиле</a>." #: warehouse/templates/manage/account.html:324 @@ -2010,16 +2002,18 @@ msgstr "Электронные адреса учетной записи" #: warehouse/templates/manage/account.html:334 msgid "" -"You can associate several emails with your account. You can use any <span " -"class=\"badge badge--success\"><i class=\"fa fa-check\" aria-hidden=\"true" -"\"></i> Verified</span> email to recover your account, but only your <span " -"class=\"badge\">Primary</span> email will receive notifications." +"You can associate several emails with your account. You can use any <span" +" class=\"badge badge--success\"><i class=\"fa fa-check\" aria-" +"hidden=\"true\"></i> Verified</span> email to recover your account, but " +"only your <span class=\"badge\">Primary</span> email will receive " +"notifications." msgstr "" -"Вы можете привязать несколько электронных адресов к вашей учетной записи. Вы " -"можете использовать любой <span class=\"badge badge--success\"><i class=\"fa " -"fa-check\" aria-hidden=\"true\"></i>Подтвержденный</span> адрес электронной " -"почты для восстановления учетной записи, но уведомления будут приходить " -"только на ваш <span class=\"badge\">Основной</span> адрес электронной почты." +"Вы можете привязать несколько электронных адресов к вашей учетной записи." +" Вы можете использовать любой <span class=\"badge badge--success\"><i " +"class=\"fa fa-check\" aria-hidden=\"true\"></i>Подтвержденный</span> " +"адрес электронной почты для восстановления учетной записи, но уведомления" +" будут приходить только на ваш <span class=\"badge\">Основной</span> " +"адрес электронной почты." #: warehouse/templates/manage/account.html:345 msgid "Emails associated with your account" @@ -2065,9 +2059,9 @@ msgid "" "account. <a href=\"%(href)s\">Learn more about <abbr title=\"two factor " "authentication\">2FA</abbr></a>." msgstr "" -"Двухфакторная аутентификация добавляет дополнительный уровень безопасности к " -"вашей учетной записи. <a href=\"%(href)s\">Узнайте больше о <abbr title=" -"\"two factor authentication\">2FA</abbr></a>." +"Двухфакторная аутентификация добавляет дополнительный уровень " +"безопасности к вашей учетной записи. <a href=\"%(href)s\">Узнайте больше " +"о <abbr title=\"two factor authentication\">2FA</abbr></a>." #: warehouse/templates/manage/account.html:451 msgid "Two factor authentication methods enabled" @@ -2080,8 +2074,8 @@ msgstr "Метод двухфакторной аутентификации" #: warehouse/templates/manage/account.html:460 #: warehouse/templates/manage/account.html:570 msgid "" -"Authentication application (<abbr title=\"time-based one-time password" -"\">TOTP</abbr>)" +"Authentication application (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>)" msgstr "" "Приложение аутентификации (<abbr title=\"time-based one-time password – " "одноразовый пароль на основе времени\">TOTP</abbr>)" @@ -2104,7 +2098,8 @@ msgstr "Удалить приложение" #: warehouse/templates/manage/account.html:568 msgid "Security device (<abbr title=\"web authentication\">WebAuthn</abbr>)" msgstr "" -"Устройство безопасности (<abbr title=\"веб аутентификация\">WebAuthn</abbr>)" +"Устройство безопасности (<abbr title=\"веб " +"аутентификация\">WebAuthn</abbr>)" #: warehouse/templates/manage/account.html:477 msgid "Remove two factor security device" @@ -2141,11 +2136,12 @@ msgstr "Вы не включили двухфакторную аутентифи #: warehouse/templates/manage/account.html:512 #, python-format msgid "" -"<a href=\"%(href)s\">Verify your primary email address</a> to add two factor " -"authentication to your account." +"<a href=\"%(href)s\">Verify your primary email address</a> to add two " +"factor authentication to your account." msgstr "" -"<a href=\"%(href)s\">Подтвердите свой основной адрес электронной почты</a>, " -"чтобы добавить двухфакторную аутентификацию в свою учетную запись." +"<a href=\"%(href)s\">Подтвердите свой основной адрес электронной " +"почты</a>, чтобы добавить двухфакторную аутентификацию в свою учетную " +"запись." #: warehouse/templates/manage/account.html:519 #: warehouse/templates/manage/settings.html:23 @@ -2158,8 +2154,8 @@ msgid "" "API tokens provide an alternative way to authenticate when uploading " "packages to PyPI." msgstr "" -"API-токены предоставляют альтернативный способ аутентификации при загрузке " -"пакетов на PyPI." +"API-токены предоставляют альтернативный способ аутентификации при " +"загрузке пакетов на PyPI." #: warehouse/templates/manage/account.html:520 msgid "Learn more about API tokens" @@ -2177,11 +2173,11 @@ msgstr "Добавить API-токен" #: warehouse/templates/manage/account.html:544 #, python-format msgid "" -"<a href=\"%(href)s\">Verify your primary email address</a> to add API tokens " -"to your account." +"<a href=\"%(href)s\">Verify your primary email address</a> to add API " +"tokens to your account." msgstr "" -"Чтобы добавить API-токены в свою учётную запись, <a href=\"%(href)s" -"\">подтвердите свой основной адрес электронной почты</a>." +"Чтобы добавить API-токены в свою учётную запись, <a " +"href=\"%(href)s\">подтвердите свой основной адрес электронной почты</a>." #: warehouse/templates/manage/account.html:559 msgid "Account created" @@ -2256,10 +2252,11 @@ msgstr "Добавлена двухфакторная аутентификаци #: warehouse/templates/manage/account.html:613 #: warehouse/templates/manage/account.html:623 msgid "" -"Method: Security device (<abbr title=\"web authentication\">WebAuthn</abbr>)" +"Method: Security device (<abbr title=\"web " +"authentication\">WebAuthn</abbr>)" msgstr "" -"Способ: Устройство безопасности (<abbr title=\"веб аутентификация" -"\">WebAuthn</abbr>)" +"Способ: Устройство безопасности (<abbr title=\"веб " +"аутентификация\">WebAuthn</abbr>)" #: warehouse/templates/manage/account.html:614 #: warehouse/templates/manage/account.html:624 @@ -2323,7 +2320,8 @@ msgstr "Уникальный идентификатор:" #: warehouse/templates/manage/account.html:662 msgid "Events appear here as security-related actions occur on your account." msgstr "" -"Здесь отображаются события, связанные с безопасностью вашей учетной записи." +"Здесь отображаются события, связанные с безопасностью вашей учетной " +"записи." #: warehouse/templates/manage/account.html:664 msgid "Recent account activity" @@ -2349,10 +2347,10 @@ msgid "IP address" msgstr "IP-адрес" #: warehouse/templates/manage/account.html:687 -msgid "" -"Events will appear here as security-related actions occur on your account." +msgid "Events will appear here as security-related actions occur on your account." msgstr "" -"Здесь отображаются события, связанные с безопасностью вашей учетной записи." +"Здесь отображаются события, связанные с безопасностью вашей учетной " +"записи." #: warehouse/templates/manage/account.html:694 msgid "Delete account" @@ -2393,38 +2391,38 @@ msgstr[2] "" #: warehouse/templates/manage/account.html:704 msgid "" "\n" -" You must transfer ownership or delete this project before you can " -"delete your account.\n" +" You must transfer ownership or delete this project before you " +"can delete your account.\n" " " msgid_plural "" "\n" -" You must transfer ownership or delete these projects before you " -"can delete your account.\n" +" You must transfer ownership or delete these projects before you" +" can delete your account.\n" " " msgstr[0] "" "\n" -" Вы должны передать право собственности или удалить этот проект, " -"прежде чем вы сможете удалить свою учетную запись.\n" +" Вы должны передать право собственности или удалить этот проект," +" прежде чем вы сможете удалить свою учетную запись.\n" " " msgstr[1] "" "\n" -" Вы должны передать право собственности или удалить эти проекты, " -"прежде чем вы сможете удалить свою учетную запись.\n" +" Вы должны передать право собственности или удалить эти проекты," +" прежде чем вы сможете удалить свою учетную запись.\n" " " msgstr[2] "" "\n" -" Вы должны передать право собственности или удалить эти проекты, " -"прежде чем вы сможете удалить свою учетную запись.\n" +" Вы должны передать право собственности или удалить эти проекты," +" прежде чем вы сможете удалить свою учетную запись.\n" " " #: warehouse/templates/manage/account.html:714 #, python-format msgid "" -"<a href=\"%(transfer_href)s\">transfer ownership</a> or <a href=" -"\"%(delete_href)s\">delete project</a>" +"<a href=\"%(transfer_href)s\">transfer ownership</a> or <a " +"href=\"%(delete_href)s\">delete project</a>" msgstr "" -"<a href=\"%(transfer_href)s\">передать право собственности</a> или <a href=" -"\"%(delete_href)s\">удалить проект</a>" +"<a href=\"%(transfer_href)s\">передать право собственности</a> или <a " +"href=\"%(delete_href)s\">удалить проект</a>" #: warehouse/templates/manage/account.html:723 #: warehouse/templates/manage/token.html:162 @@ -2451,14 +2449,14 @@ msgstr "Уничтожить документацию" #: warehouse/templates/manage/documentation.html:28 #, python-format msgid "" -"If you would like to DESTROY any existing documentation hosted at <a href=" -"\"%(url)s\">%(url)s</a> there is <strong>no</strong> undo, as uploading new " -"documentation is no longer supported." +"If you would like to DESTROY any existing documentation hosted at <a " +"href=\"%(url)s\">%(url)s</a> there is <strong>no</strong> undo, as " +"uploading new documentation is no longer supported." msgstr "" -"Если вы хотите уничтожить любую существующую документацию, размещенную на <a " -"href=\"%(url)s\">%(url)s</a>, то это действие будет <strong>невозможно " -"отменить</strong>, поскольку загрузка новой документации больше не " -"поддерживается." +"Если вы хотите уничтожить любую существующую документацию, размещенную на" +" <a href=\"%(url)s\">%(url)s</a>, то это действие будет " +"<strong>невозможно отменить</strong>, поскольку загрузка новой " +"документации больше не поддерживается." #: warehouse/templates/manage/documentation.html:35 msgid "Destroy Documentation for project" @@ -2485,11 +2483,11 @@ msgstr "История проекта '%(project_name)s'" #: warehouse/templates/manage/history.html:25 msgid "" -"Each time you (or your collaborators) perform a security action related to " -"this project, the action is recorded and displayed here." +"Each time you (or your collaborators) perform a security action related " +"to this project, the action is recorded and displayed here." msgstr "" -"Каждый раз, когда вы (или ваши соавторы) выполняете действие, связанное с " -"безопасностью, в этом проекте, то оно записывается и отображается здесь." +"Каждый раз, когда вы (или ваши соавторы) выполняете действие, связанное с" +" безопасностью, в этом проекте, то оно записывается и отображается здесь." #: warehouse/templates/manage/history.html:29 msgid "Project created" @@ -2582,17 +2580,17 @@ msgid "" "Each time you or your collaborators update this project, the action is " "recorded and displayed here." msgstr "" -"Каждый раз, когда вы или ваши соавторы обновляете этот проект, это действие " -"записывается и отображается здесь." +"Каждый раз, когда вы или ваши соавторы обновляете этот проект, это " +"действие записывается и отображается здесь." #: warehouse/templates/manage/journal.html:28 #, python-format msgid "" -"This feature will be deprecated in the future, replaced by the <a href=" -"\"%(href)s\">security history page</a>." +"This feature will be deprecated in the future, replaced by the <a " +"href=\"%(href)s\">security history page</a>." msgstr "" -"В будущем эта функция устареет и будет заменена <a href=\"%(href)s" -"\">страницей истории безопасности</a>." +"В будущем эта функция устареет и будет заменена <a " +"href=\"%(href)s\">страницей истории безопасности</a>." #: warehouse/templates/manage/journal.html:32 #, python-format @@ -2718,12 +2716,13 @@ msgstr "Посмотреть" #, python-format msgid "" "You have not uploaded any projects to PyPI, yet. To learn how to get " -"started, visit the <a href=\"%(href)s\" target=\"_blank\" rel=\"noopener" -"\">Python Packaging User Guide</a>" +"started, visit the <a href=\"%(href)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" -"Вы ещё не загрузили на PyPI ни одного проекта. Чтобы узнать, с чего начать, " -"прочтите <a href=\"%(href)s\" target=\"_blank\" rel=\"noopener\">Руководство " -"пользователя по созданию Python’ьих пакетов</a>" +"Вы ещё не загрузили на PyPI ни одного проекта. Чтобы узнать, с чего " +"начать, прочтите <a href=\"%(href)s\" target=\"_blank\" " +"rel=\"noopener\">Руководство пользователя по созданию Python’ьих " +"пакетов</a>" #: warehouse/templates/manage/release.html:18 #, python-format @@ -2827,8 +2826,8 @@ msgstr "Скрыть" #: warehouse/templates/manage/release.html:119 #, python-format msgid "" -"Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" +"Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" "Узнать, как загружать файлы, в <a href=\"%(href)s\" title=\"%(title)s\" " "target=\"_blank\" rel=\"noopener\">Руководстве пользователя по созданию " @@ -2847,13 +2846,13 @@ msgstr "Удалить выпуск" #, python-format msgid "" "\n" -" Deleting will irreversibly delete this release along with %(count)s " -"file.\n" +" Deleting will irreversibly delete this release along with " +"%(count)s file.\n" " " msgid_plural "" "\n" -" Deleting will irreversibly delete this release along with %(count)s " -"files.\n" +" Deleting will irreversibly delete this release along with " +"%(count)s files.\n" " " msgstr[0] "" "\n" @@ -2879,15 +2878,15 @@ msgstr "Удаление приведёт к необратимому удале #: warehouse/templates/manage/releases.html:91 #, python-format msgid "" -"You will not be able to re-upload a new distribution of the same type with " -"the same version number. Consider making a new release or a <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">post " -"release</a> instead." +"You will not be able to re-upload a new distribution of the same type " +"with the same version number. Consider making a new release or a <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">post release</a> instead." msgstr "" "Вы не сможете повторно загрузить новый дистрибутив того же типа с тем же " -"номером версии. Вместо этого подумайте о создании нового выпуска или <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">пост-" -"выпуска</a>." +"номером версии. Вместо этого подумайте о создании нового выпуска или <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">пост-выпуска</a>." #: warehouse/templates/manage/release.html:142 #: warehouse/templates/manage/releases.html:27 @@ -2973,13 +2972,13 @@ msgstr "Выпусков не найдено" #: warehouse/templates/manage/releases.html:109 #, python-format msgid "" -"Learn how to create a new release on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>" +"Learn how to create a new release on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" msgstr "" -"Узнать, как создать новый выпуск, в <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Руководстве пользователя по созданию " -"Python’ьих пакетов</a>" +"Узнать, как создать новый выпуск, в <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Руководстве " +"пользователя по созданию Python’ьих пакетов</a>" #: warehouse/templates/manage/roles.html:18 #, python-format @@ -2992,8 +2991,8 @@ msgid "" "Use this page to control which PyPI users can help you to manage " "%(project_name)s" msgstr "" -"Используйте эту страницу, чтобы определить, какие пользователи PyPI могут " -"помочь вам управлять %(project_name)s" +"Используйте эту страницу, чтобы определить, какие пользователи PyPI могут" +" помочь вам управлять %(project_name)s" #: warehouse/templates/manage/roles.html:25 #: warehouse/templates/pages/help.html:509 @@ -3009,8 +3008,8 @@ msgstr "Сопровождающий" #: warehouse/templates/manage/roles.html:28 #: warehouse/templates/pages/help.html:510 msgid "" -"Can upload releases for a package. Cannot add collaborators. Cannot delete " -"files, releases, or the project." +"Can upload releases for a package. Cannot add collaborators. Cannot " +"delete files, releases, or the project." msgstr "" "Может загружать новые выпуски. Не может добавлять соавторов. Не может " "удалять файлы, выпуски или проект." @@ -3084,8 +3083,8 @@ msgid "" "<a href=\"%(href)s\">Verify your primary email address</a> to add an API " "token for %(project_name)s." msgstr "" -"Чтобы добавить API-токен для проекта %(project_name)s, <a href=\"%(href)s" -"\">подтвердите свой основной адрес электронной почты</a>." +"Чтобы добавить API-токен для проекта %(project_name)s, <a " +"href=\"%(href)s\">подтвердите свой основной адрес электронной почты</a>." #: warehouse/templates/manage/settings.html:41 msgid "Project description and sidebar" @@ -3094,27 +3093,30 @@ msgstr "Описание проекта и боковая панель" #: warehouse/templates/manage/settings.html:43 #, python-format msgid "" -"To set the '%(project_name)s' description, author, links, classifiers, and " -"other details for your next release, use the <a href=\"%(setup_args_href)s\" " -"rel=\"noopener\" target=\"_blank\"><code>setup()</code> arguments in your " -"<code>setup.py</code> file</a>. Updating these fields will not change the " -"metadata for past releases. Additionally, you <strong>must</strong> use <a " -"href=\"%(twine_docs_href)s\" rel=\"noopener\" target=\"_blank\">Twine</a> to " -"upload your files in order to get full support for these fields. See <a href=" -"\"%(distribution_href)s\" rel=\"noopener\" target=\"_blank\">the Python " -"Packaging User Guide</a> for more help." +"To set the '%(project_name)s' description, author, links, classifiers, " +"and other details for your next release, use the <a " +"href=\"%(setup_args_href)s\" rel=\"noopener\" " +"target=\"_blank\"><code>setup()</code> arguments in your " +"<code>setup.py</code> file</a>. Updating these fields will not change the" +" metadata for past releases. Additionally, you <strong>must</strong> use " +"<a href=\"%(twine_docs_href)s\" rel=\"noopener\" " +"target=\"_blank\">Twine</a> to upload your files in order to get full " +"support for these fields. See <a href=\"%(distribution_href)s\" " +"rel=\"noopener\" target=\"_blank\">the Python Packaging User Guide</a> " +"for more help." msgstr "" "Чтобы задать для вашего следующего выпуска описание и автора проекта " -"«%(project_name)s», ссылки, классификаторы и другие сведения, используйте <a " -"href=\"%(setup_args_href)s\" rel=\"noopener\" target=\"_blank\">аргументы " -"функции <code>setup()</code> в вашем файле <code>setup.py</code></a>. " -"Обновление этих полей не приведёт к изменению метаданных для прошлых " -"опубликованных выпусков. Кроме того, чтобы получить полную поддержку этих " -"полей, для загрузки своих файлов вы <strong>должны</strong> использовать <a " -"href=\"%(twine_docs_href)s\" rel=\"noopener\" target=\"_blank\">Twine</a>. " -"Дополнительную информацию смотрите в <a href=\"%(distribution_href)s\" rel=" -"\"noopener\" target=\"_blank\">Руководстве пользователя по созданию " -"Python’ьих пакетов</a>." +"«%(project_name)s», ссылки, классификаторы и другие сведения, используйте" +" <a href=\"%(setup_args_href)s\" rel=\"noopener\" " +"target=\"_blank\">аргументы функции <code>setup()</code> в вашем файле " +"<code>setup.py</code></a>. Обновление этих полей не приведёт к изменению " +"метаданных для прошлых опубликованных выпусков. Кроме того, чтобы " +"получить полную поддержку этих полей, для загрузки своих файлов вы " +"<strong>должны</strong> использовать <a href=\"%(twine_docs_href)s\" " +"rel=\"noopener\" target=\"_blank\">Twine</a>. Дополнительную информацию " +"смотрите в <a href=\"%(distribution_href)s\" rel=\"noopener\" " +"target=\"_blank\">Руководстве пользователя по созданию Python’ьих " +"пакетов</a>." #: warehouse/templates/manage/settings.html:54 #: warehouse/templates/manage/settings.html:85 @@ -3128,11 +3130,11 @@ msgstr "Удаление этого проекта приведет к:" #: warehouse/templates/manage/settings.html:62 #, python-format msgid "" -"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s " -"release</a>" +"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s" +" release</a>" msgid_plural "" -"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s " -"releases</a>" +"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s" +" releases</a>" msgstr[0] "" "Необратимо удалит этот проект вместе с <a href=\"%(href)s\">%(count)s " "выпуском</a>" @@ -3150,22 +3152,22 @@ msgstr "Необратимо удалить проект" #: warehouse/templates/manage/settings.html:72 msgid "Make the project name available to <strong>any other PyPI</strong> user" msgstr "" -"Сделать название проекта доступным для <strong>любого другого пользователя " -"PyPI</strong>" +"Сделать название проекта доступным для <strong>любого другого " +"пользователя PyPI</strong>" #: warehouse/templates/manage/settings.html:74 msgid "" -"This user will be able to make new releases under this project name, so long " -"as the distribution filenames do not match filenames from a previously " -"released distribution (all PyPI distribution filenames are unique, as they " -"are generated by combining the project name + version number + distribution " -"type)" +"This user will be able to make new releases under this project name, so " +"long as the distribution filenames do not match filenames from a " +"previously released distribution (all PyPI distribution filenames are " +"unique, as they are generated by combining the project name + version " +"number + distribution type)" msgstr "" -"Этот пользователь сможет создавать новые выпуски под этим названием проекта, " -"если имена файлов дистрибутива не совпадают с именами файлов из ранее " -"выпущенного дистрибутива (все имена файлов дистрибутива PyPI уникальны, так " -"как они создаются путём объединения имени проекта с номером версии и типом " -"дистрибутива)" +"Этот пользователь сможет создавать новые выпуски под этим названием " +"проекта, если имена файлов дистрибутива не совпадают с именами файлов из " +"ранее выпущенного дистрибутива (все имена файлов дистрибутива PyPI " +"уникальны, так как они создаются путём объединения имени проекта с " +"номером версии и типом дистрибутива)" #: warehouse/templates/manage/settings.html:85 msgid "Project Name" @@ -3202,8 +3204,8 @@ msgstr "Проект \"%(project)s\"" #: warehouse/templates/manage/token.html:44 msgid "" -"For security reasons this token will only appear once. <strong>Copy it now.</" -"strong>" +"For security reasons this token will only appear once. <strong>Copy it " +"now.</strong>" msgstr "" "По соображениям безопасности, этот токен появится лишь однажды. " "<strong>Скопируйте его сейчас.</strong>" @@ -3232,20 +3234,21 @@ msgstr "Используйте <code>%(token)s</code> как имя пользо #: warehouse/templates/manage/token.html:71 #, python-format msgid "" -"Set your password to the token value, including the <code>%(prefix)s</code> " -"prefix" +"Set your password to the token value, including the " +"<code>%(prefix)s</code> prefix" msgstr "" -"Используйте значение токена вместо своего пароля, включая <code>%(prefix)s</" -"code> префикс" +"Используйте значение токена вместо своего пароля, включая " +"<code>%(prefix)s</code> префикс" #: warehouse/templates/manage/token.html:77 #, python-format msgid "" -"For example, if you are using <a href=\"%(href)s\">Twine</a> to upload your " -"projects to PyPI, set up your <code>%(filename)s</code> file like this:" +"For example, if you are using <a href=\"%(href)s\">Twine</a> to upload " +"your projects to PyPI, set up your <code>%(filename)s</code> file like " +"this:" msgstr "" -"Например, если вы пользуетесь <a href=\"%(href)s\">Twine</a> для загрузки " -"своих проектов в PyPI, настройте свой файл <code>%(filename)s</code> " +"Например, если вы пользуетесь <a href=\"%(href)s\">Twine</a> для загрузки" +" своих проектов в PyPI, настройте свой файл <code>%(filename)s</code> " "следующим образом:" #: warehouse/templates/manage/token.html:87 @@ -3255,17 +3258,17 @@ msgid "" "multiple projects to PyPI, you can set up your <code>%(filename)s</code> " "file like this:" msgstr "" -"Например, если вы пользуетесь <a href=\"%(href)s\">Twine</a> для загрузки " -"нескольких проектов в PyPI, вы можете настроить свой файл <code>" -"%(filename)s</code> следующим образом:" +"Например, если вы пользуетесь <a href=\"%(href)s\">Twine</a> для загрузки" +" нескольких проектов в PyPI, вы можете настроить свой файл " +"<code>%(filename)s</code> следующим образом:" #: warehouse/templates/manage/token.html:99 msgid "" -"either a user-scoped token or a project-scoped token you want to set as the " -"default" +"either a user-scoped token or a project-scoped token you want to set as " +"the default" msgstr "" -"либо токен пользовательской области, либо токен проектной области, который " -"вы хотите установить по умолчанию" +"либо токен пользовательской области, либо токен проектной области, " +"который вы хотите установить по умолчанию" #: warehouse/templates/manage/token.html:104 msgid "a project token" @@ -3277,17 +3280,17 @@ msgid "" "You can then use <code>%(command)s</code> to switch to the correct token " "when uploading to PyPI." msgstr "" -"Вы можете использовать <code>%(command)s</code>, чтобы выбрать правильный " -"токен, когда загружаете в PyPI." +"Вы можете использовать <code>%(command)s</code>, чтобы выбрать правильный" +" токен, когда загружаете в PyPI." #: warehouse/templates/manage/token.html:112 #, python-format msgid "" -"For further instructions on how to use this token, <a href=\"%(href)s" -"\">visit the PyPI help page</a>." +"For further instructions on how to use this token, <a " +"href=\"%(href)s\">visit the PyPI help page</a>." msgstr "" -"Для дальнейших инструкций по использованию этого токена, <a href=\"%(href)s" -"\">посетите страницу помощи PyPI</a>." +"Для дальнейших инструкций по использованию этого токена, <a " +"href=\"%(href)s\">посетите страницу помощи PyPI</a>." #: warehouse/templates/manage/token.html:120 msgid "Add another token" @@ -3315,11 +3318,11 @@ msgstr "Проект:" #: warehouse/templates/manage/token.html:163 msgid "" -"An API token scoped to your entire account will have upload permissions for " -"all of your current and future projects." +"An API token scoped to your entire account will have upload permissions " +"for all of your current and future projects." msgstr "" -"API-токен, относящийся ко всей вашей учетной записи, будет иметь разрешения " -"на загрузку для всех ваших текущих и будущих проектов." +"API-токен, относящийся ко всей вашей учетной записи, будет иметь " +"разрешения на загрузку для всех ваших текущих и будущих проектов." #: warehouse/templates/manage/token.html:166 msgid "Add token" @@ -3335,33 +3338,34 @@ msgstr "Повторно сгенерировать коды восстанов #: warehouse/templates/manage/account/recovery_codes-provision.html:46 msgid "" -"If you lose access to your authentication application or security key(s), " -"you’ll need to use one of these recovery codes to log into your PyPI " +"If you lose access to your authentication application or security key(s)," +" you’ll need to use one of these recovery codes to log into your PyPI " "account. Each code can only be used <strong>once</strong>." msgstr "" "Если вы потеряете доступ к своему приложению проверки подлинности или к " "ключу или ключам безопасности, вам нужно будет использовать один из этих " -"кодов восстановления для входа в свою учётную запись PyPI. Каждый код может " -"быть использован <strong>лишь один раз</strong>." +"кодов восстановления для входа в свою учётную запись PyPI. Каждый код " +"может быть использован <strong>лишь один раз</strong>." #: warehouse/templates/manage/account/recovery_codes-provision.html:47 msgid "" -"These codes should <strong>only</strong> be used for account recovery, not " -"for typical logins." +"These codes should <strong>only</strong> be used for account recovery, " +"not for typical logins." msgstr "" -"Эти коды должны использоваться <strong>только</strong> для восстановления " -"учётной записи, а не для повседневного в неё входа." +"Эти коды должны использоваться <strong>только</strong> для восстановления" +" учётной записи, а не для повседневного в неё входа." #: warehouse/templates/manage/account/recovery_codes-provision.html:48 msgid "" -"<strong>Keep these somewhere safe</strong>. If you lose your authentication " -"application or security key(s) and do not have access to these recovery " -"codes, you may permanently lose access to your PyPI account!" +"<strong>Keep these somewhere safe</strong>. If you lose your " +"authentication application or security key(s) and do not have access to " +"these recovery codes, you may permanently lose access to your PyPI " +"account!" msgstr "" "<strong>Храните их в каком-нибудь безопасном месте</strong>. Если вы " "потеряете своё приложение проверки подлинности или ключ или ключи " -"безопасности и у вас не будет доступа к этим кодам восстановления, вы можете " -"навсегда потерять доступ к своей учётной записи PyPI!" +"безопасности и у вас не будет доступа к этим кодам восстановления, вы " +"можете навсегда потерять доступ к своей учётной записи PyPI!" #: warehouse/templates/manage/account/recovery_codes-provision.html:52 msgid "Save your Recovery Codes" @@ -3392,14 +3396,14 @@ msgstr "Настроить 2FA с помощью приложения аутен #: warehouse/templates/manage/account/totp-provision.html:32 #, python-format msgid "" -"PyPI supports any application that follows the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based " -"one-time password\">TOTP</abbr> standard</a>." +"PyPI supports any application that follows the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title" +"=\"time-based one-time password\">TOTP</abbr> standard</a>." msgstr "" "PyPI поддерживает любые приложения, соответствующие <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">стандарту <abbr title=" -"\"time-based one-time password – одноразовый пароль на основе времени" -"\">TOTP</abbr></a>." +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">стандарту <abbr " +"title=\"time-based one-time password – одноразовый пароль на основе " +"времени\">TOTP</abbr></a>." #: warehouse/templates/manage/account/totp-provision.html:36 #, python-format @@ -3420,8 +3424,8 @@ msgstr "Отсканируйте QR-код с помощью выбранног #: warehouse/templates/manage/account/totp-provision.html:46 msgid "" -"For security reasons, you can only associate one authentication application " -"per PyPI account." +"For security reasons, you can only associate one authentication " +"application per PyPI account." msgstr "" "По соображениям безопасности, вы можете связать только одно приложение " "аутентификации со своей учетной записью на PyPI." @@ -3444,8 +3448,8 @@ msgstr "Код аутентификации" #: warehouse/templates/manage/account/totp-provision.html:73 msgid "" -"To finalize the set up process, enter the authentication code provided by " -"your application." +"To finalize the set up process, enter the authentication code provided by" +" your application." msgstr "" "Чтобы завершить процесс настройки, введите код аутентификации, " "предоставленный приложением." @@ -3461,26 +3465,27 @@ msgstr "Настроить 2FA с помощью устройства безоп #: warehouse/templates/manage/account/webauthn-provision.html:26 #, python-format msgid "" -"PyPI supports any device that adheres to the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." +"PyPI supports any device that adheres to the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." msgstr "" -"PyPI поддерживает любое устройство, которое соответствует <a href=\"%(href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">стандарту FIDO</a>." +"PyPI поддерживает любое устройство, которое соответствует <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">стандарту FIDO</a>." #: warehouse/templates/manage/account/webauthn-provision.html:28 #, python-format msgid "" -"Popular <em>USB keys</em> include <a href=\"%(yubico_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=" -"\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Google Titan</a> and <a href=\"%(thetis_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Thetis</a>." +"Popular <em>USB keys</em> include <a href=\"%(yubico_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> and <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." msgstr "" -"Популярные <em>USB-ключи</em> включают в себя <a href=\"%(yubico_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=" -"\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Google Titan</a> и <a href=\"%(thetis_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Thetis</a>." +"Популярные <em>USB-ключи</em> включают в себя <a href=\"%(yubico_href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> и <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." #: warehouse/templates/manage/account/webauthn-provision.html:43 msgid "Name your device to begin" @@ -3495,8 +3500,8 @@ msgid "" "Please give this device a name. 64 characters or fewer. All Unicode is " "valid, including spaces." msgstr "" -"Пожалуйста, дайте этому устройству имя. 64 символа или меньше. Все Юникод " -"символы действительны, включая пробелы." +"Пожалуйста, дайте этому устройству имя. 64 символа или меньше. Все Юникод" +" символы действительны, включая пробелы." #: warehouse/templates/manage/account/webauthn-provision.html:65 msgid "Set up security device" @@ -3505,24 +3510,25 @@ msgstr "Настроить устройство безопасности" #: warehouse/templates/manage/account/webauthn-provision.html:74 #, python-format msgid "" -"<strong>Not working?</strong> Check you're using a device that follows the " -"<a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">FIDO specification</a> and a <a href=\"%(mozilla_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">compatible browser</a>." +"<strong>Not working?</strong> Check you're using a device that follows " +"the <a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">FIDO specification</a> and a <a " +"href=\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">compatible browser</a>." msgstr "" "<strong>Не работает?</strong> Убедитесь, что вы используете устройство, " -"соответствующее <a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">спецификации FIDO</a>, и <a href=\"%(mozilla_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">совместимый браузер</" -"a>." +"соответствующее <a href=\"%(fido_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">спецификации FIDO</a>, и <a " +"href=\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">совместимый браузер</a>." #: warehouse/templates/manage/account/webauthn-provision.html:78 msgid "" -"Note that some older USB keys do not adhere to the FIDO standard and will " -"not work with PyPI." +"Note that some older USB keys do not adhere to the FIDO standard and will" +" not work with PyPI." msgstr "" -"Обратите внимание, что некоторые старые USB-ключи не соответствуют стандарту " -"FIDO и не будут работать с PyPI." +"Обратите внимание, что некоторые старые USB-ключи не соответствуют " +"стандарту FIDO и не будут работать с PyPI." #: warehouse/templates/packaging/detail.html:94 msgid "Copy PIP instructions" @@ -3623,12 +3629,12 @@ msgstr "предварительный выпуск" #, python-format msgid "" "Download the file for your platform. If you're not sure which to choose, " -"learn more about <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">installing packages</a>." +"learn more about <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">installing packages</a>." msgstr "" "Загрузите файл для вашей платформы. Если вы не уверены, какой выбрать, " -"узнайте больше об <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">установке пакетов</a>." +"узнайте больше об <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">установке пакетов</a>." #: warehouse/templates/packaging/detail.html:273 #, python-format @@ -3647,40 +3653,40 @@ msgstr "Хэши" #: warehouse/templates/pages/classifiers.html:22 msgid "" -"Each project's maintainers provide PyPI with a list of \"trove classifiers\" " -"to categorize each release, describing who it's for, what systems it can run " -"on, and how mature it is." +"Each project's maintainers provide PyPI with a list of \"trove " +"classifiers\" to categorize each release, describing who it's for, what " +"systems it can run on, and how mature it is." msgstr "" -"Сопровождающие каждого проекта предоставляют PyPI перечень «trove-" -"классификаторов» для категоризации каждого выпуска, описывая, для кого " -"предназначен проект, на каких системах он может запускаться и насколько он " -"зрелый." +"Сопровождающие каждого проекта предоставляют PyPI перечень " +"«trove-классификаторов» для категоризации каждого выпуска, описывая, для " +"кого предназначен проект, на каких системах он может запускаться и " +"насколько он зрелый." #: warehouse/templates/pages/classifiers.html:23 msgid "" -"These standardized classifiers can then be used by community members to find " -"projects based on their desired criteria." +"These standardized classifiers can then be used by community members to " +"find projects based on their desired criteria." msgstr "" -"Эти стандартизированные классификаторы могут затем использоваться членами " -"сообщества для поиска проектов на основе желаемых критериев." +"Эти стандартизированные классификаторы могут затем использоваться членами" +" сообщества для поиска проектов на основе желаемых критериев." #: warehouse/templates/pages/classifiers.html:25 #, python-format msgid "" -"Instructions for how to add trove classifiers to a project can be found on " -"the <a href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging User Guide</a>. To read the original " -"classifier specification, refer to <a href=\"%(pep301_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python " -"enhancement proposal\">PEP</abbr> 301</a>." +"Instructions for how to add trove classifiers to a project can be found " +"on the <a href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>. To read the original " +"classifier specification, refer to <a href=\"%(pep301_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 301</a>." msgstr "" -"Вы можете найти инструкции по добавлению trove-классификаторов в проект в <a " -"href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Руководстве пользователя по созданию Python’ьих пакетов</a>. Чтобы " -"прочитать оригинальную спецификацию классификаторов, обратитесь к <a href=" -"\"%(pep301_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><abbr title=\"Python enhancement proposal – Предложение по улучшению " -"Python’а\">PEP</abbr> 301</a>." +"Вы можете найти инструкции по добавлению trove-классификаторов в проект в" +" <a href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Руководстве пользователя по созданию Python’ьих " +"пакетов</a>. Чтобы прочитать оригинальную спецификацию классификаторов, " +"обратитесь к <a href=\"%(pep301_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\"><abbr title=\"Python enhancement " +"proposal – Предложение по улучшению Python’а\">PEP</abbr> 301</a>." #: warehouse/templates/pages/classifiers.html:31 msgid "List of classifiers" @@ -3694,49 +3700,51 @@ msgstr "Обратите внимание:" #: warehouse/templates/pages/help.html:20 #, python-format msgid "" -"All users submitting feedback, reporting issues or contributing to Warehouse " -"are expected to follow the <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">PyPA Code of Conduct</a>." +"All users submitting feedback, reporting issues or contributing to " +"Warehouse are expected to follow the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPA Code of " +"Conduct</a>." msgstr "" "Мы ожидаем, что все пользователи, отправляющие отзывы, сообщающие о " -"проблемах или вносящие свой вклад в проект Warehouse будут следовать <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">правилам " -"и нормам поведения PyPA</a>." +"проблемах или вносящие свой вклад в проект Warehouse будут следовать <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">правилам и нормам поведения PyPA</a>." #: warehouse/templates/pages/help.html:31 #, python-format msgid "" "If you lose your %(method)s and can no longer log in, you may " "<strong>permanently lose access to your account</strong>. You should " -"generate and securely store <a href=\"#recoverycodes\">recovery codes</a> to " -"regain access in that event.." +"generate and securely store <a href=\"#recoverycodes\">recovery codes</a>" +" to regain access in that event.." msgstr "" -"Если вы потеряете свой метод входа %(method)s и не сможете войти в систему, " -"вы можете <strong>навсегда потерять доступ к вашей учётной записи</strong>. " -"На такой случай для восстановления доступа необходимо создать и сохранить " -"где-нибудь в безопасном месте <a href=\"#recoverycodes\">коды " -"восстановления</a>." +"Если вы потеряете свой метод входа %(method)s и не сможете войти в " +"систему, вы можете <strong>навсегда потерять доступ к вашей учётной " +"записи</strong>. На такой случай для восстановления доступа необходимо " +"создать и сохранить где-нибудь в безопасном месте <a " +"href=\"#recoverycodes\">коды восстановления</a>." #: warehouse/templates/pages/help.html:37 msgid "" -"We recommend that all PyPI users set up <em>at least two</em> supported two " -"factor authentication methods and provision <a href=\"#recoverycodes" -"\">recovery codes</a>." +"We recommend that all PyPI users set up <em>at least two</em> supported " +"two factor authentication methods and provision <a " +"href=\"#recoverycodes\">recovery codes</a>." msgstr "" -"Мы рекомендуем всем пользователям PyPI настроить <em>по крайней мере два</" -"em> поддерживаемых метода двухфакторной аутентификации и предоставить <a " -"href=\"#recoverycodes\">коды восстановления</a>." +"Мы рекомендуем всем пользователям PyPI настроить <em>по крайней мере " +"два</em> поддерживаемых метода двухфакторной аутентификации и " +"предоставить <a href=\"#recoverycodes\">коды восстановления</a>." #: warehouse/templates/pages/help.html:43 msgid "" -"If you've lost access to all two factor methods for your account and do not " -"have <a href=\"#recoverycodes\">recovery codes</a>, you can request help <a " -"href=\"#account-recovery\">with account recovery</a>." +"If you've lost access to all two factor methods for your account and do " +"not have <a href=\"#recoverycodes\">recovery codes</a>, you can request " +"help <a href=\"#account-recovery\">with account recovery</a>." msgstr "" -"Если вы потеряли доступ ко всем своим методам двухфакторной аутентификации " -"для вашей учётной записи и не имеете <a href=\"#recoverycodes\">кодов " -"восстановления</a>, вы можете запросить помощь по <a href=\"#account-recovery" -"\">восстановлению учётной записи</a>." +"Если вы потеряли доступ ко всем своим методам двухфакторной " +"аутентификации для вашей учётной записи и не имеете <a " +"href=\"#recoverycodes\">кодов восстановления</a>, вы можете запросить " +"помощь по <a href=\"#account-recovery\">восстановлению учётной " +"записи</a>." #: warehouse/templates/pages/help.html:52 msgid "What's a package, project, or release?" @@ -3768,35 +3776,35 @@ msgstr "Что такое двухфакторная аутентификаци #: warehouse/templates/pages/help.html:60 msgid "" -"How does two factor authentication with an authentication application (<abbr " -"title=\"time-based one-time password\">TOTP</abbr>) work? How do I set it up " -"on PyPI?" +"How does two factor authentication with an authentication application " +"(<abbr title=\"time-based one-time password\">TOTP</abbr>) work? How do I" +" set it up on PyPI?" msgstr "" "Как работает двухфакторная аутентификация с приложением аутентификации " -"(<abbr title=\"time-based one-time password – одноразовый пароль на основе " -"времени\">TOTP</abbr>)? Как мне настроить её на PyPI?" +"(<abbr title=\"time-based one-time password – одноразовый пароль на " +"основе времени\">TOTP</abbr>)? Как мне настроить её на PyPI?" #: warehouse/templates/pages/help.html:61 msgid "" "How does two factor authentication with a security device (e.g. USB key) " "work? How do I set it up on PyPI?" msgstr "" -"Как работает двухфакторная аутентификация с помощью устройства безопасности " -"(например, USB-ключа)? Как мне настроить её на PyPI?" +"Как работает двухфакторная аутентификация с помощью устройства " +"безопасности (например, USB-ключа)? Как мне настроить её на PyPI?" #: warehouse/templates/pages/help.html:62 msgid "What devices (other than a USB key) can I use as a security device?" msgstr "" -"Какие устройства (кроме USB-ключа) я могу использовать в качестве устройства " -"безопасности?" +"Какие устройства (кроме USB-ключа) я могу использовать в качестве " +"устройства безопасности?" #: warehouse/templates/pages/help.html:63 msgid "" -"How does two factor authentication with a recovery code work? How do I set " -"it up on PyPI?" +"How does two factor authentication with a recovery code work? How do I " +"set it up on PyPI?" msgstr "" -"Как работает двухфакторная аутентификация с кодом восстановления? Как мне " -"настроить её на PyPI?" +"Как работает двухфакторная аутентификация с кодом восстановления? Как мне" +" настроить её на PyPI?" #: warehouse/templates/pages/help.html:64 msgid "How can I use API tokens to authenticate with PyPI?" @@ -3816,10 +3824,11 @@ msgstr "Как получить уведомление о выходе ново #: warehouse/templates/pages/help.html:69 msgid "" -"Where can I see statistics about PyPI, downloads, and project/package usage?" +"Where can I see statistics about PyPI, downloads, and project/package " +"usage?" msgstr "" -"Где я могу посмотреть статистику о PyPI, загрузках и использовании проекта/" -"пакета?" +"Где я могу посмотреть статистику о PyPI, загрузках и использовании " +"проекта/пакета?" #: warehouse/templates/pages/help.html:71 msgid "I forgot my PyPI password. Can you help me?" @@ -3831,8 +3840,8 @@ msgstr "Я потерял доступ к своей учётной записи #: warehouse/templates/pages/help.html:73 msgid "" -"Why am I getting a \"Invalid or non-existent authentication information.\" " -"error when uploading files?" +"Why am I getting a \"Invalid or non-existent authentication " +"information.\" error when uploading files?" msgstr "" "Почему при загрузке файлов я получаю ошибку «Invalid or non-existent " "authentication information.» («Недействительная или несуществующая " @@ -3840,12 +3849,12 @@ msgstr "" #: warehouse/templates/pages/help.html:74 msgid "" -"Why am I getting \"No matching distribution found\" or \"Could not fetch URL" -"\" errors during <code>pip install</code>?" +"Why am I getting \"No matching distribution found\" or \"Could not fetch " +"URL\" errors during <code>pip install</code>?" msgstr "" "Почему я получаю ошибки «No matching distribution found» («Не найдено " -"подходящих дистрибутивов») или «Could not fetch URL» («Невозможно извлечь по " -"адресу URL») во время выполнения <code>pip install</code>?" +"подходящих дистрибутивов») или «Could not fetch URL» («Невозможно извлечь" +" по адресу URL») во время выполнения <code>pip install</code>?" #: warehouse/templates/pages/help.html:75 msgid "I am having trouble using the PyPI website. Can you help me?" @@ -3854,10 +3863,8 @@ msgstr "" "помочь?" #: warehouse/templates/pages/help.html:76 -msgid "" -"Why can't I manually upload files to PyPI, through the browser interface?" -msgstr "" -"Почему я не могу вручную загрузить файлы в PyPI через интерфейс браузера?" +msgid "Why can't I manually upload files to PyPI, through the browser interface?" +msgstr "Почему я не могу вручную загрузить файлы в PyPI через интерфейс браузера?" #: warehouse/templates/pages/help.html:77 msgid "How can I publish my private packages to PyPI?" @@ -3865,23 +3872,22 @@ msgstr "Как я могу опубликовать свои личные пак #: warehouse/templates/pages/help.html:78 msgid "Why did my package or user registration get blocked?" -msgstr "" -"Почему мой пакет/проект или регистрация пользователя были заблокированы?" +msgstr "Почему мой пакет/проект или регистрация пользователя были заблокированы?" #: warehouse/templates/pages/help.html:79 msgid "How do I get a file size limit exemption or increase for my project?" msgstr "" -"Как мне получить исключение на увеличение ограничения размера файлов в моем " -"проекте?" +"Как мне получить исключение на увеличение ограничения размера файлов в " +"моем проекте?" #: warehouse/templates/pages/help.html:81 msgid "" -"Why am I getting a \"Filename or contents already exists\" or \"Filename has " -"been previously used\" error?" +"Why am I getting a \"Filename or contents already exists\" or \"Filename " +"has been previously used\" error?" msgstr "" -"Почему я получаю ошибку «Filename or contents already exists» («Имя файла " -"или содержимое уже существуют») или «Filename has been previously " -"used» («Имя файла использовалось ранее»)?" +"Почему я получаю ошибку «Filename or contents already exists» («Имя файла" +" или содержимое уже существуют») или «Filename has been previously used» " +"(«Имя файла использовалось ранее»)?" #: warehouse/templates/pages/help.html:82 msgid "Why isn't my desired project name available?" @@ -3890,7 +3896,8 @@ msgstr "Почему желаемое мной название проекта #: warehouse/templates/pages/help.html:83 msgid "How do I claim an abandoned or previously registered project name?" msgstr "" -"Как мне получить заброшенное или ранее зарегистрированное название проекта?" +"Как мне получить заброшенное или ранее зарегистрированное название " +"проекта?" #: warehouse/templates/pages/help.html:84 msgid "What collaborator roles are available for a project on PyPI?" @@ -3934,10 +3941,11 @@ msgstr "Как мне быть в курсе предстоящих измене #: warehouse/templates/pages/help.html:95 msgid "" -"What does the \"beta feature\" badge mean? What are Warehouse's current beta " -"features?" +"What does the \"beta feature\" badge mean? What are Warehouse's current " +"beta features?" msgstr "" -"Что означает пометка «бета-функция»? Каковы текущие бета-функции Warehouse?" +"Что означает пометка «бета-функция»? Каковы текущие бета-функции " +"Warehouse?" #: warehouse/templates/pages/help.html:96 msgid "How do I pronounce \"PyPI\"?" @@ -3981,82 +3989,88 @@ msgstr "О PyPI" msgid "" "\n" " <p>We use a number of terms to describe software available on " -"PyPI, like \"project\", \"release\", \"file\", and \"package\". Sometimes " -"those terms are confusing because they're used to describe different things " -"in other contexts. Here's how we use them on PyPI:</p>\n" -" <p>A \"project\" on PyPI is the name of a collection of releases " -"and files, and information about them. Projects on PyPI are made and shared " -"by other members of the Python community so that you can use them.</p>\n" -" <p>A \"release\" on PyPI is a specific version of a project. For " -"example, the <a href=\"%(requests_href)s\">requests</a> project has many " -"releases, like \"requests 2.10\" and \"requests 1.2.1\". A release consists " -"of one or more \"files\".</p>\n" -" <p>A \"file\", also known as a \"package\", on PyPI is something " -"that you can download and install. Because of different hardware, operating " -"systems, and file formats, a release may have several files (packages), like " -"an archive containing source code or a binary <a href=\"%(wheel_href)s" -"\">wheel</a>.</p>\n" +"PyPI, like \"project\", \"release\", \"file\", and \"package\". Sometimes" +" those terms are confusing because they're used to describe different " +"things in other contexts. Here's how we use them on PyPI:</p>\n" +" <p>A \"project\" on PyPI is the name of a collection of " +"releases and files, and information about them. Projects on PyPI are made" +" and shared by other members of the Python community so that you can use " +"them.</p>\n" +" <p>A \"release\" on PyPI is a specific version of a project. " +"For example, the <a href=\"%(requests_href)s\">requests</a> project has " +"many releases, like \"requests 2.10\" and \"requests 1.2.1\". A release " +"consists of one or more \"files\".</p>\n" +" <p>A \"file\", also known as a \"package\", on PyPI is " +"something that you can download and install. Because of different " +"hardware, operating systems, and file formats, a release may have several" +" files (packages), like an archive containing source code or a binary <a " +"href=\"%(wheel_href)s\">wheel</a>.</p>\n" " " msgstr "" "\n" -" <p>Для описания программного обеспечения, доступного через PyPI, " -"мы используем ряд таких терминов как «проект», «выпуск», «файл» и «пакет». " -"Иногда эти термины могут вас запутать, потому что они используются в других " -"контекстах для описания других вещей. Вот как мы используем их в PyPI:</p>\n" -" <p>«Проект» в PyPI — это название коллекции выпусков и файлов, а " -"также информация о них. Проекты на PyPI создаются и распространяются другими " -"членами Python’ьего сообщества, так что вы можете их использовать.</p>\n" -" <p>«Выпуск» в PyPI — это конкретная версия проекта. Например, у " -"проекта <a href=\"%(requests_href)s\">requests</a> есть множество выпусков, " -"таких как «requests 2.10» и «requests 1.2.1». Выпуск состоит из одного или " -"нескольких «файлов».</p>\n" -" <p>«Файл», также известный как «пакет», в PyPI — это то, что вы " -"можете скачать и установить. По причинам наличия разного аппаратного " -"обеспечения, операционных систем и форматов файлов выпуск может содержать " -"несколько файлов (пакетов), например, архив с исходным кодом или двоичный " -"файл «колёс» — <a href=\"%(wheel_href)s\">wheel</a>.</p>\n" +" <p>Для описания программного обеспечения, доступного через " +"PyPI, мы используем ряд таких терминов как «проект», «выпуск», «файл» и " +"«пакет». Иногда эти термины могут вас запутать, потому что они " +"используются в других контекстах для описания других вещей. Вот как мы " +"используем их в PyPI:</p>\n" +" <p>«Проект» в PyPI — это название коллекции выпусков и файлов, " +"а также информация о них. Проекты на PyPI создаются и распространяются " +"другими членами Python’ьего сообщества, так что вы можете их " +"использовать.</p>\n" +" <p>«Выпуск» в PyPI — это конкретная версия проекта. Например, у" +" проекта <a href=\"%(requests_href)s\">requests</a> есть множество " +"выпусков, таких как «requests 2.10» и «requests 1.2.1». Выпуск состоит из" +" одного или нескольких «файлов».</p>\n" +" <p>«Файл», также известный как «пакет», в PyPI — это то, что вы" +" можете скачать и установить. По причинам наличия разного аппаратного " +"обеспечения, операционных систем и форматов файлов выпуск может содержать" +" несколько файлов (пакетов), например, архив с исходным кодом или " +"двоичный файл «колёс» — <a href=\"%(wheel_href)s\">wheel</a>.</p>\n" " " #: warehouse/templates/pages/help.html:194 #, python-format msgid "" -"To learn how to install a file from PyPI, visit the <a href=" -"\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">installation tutorial</a> on the <a href=\"%(user_guide_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " -"User Guide</a>." +"To learn how to install a file from PyPI, visit the <a " +"href=\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">installation tutorial</a> on the <a " +"href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" -"Чтобы узнать, как установить файл из PyPI, прочитайте <a href=" -"\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">учебник по установке</a> в <a href=\"%(user_guide_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Руководстве " -"пользователя по созданию Python’ьих пакетов</a>." +"Чтобы узнать, как установить файл из PyPI, прочитайте <a " +"href=\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">учебник по установке</a> в <a " +"href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Руководстве пользователя по созданию Python’ьих " +"пакетов</a>." #: warehouse/templates/pages/help.html:201 #, python-format msgid "" -"For full instructions on configuring, packaging and distributing your Python " -"project, refer to the <a href=\"%(packaging_tutorial_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">packaging tutorial</a> on " -"the <a href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Python Packaging User Guide</a>." +"For full instructions on configuring, packaging and distributing your " +"Python project, refer to the <a href=\"%(packaging_tutorial_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">packaging " +"tutorial</a> on the <a href=\"%(user_guide_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" "Полные инструкции по настройке, упаковке и распространению вашего " -"Python’ьего проекта смотрите в <a href=\"%(packaging_tutorial_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">учебнике по пакетированию</" -"a> <a href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Руководства пользователя по созданию Python’ьих пакетов</a>." +"Python’ьего проекта смотрите в <a href=\"%(packaging_tutorial_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">учебнике по " +"пакетированию</a> <a href=\"%(user_guide_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Руководства пользователя по созданию " +"Python’ьих пакетов</a>." #: warehouse/templates/pages/help.html:208 #, python-format msgid "" -"Classifiers are used to categorize projects on PyPI. See <a href=\"%(href)s" -"\">the classifiers page</a> for more information, as well as a list of valid " -"classifiers." +"Classifiers are used to categorize projects on PyPI. See <a " +"href=\"%(href)s\">the classifiers page</a> for more information, as well " +"as a list of valid classifiers." msgstr "" "Классификаторы используются для категоризации проектов на PyPI. Для " "получения дополнительной информации, а также списка допустимых " -"классификаторов, смотрите <a href=\"%(href)s\">страницу классификаторов</a>." +"классификаторов, смотрите <a href=\"%(href)s\">страницу " +"классификаторов</a>." #: warehouse/templates/pages/help.html:215 msgid "My account" @@ -4064,11 +4078,11 @@ msgstr "Моя учётная запись" #: warehouse/templates/pages/help.html:218 msgid "" -"Currently, PyPI requires a verified email address to perform the following " -"operations:" +"Currently, PyPI requires a verified email address to perform the " +"following operations:" msgstr "" -"В настоящее время PyPI требует подтверждённый адрес электронной почты для " -"выполнения следующих операций:" +"В настоящее время PyPI требует подтверждённый адрес электронной почты для" +" выполнения следующих операций:" #: warehouse/templates/pages/help.html:220 msgid "Register a new project." @@ -4080,138 +4094,144 @@ msgstr "Загрузка новой версии или файла." #: warehouse/templates/pages/help.html:223 msgid "" -"The list of activities that require a verified email address is likely to " -"grow over time." +"The list of activities that require a verified email address is likely to" +" grow over time." msgstr "" -"Список действий, требующих подтверждения адреса электронной почты, вероятно, " -"будет расти с течением времени." +"Список действий, требующих подтверждения адреса электронной почты, " +"вероятно, будет расти с течением времени." #: warehouse/templates/pages/help.html:224 #, python-format msgid "" -"This policy will allow us to enforce a key policy of <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python " -"enhancement proposal\">PEP</abbr> 541</a> regarding maintainer reachability. " -"It also reduces the viability of spam attacks to create many accounts in an " -"automated fashion." +"This policy will allow us to enforce a key policy of <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 541</a> regarding " +"maintainer reachability. It also reduces the viability of spam attacks to" +" create many accounts in an automated fashion." msgstr "" -"Эта политика позволит нам применить основополагающую политику из <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " -"title=\"Python enhancement proposal – Предложение по улучшению Python’а" -"\">PEP</abbr> 541</a> в отношении достижимости сопровождающего. Также она " -"снижает жизнеспособность спам-атак, автоматически создающих множество " -"учётных записей." +"Эта политика позволит нам применить основополагающую политику из <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><abbr title=\"Python enhancement proposal – Предложение " +"по улучшению Python’а\">PEP</abbr> 541</a> в отношении достижимости " +"сопровождающего. Также она снижает жизнеспособность спам-атак, " +"автоматически создающих множество учётных записей." #: warehouse/templates/pages/help.html:225 #, python-format msgid "" -"You can manage your account's email addresses in your <a href=\"%(href)s" -"\">account settings</a>. This also allows for sending a new confirmation " -"email for users who signed up in the past, before we began enforcing this " -"policy." +"You can manage your account's email addresses in your <a " +"href=\"%(href)s\">account settings</a>. This also allows for sending a " +"new confirmation email for users who signed up in the past, before we " +"began enforcing this policy." msgstr "" "Вы можете управлять адресами электронной почты своей учётной записи в <a " "href=\"%(href)s\">настройках учётной записи</a>. Также эта политика " "позволяет нам отправлять новое электронное письмо с подтверждением " -"пользователям, которые зарегистрировались до того, как мы начали применять " -"эту политику." +"пользователям, которые зарегистрировались до того, как мы начали " +"применять эту политику." #: warehouse/templates/pages/help.html:228 #, python-format msgid "" -"<p> PyPI itself has not suffered a breach. This is a protective measure to " -"reduce the risk of <a href=\"%(credential_stuffing_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">credential stuffing</a> attacks " -"against PyPI and its users. </p> <p> Each time a user supplies a password — " -"while registering, authenticating, or updating their password — PyPI " -"securely checks whether that password has appeared in public data breaches. " -"</p> <p> During each of these processes, PyPI generates a SHA-1 hash of the " -"supplied password and uses the first five (5) characters of the hash to " -"check the <a href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Have I Been Pwned API</a> and determine if the " -"password has been previously compromised. The plaintext password is never " -"stored by PyPI or submitted to the Have I Been Pwned API. </p> <p> PyPI will " -"not allow such passwords to be used when setting a password at registration " -"or updating your password. </p> <p> If you receive an error message saying " -"that \"This password appears in a breach or has been compromised and cannot " -"be used\", you should change it all other places that you use it as soon as " -"possible. </p> <p> If you have received this error while attempting to log " -"in or upload to PyPI, then your password has been reset and you cannot log " -"in to PyPI until you <a href=\"%(reset_pwd_href)s\">reset your password</a>. " -"</p>" -msgstr "" -"<p>Сам PyPI не пострадал от бреши. Это защитная мера для снижения риска атак " -"<a href=\"%(credential_stuffing_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">подстановки учётных данных</a> против PyPI и его " -"пользователей.</p> <p>Каждый раз, когда пользователь вводит пароль – при " -"регистрации, аутентификации или обновлении пароля – PyPI безопасно " -"проверяет, не появился ли этот пароль в публичных данных о взломах.</p> " -"<p>Во время каждого из этих процессов PyPI генерирует от предоставляемого " -"пароля хэш SHA-1 и использует первые пять (5) символов хэша для его проверки " -"через <a href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">API сервиса Have I Been Pwned</a> и определения того, " -"был ли этот пароль ранее скомпрометирован. Пароль в открытом виде в PyPI " -"никогда не сохраняется и не передаётся в API Have I Been Pwned.</p> <p>PyPI " -"не позволяет использовать такие пароли при регистрации или обновлении пароля." -"</p> <p>Если вы получили сообщение об ошибке, говорящее, что «Этот пароль " -"„утёк“ через брешь в безопасности или же он был скомпрометирован и больше не " -"может быть использован», вам следует как можно скорее сменить его во всех " -"других местах, где вы его используете.</p> <p>Если вы получили эту ошибку " -"при попытке входа в учётную запись PyPI или при загрузке файлов на PyPI, то " -"ваш пароль был сброшен, и вы не сможете войти в PyPI до тех пор, пока не <a " -"href=\"%(reset_pwd_href)s\">сбросите свой пароль</a>.</p>" +"<p> PyPI itself has not suffered a breach. This is a protective measure " +"to reduce the risk of <a href=\"%(credential_stuffing_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">credential " +"stuffing</a> attacks against PyPI and its users. </p> <p> Each time a " +"user supplies a password — while registering, authenticating, or updating" +" their password — PyPI securely checks whether that password has appeared" +" in public data breaches. </p> <p> During each of these processes, PyPI " +"generates a SHA-1 hash of the supplied password and uses the first five " +"(5) characters of the hash to check the <a " +"href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Have I Been Pwned API</a> and determine if the password " +"has been previously compromised. The plaintext password is never stored " +"by PyPI or submitted to the Have I Been Pwned API. </p> <p> PyPI will not" +" allow such passwords to be used when setting a password at registration " +"or updating your password. </p> <p> If you receive an error message " +"saying that \"This password appears in a breach or has been compromised " +"and cannot be used\", you should change it all other places that you use " +"it as soon as possible. </p> <p> If you have received this error while " +"attempting to log in or upload to PyPI, then your password has been reset" +" and you cannot log in to PyPI until you <a " +"href=\"%(reset_pwd_href)s\">reset your password</a>. </p>" +msgstr "" +"<p>Сам PyPI не пострадал от бреши. Это защитная мера для снижения риска " +"атак <a href=\"%(credential_stuffing_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">подстановки учётных данных</a> против " +"PyPI и его пользователей.</p> <p>Каждый раз, когда пользователь вводит " +"пароль – при регистрации, аутентификации или обновлении пароля – PyPI " +"безопасно проверяет, не появился ли этот пароль в публичных данных о " +"взломах.</p> <p>Во время каждого из этих процессов PyPI генерирует от " +"предоставляемого пароля хэш SHA-1 и использует первые пять (5) символов " +"хэша для его проверки через <a href=\"%(haveibeenpwned_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">API сервиса Have I" +" Been Pwned</a> и определения того, был ли этот пароль ранее " +"скомпрометирован. Пароль в открытом виде в PyPI никогда не сохраняется и " +"не передаётся в API Have I Been Pwned.</p> <p>PyPI не позволяет " +"использовать такие пароли при регистрации или обновлении пароля.</p> " +"<p>Если вы получили сообщение об ошибке, говорящее, что «Этот пароль " +"„утёк“ через брешь в безопасности или же он был скомпрометирован и больше" +" не может быть использован», вам следует как можно скорее сменить его во " +"всех других местах, где вы его используете.</p> <p>Если вы получили эту " +"ошибку при попытке входа в учётную запись PyPI или при загрузке файлов на" +" PyPI, то ваш пароль был сброшен, и вы не сможете войти в PyPI до тех " +"пор, пока не <a href=\"%(reset_pwd_href)s\">сбросите свой пароль</a>.</p>" #: warehouse/templates/pages/help.html:263 #, python-format msgid "" "<p> Two factor authentication (2FA) makes your account more secure by " "requiring two things in order to log in: <em>something you know</em> and " -"<em>something you own</em>. </p> <p> In PyPI's case, \"something you know\" " -"is your username and password, while \"something you own\" can be <a href=" -"\"#totp\">an application to generate a temporary code</a>, or a <a href=" -"\"#utfkey\">security device</a> (most commonly a USB key). </p> <p> It is " -"strongly recommended that you set up two factor authentication on your PyPI " -"account. </p> <p> Users who have chosen to set up two factor authentication " -"will be asked to provide their second method of identity verification during " -"the log in process. This only affects logging in via a web browser, and not " -"(yet) package uploads. </p> <p>You can follow the improvements to <abbr " -"title=\"two factor authentication\">2FA</abbr> on <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">discuss.python.org</a>.</p>" +"<em>something you own</em>. </p> <p> In PyPI's case, \"something you " +"know\" is your username and password, while \"something you own\" can be " +"<a href=\"#totp\">an application to generate a temporary code</a>, or a " +"<a href=\"#utfkey\">security device</a> (most commonly a USB key). </p> " +"<p> It is strongly recommended that you set up two factor authentication " +"on your PyPI account. </p> <p> Users who have chosen to set up two factor" +" authentication will be asked to provide their second method of identity " +"verification during the log in process. This only affects logging in via " +"a web browser, and not (yet) package uploads. </p> <p>You can follow the " +"improvements to <abbr title=\"two factor authentication\">2FA</abbr> on " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">discuss.python.org</a>.</p>" msgstr "" "<p>Двухфакторная аутентификация (two factor authentication – 2FA) делает " -"вашу учётную запись более безопасной, требуя двух вещей для входа в систему: " -"<em>что-то, что вам известно</em> и <em>что-то, что вам принадлежит</em>.</" -"p> <p>В случае с PyPI «что-то, что вам известно» – это ваше имя пользователя " -"и пароль, в то время как «что-то, что вам принадлежит» может быть <a href=" -"\"#totp\">приложением для генерации временного кода</a> или <a href=\"#utfkey" -"\">устройством безопасности</a> (чаще всего это USB-ключ).</p> <p>Вам " -"настоятельно рекомендуется установить двухфакторную аутентификацию для вашей " -"учётной записи PyPI.</p> <p>Пользователям, выбравшим настройку двухфакторной " -"аутентификации, будет предложено указать второй способ проверки подлинности " -"во время входа в систему. Он применяется только при входе в PyPI через веб-" -"браузер, а не (пока что) при загрузке пакетов.</p> <p>Следить за улучшениями " -"в <abbr title=\"двухфакторная аутентификация\">2FA</abbr> вы можете на <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">discuss.python.org</a>.</p>" +"вашу учётную запись более безопасной, требуя двух вещей для входа в " +"систему: <em>что-то, что вам известно</em> и <em>что-то, что вам " +"принадлежит</em>.</p> <p>В случае с PyPI «что-то, что вам известно» – это" +" ваше имя пользователя и пароль, в то время как «что-то, что вам " +"принадлежит» может быть <a href=\"#totp\">приложением для генерации " +"временного кода</a> или <a href=\"#utfkey\">устройством безопасности</a> " +"(чаще всего это USB-ключ).</p> <p>Вам настоятельно рекомендуется " +"установить двухфакторную аутентификацию для вашей учётной записи " +"PyPI.</p> <p>Пользователям, выбравшим настройку двухфакторной " +"аутентификации, будет предложено указать второй способ проверки " +"подлинности во время входа в систему. Он применяется только при входе в " +"PyPI через веб-браузер, а не (пока что) при загрузке пакетов.</p> " +"<p>Следить за улучшениями в <abbr title=\"двухфакторная " +"аутентификация\">2FA</abbr> вы можете на <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">discuss.python.org</a>.</p>" #: warehouse/templates/pages/help.html:290 #, python-format msgid "" "PyPI users can set up two-factor authentication using any authentication " "application that supports the <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based one-time password" -"\">TOTP</abbr> standard</a>." +"target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based one-time " +"password\">TOTP</abbr> standard</a>." msgstr "" -"Пользователи PyPI могут настроить двухфакторную аутентификацию, используя " -"любое приложение, поддерживающее <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">стандарт <abbr title=\"time-based one-" -"time password – одноразовый пароль на основе времени\">TOTP</abbr></a>." +"Пользователи PyPI могут настроить двухфакторную аутентификацию, используя" +" любое приложение, поддерживающее <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">стандарт <abbr " +"title=\"time-based one-time password – одноразовый пароль на основе " +"времени\">TOTP</abbr></a>." #: warehouse/templates/pages/help.html:291 msgid "" "<abbr title=\"time-based one-time password\">TOTP</abbr> authentication " -"applications generate a regularly changing authentication code to use when " -"logging into your account." +"applications generate a regularly changing authentication code to use " +"when logging into your account." msgstr "" "Приложения аутентификации по стандарту <abbr title=\"time-based one-time " "password – одноразовый пароль на основе времени\">TOTP</abbr> генерируют " @@ -4220,25 +4240,27 @@ msgstr "" #: warehouse/templates/pages/help.html:292 msgid "" -"Because <abbr title=\"time-based one-time password\">TOTP</abbr> is an open " -"standard, there are many applications that are compatible with your PyPI " -"account. Popular applications include:" +"Because <abbr title=\"time-based one-time password\">TOTP</abbr> is an " +"open standard, there are many applications that are compatible with your " +"PyPI account. Popular applications include:" msgstr "" -"Поскольку <abbr title=\"time-based one-time password – одноразовый пароль на " -"основе времени\">TOTP</abbr> является открытым стандартом, существует " -"множество приложений, совместимых с вашей учётной записью PyPI. Среди " +"Поскольку <abbr title=\"time-based one-time password – одноразовый пароль" +" на основе времени\">TOTP</abbr> является открытым стандартом, существует" +" множество приложений, совместимых с вашей учётной записью PyPI. Среди " "популярных приложений можно назвать:" #: warehouse/templates/pages/help.html:295 #, python-format msgid "" -"Google Authenticator for <a href=\"%(android_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Google Authenticator for <a href=\"%(android_href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Android</a> or <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" msgstr "" -"Google Authenticator для <a href=\"%(android_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Android’а</a> или <a href=\"%(ios_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Google Authenticator для <a href=\"%(android_href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Android’а</a> или <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/help.html:298 #: warehouse/templates/pages/help.html:300 @@ -4250,13 +4272,15 @@ msgstr "(проприетарное)" #: warehouse/templates/pages/help.html:302 #, python-format msgid "" -"Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Android</a> or <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" msgstr "" -"Duo Mobile для <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Android’а</a> или <a href=\"%(ios_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Duo Mobile для <a href=\"%(android_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Android’а</a> или <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/help.html:308 #: warehouse/templates/pages/help.html:309 @@ -4266,15 +4290,16 @@ msgstr "(с открытым исходным кодом)" #: warehouse/templates/pages/help.html:313 #, python-format msgid "" -"Some password managers (e.g. <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">1Password</a>) can also generate authentication " -"codes. For security reasons, PyPI only allows you to set up one application " -"per account." +"Some password managers (e.g. <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">1Password</a>) can also generate " +"authentication codes. For security reasons, PyPI only allows you to set " +"up one application per account." msgstr "" -"Некоторые менеджеры паролей (например, <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">1Password</a>) также могут " -"генерировать коды аутентификации. Из соображений безопасности PyPI позволяет " -"для каждой учётной записи настроить только одно приложение." +"Некоторые менеджеры паролей (например, <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">1Password</a>) " +"также могут генерировать коды аутентификации. Из соображений безопасности" +" PyPI позволяет для каждой учётной записи настроить только одно " +"приложение." #: warehouse/templates/pages/help.html:321 msgid "" @@ -4286,42 +4311,43 @@ msgstr "" #: warehouse/templates/pages/help.html:323 msgid "" -"Open an authentication (<abbr title=\"time-based one-time password\">TOTP</" -"abbr>) application" +"Open an authentication (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>) application" msgstr "" "Откройте приложение аутентификации (<abbr title=\"time-based one-time " "password – одноразовый пароль на основе времени\">TOTP</abbr>)" #: warehouse/templates/pages/help.html:324 msgid "" -"Log in to your PyPI account, go to your account settings, and choose \"Add " -"<abbr title=\"two factor authentication\">2FA</abbr> with authentication " -"application\"" +"Log in to your PyPI account, go to your account settings, and choose " +"\"Add <abbr title=\"two factor authentication\">2FA</abbr> with " +"authentication application\"" msgstr "" "Войдите в свою учётную запись PyPI, зайдите в настройки учётной записи и " -"выберите пункт «Добавить <abbr title=\"двухфакторная аутентификация\">2FA</" -"abbr> с помощью приложения аутентификации»" +"выберите пункт «Добавить <abbr title=\"двухфакторная " +"аутентификация\">2FA</abbr> с помощью приложения аутентификации»" #: warehouse/templates/pages/help.html:325 msgid "" -"PyPI will generate a secret key, specific to your account. This is displayed " -"as a QR code, and as a text code." +"PyPI will generate a secret key, specific to your account. This is " +"displayed as a QR code, and as a text code." msgstr "" -"PyPI сгенерирует секретный ключ, специфичный для вашей учётной записи. Он " -"отобразится как в виде QR-кода, так и виде текстового кода." +"PyPI сгенерирует секретный ключ, специфичный для вашей учётной записи. Он" +" отобразится как в виде QR-кода, так и виде текстового кода." #: warehouse/templates/pages/help.html:326 msgid "" "Scan the QR code with your authentication application, or type it in " -"manually. The method of input will depend on the application you have chosen." +"manually. The method of input will depend on the application you have " +"chosen." msgstr "" -"Отсканируйте QR-код с помощью приложения для аутентификации или введите его " -"вручную. Способ ввода будет зависеть от выбранного приложения." +"Отсканируйте QR-код с помощью приложения для аутентификации или введите " +"его вручную. Способ ввода будет зависеть от выбранного приложения." #: warehouse/templates/pages/help.html:327 msgid "" -"Your application will generate an authentication code - use this to verify " -"your set up on PyPI" +"Your application will generate an authentication code - use this to " +"verify your set up on PyPI" msgstr "" "Ваше приложение сгенерирует код аутентификации – используйте его для " "проверки настроек на PyPI" @@ -4329,11 +4355,11 @@ msgstr "" #: warehouse/templates/pages/help.html:330 msgid "" "The PyPI server and your application now share your PyPI secret key, " -"allowing your application to generate valid authentication codes for your " -"PyPI account." +"allowing your application to generate valid authentication codes for your" +" PyPI account." msgstr "" -"Теперь сервер PyPI и ваше приложение совместно используют ваш секретный ключ " -"PyPI, позволяя вашему приложению генерировать действительные коды " +"Теперь сервер PyPI и ваше приложение совместно используют ваш секретный " +"ключ PyPI, позволяя вашему приложению генерировать действительные коды " "аутентификации для вашей учётной записи PyPI." #: warehouse/templates/pages/help.html:332 @@ -4348,8 +4374,7 @@ msgstr "Как обычно предоставить своё имя польз #: warehouse/templates/pages/help.html:335 msgid "Open your authentication application to generate an authentication code" -msgstr "" -"Откройте своё приложение аутентификации для генерации кода аутентификации" +msgstr "Откройте своё приложение аутентификации для генерации кода аутентификации" #: warehouse/templates/pages/help.html:336 msgid "Use this code to finish logging into PyPI" @@ -4357,34 +4382,34 @@ msgstr "Использовать этот код для завершения в #: warehouse/templates/pages/help.html:342 msgid "" -"A security device is a USB key or <a href=\"#utfdevices\">other device</a> " -"that generates a one-time password and sends that password to the browser. " -"This password is then used by PyPI to authenticate you as a user." +"A security device is a USB key or <a href=\"#utfdevices\">other " +"device</a> that generates a one-time password and sends that password to " +"the browser. This password is then used by PyPI to authenticate you as a " +"user." msgstr "" -"Устройство безопасности – это USB-ключ или <a href=\"#utfdevices\">другое " -"устройство</a>, которое генерирует одноразовый пароль и отправляет его в " -"браузер. Затем этот пароль используется PyPI для аутентификации вас как " +"Устройство безопасности – это USB-ключ или <a href=\"#utfdevices\">другое" +" устройство</a>, которое генерирует одноразовый пароль и отправляет его в" +" браузер. Затем этот пароль используется PyPI для аутентификации вас как " "пользователя." #: warehouse/templates/pages/help.html:344 -msgid "" -"To set up two factor authentication with a <em>USB key</em>, you'll need:" +msgid "To set up two factor authentication with a <em>USB key</em>, you'll need:" msgstr "" -"Для настройки двухфакторной аутентификации с помощью <em>USB-ключа</em> вам " -"понадобится:" +"Для настройки двухфакторной аутентификации с помощью <em>USB-ключа</em> " +"вам понадобится:" #: warehouse/templates/pages/help.html:346 #, python-format msgid "" -"To use a <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">browser that supports <abbr title=\"web authentication" -"\">WebAuthn</abbr> and PublicKeyCredential</a>, as this is the standard " -"implemented by PyPI." +"To use a <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">browser that supports <abbr title=\"web " +"authentication\">WebAuthn</abbr> and PublicKeyCredential</a>, as this is " +"the standard implemented by PyPI." msgstr "" -"Использовать <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">браузер, поддерживающий <abbr title=\"веб аутентификация" -"\">WebAuthn</abbr> и PublicKeyCredential</a>, так как именно этот стандарт " -"реализует PyPI." +"Использовать <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">браузер, поддерживающий <abbr title=\"веб " +"аутентификация\">WebAuthn</abbr> и PublicKeyCredential</a>, так как " +"именно этот стандарт реализует PyPI." #: warehouse/templates/pages/help.html:347 msgid "To be running JavaScript on your browser" @@ -4393,34 +4418,36 @@ msgstr "Работающий JavaScript в вашем браузере" #: warehouse/templates/pages/help.html:348 #, python-format msgid "" -"To use a USB key that adheres to the <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">FIDO U2F specification</a>:" +"To use a USB key that adheres to the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO U2F " +"specification</a>:" msgstr "" -"Использовать USB-ключ, который придерживается <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">спецификации FIDO U2F</a>:" +"Использовать USB-ключ, который придерживается <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">спецификации FIDO " +"U2F</a>:" #: warehouse/templates/pages/help.html:351 #, python-format msgid "" -"Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</a> and <a " -"href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Thetis</a>." +"Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> and <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." msgstr "" -"Популярные ключи включают в себя <a href=\"%(yubikey_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=" -"\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Google Titan</a> и <a href=\"%(thetis_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Thetis</a>." +"Популярные ключи включают в себя <a href=\"%(yubikey_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> и <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." #: warehouse/templates/pages/help.html:358 msgid "" "Note that some older Yubico USB keys <strong>do not follow the FIDO " "specification</strong>, and will therefore not work with PyPI" msgstr "" -"Обратите внимание, что некоторые старые USB-ключи Yubico <strong>не следуют " -"спецификации FIDO</strong>, и поэтому не будут работать с PyPI" +"Обратите внимание, что некоторые старые USB-ключи Yubico <strong>не " +"следуют спецификации FIDO</strong>, и поэтому не будут работать с PyPI" #: warehouse/templates/pages/help.html:363 msgid "Follow these steps:" @@ -4429,20 +4456,21 @@ msgstr "Выполните следующие действия:" #: warehouse/templates/pages/help.html:365 msgid "" "\n" -" <li>Log in to your PyPI account, go to your account settings, and " -"choose \"Add <abbr title=\"two factor authentication\">2FA</abbr> with " -"security device (e.g. USB key)\"</li>\n" -" <li>Give your key a name. This is necessary because it's possible " -"to add more than one security device to your account.</li>\n" +" <li>Log in to your PyPI account, go to your account settings, " +"and choose \"Add <abbr title=\"two factor authentication\">2FA</abbr> " +"with security device (e.g. USB key)\"</li>\n" +" <li>Give your key a name. This is necessary because it's " +"possible to add more than one security device to your account.</li>\n" " <li>Click on the \"Set up security device\" button</li>\n" -" <li>Insert and touch your USB key, as instructed by your browser</" -"li>\n" +" <li>Insert and touch your USB key, as instructed by your " +"browser</li>\n" " " msgstr "" "\n" " <li>Войдите в учётную запись PyPI, зайдите в настройки учётной " -"записи и выберите пункт «Добавить <abbr title=\"двухфакторная аутентификация" -"\">2FA</abbr> с устройством безопасности (например, USB-ключ)»</li>\n" +"записи и выберите пункт «Добавить <abbr title=\"двухфакторная " +"аутентификация\">2FA</abbr> с устройством безопасности (например, " +"USB-ключ)»</li>\n" " <li>Дайте вашему ключу имя. Это необходимо, потому что в вашу " "учётную запись можно добавить несколько устройств безопасности.</li>\n" " <li>Нажмите на кнопку «Настроить устройство безопасности»</li>\n" @@ -4452,86 +4480,87 @@ msgstr "" #: warehouse/templates/pages/help.html:372 msgid "" -"Once complete, your USB key will be registered to your PyPI account and can " -"be used during the log in process." +"Once complete, your USB key will be registered to your PyPI account and " +"can be used during the log in process." msgstr "" -"По завершению ваш USB-ключ будет зарегистрирован в вашей учётной записи PyPI " -"и сможет быть использован во время входа в систему." +"По завершению ваш USB-ключ будет зарегистрирован в вашей учётной записи " +"PyPI и сможет быть использован во время входа в систему." #: warehouse/templates/pages/help.html:376 msgid "" "\n" " <li>Provide your username and password, as normal</li>\n" -" <li>Insert and touch your USB key to finish logging into PyPI</" -"li>\n" +" <li>Insert and touch your USB key to finish logging into " +"PyPI</li>\n" " " msgstr "" "\n" -" <li>Как обычно предоставить своё имя пользователя и пароль</li>\n" -" <li>Вставить и коснуться своего USB-ключа, чтобы закончить вход в " -"PyPI</li>\n" +" <li>Как обычно предоставить своё имя пользователя и пароль</li>" +"\n" +" <li>Вставить и коснуться своего USB-ключа, чтобы закончить вход" +" в PyPI</li>\n" " " #: warehouse/templates/pages/help.html:387 #, python-format msgid "" "There is a growing ecosystem of <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">devices that are FIDO compliant</a>, and " -"can therefore be used with PyPI." +"target=\"_blank\" rel=\"noopener\">devices that are FIDO compliant</a>, " +"and can therefore be used with PyPI." msgstr "" "Существует растущая экосистема <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">совместимых с FIDO устройств</a>, так что " -"они могут использоваться и с PyPI." +"target=\"_blank\" rel=\"noopener\">совместимых с FIDO устройств</a>, так " +"что они могут использоваться и с PyPI." #: warehouse/templates/pages/help.html:392 #, python-format msgid "" -"Emerging solutions include biometric (facial and fingerprint) scanners and " -"FIDO compatible credit cards. There is also growing support for <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">mobile " -"phones to act as security devices</a>." +"Emerging solutions include biometric (facial and fingerprint) scanners " +"and FIDO compatible credit cards. There is also growing support for <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">mobile phones to act as security devices</a>." msgstr "" "Новые решения включают в себя биометрические (по распознаванию лица и по " "отпечаткам пальцев) сканеры и совместимые с FIDO кредитные карты. Также " -"растёт поддержка <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">мобильных телефонов, работающих как устройства " -"безопасности</a>." +"растёт поддержка <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">мобильных телефонов, работающих как " +"устройства безопасности</a>." #: warehouse/templates/pages/help.html:398 #, python-format msgid "" -"As PyPI's two factor implementation follows the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"web " -"authentication\">WebAuthn</abbr> standard</a>, PyPI users will be able to " -"take advantage of any future developments in this field." +"As PyPI's two factor implementation follows the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"web " +"authentication\">WebAuthn</abbr> standard</a>, PyPI users will be able to" +" take advantage of any future developments in this field." msgstr "" -"Поскольку двухфакторная реализация PyPI следует <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">стандарту <abbr title=\"веб " -"аутентификация\">WebAuthn</abbr></a>, пользователи PyPI смогут " -"воспользоваться любыми будущими разработками в этой области." +"Поскольку двухфакторная реализация PyPI следует <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">стандарту <abbr " +"title=\"веб аутентификация\">WebAuthn</abbr></a>, пользователи PyPI " +"смогут воспользоваться любыми будущими разработками в этой области." #: warehouse/templates/pages/help.html:407 msgid "" -"If you lose access to your <a href=\"#totp\">authentication application</a> " -"or <a href=\"#utfkey\">security device</a>, you can use these codes to sign " -"into PyPI." +"If you lose access to your <a href=\"#totp\">authentication " +"application</a> or <a href=\"#utfkey\">security device</a>, you can use " +"these codes to sign into PyPI." msgstr "" "Если вы потеряете доступ к своему <a href=\"#totp\">приложению " -"аутентификации</a> или к <a href=\"#utfkey\">устройству безопасности</a>, вы " -"сможете использовать эти коды для входа в PyPI." +"аутентификации</a> или к <a href=\"#utfkey\">устройству безопасности</a>," +" вы сможете использовать эти коды для входа в PyPI." #: warehouse/templates/pages/help.html:410 msgid "" -"Recovery codes are <strong>one time use</strong>. They are not a substitute " -"for a <a href=\"#totp\">authentication application</a> or <a href=\"#utfkey" -"\">security device</a> and should only be used for recovery. After using a " -"recovery code to sign in, it becomes inactive." +"Recovery codes are <strong>one time use</strong>. They are not a " +"substitute for a <a href=\"#totp\">authentication application</a> or <a " +"href=\"#utfkey\">security device</a> and should only be used for " +"recovery. After using a recovery code to sign in, it becomes inactive." msgstr "" "Коды восстановления <strong>используются однократно</strong>. Они не " -"являются заменой <a href=\"#totp\">приложения аутентификации</a> или <a href=" -"\"#utfkey\">устройства безопасности</a> и должны использоваться только для " -"восстановления доступа. После использования кода восстановления для входа в " -"PyPI он становится неактивным." +"являются заменой <a href=\"#totp\">приложения аутентификации</a> или <a " +"href=\"#utfkey\">устройства безопасности</a> и должны использоваться " +"только для восстановления доступа. После использования кода " +"восстановления для входа в PyPI он становится неактивным." #: warehouse/templates/pages/help.html:416 msgid "To provision recovery codes:" @@ -4547,22 +4576,22 @@ msgstr "" #: warehouse/templates/pages/help.html:419 msgid "" -"Securely store the displayed recovery codes! Consider printing them out and " -"storing them in a safe location or saving them in a password manager." +"Securely store the displayed recovery codes! Consider printing them out " +"and storing them in a safe location or saving them in a password manager." msgstr "" -"Сохраните отображаемые коды восстановления в какое-нибудь надёжное место! " -"Рассмотрите возможность их распечатки и размещения в безопасном месте или " -"сохранения в менеджере паролей." +"Сохраните отображаемые коды восстановления в какое-нибудь надёжное место!" +" Рассмотрите возможность их распечатки и размещения в безопасном месте " +"или сохранения в менеджере паролей." #: warehouse/templates/pages/help.html:422 msgid "" -"If you lose access to your stored recovery codes or use all of them, you can " -"get new ones by selecting \"Regenerate recovery codes\" in your account " -"settings." +"If you lose access to your stored recovery codes or use all of them, you " +"can get new ones by selecting \"Regenerate recovery codes\" in your " +"account settings." msgstr "" -"Если вы потеряете доступ к сохранённым кодам восстановления или используете " -"их все, вы можете получить новые, нажав на кнопку «Повторно сгенерировать " -"коды восстановления» в настройках вашей учётной записи." +"Если вы потеряете доступ к сохранённым кодам восстановления или " +"используете их все, вы можете получить новые, нажав на кнопку «Повторно " +"сгенерировать коды восстановления» в настройках вашей учётной записи." #: warehouse/templates/pages/help.html:424 msgid "To sign in with a recovery code:" @@ -4570,35 +4599,36 @@ msgstr "Для входа с помощью кода восстановлени #: warehouse/templates/pages/help.html:427 msgid "" -"When prompted for Two-Factor Authentication, select \"Login using a Recovery " -"Code\"" +"When prompted for Two-Factor Authentication, select \"Login using a " +"Recovery Code\"" msgstr "" "Когда появится запрос на двухфакторную аутентификацию, нажмите на кнопку " "«Войти с помощью кода восстановления»" #: warehouse/templates/pages/help.html:428 msgid "" -"As each code can be used only once, you might want to mark the code as used" +"As each code can be used only once, you might want to mark the code as " +"used" msgstr "" "Так как каждый код может быть использован только один раз, вы можете " "захотеть пометить код как уже использованный" #: warehouse/templates/pages/help.html:429 msgid "" -"If you have few recovery codes remaining, you may also want to generate a " -"new set using the \"Regenerate recovery codes\" button in your account " +"If you have few recovery codes remaining, you may also want to generate a" +" new set using the \"Regenerate recovery codes\" button in your account " "settings." msgstr "" "Если у вас ещё осталось несколько кодов восстановления, вы также можете " -"сгенерировать новый их набор с помощью кнопки «Повторно сгенерировать коды " -"восстановления» в настройках вашей учётной записи." +"сгенерировать новый их набор с помощью кнопки «Повторно сгенерировать " +"коды восстановления» в настройках вашей учётной записи." #: warehouse/templates/pages/help.html:434 msgid "" "\n" -" <p>API tokens provide an alternative way (instead of username and " -"password) to authenticate when <strong>uploading packages</strong> to PyPI.</" -"p>\n" +" <p>API tokens provide an alternative way (instead of username " +"and password) to authenticate when <strong>uploading packages</strong> to" +" PyPI.</p>\n" " <p>You can create a token for an entire PyPI account, in which " "case, the token will work for all projects associated with that account. " "Alternatively, you can limit a token's scope to a specific project.</p>\n" @@ -4608,11 +4638,11 @@ msgid "" " " msgstr "" "\n" -" <p>API-токены предоставляют альтернативный способ аутентификации " -"(вместо использования имени пользователя и пароля) при <strong>загрузке " -"пакетов</strong> на PyPI.</p>\n" -" <p>Вы можете создать токен для всей учётной записи PyPI, в этом " -"случае токен будет работать для всех проектов, связанных с этой учётной " +" <p>API-токены предоставляют альтернативный способ " +"аутентификации (вместо использования имени пользователя и пароля) при " +"<strong>загрузке пакетов</strong> на PyPI.</p>\n" +" <p>Вы можете создать токен для всей учётной записи PyPI, в этом" +" случае токен будет работать для всех проектов, связанных с этой учётной " "записью. В качестве альтернативы вы можете ограничить область действия " "токена определённым проектом.</p>\n" " <p><strong>Мы настоятельно рекомендуем вам по возможности " @@ -4652,37 +4682,42 @@ msgstr "Установите своё имя пользователя в зна #: warehouse/templates/pages/help.html:452 msgid "" -"Set your password to the token value, including the <code>pypi-</code> prefix" +"Set your password to the token value, including the <code>pypi-</code> " +"prefix" msgstr "" -"Установите свой пароль в значение токена, добавив к нему префикс <code>pypi-" -"</code>" +"Установите свой пароль в значение токена, добавив к нему префикс " +"<code>pypi-</code>" #: warehouse/templates/pages/help.html:456 #, python-format msgid "" -"Where you edit or add these values will depend on your individual use case. " -"For example, some users may need to edit <a href=\"%(pypirc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">their <code>.pypirc</code> " -"file</a>, while others may need to update their CI configuration file (e.g. " -"<a href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\"><code>.travis.yml</code> if you are using Travis</a>)." +"Where you edit or add these values will depend on your individual use " +"case. For example, some users may need to edit <a " +"href=\"%(pypirc_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">their <code>.pypirc</code> file</a>, while others may " +"need to update their CI configuration file (e.g. <a " +"href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>.travis.yml</code> if you are using Travis</a>)." msgstr "" "То, где вам нужно будет отредактировать или куда добавить эти значения, " -"зависит от вашей индивидуальной ситуации. Например, некоторым пользователям " -"может понадобиться отредактировать <a href=\"%(pypirc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">их файл <code>.pypirc</" -"code></a>, в то время как другим может понадобиться обновить " -"конфигурационный файл их системы непрерывной интеграции (например, <a href=" -"\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><code>.travis.yml</code>, если вы используете Travis</a>)." +"зависит от вашей индивидуальной ситуации. Например, некоторым " +"пользователям может понадобиться отредактировать <a " +"href=\"%(pypirc_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">их файл <code>.pypirc</code></a>, в то время как другим " +"может понадобиться обновить конфигурационный файл их системы непрерывной " +"интеграции (например, <a href=\"%(travis_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\"><code>.travis.yml</code>, если вы " +"используете Travis</a>)." #: warehouse/templates/pages/help.html:460 msgid "" -"Advanced users may wish to inspect their token by decoding it with base64, " -"and checking the output against the unique identifier displayed on PyPI." +"Advanced users may wish to inspect their token by decoding it with " +"base64, and checking the output against the unique identifier displayed " +"on PyPI." msgstr "" -"Опытные пользователи могут захотеть проверить свой токен, декодировав его из " -"base64 и сверив вывод с уникальным идентификатором, отображаемым на PyPI." +"Опытные пользователи могут захотеть проверить свой токен, декодировав его" +" из base64 и сверив вывод с уникальным идентификатором, отображаемым на " +"PyPI." #: warehouse/templates/pages/help.html:468 msgid "Yes, including RSS feeds of new packages and new releases." @@ -4695,9 +4730,10 @@ msgstr "Смотрите справочник по API." #: warehouse/templates/pages/help.html:471 #, python-format msgid "" -"If you need to run your own mirror of PyPI, the <a href=\"%(href)s" -"\">bandersnatch project</a> is the recommended solution. Note that the " -"storage requirements for a PyPI mirror would exceed 1 terabyte—and growing!" +"If you need to run your own mirror of PyPI, the <a " +"href=\"%(href)s\">bandersnatch project</a> is the recommended solution. " +"Note that the storage requirements for a PyPI mirror would exceed 1 " +"terabyte—and growing!" msgstr "" "Если вам необходимо запустить собственное зеркало PyPI, то рекомендуемым " "решением является <a href=\"%(href)s\">проект bandersnatch</a>. Обратите " @@ -4707,81 +4743,84 @@ msgstr "" #: warehouse/templates/pages/help.html:474 #, python-format msgid "" -"PyPI itself does not offer a way to get notified when a project uploads new " -"releases. However, there are several third-party services that offer " +"PyPI itself does not offer a way to get notified when a project uploads " +"new releases. However, there are several third-party services that offer " "comprehensive monitoring and notifications for project releases and " -"vulnerabilities listed as <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">GitHub apps</a>." +"vulnerabilities listed as <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">GitHub apps</a>." msgstr "" -"Сам по себе PyPI не предлагает никакого способа получения уведомлений при " -"загрузке в проект новых выпусков. Тем не менее, существует несколько " +"Сам по себе PyPI не предлагает никакого способа получения уведомлений при" +" загрузке в проект новых выпусков. Тем не менее, существует несколько " "сторонних сервисов, которые предлагают исчерпывающий мониторинг и " -"уведомления о выпусках проектов и об их уязвимостях, которые перечислены на " -"странице <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">приложений GitHub’а</a>." +"уведомления о выпусках проектов и об их уязвимостях, которые перечислены " +"на странице <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">приложений GitHub’а</a>." #: warehouse/templates/pages/help.html:477 #, python-format msgid "" -"You can <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">analyze PyPI download usage statistics via our public dataset " -"on Google BigQuery</a>." +"You can <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">analyze PyPI download usage statistics via our public " +"dataset on Google BigQuery</a>." msgstr "" -"Вы можете <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">проанализировать статистику загрузок с PyPI через наш " +"Вы можете <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">проанализировать статистику загрузок с PyPI через наш " "общедоступный набор данных на Google BigQuery</a>." #: warehouse/templates/pages/help.html:479 #, python-format msgid "" -"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.io provides statistics for PyPI projects</a> (<a href=" -"\"%(libs_io_example_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">example</a>, <a href=\"%(libs_io_api_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">API</a>) including GitHub stars and " -"forks, dependency tracking (<a href=\"%(in_progress_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">in progress</a>), and <a " -"href=\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">other relevant factors</a>." -msgstr "" -"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.io предоставляет статистику для проектов PyPI</a> (<a " -"href=\"%(libs_io_example_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">пример</a>, <a href=\"%(libs_io_api_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">API</a>), включая количество звёзд и " -"форков на GitHub’е, отслеживание зависимостей (<a href=\"%(in_progress_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">в процессе</a>) и " -"<a href=\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">другие релевантные факторы</a>." +"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io provides statistics for PyPI projects</a> " +"(<a href=\"%(libs_io_example_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">example</a>, <a " +"href=\"%(libs_io_api_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">API</a>) including GitHub stars and forks, dependency " +"tracking (<a href=\"%(in_progress_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">in progress</a>), and <a " +"href=\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">other relevant factors</a>." +msgstr "" +"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io предоставляет статистику для проектов " +"PyPI</a> (<a href=\"%(libs_io_example_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">пример</a>, <a " +"href=\"%(libs_io_api_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">API</a>), включая количество звёзд и форков на GitHub’е," +" отслеживание зависимостей (<a href=\"%(in_progress_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">в процессе</a>) и " +"<a href=\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">другие релевантные факторы</a>." #: warehouse/templates/pages/help.html:488 #, python-format msgid "" -"For recent statistics on uptime and performance, see <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status page</a>." +"For recent statistics on uptime and performance, see <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status " +"page</a>." msgstr "" -"Последнюю статистику по времени доступности и производительности смотрите <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">на " -"нашей странице статуса</a>." +"Последнюю статистику по времени доступности и производительности смотрите" +" <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">на нашей странице статуса</a>." #: warehouse/templates/pages/help.html:495 #, python-format msgid "" -"PyPI does not support publishing private packages. If you need to publish " -"your private package to a package index, the recommended solution is to run " -"your own deployment of the <a href=\"%(href)s\">devpi project</a>." +"PyPI does not support publishing private packages. If you need to publish" +" your private package to a package index, the recommended solution is to " +"run your own deployment of the <a href=\"%(href)s\">devpi project</a>." msgstr "" -"PyPI не поддерживает публикацию частных пакетов. Если вам нужно опубликовать " -"свой частный пакет в указателе пакетов, рекомендуемое решение – запустить " -"собственную инфраструктуру развёртывания на основе <a href=\"%(href)s" -"\">проекта devpi</a>." +"PyPI не поддерживает публикацию частных пакетов. Если вам нужно " +"опубликовать свой частный пакет в указателе пакетов, рекомендуемое " +"решение – запустить собственную инфраструктуру развёртывания на основе <a" +" href=\"%(href)s\">проекта devpi</a>." #: warehouse/templates/pages/help.html:498 msgid "" "Your publishing tool may return an error that your new project can't be " -"created with your desired name, despite no evidence of a project or release " -"of the same name on PyPI. Currently, there are three primary reasons this " -"may occur:" +"created with your desired name, despite no evidence of a project or " +"release of the same name on PyPI. Currently, there are three primary " +"reasons this may occur:" msgstr "" "Ваш инструмент публикации может вернуть ошибку, что ваш новый проект не " "может быть создан с желаемым вами именем, несмотря на отсутствие " @@ -4791,32 +4830,32 @@ msgstr "" #: warehouse/templates/pages/help.html:500 #, python-format msgid "" -"The project name conflicts with a <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Standard Library</a> module from " -"any major version from 2.5 to present." +"The project name conflicts with a <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Standard " +"Library</a> module from any major version from 2.5 to present." msgstr "" -"Название проекта конфликтует с именем модуля из <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">стандартной библиотеки " -"Python’а</a> любой основной версии Python’а, начиная с версии 2.5 и по " -"настоящее время." +"Название проекта конфликтует с именем модуля из <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">стандартной " +"библиотеки Python’а</a> любой основной версии Python’а, начиная с версии " +"2.5 и по настоящее время." #: warehouse/templates/pages/help.html:501 #, python-format msgid "" -"The project name has been explicitly prohibited by the PyPI administrators. " -"For example, <code>%(incorrect_code)s</code> is a common typo for <code>" -"%(correct_code)s</code>, and should not surprise the user with a malicious " -"package." +"The project name has been explicitly prohibited by the PyPI " +"administrators. For example, <code>%(incorrect_code)s</code> is a common " +"typo for <code>%(correct_code)s</code>, and should not surprise the user " +"with a malicious package." msgstr "" "Название проекта было явно запрещено администраторами PyPI. Например, " -"команда <code>%(incorrect_code)s</code> является распространённой опечаткой " -"команды <code>%(correct_code)s</code>, и она не должна приводить " -"пользователя в удивление скачиванием вредоносного пакета." +"команда <code>%(incorrect_code)s</code> является распространённой " +"опечаткой команды <code>%(correct_code)s</code>, и она не должна " +"приводить пользователя в удивление скачиванием вредоносного пакета." #: warehouse/templates/pages/help.html:502 msgid "" -"The project name has been registered by another user, but no releases have " -"been created." +"The project name has been registered by another user, but no releases " +"have been created." msgstr "" "Название проекта было зарегистрировано другим пользователем, но никаких " "выпусков создано не было." @@ -4824,14 +4863,14 @@ msgstr "" #: warehouse/templates/pages/help.html:506 #, python-format msgid "" -"Follow the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">\"How to request a name transfer\"</a> section of <abbr title=" -"\"Python enhancement proposal\">PEP</abbr> 541." +"Follow the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">\"How to request a name transfer\"</a> section of <abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 541." msgstr "" -"Следуйте указаниям раздела <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">„How to request a name transfer“ («Как запросить " -"передачу имени»)</a> из <abbr title=\"Python enhancement proposal – " -"Предложение по улучшению Python’а\">PEP</abbr> 541." +"Следуйте указаниям раздела <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">„How to request a name transfer“ («Как" +" запросить передачу имени»)</a> из <abbr title=\"Python enhancement " +"proposal – Предложение по улучшению Python’а\">PEP</abbr> 541." #: warehouse/templates/pages/help.html:511 msgid "Owner:" @@ -4839,84 +4878,88 @@ msgstr "Владелец:" #: warehouse/templates/pages/help.html:514 msgid "" -"Only the current owners of a project have the ability to add new owners or " -"maintainers. If you need to request ownership, you should contact the " -"current owner(s) of the project directly. Many project owners provide their " -"contact details in the 'Author' field of the 'Meta' details on the project " -"page." +"Only the current owners of a project have the ability to add new owners " +"or maintainers. If you need to request ownership, you should contact the " +"current owner(s) of the project directly. Many project owners provide " +"their contact details in the 'Author' field of the 'Meta' details on the " +"project page." msgstr "" "Только текущие владельцы проекта имеют возможность добавлять новых " -"владельцев или сопровождающих. Если вам нужно запросить право владения, вы " -"должны связаться с текущим владельцем (или владельцами) проекта напрямую. " -"Многие владельцы проектов указывают свои контактные данные в поле «Автор» " -"раздела «Метаданные» на странице проекта." +"владельцев или сопровождающих. Если вам нужно запросить право владения, " +"вы должны связаться с текущим владельцем (или владельцами) проекта " +"напрямую. Многие владельцы проектов указывают свои контактные данные в " +"поле «Автор» раздела «Метаданные» на странице проекта." #: warehouse/templates/pages/help.html:515 #, python-format -msgid "" -"If the owner is unresponsive, see <a href=\"%(href)s\">%(anchor_text)s</a>" +msgid "If the owner is unresponsive, see <a href=\"%(href)s\">%(anchor_text)s</a>" msgstr "" -"Если владелец не реагирует, смотрите вопрос <a href=\"%(href)s\">" -"%(anchor_text)s</a>" +"Если владелец не реагирует, смотрите вопрос <a " +"href=\"%(href)s\">%(anchor_text)s</a>" #: warehouse/templates/pages/help.html:518 #, python-format msgid "" -"By default, an upload's description will render with <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">reStructuredText</a>. " -"If the description is in an alternate format like Markdown, a package may " -"set the <code>long_description_content_type</code> in <code>setup.py</code> " -"to the alternate format." +"By default, an upload's description will render with <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">reStructuredText</a>. If the description is in an " +"alternate format like Markdown, a package may set the " +"<code>long_description_content_type</code> in <code>setup.py</code> to " +"the alternate format." msgstr "" "По умолчанию описание загрузки будет сгенерировано из текста описания, " -"используя разметку <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">reStructuredText</a>. Если описание приведено в " -"альтернативном формате, например, в Markdown, пакет может установить " -"параметр <code>long_description_content_type</code> в <code>setup.py</code> " -"в альтернативный формат." +"используя разметку <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">reStructuredText</a>. Если описание " +"приведено в альтернативном формате, например, в Markdown, пакет может " +"установить параметр <code>long_description_content_type</code> в " +"<code>setup.py</code> в альтернативный формат." #: warehouse/templates/pages/help.html:519 #, python-format msgid "" -"Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging User Guide</a> for details on the available " -"formats." +"Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a> for details on the " +"available formats." msgstr "" -"Для получения подробной информации о доступных форматах обратитесь к <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Руководству пользователя по созданию Python’ьих пакетов</a>." +"Для получения подробной информации о доступных форматах обратитесь к <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Руководству пользователя по созданию Python’ьих " +"пакетов</a>." #: warehouse/templates/pages/help.html:520 #, python-format msgid "" "PyPI will reject uploads if the description fails to render. To check a " -"description locally for validity, you may use <a href=\"%(href)s" -"\">readme_renderer</a>, which is the same description renderer used by PyPI." +"description locally for validity, you may use <a " +"href=\"%(href)s\">readme_renderer</a>, which is the same description " +"renderer used by PyPI." msgstr "" -"PyPI отклонит загрузку, если описание не удастся сгенерировать из разметки. " -"Для локальной проверки верности описания можно использовать проект <a href=" -"\"%(href)s\">readme_renderer</a>, который также используется самим PyPI для " -"генерации описания в HTML." +"PyPI отклонит загрузку, если описание не удастся сгенерировать из " +"разметки. Для локальной проверки верности описания можно использовать " +"проект <a href=\"%(href)s\">readme_renderer</a>, который также " +"используется самим PyPI для генерации описания в HTML." #: warehouse/templates/pages/help.html:524 #, python-format msgid "" -"If you can't upload your project's release to PyPI because you're hitting " -"the upload file size limit, we can sometimes increase your limit. Make sure " -"you've uploaded at least one release for the project that's <em>under</em> " -"the limit (a <a href=\"%(dev_release_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">developmental release version number</a> is " -"fine). Then, <a href=\"%(file_issue_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">file an issue</a> and tell us:</p>" -msgstr "" -"Если вы не можете загрузить выпуск своего проекта на PyPI из-за того, что вы " -"превысили лимит на размер загружаемого файла, мы иногда можем увеличить ваш " -"лимит. Убедитесь, что вы загрузили по крайней мере один выпуск для проекта, " -"который <em>не превышает</em> лимит (допустимо использовать <a href=" -"\"%(dev_release_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">номер версии разрабатываемого выпуска</a>). Затем <a href=" -"\"%(file_issue_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">создайте описание проблемы на GitHub’е</a> и сообщите нам:</p>" +"If you can't upload your project's release to PyPI because you're hitting" +" the upload file size limit, we can sometimes increase your limit. Make " +"sure you've uploaded at least one release for the project that's " +"<em>under</em> the limit (a <a href=\"%(dev_release_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">developmental " +"release version number</a> is fine). Then, <a " +"href=\"%(file_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">file an issue</a> and tell us:</p>" +msgstr "" +"Если вы не можете загрузить выпуск своего проекта на PyPI из-за того, что" +" вы превысили лимит на размер загружаемого файла, мы иногда можем " +"увеличить ваш лимит. Убедитесь, что вы загрузили по крайней мере один " +"выпуск для проекта, который <em>не превышает</em> лимит (допустимо " +"использовать <a href=\"%(dev_release_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">номер версии разрабатываемого " +"выпуска</a>). Затем <a href=\"%(file_issue_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">создайте описание проблемы на " +"GitHub’е</a> и сообщите нам:</p>" #: warehouse/templates/pages/help.html:532 msgid "A link to your project on PyPI (or Test PyPI)" @@ -4927,26 +4970,27 @@ msgid "The size of your release, in megabytes" msgstr "Размер вашего выпуска в мегабайтах" #: warehouse/templates/pages/help.html:534 -msgid "" -"Which index/indexes you need the increase for (PyPI, Test PyPI, or both)" +msgid "Which index/indexes you need the increase for (PyPI, Test PyPI, or both)" msgstr "" -"В каких указателях вам необходимо увеличить лимит (на PyPI, на тестовом PyPI " -"или на обоих)" +"В каких указателях вам необходимо увеличить лимит (на PyPI, на тестовом " +"PyPI или на обоих)" #: warehouse/templates/pages/help.html:535 msgid "" -"A brief description of your project, including the reason for the additional " -"size." +"A brief description of your project, including the reason for the " +"additional size." msgstr "" -"Краткое описание вашего проекта, включая причину запроса увеличения размера." +"Краткое описание вашего проекта, включая причину запроса увеличения " +"размера." #: warehouse/templates/pages/help.html:544 msgid "" -"If you've forgotten your PyPI password but you remember your email address " -"or username, follow these steps to reset your password:" +"If you've forgotten your PyPI password but you remember your email " +"address or username, follow these steps to reset your password:" msgstr "" -"Если вы забыли свой пароль от PyPI, но помните свой адрес электронной почты " -"или имя пользователя, выполните следующие шаги для сброса своего пароля:" +"Если вы забыли свой пароль от PyPI, но помните свой адрес электронной " +"почты или имя пользователя, выполните следующие шаги для сброса своего " +"пароля:" #: warehouse/templates/pages/help.html:546 #, python-format @@ -4954,8 +4998,7 @@ msgid "Go to <a href=\"%(href)s\">reset your password</a>." msgstr "Перейдите на <a href=\"%(href)s\">страницу сброса пароля</a>." #: warehouse/templates/pages/help.html:547 -msgid "" -"Enter the email address or username you used for PyPI and submit the form." +msgid "Enter the email address or username you used for PyPI and submit the form." msgstr "" "Введите адрес электронной почты или имя пользователя, которое вы " "использовали на PyPI, и отправьте форму." @@ -4971,27 +5014,30 @@ msgstr "Если вы потеряли доступ к своей учётной #: warehouse/templates/pages/help.html:555 msgid "Lost access to the email address associated with your account" msgstr "" -"Потери доступа к адресу электронной почты, связанному с вашей учётной записью" +"Потери доступа к адресу электронной почты, связанному с вашей учётной " +"записью" #: warehouse/templates/pages/help.html:556 msgid "" -"Lost two factor authentication <a href=\"#totp\">application</a>, <a href=" -"\"#utfkey\">device</a>, and <a href=\"#recoverycodes\">recovery codes</a>" +"Lost two factor authentication <a href=\"#totp\">application</a>, <a " +"href=\"#utfkey\">device</a>, and <a href=\"#recoverycodes\">recovery " +"codes</a>" msgstr "" -"Потери <a href=\"#totp\">приложения</a>, <a href=\"#utfkey\">устройства</a> " -"и <a href=\"#recoverycodes\">кодов восстановления</a> двухфакторной " -"аутентификации" +"Потери <a href=\"#totp\">приложения</a>, <a " +"href=\"#utfkey\">устройства</a> и <a href=\"#recoverycodes\">кодов " +"восстановления</a> двухфакторной аутентификации" #: warehouse/templates/pages/help.html:559 #, python-format msgid "" -"You can proceed to, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">file an issue on our tracker</a> to request assistance " -"with account recovery." +"You can proceed to, <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">file an issue on our tracker</a> to " +"request assistance with account recovery." msgstr "" -"Вы можете зайти в нашу систему отслеживания проблем и <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">описать свою " -"проблему</a>, чтобы запросить помощь в восстановлении учётной записи." +"Вы можете зайти в нашу систему отслеживания проблем и <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">описать свою проблему</a>, чтобы запросить помощь в " +"восстановлении учётной записи." #: warehouse/templates/pages/help.html:566 msgid "If you are using a username and password for uploads:" @@ -5019,99 +5065,103 @@ msgstr "Убедитесь, что ваш API-токен действителе #: warehouse/templates/pages/help.html:574 msgid "" -"Ensure that your API Token is <a href=\"#apitoken\">properly formatted</a> " -"and does not contain any trailing characters such as newlines." +"Ensure that your API Token is <a href=\"#apitoken\">properly " +"formatted</a> and does not contain any trailing characters such as " +"newlines." msgstr "" -"Убедитесь, что ваш API-токен <a href=\"#apitoken\">имеет правильный формат</" -"a> и не содержит никаких лишних конечных символов, вроде символов новой " -"строки." +"Убедитесь, что ваш API-токен <a href=\"#apitoken\">имеет правильный " +"формат</a> и не содержит никаких лишних конечных символов, вроде символов" +" новой строки." #: warehouse/templates/pages/help.html:579 #, python-format msgid "" -"Transport Layer Security, or TLS, is part of how we make sure connections " -"between your computer and PyPI are private and secure. It's a cryptographic " -"protocol that's had several versions over time. PyPI <a href=" -"\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">turned off support for TLS versions 1.0 and 1.1</a> in April " -"2018. <a href=\"%(reason_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Learn why on the PSF blog</a>." +"Transport Layer Security, or TLS, is part of how we make sure connections" +" between your computer and PyPI are private and secure. It's a " +"cryptographic protocol that's had several versions over time. PyPI <a " +"href=\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">turned off support for TLS versions 1.0 and 1.1</a> in " +"April 2018. <a href=\"%(reason_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Learn why on the PSF blog</a>." msgstr "" "Частью того, как мы обеспечиваем конфиденциальность и безопасность " "соединений между вашим компьютером и PyPI является протокол защиты " "транспортного уровня – Transport Layer Security или TLS. Это " -"криптографический протокол, который в процессе своего развития прошёл через " -"несколько версий. PyPI в апреле 2018 года <a href=\"%(announcement_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">отключил поддержку " -"TLS версий 1.0 и 1.1</a>. <a href=\"%(reason_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Узнать, почему он это сделал, в блоге " -"PSF</a>." +"криптографический протокол, который в процессе своего развития прошёл " +"через несколько версий. PyPI в апреле 2018 года <a " +"href=\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">отключил поддержку TLS версий 1.0 и 1.1</a>. <a " +"href=\"%(reason_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Узнать, почему он это сделал, в блоге PSF</a>." #: warehouse/templates/pages/help.html:586 #, python-format msgid "" -"If you are having trouble with <code>%(command)s</code> and get a <code>No " -"matching distribution found</code> or <code>Could not fetch URL</code> " -"error, try adding <code>-v</code> to the command to get more information:" +"If you are having trouble with <code>%(command)s</code> and get a " +"<code>No matching distribution found</code> or <code>Could not fetch " +"URL</code> error, try adding <code>-v</code> to the command to get more " +"information:" msgstr "" "Если у вас возникли проблемы с командой <code>%(command)s</code> и вы " "получили ошибку <code>No matching distribution found</code> («Не найдено " -"подходящих дистрибутивов») или <code>Could not fetch URL</code> («Невозможно " -"извлечь по адресу URL»), попробуйте добавить к команде параметр <code>-v</" -"code>, чтобы получить более подробную информацию:" +"подходящих дистрибутивов») или <code>Could not fetch URL</code> " +"(«Невозможно извлечь по адресу URL»), попробуйте добавить к команде " +"параметр <code>-v</code>, чтобы получить более подробную информацию:" #: warehouse/templates/pages/help.html:588 msgid "" "If you see an error like <code>There was a problem confirming the ssl " "certificate</code> or <code>tlsv1 alert protocol version</code> or " -"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, you need to be connecting to PyPI " -"with a newer TLS support library." +"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, you need to be connecting to " +"PyPI with a newer TLS support library." msgstr "" -"Если вы заметили ошибку вида <code>There was a problem confirming the ssl " -"certificate</code> («Была проблема с подтверждением ssl-сертификата»), или " -"<code>tlsv1 alert protocol version</code> («тревога: версии протокола " -"tlsv1»), или <code>TLSV1_ALERT_PROTOCOL_VERSION</code>, вам нужно " +"Если вы заметили ошибку вида <code>There was a problem confirming the ssl" +" certificate</code> («Была проблема с подтверждением ssl-сертификата»), " +"или <code>tlsv1 alert protocol version</code> («тревога: версии протокола" +" tlsv1»), или <code>TLSV1_ALERT_PROTOCOL_VERSION</code>, вам нужно " "подключиться к PyPI через более свежую библиотеку поддержки TLS." #: warehouse/templates/pages/help.html:589 msgid "" "The specific steps you need to take will depend on your operating system " -"version, where your installation of Python originated (python.org, your OS " -"vendor, or an intermediate distributor), and the installed versions of " -"Python, <code>setuptools</code>, and <code>pip</code>." +"version, where your installation of Python originated (python.org, your " +"OS vendor, or an intermediate distributor), and the installed versions of" +" Python, <code>setuptools</code>, and <code>pip</code>." msgstr "" "Конкретные шаги, которые вам нужно будет предпринять, будут зависеть от " "версии вашей операционной системы, от того, откуда был установлен Python " -"(загружен с python.org, поставлялся вместе с вашей операционной системой или " -"сторонним дистрибьютором), а также от установленных версий Python’а, " +"(загружен с python.org, поставлялся вместе с вашей операционной системой " +"или сторонним дистрибьютором), а также от установленных версий Python’а, " "<code>setuptools</code> и <code>pip</code>." #: warehouse/templates/pages/help.html:591 #, python-format msgid "" -"For help, go to <a href=\"%(irc_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">the <code>#pypa</code> IRC channel on Freenode</a>, file " -"an issue at <a href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">pypa/packaging-problems/issues</a>, or <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">post to the python-help mailing list</a>, including your OS and " -"installation details and the output of <code>%(command)s</code>." -msgstr "" -"Для получения помощи обратитесь в <a href=\"%(irc_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">IRC-канал <code>#pypa</code> на " -"Freenode</a>, заведите проблему на <a href=\"%(issue_tracker_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">pypa/packaging-problems/" -"issues</a> или <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">напишите в список рассылки python-help</a>, " -"включив в сообщение сведения о вашей операционной системе и сведения об " -"установке, а также вывод команды <code>%(command)s</code>." +"For help, go to <a href=\"%(irc_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">the <code>#pypa</code> IRC channel on " +"Freenode</a>, file an issue at <a href=\"%(issue_tracker_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">pypa/packaging-" +"problems/issues</a>, or <a href=\"%(mailing_list_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">post to the " +"python-help mailing list</a>, including your OS and installation details " +"and the output of <code>%(command)s</code>." +msgstr "" +"Для получения помощи обратитесь в <a href=\"%(irc_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">IRC-канал " +"<code>#pypa</code> на Freenode</a>, заведите проблему на <a " +"href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">pypa/packaging-problems/issues</a> или <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">напишите в список рассылки python-help</a>, включив в " +"сообщение сведения о вашей операционной системе и сведения об установке, " +"а также вывод команды <code>%(command)s</code>." #: warehouse/templates/pages/help.html:602 #, python-format msgid "" -"We take <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">accessibility</a> very seriously and want to make the website " -"easy to use for everyone." +"We take <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">accessibility</a> very seriously and want to make the " +"website easy to use for everyone." msgstr "" "Мы очень серьёзно относимся к <a href=\"%(href)s\" title=\"%(title)s\" " "target=\"_blank\" rel=\"noopener\">доступности</a> и хотим сделать сайт " @@ -5120,61 +5170,63 @@ msgstr "" #: warehouse/templates/pages/help.html:607 #, python-format msgid "" -"If you are experiencing an accessibility problem, <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">report it to us on GitHub</" -"a>, so we can try to fix the problem, for you and others." +"If you are experiencing an accessibility problem, <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">report it to us on" +" GitHub</a>, so we can try to fix the problem, for you and others." msgstr "" -"Если вы столкнулись с проблемой с доступностью, <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">сообщите нам об этом через " -"GitHub</a>, чтобы мы могли попробовать решить эту проблему как для вас, так " -"и для других." +"Если вы столкнулись с проблемой с доступностью, <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">сообщите нам об " +"этом через GitHub</a>, чтобы мы могли попробовать решить эту проблему как" +" для вас, так и для других." #: warehouse/templates/pages/help.html:615 #, python-format msgid "" "In a previous version of PyPI, it used to be possible for maintainers to " -"upload releases to PyPI using a form in the web browser. This feature was " -"deprecated with the new version of PyPI – we instead recommend that you <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">use " -"twine to upload your project to PyPI</a>." -msgstr "" -"В предыдущей версии PyPI сопровождающие имели возможность загружать выпуски " -"на PyPI через форму в веб-браузере. В новой версии PyPI эта возможность " -"объявлена устаревшей – вместо этого мы рекомендуем вам <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">использовать для " -"загрузки своего проекта на PyPI модуль twine</a>." +"upload releases to PyPI using a form in the web browser. This feature was" +" deprecated with the new version of PyPI – we instead recommend that you " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">use twine to upload your project to PyPI</a>." +msgstr "" +"В предыдущей версии PyPI сопровождающие имели возможность загружать " +"выпуски на PyPI через форму в веб-браузере. В новой версии PyPI эта " +"возможность объявлена устаревшей – вместо этого мы рекомендуем вам <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">использовать для загрузки своего проекта на PyPI модуль " +"twine</a>." #: warehouse/templates/pages/help.html:624 msgid "" -"Spammers return to PyPI with some regularity hoping to place their Search " -"Engine Optimized phishing, scam, and click-farming content on the site. " +"Spammers return to PyPI with some regularity hoping to place their Search" +" Engine Optimized phishing, scam, and click-farming content on the site. " "Since PyPI allows for indexing of the Long Description and other data " "related to projects and has a generally solid search reputation, it is a " "prime target." msgstr "" -"Спамеры с некоторой регулярностью возвращаются на PyPI в надежде разместить " -"на сайте своё оптимизированное под поисковые системы, фишинговое, " -"мошенническое содержимое или содержимое для накрутки рекламных кликов. " -"Поскольку PyPI позволяет индексировать поле длинного описания и другие " -"данные, связанные с проектами, и в целом имеет солидную репутацию в области " -"поиска, он является лакомой целью." +"Спамеры с некоторой регулярностью возвращаются на PyPI в надежде " +"разместить на сайте своё оптимизированное под поисковые системы, " +"фишинговое, мошенническое содержимое или содержимое для накрутки " +"рекламных кликов. Поскольку PyPI позволяет индексировать поле длинного " +"описания и другие данные, связанные с проектами, и в целом имеет солидную" +" репутацию в области поиска, он является лакомой целью." #: warehouse/templates/pages/help.html:626 #, python-format msgid "" "When the PyPI administrators are overwhelmed by spam <strong>or</strong> " -"determine that there is some other threat to PyPI, new user registration and/" -"or new project registration may be disabled. Check <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status page</a> " -"for more details, as we'll likely have updated it with reasoning for the " -"intervention." -msgstr "" -"Когда администраторы PyPI оказываются завалены спамом <strong>или</strong> " -"определяют, что существует какая-либо другая угроза PyPI, регистрация новых " -"пользователей и/или новых проектов может быть отключена. Для получения более " -"подробной информации проверьте <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">нашу страницу статуса</a>, так как, " -"скорее всего, мы обновили её, указав на ней причину такого вмешательства." +"determine that there is some other threat to PyPI, new user registration " +"and/or new project registration may be disabled. Check <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">our status page</a> for more details, as we'll likely " +"have updated it with reasoning for the intervention." +msgstr "" +"Когда администраторы PyPI оказываются завалены спамом " +"<strong>или</strong> определяют, что существует какая-либо другая угроза " +"PyPI, регистрация новых пользователей и/или новых проектов может быть " +"отключена. Для получения более подробной информации проверьте <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">нашу страницу статуса</a>, так как, скорее всего, мы " +"обновили её, указав на ней причину такого вмешательства." #: warehouse/templates/pages/help.html:635 msgid "PyPI will return these errors for one of these reasons:" @@ -5203,166 +5255,175 @@ msgstr "" #: warehouse/templates/pages/help.html:643 #, python-format msgid "" -"To avoid this situation, <a href=\"%(test_pypi_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">use Test PyPI to perform and check your " -"upload first</a>, before uploading to <a href=\"%(pypi_href)s\">pypi.org</a>." +"To avoid this situation, <a href=\"%(test_pypi_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">use Test PyPI to " +"perform and check your upload first</a>, before uploading to <a " +"href=\"%(pypi_href)s\">pypi.org</a>." msgstr "" -"Чтобы избежать этой ситуации, <a href=\"%(test_pypi_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">воспользуйтесь тестовым " -"PyPI для проверки вашей загрузки</a> до того, как загружать файл на <a href=" -"\"%(pypi_href)s\">pypi.org</a>." +"Чтобы избежать этой ситуации, <a href=\"%(test_pypi_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">воспользуйтесь " +"тестовым PyPI для проверки вашей загрузки</a> до того, как загружать файл" +" на <a href=\"%(pypi_href)s\">pypi.org</a>." #: warehouse/templates/pages/help.html:650 #, python-format msgid "" -"If you would like to request a new trove classifier file a pull request on " -"the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><code>pypa/trove-classifiers</code> project</a>. Be sure to include a " -"brief justification of why it is important." +"If you would like to request a new trove classifier file a pull request " +"on the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>pypa/trove-classifiers</code> project</a>. Be sure" +" to include a brief justification of why it is important." msgstr "" -"Если вы хотите запросить добавление нового trove-классификатора, отправьте " -"запрос на вытягивание в <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">проект <code>pypa/trove-classifiers</code></a>. " -"Обязательно включите в него краткое обоснование, почему новый классификатор " -"так важен." +"Если вы хотите запросить добавление нового trove-классификатора, " +"отправьте запрос на вытягивание в <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">проект <code>pypa" +"/trove-classifiers</code></a>. Обязательно включите в него краткое " +"обоснование, почему новый классификатор так важен." #: warehouse/templates/pages/help.html:658 #, python-format msgid "" "If you're experiencing an issue with PyPI itself, we welcome " -"<strong>constructive</strong> feedback and bug reports via our <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">issue " -"tracker</a>. Please note that this tracker is only for issues with the " -"software that runs PyPI. Before writing a new issue, first check that a " -"similar issue does not already exist." +"<strong>constructive</strong> feedback and bug reports via our <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">issue tracker</a>. Please note that this tracker is only" +" for issues with the software that runs PyPI. Before writing a new issue," +" first check that a similar issue does not already exist." msgstr "" "Если вы испытываете проблемы с самим PyPI, мы приветствуем " -"<strong>конструктивную</strong> обратную связь и сообщения об ошибках через " -"нашу <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">систему отслеживания проблем</a>. Пожалуйста, обратите " +"<strong>конструктивную</strong> обратную связь и сообщения об ошибках " +"через нашу <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">систему отслеживания проблем</a>. Пожалуйста, обратите " "внимание, что эта система предназначена только для проблем с программным " "обеспечением, на котором работает PyPI. Перед тем, как создать новую " "проблему, сначала проверьте, не существует ли уже похожей проблемы." #: warehouse/templates/pages/help.html:665 msgid "" -"If you are having an issue is with a specific package installed from PyPI, " -"you should reach out to the maintainers of that project directly instead." +"If you are having an issue is with a specific package installed from " +"PyPI, you should reach out to the maintainers of that project directly " +"instead." msgstr "" -"Если у вас возникли проблемы с определённым пакетом, установленным из PyPI, " -"вам следует обратиться непосредственно к сопровождающим этого проекта." +"Если у вас возникли проблемы с определённым пакетом, установленным из " +"PyPI, вам следует обратиться непосредственно к сопровождающим этого " +"проекта." #: warehouse/templates/pages/help.html:674 #, python-format msgid "" -"PyPI is powered by the Warehouse project; <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> is an open " -"source project developed under the umbrella of the Python Packaging " -"Authority (PyPA) and supported by the Python Packaging Working Group " -"(PackagingWG)." +"PyPI is powered by the Warehouse project; <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> is " +"an open source project developed under the umbrella of the Python " +"Packaging Authority (PyPA) and supported by the Python Packaging Working " +"Group (PackagingWG)." msgstr "" -"PyPI работает на программом обеспечении проекта Warehouse; <a href=\"%(href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> " -"является проектом с открытым исходным кодом, разработанным под эгидой Группы " -"пакетирования Python’а (Python Packaging Authority – PyPA) и поддерживаемым " -"Рабочей группой Python’а по пакетированию (Python Packaging Working Group – " -"PackagingWG)." +"PyPI работает на программом обеспечении проекта Warehouse; <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Warehouse</a> является проектом с открытым исходным " +"кодом, разработанным под эгидой Группы пакетирования Python’а (Python " +"Packaging Authority – PyPA) и поддерживаемым Рабочей группой Python’а по " +"пакетированию (Python Packaging Working Group – PackagingWG)." #: warehouse/templates/pages/help.html:679 #, python-format msgid "" -"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPA</a> is an independent group of developers whose goal is to improve " -"and maintain many of the core projects related to Python packaging." +"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA</a> is an independent group of developers whose " +"goal is to improve and maintain many of the core projects related to " +"Python packaging." msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPA</a> является независимой группой разработчиков, целью которой " -"является улучшение и поддержка множества основных проектов, связанных с " -"созданием и распространением Python’ьих пакетов." +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA</a> является независимой группой разработчиков, " +"целью которой является улучшение и поддержка множества основных проектов," +" связанных с созданием и распространением Python’ьих пакетов." #: warehouse/templates/pages/help.html:684 #, python-format msgid "" -"The <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">PackagingWG</a> is a working group of the Python Software " -"Foundation (PSF) whose goal is to raise and disburse funds to support the " -"ongoing improvement of Python packaging. Most recently it <a href=" -"\"%(otf_award_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">secured an award from the Open Technology Fund</a> whose funding is " -"enabling developers to improve Warehouse's security and accessibility." -msgstr "" -"<a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">PackagingWG</a> является рабочей группой Фонда программного " -"обеспечения Python’а (Python Software Foundation – PSF), целью которой " -"является сбор и распределение средств для поддержки постоянного улучшения " -"средств создания и распространения Python’ьих пакетов. Совсем недавно она <a " -"href=\"%(otf_award_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">получила награду от Фонда открытых технологий (Open Technology " -"Fund)</a>, чьё финансирование позволило разработчикам улучшить безопасность " -"и доступность Warehouse." +"The <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">PackagingWG</a> is a working group of " +"the Python Software Foundation (PSF) whose goal is to raise and disburse " +"funds to support the ongoing improvement of Python packaging. Most " +"recently it <a href=\"%(otf_award_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">secured an award from the Open " +"Technology Fund</a> whose funding is enabling developers to improve " +"Warehouse's security and accessibility." +msgstr "" +"<a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PackagingWG</a> является рабочей группой Фонда " +"программного обеспечения Python’а (Python Software Foundation – PSF), " +"целью которой является сбор и распределение средств для поддержки " +"постоянного улучшения средств создания и распространения Python’ьих " +"пакетов. Совсем недавно она <a href=\"%(otf_award_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">получила награду " +"от Фонда открытых технологий (Open Technology Fund)</a>, чьё " +"финансирование позволило разработчикам улучшить безопасность и " +"доступность Warehouse." #: warehouse/templates/pages/help.html:694 #, python-format msgid "" -"PyPI is powered by <a href=\"%(warehouse_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Warehouse</a> and by a variety of tools and " -"services provided by our <a href=\"%(sponsors_href)s\">generous sponsors</a>." +"PyPI is powered by <a href=\"%(warehouse_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Warehouse</a> and by a variety of " +"tools and services provided by our <a href=\"%(sponsors_href)s\">generous" +" sponsors</a>." msgstr "" -"PyPI работает на <a href=\"%(warehouse_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Warehouse</a>, а также использует различные " -"инструменты и услуги, предоставляемые нашими <a href=\"%(sponsors_href)s" -"\">великодушными спонсорами</a>." +"PyPI работает на <a href=\"%(warehouse_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Warehouse</a>, а также использует " +"различные инструменты и услуги, предоставляемые нашими <a " +"href=\"%(sponsors_href)s\">великодушными спонсорами</a>." #: warehouse/templates/pages/help.html:701 msgid "" -"As of April 16, 2018, PyPI.org is at \"production\" status, meaning that it " -"has moved out of beta and replaced the old site (pypi.python.org). It is now " -"robust, tested, and ready for expected browser and API traffic." +"As of April 16, 2018, PyPI.org is at \"production\" status, meaning that " +"it has moved out of beta and replaced the old site (pypi.python.org). It " +"is now robust, tested, and ready for expected browser and API traffic." msgstr "" -"С 16 апреля 2018 года PyPI.org находится в «боевом» статусе, что означает, " -"что он перестал быть бета-версией и заменил собой старый сайт (pypi.python." -"org). Теперь это надёжный, протестированный и готовый к ожидаемому трафику " -"от браузеров и API сайт." +"С 16 апреля 2018 года PyPI.org находится в «боевом» статусе, что " +"означает, что он перестал быть бета-версией и заменил собой старый сайт " +"(pypi.python.org). Теперь это надёжный, протестированный и готовый к " +"ожидаемому трафику от браузеров и API сайт." #: warehouse/templates/pages/help.html:703 #, python-format msgid "" -"PyPI is heavily cached and distributed via <abbr title=\"content delivery " -"network\">CDN</abbr> thanks to our sponsor <a href=\"%(fastly_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Fastly</a> and thus is " -"generally available globally. However, the site is mostly maintained by " -"volunteers, we do not provide any specific Service Level Agreement, and as " -"could be expected for a giant distributed system, things can and sometimes " -"do go wrong. See <a href=\"%(status_page_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">our status page</a> for current and past outages " -"and incidents. If you have high availability requirements for your package " -"index, consider either a <a href=\"%(mirror_href)s\">mirror</a> or a <a href=" -"\"%(private_index_href)s\">private index</a>." -msgstr "" -"PyPI интенсивно кэшируется и распространяется через <abbr title=\"content " -"delivery network – сеть доставки содержимого\">CDN</abbr> благодаря нашему " -"спонсору <a href=\"%(fastly_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Fastly</a> и, таким образом, доступен по всему миру. Тем не " -"менее, сайт в основном поддерживается добровольцами, мы не предоставляем " -"никаких специальных соглашений об уровне обслуживания, и, как и следовало " -"ожидать для гигантской распределённой системы, всё может идти и иногда идёт " -"не так, как надо. Статус текущих и прошлых отключений и инцидентов смотрите " -"на <a href=\"%(status_page_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">нашей странице статуса</a>. Если у вас высокие требования к " -"доступности указателя для вашего пакета, рассмотрите возможность поднятия " -"либо <a href=\"%(mirror_href)s\">зеркала</a>, либо <a href=" -"\"%(private_index_href)s\">частного указателя</a>." +"PyPI is heavily cached and distributed via <abbr title=\"content delivery" +" network\">CDN</abbr> thanks to our sponsor <a href=\"%(fastly_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Fastly</a> and " +"thus is generally available globally. However, the site is mostly " +"maintained by volunteers, we do not provide any specific Service Level " +"Agreement, and as could be expected for a giant distributed system, " +"things can and sometimes do go wrong. See <a " +"href=\"%(status_page_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">our status page</a> for current and past outages and " +"incidents. If you have high availability requirements for your package " +"index, consider either a <a href=\"%(mirror_href)s\">mirror</a> or a <a " +"href=\"%(private_index_href)s\">private index</a>." +msgstr "" +"PyPI интенсивно кэшируется и распространяется через <abbr title=\"content" +" delivery network – сеть доставки содержимого\">CDN</abbr> благодаря " +"нашему спонсору <a href=\"%(fastly_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Fastly</a> и, таким образом, доступен " +"по всему миру. Тем не менее, сайт в основном поддерживается " +"добровольцами, мы не предоставляем никаких специальных соглашений об " +"уровне обслуживания, и, как и следовало ожидать для гигантской " +"распределённой системы, всё может идти и иногда идёт не так, как надо. " +"Статус текущих и прошлых отключений и инцидентов смотрите на <a " +"href=\"%(status_page_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">нашей странице статуса</a>. Если у вас высокие " +"требования к доступности указателя для вашего пакета, рассмотрите " +"возможность поднятия либо <a href=\"%(mirror_href)s\">зеркала</a>, либо " +"<a href=\"%(private_index_href)s\">частного указателя</a>." #: warehouse/templates/pages/help.html:717 #, python-format msgid "" -"We have a huge amount of work to do to continue to maintain and improve PyPI " -"(also known as <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">the Warehouse project</a>)." +"We have a huge amount of work to do to continue to maintain and improve " +"PyPI (also known as <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">the Warehouse project</a>)." msgstr "" "Нам требуется проделывать огромный объём работы, чтобы продолжать " -"поддерживать и улучшать PyPI (также известный как <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">проект Warehouse " +"поддерживать и улучшать PyPI (также известный как <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">проект Warehouse " "(хранилища)</a>)." #: warehouse/templates/pages/help.html:722 @@ -5384,53 +5445,56 @@ msgstr "Как разработчик:" #: warehouse/templates/pages/help.html:723 msgid "" -"Warehouse is open source, and we would love to see some new faces working on " -"the project. You <strong>do not</strong> need to be an experienced open-" -"source developer to make a contribution – in fact, we'd love to help you " -"make your first open source pull request!" +"Warehouse is open source, and we would love to see some new faces working" +" on the project. You <strong>do not</strong> need to be an experienced " +"open-source developer to make a contribution – in fact, we'd love to help" +" you make your first open source pull request!" msgstr "" "Warehouse является проектом с открытым исходным кодом, и нам хотелось бы " -"видеть новые лица, над ним работающие. Вам <strong>не обязательно</strong> " -"быть опытным разработчиком открытого исходного кода, чтобы начать вносить " -"свой вклад – на самом деле мы с радостью поможем вам сделать ваш первый " -"запрос на слияние в проект с открытым исходным кодом!" +"видеть новые лица, над ним работающие. Вам <strong>не " +"обязательно</strong> быть опытным разработчиком открытого исходного кода," +" чтобы начать вносить свой вклад – на самом деле мы с радостью поможем " +"вам сделать ваш первый запрос на слияние в проект с открытым исходным " +"кодом!" #: warehouse/templates/pages/help.html:725 #, python-format msgid "" "If you have skills in Python, ElasticSearch, HTML, SCSS, JavaScript, or " -"SQLAlchemy then skim our <a href=\"%(getting_started_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">\"Getting started\" guide</" -"a>, then take a look at the <a href=\"%(issue_tracker_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">issue tracker</a>. We've " -"created a <a href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">'Good first issue'</a> label – we recommend you " -"start here." -msgstr "" -"Если у вас есть навыки в Python’е, ElasticSearch, HTML, SCSS, JavaScript или " -"SQLAlchemy, то пролистайте наши <a href=\"%(getting_started_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">руководства «С чего " -"начать»</a>, а затем загляните в нашу <a href=\"%(issue_tracker_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">систему отслеживания " -"проблем</a>. Мы создали метку <a href=\"%(good_first_issue_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">«Good first " -"issue» («Хорошая первая проблема»)</a> – мы рекомендуем вам начать с таких " -"проблем." +"SQLAlchemy then skim our <a href=\"%(getting_started_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">\"Getting " +"started\" guide</a>, then take a look at the <a " +"href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">issue tracker</a>. We've created a <a " +"href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">'Good first issue'</a> label – we recommend you start " +"here." +msgstr "" +"Если у вас есть навыки в Python’е, ElasticSearch, HTML, SCSS, JavaScript " +"или SQLAlchemy, то пролистайте наши <a href=\"%(getting_started_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">руководства «С " +"чего начать»</a>, а затем загляните в нашу <a " +"href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">систему отслеживания проблем</a>. Мы создали метку <a " +"href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">«Good first issue» («Хорошая первая проблема»)</a> – мы " +"рекомендуем вам начать с таких проблем." #: warehouse/templates/pages/help.html:733 #, python-format msgid "" -"Issues are grouped into <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">milestones</a>; working on issues in the current " -"milestone is a great way to help push the project forward. If you're " -"interested in working on a particular issue, leave a comment and we can " -"guide you through the contribution process." +"Issues are grouped into <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">milestones</a>; working on issues in " +"the current milestone is a great way to help push the project forward. If" +" you're interested in working on a particular issue, leave a comment and " +"we can guide you through the contribution process." msgstr "" -"Проблемы сгруппированы в <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">этапы</a>; работа над проблемами текущего этапа " -"– это отличный способ помочь продвинуть проект вперёд. Если вы " -"заинтересованы в работе над конкретной проблемой, оставьте комментарий, и мы " -"сможем направить вас в процессе внесения вами своего вклада." +"Проблемы сгруппированы в <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">этапы</a>; работа над проблемами " +"текущего этапа – это отличный способ помочь продвинуть проект вперёд. " +"Если вы заинтересованы в работе над конкретной проблемой, оставьте " +"комментарий, и мы сможем направить вас в процессе внесения вами своего " +"вклада." #: warehouse/templates/pages/help.html:740 msgid "Stay updated:" @@ -5439,49 +5503,52 @@ msgstr "Оставайтесь в курсе событий:" #: warehouse/templates/pages/help.html:741 #, python-format msgid "" -"You can also follow the ongoing development of the project on the <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">distutils-sig mailing list</a> and the <a href=" -"\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">PyPA Dev message group</a>." +"You can also follow the ongoing development of the project on the <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">distutils-sig mailing list</a> and the <a " +"href=\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA Dev message group</a>." msgstr "" -"Также вы можете следить за текущим развитием проекта через <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">список рассылки distutils-sig</a> и <a href=" -"\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">группу сообщений PyPA Dev</a>." +"Также вы можете следить за текущим развитием проекта через <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">список рассылки distutils-sig</a> и <a " +"href=\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">группу сообщений PyPA Dev</a>." #: warehouse/templates/pages/help.html:751 #, python-format msgid "" -"Changes to PyPI are generally announced on both the <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">pypi-announce mailing list</a> and the <a href=\"%(blog_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PSF blog</a> under " -"the label \"pypi\". The PSF blog also has <a href=\"%(atom_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Atom</a> and <a href=" -"\"%(rss_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</" -"a> feeds for the \"pypi\" label." -msgstr "" -"Об изменениях в PyPI обычно объявляется как в <a href=\"%(mailing_list_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">списке рассылки " -"pypi-announce</a>, так и в <a href=\"%(blog_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">блоге PSF</a> под меткой «pypi». В блоге " -"PSF для метки «pypi» также настроены каналы <a href=\"%(atom_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Atom</a> и <a href=" -"\"%(rss_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</" -"a>." +"Changes to PyPI are generally announced on both the <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">pypi-announce mailing list</a> and the <a " +"href=\"%(blog_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PSF blog</a> under the label \"pypi\". The PSF blog also" +" has <a href=\"%(atom_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Atom</a> and <a href=\"%(rss_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</a> feeds for " +"the \"pypi\" label." +msgstr "" +"Об изменениях в PyPI обычно объявляется как в <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">списке рассылки pypi-announce</a>, так и в <a " +"href=\"%(blog_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">блоге PSF</a> под меткой «pypi». В блоге PSF для метки " +"«pypi» также настроены каналы <a href=\"%(atom_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Atom</a> и <a " +"href=\"%(rss_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">RSS</a>." #: warehouse/templates/pages/help.html:761 msgid "" -"When Warehouse's maintainers are deploying new features, at first we mark " -"them with a small \"beta feature\" symbol to tell you: this should probably " -"work fine, but it's new and less tested than other site functionality." +"When Warehouse's maintainers are deploying new features, at first we mark" +" them with a small \"beta feature\" symbol to tell you: this should " +"probably work fine, but it's new and less tested than other site " +"functionality." msgstr "" -"Когда сопровождающие Warehouse внедряют новые функции, сперва мы их помечаем " -"маленьким символом «бета-функции», чтобы сказать вам: она, вероятно, будет " -"работать хорошо, но это новая и менее проверенная функциональность, нежели " -"другие возможности сайта." +"Когда сопровождающие Warehouse внедряют новые функции, сперва мы их " +"помечаем маленьким символом «бета-функции», чтобы сказать вам: она, " +"вероятно, будет работать хорошо, но это новая и менее проверенная " +"функциональность, нежели другие возможности сайта." #: warehouse/templates/pages/help.html:762 msgid "Currently, no features are in beta." @@ -5490,11 +5557,11 @@ msgstr "В настоящее время никаких функций в бет #: warehouse/templates/pages/help.html:766 #, python-format msgid "" -"\"PyPI\" should be pronounced like \"pie pea eye\", specifically with the " -"\"PI\" pronounced as individual letters, rather as a single sound. This " -"minimizes confusion with the <a href=\"%(href)s\" title=\"%(title)s\">PyPy</" -"a> project, which is a popular alternative implementation of the Python " -"language." +"\"PyPI\" should be pronounced like \"pie pea eye\", specifically with the" +" \"PI\" pronounced as individual letters, rather as a single sound. This " +"minimizes confusion with the <a href=\"%(href)s\" " +"title=\"%(title)s\">PyPy</a> project, which is a popular alternative " +"implementation of the Python language." msgstr "" "«PyPI» следует произносить как «пай пи ай», особенно часть «PI», " "произносимую по отдельным буквам, а не одним звуком. Это минимизирует " @@ -5536,23 +5603,24 @@ msgstr "Контактная информация" #: warehouse/templates/pages/help.html:789 #, python-format msgid "" -"The <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging Authority (PyPA)</a> is a working group who " -"work together to improve Python packaging. If you'd like to get in touch " -"with a core packaging developer, use <a href=\"%(irc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">#pypa on IRC (freenode)</" -"a>, or <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">join the distutils-sig mailing list</a>." -msgstr "" -"<a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Группой пакетирования Python’а, Python Packaging Authority " -"(PyPA)</a> является рабочей группой, которая работает над улучшением " -"пакетирования в Python’е. Если вы хотите связаться с ключевыми " -"разработчиками инструментов пакетирования, используйте комнату <a href=" -"\"%(irc_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">#pypa на IRC (freenode)</a> или <a href=\"%(mailing_list_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">присоединяйтесь к списку " -"рассылки distutils-sig</a>." +"The <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging Authority (PyPA)</a> is a working group" +" who work together to improve Python packaging. If you'd like to get in " +"touch with a core packaging developer, use <a href=\"%(irc_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">#pypa on IRC " +"(freenode)</a>, or <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">join the distutils-sig mailing " +"list</a>." +msgstr "" +"<a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Группой пакетирования Python’а, Python Packaging " +"Authority (PyPA)</a> является рабочей группой, которая работает над " +"улучшением пакетирования в Python’е. Если вы хотите связаться с ключевыми" +" разработчиками инструментов пакетирования, используйте комнату <a " +"href=\"%(irc_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">#pypa на IRC (freenode)</a> или <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">присоединяйтесь к списку рассылки distutils-sig</a>." #: warehouse/templates/pages/security.html:15 msgid "Security" @@ -5564,8 +5632,8 @@ msgstr "Сообщить о проблеме безопасности" #: warehouse/templates/pages/security.html:22 msgid "" -"We take security very seriously and ask that you follow our security policy " -"carefully." +"We take security very seriously and ask that you follow our security " +"policy carefully." msgstr "" "Мы очень серьёзно относимся к безопасности и просим вас внимательно " "следовать нашей политике безопасности." @@ -5576,13 +5644,13 @@ msgstr "Важно!" #: warehouse/templates/pages/security.html:24 msgid "" -"If you believe you've identified a security issue with Warehouse, <strong>DO " -"NOT</strong> report the issue in any public forum, including (but not " -"limited to):" +"If you believe you've identified a security issue with Warehouse, " +"<strong>DO NOT</strong> report the issue in any public forum, including " +"(but not limited to):" msgstr "" "Если вы считаете, что обнаружили в Warehouse проблему безопасности, " -"<strong>НЕ СООБЩАЙТЕ</strong> об этой проблеме ни на каком публичном форуме, " -"включая (но не ограничиваясь):" +"<strong>НЕ СООБЩАЙТЕ</strong> об этой проблеме ни на каком публичном " +"форуме, включая (но не ограничиваясь):" #: warehouse/templates/pages/security.html:27 msgid "Our GitHub issue tracker" @@ -5599,23 +5667,24 @@ msgstr "Официальные или неофициальные списки р #: warehouse/templates/pages/security.html:35 #, python-format msgid "" -"Instead, email <a href=\"%(href)s\">security at python dot org</a> directly, " -"providing as much relevant information as possible." +"Instead, email <a href=\"%(href)s\">security at python dot org</a> " +"directly, providing as much relevant information as possible." msgstr "" -"Вместо этого напрямую отправьте электронное письмо на адрес <a href=" -"\"%(href)s\">security собака python точка org</a>, предоставив в нём как " -"можно больше актуальной информации." +"Вместо этого напрямую отправьте электронное письмо на адрес <a " +"href=\"%(href)s\">security собака python точка org</a>, предоставив в нём" +" как можно больше актуальной информации." #: warehouse/templates/pages/security.html:36 #, python-format msgid "" "Messages may be optionally encrypted with GPG using key fingerprints " -"available <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">at the Python Security page</a>." +"available <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">at the Python Security page</a>." msgstr "" -"По желанию сообщения могут быть зашифрованы с помощью GPG с использованием " -"отпечатков ключей, доступных <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">на странице безопасности Python’а</a>." +"По желанию сообщения могут быть зашифрованы с помощью GPG с " +"использованием отпечатков ключей, доступных <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">на странице " +"безопасности Python’а</a>." #: warehouse/templates/pages/security.html:38 msgid "What happens next?" @@ -5626,8 +5695,8 @@ msgid "" "Once you've submitted an issue via email, you should receive an " "acknowledgment within 48 hours." msgstr "" -"После того, как вы отправили сообщение о проблеме по электронной почте, вы " -"должны получить подтверждение в течение 48 часов." +"После того, как вы отправили сообщение о проблеме по электронной почте, " +"вы должны получить подтверждение в течение 48 часов." #: warehouse/templates/pages/security.html:41 msgid "" @@ -5639,8 +5708,7 @@ msgstr "" #: warehouse/templates/pages/security.html:44 msgid "This security policy was last updated on March 14, 2018." -msgstr "" -"Последний раз эта политика безопасности обновлялась 14 марта 2018 года." +msgstr "Последний раз эта политика безопасности обновлялась 14 марта 2018 года." #: warehouse/templates/pages/sitemap.html:21 msgid "PyPI site map" @@ -5686,15 +5754,16 @@ msgstr "Пожертвовать на деятельность Рабочей г #: warehouse/templates/pages/sponsor.html:27 #, python-format msgid "" -"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Packaging Working Group</a> is a work group of the Python Software " -"Foundation which raises and distributes funds to improve Python's packaging " -"ecosystem." +"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Packaging Working Group</a> is a work group of the " +"Python Software Foundation which raises and distributes funds to improve " +"Python's packaging ecosystem." msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Рабочая группа по пакетированию</a> является рабочей группой Python " -"Software Foundation, которая собирает и распределяет средства для улучшения " -"экосистемы создания и распространения Python’ьих пакетов." +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Рабочая группа по пакетированию</a> является рабочей " +"группой Python Software Foundation, которая собирает и распределяет " +"средства для улучшения экосистемы создания и распространения Python’ьих " +"пакетов." #: warehouse/templates/pages/sponsor.html:29 msgid "Recent projects funded through the working group include:" @@ -5707,82 +5776,83 @@ msgid "" "The successful relaunch of the Python Package Index, powered by the new " "'Warehouse' codebase" msgstr "" -"Успешный перезапуск Указателя пакетов Python’а, основанного на новой кодовой " -"базе «Warehouse» («Хранилище»)" +"Успешный перезапуск Указателя пакетов Python’а, основанного на новой " +"кодовой базе «Warehouse» («Хранилище»)" #: warehouse/templates/pages/sponsor.html:33 #, python-format msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$170,000 in funding</a> from the <a href=\"%(funder_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Mozilla Open Source " -"Support Program</a> in 2018" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$170,000 in funding</a> from the <a " +"href=\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Mozilla Open Source Support Program</a> in 2018" msgstr "" -"С помощью <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">финансирования на $170 000</a>, полученного из <a href=" -"\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Программы Mozilla по поддержке ПО с открытым исходным кодом</a> в 2018 " -"году" +"С помощью <a href=\"%(project_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">финансирования на $170 000</a>, " +"полученного из <a href=\"%(funder_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Программы Mozilla по поддержке ПО с " +"открытым исходным кодом</a> в 2018 году" #: warehouse/templates/pages/sponsor.html:36 msgid "" -"Improving PyPI's security and accessibility, and adding support for multiple " -"locales" +"Improving PyPI's security and accessibility, and adding support for " +"multiple locales" msgstr "" -"Улучшения в безопасности и доступности PyPI, а также добавление поддержки " -"нескольких языков" +"Улучшения в безопасности и доступности PyPI, а также добавление поддержки" +" нескольких языков" #: warehouse/templates/pages/sponsor.html:37 #, python-format msgid "" -"With $80,000 in funding from the <a href=\"%(funder_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology Fund</a> in " -"2019" +"With $80,000 in funding from the <a href=\"%(funder_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology " +"Fund</a> in 2019" msgstr "" -"С помощью финансирования на $80 000, полученного от фонда <a href=" -"\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Open Technology Fund</a> в 2019 году" +"С помощью финансирования на $80 000, полученного от фонда <a " +"href=\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Open Technology Fund</a> в 2019 году" #: warehouse/templates/pages/sponsor.html:40 msgid "Additional security-focused features for PyPI" -msgstr "" -"Дополнительные функции PyPI, направленные на повышение его безопасности" +msgstr "Дополнительные функции PyPI, направленные на повышение его безопасности" #: warehouse/templates/pages/sponsor.html:41 #, python-format msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$100,000 in funding</a> from <a href=\"%(funder_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Facebook Research</a> in " -"2019 and 2020" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$100,000 in funding</a> from <a href=\"%(funder_href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Facebook " +"Research</a> in 2019 and 2020" msgstr "" -"С помощью <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">финансирования на $100 000</a>, полученного от <a href=" -"\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Facebook Research</a> в 2019 и 2020 годах" +"С помощью <a href=\"%(project_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">финансирования на $100 000</a>, " +"полученного от <a href=\"%(funder_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Facebook Research</a> в 2019 и 2020 " +"годах" #: warehouse/templates/pages/sponsor.html:44 msgid "Overhauling pip's user experience and dependency resolver" msgstr "" -"Пересмотр процесса взаимодействия с пользователем и разрешения зависимостей " -"в pip" +"Пересмотр процесса взаимодействия с пользователем и разрешения " +"зависимостей в pip" #: warehouse/templates/pages/sponsor.html:45 #, python-format msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$407,000 in funding</a> from the <a href=\"%(funder0_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Chan Zuckerberg " -"Initiative</a> and the <a href=\"%(funder1_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Mozilla Open Source Support Program</a> " -"in 2020" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$407,000 in funding</a> from the <a " +"href=\"%(funder0_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Chan Zuckerberg Initiative</a> and the <a " +"href=\"%(funder1_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Mozilla Open Source Support Program</a> in 2020" msgstr "" -"С помощью <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">финансирования на $407 000</a>, полученного от <a href=" -"\"%(funder0_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">кампании Chan Zuckerberg Initiative</a> и <a href=\"%(funder1_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Программы Mozilla по " -"поддержке ПО с открытым исходным кодом</a> в 2020 году" +"С помощью <a href=\"%(project_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">финансирования на $407 000</a>, " +"полученного от <a href=\"%(funder0_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">кампании Chan Zuckerberg " +"Initiative</a> и <a href=\"%(funder1_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Программы Mozilla по поддержке ПО с " +"открытым исходным кодом</a> в 2020 году" #: warehouse/templates/pages/sponsor.html:49 msgid "" @@ -5804,12 +5874,13 @@ msgstr "Мы высоко ценим как разовые, так и перио #: warehouse/templates/pages/sponsor.html:61 #, python-format msgid "" -"For US taxpayers, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">your donation may be tax-deductible</a>." +"For US taxpayers, <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">your donation may be tax-" +"deductible</a>." msgstr "" -"К сведению налогоплательщиков в США: <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">ваше пожертвование может быть вычтено " -"из налогооблагаемой базы</a>." +"К сведению налогоплательщиков в США: <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">ваше пожертвование" +" может быть вычтено из налогооблагаемой базы</a>." #: warehouse/templates/pages/sponsor.html:62 msgid "Every donation counts!" @@ -5821,11 +5892,10 @@ msgstr "Жертвовать здесь" #: warehouse/templates/pages/sponsor.html:66 #, python-format -msgid "" -"Donating over $5,000? <a href=\"%(href)s\">Become a sponsor</a> instead." +msgid "Donating over $5,000? <a href=\"%(href)s\">Become a sponsor</a> instead." msgstr "" -"Жертвуете более $5 000? Вместо этого <a href=\"%(href)s\">станьте спонсором</" -"a>." +"Жертвуете более $5 000? Вместо этого <a href=\"%(href)s\">станьте " +"спонсором</a>." #: warehouse/templates/pages/sponsor.html:77 msgid "Get your logo on PyPI.org" @@ -5833,8 +5903,8 @@ msgstr "Ваш логотип на PyPI.org" #: warehouse/templates/pages/sponsor.html:78 msgid "" -"Looking for brand visibility? In the last year*, 21.1 million people from " -"237 countries visited PyPI.org." +"Looking for brand visibility? In the last year*, 21.1 million people from" +" 237 countries visited PyPI.org." msgstr "" "Ищете, как повысить узнаваемость бренда? За последний год* сайт PyPI.org " "посетило 21,1 миллиона человек из 237 стран мира." @@ -5849,12 +5919,12 @@ msgstr "Укрепление Python’ьей экосистемы" #: warehouse/templates/pages/sponsor.html:83 msgid "" -"Funds raised by the packaging working group go directly towards improving " -"the tools your company uses every day." +"Funds raised by the packaging working group go directly towards improving" +" the tools your company uses every day." msgstr "" "Средства, собранные рабочей группой по пакетированию, направляются " -"непосредственно на совершенствование инструментов, которыми ваша компания " -"пользуется каждый день." +"непосредственно на совершенствование инструментов, которыми ваша компания" +" пользуется каждый день." #: warehouse/templates/pages/sponsor.html:86 msgid "Boost your reputation" @@ -5862,8 +5932,8 @@ msgstr "Прокачайте свою репутацию" #: warehouse/templates/pages/sponsor.html:87 msgid "" -"Enhance your company's reputation by investing in Python and the open source " -"community." +"Enhance your company's reputation by investing in Python and the open " +"source community." msgstr "" "Улучшите репутацию своей компании, инвестируя в Python и сообщество " "открытого исходного кода." @@ -5892,20 +5962,21 @@ msgstr "" "Логотип на видном месте страницы PyPI с подробными сведениями о проекте, " "<strong>навечно</strong>" +# | msgid "" +# | "<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Sofware " +# | "Foundation blog</a>" #: warehouse/templates/pages/sponsor.html:112 #: warehouse/templates/pages/sponsor.html:133 #, fuzzy, python-format -#| msgid "" -#| "<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Sofware " -#| "Foundation blog</a>" msgid "" -"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation " -"blog</a>" +"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation blog</a>" msgstr "" -"<strong>Отдельная</strong> запись в <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">блоге Python Sofware Foundation</a>" +"<strong>Отдельная</strong> запись в <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">блоге Python " +"Sofware Foundation</a>" #: warehouse/templates/pages/sponsor.html:116 #: warehouse/templates/pages/sponsor.html:139 @@ -5927,7 +5998,8 @@ msgstr "$50 000 в год или эквивалент в пожертвован #: warehouse/templates/pages/sponsor.html:130 msgid "" -"Logo in a <strong>prominent position</strong> on the PyPI project detail page" +"Logo in a <strong>prominent position</strong> on the PyPI project detail " +"page" msgstr "" "Логотип <strong>на видном месте</strong> страницы PyPI с подробными " "сведениями о проекте" @@ -5944,8 +6016,8 @@ msgstr "Логотип в подвале PyPI" #: warehouse/templates/pages/sponsor.html:243 #, python-format msgid "" -"Logo <strong>and write up</strong> on the <a href=\"%(href)s\">PyPI sponsors " -"page</a>" +"Logo <strong>and write up</strong> on the <a href=\"%(href)s\">PyPI " +"sponsors page</a>" msgstr "" "Логотип <strong>и упоминание</strong> на <a href=\"%(href)s\">странице " "спонсоров PyPI</a>" @@ -5959,9 +6031,9 @@ msgid "" "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " "Foundation</a>" msgstr "" -"<strong>Ежеквартальное</strong> выражение благодарности в виде твита от <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Python Software Foundation</a>" +"<strong>Ежеквартальное</strong> выражение благодарности в виде твита от " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Software Foundation</a>" #: warehouse/templates/pages/sponsor.html:135 #: warehouse/templates/pages/sponsor.html:158 @@ -5969,12 +6041,12 @@ msgstr "" #, python-format msgid "" "<strong>Quarterly</strong> thank you tweet from the <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</" -"a>" +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" -"<strong>Ежеквартальное</strong> выражение благодарности в виде твита от <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">учётной записи PyPI в Twitter’е</a>" +"<strong>Ежеквартальное</strong> выражение благодарности в виде твита от " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">учётной записи PyPI в Twitter’е</a>" #: warehouse/templates/pages/sponsor.html:148 msgid "Platinum" @@ -5986,32 +6058,33 @@ msgstr "$30 000 в год или эквивалент в пожертвован #: warehouse/templates/pages/sponsor.html:153 msgid "" -"Logo on <strong>high rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>high rotation</strong> in a prominent position on the " +"PyPI project detail page" msgstr "" "Логотип с <strong>высокой частотой появления</strong> на видном месте " "страницы PyPI с подробными сведениями о проекте" +# | msgid "" +# | "Inclusion in a blog post on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Sofware Foundation blog</a>, " +# | "<strong>with other sponsors</strong> whose sponsorship commenced during " +# | "the same quarter" #: warehouse/templates/pages/sponsor.html:156 #: warehouse/templates/pages/sponsor.html:179 #: warehouse/templates/pages/sponsor.html:201 #: warehouse/templates/pages/sponsor.html:222 #, fuzzy, python-format -#| msgid "" -#| "Inclusion in a blog post on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Sofware Foundation blog</a>, " -#| "<strong>with other sponsors</strong> whose sponsorship commenced during " -#| "the same quarter" msgid "" "Inclusion in a blog post on the <a href=\"%(href)s\" title=\"%(title)s\" " "target=\"_blank\" rel=\"noopener\">Python Software Foundation blog</a>, " -"<strong>with other sponsors</strong> whose sponsorship commenced during the " -"same quarter" +"<strong>with other sponsors</strong> whose sponsorship commenced during " +"the same quarter" msgstr "" -"Упоминание в записи <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">блога Python Sofware Foundation</a>, вместе <strong>с " -"другими спонсорами</strong>, чья спонсорская поддержка началась в этом же " -"квартале" +"Упоминание в записи <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">блога Python Sofware Foundation</a>, " +"вместе <strong>с другими спонсорами</strong>, чья спонсорская поддержка " +"началась в этом же квартале" #: warehouse/templates/pages/sponsor.html:171 msgid "Gold" @@ -6023,8 +6096,8 @@ msgstr "$20 000 в год или эквивалент в пожертвован #: warehouse/templates/pages/sponsor.html:176 msgid "" -"Logo on <strong>medium rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>medium rotation</strong> in a prominent position on the " +"PyPI project detail page" msgstr "" "Логотип со <strong>средней частотой появления</strong> на видном месте " "страницы PyPI с подробными сведениями о проекте" @@ -6039,8 +6112,8 @@ msgstr "$10 000 в год или эквивалент в пожертвован #: warehouse/templates/pages/sponsor.html:199 msgid "" -"Logo on <strong>low rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>low rotation</strong> in a prominent position on the PyPI" +" project detail page" msgstr "" "Логотип с <strong>низкой частотой появления</strong> на видном месте " "страницы PyPI с подробными сведениями о проекте" @@ -6058,20 +6131,20 @@ msgid "" "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " "Foundation</a>" msgstr "" -"Выражение благодарности <strong>два раза в год</strong> в виде твита от <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Python Software Foundation</a>" +"Выражение благодарности <strong>два раза в год</strong> в виде твита от " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Software Foundation</a>" #: warehouse/templates/pages/sponsor.html:203 #, python-format msgid "" "<strong>Bi-yearly</strong> thank you tweet from the <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</" -"a>" +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" -"Выражение благодарности <strong>два раза в год</strong> в виде твита от <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">учётной записи PyPI в Twitter’е</a>" +"Выражение благодарности <strong>два раза в год</strong> в виде твита от " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">учётной записи PyPI в Twitter’е</a>" #: warehouse/templates/pages/sponsor.html:216 msgid "Bronze" @@ -6084,26 +6157,26 @@ msgstr "$5 000 в год или эквивалент в пожертвован #: warehouse/templates/pages/sponsor.html:223 #, python-format msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a> (on initial sponsorship, and on each subsequent renewal)" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a> (on initial sponsorship, and on each subsequent renewal)" msgstr "" -"<strong>Разовое</strong> выражение благодарности в виде твита от <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python " -"Software Foundation</a> (при первоначальном спонсорстве и при каждом " -"последующем обновлении)" +"<strong>Разовое</strong> выражение благодарности в виде твита от <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Software Foundation</a> (при первоначальном " +"спонсорстве и при каждом последующем обновлении)" #: warehouse/templates/pages/sponsor.html:224 #, python-format msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</a> " -"(on initial sponsorship, and on each subsequent renewal)" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a> (on initial sponsorship, and on each subsequent renewal)" msgstr "" -"<strong>Разовое</strong> выражение благодарности в виде твита от <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">учётной " -"записи PyPI в Twitter’е</a> (при первоначальном спонсорстве и при каждом " -"последующем обновлении)" +"<strong>Разовое</strong> выражение благодарности в виде твита от <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">учётной записи PyPI в Twitter’е</a> (при первоначальном " +"спонсорстве и при каждом последующем обновлении)" #: warehouse/templates/pages/sponsor.html:238 msgid "One time grants / custom donations" @@ -6112,58 +6185,62 @@ msgstr "Разовые / индивидуальные пожертвования #: warehouse/templates/pages/sponsor.html:239 #, python-format msgid "" -"Sponsorship of a specific feature, feature set, or community sprint, valued " -"at over $50,000. See <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">fundable packaging improvements</a> for ideas." +"Sponsorship of a specific feature, feature set, or community sprint, " +"valued at over $50,000. See <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">fundable packaging improvements</a> " +"for ideas." msgstr "" "Спонсорская поддержка конкретной функции, набора функций или спринта " -"сообщества стоимостью более $50 000. Смотрите идеи на странице <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">желательных к финансированию улучшений в создании пакетов</a>." - +"сообщества стоимостью более $50 000. Смотрите идеи на странице <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">желательных к финансированию улучшений в создании " +"пакетов</a>." + +# | msgid "" +# | "<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Sofware " +# | "Foundation blog</a>, explaining what the funds will be used for" #: warehouse/templates/pages/sponsor.html:244 #, fuzzy, python-format -#| msgid "" -#| "<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Sofware " -#| "Foundation blog</a>, explaining what the funds will be used for" msgid "" -"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation " -"blog</a>, explaining what the funds will be used for" +"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation blog</a>, explaining what the funds will be used for" msgstr "" -"<strong>Отдельная</strong> запись в <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">блоге Python Sofware Foundation</a>, " -"объясняющая, на что будут использованы эти средства" +"<strong>Отдельная</strong> запись в <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">блоге Python " +"Sofware Foundation</a>, объясняющая, на что будут использованы эти " +"средства" #: warehouse/templates/pages/sponsor.html:245 #, python-format msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a>" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a>" msgstr "" -"<strong>Разовое</strong> выражение благодарности в виде твита от <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python " -"Software Foundation</a>" +"<strong>Разовое</strong> выражение благодарности в виде твита от <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Software Foundation</a>" #: warehouse/templates/pages/sponsor.html:246 #, python-format msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</a>" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" -"<strong>Разовое</strong> выражение благодарности в виде твита от <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">учётной " -"записи PyPI в Twitter’е</a>" +"<strong>Разовое</strong> выражение благодарности в виде твита от <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">учётной записи PyPI в Twitter’е</a>" #: warehouse/templates/pages/sponsor.html:248 msgid "" "Note: A record of working group grants will be listed on the PyPI " "sponsorship page in perpetuity." msgstr "" -"Примечание: запись о пожертвовании рабочей группе будет бессрочно внесена на " -"страницу спонсорства PyPI." +"Примечание: запись о пожертвовании рабочей группе будет бессрочно внесена" +" на страницу спонсорства PyPI." #: warehouse/templates/pages/stats.html:21 msgid "PyPI statistics" @@ -6172,12 +6249,12 @@ msgstr "Статистика PyPI" #: warehouse/templates/pages/stats.html:23 msgid "" "We all love stats, so here are some useful statistics about PyPI. The " -"statistics page is cached for 24 hours, so don't expect the numbers to be " -"realtime." +"statistics page is cached for 24 hours, so don't expect the numbers to be" +" realtime." msgstr "" "Все мы любим статистику, так что вот некоторые полезные статистические " -"данные о PyPI. Страница статистики кэшируется на 24 часа, так что не ждите, " -"что цифры на ней будут обновляться в реальном времени." +"данные о PyPI. Страница статистики кэшируется на 24 часа, так что не " +"ждите, что цифры на ней будут обновляться в реальном времени." #: warehouse/templates/pages/stats.html:30 msgid "Top projects by total package size" @@ -6185,11 +6262,11 @@ msgstr "Топ проектов по общему размеру пакета" #: warehouse/templates/pages/stats.html:32 msgid "" -"Here is a list of the top 100 projects based on the sum of their packages' " -"sizes (in bytes)." +"Here is a list of the top 100 projects based on the sum of their " +"packages' sizes (in bytes)." msgstr "" -"Ниже приведён список из 100 проектов с самым большим суммарным размеров их " -"пакетов (в байтах)." +"Ниже приведён список из 100 проектов с самым большим суммарным размеров " +"их пакетов (в байтах)." #: warehouse/templates/pages/stats.html:39 msgid "Statistics by project" @@ -6225,8 +6302,7 @@ msgstr "Фильтр по <a href=\"%(href)s\">классификатору</a>" #: warehouse/templates/search/results.html:109 msgid "Enter a search query, or select a filter from the list of classifiers." -msgstr "" -"Введите поисковый запрос или выберите фильтр из списка классификаторов." +msgstr "Введите поисковый запрос или выберите фильтр из списка классификаторов." #: warehouse/templates/search/results.html:110 msgid "Enter a search query, or add a filter by clicking on the button." @@ -6242,8 +6318,7 @@ msgstr "Проекты, совместимые с третьим Python’ом" #: warehouse/templates/search/results.html:120 msgid "Sphinx extensions that have a stable/production status" -msgstr "" -"Расширения Sphinx, имеющие стабильный статус/готовые к боевому применению" +msgstr "Расширения Sphinx, имеющие стабильный статус/готовые к боевому применению" #: warehouse/templates/search/results.html:125 msgid "Projects related to \"graphics\" with OSI-approved licenses" @@ -6353,7 +6428,8 @@ msgstr[2] "" #~ msgid "A new collaborator has been added to a project you own on PyPI:" #~ msgstr "" -#~ "Новый соавтор был добавлен в проект, владельцем которого являетесь вы на " +#~ "Новый соавтор был добавлен в проект, " +#~ "владельцем которого являетесь вы на " #~ "PyPI:" #~ msgid "<strong>Username</strong>: %(username)s" @@ -6369,52 +6445,45 @@ msgstr[2] "" #~ msgstr "<strong>Добавлен</strong>: %(submitter)s" #~ msgid "" -#~ "If this was a mistake, you can email <a href=\"%(href)s\">" -#~ "%(email_address)s</a> to communicate with the PyPI administrators." +#~ "If this was a mistake, you can " +#~ "email <a href=\"%(href)s\">%(email_address)s</a> to" +#~ " communicate with the PyPI administrators." #~ msgstr "" -#~ "Если это было ошибкой, вы можете отправить письмо на <a href=\"%(href)s\">" -#~ "%(email_address)s</a>, чтобы связаться с администраторами PyPI." +#~ "Если это было ошибкой, вы можете " +#~ "отправить письмо на <a " +#~ "href=\"%(href)s\">%(email_address)s</a>, чтобы связаться" +#~ " с администраторами PyPI." #~ msgid "You are receiving this because you are an owner of this project." #~ msgstr "Вы получили это, поскольку вы владелец этого проекта." -#, fuzzy -#~| msgid "This project has no releases" #~ msgid "The project %(project)s has been deleted." #~ msgstr "Этот проект не имеет опубликованных версий" -#, fuzzy -#~| msgid "<strong>Added by</strong>: %(submitter)s" #~ msgid "" #~ "<strong>Deleted by:</strong> %(submitter)s with a role:\n" #~ " %(role)s." #~ msgstr "<strong>Добавлен</strong>: %(submitter)s" -#, fuzzy -#~| msgid "" -#~| "If this was a mistake, you can email <a href=\"%(href)s\">" -#~| "%(email_address)s</a> to communicate with the PyPI administrators." #~ msgid "" #~ "If this was a mistake, you can email <a\n" -#~ " href=\"%(href)s\">%(email_address)s</a> to communicate with the PyPI " -#~ "administrators." +#~ " href=\"%(href)s\">%(email_address)s</a> to " +#~ "communicate with the PyPI administrators." #~ msgstr "" -#~ "Если это было ошибкой, вы можете отправить письмо на <a href=\"%(href)s\">" -#~ "%(email_address)s</a>, чтобы связаться с администраторами PyPI." +#~ "Если это было ошибкой, вы можете " +#~ "отправить письмо на <a " +#~ "href=\"%(href)s\">%(email_address)s</a>, чтобы связаться" +#~ " с администраторами PyPI." -#, fuzzy -#~| msgid "You are receiving this because you are an owner of this project." #~ msgid "" -#~ "You are receiving this because you are %(recipient_role_descr)s of this " -#~ "project." +#~ "You are receiving this because you " +#~ "are %(recipient_role_descr)s of this project." #~ msgstr "Вы получили это, поскольку вы владелец этого проекта." -#, fuzzy -#~| msgid "You are receiving this because you are an owner of this project." #~ msgid "" #~ "\n" -#~ "You are receiving this because you are %(recipient_role_descr)s of this " -#~ "project." +#~ "You are receiving this because you " +#~ "are %(recipient_role_descr)s of this project." #~ msgstr "Вы получили это, поскольку вы владелец этого проекта." #~ msgid "View <span>hashes</span>" @@ -6424,40 +6493,53 @@ msgstr[2] "" #~ msgstr "Бета-функция" #~ msgid "" -#~ "If you lose your %(method)s and can no longer log in, the PyPI team " -#~ "<strong>cannot</strong> currently help you recover your account. We plan " -#~ "to develop a <a href=\"%(policy_href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">manual account recovery policy</a> and " -#~ "implement <a href=\"%(recovery_codes_href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">account recovery codes</a> to address this " -#~ "issue." +#~ "If you lose your %(method)s and " +#~ "can no longer log in, the PyPI " +#~ "team <strong>cannot</strong> currently help " +#~ "you recover your account. We plan " +#~ "to develop a <a href=\"%(policy_href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">manual account recovery policy</a>" +#~ " and implement <a " +#~ "href=\"%(recovery_codes_href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\">account recovery " +#~ "codes</a> to address this issue." #~ msgstr "" -#~ "Если вы потеряете свой %(method)s и больше не можете войти, команда PyPI " -#~ "пока <strong>не может</strong> помочь вам восстановить свою учетную " -#~ "запись. Для решения этого вопроса, мы планируем разработать <a href=" -#~ "\"%(policy_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -#~ "\">политику ручного восстановления учетных записей</a> и внедрить <a href=" -#~ "\"%(recovery_codes_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -#~ "\"noopener\">коды для восстановления учетных записей</a>." +#~ "Если вы потеряете свой %(method)s и " +#~ "больше не можете войти, команда PyPI " +#~ "пока <strong>не может</strong> помочь вам " +#~ "восстановить свою учетную запись. Для " +#~ "решения этого вопроса, мы планируем " +#~ "разработать <a href=\"%(policy_href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">политику ручного восстановления " +#~ "учетных записей</a> и внедрить <a " +#~ "href=\"%(recovery_codes_href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\">коды для " +#~ "восстановления учетных записей</a>." #~ msgid "" #~ "\n" -#~ " In the short term, we recommend that all PyPI users set up " -#~ "<em>both</em>\n" -#~ " supported two factor authentication methods - using an " -#~ "authentication\n" -#~ " application <em>and</em> setting up a security device (e.g. USB " -#~ "key).\n" +#~ " In the short term, we " +#~ "recommend that all PyPI users set " +#~ "up <em>both</em>\n" +#~ " supported two factor authentication" +#~ " methods - using an authentication\n" +#~ " application <em>and</em> setting up" +#~ " a security device (e.g. USB key)." +#~ "\n" #~ " " #~ msgstr "" #~ "\n" -#~ " В краткосрочной перспективе, мы советуем всем пользователям PyPI " -#~ "настроить <em>оба</em>\n" -#~ " способа двухфакторной аутентификации - использовать приложение\n" -#~ " аутентификации <em>и</em> настроить устройство безопасности " -#~ "(напр., USB-ключ).\n" +#~ " В краткосрочной перспективе, мы " +#~ "советуем всем пользователям PyPI настроить " +#~ "<em>оба</em>\n" +#~ " способа двухфакторной аутентификации -" +#~ " использовать приложение\n" +#~ " аутентификации <em>и</em> настроить " +#~ "устройство безопасности (напр., USB-ключ).\n" #~ " " -#~ msgid "" -#~ "There have been too many unsuccessful login attempts, try again later." +#~ msgid "There have been too many unsuccessful login attempts, try again later." #~ msgstr "Слишком много неудачных попыток входа. Попробуйте позже." + diff --git a/warehouse/locale/uk/LC_MESSAGES/messages.mo b/warehouse/locale/uk/LC_MESSAGES/messages.mo index 8ce649360308..2ca72871d4a6 100644 Binary files a/warehouse/locale/uk/LC_MESSAGES/messages.mo and b/warehouse/locale/uk/LC_MESSAGES/messages.mo differ diff --git a/warehouse/locale/uk/LC_MESSAGES/messages.po b/warehouse/locale/uk/LC_MESSAGES/messages.po index a780d11db5b0..d27635415aef 100644 --- a/warehouse/locale/uk/LC_MESSAGES/messages.po +++ b/warehouse/locale/uk/LC_MESSAGES/messages.po @@ -1,32 +1,3 @@ -# Translations template for Warehouse. -# Copyright (C) 2019 PyPA -# This file is distributed under the same license as the Warehouse project. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2019. -# Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua>, 2019. -# okawo <okawo.198@gmail.com>, 2019. -# Sviatoslav Sydorenko <wk+weblate.org@sydorenko.org.ua>, 2019, 2020. -# Alex Solonenko <alex.solonencko@gmail.com>, 2019, 2020. -# Roksolana <roksolana.d22@gmail.com>, 2019. -# Olexandr <me.olexandr.kovalchuk@gmail.com>, 2020. -# anonymous <noreply@weblate.org>, 2020. -msgid "" -msgstr "" -"Project-Id-Version: Warehouse VERSION\n" -"Report-Msgid-Bugs-To: https://github.com/pypa/warehouse/issues/new\n" -"POT-Creation-Date: 2020-01-15 20:11+0200\n" -"PO-Revision-Date: 2020-04-05 13:40+0000\n" -"Last-Translator: Alex Solonenko <alex.solonencko@gmail.com>\n" -"Language-Team: Ukrainian <https://hosted.weblate.org/projects/pypa/warehouse/" -"uk/>\n" -"Language: uk\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 4.0-dev\n" -"Generated-By: Babel 2.7.0\n" - #: warehouse/views.py:254 msgid "Locale updated" msgstr "Локаль оновлено" @@ -46,17 +17,18 @@ msgstr "Оберіть ім'я користувача, довжиною 50 си #: warehouse/accounts/forms.py:85 msgid "" "The username is invalid. Usernames must be composed of letters, numbers, " -"dots, hyphens and underscores. And must also start and finish with a letter " -"or number. Choose a different username." +"dots, hyphens and underscores. And must also start and finish with a " +"letter or number. Choose a different username." msgstr "" -"Таке ім'я користувача неправильне. Імена користувачів мають складатися із " -"літер, чисел, крапок, дефісів та підкреслень. Також вони мають починатися і " -"закінчуватися на літеру або число. Оберіть інше ім'я користувача." +"Таке ім'я користувача неправильне. Імена користувачів мають складатися із" +" літер, чисел, крапок, дефісів та підкреслень. Також вони мають " +"починатися і закінчуватися на літеру або число. Оберіть інше ім'я " +"користувача." #: warehouse/accounts/forms.py:99 msgid "" -"This username is already being used by another account. Choose a different " -"username." +"This username is already being used by another account. Choose a " +"different username." msgstr "" "Таким ім'ям користувача уже користується хтось інший. Оберіть інше ім'я " "користувача." @@ -85,16 +57,16 @@ msgstr "" #: warehouse/accounts/forms.py:209 msgid "" -"This email address is already being used by this account. Use a different " -"email." +"This email address is already being used by this account. Use a different" +" email." msgstr "" -"Ця електронна адреса вже використовується у цьому обліковому записі. Введіть " -"іншу." +"Ця електронна адреса вже використовується у цьому обліковому записі. " +"Введіть іншу." #: warehouse/accounts/forms.py:216 msgid "" -"This email address is already being used by another account. Use a different " -"email." +"This email address is already being used by another account. Use a " +"different email." msgstr "Ця електронна адреса вже кимось використовується. Введіть іншу." #: warehouse/accounts/forms.py:238 @@ -137,11 +109,11 @@ msgstr "Код відновлення прийнято. Введений код #: warehouse/accounts/views.py:455 msgid "" -"New user registration temporarily disabled. See https://pypi.org/help#admin-" -"intervention for details." +"New user registration temporarily disabled. See https://pypi.org/help" +"#admin-intervention for details." msgstr "" -"Реєстрація нових користувачів тимчасово вимкнена. Ознайомтеся з деталями на " -"https://pypi.org/help#admin-intervention." +"Реєстрація нових користувачів тимчасово вимкнена. Ознайомтеся з деталями " +"на https://pypi.org/help#admin-intervention." #: warehouse/accounts/views.py:552 msgid "Expired token: request a new password reset link" @@ -167,8 +139,7 @@ msgstr "Недійсний токен: користувача не знайде #: warehouse/accounts/views.py:572 msgid "Invalid token: user has logged in since this token was requested" -msgstr "" -"Недійсний токен: користувач здійснив вхід з моменту запиту цього токена" +msgstr "Недійсний токен: користувач здійснив вхід з моменту запиту цього токена" #: warehouse/accounts/views.py:579 msgid "" @@ -217,12 +188,13 @@ msgstr "Електронну адресу ${email_address} підтвердже #: warehouse/manage/views.py:186 msgid "Email ${email_address} added - check your email for a verification link" msgstr "" -"Електронну адресу ${email_address} додано — знайдіть посилання-підтвердження " -"у своїй електронній скриньці" +"Електронну адресу ${email_address} додано — знайдіть " +"посилання-підтвердження у своїй електронній скриньці" #: warehouse/manage/views.py:667 warehouse/manage/views.py:703 msgid "" -"You must provision a two factor method before recovery codes can be generated" +"You must provision a two factor method before recovery codes can be " +"generated" msgstr "" "Ви повинні увімкнути двофакторну авторизацію, щоб коди відновлення можна " "було згенерувати" @@ -233,8 +205,7 @@ msgstr "Коди відновлення вже згенеровано" #: warehouse/manage/views.py:679 msgid "Generating new recovery codes will invalidate your existing codes." -msgstr "" -"Генерування нових кодів відновлення зробить недійсними ваші існуючі коди." +msgstr "Генерування нових кодів відновлення зробить недійсними ваші існуючі коди." #: warehouse/manage/views.py:729 msgid "Invalid credentials. Try again" @@ -411,13 +382,13 @@ msgstr "Щось пішло шкереберть" #: warehouse/templates/500.html:22 msgid "" -"<p>We are experiencing technical issues that are affecting our ability to " -"serve you this site.</p> <p>We are aware of the problem and are working to " -"resolve it as soon as possible.</p>" +"<p>We are experiencing technical issues that are affecting our ability to" +" serve you this site.</p> <p>We are aware of the problem and are working " +"to resolve it as soon as possible.</p>" msgstr "" "<p>У нас виникли технічні проблеми, які перешкоджають нашій здатності " -"показувати вам цей сайт.</p> <p>Нам відомо про цю проблему, і ми працюємо " -"над її щонайшвидшим вирішенням.</p>" +"показувати вам цей сайт.</p> <p>Нам відомо про цю проблему, і ми працюємо" +" над її щонайшвидшим вирішенням.</p>" #: warehouse/templates/500.html:28 msgid "Check our status page" @@ -437,24 +408,25 @@ msgstr "Покладаєтеся на PyPI, аби виконувати свою #: warehouse/templates/500.html:37 msgid "" -"Consider <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\" rel=" -"\"noopener\"> contributing </a> or <a href=\"https://psfmember.org/civicrm/" -"contribute/transact?reset=1&id=13\" target=\"_blank\" rel=\"noopener\"> " -"donating </a> to help us build a more stable and secure platform." +"Consider <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\" " +"rel=\"noopener\"> contributing </a> or <a " +"href=\"https://psfmember.org/civicrm/contribute/transact?reset=1&id=13\" " +"target=\"_blank\" rel=\"noopener\"> donating </a> to help us build a more" +" stable and secure platform." msgstr "" -"Розгляньте можливість <a href=\"https://github.com/pypa/warehouse\" target=" -"\"_blank\" rel=\"noopener\"> вкладу </a> або ж <a href=\"https://psfmember." -"org/civicrm/contribute/transact?reset=1&id=13\" target=\"_blank\" rel=" -"\"noopener\"> пожертви </a>, щоб допомогти нам будувати стабільнішу та " -"безпечнішу платформу." +"Розгляньте можливість <a href=\"https://github.com/pypa/warehouse\" " +"target=\"_blank\" rel=\"noopener\"> вкладу </a> або ж <a " +"href=\"https://psfmember.org/civicrm/contribute/transact?reset=1&id=13\" " +"target=\"_blank\" rel=\"noopener\"> пожертви </a>, щоб допомогти нам " +"будувати стабільнішу та безпечнішу платформу." #: warehouse/templates/base.html:23 msgid "" -"Choose a strong password that contains letters (uppercase and lowercase), " -"numbers and special characters. Avoid common words or repetition." +"Choose a strong password that contains letters (uppercase and lowercase)," +" numbers and special characters. Avoid common words or repetition." msgstr "" -"Оберіть надійний пароль, який містить літери (великі й маленькі), числа та " -"особливі символи. Уникайте загальних слів та повторень." +"Оберіть надійний пароль, який містить літери (великі й маленькі), числа " +"та особливі символи. Уникайте загальних слів та повторень." #: warehouse/templates/base.html:26 msgid "Password strength:" @@ -510,11 +482,11 @@ msgstr "Головне меню" #: warehouse/templates/base.html:76 warehouse/templates/index.html:79 msgid "" -"The Python Package Index (PyPI) is a repository of software for the Python " -"programming language." +"The Python Package Index (PyPI) is a repository of software for the " +"Python programming language." msgstr "" -"Реєстр Python-пакунків (PyPI) це сховище програмного забезпечення для мови " -"програмування Python." +"Реєстр Python-пакунків (PyPI) це сховище програмного забезпечення для " +"мови програмування Python." #: warehouse/templates/base.html:92 msgid "RSS: 40 latest updates" @@ -546,23 +518,22 @@ msgstr "Попередження" #: warehouse/templates/base.html:158 msgid "You are using an unsupported browser, upgrade to a newer version." -msgstr "" -"Ви використовуєте непідтримуваний браузер, оновіть його до новішої версії." +msgstr "Ви використовуєте непідтримуваний браузер, оновіть його до новішої версії." #: warehouse/templates/base.html:167 msgid "" "You are using TestPyPI – a separate instance of the Python Package Index " -"that allows you to try distribution tools and processes without affecting " -"the real index." +"that allows you to try distribution tools and processes without affecting" +" the real index." msgstr "" -"Ви використовуєте TestPyPI — це окремий екземпляр реєстру Python-пакунків, " -"який надає вам можливість спробувати засоби і процеси, не впливаючи на " -"справжній реєстр." +"Ви використовуєте TestPyPI — це окремий екземпляр реєстру " +"Python-пакунків, який надає вам можливість спробувати засоби і процеси, " +"не впливаючи на справжній реєстр." #: warehouse/templates/base.html:177 msgid "" -"Some features may not work without JavaScript. Please try enabling it if you " -"encounter problems." +"Some features may not work without JavaScript. Please try enabling it if " +"you encounter problems." msgstr "" "Деякі функції можуть не працювати без JavaScript. Будь ласка, спробуйте " "увімкнути його, якщо у вас виникнуть проблеми." @@ -687,7 +658,8 @@ msgstr "усі системи працюють" #: warehouse/templates/base.html:311 msgid "" -"Developed and maintained by the Python community, for the Python community." +"Developed and maintained by the Python community, for the Python " +"community." msgstr "Розробляється та доглядається спільнотою Python, для спільноти Python." #: warehouse/templates/base.html:313 @@ -717,14 +689,14 @@ msgstr "Реєстр Python-пакунків" #: warehouse/templates/index.html:42 msgid "Test Python package publishing with the Test Python Package Index" msgstr "" -"Спробуйте публікувати Python-пакунки за допомогою Тестового Реєстру Python-" -"пакунків" +"Спробуйте публікувати Python-пакунки за допомогою Тестового Реєстру " +"Python-пакунків" #: warehouse/templates/index.html:44 msgid "Find, install and publish Python packages with the Python Package Index" msgstr "" -"Знаходьте, встановлюйте та публікуйте Python-пакунки за допомогою Реєстру " -"Python-пакунків" +"Знаходьте, встановлюйте та публікуйте Python-пакунки за допомогою Реєстру" +" Python-пакунків" #: warehouse/templates/index.html:60 #, python-format @@ -753,8 +725,8 @@ msgstr "%(num_users)s користувач(-і,-ів)" #: warehouse/templates/index.html:81 msgid "" -"PyPI helps you find and install software developed and shared by the Python " -"community." +"PyPI helps you find and install software developed and shared by the " +"Python community." msgstr "" "PyPI допомагає вам знаходити і встановлювати програмне забезпечення, " "розроблене і поширене спільнотою Python." @@ -796,20 +768,22 @@ msgstr "Ця URL-адреса є точкою виходу API для заван #: warehouse/templates/upload.html:26 #, python-format msgid "" -"For more information on uploading projects to PyPI, visit the <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python " -"Packaging User Guide</a>." +"For more information on uploading projects to PyPI, visit the <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" -"Щоб дізнатися більше про завантаження проектів до PyPI, відвідайте <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">користувацьке керівництво з пакування Python</a>." +"Щоб дізнатися більше про завантаження проектів до PyPI, відвідайте <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">користувацьке керівництво з пакування Python</a>." #: warehouse/templates/upload.html:28 #, python-format msgid "" -"Otherwise, we suggest you <a href=\"%(href)s\">go to the PyPI homepage</a>." +"Otherwise, we suggest you <a href=\"%(href)s\">go to the PyPI " +"homepage</a>." msgstr "" -"Інакше, радимо вам <a href=\"%(href)s\">перейти на домашню сторінку PyPI</a>." +"Інакше, радимо вам <a href=\"%(href)s\">перейти на домашню сторінку " +"PyPI</a>." #: warehouse/templates/accounts/login.html:17 #: warehouse/templates/accounts/recovery-code.html:17 @@ -976,14 +950,14 @@ msgstr "Підтвердити" #: warehouse/templates/accounts/recovery-code.html:58 msgid "" -"PyPI allows for generating recovery codes to be stored securely offline in " -"the event that your device or application is lost. Enter one of these codes " -"in the form to verify your identity. Once used, the recovery code will no " -"longer be valid." +"PyPI allows for generating recovery codes to be stored securely offline " +"in the event that your device or application is lost. Enter one of these " +"codes in the form to verify your identity. Once used, the recovery code " +"will no longer be valid." msgstr "" -"PyPI дозволяє генерувати коди відновлення, які будуть зберігатись надійно " -"оффлайн, у випадку, якщо ваш пристрій чи застосунок втрачено. Введіть один " -"із цих кодів для того, щоб ідентифікувати вашу особистість. Після " +"PyPI дозволяє генерувати коди відновлення, які будуть зберігатись надійно" +" оффлайн, у випадку, якщо ваш пристрій чи застосунок втрачено. Введіть " +"один із цих кодів для того, щоб ідентифікувати вашу особистість. Після " "використання код відновлення перестає бути дійсним." #: warehouse/templates/accounts/recovery-code.html:59 @@ -1049,12 +1023,12 @@ msgstr "Підтвердіть пароль" #: warehouse/templates/accounts/register.html:157 msgid "" "This password appears in a security breach or has been compromised and " -"cannot be used. Please refer to the <a href=\"/help/#compromised-password" -"\">FAQ</a> for more information." +"cannot be used. Please refer to the <a href=\"/help/#compromised-" +"password\">FAQ</a> for more information." msgstr "" -"Цей пароль з'явився у зламі безпеки або його було скомпрометовано, і більше " -"ним користуватися не можна. Будь ласка, зверніться до <a href=\"/help/" -"#compromised-password\">ЧаПів</a>, аби дізнатися більше." +"Цей пароль з'явився у зламі безпеки або його було скомпрометовано, і " +"більше ним користуватися не можна. Будь ласка, зверніться до <a " +"href=\"/help/#compromised-password\">ЧаПів</a>, аби дізнатися більше." #: warehouse/templates/accounts/register.html:162 msgid "Create account" @@ -1067,8 +1041,7 @@ msgstr "Скидання пароля" #: warehouse/templates/accounts/request-password-reset.html:27 msgid "To reset your password, enter your username or email." -msgstr "" -"Щоб скинути пароль, введіть своє ім'я користувача або електронну адресу." +msgstr "Щоб скинути пароль, введіть своє ім'я користувача або електронну адресу." #: warehouse/templates/accounts/request-password-reset.html:39 msgid "Username or email" @@ -1089,8 +1062,8 @@ msgstr "Листа надіслано на вашу зареєстровану #: warehouse/templates/accounts/request-password-reset.html:52 #, python-format msgid "" -"The email contains a link to reset your password. This link will expire in " -"%(n_hours)s hours." +"The email contains a link to reset your password. This link will expire " +"in %(n_hours)s hours." msgstr "" "Електронний лист містить посилання для скидання пароля. Термін дії цього " "посилення збіжить за %(n_hours)s годин(-у,-и)." @@ -1117,16 +1090,15 @@ msgstr "Двофакторна автентифікація" #: warehouse/templates/accounts/two-factor.html:36 msgid "Authenticate with a security device (e.g. USB key)" -msgstr "" -"Здійснюйте автентифікацію за допомогою пристрою безпеки (напр. USB-ключа)" +msgstr "Здійснюйте автентифікацію за допомогою пристрою безпеки (напр. USB-ключа)" #: warehouse/templates/accounts/two-factor.html:39 msgid "" "Connect your security device and click the \"Authenticate with device\" " "button." msgstr "" -"Підключіть свій пристрій безпеки і клікніть на кнопку «Автентифікуватися за " -"допомогою пристрою»." +"Підключіть свій пристрій безпеки і клікніть на кнопку «Автентифікуватися " +"за допомогою пристрою»." #: warehouse/templates/accounts/two-factor.html:42 msgid "Enable JavaScript to log in with a security device (e.g. USB key)" @@ -1141,19 +1113,20 @@ msgstr "Автентифікуватися за допомогою пристр #: warehouse/templates/accounts/two-factor.html:55 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" rel=\"%(rel)s" -"\">Upgrade your browser</a> to log in with a security device (e.g. USB key)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" " +"rel=\"%(rel)s\">Upgrade your browser</a> to log in with a security device" +" (e.g. USB key)" msgstr "" -"Щоб увійти за допомогою пристрою безпеки (напр. USB-ключа), <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" rel=\"%(rel)s" -"\">оновіть свій веб-браузер</a>" +"Щоб увійти за допомогою пристрою безпеки (напр. USB-ключа), <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" " +"rel=\"%(rel)s\">оновіть свій веб-браузер</a>" #: warehouse/templates/accounts/two-factor.html:60 #, python-format msgid "Lost your device? Not working? <a href=\"%(href)s\">Get help</a>." msgstr "" -"Втратили свій пристрій? Не працює? <a href=\"%(href)s\">Отримайте допомогу</" -"a>." +"Втратили свій пристрій? Не працює? <a href=\"%(href)s\">Отримайте " +"допомогу</a>." #: warehouse/templates/accounts/two-factor.html:72 msgid "Authenticate with an app" @@ -1166,14 +1139,15 @@ msgstr "Введіть код автентифікації" #: warehouse/templates/accounts/two-factor.html:105 #, python-format msgid "" -"<p>Generate a code using the authentication application connected to your " -"PyPI account. Enter this code in the form to verify your identity.</p> " -"<p>Lost your application? Not working? <a href=\"%(href)s\">Get help</a>.</p>" +"<p>Generate a code using the authentication application connected to your" +" PyPI account. Enter this code in the form to verify your identity.</p> " +"<p>Lost your application? Not working? <a href=\"%(href)s\">Get " +"help</a>.</p>" msgstr "" -"<p>Згенеруйте код, використовуючи застосунок автентифікації, пов'язаний із " -"вашим обліковим записом на PyPI. Введіть цей код до форми, аби підтвердити " -"свою особистість.</p> <p>Втратили свій застосунок? Не працює? <a href=" -"\"%(href)s\">Отримайте допомогу</a>.</p>" +"<p>Згенеруйте код, використовуючи застосунок автентифікації, пов'язаний " +"із вашим обліковим записом на PyPI. Введіть цей код до форми, аби " +"підтвердити свою особистість.</p> <p>Втратили свій застосунок? Не працює?" +" <a href=\"%(href)s\">Отримайте допомогу</a>.</p>" #: warehouse/templates/accounts/two-factor.html:117 msgid "Lost your security key or application?" @@ -1186,20 +1160,20 @@ msgstr "Увійти за допомогою Коду Відновлення" #: warehouse/templates/accounts/two-factor.html:122 #, python-format msgid "" -"<p><strong>You have not generated account recovery codes.</strong></p> <p>If " -"you lose access to your two factor methods, you may lose access to your " -"account. <a href=\"%(href)s\">Get help with recovery codes.</a></p>" +"<p><strong>You have not generated account recovery codes.</strong></p> " +"<p>If you lose access to your two factor methods, you may lose access to " +"your account. <a href=\"%(href)s\">Get help with recovery codes.</a></p>" msgstr "" -"<p><strong>Ви не згенерували коди відновлення для вашого облікового запису.</" -"strong></p> <p>Якщо ви втратите доступ до ваших методів двофакторної " -"авторизації, то ви можете втратити доступ до вашого облікового запису. <a " -"href=\"%(href)s\">Отримайте допомогу з кодами відновлення.</a></p>" +"<p><strong>Ви не згенерували коди відновлення для вашого облікового " +"запису.</strong></p> <p>Якщо ви втратите доступ до ваших методів " +"двофакторної авторизації, то ви можете втратити доступ до вашого " +"облікового запису. <a href=\"%(href)s\">Отримайте допомогу з кодами " +"відновлення.</a></p>" #: warehouse/templates/email/account-deleted/body.html:18 #, python-format msgid "Your PyPI account <strong>%(username)s</strong> has been deleted." -msgstr "" -"Ваш обліковий запис <strong>%(username)s</strong> було видалено з PyPI." +msgstr "Ваш обліковий запис <strong>%(username)s</strong> було видалено з PyPI." #: warehouse/templates/email/account-deleted/body.html:20 #: warehouse/templates/email/password-change/body.html:20 @@ -1208,11 +1182,13 @@ msgstr "" #: warehouse/templates/email/two-factor-removed/body.html:20 #, python-format msgid "" -"If you did not make this change, you can email <a href=\"%(href)s\">" -"%(email_address)s</a> to communicate with the PyPI administrators." +"If you did not make this change, you can email <a " +"href=\"%(href)s\">%(email_address)s</a> to communicate with the PyPI " +"administrators." msgstr "" -"Якщо ви не робили цієї зміни, ви можете написати листа на <a href=\"%(href)s" -"\">%(email_address)s</a>, аби зв'язатися з адміністраторами PyPI." +"Якщо ви не робили цієї зміни, ви можете написати листа на <a " +"href=\"%(href)s\">%(email_address)s</a>, аби зв'язатися з " +"адміністраторами PyPI." #: warehouse/templates/email/added-as-collaborator/body.html:19 #, python-format @@ -1233,11 +1209,11 @@ msgstr "Ви отримали це, бо %(submitter)s додає вас до п #: warehouse/templates/email/password-change/body.html:18 #, python-format msgid "" -"Someone, perhaps you, has changed the password for your PyPI account <strong>" -"%(username)s</strong>." +"Someone, perhaps you, has changed the password for your PyPI account " +"<strong>%(username)s</strong>." msgstr "" -"Хтось, можливо ви, змінив пароль до вашого облікового запису <strong>" -"%(username)s</strong> на PyPI." +"Хтось, можливо ви, змінив пароль до вашого облікового запису " +"<strong>%(username)s</strong> на PyPI." #: warehouse/templates/email/password-compromised-hibp/body.html:18 #: warehouse/templates/email/password-compromised/body.html:18 @@ -1246,15 +1222,16 @@ msgstr "Що?" #: warehouse/templates/email/password-compromised/body.html:20 msgid "" -"PyPI administrators have determined that your password is compromised. To\n" -" protect you and other users, we have preemptively reset your password and " -"you\n" +"PyPI administrators have determined that your password is compromised. To" +"\n" +" protect you and other users, we have preemptively reset your password " +"and you\n" " will no longer be able to log in or upload to PyPI with your existing\n" " password." msgstr "" "Адміністратори PyPI з'ясували, що ваш пароль скомпрометовано. Аби\n" -" захистити вас та інших користувачів, ми превентивно скинули ваш пароль, і " -"ви\n" +" захистити вас та інших користувачів, ми превентивно скинули ваш пароль," +" і ви\n" " більше не зможете увійти чи завантажувати до PyPI за допомогою свого " "існуючого\n" " пароля." @@ -1276,11 +1253,11 @@ msgstr "Що мені робити?" #: warehouse/templates/email/password-compromised/body.html:33 #, python-format msgid "" -"To regain access to your account, <a href=\"%(href)s\">reset your password</" -"a> on PyPI." +"To regain access to your account, <a href=\"%(href)s\">reset your " +"password</a> on PyPI." msgstr "" -"Щоб відновити доступ до свого облікового запису, <a href=\"%(href)s" -"\">скиньте свій пароль</a> на PyPI." +"Щоб відновити доступ до свого облікового запису, <a " +"href=\"%(href)s\">скиньте свій пароль</a> на PyPI." #: warehouse/templates/email/password-compromised/body.html:39 msgid "How can I contact you?" @@ -1289,7 +1266,8 @@ msgstr "Як із вами зв'язатися?" #: warehouse/templates/email/password-compromised/body.html:41 #, python-format msgid "" -"For more information, you can email %(email_address)s to communicate with\n" +"For more information, you can email %(email_address)s to communicate with" +"\n" " the PyPI administrators." msgstr "" "Щоб дізнатися більше, ви можете написати листа на %(email_address)s, аби " @@ -1302,12 +1280,12 @@ msgid "" "password appears\n" " in public data breaches. To protect you and other users, we have " "preemptively reset your\n" -" password and you will no longer be able to log in or upload to PyPI with " -"your existing\n" +" password and you will no longer be able to log in or upload to PyPI " +"with your existing\n" " password." msgstr "" -"Коли ви нещодавно намагалися увійти або завантажити на PyPI, ми помітили що " -"ваш пароль з'являється\n" +"Коли ви нещодавно намагалися увійти або завантажити на PyPI, ми помітили " +"що ваш пароль з'являється\n" " у публічних витоках даних. Для того, щоб захистити вас та інших " "користувачів, ми превентивно скинули ваш\n" " пароль, і ви більше не зможете увійти або завантажити на PyPI, " @@ -1323,22 +1301,23 @@ msgid "" " attacks against PyPI and its users." msgstr "" "Сам PyPI не зазнав злому. Це захисна міра для зниження\n" -" ризику атак <a href=\"%(href)s\">підстановки облікових даних (credential " -"stuffing)</a>\n" +" ризику атак <a href=\"%(href)s\">підстановки облікових даних " +"(credential stuffing)</a>\n" " на PyPI та його користувачів." #: warehouse/templates/email/password-compromised-hibp/body.html:34 #, python-format msgid "" -"To regain access to your account, <a href=\"%(reset_pw_url)s\">reset your " -"password</a> on PyPI. We also recommend that you go to <a href=" -"\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> and check your other " -"passwords and get yourself familiar with good password practices." +"To regain access to your account, <a href=\"%(reset_pw_url)s\">reset your" +" password</a> on PyPI. We also recommend that you go to <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> and check your " +"other passwords and get yourself familiar with good password practices." msgstr "" -"Щоб відновити доступ до вашого облікового запису, <a href=\"%(reset_pw_url)s" -"\">скиньте свій пароль</a> на PyPI. Ми також радимо вам відвідати <a href=" -"\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> та перевірити ваші інші " -"паролі й ознайомитися з хорошими практиками для паролів." +"Щоб відновити доступ до вашого облікового запису, <a " +"href=\"%(reset_pw_url)s\">скиньте свій пароль</a> на PyPI. Ми також " +"радимо вам відвідати <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> та перевірити ваші " +"інші паролі й ознайомитися з хорошими практиками для паролів." #: warehouse/templates/email/password-compromised-hibp/body.html:40 msgid "How do you know this?" @@ -1347,29 +1326,31 @@ msgstr "Звідки вам це відомо?" #: warehouse/templates/email/password-compromised-hibp/body.html:42 #, python-format msgid "" -"We use a free security service from <a href=\"%(have_i_been_pwned_url)s" -"\">HaveIBeenPwned</a>. When registering, authenticating, or updating your " -"password, we generate a SHA1 hash of your password and use the first 5 " -"characters of the hash to decide if the password is compromised. The " -"plaintext password is never stored by PyPI or sent to HaveIBeenPwned." +"We use a free security service from <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>. When registering, " +"authenticating, or updating your password, we generate a SHA1 hash of " +"your password and use the first 5 characters of the hash to decide if the" +" password is compromised. The plaintext password is never stored by PyPI " +"or sent to HaveIBeenPwned." msgstr "" -"Ми користуємося безкоштовним сервісом безпеки від <a href=" -"\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>. Коли ви реєструєте, " -"автентифікуєте чи змінюєте свій пароль, ми генеруємо хеш SHA1 вашого з " -"пароля і використовуємо його перші 5 знаків, щоб вирішити чи пароль був " -"скомпрометований. Пароль ніколи не зберігається на PyPI у вигляді відкритого " -"тексту і не надсилається до HaveIBeenPwned." +"Ми користуємося безкоштовним сервісом безпеки від <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>. Коли ви " +"реєструєте, автентифікуєте чи змінюєте свій пароль, ми генеруємо хеш SHA1" +" вашого з пароля і використовуємо його перші 5 знаків, щоб вирішити чи " +"пароль був скомпрометований. Пароль ніколи не зберігається на PyPI у " +"вигляді відкритого тексту і не надсилається до HaveIBeenPwned." #: warehouse/templates/email/password-compromised-hibp/body.html:47 #, python-format msgid "" -"For more information, see our <a href=\"%(faq_url)s\">FAQ</a>. For help, you " -"can email <a href=\"%(email_href)s\">%(email_address)s</a> to communicate " -"with the PyPI administrators." +"For more information, see our <a href=\"%(faq_url)s\">FAQ</a>. For help, " +"you can email <a href=\"%(email_href)s\">%(email_address)s</a> to " +"communicate with the PyPI administrators." msgstr "" "Щоб дізнатися більше, дивітся наші <a href=\"%(faq_url)s\">ЧаПи</a>. Щоб " -"одержати допомогу, ви можете надіслати листа на <a href=\"%(email_href)s\">" -"%(email_address)s</a>, щоб зв'язатись із адміністраторами PyPI." +"одержати допомогу, ви можете надіслати листа на <a " +"href=\"%(email_href)s\">%(email_address)s</a>, щоб зв'язатись із " +"адміністраторами PyPI." #: warehouse/templates/email/password-reset/body.html:18 #, python-format @@ -1377,8 +1358,8 @@ msgid "" "Someone, perhaps you, has made a password reset request for your PyPI " "account '%(username)s'." msgstr "" -"Хтось, можливо ви, скинув пароль від вашого облікового запису «%(username)s» " -"на PyPI." +"Хтось, можливо ви, скинув пароль від вашого облікового запису " +"«%(username)s» на PyPI." #: warehouse/templates/email/password-reset/body.html:20 #, python-format @@ -1386,8 +1367,8 @@ msgid "" "If you wish to proceed with this request, <a href=\"%(href)s\">click to " "reset your password</a>." msgstr "" -"Якщо ви бажаєте продовжити виконання цього запиту, <a href=\"%(href)s" -"\">клікніть щоб скинути свій пароль</a>." +"Якщо ви бажаєте продовжити виконання цього запиту, <a " +"href=\"%(href)s\">клікніть щоб скинути свій пароль</a>." #: warehouse/templates/email/password-reset/body.html:22 #: warehouse/templates/email/verify-email/body.html:22 @@ -1402,17 +1383,19 @@ msgstr[2] "Термін дії цього посилання збіжить за #: warehouse/templates/email/verify-email/body.html:24 msgid "If you did not make this request, you can safely ignore this email." msgstr "" -"Якщо ви не робили цього запиту, то можете безпечно проігнорувати цього листа." +"Якщо ви не робили цього запиту, то можете безпечно проігнорувати цього " +"листа." #: warehouse/templates/email/primary-email-change/body.html:18 #, python-format msgid "" -"The primary email for your PyPI account <strong>%(username)s</strong> has " -"been changed from <code>%(old_email)s</code> to <code>%(new_email)s</code>" +"The primary email for your PyPI account <strong>%(username)s</strong> has" +" been changed from <code>%(old_email)s</code> to " +"<code>%(new_email)s</code>" msgstr "" -"Основну електронну адресу для вашого облікового запису <strong>%(username)s</" -"strong> на PyPI було змінено з <code>%(old_email)s</code> на <code>" -"%(new_email)s</code>" +"Основну електронну адресу для вашого облікового запису " +"<strong>%(username)s</strong> на PyPI було змінено з " +"<code>%(old_email)s</code> на <code>%(new_email)s</code>" #: warehouse/templates/email/two-factor-added/body.html:18 #, python-format @@ -1429,26 +1412,27 @@ msgid "" "Someone, perhaps you, has removed a %(method)s two-factor authentication " "method from your PyPI account <strong>%(username)s</strong>." msgstr "" -"Хтось, можливо ви, видалив %(method)s метод двофакторної аутентифікації з " -"вашого PyPI облікового запису<strong>%(username)s</strong>." +"Хтось, можливо ви, видалив %(method)s метод двофакторної аутентифікації з" +" вашого PyPI облікового запису<strong>%(username)s</strong>." #: warehouse/templates/email/verify-email/body.html:18 #, python-format msgid "" -"Someone, perhaps you, has added this email address (<code>%(email_address)s</" -"code>) to their PyPI account." +"Someone, perhaps you, has added this email address " +"(<code>%(email_address)s</code>) to their PyPI account." msgstr "" -"Хтось, можливо ви, додав цю електронну адресу (<code>%(email_address)s</" -"code>) до свого облікового запису на PyPI." +"Хтось, можливо ви, додав цю електронну адресу " +"(<code>%(email_address)s</code>) до свого облікового запису на PyPI." #: warehouse/templates/email/verify-email/body.html:20 #, python-format msgid "" -"If you wish to proceed with this request, <a href=\"%(href)s\">click this " -"link to verify your email address</a>." +"If you wish to proceed with this request, <a href=\"%(href)s\">click this" +" link to verify your email address</a>." msgstr "" -"Якщо ви бажаєте продовжити виконання цього запиту, <a href=\"%(href)s" -"\">клікніть на це посилання, щоб підтвердити вашу електронну адресу</a>." +"Якщо ви бажаєте продовжити виконання цього запиту, <a " +"href=\"%(href)s\">клікніть на це посилання, щоб підтвердити вашу " +"електронну адресу</a>." #: warehouse/templates/includes/current-user-indicator.html:29 msgid "Admin" @@ -1509,11 +1493,11 @@ msgstr "Успіх" #: warehouse/templates/includes/hash-modal.html:23 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Hashes</a> for %(filename)s" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Hashes</a> for %(filename)s" msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Хеші</a> для %(filename)s" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Хеші</a> для %(filename)s" #: warehouse/templates/includes/hash-modal.html:28 #, python-format @@ -1579,11 +1563,11 @@ msgstr "Підтвердіть свою електронну адресу або #: warehouse/templates/includes/session-notifications.html:37 #, python-format msgid "" -"Two factor authentication is available, <a href=\"%(href)s\">enable it now " -"for your account.</a>" +"Two factor authentication is available, <a href=\"%(href)s\">enable it " +"now for your account.</a>" msgstr "" -"Двофакторна автентифікація доступна, <a href=\"%(href)s\">увімкніть її для " -"свого облікового запису зараз.</a>" +"Двофакторна автентифікація доступна, <a href=\"%(href)s\">увімкніть її " +"для свого облікового запису зараз.</a>" #: warehouse/templates/includes/accounts/profile-actions.html:16 msgid "Edit profile" @@ -1600,39 +1584,40 @@ msgstr "Статистика" #: warehouse/templates/includes/accounts/profile-actions.html:21 #, python-format msgid "" -"View statistics for your projects via <a href=\"%(libs_io_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or by " -"using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our public " -"dataset on Google BigQuery</a>" +"View statistics for your projects via <a href=\"%(libs_io_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, " +"or by using <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">our public dataset on Google BigQuery</a>" msgstr "" -"Дивіться статистику своїх проектів на <a href=\"%(libs_io_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, або за " -"допомогою <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">нашого " -"відкритого набору даних на Google BigQuery</a>" +"Дивіться статистику своїх проектів на <a href=\"%(libs_io_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, " +"або за допомогою <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">нашого відкритого набору даних на Google BigQuery</a>" #: warehouse/templates/includes/accounts/profile-actions.html:30 #, python-format msgid "" -"View statistics for %(username)s's projects via <a href=\"%(libs_io_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or " -"by using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our " -"public dataset on Google BigQuery</a>" +"View statistics for %(username)s's projects via <a " +"href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io</a>, or by using <a href=\"%(gbq_href)s\" " +"target=\"_blank\" rel=\"noopener\">our public dataset on Google " +"BigQuery</a>" msgstr "" -"Дивіться статистику проектів %(username)s на <a href=\"%(libs_io_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, або " -"за допомогою <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener" -"\">нашого відкритого набору даних на Google BigQuery</a>" +"Дивіться статистику проектів %(username)s на <a href=\"%(libs_io_href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>," +" або за допомогою <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">нашого відкритого набору даних на Google BigQuery</a>" #: warehouse/templates/includes/accounts/profile-callout.html:18 #, python-format msgid "" "You have not uploaded any projects to PyPI, yet. To learn how to get " -"started, visit the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">Python Packaging User Guide</a>" +"started, visit the <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" "Ви ще не завантажували проектів до PyPI. Щоб дізнатися, як почати, " -"відвідайте <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">користувацьке керівництво з пакування Python</a>" +"відвідайте <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">користувацьке керівництво з пакування Python</a>" #: warehouse/templates/includes/accounts/profile-callout.html:23 #, python-format @@ -1699,15 +1684,15 @@ msgstr "Відкриті іш'ю/PR:" #: warehouse/templates/includes/packaging/project-data.html:66 #, python-format msgid "" -"View statistics for this project via <a href=\"%(libs_io_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or by " -"using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our public " -"dataset on Google BigQuery</a>" +"View statistics for this project via <a href=\"%(libs_io_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, " +"or by using <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">our public dataset on Google BigQuery</a>" msgstr "" -"Переглядайте статистику для цього проекта на <a href=\"%(libs_io_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a> або " -"використовуючи <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener" -"\">наш публічний набір даних на Google BigQuery</a>" +"Переглядайте статистику для цього проекта на <a href=\"%(libs_io_href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a> " +"або використовуючи <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">наш публічний набір даних на Google BigQuery</a>" #: warehouse/templates/includes/packaging/project-data.html:74 msgid "Meta" @@ -1828,8 +1813,8 @@ msgstr "Видалити цю електронну адресу" #: warehouse/templates/manage/account.html:138 msgid "" -"Add <abbr title=\"two factor authentication\">2FA</abbr> with authentication " -"application" +"Add <abbr title=\"two factor authentication\">2FA</abbr> with " +"authentication application" msgstr "" "Додати <abbr title=\"two factor authentication\">2FA</abbr> за допомогою " "застосунку автентифікації" @@ -1839,8 +1824,8 @@ msgid "" "Add <abbr title=\"two factor authentication\">2FA</abbr> with security " "device (e.g. USB key)" msgstr "" -"Додати <abbr title=\"двофакторна автентифікація\">2FA</abbr> із пристроєм " -"безпеки (напр. USB-ключем)" +"Додати <abbr title=\"двофакторна автентифікація\">2FA</abbr> із пристроєм" +" безпеки (напр. USB-ключем)" #: warehouse/templates/manage/account.html:142 msgid "Generate Recovery Codes" @@ -1849,8 +1834,8 @@ msgstr "Згенерувати Коди ВІдновлення" #: warehouse/templates/manage/account.html:147 #: warehouse/templates/manage/account/webauthn-provision.html:37 msgid "" -"Enable JavaScript to set up two factor authentication with a security device " -"(e.g. USB key)" +"Enable JavaScript to set up two factor authentication with a security " +"device (e.g. USB key)" msgstr "" "Увімкніть JavaScript, аби налаштувати двофакторну автентифікацію через " "пристрій безпеки (напр. USB-ключ)" @@ -1859,13 +1844,13 @@ msgstr "" #: warehouse/templates/manage/account/webauthn-provision.html:53 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Upgrade your browser</a> to set up two factor authentication with a " -"security device (e.g. USB key)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Upgrade your browser</a> to set up two factor " +"authentication with a security device (e.g. USB key)" msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Оновіть свій браузер</a>, аби налаштувати двофакторну автентифікацію " -"через пристрій безпеки (напр. USB-ключ)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Оновіть свій браузер</a>, аби налаштувати двофакторну " +"автентифікацію через пристрій безпеки (напр. USB-ключ)" #: warehouse/templates/manage/account.html:166 #: warehouse/templates/manage/account.html:528 @@ -1914,7 +1899,8 @@ msgstr "Видалити API-токен" #: warehouse/templates/manage/account.html:216 #: warehouse/templates/manage/token.html:59 msgid "" -"Applications or scripts using this token will no longer have access to PyPI." +"Applications or scripts using this token will no longer have access to " +"PyPI." msgstr "" "Застосунки чи скрипти, які користуються цим токеном, більше не матимуть " "доступу до PyPI." @@ -1931,13 +1917,13 @@ msgstr "Зображення профілю" #: warehouse/templates/manage/account.html:250 #, python-format msgid "" -"We use <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">gravatar.com</a> to generate your profile picture based on your " -"primary email address" +"We use <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">gravatar.com</a> to generate your profile picture based " +"on your primary email address" msgstr "" -"Ми використовуємо <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">gravatar.com</a>, щоб згенерувати ваше зображення профілю " -"на основі вашої основної електронної адреси" +"Ми використовуємо <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">gravatar.com</a>, щоб згенерувати ваше" +" зображення профілю на основі вашої основної електронної адреси" #: warehouse/templates/manage/account.html:257 msgid "Change image on gravatar.com" @@ -1954,10 +1940,11 @@ msgstr "Дата приєднання" #: warehouse/templates/manage/account.html:279 #, python-format msgid "" -"Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be changed." +"Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be " +"changed." msgstr "" -"Відображається у вашому <a href=\"%(href)s\">публічному профілі</a>. Не може " -"бути змінено." +"Відображається у вашому <a href=\"%(href)s\">публічному профілі</a>. Не " +"може бути змінено." #: warehouse/templates/manage/account.html:290 msgid "Full name" @@ -1979,11 +1966,12 @@ msgstr "Публічна електронна адреса" #: warehouse/templates/manage/account.html:319 #, python-format msgid "" -"One of your verified emails can be displayed on your <a href=\"%(href)s" -"\">public profile</a> to logged-in users." +"One of your verified emails can be displayed on your <a " +"href=\"%(href)s\">public profile</a> to logged-in users." msgstr "" -"Одна з підтверджених адрес може відображатися у вашому <a href=\"%(href)s" -"\">публічному профілі</a> для автентифікованих користувачів." +"Одна з підтверджених адрес може відображатися у вашому <a " +"href=\"%(href)s\">публічному профілі</a> для автентифікованих " +"користувачів." #: warehouse/templates/manage/account.html:324 msgid "Update account" @@ -1995,16 +1983,18 @@ msgstr "Електронні адреси облікового запису" #: warehouse/templates/manage/account.html:334 msgid "" -"You can associate several emails with your account. You can use any <span " -"class=\"badge badge--success\"><i class=\"fa fa-check\" aria-hidden=\"true" -"\"></i> Verified</span> email to recover your account, but only your <span " -"class=\"badge\">Primary</span> email will receive notifications." +"You can associate several emails with your account. You can use any <span" +" class=\"badge badge--success\"><i class=\"fa fa-check\" aria-" +"hidden=\"true\"></i> Verified</span> email to recover your account, but " +"only your <span class=\"badge\">Primary</span> email will receive " +"notifications." msgstr "" -"Ви можете пов'язати кілька електронних адрес зі своїм обліковим записом. Ви " -"можете використовувати будь-яку <span class=\"badge badge--success\"><i " -"class=\"fa fa-check\" aria-hidden=\"true\"></i> Схвалену</span> електронну " -"адресу, щоб відновити свій обліковий запис, але лише ваша <span class=\"badge" -"\">Основна</span> адреса отримуватиме сповіщення." +"Ви можете пов'язати кілька електронних адрес зі своїм обліковим записом. " +"Ви можете використовувати будь-яку <span class=\"badge badge--" +"success\"><i class=\"fa fa-check\" aria-hidden=\"true\"></i> " +"Схвалену</span> електронну адресу, щоб відновити свій обліковий запис, " +"але лише ваша <span class=\"badge\">Основна</span> адреса отримуватиме " +"сповіщення." #: warehouse/templates/manage/account.html:345 msgid "Emails associated with your account" @@ -2051,8 +2041,9 @@ msgid "" "authentication\">2FA</abbr></a>." msgstr "" "Двофакторна автентифікація додає додатковий рівень захисту до вашого " -"облікового запису. <a href=\"%(href)s\">Дізнайтеся більше про <abbr title=" -"\"двофакторна автентифікація (two factor authentication)\">2FA</abbr></a>." +"облікового запису. <a href=\"%(href)s\">Дізнайтеся більше про <abbr " +"title=\"двофакторна автентифікація (two factor " +"authentication)\">2FA</abbr></a>." #: warehouse/templates/manage/account.html:451 msgid "Two factor authentication methods enabled" @@ -2065,11 +2056,11 @@ msgstr "Двофакторний метод" #: warehouse/templates/manage/account.html:460 #: warehouse/templates/manage/account.html:570 msgid "" -"Authentication application (<abbr title=\"time-based one-time password" -"\">TOTP</abbr>)" +"Authentication application (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>)" msgstr "" -"Застосунок автентифікації (<abbr title=\"time-based one-time password" -"\">TOTP</abbr>)" +"Застосунок автентифікації (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>)" #: warehouse/templates/manage/account.html:462 #: warehouse/templates/manage/account.html:476 @@ -2127,11 +2118,12 @@ msgstr "Ви не ввімкнули двофакторну автентифік #: warehouse/templates/manage/account.html:512 #, python-format msgid "" -"<a href=\"%(href)s\">Verify your primary email address</a> to add two factor " -"authentication to your account." +"<a href=\"%(href)s\">Verify your primary email address</a> to add two " +"factor authentication to your account." msgstr "" -"<a href=\"%(href)s\">Підтвердіть свою основну адресу електронної пошти</a>, " -"щоб додати двофакторну автентифікацію до свого облікового запису." +"<a href=\"%(href)s\">Підтвердіть свою основну адресу електронної " +"пошти</a>, щоб додати двофакторну автентифікацію до свого облікового " +"запису." #: warehouse/templates/manage/account.html:519 #: warehouse/templates/manage/settings.html:23 @@ -2163,8 +2155,8 @@ msgstr "Додати API-токен" #: warehouse/templates/manage/account.html:544 #, python-format msgid "" -"<a href=\"%(href)s\">Verify your primary email address</a> to add API tokens " -"to your account." +"<a href=\"%(href)s\">Verify your primary email address</a> to add API " +"tokens to your account." msgstr "" "<a href=\"%(href)s\">Підтвердіть свою основну електронну адресу</a>, щоб " "додати API-токени до свого облікового запису." @@ -2242,9 +2234,11 @@ msgstr "Двофакторну автентифікацію додано" #: warehouse/templates/manage/account.html:613 #: warehouse/templates/manage/account.html:623 msgid "" -"Method: Security device (<abbr title=\"web authentication\">WebAuthn</abbr>)" +"Method: Security device (<abbr title=\"web " +"authentication\">WebAuthn</abbr>)" msgstr "" -"Спосіб: Пристрій безпеки (<abbr title=\"web authentication\">WebAuthn</abbr>)" +"Спосіб: Пристрій безпеки (<abbr title=\"web " +"authentication\">WebAuthn</abbr>)" #: warehouse/templates/manage/account.html:614 #: warehouse/templates/manage/account.html:624 @@ -2335,11 +2329,10 @@ msgid "IP address" msgstr "IP-адреса" #: warehouse/templates/manage/account.html:687 -msgid "" -"Events will appear here as security-related actions occur on your account." +msgid "Events will appear here as security-related actions occur on your account." msgstr "" -"Події з'являтимуться тут, щойно дії, пов'язані з безпекою, виникатимуть у " -"вашому обліковому записі." +"Події з'являтимуться тут, щойно дії, пов'язані з безпекою, виникатимуть у" +" вашому обліковому записі." #: warehouse/templates/manage/account.html:694 msgid "Delete account" @@ -2380,38 +2373,38 @@ msgstr[2] "" #: warehouse/templates/manage/account.html:704 msgid "" "\n" -" You must transfer ownership or delete this project before you can " -"delete your account.\n" +" You must transfer ownership or delete this project before you " +"can delete your account.\n" " " msgid_plural "" "\n" -" You must transfer ownership or delete these projects before you " -"can delete your account.\n" +" You must transfer ownership or delete these projects before you" +" can delete your account.\n" " " msgstr[0] "" "\n" -" Ви мусите перенести право власності чи видалити цей проект, аби " -"видалити свій обліковий запис.\n" +" Ви мусите перенести право власності чи видалити цей проект, аби" +" видалити свій обліковий запис.\n" " " msgstr[1] "" "\n" -" Ви мусите перенести право власності чи видалити ці проекти, аби " -"видалити свій обліковий запис.\n" +" Ви мусите перенести право власності чи видалити ці проекти, аби" +" видалити свій обліковий запис.\n" " " msgstr[2] "" "\n" -" Ви мусите перенести право власності чи видалити ці проекти, аби " -"видалити свій обліковий запис.\n" +" Ви мусите перенести право власності чи видалити ці проекти, аби" +" видалити свій обліковий запис.\n" " " #: warehouse/templates/manage/account.html:714 #, python-format msgid "" -"<a href=\"%(transfer_href)s\">transfer ownership</a> or <a href=" -"\"%(delete_href)s\">delete project</a>" +"<a href=\"%(transfer_href)s\">transfer ownership</a> or <a " +"href=\"%(delete_href)s\">delete project</a>" msgstr "" -"<a href=\"%(transfer_href)s\">перенести право власності</a> чи <a href=" -"\"%(delete_href)s\">видалити проект</a>" +"<a href=\"%(transfer_href)s\">перенести право власності</a> чи <a " +"href=\"%(delete_href)s\">видалити проект</a>" #: warehouse/templates/manage/account.html:723 #: warehouse/templates/manage/token.html:162 @@ -2420,8 +2413,7 @@ msgstr "Продовжуйте обережно!" #: warehouse/templates/manage/account.html:726 msgid "You will not be able to recover your account after you delete it" -msgstr "" -"Ви не зможете відносити свій обліковий запис після того, як видалите його" +msgstr "Ви не зможете відносити свій обліковий запис після того, як видалите його" #: warehouse/templates/manage/account.html:728 msgid "Delete your PyPI account" @@ -2439,13 +2431,13 @@ msgstr "Знищити документацію" #: warehouse/templates/manage/documentation.html:28 #, python-format msgid "" -"If you would like to DESTROY any existing documentation hosted at <a href=" -"\"%(url)s\">%(url)s</a> there is <strong>no</strong> undo, as uploading new " -"documentation is no longer supported." +"If you would like to DESTROY any existing documentation hosted at <a " +"href=\"%(url)s\">%(url)s</a> there is <strong>no</strong> undo, as " +"uploading new documentation is no longer supported." msgstr "" -"Якщо ви бажаєте ЗНИЩИТИ будь-яку існуючу документацію, розміщену на <a href=" -"\"%(url)s\">%(url)s</a>, то вороття <strong>немає</strong>, оскільки " -"завантаження нової документації більше не підтримується." +"Якщо ви бажаєте ЗНИЩИТИ будь-яку існуючу документацію, розміщену на <a " +"href=\"%(url)s\">%(url)s</a>, то вороття <strong>немає</strong>, оскільки" +" завантаження нової документації більше не підтримується." #: warehouse/templates/manage/documentation.html:35 msgid "Destroy Documentation for project" @@ -2472,11 +2464,11 @@ msgstr "Історія проекту '%(project_name)s'" #: warehouse/templates/manage/history.html:25 msgid "" -"Each time you (or your collaborators) perform a security action related to " -"this project, the action is recorded and displayed here." +"Each time you (or your collaborators) perform a security action related " +"to this project, the action is recorded and displayed here." msgstr "" -"Щоразу, коли ви (або ж ваші поплічники) виконуєте дію, пов'язану з безпекою, " -"у цьому проекті, то вона записується і відображається тут." +"Щоразу, коли ви (або ж ваші поплічники) виконуєте дію, пов'язану з " +"безпекою, у цьому проекті, то вона записується і відображається тут." #: warehouse/templates/manage/history.html:29 msgid "Project created" @@ -2525,8 +2517,7 @@ msgstr "<a href=\"%(href)s\">%(username)s</a> додано як %(role_name)s п #: warehouse/templates/manage/history.html:55 #, python-format msgid "<a href=\"%(href)s\">%(username)s</a> removed as project %(role_name)s" -msgstr "" -"<a href=\"%(href)s\">%(username)s</a> видалено як %(role_name)s проекту" +msgstr "<a href=\"%(href)s\">%(username)s</a> видалено як %(role_name)s проекту" #: warehouse/templates/manage/history.html:60 #, python-format @@ -2566,17 +2557,17 @@ msgid "" "Each time you or your collaborators update this project, the action is " "recorded and displayed here." msgstr "" -"Щоразу, коли ви чи ваші поплічники оновлюєте цей проект, ця дія записується " -"і відображається тут." +"Щоразу, коли ви чи ваші поплічники оновлюєте цей проект, ця дія " +"записується і відображається тут." #: warehouse/templates/manage/journal.html:28 #, python-format msgid "" -"This feature will be deprecated in the future, replaced by the <a href=" -"\"%(href)s\">security history page</a>." +"This feature will be deprecated in the future, replaced by the <a " +"href=\"%(href)s\">security history page</a>." msgstr "" -"Ця функція стане застарілою в майбутньому, її замінить <a href=\"%(href)s" -"\">сторінка історії безпеки</a>." +"Ця функція стане застарілою в майбутньому, її замінить <a " +"href=\"%(href)s\">сторінка історії безпеки</a>." #: warehouse/templates/manage/journal.html:32 #, python-format @@ -2702,12 +2693,12 @@ msgstr "Дивитися" #, python-format msgid "" "You have not uploaded any projects to PyPI, yet. To learn how to get " -"started, visit the <a href=\"%(href)s\" target=\"_blank\" rel=\"noopener" -"\">Python Packaging User Guide</a>" +"started, visit the <a href=\"%(href)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" -"Ви не ще завантажили жодного проекту до PyPI. Аби дізнатися, звідки почати, " -"відвідайте <a href=\"%(href)s\" target=\"_blank\" rel=\"noopener" -"\">користувацьке керівництво з пакування Python</a>" +"Ви не ще завантажили жодного проекту до PyPI. Аби дізнатися, звідки " +"почати, відвідайте <a href=\"%(href)s\" target=\"_blank\" " +"rel=\"noopener\">користувацьке керівництво з пакування Python</a>" #: warehouse/templates/manage/release.html:18 #, python-format @@ -2811,12 +2802,12 @@ msgstr "Сховати" #: warehouse/templates/manage/release.html:119 #, python-format msgid "" -"Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" +"Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" -"Дізнатися, як завантажувати файли в <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">користувацькому керівництві з пакування " -"Python</a>" +"Дізнатися, як завантажувати файли в <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">користувацькому " +"керівництві з пакування Python</a>" #: warehouse/templates/manage/release.html:122 msgid "Release settings" @@ -2831,13 +2822,13 @@ msgstr "Видалити публікацію" #, python-format msgid "" "\n" -" Deleting will irreversibly delete this release along with %(count)s " -"file.\n" +" Deleting will irreversibly delete this release along with " +"%(count)s file.\n" " " msgid_plural "" "\n" -" Deleting will irreversibly delete this release along with %(count)s " -"files.\n" +" Deleting will irreversibly delete this release along with " +"%(count)s files.\n" " " msgstr[0] "" "\n" @@ -2863,15 +2854,15 @@ msgstr "Видалення незворотньо видалить цей вип #: warehouse/templates/manage/releases.html:91 #, python-format msgid "" -"You will not be able to re-upload a new distribution of the same type with " -"the same version number. Consider making a new release or a <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">post " -"release</a> instead." +"You will not be able to re-upload a new distribution of the same type " +"with the same version number. Consider making a new release or a <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">post release</a> instead." msgstr "" -"Ви не зможете повторно завантажити новий пакунок того ж самого типу із тою ж " -"самою версією. Натомість, розгляньте створення нового випуску або <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">пост-" -"публікації</a>." +"Ви не зможете повторно завантажити новий пакунок того ж самого типу із " +"тою ж самою версією. Натомість, розгляньте створення нового випуску або " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">пост-публікації</a>." #: warehouse/templates/manage/release.html:142 #: warehouse/templates/manage/releases.html:27 @@ -2957,13 +2948,13 @@ msgstr "Випусків не знайдено" #: warehouse/templates/manage/releases.html:109 #, python-format msgid "" -"Learn how to create a new release on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>" +"Learn how to create a new release on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" msgstr "" -"Дізнатися, як створити новий випуск у <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">користувацькому керівництві з " -"пакування Python</a>" +"Дізнатися, як створити новий випуск у <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">користувацькому " +"керівництві з пакування Python</a>" #: warehouse/templates/manage/roles.html:18 #, python-format @@ -2976,8 +2967,8 @@ msgid "" "Use this page to control which PyPI users can help you to manage " "%(project_name)s" msgstr "" -"Використовуйте цю сторінку, аби контролювати те, які користувачі PyPI можуть " -"допомагати вам керувати %(project_name)s" +"Використовуйте цю сторінку, аби контролювати те, які користувачі PyPI " +"можуть допомагати вам керувати %(project_name)s" #: warehouse/templates/manage/roles.html:25 #: warehouse/templates/pages/help.html:509 @@ -2993,8 +2984,8 @@ msgstr "Доглядач" #: warehouse/templates/manage/roles.html:28 #: warehouse/templates/pages/help.html:510 msgid "" -"Can upload releases for a package. Cannot add collaborators. Cannot delete " -"files, releases, or the project." +"Can upload releases for a package. Cannot add collaborators. Cannot " +"delete files, releases, or the project." msgstr "" "Може завантажувати випуски для пакунку. Не може додавати поплічників. Не " "може видаляти файли, випуски чи проект." @@ -3078,26 +3069,29 @@ msgstr "Опис проекту і бокова панель" #: warehouse/templates/manage/settings.html:43 #, python-format msgid "" -"To set the '%(project_name)s' description, author, links, classifiers, and " -"other details for your next release, use the <a href=\"%(setup_args_href)s\" " -"rel=\"noopener\" target=\"_blank\"><code>setup()</code> arguments in your " -"<code>setup.py</code> file</a>. Updating these fields will not change the " -"metadata for past releases. Additionally, you <strong>must</strong> use <a " -"href=\"%(twine_docs_href)s\" rel=\"noopener\" target=\"_blank\">Twine</a> to " -"upload your files in order to get full support for these fields. See <a href=" -"\"%(distribution_href)s\" rel=\"noopener\" target=\"_blank\">the Python " -"Packaging User Guide</a> for more help." +"To set the '%(project_name)s' description, author, links, classifiers, " +"and other details for your next release, use the <a " +"href=\"%(setup_args_href)s\" rel=\"noopener\" " +"target=\"_blank\"><code>setup()</code> arguments in your " +"<code>setup.py</code> file</a>. Updating these fields will not change the" +" metadata for past releases. Additionally, you <strong>must</strong> use " +"<a href=\"%(twine_docs_href)s\" rel=\"noopener\" " +"target=\"_blank\">Twine</a> to upload your files in order to get full " +"support for these fields. See <a href=\"%(distribution_href)s\" " +"rel=\"noopener\" target=\"_blank\">the Python Packaging User Guide</a> " +"for more help." msgstr "" "Щоб встановити опис «%(project_name)s», його автора, посилання, " "класифікатори та інші подробиці свого наступного випуску, використовуйте " -"аргументи <a href=\"%(setup_args_href)s\" rel=\"noopener\" target=\"_blank" -"\"><code>setup()</code> у вашому файлі <code>setup.py</code></a>. Оновлення " -"цих полів не змінить метадані минулих випусків. Крім того, ви " -"<strong>мусите</strong> використовувати <a href=\"%(twine_docs_href)s\" rel=" -"\"noopener\" target=\"_blank\">Twine</a> для завантаження своїх файлів, аби " -"отримати повний доступ до цих полів. Шукайте більше допомоги у <a href=" -"\"%(distribution_href)s\" rel=\"noopener\" target=\"_blank\">користувацькому " -"керівництві з пакування Python</a>." +"аргументи <a href=\"%(setup_args_href)s\" rel=\"noopener\" " +"target=\"_blank\"><code>setup()</code> у вашому файлі " +"<code>setup.py</code></a>. Оновлення цих полів не змінить метадані " +"минулих випусків. Крім того, ви <strong>мусите</strong> використовувати " +"<a href=\"%(twine_docs_href)s\" rel=\"noopener\" " +"target=\"_blank\">Twine</a> для завантаження своїх файлів, аби отримати " +"повний доступ до цих полів. Шукайте більше допомоги у <a " +"href=\"%(distribution_href)s\" rel=\"noopener\" " +"target=\"_blank\">користувацькому керівництві з пакування Python</a>." #: warehouse/templates/manage/settings.html:54 #: warehouse/templates/manage/settings.html:85 @@ -3111,11 +3105,11 @@ msgstr "Видалення цього проекту:" #: warehouse/templates/manage/settings.html:62 #, python-format msgid "" -"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s " -"release</a>" +"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s" +" release</a>" msgid_plural "" -"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s " -"releases</a>" +"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s" +" releases</a>" msgstr[0] "" "Незворотньо видалить цей проект разом із <a href=\"%(href)s\">%(count)s " "випуском</a>" @@ -3138,16 +3132,16 @@ msgstr "" #: warehouse/templates/manage/settings.html:74 msgid "" -"This user will be able to make new releases under this project name, so long " -"as the distribution filenames do not match filenames from a previously " -"released distribution (all PyPI distribution filenames are unique, as they " -"are generated by combining the project name + version number + distribution " -"type)" +"This user will be able to make new releases under this project name, so " +"long as the distribution filenames do not match filenames from a " +"previously released distribution (all PyPI distribution filenames are " +"unique, as they are generated by combining the project name + version " +"number + distribution type)" msgstr "" -"Цей користувач зможе робити нові випуски з цією назвою проекту доки назви " -"файлів пакунків не збігаються з існуючими з попередніх випусків пакунка (усі " -"назви файлів пакунків на PyPI унікальні, оскільки вони згенеровані з " -"комбінації назви проекту + номеру версії + типу пакунка)" +"Цей користувач зможе робити нові випуски з цією назвою проекту доки назви" +" файлів пакунків не збігаються з існуючими з попередніх випусків пакунка " +"(усі назви файлів пакунків на PyPI унікальні, оскільки вони згенеровані з" +" комбінації назви проекту + номеру версії + типу пакунка)" #: warehouse/templates/manage/settings.html:85 msgid "Project Name" @@ -3184,11 +3178,11 @@ msgstr "Проект «%(project)s»" #: warehouse/templates/manage/token.html:44 msgid "" -"For security reasons this token will only appear once. <strong>Copy it now.</" -"strong>" +"For security reasons this token will only appear once. <strong>Copy it " +"now.</strong>" msgstr "" -"З міркувань безпеки, цей токен з'явиться лише одного разу. <strong>Скопіюйте " -"його зараз.</strong>" +"З міркувань безпеки, цей токен з'явиться лише одного разу. " +"<strong>Скопіюйте його зараз.</strong>" #: warehouse/templates/manage/token.html:46 msgid "Copy token to clipboard" @@ -3214,21 +3208,22 @@ msgstr "Використайте <code>%(token)s</code> як своє ім'я к #: warehouse/templates/manage/token.html:71 #, python-format msgid "" -"Set your password to the token value, including the <code>%(prefix)s</code> " -"prefix" +"Set your password to the token value, including the " +"<code>%(prefix)s</code> prefix" msgstr "" -"Використайте значення токена замість свого пароля, включно з префіксом <code>" -"%(prefix)s</code>" +"Використайте значення токена замість свого пароля, включно з префіксом " +"<code>%(prefix)s</code>" #: warehouse/templates/manage/token.html:77 #, python-format msgid "" -"For example, if you are using <a href=\"%(href)s\">Twine</a> to upload your " -"projects to PyPI, set up your <code>%(filename)s</code> file like this:" +"For example, if you are using <a href=\"%(href)s\">Twine</a> to upload " +"your projects to PyPI, set up your <code>%(filename)s</code> file like " +"this:" msgstr "" "Наприклад, якщо ви користуєтеся <a href=\"%(href)s\">Twine</a> для " -"завантаження своїх проектів до PyPI, налаштуйте свій файл <code>" -"%(filename)s</code> таким чином:" +"завантаження своїх проектів до PyPI, налаштуйте свій файл " +"<code>%(filename)s</code> таким чином:" #: warehouse/templates/manage/token.html:87 #, python-format @@ -3243,11 +3238,11 @@ msgstr "" #: warehouse/templates/manage/token.html:99 msgid "" -"either a user-scoped token or a project-scoped token you want to set as the " -"default" +"either a user-scoped token or a project-scoped token you want to set as " +"the default" msgstr "" -"користувацький токен або токен із проектним рівнем допуску, який ви хочете " -"встановити типовим" +"користувацький токен або токен із проектним рівнем допуску, який ви " +"хочете встановити типовим" #: warehouse/templates/manage/token.html:104 msgid "a project token" @@ -3259,17 +3254,17 @@ msgid "" "You can then use <code>%(command)s</code> to switch to the correct token " "when uploading to PyPI." msgstr "" -"Ви можете використати <code>%(command)s</code>, щоб обрати правильний токен, " -"коли завантажуєте до PyPI." +"Ви можете використати <code>%(command)s</code>, щоб обрати правильний " +"токен, коли завантажуєте до PyPI." #: warehouse/templates/manage/token.html:112 #, python-format msgid "" -"For further instructions on how to use this token, <a href=\"%(href)s" -"\">visit the PyPI help page</a>." +"For further instructions on how to use this token, <a " +"href=\"%(href)s\">visit the PyPI help page</a>." msgstr "" -"Для подальших інструкцій щодо використання цього токена, <a href=\"%(href)s" -"\">відвідайте сторінку допомоги PyPI</a>." +"Для подальших інструкцій щодо використання цього токена, <a " +"href=\"%(href)s\">відвідайте сторінку допомоги PyPI</a>." #: warehouse/templates/manage/token.html:120 msgid "Add another token" @@ -3297,11 +3292,11 @@ msgstr "Проект:" #: warehouse/templates/manage/token.html:163 msgid "" -"An API token scoped to your entire account will have upload permissions for " -"all of your current and future projects." +"An API token scoped to your entire account will have upload permissions " +"for all of your current and future projects." msgstr "" -"API-токен з областю допуску на увесь ваш обліковий запис матиме дозвіл до " -"усіх ваших поточних і майбутніх проектів." +"API-токен з областю допуску на увесь ваш обліковий запис матиме дозвіл до" +" усіх ваших поточних і майбутніх проектів." #: warehouse/templates/manage/token.html:166 msgid "Add token" @@ -3317,33 +3312,34 @@ msgstr "Згенерувати нові коди відновлення" #: warehouse/templates/manage/account/recovery_codes-provision.html:46 msgid "" -"If you lose access to your authentication application or security key(s), " -"you’ll need to use one of these recovery codes to log into your PyPI " +"If you lose access to your authentication application or security key(s)," +" you’ll need to use one of these recovery codes to log into your PyPI " "account. Each code can only be used <strong>once</strong>." msgstr "" -"Якщо ви втратили доступ до свого застосунку автентифікації чи до ключа(-ів) " -"безпеки, вам знадобиться скористатися одним із кодів відновлення, аби увійти " -"до облікового запису PyPI. Кожен код можна використати лише <strong>один</" -"strong> раз." +"Якщо ви втратили доступ до свого застосунку автентифікації чи до " +"ключа(-ів) безпеки, вам знадобиться скористатися одним із кодів " +"відновлення, аби увійти до облікового запису PyPI. Кожен код можна " +"використати лише <strong>один</strong> раз." #: warehouse/templates/manage/account/recovery_codes-provision.html:47 msgid "" -"These codes should <strong>only</strong> be used for account recovery, not " -"for typical logins." +"These codes should <strong>only</strong> be used for account recovery, " +"not for typical logins." msgstr "" -"Ці коди повинні використовуватись <strong>тільки</strong> для відновлення " -"облікового запису, а не звичайного входу в обліковий запис." +"Ці коди повинні використовуватись <strong>тільки</strong> для відновлення" +" облікового запису, а не звичайного входу в обліковий запис." #: warehouse/templates/manage/account/recovery_codes-provision.html:48 msgid "" -"<strong>Keep these somewhere safe</strong>. If you lose your authentication " -"application or security key(s) and do not have access to these recovery " -"codes, you may permanently lose access to your PyPI account!" +"<strong>Keep these somewhere safe</strong>. If you lose your " +"authentication application or security key(s) and do not have access to " +"these recovery codes, you may permanently lose access to your PyPI " +"account!" msgstr "" "<strong>Зберігайте їх у безпечному місці</strong>. Якщо ви втратите свій " -"застосунок аутентифікації або ключ(і) безпеки і не матимете доступу до цих " -"кодів відновлення, ви можете назавжди втратити доступ до свого облікового " -"запису PyPI!" +"застосунок аутентифікації або ключ(і) безпеки і не матимете доступу до " +"цих кодів відновлення, ви можете назавжди втратити доступ до свого " +"облікового запису PyPI!" #: warehouse/templates/manage/account/recovery_codes-provision.html:52 msgid "Save your Recovery Codes" @@ -3374,13 +3370,13 @@ msgstr "Налаштувати 2FA за допомогою застосунку #: warehouse/templates/manage/account/totp-provision.html:32 #, python-format msgid "" -"PyPI supports any application that follows the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based " -"one-time password\">TOTP</abbr> standard</a>." +"PyPI supports any application that follows the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title" +"=\"time-based one-time password\">TOTP</abbr> standard</a>." msgstr "" -"PyPI підтримує будь-які застосунки, які відповідають <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">стандарту <abbr title=" -"\"time-based one-time password\">TOTP</abbr></a>." +"PyPI підтримує будь-які застосунки, які відповідають <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">стандарту <abbr " +"title=\"time-based one-time password\">TOTP</abbr></a>." #: warehouse/templates/manage/account/totp-provision.html:36 #, python-format @@ -3388,8 +3384,8 @@ msgid "" "Visit <a href=\"%(href)s\">PyPI's help page</a> for a list of compatible " "applications." msgstr "" -"Відвідайте <a href=\"%(href)s\">сторінку допомоги PyPI</a>, щоб переглянути " -"перелік сумісних застосунків." +"Відвідайте <a href=\"%(href)s\">сторінку допомоги PyPI</a>, щоб " +"переглянути перелік сумісних застосунків." #: warehouse/templates/manage/account/totp-provision.html:42 msgid "Set up your application" @@ -3401,11 +3397,11 @@ msgstr "Відскануйте QR-код у застосунку автенти #: warehouse/templates/manage/account/totp-provision.html:46 msgid "" -"For security reasons, you can only associate one authentication application " -"per PyPI account." +"For security reasons, you can only associate one authentication " +"application per PyPI account." msgstr "" -"З міркувань безпеки, ви можете пов'язати лише один застосунок автентифікації " -"зі своїм обліковим записом на PyPI." +"З міркувань безпеки, ви можете пов'язати лише один застосунок " +"автентифікації зі своїм обліковим записом на PyPI." #: warehouse/templates/manage/account/totp-provision.html:52 msgid "QR code for setting up an authentication application" @@ -3425,11 +3421,11 @@ msgstr "Код автентифікації" #: warehouse/templates/manage/account/totp-provision.html:73 msgid "" -"To finalize the set up process, enter the authentication code provided by " -"your application." +"To finalize the set up process, enter the authentication code provided by" +" your application." msgstr "" -"Аби завершити процес налаштування, введіть код автентифікації, наданий вашим " -"застосунком автентифікації." +"Аби завершити процес налаштування, введіть код автентифікації, наданий " +"вашим застосунком автентифікації." #: warehouse/templates/manage/account/totp-provision.html:85 msgid "Set up application" @@ -3442,26 +3438,27 @@ msgstr "Налаштувати 2FA за допомогою пристрою бе #: warehouse/templates/manage/account/webauthn-provision.html:26 #, python-format msgid "" -"PyPI supports any device that adheres to the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." +"PyPI supports any device that adheres to the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." msgstr "" "PyPI підтримує будь-який пристрій, який відповідає <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">стандарту FIDO</a>." +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">стандарту " +"FIDO</a>." #: warehouse/templates/manage/account/webauthn-provision.html:28 #, python-format msgid "" -"Popular <em>USB keys</em> include <a href=\"%(yubico_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=" -"\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Google Titan</a> and <a href=\"%(thetis_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Thetis</a>." +"Popular <em>USB keys</em> include <a href=\"%(yubico_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> and <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." msgstr "" -"Поширені <em>USB-ключі</em> включають <a href=\"%(yubico_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=" -"\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Google Titan</a> та <a href=\"%(thetis_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Thetis</a>." +"Поширені <em>USB-ключі</em> включають <a href=\"%(yubico_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> та <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." #: warehouse/templates/manage/account/webauthn-provision.html:43 msgid "Name your device to begin" @@ -3486,23 +3483,25 @@ msgstr "Налаштувати пристрій безпеки" #: warehouse/templates/manage/account/webauthn-provision.html:74 #, python-format msgid "" -"<strong>Not working?</strong> Check you're using a device that follows the " -"<a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">FIDO specification</a> and a <a href=\"%(mozilla_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">compatible browser</a>." +"<strong>Not working?</strong> Check you're using a device that follows " +"the <a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">FIDO specification</a> and a <a " +"href=\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">compatible browser</a>." msgstr "" -"<strong>Не працює?</strong> Переконайтеся, що ви використовуєте пристрій, " -"сумісний зі <a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">специфікацією FIDO</a> та <a href=\"%(mozilla_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">сумісний браузер</a>." +"<strong>Не працює?</strong> Переконайтеся, що ви використовуєте пристрій," +" сумісний зі <a href=\"%(fido_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">специфікацією FIDO</a> та <a " +"href=\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">сумісний браузер</a>." #: warehouse/templates/manage/account/webauthn-provision.html:78 msgid "" -"Note that some older USB keys do not adhere to the FIDO standard and will " -"not work with PyPI." +"Note that some older USB keys do not adhere to the FIDO standard and will" +" not work with PyPI." msgstr "" -"Зверніть увагу, що деякі старі USB-ключі не дотримуються стандарту FIDO і не " -"працюватимуть із PyPI." +"Зверніть увагу, що деякі старі USB-ключі не дотримуються стандарту FIDO і" +" не працюватимуть із PyPI." #: warehouse/templates/packaging/detail.html:94 msgid "Copy PIP instructions" @@ -3603,12 +3602,12 @@ msgstr "попередні випуски" #, python-format msgid "" "Download the file for your platform. If you're not sure which to choose, " -"learn more about <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">installing packages</a>." +"learn more about <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">installing packages</a>." msgstr "" "Завантажте файл для своєї платформи. Якщо ви не впевнені який обрати, " -"дізнайтеся більше про <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">встановлення пакунків</a>." +"дізнайтеся більше про <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">встановлення пакунків</a>." #: warehouse/templates/packaging/detail.html:273 #, python-format @@ -3627,18 +3626,18 @@ msgstr "Хеші" #: warehouse/templates/pages/classifiers.html:22 msgid "" -"Each project's maintainers provide PyPI with a list of \"trove classifiers\" " -"to categorize each release, describing who it's for, what systems it can run " -"on, and how mature it is." +"Each project's maintainers provide PyPI with a list of \"trove " +"classifiers\" to categorize each release, describing who it's for, what " +"systems it can run on, and how mature it is." msgstr "" -"Доглядачі кожного проекту надають PyPI перелік «trove-класифікаторів», щоб " -"категоризувати кожен випуск, описуючи для кого він, на яких системах може " -"запускатися і наскільки він зрілий." +"Доглядачі кожного проекту надають PyPI перелік «trove-класифікаторів», " +"щоб категоризувати кожен випуск, описуючи для кого він, на яких системах " +"може запускатися і наскільки він зрілий." #: warehouse/templates/pages/classifiers.html:23 msgid "" -"These standardized classifiers can then be used by community members to find " -"projects based on their desired criteria." +"These standardized classifiers can then be used by community members to " +"find projects based on their desired criteria." msgstr "" "Ці стандартизовані класифікатори потім можуть бути використані членами " "спільноти, щоб знаходити проекти на основі їх бажаних критеріїв." @@ -3646,20 +3645,20 @@ msgstr "" #: warehouse/templates/pages/classifiers.html:25 #, python-format msgid "" -"Instructions for how to add trove classifiers to a project can be found on " -"the <a href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging User Guide</a>. To read the original " -"classifier specification, refer to <a href=\"%(pep301_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python " -"enhancement proposal\">PEP</abbr> 301</a>." +"Instructions for how to add trove classifiers to a project can be found " +"on the <a href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>. To read the original " +"classifier specification, refer to <a href=\"%(pep301_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 301</a>." msgstr "" -"Ви можете знайти інструкції щодо додавання trove-класифікаторів до проекту в " -"<a href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">користувацькому керівництві з пакування Python</a>. Щоб " -"прочитати оригінальну специфікацію класифікаторів, зверніться до <a href=" -"\"%(pep301_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><abbr title=\"Пропозиція покращення Python (Python enhancement " -"proposal)\">PEP</abbr> 301</a>." +"Ви можете знайти інструкції щодо додавання trove-класифікаторів до " +"проекту в <a href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\"" +" rel=\"noopener\">користувацькому керівництві з пакування Python</a>. Щоб" +" прочитати оригінальну специфікацію класифікаторів, зверніться до <a " +"href=\"%(pep301_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><abbr title=\"Пропозиція покращення Python (Python " +"enhancement proposal)\">PEP</abbr> 301</a>." #: warehouse/templates/pages/classifiers.html:31 msgid "List of classifiers" @@ -3673,21 +3672,23 @@ msgstr "Зверніть увагу:" #: warehouse/templates/pages/help.html:20 #, python-format msgid "" -"All users submitting feedback, reporting issues or contributing to Warehouse " -"are expected to follow the <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">PyPA Code of Conduct</a>." +"All users submitting feedback, reporting issues or contributing to " +"Warehouse are expected to follow the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPA Code of " +"Conduct</a>." msgstr "" -"Ми очікуємо, що всі користувачі, які надсилають відгуки, звіти про проблеми " -"або вклади до Warehouse будуть дотримуватися <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Кодексу честі PyPA</a>." +"Ми очікуємо, що всі користувачі, які надсилають відгуки, звіти про " +"проблеми або вклади до Warehouse будуть дотримуватися <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Кодексу честі PyPA</a>." #: warehouse/templates/pages/help.html:31 #, python-format msgid "" "If you lose your %(method)s and can no longer log in, you may " "<strong>permanently lose access to your account</strong>. You should " -"generate and securely store <a href=\"#recoverycodes\">recovery codes</a> to " -"regain access in that event.." +"generate and securely store <a href=\"#recoverycodes\">recovery codes</a>" +" to regain access in that event.." msgstr "" "Якщо ви втратите ваш %(method)s і не зможете увійти, ви можете " "<strong>назавжди втратити доступ до вашого акаунту</strong>. Вам варто " @@ -3696,23 +3697,23 @@ msgstr "" #: warehouse/templates/pages/help.html:37 msgid "" -"We recommend that all PyPI users set up <em>at least two</em> supported two " -"factor authentication methods and provision <a href=\"#recoverycodes" -"\">recovery codes</a>." +"We recommend that all PyPI users set up <em>at least two</em> supported " +"two factor authentication methods and provision <a " +"href=\"#recoverycodes\">recovery codes</a>." msgstr "" -"Ми рекомендуємо усім користувачам PyPI встановити <em>як найменше два</em> з " -"доступних методів двофакторної аутентифікації і отримати <a href=" -"\"#recoverycodes\">коди відновлення</a>." +"Ми рекомендуємо усім користувачам PyPI встановити <em>як найменше " +"два</em> з доступних методів двофакторної аутентифікації і отримати <a " +"href=\"#recoverycodes\">коди відновлення</a>." #: warehouse/templates/pages/help.html:43 msgid "" -"If you've lost access to all two factor methods for your account and do not " -"have <a href=\"#recoverycodes\">recovery codes</a>, you can request help <a " -"href=\"#account-recovery\">with account recovery</a>." +"If you've lost access to all two factor methods for your account and do " +"not have <a href=\"#recoverycodes\">recovery codes</a>, you can request " +"help <a href=\"#account-recovery\">with account recovery</a>." msgstr "" -"Якщо ви втратили доступ до всіх двофакторних методів і не маєте <a href=" -"\"#recoverycodes\">кодів відновлення</a>, ви можете звернутися за допомогою " -"для <a href=\"#account-recovery\">відновлення акаунту</a>." +"Якщо ви втратили доступ до всіх двофакторних методів і не маєте <a " +"href=\"#recoverycodes\">кодів відновлення</a>, ви можете звернутися за " +"допомогою для <a href=\"#account-recovery\">відновлення акаунту</a>." #: warehouse/templates/pages/help.html:52 msgid "What's a package, project, or release?" @@ -3744,21 +3745,21 @@ msgstr "Що таке двофакторна автентифікація та #: warehouse/templates/pages/help.html:60 msgid "" -"How does two factor authentication with an authentication application (<abbr " -"title=\"time-based one-time password\">TOTP</abbr>) work? How do I set it up " -"on PyPI?" +"How does two factor authentication with an authentication application " +"(<abbr title=\"time-based one-time password\">TOTP</abbr>) work? How do I" +" set it up on PyPI?" msgstr "" -"Як працює двофакторна автентифікація за допомогою застосунку автентифікації " -"(<abbr title=\"time-based one-time password\">TOTP</abbr>)? Як налаштувати " -"це на PyPI?" +"Як працює двофакторна автентифікація за допомогою застосунку " +"автентифікації (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>)? Як налаштувати це на PyPI?" #: warehouse/templates/pages/help.html:61 msgid "" "How does two factor authentication with a security device (e.g. USB key) " "work? How do I set it up on PyPI?" msgstr "" -"Як працює двофакторна автентифікація за допомогою пристрою безпеки (напр. " -"USB-ключа)? Як налаштувати це на PyPI?" +"Як працює двофакторна автентифікація за допомогою пристрою безпеки (напр." +" USB-ключа)? Як налаштувати це на PyPI?" #: warehouse/templates/pages/help.html:62 msgid "What devices (other than a USB key) can I use as a security device?" @@ -3768,8 +3769,8 @@ msgstr "" #: warehouse/templates/pages/help.html:63 msgid "" -"How does two factor authentication with a recovery code work? How do I set " -"it up on PyPI?" +"How does two factor authentication with a recovery code work? How do I " +"set it up on PyPI?" msgstr "" "Як працює двофакторна автентифікація за допомогою кодів відновлення? Як " "налаштувати це на PyPI?" @@ -3792,10 +3793,11 @@ msgstr "Як мені отримувати сповіщення щойно но #: warehouse/templates/pages/help.html:69 msgid "" -"Where can I see statistics about PyPI, downloads, and project/package usage?" +"Where can I see statistics about PyPI, downloads, and project/package " +"usage?" msgstr "" -"Де мені подивитися статистику щодо PyPI, завантаження і використання проекта/" -"пакунка?" +"Де мені подивитися статистику щодо PyPI, завантаження і використання " +"проекта/пакунка?" #: warehouse/templates/pages/help.html:71 msgid "I forgot my PyPI password. Can you help me?" @@ -3807,30 +3809,29 @@ msgstr "Я втратив доступ до облікового запису Py #: warehouse/templates/pages/help.html:73 msgid "" -"Why am I getting a \"Invalid or non-existent authentication information.\" " -"error when uploading files?" +"Why am I getting a \"Invalid or non-existent authentication " +"information.\" error when uploading files?" msgstr "" "Чому я отримую помилку \"Неправильна або неіснуюча аутентифікаційна " "інформація.\" при завантаженні файлів?" #: warehouse/templates/pages/help.html:74 msgid "" -"Why am I getting \"No matching distribution found\" or \"Could not fetch URL" -"\" errors during <code>pip install</code>?" +"Why am I getting \"No matching distribution found\" or \"Could not fetch " +"URL\" errors during <code>pip install</code>?" msgstr "" -"Чому я отримую помилки «No matching distribution found» чи «Could not fetch " -"URL» під час <code>pip install</code>?" +"Чому я отримую помилки «No matching distribution found» чи «Could not " +"fetch URL» під час <code>pip install</code>?" #: warehouse/templates/pages/help.html:75 msgid "I am having trouble using the PyPI website. Can you help me?" -msgstr "" -"Я маю проблему під час використання веб-сайту PyPI. Можете мені допомогти?" +msgstr "Я маю проблему під час використання веб-сайту PyPI. Можете мені допомогти?" #: warehouse/templates/pages/help.html:76 -msgid "" -"Why can't I manually upload files to PyPI, through the browser interface?" +msgid "Why can't I manually upload files to PyPI, through the browser interface?" msgstr "" -"Чому я не можу завантажувати файли до PyPI вручну через браузерний інтерфейс?" +"Чому я не можу завантажувати файли до PyPI вручну через браузерний " +"інтерфейс?" #: warehouse/templates/pages/help.html:77 msgid "How can I publish my private packages to PyPI?" @@ -3848,11 +3849,11 @@ msgstr "" #: warehouse/templates/pages/help.html:81 msgid "" -"Why am I getting a \"Filename or contents already exists\" or \"Filename has " -"been previously used\" error?" +"Why am I getting a \"Filename or contents already exists\" or \"Filename " +"has been previously used\" error?" msgstr "" -"Чому я отримую помилку «Назва файлу або вміст уже існує» чи «Назва файлу вже " -"використовувалася раніше»?" +"Чому я отримую помилку «Назва файлу або вміст уже існує» чи «Назва файлу " +"вже використовувалася раніше»?" #: warehouse/templates/pages/help.html:82 msgid "Why isn't my desired project name available?" @@ -3861,7 +3862,8 @@ msgstr "Чому моя бажана назва проекту недоступ #: warehouse/templates/pages/help.html:83 msgid "How do I claim an abandoned or previously registered project name?" msgstr "" -"Як я можу претендувати на закинуту чи попередньо зареєстровану назву проекту?" +"Як я можу претендувати на закинуту чи попередньо зареєстровану назву " +"проекту?" #: warehouse/templates/pages/help.html:84 msgid "What collaborator roles are available for a project on PyPI?" @@ -3905,10 +3907,11 @@ msgstr "Як я можу йти в ногу з майбутніми змінам #: warehouse/templates/pages/help.html:95 msgid "" -"What does the \"beta feature\" badge mean? What are Warehouse's current beta " -"features?" +"What does the \"beta feature\" badge mean? What are Warehouse's current " +"beta features?" msgstr "" -"Що означає позначка «бета-функція»? Які бета-функції має Warehouse's зараз?" +"Що означає позначка «бета-функція»? Які бета-функції має Warehouse's " +"зараз?" #: warehouse/templates/pages/help.html:96 msgid "How do I pronounce \"PyPI\"?" @@ -3952,21 +3955,22 @@ msgstr "Про" msgid "" "\n" " <p>We use a number of terms to describe software available on " -"PyPI, like \"project\", \"release\", \"file\", and \"package\". Sometimes " -"those terms are confusing because they're used to describe different things " -"in other contexts. Here's how we use them on PyPI:</p>\n" -" <p>A \"project\" on PyPI is the name of a collection of releases " -"and files, and information about them. Projects on PyPI are made and shared " -"by other members of the Python community so that you can use them.</p>\n" -" <p>A \"release\" on PyPI is a specific version of a project. For " -"example, the <a href=\"%(requests_href)s\">requests</a> project has many " -"releases, like \"requests 2.10\" and \"requests 1.2.1\". A release consists " -"of one or more \"files\".</p>\n" -" <p>A \"file\", also known as a \"package\", on PyPI is something " -"that you can download and install. Because of different hardware, operating " -"systems, and file formats, a release may have several files (packages), like " -"an archive containing source code or a binary <a href=\"%(wheel_href)s" -"\">wheel</a>.</p>\n" +"PyPI, like \"project\", \"release\", \"file\", and \"package\". Sometimes" +" those terms are confusing because they're used to describe different " +"things in other contexts. Here's how we use them on PyPI:</p>\n" +" <p>A \"project\" on PyPI is the name of a collection of " +"releases and files, and information about them. Projects on PyPI are made" +" and shared by other members of the Python community so that you can use " +"them.</p>\n" +" <p>A \"release\" on PyPI is a specific version of a project. " +"For example, the <a href=\"%(requests_href)s\">requests</a> project has " +"many releases, like \"requests 2.10\" and \"requests 1.2.1\". A release " +"consists of one or more \"files\".</p>\n" +" <p>A \"file\", also known as a \"package\", on PyPI is " +"something that you can download and install. Because of different " +"hardware, operating systems, and file formats, a release may have several" +" files (packages), like an archive containing source code or a binary <a " +"href=\"%(wheel_href)s\">wheel</a>.</p>\n" " " msgstr "" "\n" @@ -3975,60 +3979,61 @@ msgstr "" "«пакунок». Часом, деякі з цих термінів призводять до плутанини, бо вони " "використовуються для опису різних речей в інших контекстах. Ось як ми " "використовуємо їх на PyPI:</p>\n" -" <p>«Проект» на PyPI це назва збірки випусків та файлів, а також " -"інформація про них. Проекти на PyPI створюються і поширюються іншими " +" <p>«Проект» на PyPI це назва збірки випусків та файлів, а також" +" інформація про них. Проекти на PyPI створюються і поширюються іншими " "учасниками спільноти Python, щоб ви могли ними користуватися.</p>\n" -" <p>«Випуском» на PyPI є певна версія проекту. Наприклад, проект <a " -"href=\"%(requests_href)s\">requests</a> має багато випусків, таких як " -"«requests 2.10» та «requests 1.2.1». Випуск складається із одного або більше " -"«файлів».</p>\n" +" <p>«Випуском» на PyPI є певна версія проекту. Наприклад, проект" +" <a href=\"%(requests_href)s\">requests</a> має багато випусків, таких як" +" «requests 2.10» та «requests 1.2.1». Випуск складається із одного або " +"більше «файлів».</p>\n" " <p>«Файл», також відомий як «пакунок», на PyPI це щось, що ви " -"можете завантажити і встановити. Через різне обладнання, операційні системи " -"і формати файлів, випуск може містити кілька файлів (пакунків), як-от архів " -"із джерельним кодом або двійкове <a href=\"%(wheel_href)s\">wheel</a>.</p>\n" +"можете завантажити і встановити. Через різне обладнання, операційні " +"системи і формати файлів, випуск може містити кілька файлів (пакунків), " +"як-от архів із джерельним кодом або двійкове <a " +"href=\"%(wheel_href)s\">wheel</a>.</p>\n" " " #: warehouse/templates/pages/help.html:194 #, python-format msgid "" -"To learn how to install a file from PyPI, visit the <a href=" -"\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">installation tutorial</a> on the <a href=\"%(user_guide_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " -"User Guide</a>." +"To learn how to install a file from PyPI, visit the <a " +"href=\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">installation tutorial</a> on the <a " +"href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" -"Щоб дізнатися, як встановити файл із PyPI, відвідайте <a href=" -"\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">навчальну інструкцію з встановлення</a> у <a href=" -"\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">користувацькому керівництві з пакування Python</a>." +"Щоб дізнатися, як встановити файл із PyPI, відвідайте <a " +"href=\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">навчальну інструкцію з встановлення</a> у <a " +"href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">користувацькому керівництві з пакування Python</a>." #: warehouse/templates/pages/help.html:201 #, python-format msgid "" -"For full instructions on configuring, packaging and distributing your Python " -"project, refer to the <a href=\"%(packaging_tutorial_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">packaging tutorial</a> on " -"the <a href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Python Packaging User Guide</a>." +"For full instructions on configuring, packaging and distributing your " +"Python project, refer to the <a href=\"%(packaging_tutorial_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">packaging " +"tutorial</a> on the <a href=\"%(user_guide_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" "Щоб знайти повні інструкції з налаштування, пакування і поширення вашого " -"Python-проекту, зверніться до <a href=\"%(packaging_tutorial_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">навчальну інструкцію з " -"пакування</a> у <a href=\"%(user_guide_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">користувацькому керівництві з пакування Python</" -"a>." +"Python-проекту, зверніться до <a href=\"%(packaging_tutorial_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">навчальну " +"інструкцію з пакування</a> у <a href=\"%(user_guide_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">користувацькому " +"керівництві з пакування Python</a>." #: warehouse/templates/pages/help.html:208 #, python-format msgid "" -"Classifiers are used to categorize projects on PyPI. See <a href=\"%(href)s" -"\">the classifiers page</a> for more information, as well as a list of valid " -"classifiers." +"Classifiers are used to categorize projects on PyPI. See <a " +"href=\"%(href)s\">the classifiers page</a> for more information, as well " +"as a list of valid classifiers." msgstr "" "Класифікатори використовуються для категоризації проектів на PyPI. " -"Перегляньте <a href=\"%(href)s\">сторінку класифікаторів</a>, щоб дізнатися " -"більше інформації, а також перелік дійсних класифікаторів." +"Перегляньте <a href=\"%(href)s\">сторінку класифікаторів</a>, щоб " +"дізнатися більше інформації, а також перелік дійсних класифікаторів." #: warehouse/templates/pages/help.html:215 msgid "My account" @@ -4036,11 +4041,11 @@ msgstr "Мій обліковий запис" #: warehouse/templates/pages/help.html:218 msgid "" -"Currently, PyPI requires a verified email address to perform the following " -"operations:" +"Currently, PyPI requires a verified email address to perform the " +"following operations:" msgstr "" -"Наразі, PyPI потребує підтверджену електронну адресу щоб виконувати наступні " -"дії:" +"Наразі, PyPI потребує підтверджену електронну адресу щоб виконувати " +"наступні дії:" #: warehouse/templates/pages/help.html:220 msgid "Register a new project." @@ -4052,8 +4057,8 @@ msgstr "Завантажити нову версію або файл." #: warehouse/templates/pages/help.html:223 msgid "" -"The list of activities that require a verified email address is likely to " -"grow over time." +"The list of activities that require a verified email address is likely to" +" grow over time." msgstr "" "Перелік дій, які потребують підтверджену електронну адресу, ймовірно " "збільшиться з часом." @@ -4061,151 +4066,159 @@ msgstr "" #: warehouse/templates/pages/help.html:224 #, python-format msgid "" -"This policy will allow us to enforce a key policy of <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python " -"enhancement proposal\">PEP</abbr> 541</a> regarding maintainer reachability. " -"It also reduces the viability of spam attacks to create many accounts in an " -"automated fashion." +"This policy will allow us to enforce a key policy of <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 541</a> regarding " +"maintainer reachability. It also reduces the viability of spam attacks to" +" create many accounts in an automated fashion." msgstr "" -"Ця політика дозволить нам застосовувати ключову політику <a href=\"%(href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=" -"\"Python enhancement proposal\">PEP</abbr> 541</a> щодо доступності " -"доглядачів. Це також зменшує життєздатність спам-атак зі створенням багатьох " -"облікових записів автоматично." +"Ця політика дозволить нам застосовувати ключову політику <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><abbr title=\"Python enhancement proposal\">PEP</abbr> " +"541</a> щодо доступності доглядачів. Це також зменшує життєздатність " +"спам-атак зі створенням багатьох облікових записів автоматично." #: warehouse/templates/pages/help.html:225 #, python-format msgid "" -"You can manage your account's email addresses in your <a href=\"%(href)s" -"\">account settings</a>. This also allows for sending a new confirmation " -"email for users who signed up in the past, before we began enforcing this " -"policy." +"You can manage your account's email addresses in your <a " +"href=\"%(href)s\">account settings</a>. This also allows for sending a " +"new confirmation email for users who signed up in the past, before we " +"began enforcing this policy." msgstr "" -"Ви можете керувати електронною адресою вашого облікового запису в <a href=" -"\"%(href)s\">його налаштуваннях</a>. Це також дозволяє надсилання нового " -"електронного листа підтвердження користувачам, які зареєструвалися в " -"минулому, до того як ми впровадили цю політику." +"Ви можете керувати електронною адресою вашого облікового запису в <a " +"href=\"%(href)s\">його налаштуваннях</a>. Це також дозволяє надсилання " +"нового електронного листа підтвердження користувачам, які зареєструвалися" +" в минулому, до того як ми впровадили цю політику." #: warehouse/templates/pages/help.html:228 #, python-format msgid "" -"<p> PyPI itself has not suffered a breach. This is a protective measure to " -"reduce the risk of <a href=\"%(credential_stuffing_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">credential stuffing</a> attacks " -"against PyPI and its users. </p> <p> Each time a user supplies a password — " -"while registering, authenticating, or updating their password — PyPI " -"securely checks whether that password has appeared in public data breaches. " -"</p> <p> During each of these processes, PyPI generates a SHA-1 hash of the " -"supplied password and uses the first five (5) characters of the hash to " -"check the <a href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Have I Been Pwned API</a> and determine if the " -"password has been previously compromised. The plaintext password is never " -"stored by PyPI or submitted to the Have I Been Pwned API. </p> <p> PyPI will " -"not allow such passwords to be used when setting a password at registration " -"or updating your password. </p> <p> If you receive an error message saying " -"that \"This password appears in a breach or has been compromised and cannot " -"be used\", you should change it all other places that you use it as soon as " -"possible. </p> <p> If you have received this error while attempting to log " -"in or upload to PyPI, then your password has been reset and you cannot log " -"in to PyPI until you <a href=\"%(reset_pwd_href)s\">reset your password</a>. " -"</p>" +"<p> PyPI itself has not suffered a breach. This is a protective measure " +"to reduce the risk of <a href=\"%(credential_stuffing_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">credential " +"stuffing</a> attacks against PyPI and its users. </p> <p> Each time a " +"user supplies a password — while registering, authenticating, or updating" +" their password — PyPI securely checks whether that password has appeared" +" in public data breaches. </p> <p> During each of these processes, PyPI " +"generates a SHA-1 hash of the supplied password and uses the first five " +"(5) characters of the hash to check the <a " +"href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Have I Been Pwned API</a> and determine if the password " +"has been previously compromised. The plaintext password is never stored " +"by PyPI or submitted to the Have I Been Pwned API. </p> <p> PyPI will not" +" allow such passwords to be used when setting a password at registration " +"or updating your password. </p> <p> If you receive an error message " +"saying that \"This password appears in a breach or has been compromised " +"and cannot be used\", you should change it all other places that you use " +"it as soon as possible. </p> <p> If you have received this error while " +"attempting to log in or upload to PyPI, then your password has been reset" +" and you cannot log in to PyPI until you <a " +"href=\"%(reset_pwd_href)s\">reset your password</a>. </p>" msgstr "" "<p> Сам PyPI не зазнав злому. Це захисний захід спрямований на зниження " "ризику атак <a href=\"%(credential_stuffing_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">підстановки облікових даних (credential " -"stuffing)</a> на PyPI та його користувачів. </p> <p> Щоразу, коли користувач " -"надає пароль, — під час реєстрації, автентифікації або оновлення свого " -"пароля — PyPI безпечно перевіряє чи цей пароль з'являвся у публічних витоках " -"даних. </p> <p> Під час кожного з цих процесів, PyPI генерує хеш SHA-1 із " -"наданого пароля та використовує перші п'ять (5) символів хеша, аби " -"перевірити <a href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Have I Been Pwned API</a> та з'ясувати чи пароль " -"було коли-небудь скомпрометовано. Пароль ніколи не зберігається на PyPI у " -"вигляді відкритого тексту і не надсилається до Have I Been Pwned API. </p> " -"<p> PyPI не дозволить використовувати такі паролі під час встановлення " -"пароля протягом реєстрації чи його оновленні. </p> <p> Якщо ви отримаєте " -"повідомлення, яке повідомляє, що «Цей пароль виявлено у витоці даних або " -"було скомпрометовано, і ним не можна користуватися», вам слід якнайшвидше " -"змінити його в усіх інших місцях, де ви його використовуєте. </p> <p> Якщо " -"ви отримали цю помилку, поки намагалися увійти чи завантажити до PyPI, це " -"означає, що ваш пароль було скинуто, і ви не зможете увійти до PyPI, доки не " -"<a href=\"%(reset_pwd_href)s\">скинете свій пароль</a>. </p>" +"target=\"_blank\" rel=\"noopener\">підстановки облікових даних " +"(credential stuffing)</a> на PyPI та його користувачів. </p> <p> Щоразу, " +"коли користувач надає пароль, — під час реєстрації, автентифікації або " +"оновлення свого пароля — PyPI безпечно перевіряє чи цей пароль з'являвся " +"у публічних витоках даних. </p> <p> Під час кожного з цих процесів, PyPI " +"генерує хеш SHA-1 із наданого пароля та використовує перші п'ять (5) " +"символів хеша, аби перевірити <a href=\"%(haveibeenpwned_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Have I Been Pwned " +"API</a> та з'ясувати чи пароль було коли-небудь скомпрометовано. Пароль " +"ніколи не зберігається на PyPI у вигляді відкритого тексту і не " +"надсилається до Have I Been Pwned API. </p> <p> PyPI не дозволить " +"використовувати такі паролі під час встановлення пароля протягом " +"реєстрації чи його оновленні. </p> <p> Якщо ви отримаєте повідомлення, " +"яке повідомляє, що «Цей пароль виявлено у витоці даних або було " +"скомпрометовано, і ним не можна користуватися», вам слід якнайшвидше " +"змінити його в усіх інших місцях, де ви його використовуєте. </p> <p> " +"Якщо ви отримали цю помилку, поки намагалися увійти чи завантажити до " +"PyPI, це означає, що ваш пароль було скинуто, і ви не зможете увійти до " +"PyPI, доки не <a href=\"%(reset_pwd_href)s\">скинете свій пароль</a>. " +"</p>" #: warehouse/templates/pages/help.html:263 #, python-format msgid "" "<p> Two factor authentication (2FA) makes your account more secure by " "requiring two things in order to log in: <em>something you know</em> and " -"<em>something you own</em>. </p> <p> In PyPI's case, \"something you know\" " -"is your username and password, while \"something you own\" can be <a href=" -"\"#totp\">an application to generate a temporary code</a>, or a <a href=" -"\"#utfkey\">security device</a> (most commonly a USB key). </p> <p> It is " -"strongly recommended that you set up two factor authentication on your PyPI " -"account. </p> <p> Users who have chosen to set up two factor authentication " -"will be asked to provide their second method of identity verification during " -"the log in process. This only affects logging in via a web browser, and not " -"(yet) package uploads. </p> <p>You can follow the improvements to <abbr " -"title=\"two factor authentication\">2FA</abbr> on <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">discuss.python.org</a>.</p>" +"<em>something you own</em>. </p> <p> In PyPI's case, \"something you " +"know\" is your username and password, while \"something you own\" can be " +"<a href=\"#totp\">an application to generate a temporary code</a>, or a " +"<a href=\"#utfkey\">security device</a> (most commonly a USB key). </p> " +"<p> It is strongly recommended that you set up two factor authentication " +"on your PyPI account. </p> <p> Users who have chosen to set up two factor" +" authentication will be asked to provide their second method of identity " +"verification during the log in process. This only affects logging in via " +"a web browser, and not (yet) package uploads. </p> <p>You can follow the " +"improvements to <abbr title=\"two factor authentication\">2FA</abbr> on " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">discuss.python.org</a>.</p>" msgstr "" "<p> Двофакторна автентифікація (2FA) підвищує рівень безпеки вашого " -"облікового запису, вимагаючи дві речі для входу: <em>щось, що вам відомо</" -"em> і <em>щось, чим ви володієте</em>. </p> <p> У випадку PyPI, «щось, що " -"вам відомо» це ваші ім'я користувача та пароль, а от «тим, чим ви володієте» " -"може бути <a href=\"#totp\">застосунок для генерації тимчасового коду</a> " -"або ж <a href=\"#utfkey\">пристрій безпеки</a> (найчастіше це USB-ключ). </" -"p> <p> Ми наполегливо рекомендуємо, щоб ви налаштували двофакторну " -"автентифікацію у своєму обліковому записі на PyPI. </p> <p> Від " -"користувачів, які налаштували двофакторну автентифікацію, буде вимагатися " -"надати свій другий спосіб підтвердження особистості під час процесу входу. " -"Це лише впливає на вхід через веб-браузер, але не на завантаження пакунків " -"(поки що). </p> <p>Ви можете стежити за покращеннями до <abbr title=" -"\"двофакторна автентифікація\">2FA</abbr> на <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">discuss.python.org</a>.</p>" +"облікового запису, вимагаючи дві речі для входу: <em>щось, що вам " +"відомо</em> і <em>щось, чим ви володієте</em>. </p> <p> У випадку PyPI, " +"«щось, що вам відомо» це ваші ім'я користувача та пароль, а от «тим, чим " +"ви володієте» може бути <a href=\"#totp\">застосунок для генерації " +"тимчасового коду</a> або ж <a href=\"#utfkey\">пристрій безпеки</a> " +"(найчастіше це USB-ключ). </p> <p> Ми наполегливо рекомендуємо, щоб ви " +"налаштували двофакторну автентифікацію у своєму обліковому записі на " +"PyPI. </p> <p> Від користувачів, які налаштували двофакторну " +"автентифікацію, буде вимагатися надати свій другий спосіб підтвердження " +"особистості під час процесу входу. Це лише впливає на вхід через " +"веб-браузер, але не на завантаження пакунків (поки що). </p> <p>Ви можете" +" стежити за покращеннями до <abbr title=\"двофакторна " +"автентифікація\">2FA</abbr> на <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">discuss.python.org</a>.</p>" #: warehouse/templates/pages/help.html:290 #, python-format msgid "" "PyPI users can set up two-factor authentication using any authentication " "application that supports the <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based one-time password" -"\">TOTP</abbr> standard</a>." +"target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based one-time " +"password\">TOTP</abbr> standard</a>." msgstr "" "Користувачі PyPI можуть налаштувати двофакторну автентифікацію " "використовуючи будь-який застосунок автентифікації, який дотримується " -"стандарту <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\"><abbr title=\"time-based one-time password\">TOTP</abbr></a>." +"стандарту <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><abbr title=\"time-based one-time " +"password\">TOTP</abbr></a>." #: warehouse/templates/pages/help.html:291 msgid "" "<abbr title=\"time-based one-time password\">TOTP</abbr> authentication " -"applications generate a regularly changing authentication code to use when " -"logging into your account." +"applications generate a regularly changing authentication code to use " +"when logging into your account." msgstr "" -"Застосунки автентифікації <abbr title=\"time-based one-time password\">TOTP</" -"abbr> генерують код, який регулярно змінюється, для використання під час " -"входу у ваш обліковий запис." +"Застосунки автентифікації <abbr title=\"time-based one-time " +"password\">TOTP</abbr> генерують код, який регулярно змінюється, для " +"використання під час входу у ваш обліковий запис." #: warehouse/templates/pages/help.html:292 msgid "" -"Because <abbr title=\"time-based one-time password\">TOTP</abbr> is an open " -"standard, there are many applications that are compatible with your PyPI " -"account. Popular applications include:" +"Because <abbr title=\"time-based one-time password\">TOTP</abbr> is an " +"open standard, there are many applications that are compatible with your " +"PyPI account. Popular applications include:" msgstr "" -"Завдяки тому, що <abbr title=\"time-based one-time password\">TOTP</abbr> — " -"це відкритий стандарт, багато програм сумісні з вашим обліковим записом на " -"PyPI. Поширені програми включають:" +"Завдяки тому, що <abbr title=\"time-based one-time password\">TOTP</abbr>" +" — це відкритий стандарт, багато програм сумісні з вашим обліковим " +"записом на PyPI. Поширені програми включають:" #: warehouse/templates/pages/help.html:295 #, python-format msgid "" -"Google Authenticator for <a href=\"%(android_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Google Authenticator for <a href=\"%(android_href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Android</a> or <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" msgstr "" -"Генератор кодів Google для <a href=\"%(android_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Android</a> або <a href=\"%(ios_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Генератор кодів Google для <a href=\"%(android_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Android</a> або <a" +" href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/help.html:298 #: warehouse/templates/pages/help.html:300 @@ -4217,13 +4230,15 @@ msgstr "(пропрієтарний)" #: warehouse/templates/pages/help.html:302 #, python-format msgid "" -"Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Android</a> or <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" msgstr "" -"Duo Mobile для <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Android</a> або <a href=\"%(ios_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Duo Mobile для <a href=\"%(android_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Android</a> або <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/help.html:308 #: warehouse/templates/pages/help.html:309 @@ -4233,15 +4248,15 @@ msgstr "(відкритий код)" #: warehouse/templates/pages/help.html:313 #, python-format msgid "" -"Some password managers (e.g. <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">1Password</a>) can also generate authentication " -"codes. For security reasons, PyPI only allows you to set up one application " -"per account." +"Some password managers (e.g. <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">1Password</a>) can also generate " +"authentication codes. For security reasons, PyPI only allows you to set " +"up one application per account." msgstr "" "Деякі менеджери паролів (напр. <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">1Password</a>) також можуть генерувати " -"коди автентифікації. З міркувань безпеки, PyPI дозволяє налаштувати лише " -"один застосунок автентифікації для облікового запису." +"target=\"_blank\" rel=\"noopener\">1Password</a>) також можуть генерувати" +" коди автентифікації. З міркувань безпеки, PyPI дозволяє налаштувати лише" +" один застосунок автентифікації для облікового запису." #: warehouse/templates/pages/help.html:321 msgid "" @@ -4253,42 +4268,43 @@ msgstr "" #: warehouse/templates/pages/help.html:323 msgid "" -"Open an authentication (<abbr title=\"time-based one-time password\">TOTP</" -"abbr>) application" +"Open an authentication (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>) application" msgstr "" "Відкрити застосунок автентифікації (<abbr title=\"time-based one-time " "password\">TOTP</abbr>)" #: warehouse/templates/pages/help.html:324 msgid "" -"Log in to your PyPI account, go to your account settings, and choose \"Add " -"<abbr title=\"two factor authentication\">2FA</abbr> with authentication " -"application\"" +"Log in to your PyPI account, go to your account settings, and choose " +"\"Add <abbr title=\"two factor authentication\">2FA</abbr> with " +"authentication application\"" msgstr "" -"Увійдіть до свого облікового запису на PyPI, перейдіть до налаштувань свого " -"облікового запису та оберіть «Додати <abbr title=\"two factor authentication" -"\">2FA</abbr> за допомогою застосунку автентифікації»" +"Увійдіть до свого облікового запису на PyPI, перейдіть до налаштувань " +"свого облікового запису та оберіть «Додати <abbr title=\"two factor " +"authentication\">2FA</abbr> за допомогою застосунку автентифікації»" #: warehouse/templates/pages/help.html:325 msgid "" -"PyPI will generate a secret key, specific to your account. This is displayed " -"as a QR code, and as a text code." +"PyPI will generate a secret key, specific to your account. This is " +"displayed as a QR code, and as a text code." msgstr "" -"PyPI згенерує таємний ключ, специфічний для вашого облікового запису. Він " -"відображається як QR-код та як текстовий код." +"PyPI згенерує таємний ключ, специфічний для вашого облікового запису. Він" +" відображається як QR-код та як текстовий код." #: warehouse/templates/pages/help.html:326 msgid "" "Scan the QR code with your authentication application, or type it in " -"manually. The method of input will depend on the application you have chosen." +"manually. The method of input will depend on the application you have " +"chosen." msgstr "" "Відскануйте QR-код у своєму застосунку автентифікації або введіть його " "вручну. Спосіб вводу залежить від застосунку, який ви обрали." #: warehouse/templates/pages/help.html:327 msgid "" -"Your application will generate an authentication code - use this to verify " -"your set up on PyPI" +"Your application will generate an authentication code - use this to " +"verify your set up on PyPI" msgstr "" "Ваш застосунок згенерує код автентифікації — скористайтеся ним, щоб " "підтвердити своє налаштування на PyPI" @@ -4296,12 +4312,12 @@ msgstr "" #: warehouse/templates/pages/help.html:330 msgid "" "The PyPI server and your application now share your PyPI secret key, " -"allowing your application to generate valid authentication codes for your " -"PyPI account." +"allowing your application to generate valid authentication codes for your" +" PyPI account." msgstr "" -"Сервер PyPI та ваш застосунок тепер розділяють ваш таємний ключ для PyPI, що " -"дозволяє вашому застосунку генерувати дійсні коди автентифікації для вашого " -"облікового запису на PyPI." +"Сервер PyPI та ваш застосунок тепер розділяють ваш таємний ключ для PyPI," +" що дозволяє вашому застосунку генерувати дійсні коди автентифікації для " +"вашого облікового запису на PyPI." #: warehouse/templates/pages/help.html:332 #: warehouse/templates/pages/help.html:374 @@ -4315,8 +4331,7 @@ msgstr "Надати своє ім'я користувача і пароль, я #: warehouse/templates/pages/help.html:335 msgid "Open your authentication application to generate an authentication code" -msgstr "" -"Відкрити свій застосунок автентифікації аби згенерувати код автентифікації" +msgstr "Відкрити свій застосунок автентифікації аби згенерувати код автентифікації" #: warehouse/templates/pages/help.html:336 msgid "Use this code to finish logging into PyPI" @@ -4324,33 +4339,34 @@ msgstr "Використати цей код, щоб завершити проц #: warehouse/templates/pages/help.html:342 msgid "" -"A security device is a USB key or <a href=\"#utfdevices\">other device</a> " -"that generates a one-time password and sends that password to the browser. " -"This password is then used by PyPI to authenticate you as a user." +"A security device is a USB key or <a href=\"#utfdevices\">other " +"device</a> that generates a one-time password and sends that password to " +"the browser. This password is then used by PyPI to authenticate you as a " +"user." msgstr "" -"Пристроєм безпеки є USB-ключ або <a href=\"#utfdevices\">інший пристрій</" -"a> , який генерує одноразовий пароль і надсилає той пароль до браузера. PyPI " -"потім використовує цей пароль, щоб автентифікувати вас як користувача." +"Пристроєм безпеки є USB-ключ або <a href=\"#utfdevices\">інший " +"пристрій</a> , який генерує одноразовий пароль і надсилає той пароль до " +"браузера. PyPI потім використовує цей пароль, щоб автентифікувати вас як " +"користувача." #: warehouse/templates/pages/help.html:344 -msgid "" -"To set up two factor authentication with a <em>USB key</em>, you'll need:" +msgid "To set up two factor authentication with a <em>USB key</em>, you'll need:" msgstr "" -"Щоб налаштувати двофакторну автентифікацію за допомогою <em>USB-ключа</em>, " -"вам слід:" +"Щоб налаштувати двофакторну автентифікацію за допомогою " +"<em>USB-ключа</em>, вам слід:" #: warehouse/templates/pages/help.html:346 #, python-format msgid "" -"To use a <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">browser that supports <abbr title=\"web authentication" -"\">WebAuthn</abbr> and PublicKeyCredential</a>, as this is the standard " -"implemented by PyPI." +"To use a <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">browser that supports <abbr title=\"web " +"authentication\">WebAuthn</abbr> and PublicKeyCredential</a>, as this is " +"the standard implemented by PyPI." msgstr "" -"Використовувати <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">браузер, який підтримує <abbr title=\"веб автентифікація" -"\">WebAuthn</abbr> та PublicKeyCredential</a>, оскільки це стандарт, " -"впроваджений PyPI." +"Використовувати <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">браузер, який підтримує <abbr " +"title=\"веб автентифікація\">WebAuthn</abbr> та PublicKeyCredential</a>, " +"оскільки це стандарт, впроваджений PyPI." #: warehouse/templates/pages/help.html:347 msgid "To be running JavaScript on your browser" @@ -4359,26 +4375,28 @@ msgstr "Мати увімкнений JavaScript у своєму браузер #: warehouse/templates/pages/help.html:348 #, python-format msgid "" -"To use a USB key that adheres to the <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">FIDO U2F specification</a>:" +"To use a USB key that adheres to the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO U2F " +"specification</a>:" msgstr "" -"Використовувати USB-ключ, який відповідає <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">специфікації FIDO U2F</a>:" +"Використовувати USB-ключ, який відповідає <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">специфікації FIDO " +"U2F</a>:" #: warehouse/templates/pages/help.html:351 #, python-format msgid "" -"Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</a> and <a " -"href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Thetis</a>." +"Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> and <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." msgstr "" -"Поширені ключі включають <a href=\"%(yubikey_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</a> і <a " -"href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Thetis</a>." +"Поширені ключі включають <a href=\"%(yubikey_href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> і <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." #: warehouse/templates/pages/help.html:358 msgid "" @@ -4395,55 +4413,56 @@ msgstr "Виконайте ці кроки:" #: warehouse/templates/pages/help.html:365 msgid "" "\n" -" <li>Log in to your PyPI account, go to your account settings, and " -"choose \"Add <abbr title=\"two factor authentication\">2FA</abbr> with " -"security device (e.g. USB key)\"</li>\n" -" <li>Give your key a name. This is necessary because it's possible " -"to add more than one security device to your account.</li>\n" +" <li>Log in to your PyPI account, go to your account settings, " +"and choose \"Add <abbr title=\"two factor authentication\">2FA</abbr> " +"with security device (e.g. USB key)\"</li>\n" +" <li>Give your key a name. This is necessary because it's " +"possible to add more than one security device to your account.</li>\n" " <li>Click on the \"Set up security device\" button</li>\n" -" <li>Insert and touch your USB key, as instructed by your browser</" -"li>\n" +" <li>Insert and touch your USB key, as instructed by your " +"browser</li>\n" " " msgstr "" "\n" " <li>Увійдійть до свого облікового запису на PyPI, перейдіть до " -"налаштувань облікового запису та оберіть «Додати <abbr title=\"двофакторна " -"автентифікація\">2FA</abbr> із пристроєм безпеки (напр. USB-ключем)»</li>\n" +"налаштувань облікового запису та оберіть «Додати <abbr " +"title=\"двофакторна автентифікація\">2FA</abbr> із пристроєм безпеки " +"(напр. USB-ключем)»</li>\n" " <li>Назвіть свій ключ. Це необхідно, оскільки можна додавати " "більше одного пристрою безпеки до вашого облікового запису.</li>\n" " <li>Клікніть на кнопку «Налаштувати пристрій безпеки»</li>\n" -" <li>Вставте свій USB-ключ і торкніться його, слідуючи інструкціям " -"вашого браузера</li>\n" +" <li>Вставте свій USB-ключ і торкніться його, слідуючи " +"інструкціям вашого браузера</li>\n" " " #: warehouse/templates/pages/help.html:372 msgid "" -"Once complete, your USB key will be registered to your PyPI account and can " -"be used during the log in process." +"Once complete, your USB key will be registered to your PyPI account and " +"can be used during the log in process." msgstr "" -"Щойно завершено, ваш USB-ключ буде зареєстровано у вашому обліковому записі " -"на PyPI і зможе бути використаний у процесі входу." +"Щойно завершено, ваш USB-ключ буде зареєстровано у вашому обліковому " +"записі на PyPI і зможе бути використаний у процесі входу." #: warehouse/templates/pages/help.html:376 msgid "" "\n" " <li>Provide your username and password, as normal</li>\n" -" <li>Insert and touch your USB key to finish logging into PyPI</" -"li>\n" +" <li>Insert and touch your USB key to finish logging into " +"PyPI</li>\n" " " msgstr "" "\n" " <li>Надати своє ім'я користувача і пароль, як зазвичай</li>\n" -" <li>Вставте свій USB-ключ і торкніться його, аби завершити процес " -"входу до PyPI</li>\n" +" <li>Вставте свій USB-ключ і торкніться його, аби завершити " +"процес входу до PyPI</li>\n" " " #: warehouse/templates/pages/help.html:387 #, python-format msgid "" "There is a growing ecosystem of <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">devices that are FIDO compliant</a>, and " -"can therefore be used with PyPI." +"target=\"_blank\" rel=\"noopener\">devices that are FIDO compliant</a>, " +"and can therefore be used with PyPI." msgstr "" "Стрімко розвивається екосистема <a href=\"%(href)s\" title=\"%(title)s\" " "target=\"_blank\" rel=\"noopener\">пристроїв, які сумісні зі стандартом " @@ -4452,51 +4471,53 @@ msgstr "" #: warehouse/templates/pages/help.html:392 #, python-format msgid "" -"Emerging solutions include biometric (facial and fingerprint) scanners and " -"FIDO compatible credit cards. There is also growing support for <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">mobile " -"phones to act as security devices</a>." +"Emerging solutions include biometric (facial and fingerprint) scanners " +"and FIDO compatible credit cards. There is also growing support for <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">mobile phones to act as security devices</a>." msgstr "" -"Новітні розробки включають біометричні сканери (лиця та відбитків) та FIDO-" -"сумісні кредитні картки. Також, розвивається підтримка <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">використання " -"мобільних телефонів як пристроїв безпеки</a>." +"Новітні розробки включають біометричні сканери (лиця та відбитків) та " +"FIDO-сумісні кредитні картки. Також, розвивається підтримка <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">використання мобільних телефонів як пристроїв " +"безпеки</a>." #: warehouse/templates/pages/help.html:398 #, python-format msgid "" -"As PyPI's two factor implementation follows the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"web " -"authentication\">WebAuthn</abbr> standard</a>, PyPI users will be able to " -"take advantage of any future developments in this field." +"As PyPI's two factor implementation follows the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"web " +"authentication\">WebAuthn</abbr> standard</a>, PyPI users will be able to" +" take advantage of any future developments in this field." msgstr "" -"Оскільки реалізація другого фактору в PyPI відповідає <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">стандарту <abbr title=" -"\"web authentication\">WebAuthn</abbr></a>, користувачі PyPI зможуть " +"Оскільки реалізація другого фактору в PyPI відповідає <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">стандарту <abbr title=\"web " +"authentication\">WebAuthn</abbr></a>, користувачі PyPI зможуть " "скористатися будь-якими майбутніми розробками у цій області." #: warehouse/templates/pages/help.html:407 msgid "" -"If you lose access to your <a href=\"#totp\">authentication application</a> " -"or <a href=\"#utfkey\">security device</a>, you can use these codes to sign " -"into PyPI." +"If you lose access to your <a href=\"#totp\">authentication " +"application</a> or <a href=\"#utfkey\">security device</a>, you can use " +"these codes to sign into PyPI." msgstr "" "Якщо ви втратите доступ до вашого <a href=\"#totp\">застосунку " -"аутентифікації</a> або <a href=\"#utfkey\">пристрою безпеки</a>, ви можете " -"використати ці коди, щоб увійти до PyPI." +"аутентифікації</a> або <a href=\"#utfkey\">пристрою безпеки</a>, ви " +"можете використати ці коди, щоб увійти до PyPI." #: warehouse/templates/pages/help.html:410 msgid "" -"Recovery codes are <strong>one time use</strong>. They are not a substitute " -"for a <a href=\"#totp\">authentication application</a> or <a href=\"#utfkey" -"\">security device</a> and should only be used for recovery. After using a " -"recovery code to sign in, it becomes inactive." +"Recovery codes are <strong>one time use</strong>. They are not a " +"substitute for a <a href=\"#totp\">authentication application</a> or <a " +"href=\"#utfkey\">security device</a> and should only be used for " +"recovery. After using a recovery code to sign in, it becomes inactive." msgstr "" "Коди відновлення <strong>використовуються одноразово</strong>. Вони не " -"можуть бути заміною для <a href=\"#totp\">застосунку аутентифікації</a> або " -"<a href=\"#utfkey\">пристрою безпеки</a> і повинні використовуватись лише " -"для відновлення. Після входу за допомогою коду відновлення, він стає " -"неактивним." +"можуть бути заміною для <a href=\"#totp\">застосунку аутентифікації</a> " +"або <a href=\"#utfkey\">пристрою безпеки</a> і повинні використовуватись " +"лише для відновлення. Після входу за допомогою коду відновлення, він стає" +" неактивним." #: warehouse/templates/pages/help.html:416 msgid "To provision recovery codes:" @@ -4507,26 +4528,27 @@ msgid "" "Log in to your PyPI account, go to your account settings, and choose " "\"Generate recovery codes\"" msgstr "" -"Увійдіть до свого облікового запису на PyPI, перейдіть до налаштувань свого " -"облікового запису та оберіть \"Згенерувати коди відновлення\"" +"Увійдіть до свого облікового запису на PyPI, перейдіть до налаштувань " +"свого облікового запису та оберіть \"Згенерувати коди відновлення\"" #: warehouse/templates/pages/help.html:419 msgid "" -"Securely store the displayed recovery codes! Consider printing them out and " -"storing them in a safe location or saving them in a password manager." +"Securely store the displayed recovery codes! Consider printing them out " +"and storing them in a safe location or saving them in a password manager." msgstr "" "Надійно збережіть показані коди відновлення! Подумайте про те, щоб " -"надрукувати їх і зберегти в безпечному місці або додати в менеджер паролів." +"надрукувати їх і зберегти в безпечному місці або додати в менеджер " +"паролів." #: warehouse/templates/pages/help.html:422 msgid "" -"If you lose access to your stored recovery codes or use all of them, you can " -"get new ones by selecting \"Regenerate recovery codes\" in your account " -"settings." +"If you lose access to your stored recovery codes or use all of them, you " +"can get new ones by selecting \"Regenerate recovery codes\" in your " +"account settings." msgstr "" "Якщо ви втратите доступ до збережених кодів відновлення або використаєте " -"всі, ви можете отримати нові, обравши \"Перегенерувати коди відновлення\" в " -"налаштуваннях вашого облікового запису." +"всі, ви можете отримати нові, обравши \"Перегенерувати коди відновлення\"" +" в налаштуваннях вашого облікового запису." #: warehouse/templates/pages/help.html:424 msgid "To sign in with a recovery code:" @@ -4534,35 +4556,36 @@ msgstr "Увійти за допомогою коду відновлення:" #: warehouse/templates/pages/help.html:427 msgid "" -"When prompted for Two-Factor Authentication, select \"Login using a Recovery " -"Code\"" +"When prompted for Two-Factor Authentication, select \"Login using a " +"Recovery Code\"" msgstr "" "Коли буде запропоновано Двофакторну Аутентифікацію, оберіть \"Увійти за " "допомогою Коду Відновлення\"" #: warehouse/templates/pages/help.html:428 msgid "" -"As each code can be used only once, you might want to mark the code as used" +"As each code can be used only once, you might want to mark the code as " +"used" msgstr "" -"Оскільки кожен код може бути використаний лише один раз, ви можете позначити " -"код, як використаний" +"Оскільки кожен код може бути використаний лише один раз, ви можете " +"позначити код, як використаний" #: warehouse/templates/pages/help.html:429 msgid "" -"If you have few recovery codes remaining, you may also want to generate a " -"new set using the \"Regenerate recovery codes\" button in your account " +"If you have few recovery codes remaining, you may also want to generate a" +" new set using the \"Regenerate recovery codes\" button in your account " "settings." msgstr "" -"Якщо у вас залишилось мало кодів відновлення, ви можете згенерувати новий " -"набір кодів за допомогою кнопки \"Перегенерувати коди відновлення\" в " +"Якщо у вас залишилось мало кодів відновлення, ви можете згенерувати новий" +" набір кодів за допомогою кнопки \"Перегенерувати коди відновлення\" в " "налаштуваннях вашого облікового запису." #: warehouse/templates/pages/help.html:434 msgid "" "\n" -" <p>API tokens provide an alternative way (instead of username and " -"password) to authenticate when <strong>uploading packages</strong> to PyPI.</" -"p>\n" +" <p>API tokens provide an alternative way (instead of username " +"and password) to authenticate when <strong>uploading packages</strong> to" +" PyPI.</p>\n" " <p>You can create a token for an entire PyPI account, in which " "case, the token will work for all projects associated with that account. " "Alternatively, you can limit a token's scope to a specific project.</p>\n" @@ -4572,15 +4595,15 @@ msgid "" " " msgstr "" "\n" -" <p>API-токени забезпечують альтернативний спосіб (замість імені " -"користувача та пароля) автентифікації під час <strong>завантаження пакунків</" -"strong> до PyPI.</p>\n" -" <p>Ви можете створити токен для усього облікового запису на PyPI, " -"і у такому разі цей токен працюватиме для усіх проектів, пов'язаних і цим " -"обліковим записом. Як варіант, ви можете обмежити область дії токена до " -"певного проекта.</p>\n" -" <p><strong>Ми наполегливо радимо автентифікуватися за допомогою " -"API-токена за можливості.</strong></p>\n" +" <p>API-токени забезпечують альтернативний спосіб (замість імені" +" користувача та пароля) автентифікації під час <strong>завантаження " +"пакунків</strong> до PyPI.</p>\n" +" <p>Ви можете створити токен для усього облікового запису на " +"PyPI, і у такому разі цей токен працюватиме для усіх проектів, пов'язаних" +" і цим обліковим записом. Як варіант, ви можете обмежити область дії " +"токена до певного проекта.</p>\n" +" <p><strong>Ми наполегливо радимо автентифікуватися за допомогою" +" API-токена за можливості.</strong></p>\n" "\n" " " @@ -4595,8 +4618,7 @@ msgstr "Підтвердіть свою електронну адресу" #: warehouse/templates/pages/help.html:444 #, python-format msgid "(check your <a href=\"%(href)s\">account settings</a>)" -msgstr "" -"(перевірте <a href=\"%(href)s\">налаштування свого облікового запису</a>)" +msgstr "(перевірте <a href=\"%(href)s\">налаштування свого облікового запису</a>)" #: warehouse/templates/pages/help.html:445 #, python-format @@ -4604,8 +4626,8 @@ msgid "" "In your <a href=\"%(href)s\">account settings</a>, go to the API tokens " "section and select \"Add API token\"" msgstr "" -"У <a href=\"%(href)s\">налаштуваннях свого облікового запису</a>, перейдіть " -"до секції API-токени та оберіть «Додати API-токен»" +"У <a href=\"%(href)s\">налаштуваннях свого облікового запису</a>, " +"перейдіть до секції API-токени та оберіть «Додати API-токен»" #: warehouse/templates/pages/help.html:448 msgid "To use an API token:" @@ -4617,7 +4639,8 @@ msgstr "Встановіть своє ім'я користувача на <code> #: warehouse/templates/pages/help.html:452 msgid "" -"Set your password to the token value, including the <code>pypi-</code> prefix" +"Set your password to the token value, including the <code>pypi-</code> " +"prefix" msgstr "" "Використайте значення токена замість свого пароля, включно з префіксом " "<code>pypi-</code>" @@ -4625,25 +4648,28 @@ msgstr "" #: warehouse/templates/pages/help.html:456 #, python-format msgid "" -"Where you edit or add these values will depend on your individual use case. " -"For example, some users may need to edit <a href=\"%(pypirc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">their <code>.pypirc</code> " -"file</a>, while others may need to update their CI configuration file (e.g. " -"<a href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\"><code>.travis.yml</code> if you are using Travis</a>)." +"Where you edit or add these values will depend on your individual use " +"case. For example, some users may need to edit <a " +"href=\"%(pypirc_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">their <code>.pypirc</code> file</a>, while others may " +"need to update their CI configuration file (e.g. <a " +"href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>.travis.yml</code> if you are using Travis</a>)." msgstr "" -"Те, де ви редагуєте чи додаєте ці значення, залежатиме від вашої особистої " -"ситуації. Наприклад, деякі користувачі можуть мати необхідність редагувати " -"<a href=\"%(pypirc_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">свій файл <code>.pypirc</code></a>, а от інші потребуватимуть " -"оновити файли налаштувань своїх CI (напр. <a href=\"%(travis_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><code>.travis.yml</code>, " -"якщо ви користуєтесь Travis</a>)." +"Те, де ви редагуєте чи додаєте ці значення, залежатиме від вашої " +"особистої ситуації. Наприклад, деякі користувачі можуть мати необхідність" +" редагувати <a href=\"%(pypirc_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">свій файл <code>.pypirc</code></a>, а " +"от інші потребуватимуть оновити файли налаштувань своїх CI (напр. <a " +"href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>.travis.yml</code>, якщо ви користуєтесь " +"Travis</a>)." #: warehouse/templates/pages/help.html:460 msgid "" -"Advanced users may wish to inspect their token by decoding it with base64, " -"and checking the output against the unique identifier displayed on PyPI." +"Advanced users may wish to inspect their token by decoding it with " +"base64, and checking the output against the unique identifier displayed " +"on PyPI." msgstr "" "Просунуті користувачі можуть зажадати перевірити свій токен, декодувавши " "його за допомогою base64, і перевіривши що вивід містить унікальний " @@ -4660,124 +4686,130 @@ msgstr "Перегляньте API-довідник." #: warehouse/templates/pages/help.html:471 #, python-format msgid "" -"If you need to run your own mirror of PyPI, the <a href=\"%(href)s" -"\">bandersnatch project</a> is the recommended solution. Note that the " -"storage requirements for a PyPI mirror would exceed 1 terabyte—and growing!" +"If you need to run your own mirror of PyPI, the <a " +"href=\"%(href)s\">bandersnatch project</a> is the recommended solution. " +"Note that the storage requirements for a PyPI mirror would exceed 1 " +"terabyte—and growing!" msgstr "" -"Якщо вам необхідно підтримувати власне дзеркало PyPI, ми радимо скористатися " -"<a href=\"%(href)s\">проектом bandersnatch</a>. Зверніть увагу, що вимоги до " -"сховища для дзеркала PyPI перевищують 1 терабайт — і більше!" +"Якщо вам необхідно підтримувати власне дзеркало PyPI, ми радимо " +"скористатися <a href=\"%(href)s\">проектом bandersnatch</a>. Зверніть " +"увагу, що вимоги до сховища для дзеркала PyPI перевищують 1 терабайт — і " +"більше!" #: warehouse/templates/pages/help.html:474 #, python-format msgid "" -"PyPI itself does not offer a way to get notified when a project uploads new " -"releases. However, there are several third-party services that offer " +"PyPI itself does not offer a way to get notified when a project uploads " +"new releases. However, there are several third-party services that offer " "comprehensive monitoring and notifications for project releases and " -"vulnerabilities listed as <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">GitHub apps</a>." +"vulnerabilities listed as <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">GitHub apps</a>." msgstr "" -"Сам PyPI не пропонує способів отримувати сповіщення коли проект завантажує " -"нові випуски. Однак, є сторонні служби, які пропонують всеосяжний моніторинг " -"та сповіщення про публікації проектів та переліки вразливостей у вигляді <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">GitHub-застосунків</a>." +"Сам PyPI не пропонує способів отримувати сповіщення коли проект " +"завантажує нові випуски. Однак, є сторонні служби, які пропонують " +"всеосяжний моніторинг та сповіщення про публікації проектів та переліки " +"вразливостей у вигляді <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">GitHub-застосунків</a>." #: warehouse/templates/pages/help.html:477 #, python-format msgid "" -"You can <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">analyze PyPI download usage statistics via our public dataset " -"on Google BigQuery</a>." +"You can <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">analyze PyPI download usage statistics via our public " +"dataset on Google BigQuery</a>." msgstr "" -"Ви можете <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">аналізувати статистику використання завантажень з PyPI за " -"допомогою нашого публічного набору даних на Google BigQuery</a>." +"Ви можете <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">аналізувати статистику використання завантажень з PyPI " +"за допомогою нашого публічного набору даних на Google BigQuery</a>." #: warehouse/templates/pages/help.html:479 #, python-format msgid "" -"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.io provides statistics for PyPI projects</a> (<a href=" -"\"%(libs_io_example_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">example</a>, <a href=\"%(libs_io_api_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">API</a>) including GitHub stars and " -"forks, dependency tracking (<a href=\"%(in_progress_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">in progress</a>), and <a " -"href=\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">other relevant factors</a>." -msgstr "" -"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.io надає статистику проектів на PyPI</a> (<a href=" -"\"%(libs_io_example_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">example</a>, <a href=\"%(libs_io_api_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">API</a>) включно із зірочками та " -"форками на GitHub, відстежуванням залежностей (<a href=\"%(in_progress_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">в процесі " -"розробки</a>) та <a href=\"%(other_factors_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">інші доречні фактори</a>." +"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io provides statistics for PyPI projects</a> " +"(<a href=\"%(libs_io_example_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">example</a>, <a " +"href=\"%(libs_io_api_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">API</a>) including GitHub stars and forks, dependency " +"tracking (<a href=\"%(in_progress_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">in progress</a>), and <a " +"href=\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">other relevant factors</a>." +msgstr "" +"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io надає статистику проектів на PyPI</a> (<a " +"href=\"%(libs_io_example_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">example</a>, <a href=\"%(libs_io_api_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">API</a>) включно " +"із зірочками та форками на GitHub, відстежуванням залежностей (<a " +"href=\"%(in_progress_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">в процесі розробки</a>) та <a " +"href=\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">інші доречні фактори</a>." #: warehouse/templates/pages/help.html:488 #, python-format msgid "" -"For recent statistics on uptime and performance, see <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status page</a>." +"For recent statistics on uptime and performance, see <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status " +"page</a>." msgstr "" -"Щоб дізнатися найновішу статистику щодо тривалості роботи й продуктивності, " -"дивіться <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">нашу сторінку статусу</a>." +"Щоб дізнатися найновішу статистику щодо тривалості роботи й " +"продуктивності, дивіться <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">нашу сторінку статусу</a>." #: warehouse/templates/pages/help.html:495 #, python-format msgid "" -"PyPI does not support publishing private packages. If you need to publish " -"your private package to a package index, the recommended solution is to run " -"your own deployment of the <a href=\"%(href)s\">devpi project</a>." +"PyPI does not support publishing private packages. If you need to publish" +" your private package to a package index, the recommended solution is to " +"run your own deployment of the <a href=\"%(href)s\">devpi project</a>." msgstr "" -"PyPI не публікує приватних пакунків. Якщо вам необхідно публікувати приватні " -"пакунки до індексу пакунків, ми радимо вам розгорнути <a href=\"%(href)s" -"\">проект devpi</a> власноруч." +"PyPI не публікує приватних пакунків. Якщо вам необхідно публікувати " +"приватні пакунки до індексу пакунків, ми радимо вам розгорнути <a " +"href=\"%(href)s\">проект devpi</a> власноруч." #: warehouse/templates/pages/help.html:498 msgid "" "Your publishing tool may return an error that your new project can't be " -"created with your desired name, despite no evidence of a project or release " -"of the same name on PyPI. Currently, there are three primary reasons this " -"may occur:" +"created with your desired name, despite no evidence of a project or " +"release of the same name on PyPI. Currently, there are three primary " +"reasons this may occur:" msgstr "" -"Ваш інструмент публікації може повернути помилку про те, що ваш новий проект " -"не може бути створений із бажаною назвою, незважаючи на відсутність доказів " -"про те, що проект або випуск із такою назвою є на PyPI. Нині є три основні " -"причини її виникнення:" +"Ваш інструмент публікації може повернути помилку про те, що ваш новий " +"проект не може бути створений із бажаною назвою, незважаючи на " +"відсутність доказів про те, що проект або випуск із такою назвою є на " +"PyPI. Нині є три основні причини її виникнення:" #: warehouse/templates/pages/help.html:500 #, python-format msgid "" -"The project name conflicts with a <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Standard Library</a> module from " -"any major version from 2.5 to present." +"The project name conflicts with a <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Standard " +"Library</a> module from any major version from 2.5 to present." msgstr "" -"Назва проекту конфліктує з модулем зі <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">стандартної бібліотеки Python</a> із " -"будь-якої основної версії починаючи з 2.5 донині." +"Назва проекту конфліктує з модулем зі <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">стандартної " +"бібліотеки Python</a> із будь-якої основної версії починаючи з 2.5 " +"донині." #: warehouse/templates/pages/help.html:501 #, python-format msgid "" -"The project name has been explicitly prohibited by the PyPI administrators. " -"For example, <code>%(incorrect_code)s</code> is a common typo for <code>" -"%(correct_code)s</code>, and should not surprise the user with a malicious " -"package." +"The project name has been explicitly prohibited by the PyPI " +"administrators. For example, <code>%(incorrect_code)s</code> is a common " +"typo for <code>%(correct_code)s</code>, and should not surprise the user " +"with a malicious package." msgstr "" -"Ця назва проекту явно заборонена адміністраторами PyPI. Наприклад, <code>" -"%(incorrect_code)s</code> — поширена помилка написання <code>" -"%(correct_code)s</code>, і не має несподівано для користувачів містити " -"зловмисний пакунок." +"Ця назва проекту явно заборонена адміністраторами PyPI. Наприклад, " +"<code>%(incorrect_code)s</code> — поширена помилка написання " +"<code>%(correct_code)s</code>, і не має несподівано для користувачів " +"містити зловмисний пакунок." #: warehouse/templates/pages/help.html:502 msgid "" -"The project name has been registered by another user, but no releases have " -"been created." +"The project name has been registered by another user, but no releases " +"have been created." msgstr "" "Проект із такою назвою було зареєстровано іншим користувачем, але він не " "створив жодних випусків." @@ -4785,14 +4817,14 @@ msgstr "" #: warehouse/templates/pages/help.html:506 #, python-format msgid "" -"Follow the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">\"How to request a name transfer\"</a> section of <abbr title=" -"\"Python enhancement proposal\">PEP</abbr> 541." +"Follow the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">\"How to request a name transfer\"</a> section of <abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 541." msgstr "" -"Слідуйте інструкціям секції <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">«Як попросити перенесення імені» (\"How to " -"request a name transfer\")</a> <abbr title=\"Пропозиція покращення Python " -"(Python enhancement proposal)\">PEP</abbr> 541." +"Слідуйте інструкціям секції <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">«Як попросити перенесення імені» " +"(\"How to request a name transfer\")</a> <abbr title=\"Пропозиція " +"покращення Python (Python enhancement proposal)\">PEP</abbr> 541." #: warehouse/templates/pages/help.html:511 msgid "Owner:" @@ -4800,82 +4832,86 @@ msgstr "Власник:" #: warehouse/templates/pages/help.html:514 msgid "" -"Only the current owners of a project have the ability to add new owners or " -"maintainers. If you need to request ownership, you should contact the " -"current owner(s) of the project directly. Many project owners provide their " -"contact details in the 'Author' field of the 'Meta' details on the project " -"page." +"Only the current owners of a project have the ability to add new owners " +"or maintainers. If you need to request ownership, you should contact the " +"current owner(s) of the project directly. Many project owners provide " +"their contact details in the 'Author' field of the 'Meta' details on the " +"project page." msgstr "" "Лише нинішні власники проекту здатні додавати нових власників або " "доглядачів. Якщо вам необхідно попросити право власності, вам слід " -"зв'язатися з поточним(-и) власником(-ами) проекту напряму. Багато власників " -"проектів надають свою контактну інформацію у полі «Автор» деталей «Мета» на " -"сторінці проекту." +"зв'язатися з поточним(-и) власником(-ами) проекту напряму. Багато " +"власників проектів надають свою контактну інформацію у полі «Автор» " +"деталей «Мета» на сторінці проекту." #: warehouse/templates/pages/help.html:515 #, python-format -msgid "" -"If the owner is unresponsive, see <a href=\"%(href)s\">%(anchor_text)s</a>" +msgid "If the owner is unresponsive, see <a href=\"%(href)s\">%(anchor_text)s</a>" msgstr "" -"Якщо автор не відповідає, дивіться <a href=\"%(href)s\">%(anchor_text)s</a>" +"Якщо автор не відповідає, дивіться <a " +"href=\"%(href)s\">%(anchor_text)s</a>" #: warehouse/templates/pages/help.html:518 #, python-format msgid "" -"By default, an upload's description will render with <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">reStructuredText</a>. " -"If the description is in an alternate format like Markdown, a package may " -"set the <code>long_description_content_type</code> in <code>setup.py</code> " -"to the alternate format." +"By default, an upload's description will render with <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">reStructuredText</a>. If the description is in an " +"alternate format like Markdown, a package may set the " +"<code>long_description_content_type</code> in <code>setup.py</code> to " +"the alternate format." msgstr "" -"Типово, опис завантаження буде відображено за допомогою <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">reStructuredText</a>. " -"Якщо опис у альтернативному форматі, на кшталт Markdown, пакунок може " -"встановити <code>long_description_content_type</code> в <code>setup.py</" -"code>, щоб змінити формат." +"Типово, опис завантаження буде відображено за допомогою <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">reStructuredText</a>. Якщо опис у альтернативному " +"форматі, на кшталт Markdown, пакунок може встановити " +"<code>long_description_content_type</code> в <code>setup.py</code>, щоб " +"змінити формат." #: warehouse/templates/pages/help.html:519 #, python-format msgid "" -"Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging User Guide</a> for details on the available " -"formats." +"Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a> for details on the " +"available formats." msgstr "" -"Зверніться до <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">користувацького керівництва з пакування Python</a>, щоб " +"Зверніться до <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">користувацького керівництва з пакування Python</a>, щоб " "дізнатися більше про доступні формати." #: warehouse/templates/pages/help.html:520 #, python-format msgid "" "PyPI will reject uploads if the description fails to render. To check a " -"description locally for validity, you may use <a href=\"%(href)s" -"\">readme_renderer</a>, which is the same description renderer used by PyPI." +"description locally for validity, you may use <a " +"href=\"%(href)s\">readme_renderer</a>, which is the same description " +"renderer used by PyPI." msgstr "" -"PyPI відхилить завантаження пакунків, якщо їх опис не вдасться відобразити. " -"Щоб перевірити чи опис дійсний локально, ви можете скористатися <a href=" -"\"%(href)s\">readme_renderer</a>, який є тим самим відображувачем опису який " -"використовується у PyPI." +"PyPI відхилить завантаження пакунків, якщо їх опис не вдасться " +"відобразити. Щоб перевірити чи опис дійсний локально, ви можете " +"скористатися <a href=\"%(href)s\">readme_renderer</a>, який є тим самим " +"відображувачем опису який використовується у PyPI." #: warehouse/templates/pages/help.html:524 #, python-format msgid "" -"If you can't upload your project's release to PyPI because you're hitting " -"the upload file size limit, we can sometimes increase your limit. Make sure " -"you've uploaded at least one release for the project that's <em>under</em> " -"the limit (a <a href=\"%(dev_release_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">developmental release version number</a> is " -"fine). Then, <a href=\"%(file_issue_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">file an issue</a> and tell us:</p>" +"If you can't upload your project's release to PyPI because you're hitting" +" the upload file size limit, we can sometimes increase your limit. Make " +"sure you've uploaded at least one release for the project that's " +"<em>under</em> the limit (a <a href=\"%(dev_release_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">developmental " +"release version number</a> is fine). Then, <a " +"href=\"%(file_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">file an issue</a> and tell us:</p>" msgstr "" -"Якщо вам не вдається завантажити випуск свого проекту до PyPI через те, що " -"ви досягаєте обмеження розміру завантажуваних файлів, іноді ми можемо " +"Якщо вам не вдається завантажити випуск свого проекту до PyPI через те, " +"що ви досягаєте обмеження розміру завантажуваних файлів, іноді ми можемо " "збільшити ваш ліміт. Переконайтеся, що ви завантажили хоча б один випуск " -"проекту, <em>меншого</em> розміру за цей ліміт (<a href=" -"\"%(dev_release_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">розробницька версія випуску</a> підходить). Тоді, <a href=" -"\"%(file_issue_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">створіть іш'ю</a> і повідомте нас:</p>" +"проекту, <em>меншого</em> розміру за цей ліміт (<a " +"href=\"%(dev_release_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">розробницька версія випуску</a> підходить). Тоді, <a " +"href=\"%(file_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">створіть іш'ю</a> і повідомте нас:</p>" #: warehouse/templates/pages/help.html:532 msgid "A link to your project on PyPI (or Test PyPI)" @@ -4886,25 +4922,24 @@ msgid "The size of your release, in megabytes" msgstr "Розвір вашої публікації, у мегабайтах" #: warehouse/templates/pages/help.html:534 -msgid "" -"Which index/indexes you need the increase for (PyPI, Test PyPI, or both)" +msgid "Which index/indexes you need the increase for (PyPI, Test PyPI, or both)" msgstr "На яких випусках вам треба збільшення (PyPI, Test PyPI чи обидва)" #: warehouse/templates/pages/help.html:535 msgid "" -"A brief description of your project, including the reason for the additional " -"size." +"A brief description of your project, including the reason for the " +"additional size." msgstr "" -"Короткий опис вашого проекту, включно із причиною необхідності додаткового " -"обсягу." +"Короткий опис вашого проекту, включно із причиною необхідності " +"додаткового обсягу." #: warehouse/templates/pages/help.html:544 msgid "" -"If you've forgotten your PyPI password but you remember your email address " -"or username, follow these steps to reset your password:" +"If you've forgotten your PyPI password but you remember your email " +"address or username, follow these steps to reset your password:" msgstr "" -"Якщо ви забули свій пароль від PyPI але пам'ятаєте свою електронну адресу " -"або ім'я користувача, слідуйте цим крокам, аби скинути свій пароль:" +"Якщо ви забули свій пароль від PyPI але пам'ятаєте свою електронну адресу" +" або ім'я користувача, слідуйте цим крокам, аби скинути свій пароль:" #: warehouse/templates/pages/help.html:546 #, python-format @@ -4912,11 +4947,10 @@ msgid "Go to <a href=\"%(href)s\">reset your password</a>." msgstr "Перейдіть до <a href=\"%(href)s\">скидання свого пароля</a>." #: warehouse/templates/pages/help.html:547 -msgid "" -"Enter the email address or username you used for PyPI and submit the form." +msgid "Enter the email address or username you used for PyPI and submit the form." msgstr "" -"Введіть електронну адресу або ім'я користувача, які ви використовували для " -"PyPI і відправте форму." +"Введіть електронну адресу або ім'я користувача, які ви використовували " +"для PyPI і відправте форму." #: warehouse/templates/pages/help.html:548 msgid "You'll receive an email with a password reset link." @@ -4929,27 +4963,29 @@ msgstr "Якщо ви втратили доступ до облікового з #: warehouse/templates/pages/help.html:555 msgid "Lost access to the email address associated with your account" msgstr "" -"Втрачений доступ до електронних адресів, пов'язаних з вашим обліковим записом" +"Втрачений доступ до електронних адресів, пов'язаних з вашим обліковим " +"записом" #: warehouse/templates/pages/help.html:556 msgid "" -"Lost two factor authentication <a href=\"#totp\">application</a>, <a href=" -"\"#utfkey\">device</a>, and <a href=\"#recoverycodes\">recovery codes</a>" +"Lost two factor authentication <a href=\"#totp\">application</a>, <a " +"href=\"#utfkey\">device</a>, and <a href=\"#recoverycodes\">recovery " +"codes</a>" msgstr "" -"Втрачено <a href=\"#totp\">застосунок</a> двофакторної аутентифікації, <a " -"href=\"#utfkey\">пристрій</a> та <a href=\"#recoverycodes\">коди " +"Втрачено <a href=\"#totp\">застосунок</a> двофакторної аутентифікації, <a" +" href=\"#utfkey\">пристрій</a> та <a href=\"#recoverycodes\">коди " "відновлення</a>" #: warehouse/templates/pages/help.html:559 #, python-format msgid "" -"You can proceed to, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">file an issue on our tracker</a> to request assistance " -"with account recovery." +"You can proceed to, <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">file an issue on our tracker</a> to " +"request assistance with account recovery." msgstr "" -"Ви можете перейти до, <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">створіть іш'ю на нашому трекері</a>, щоб " -"запросити допомогу з відновленням облікового запису." +"Ви можете перейти до, <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">створіть іш'ю на нашому трекері</a>, " +"щоб запросити допомогу з відновленням облікового запису." #: warehouse/templates/pages/help.html:566 msgid "If you are using a username and password for uploads:" @@ -4970,7 +5006,8 @@ msgstr "" #: warehouse/templates/pages/help.html:571 msgid "If you are using an <a href=\"#apitoken\">API Token</a> for uploads:" msgstr "" -"Якщо ви використовуєте <a href=\"#apitoken\">API-токен</a> для завантажень:" +"Якщо ви використовуєте <a href=\"#apitoken\">API-токен</a> для " +"завантажень:" #: warehouse/templates/pages/help.html:573 msgid "Ensure that your API Token is valid and has not been revoked." @@ -4978,154 +5015,159 @@ msgstr "Переконайтеся, що ваш API-токен дійсний і #: warehouse/templates/pages/help.html:574 msgid "" -"Ensure that your API Token is <a href=\"#apitoken\">properly formatted</a> " -"and does not contain any trailing characters such as newlines." +"Ensure that your API Token is <a href=\"#apitoken\">properly " +"formatted</a> and does not contain any trailing characters such as " +"newlines." msgstr "" -"Переконайтеся, що ваш API-токен у <a href=\"#apitoken\">коректному форматі</" -"a> та не містить зайвих символів, таких як перенесення рядка." +"Переконайтеся, що ваш API-токен у <a href=\"#apitoken\">коректному " +"форматі</a> та не містить зайвих символів, таких як перенесення рядка." #: warehouse/templates/pages/help.html:579 #, python-format msgid "" -"Transport Layer Security, or TLS, is part of how we make sure connections " -"between your computer and PyPI are private and secure. It's a cryptographic " -"protocol that's had several versions over time. PyPI <a href=" -"\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">turned off support for TLS versions 1.0 and 1.1</a> in April " -"2018. <a href=\"%(reason_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Learn why on the PSF blog</a>." +"Transport Layer Security, or TLS, is part of how we make sure connections" +" between your computer and PyPI are private and secure. It's a " +"cryptographic protocol that's had several versions over time. PyPI <a " +"href=\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">turned off support for TLS versions 1.0 and 1.1</a> in " +"April 2018. <a href=\"%(reason_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Learn why on the PSF blog</a>." msgstr "" -"Захист на транспортному рівні, або TLS, — це частина того як ми забезпечуємо " -"те, що з'єднання між вашим комп'ютером та PyPI приватні і надійні. Це " -"криптографічний протокол, який протягом часу мав кілька версій. PyPI <a href=" -"\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">вимкнув підтримку версій TLS 1.0 і 1.1</a> у квітні 2018. <a " -"href=\"%(reason_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Дізнайтеся про це у блозі PSF</a>." +"Захист на транспортному рівні, або TLS, — це частина того як ми " +"забезпечуємо те, що з'єднання між вашим комп'ютером та PyPI приватні і " +"надійні. Це криптографічний протокол, який протягом часу мав кілька " +"версій. PyPI <a href=\"%(announcement_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">вимкнув підтримку версій TLS 1.0 і " +"1.1</a> у квітні 2018. <a href=\"%(reason_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Дізнайтеся про це у блозі PSF</a>." #: warehouse/templates/pages/help.html:586 #, python-format msgid "" -"If you are having trouble with <code>%(command)s</code> and get a <code>No " -"matching distribution found</code> or <code>Could not fetch URL</code> " -"error, try adding <code>-v</code> to the command to get more information:" +"If you are having trouble with <code>%(command)s</code> and get a " +"<code>No matching distribution found</code> or <code>Could not fetch " +"URL</code> error, try adding <code>-v</code> to the command to get more " +"information:" msgstr "" "Якщо у вас є проблеми з <code>%(command)s</code> і ви отримуєте помилку " -"<code>No matching distribution found</code> або <code>Could not fetch URL</" -"code>, спробуйте додати <code>-v</code> до команди, щоб отримати більше " -"інформації:" +"<code>No matching distribution found</code> або <code>Could not fetch " +"URL</code>, спробуйте додати <code>-v</code> до команди, щоб отримати " +"більше інформації:" #: warehouse/templates/pages/help.html:588 msgid "" "If you see an error like <code>There was a problem confirming the ssl " "certificate</code> or <code>tlsv1 alert protocol version</code> or " -"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, you need to be connecting to PyPI " -"with a newer TLS support library." +"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, you need to be connecting to " +"PyPI with a newer TLS support library." msgstr "" -"Якщо ви бачите помилку на кшталт <code>>There was a problem confirming the " -"ssl certificate</code> чи <code>tlsv1 alert protocol version</code>, або " -"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, то вам слід під'єднуватися до " -"PyPI за допомогою бібліотеки з підтримкою новішого TLS." +"Якщо ви бачите помилку на кшталт <code>>There was a problem confirming " +"the ssl certificate</code> чи <code>tlsv1 alert protocol version</code>, " +"або <code>TLSV1_ALERT_PROTOCOL_VERSION</code>, то вам слід під'єднуватися" +" до PyPI за допомогою бібліотеки з підтримкою новішого TLS." #: warehouse/templates/pages/help.html:589 msgid "" "The specific steps you need to take will depend on your operating system " -"version, where your installation of Python originated (python.org, your OS " -"vendor, or an intermediate distributor), and the installed versions of " -"Python, <code>setuptools</code>, and <code>pip</code>." +"version, where your installation of Python originated (python.org, your " +"OS vendor, or an intermediate distributor), and the installed versions of" +" Python, <code>setuptools</code>, and <code>pip</code>." msgstr "" -"Певні кроки, які вам слід здійснити, залежать від версії вашої операційної " -"системи, походження вашого дистрибутиву Python (python.org, ваш постачальник " -"OS або проміжний дистриб'ютор) та встановлених версій Python, " -"<code>setuptools</code> та <code>pip</code>." +"Певні кроки, які вам слід здійснити, залежать від версії вашої " +"операційної системи, походження вашого дистрибутиву Python (python.org, " +"ваш постачальник OS або проміжний дистриб'ютор) та встановлених версій " +"Python, <code>setuptools</code> та <code>pip</code>." #: warehouse/templates/pages/help.html:591 #, python-format msgid "" -"For help, go to <a href=\"%(irc_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">the <code>#pypa</code> IRC channel on Freenode</a>, file " -"an issue at <a href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">pypa/packaging-problems/issues</a>, or <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">post to the python-help mailing list</a>, including your OS and " -"installation details and the output of <code>%(command)s</code>." -msgstr "" -"Щоб отримати допомого, перейдіть до <a href=\"%(irc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">IRC-каналу <code>#pypa</" -"code> на Freenode</a>, заведіть іш'ю на <a href=\"%(issue_tracker_href)s\" " +"For help, go to <a href=\"%(irc_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">the <code>#pypa</code> IRC channel on " +"Freenode</a>, file an issue at <a href=\"%(issue_tracker_href)s\" " "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">pypa/packaging-" -"problems/issues</a> або <a href=\"%(mailing_list_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">напишіть до списку розсилки python-" -"help</a>, включивши інформацію про свою ОС, деталі інсталяції та консольний " -"вивід команди <code>%(command)s</code>." +"problems/issues</a>, or <a href=\"%(mailing_list_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">post to the " +"python-help mailing list</a>, including your OS and installation details " +"and the output of <code>%(command)s</code>." +msgstr "" +"Щоб отримати допомого, перейдіть до <a href=\"%(irc_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">IRC-каналу " +"<code>#pypa</code> на Freenode</a>, заведіть іш'ю на <a " +"href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">pypa/packaging-problems/issues</a> або <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">напишіть до списку розсилки python-help</a>, включивши " +"інформацію про свою ОС, деталі інсталяції та консольний вивід команди " +"<code>%(command)s</code>." #: warehouse/templates/pages/help.html:602 #, python-format msgid "" -"We take <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">accessibility</a> very seriously and want to make the website " -"easy to use for everyone." +"We take <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">accessibility</a> very seriously and want to make the " +"website easy to use for everyone." msgstr "" -"Ми ставимося до <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">доступності</a> дуже серйозно та жадаємо зробити " -"користування цим веб-сайтом простим для кожного." +"Ми ставимося до <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">доступності</a> дуже серйозно та " +"жадаємо зробити користування цим веб-сайтом простим для кожного." #: warehouse/templates/pages/help.html:607 #, python-format msgid "" -"If you are experiencing an accessibility problem, <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">report it to us on GitHub</" -"a>, so we can try to fix the problem, for you and others." +"If you are experiencing an accessibility problem, <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">report it to us on" +" GitHub</a>, so we can try to fix the problem, for you and others." msgstr "" -"Якщо у вас виникла проблема з доступністю, <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">повідомте нам про неї на " -"GitHub</a>, щоб ми змогли спробувати її вирішити для вас та інших." +"Якщо у вас виникла проблема з доступністю, <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">повідомте нам про " +"неї на GitHub</a>, щоб ми змогли спробувати її вирішити для вас та інших." #: warehouse/templates/pages/help.html:615 #, python-format msgid "" "In a previous version of PyPI, it used to be possible for maintainers to " -"upload releases to PyPI using a form in the web browser. This feature was " -"deprecated with the new version of PyPI – we instead recommend that you <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">use " -"twine to upload your project to PyPI</a>." +"upload releases to PyPI using a form in the web browser. This feature was" +" deprecated with the new version of PyPI – we instead recommend that you " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">use twine to upload your project to PyPI</a>." msgstr "" -"У попередній версії PyPI доглядачі могли завантажувати випуски до PyPI через " -"форму у веб-браузері. Ця можливість застаріла у новій версії PyPI — " -"натомість ми радимо вам <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">користуватися twine для завантаження свого " -"проекту на PyPI</a>." +"У попередній версії PyPI доглядачі могли завантажувати випуски до PyPI " +"через форму у веб-браузері. Ця можливість застаріла у новій версії PyPI —" +" натомість ми радимо вам <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">користуватися twine для завантаження " +"свого проекту на PyPI</a>." #: warehouse/templates/pages/help.html:624 msgid "" -"Spammers return to PyPI with some regularity hoping to place their Search " -"Engine Optimized phishing, scam, and click-farming content on the site. " +"Spammers return to PyPI with some regularity hoping to place their Search" +" Engine Optimized phishing, scam, and click-farming content on the site. " "Since PyPI allows for indexing of the Long Description and other data " "related to projects and has a generally solid search reputation, it is a " "prime target." msgstr "" -"Спамери повертаються до PyPI із завидною частотою, сподіваючись розмістити " -"свій фішинг, що оптимізований для пошукових рушіїв, скам і клік-фармінговий " -"вміст на сайті. Оскільки PyPI дозволяє індексацію довгого опису та інших " -"даних, пов'язаних із проектами, та має в цілому міцну пошукову репутацію, " -"він є важливою ціллю." +"Спамери повертаються до PyPI із завидною частотою, сподіваючись " +"розмістити свій фішинг, що оптимізований для пошукових рушіїв, скам і " +"клік-фармінговий вміст на сайті. Оскільки PyPI дозволяє індексацію " +"довгого опису та інших даних, пов'язаних із проектами, та має в цілому " +"міцну пошукову репутацію, він є важливою ціллю." #: warehouse/templates/pages/help.html:626 #, python-format msgid "" "When the PyPI administrators are overwhelmed by spam <strong>or</strong> " -"determine that there is some other threat to PyPI, new user registration and/" -"or new project registration may be disabled. Check <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status page</a> " -"for more details, as we'll likely have updated it with reasoning for the " -"intervention." -msgstr "" -"Коли адміністратори PyPI переповнені спамом <strong>або</strong> з'ясовують " -"що існує якась інша загроза для PyPI, реєстрацію нових користувачів і/або " -"нових проектів може бути вимкнуто. Перевіряйте <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">нашу сторінку статусу</a>, " -"щоб дізнатися більше, оскільки ми швидше за все публікуватимемо там " -"оновлення щодо причин втручання." +"determine that there is some other threat to PyPI, new user registration " +"and/or new project registration may be disabled. Check <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">our status page</a> for more details, as we'll likely " +"have updated it with reasoning for the intervention." +msgstr "" +"Коли адміністратори PyPI переповнені спамом <strong>або</strong> " +"з'ясовують що існує якась інша загроза для PyPI, реєстрацію нових " +"користувачів і/або нових проектів може бути вимкнуто. Перевіряйте <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">нашу сторінку статусу</a>, щоб дізнатися більше, " +"оскільки ми швидше за все публікуватимемо там оновлення щодо причин " +"втручання." #: warehouse/templates/pages/help.html:635 msgid "PyPI will return these errors for one of these reasons:" @@ -5148,60 +5190,64 @@ msgid "" "PyPI does not allow for a filename to be reused, even once a project has " "been deleted and recreated." msgstr "" -"PyPI не дозволяє використовувати назву файла повторно, навіть якщо проект " -"було видалено і перестворено." +"PyPI не дозволяє використовувати назву файла повторно, навіть якщо проект" +" було видалено і перестворено." #: warehouse/templates/pages/help.html:643 #, python-format msgid "" -"To avoid this situation, <a href=\"%(test_pypi_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">use Test PyPI to perform and check your " -"upload first</a>, before uploading to <a href=\"%(pypi_href)s\">pypi.org</a>." +"To avoid this situation, <a href=\"%(test_pypi_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">use Test PyPI to " +"perform and check your upload first</a>, before uploading to <a " +"href=\"%(pypi_href)s\">pypi.org</a>." msgstr "" -"Щоб уникнути цієї ситуації, <a href=\"%(test_pypi_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">використовуйте Test PyPI, щоб спершу " -"виконати і перевірати своє завантаження</a>, перед тим як завантажувати його " -"на <a href=\"%(pypi_href)s\">pypi.org</a>." +"Щоб уникнути цієї ситуації, <a href=\"%(test_pypi_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">використовуйте " +"Test PyPI, щоб спершу виконати і перевірати своє завантаження</a>, перед " +"тим як завантажувати його на <a href=\"%(pypi_href)s\">pypi.org</a>." +# | msgid "" +# | "If you would like to request a new trove classifier file a bug on our <a +# " +# | "href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" +# | "\">issue tracker</a>. Include the name of the requested classifier and a +# | "brief justification of why it is important." #: warehouse/templates/pages/help.html:650 #, fuzzy, python-format -#| msgid "" -#| "If you would like to request a new trove classifier file a bug on our <a " -#| "href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -#| "\">issue tracker</a>. Include the name of the requested classifier and a " -#| "brief justification of why it is important." -msgid "" -"If you would like to request a new trove classifier file a pull request on " -"the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><code>pypa/trove-classifiers</code> project</a>. Be sure to include a " -"brief justification of why it is important." -msgstr "" -"Якщо ви бажаєте попросити новий trove-класифікатор, заведіть баг на нашому " -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">іш'ю-трекері</a>. Включіть назву trove-класифікатора та коротке пояснення " -"того, чому це важливо." +msgid "" +"If you would like to request a new trove classifier file a pull request " +"on the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>pypa/trove-classifiers</code> project</a>. Be sure" +" to include a brief justification of why it is important." +msgstr "" +"Якщо ви бажаєте попросити новий trove-класифікатор, заведіть баг на " +"нашому <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">іш'ю-трекері</a>. Включіть назву trove-класифікатора та " +"коротке пояснення того, чому це важливо." #: warehouse/templates/pages/help.html:658 #, python-format msgid "" "If you're experiencing an issue with PyPI itself, we welcome " -"<strong>constructive</strong> feedback and bug reports via our <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">issue " -"tracker</a>. Please note that this tracker is only for issues with the " -"software that runs PyPI. Before writing a new issue, first check that a " -"similar issue does not already exist." +"<strong>constructive</strong> feedback and bug reports via our <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">issue tracker</a>. Please note that this tracker is only" +" for issues with the software that runs PyPI. Before writing a new issue," +" first check that a similar issue does not already exist." msgstr "" "Якщо у вас виникла проблема з самим PyPI, ми заохочуємо " -"<strong>конструктивні</strong> відгуки та звіти про вади через наш <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">іш'ю-" -"трекер</a>. Будь ласка, зверніть увагу на те, що це трекер лише для проблем " -"із програмним забезпеченням, на якому працює PyPI. Перед написанням нового " -"іш'ю спершу переконайтеся, що схожого іш'ю ще не існує." +"<strong>конструктивні</strong> відгуки та звіти про вади через наш <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">іш'ю-трекер</a>. Будь ласка, зверніть увагу на те, що це" +" трекер лише для проблем із програмним забезпеченням, на якому працює " +"PyPI. Перед написанням нового іш'ю спершу переконайтеся, що схожого іш'ю " +"ще не існує." #: warehouse/templates/pages/help.html:665 msgid "" -"If you are having an issue is with a specific package installed from PyPI, " -"you should reach out to the maintainers of that project directly instead." +"If you are having an issue is with a specific package installed from " +"PyPI, you should reach out to the maintainers of that project directly " +"instead." msgstr "" "Якщо у вас виникла проблема із певним пакунком, встановленим із PyPI, ви " "маєте натомість зв'язатися з доглядачами того проекту напряму." @@ -5209,53 +5255,59 @@ msgstr "" #: warehouse/templates/pages/help.html:674 #, python-format msgid "" -"PyPI is powered by the Warehouse project; <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> is an open " -"source project developed under the umbrella of the Python Packaging " -"Authority (PyPA) and supported by the Python Packaging Working Group " -"(PackagingWG)." +"PyPI is powered by the Warehouse project; <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> is " +"an open source project developed under the umbrella of the Python " +"Packaging Authority (PyPA) and supported by the Python Packaging Working " +"Group (PackagingWG)." msgstr "" -"PyPI працює на базі проекту Warehouse; <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">Warehouse</a> — це проект із відкритим " -"кодом, який розробляється під егідою управління з пакування Python (PyPA) та " -"підтримується робочою групою з пакування Python (PackagingWG)." +"PyPI працює на базі проекту Warehouse; <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> — це" +" проект із відкритим кодом, який розробляється під егідою управління з " +"пакування Python (PyPA) та підтримується робочою групою з пакування " +"Python (PackagingWG)." #: warehouse/templates/pages/help.html:679 #, python-format msgid "" -"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPA</a> is an independent group of developers whose goal is to improve " -"and maintain many of the core projects related to Python packaging." +"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA</a> is an independent group of developers whose " +"goal is to improve and maintain many of the core projects related to " +"Python packaging." msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPA</a> — незалежна група розробників, метою якої є покращення та догляд " -"за багатьма основоположними проектами, пов'язаними з пакуванням Python." +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA</a> — незалежна група розробників, метою якої є " +"покращення та догляд за багатьма основоположними проектами, пов'язаними з" +" пакуванням Python." #: warehouse/templates/pages/help.html:684 #, python-format msgid "" -"The <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">PackagingWG</a> is a working group of the Python Software " -"Foundation (PSF) whose goal is to raise and disburse funds to support the " -"ongoing improvement of Python packaging. Most recently it <a href=" -"\"%(otf_award_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">secured an award from the Open Technology Fund</a> whose funding is " -"enabling developers to improve Warehouse's security and accessibility." -msgstr "" -"<a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">PackagingWG</a> — це робоча група Python Software Foundation " -"(PSF), метою якої є збір і виплата коштів для підтримки постійного " -"вдосконалення пакування Python. Нещодавно вони <a href=\"%(otf_award_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">забезпечили " -"нагороду від Open Technology Fund</a>, чиє фінансування забезпечує " -"розробникам можливість покращити безпеку та доступність Warehouse." +"The <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">PackagingWG</a> is a working group of " +"the Python Software Foundation (PSF) whose goal is to raise and disburse " +"funds to support the ongoing improvement of Python packaging. Most " +"recently it <a href=\"%(otf_award_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">secured an award from the Open " +"Technology Fund</a> whose funding is enabling developers to improve " +"Warehouse's security and accessibility." +msgstr "" +"<a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PackagingWG</a> — це робоча група Python Software " +"Foundation (PSF), метою якої є збір і виплата коштів для підтримки " +"постійного вдосконалення пакування Python. Нещодавно вони <a " +"href=\"%(otf_award_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">забезпечили нагороду від Open Technology Fund</a>, чиє " +"фінансування забезпечує розробникам можливість покращити безпеку та " +"доступність Warehouse." #: warehouse/templates/pages/help.html:694 #, python-format msgid "" -"PyPI is powered by <a href=\"%(warehouse_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Warehouse</a> and by a variety of tools and " -"services provided by our <a href=\"%(sponsors_href)s\">generous sponsors</a>." +"PyPI is powered by <a href=\"%(warehouse_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Warehouse</a> and by a variety of " +"tools and services provided by our <a href=\"%(sponsors_href)s\">generous" +" sponsors</a>." msgstr "" "PyPI працює на базі <a href=\"%(warehouse_href)s\" title=\"%(title)s\" " "target=\"_blank\" rel=\"noopener\">Warehouse</a> та різноманітних " @@ -5264,52 +5316,56 @@ msgstr "" #: warehouse/templates/pages/help.html:701 msgid "" -"As of April 16, 2018, PyPI.org is at \"production\" status, meaning that it " -"has moved out of beta and replaced the old site (pypi.python.org). It is now " -"robust, tested, and ready for expected browser and API traffic." +"As of April 16, 2018, PyPI.org is at \"production\" status, meaning that " +"it has moved out of beta and replaced the old site (pypi.python.org). It " +"is now robust, tested, and ready for expected browser and API traffic." msgstr "" -"Станом на 16 квітня 2018, PyPI.org має статус «продакшна», що означає що він " -"вийшов з бети і замінив старий сайт (pypi.python.org). Тепер він надійний, " -"протестований і готовий до очікуваного трафіку з браузера та API." +"Станом на 16 квітня 2018, PyPI.org має статус «продакшна», що означає що " +"він вийшов з бети і замінив старий сайт (pypi.python.org). Тепер він " +"надійний, протестований і готовий до очікуваного трафіку з браузера та " +"API." #: warehouse/templates/pages/help.html:703 #, python-format msgid "" -"PyPI is heavily cached and distributed via <abbr title=\"content delivery " -"network\">CDN</abbr> thanks to our sponsor <a href=\"%(fastly_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Fastly</a> and thus is " -"generally available globally. However, the site is mostly maintained by " -"volunteers, we do not provide any specific Service Level Agreement, and as " -"could be expected for a giant distributed system, things can and sometimes " -"do go wrong. See <a href=\"%(status_page_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">our status page</a> for current and past outages " -"and incidents. If you have high availability requirements for your package " -"index, consider either a <a href=\"%(mirror_href)s\">mirror</a> or a <a href=" -"\"%(private_index_href)s\">private index</a>." +"PyPI is heavily cached and distributed via <abbr title=\"content delivery" +" network\">CDN</abbr> thanks to our sponsor <a href=\"%(fastly_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Fastly</a> and " +"thus is generally available globally. However, the site is mostly " +"maintained by volunteers, we do not provide any specific Service Level " +"Agreement, and as could be expected for a giant distributed system, " +"things can and sometimes do go wrong. See <a " +"href=\"%(status_page_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">our status page</a> for current and past outages and " +"incidents. If you have high availability requirements for your package " +"index, consider either a <a href=\"%(mirror_href)s\">mirror</a> or a <a " +"href=\"%(private_index_href)s\">private index</a>." msgstr "" "PyPI дуже кешований і рорподілений через <abbr title=\"мережа доставки " -"вмісту (content delivery network)\">CDN</abbr> завдяки нашому спонсору <a " -"href=\"%(fastly_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Fastly</a> і тому є загальнодоступним глобально. Однак, цей сайт " -"переважно доглядають волонтери, ми не надаємо жодної специфічної угоди про " -"рівень обслуговування, і як це можна очікувати від гігантської розподіленої " -"системи, речі можуть і йдуть не так. Відвідайте <a href=" -"\"%(status_page_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">нашу сторінку статусу</a>, щоб дізнатися про нинішні та минулі перебої й " -"інциденти. Якщо висока доступність є вимогою для вашого індексу пакунків, " -"розгляньте можливість мати <a href=\"%(mirror_href)s\">дзеркало</a> чи <a " +"вмісту (content delivery network)\">CDN</abbr> завдяки нашому спонсору <a" +" href=\"%(fastly_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Fastly</a> і тому є загальнодоступним глобально. Однак, " +"цей сайт переважно доглядають волонтери, ми не надаємо жодної специфічної" +" угоди про рівень обслуговування, і як це можна очікувати від гігантської" +" розподіленої системи, речі можуть і йдуть не так. Відвідайте <a " +"href=\"%(status_page_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">нашу сторінку статусу</a>, щоб дізнатися про нинішні та " +"минулі перебої й інциденти. Якщо висока доступність є вимогою для вашого " +"індексу пакунків, розгляньте можливість мати <a " +"href=\"%(mirror_href)s\">дзеркало</a> чи <a " "href=\"%(private_index_href)s\">приватний індекс</a>." #: warehouse/templates/pages/help.html:717 #, python-format msgid "" -"We have a huge amount of work to do to continue to maintain and improve PyPI " -"(also known as <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">the Warehouse project</a>)." +"We have a huge amount of work to do to continue to maintain and improve " +"PyPI (also known as <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">the Warehouse project</a>)." msgstr "" "Ми маємо виконати величезний обсяг роботи щоб продовжувати доглядати та " -"покращувати PyPI (також відомий як <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">проект Warehouse</a>)." +"покращувати PyPI (також відомий як <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">проект " +"Warehouse</a>)." #: warehouse/templates/pages/help.html:722 msgid "Financial:" @@ -5321,8 +5377,8 @@ msgid "" "We would deeply appreciate <a href=\"%(href)s\">your donations to fund " "development and maintenance</a>." msgstr "" -"Ми глибоко цінуємо <a href=\"%(href)s\">ваші пожертви до фонду розробки і " -"обслуговування</a>." +"Ми глибоко цінуємо <a href=\"%(href)s\">ваші пожертви до фонду розробки і" +" обслуговування</a>." #: warehouse/templates/pages/help.html:723 msgid "Development:" @@ -5330,51 +5386,52 @@ msgstr "Розробка:" #: warehouse/templates/pages/help.html:723 msgid "" -"Warehouse is open source, and we would love to see some new faces working on " -"the project. You <strong>do not</strong> need to be an experienced open-" -"source developer to make a contribution – in fact, we'd love to help you " -"make your first open source pull request!" +"Warehouse is open source, and we would love to see some new faces working" +" on the project. You <strong>do not</strong> need to be an experienced " +"open-source developer to make a contribution – in fact, we'd love to help" +" you make your first open source pull request!" msgstr "" "Warehouse має відкритий код і ми були б раді бачити роботу нових облич у " -"проекті. Вам <strong>не</strong> потрібно мати досвід у розробці відкритого " -"коду, щоб зробити вклад — насправді, ми залюбки допоможемо вам зробити свій " -"перший опенсорцний пул-реквест!" +"проекті. Вам <strong>не</strong> потрібно мати досвід у розробці " +"відкритого коду, щоб зробити вклад — насправді, ми залюбки допоможемо вам" +" зробити свій перший опенсорцний пул-реквест!" #: warehouse/templates/pages/help.html:725 #, python-format msgid "" "If you have skills in Python, ElasticSearch, HTML, SCSS, JavaScript, or " -"SQLAlchemy then skim our <a href=\"%(getting_started_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">\"Getting started\" guide</" -"a>, then take a look at the <a href=\"%(issue_tracker_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">issue tracker</a>. We've " -"created a <a href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">'Good first issue'</a> label – we recommend you " -"start here." -msgstr "" -"Якщо ви маєте навички в Python, ElasticSearch, HTML, SCSS, JavaScript або " -"SQLAlchemy, тоді прогляньте наше <a href=\"%(getting_started_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">керівництво «Getting " -"started»</a>, потім зверніть увагу на <a href=\"%(issue_tracker_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">іш'ю-трекер</a>. Ми " -"створили позначку <a href=\"%(good_first_issue_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">«Good first issue»</a> — ми радимо вам " -"почати тут." +"SQLAlchemy then skim our <a href=\"%(getting_started_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">\"Getting " +"started\" guide</a>, then take a look at the <a " +"href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">issue tracker</a>. We've created a <a " +"href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">'Good first issue'</a> label – we recommend you start " +"here." +msgstr "" +"Якщо ви маєте навички в Python, ElasticSearch, HTML, SCSS, JavaScript або" +" SQLAlchemy, тоді прогляньте наше <a href=\"%(getting_started_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">керівництво " +"«Getting started»</a>, потім зверніть увагу на <a " +"href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">іш'ю-трекер</a>. Ми створили позначку <a " +"href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">«Good first issue»</a> — ми радимо вам почати тут." #: warehouse/templates/pages/help.html:733 #, python-format msgid "" -"Issues are grouped into <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">milestones</a>; working on issues in the current " -"milestone is a great way to help push the project forward. If you're " -"interested in working on a particular issue, leave a comment and we can " -"guide you through the contribution process." +"Issues are grouped into <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">milestones</a>; working on issues in " +"the current milestone is a great way to help push the project forward. If" +" you're interested in working on a particular issue, leave a comment and " +"we can guide you through the contribution process." msgstr "" -"Іш'ю згруповані у <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">вехи</a>; робота над задачами із поточної вехи це чудовий " -"спосіб допомогти розвивати проект. Якщо ви зацікавлені у роботі над певним " -"іш'ю, напишіть коментар і ми можемо допомогти вам розібратися з процесом " -"вкладів." +"Іш'ю згруповані у <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">вехи</a>; робота над задачами із " +"поточної вехи це чудовий спосіб допомогти розвивати проект. Якщо ви " +"зацікавлені у роботі над певним іш'ю, напишіть коментар і ми можемо " +"допомогти вам розібратися з процесом вкладів." #: warehouse/templates/pages/help.html:740 msgid "Stay updated:" @@ -5383,47 +5440,50 @@ msgstr "Будьте в курсі оновлень:" #: warehouse/templates/pages/help.html:741 #, python-format msgid "" -"You can also follow the ongoing development of the project on the <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">distutils-sig mailing list</a> and the <a href=" -"\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">PyPA Dev message group</a>." +"You can also follow the ongoing development of the project on the <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">distutils-sig mailing list</a> and the <a " +"href=\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA Dev message group</a>." msgstr "" -"Також, ви можете стежити за процесом розробки проекту через <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">список розсилки distutils-sig</a> та <a href=" -"\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">групу повідомлень PyPA Dev</a>." +"Також, ви можете стежити за процесом розробки проекту через <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">список розсилки distutils-sig</a> та <a " +"href=\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">групу повідомлень PyPA Dev</a>." #: warehouse/templates/pages/help.html:751 #, python-format msgid "" -"Changes to PyPI are generally announced on both the <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">pypi-announce mailing list</a> and the <a href=\"%(blog_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PSF blog</a> under " -"the label \"pypi\". The PSF blog also has <a href=\"%(atom_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Atom</a> and <a href=" -"\"%(rss_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</" -"a> feeds for the \"pypi\" label." +"Changes to PyPI are generally announced on both the <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">pypi-announce mailing list</a> and the <a " +"href=\"%(blog_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PSF blog</a> under the label \"pypi\". The PSF blog also" +" has <a href=\"%(atom_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Atom</a> and <a href=\"%(rss_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</a> feeds for " +"the \"pypi\" label." msgstr "" "Зміни до PyPI зазвичай оголошуються в <a href=\"%(mailing_list_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">списку розсилки pypi-" -"announce</a> та у <a href=\"%(blog_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">блозі PSF</a> із позначкою «pypi». Блог PSF " -"також має стрічки <a href=\"%(atom_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Atom</a> та <a href=\"%(rss_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</a> для мітки «pypi»." +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">списку розсилки " +"pypi-announce</a> та у <a href=\"%(blog_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">блозі PSF</a> із позначкою «pypi». " +"Блог PSF також має стрічки <a href=\"%(atom_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Atom</a> та <a href=\"%(rss_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</a> для мітки " +"«pypi»." #: warehouse/templates/pages/help.html:761 msgid "" -"When Warehouse's maintainers are deploying new features, at first we mark " -"them with a small \"beta feature\" symbol to tell you: this should probably " -"work fine, but it's new and less tested than other site functionality." +"When Warehouse's maintainers are deploying new features, at first we mark" +" them with a small \"beta feature\" symbol to tell you: this should " +"probably work fine, but it's new and less tested than other site " +"functionality." msgstr "" -"Коли доглядачі Warehouse'а розгортають нові функції, спершу ми позначаємо їх " -"маленьким символом «бета-функція» аби сказати вам: це ймовірно працює добре, " -"але воно нове і менш перевірене за інші функції сайту." +"Коли доглядачі Warehouse'а розгортають нові функції, спершу ми позначаємо" +" їх маленьким символом «бета-функція» аби сказати вам: це ймовірно працює" +" добре, але воно нове і менш перевірене за інші функції сайту." #: warehouse/templates/pages/help.html:762 msgid "Currently, no features are in beta." @@ -5432,16 +5492,16 @@ msgstr "Наразі, немає функцій в бета." #: warehouse/templates/pages/help.html:766 #, python-format msgid "" -"\"PyPI\" should be pronounced like \"pie pea eye\", specifically with the " -"\"PI\" pronounced as individual letters, rather as a single sound. This " -"minimizes confusion with the <a href=\"%(href)s\" title=\"%(title)s\">PyPy</" -"a> project, which is a popular alternative implementation of the Python " -"language." +"\"PyPI\" should be pronounced like \"pie pea eye\", specifically with the" +" \"PI\" pronounced as individual letters, rather as a single sound. This " +"minimizes confusion with the <a href=\"%(href)s\" " +"title=\"%(title)s\">PyPy</a> project, which is a popular alternative " +"implementation of the Python language." msgstr "" "«PyPI» має вимовлятися як «пай пі ай», зокрема «PI» має вимовлятися як " -"окремі літери, а не один звук. Це зменшує плутанину з проектом <a href=" -"\"%(href)s\" title=\"%(title)s\">PyPy</a>, який є відомою альтернативною " -"реалізацією мови Python." +"окремі літери, а не один звук. Це зменшує плутанину з проектом <a " +"href=\"%(href)s\" title=\"%(title)s\">PyPy</a>, який є відомою " +"альтернативною реалізацією мови Python." #: warehouse/templates/pages/help.html:778 msgid "Resources" @@ -5478,20 +5538,22 @@ msgstr "Зв'язок" #: warehouse/templates/pages/help.html:789 #, python-format msgid "" -"The <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging Authority (PyPA)</a> is a working group who " -"work together to improve Python packaging. If you'd like to get in touch " -"with a core packaging developer, use <a href=\"%(irc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">#pypa on IRC (freenode)</" -"a>, or <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">join the distutils-sig mailing list</a>." -msgstr "" -"<a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Управління з пакування Python (PyPA)</a> — це робоча група, яка " -"працює разом.ю щоб покращити пакування Python. Якщо ви бажаєте зв'язатися із " -"головним розробником пакування, скористайтеся <a href=\"%(irc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">#pypa на IRC (freenode)</a> " -"чи <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"The <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging Authority (PyPA)</a> is a working group" +" who work together to improve Python packaging. If you'd like to get in " +"touch with a core packaging developer, use <a href=\"%(irc_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">#pypa on IRC " +"(freenode)</a>, or <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">join the distutils-sig mailing " +"list</a>." +msgstr "" +"<a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Управління з пакування Python (PyPA)</a> — це робоча " +"група, яка працює разом.ю щоб покращити пакування Python. Якщо ви бажаєте" +" зв'язатися із головним розробником пакування, скористайтеся <a " +"href=\"%(irc_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">#pypa на IRC (freenode)</a> чи <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " "rel=\"noopener\">приєднайтеся до списку розсилки distutils-sig</a>." #: warehouse/templates/pages/security.html:15 @@ -5504,11 +5566,11 @@ msgstr "Надсилання звіту про проблему безпеки" #: warehouse/templates/pages/security.html:22 msgid "" -"We take security very seriously and ask that you follow our security policy " -"carefully." +"We take security very seriously and ask that you follow our security " +"policy carefully." msgstr "" -"Ми ставимося до безпеки дуже серйозно та просимо вас ретельно дотримуватися " -"нашої політики безпеки." +"Ми ставимося до безпеки дуже серйозно та просимо вас ретельно " +"дотримуватися нашої політики безпеки." #: warehouse/templates/pages/security.html:24 msgid "Important!" @@ -5516,13 +5578,13 @@ msgstr "Важливо!" #: warehouse/templates/pages/security.html:24 msgid "" -"If you believe you've identified a security issue with Warehouse, <strong>DO " -"NOT</strong> report the issue in any public forum, including (but not " -"limited to):" +"If you believe you've identified a security issue with Warehouse, " +"<strong>DO NOT</strong> report the issue in any public forum, including " +"(but not limited to):" msgstr "" -"Якщо ви вважаєте, що виявили проблему безпеки із Warehouse, <strong>НЕ</" -"strong> надсилайте звіт про цю проблему на жоден публічний форум, включаючи " -"(але не обмежуючись):" +"Якщо ви вважаєте, що виявили проблему безпеки із Warehouse, " +"<strong>НЕ</strong> надсилайте звіт про цю проблему на жоден публічний " +"форум, включаючи (але не обмежуючись):" #: warehouse/templates/pages/security.html:27 msgid "Our GitHub issue tracker" @@ -5539,23 +5601,24 @@ msgstr "Офіційні або неофіційні списки розсилк #: warehouse/templates/pages/security.html:35 #, python-format msgid "" -"Instead, email <a href=\"%(href)s\">security at python dot org</a> directly, " -"providing as much relevant information as possible." +"Instead, email <a href=\"%(href)s\">security at python dot org</a> " +"directly, providing as much relevant information as possible." msgstr "" -"Натомість, надішліть електронного листа на <a href=\"%(href)s\">security на " -"python цятка org</a> напряму, вказавши якнайбільше доречної інформації." +"Натомість, надішліть електронного листа на <a href=\"%(href)s\">security " +"на python цятка org</a> напряму, вказавши якнайбільше доречної " +"інформації." #: warehouse/templates/pages/security.html:36 #, python-format msgid "" "Messages may be optionally encrypted with GPG using key fingerprints " -"available <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">at the Python Security page</a>." +"available <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">at the Python Security page</a>." msgstr "" "Необов'язково, повідомлення можуть бути зашифровані за допомогою GPG, " -"використовуючи відбитки ключа, доступні <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">на сторінці безпеки Python</" -"a>." +"використовуючи відбитки ключа, доступні <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">на сторінці " +"безпеки Python</a>." #: warehouse/templates/pages/security.html:38 msgid "What happens next?" @@ -5623,15 +5686,15 @@ msgstr "Зробити пожертву для робочої групи з па #: warehouse/templates/pages/sponsor.html:27 #, python-format msgid "" -"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Packaging Working Group</a> is a work group of the Python Software " -"Foundation which raises and distributes funds to improve Python's packaging " -"ecosystem." +"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Packaging Working Group</a> is a work group of the " +"Python Software Foundation which raises and distributes funds to improve " +"Python's packaging ecosystem." msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Група по роботі з пакунками</a> це робоча група з Python Software " -"Foundation, яка збирає та розподіляє кошти для покращення екосистеми " -"пакунків у Python." +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Група по роботі з пакунками</a> це робоча група з Python" +" Software Foundation, яка збирає та розподіляє кошти для покращення " +"екосистеми пакунків у Python." #: warehouse/templates/pages/sponsor.html:29 msgid "Recent projects funded through the working group include:" @@ -5648,20 +5711,20 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:33 #, python-format msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$170,000 in funding</a> from the <a href=\"%(funder_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Mozilla Open Source " -"Support Program</a> in 2018" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$170,000 in funding</a> from the <a " +"href=\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Mozilla Open Source Support Program</a> in 2018" msgstr "" -"Завдяки <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">гранту обсягом $170000</a> від <a href=\"%(funder_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Mozilla Open Source " -"Support Program</a> у 2018" +"Завдяки <a href=\"%(project_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">гранту обсягом $170000</a> від <a " +"href=\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Mozilla Open Source Support Program</a> у 2018" #: warehouse/templates/pages/sponsor.html:36 msgid "" -"Improving PyPI's security and accessibility, and adding support for multiple " -"locales" +"Improving PyPI's security and accessibility, and adding support for " +"multiple locales" msgstr "" "Покращення безпеки і доступності PyPI, та додавання підтримки декількох " "локалей" @@ -5669,13 +5732,13 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:37 #, python-format msgid "" -"With $80,000 in funding from the <a href=\"%(funder_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology Fund</a> in " -"2019" +"With $80,000 in funding from the <a href=\"%(funder_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology " +"Fund</a> in 2019" msgstr "" -"Завдяки гранту обсягом $80000 від <a href=\"%(funder_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology Fund</a> у " -"2019" +"Завдяки гранту обсягом $80000 від <a href=\"%(funder_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology " +"Fund</a> у 2019" #: warehouse/templates/pages/sponsor.html:40 msgid "Additional security-focused features for PyPI" @@ -5684,15 +5747,15 @@ msgstr "Додаткові засоби безпеки на PyPI" #: warehouse/templates/pages/sponsor.html:41 #, python-format msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$100,000 in funding</a> from <a href=\"%(funder_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Facebook Research</a> in " -"2019 and 2020" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$100,000 in funding</a> from <a href=\"%(funder_href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Facebook " +"Research</a> in 2019 and 2020" msgstr "" -"Завдяки <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">гранту обсягом $100000 </a> від <a href=\"%(funder_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Facebook Research</a> " -"у 2019 та 2020" +"Завдяки <a href=\"%(project_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">гранту обсягом $100000 </a> від <a " +"href=\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Facebook Research</a> у 2019 та 2020" #: warehouse/templates/pages/sponsor.html:44 #, fuzzy @@ -5704,18 +5767,19 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:45 #, python-format msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$407,000 in funding</a> from the <a href=\"%(funder0_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Chan Zuckerberg " -"Initiative</a> and the <a href=\"%(funder1_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Mozilla Open Source Support Program</a> " -"in 2020" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$407,000 in funding</a> from the <a " +"href=\"%(funder0_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Chan Zuckerberg Initiative</a> and the <a " +"href=\"%(funder1_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Mozilla Open Source Support Program</a> in 2020" msgstr "" -"Завдяки <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">гранту обсягом $407000</a> від<a href=\"%(funder0_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Chan Zuckerberg " -"Initiative</a> та <a href=\"%(funder1_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Mozilla Open Source Support Program</a> у 2020" +"Завдяки <a href=\"%(project_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">гранту обсягом $407000</a> від<a " +"href=\"%(funder0_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Chan Zuckerberg Initiative</a> та <a " +"href=\"%(funder1_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Mozilla Open Source Support Program</a> у 2020" #: warehouse/templates/pages/sponsor.html:49 msgid "" @@ -5737,8 +5801,9 @@ msgstr "Ми щиро вдячні як одноразовим, так і пер #: warehouse/templates/pages/sponsor.html:61 #, python-format msgid "" -"For US taxpayers, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">your donation may be tax-deductible</a>." +"For US taxpayers, <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">your donation may be tax-" +"deductible</a>." msgstr "" "Для платників податків в США, <a href=\"%(href)s\" title=\"%(title)s\" " "target=\"_blank\" rel=\"noopener\">ваше пожертвування може зменшити " @@ -5754,11 +5819,10 @@ msgstr "Пожертвуйте тут" #: warehouse/templates/pages/sponsor.html:66 #, python-format -msgid "" -"Donating over $5,000? <a href=\"%(href)s\">Become a sponsor</a> instead." +msgid "Donating over $5,000? <a href=\"%(href)s\">Become a sponsor</a> instead." msgstr "" -"Жертвуєте понад $5000? Натомість, <a href=\"%(href)s\">ставайте спонсором</" -"a>." +"Жертвуєте понад $5000? Натомість, <a href=\"%(href)s\">ставайте " +"спонсором</a>." #: warehouse/templates/pages/sponsor.html:77 msgid "Get your logo on PyPI.org" @@ -5766,11 +5830,11 @@ msgstr "Ваш логотип на PyPI.org" #: warehouse/templates/pages/sponsor.html:78 msgid "" -"Looking for brand visibility? In the last year*, 21.1 million people from " -"237 countries visited PyPI.org." +"Looking for brand visibility? In the last year*, 21.1 million people from" +" 237 countries visited PyPI.org." msgstr "" -"Потрібна видимість бренду? За останній рік* 21.1 мільйон людей з 237 країн " -"відвідали PyPI.org." +"Потрібна видимість бренду? За останній рік* 21.1 мільйон людей з 237 " +"країн відвідали PyPI.org." #: warehouse/templates/pages/sponsor.html:79 msgid "* Data as of March 2020" @@ -5782,8 +5846,8 @@ msgstr "Зміцнення екосистеми Python" #: warehouse/templates/pages/sponsor.html:83 msgid "" -"Funds raised by the packaging working group go directly towards improving " -"the tools your company uses every day." +"Funds raised by the packaging working group go directly towards improving" +" the tools your company uses every day." msgstr "" "Кошти, отримані для робочої групи з пакування, йдуть безпосередньо на " "покращення інструментів, які ваша компанія використовує щодня." @@ -5794,8 +5858,8 @@ msgstr "Підвищіть свою репутацію" #: warehouse/templates/pages/sponsor.html:87 msgid "" -"Enhance your company's reputation by investing in Python and the open source " -"community." +"Enhance your company's reputation by investing in Python and the open " +"source community." msgstr "" "Покращіть репутацію своєї компанії, шляхом інвестування в Python та open " "source спільноту." @@ -5824,20 +5888,20 @@ msgstr "" "Логотип у визначному місці на сторінці детального опису проекту PyPI " "<strong>назавжди</strong>" +# | msgid "" +# | "<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Sofware " +# | "Foundation blog</a>" #: warehouse/templates/pages/sponsor.html:112 #: warehouse/templates/pages/sponsor.html:133 #, fuzzy, python-format -#| msgid "" -#| "<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Sofware " -#| "Foundation blog</a>" msgid "" -"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation " -"blog</a>" +"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation blog</a>" msgstr "" -"<strong>Власний</strong> допис у <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\"> блозі Python Software Foundation</a>" +"<strong>Власний</strong> допис у <a href=\"%(href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\"> блозі Python Software Foundation</a>" #: warehouse/templates/pages/sponsor.html:116 #: warehouse/templates/pages/sponsor.html:139 @@ -5859,7 +5923,8 @@ msgstr "$50000 на рік, або еквівалент в наданих пос #: warehouse/templates/pages/sponsor.html:130 msgid "" -"Logo in a <strong>prominent position</strong> on the PyPI project detail page" +"Logo in a <strong>prominent position</strong> on the PyPI project detail " +"page" msgstr "" "Логотип у <strong>визначному місці</strong> на сторінці опису деталей " "проекту PyPI" @@ -5876,11 +5941,11 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:243 #, python-format msgid "" -"Logo <strong>and write up</strong> on the <a href=\"%(href)s\">PyPI sponsors " -"page</a>" +"Logo <strong>and write up</strong> on the <a href=\"%(href)s\">PyPI " +"sponsors page</a>" msgstr "" -"Логотип <strong>і детальний опис</strong> на <a href=\"%(href)s\">сторінці " -"спонсорів PyPI</a>" +"Логотип <strong>і детальний опис</strong> на <a " +"href=\"%(href)s\">сторінці спонсорів PyPI</a>" #: warehouse/templates/pages/sponsor.html:134 #: warehouse/templates/pages/sponsor.html:157 @@ -5891,9 +5956,9 @@ msgid "" "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " "Foundation</a>" msgstr "" -"<strong>Щоквартальний</strong> твіт з подякою від<a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a>" +"<strong>Щоквартальний</strong> твіт з подякою від<a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a>" #: warehouse/templates/pages/sponsor.html:135 #: warehouse/templates/pages/sponsor.html:158 @@ -5901,11 +5966,12 @@ msgstr "" #, python-format msgid "" "<strong>Quarterly</strong> thank you tweet from the <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</" -"a>" +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" -"<strong>Щоквартальний</strong> твіт з подякою від <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Твітер акаунту PyPI</a>" +"<strong>Щоквартальний</strong> твіт з подякою від <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Твітер акаунту " +"PyPI</a>" #: warehouse/templates/pages/sponsor.html:148 msgid "Platinum" @@ -5917,29 +5983,31 @@ msgstr "$30,000 на рік, або еквівалент у наданих по #: warehouse/templates/pages/sponsor.html:153 msgid "" -"Logo on <strong>high rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>high rotation</strong> in a prominent position on the " +"PyPI project detail page" msgstr "" +# | msgid "" +# | "Inclusion in a blog post on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Sofware Foundation blog</a>, " +# | "<strong>with other sponsors</strong> whose sponsorship commenced during " +# | "the same quarter" #: warehouse/templates/pages/sponsor.html:156 #: warehouse/templates/pages/sponsor.html:179 #: warehouse/templates/pages/sponsor.html:201 #: warehouse/templates/pages/sponsor.html:222 #, fuzzy, python-format -#| msgid "" -#| "Inclusion in a blog post on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Sofware Foundation blog</a>, " -#| "<strong>with other sponsors</strong> whose sponsorship commenced during " -#| "the same quarter" msgid "" "Inclusion in a blog post on the <a href=\"%(href)s\" title=\"%(title)s\" " "target=\"_blank\" rel=\"noopener\">Python Software Foundation blog</a>, " -"<strong>with other sponsors</strong> whose sponsorship commenced during the " -"same quarter" +"<strong>with other sponsors</strong> whose sponsorship commenced during " +"the same quarter" msgstr "" -"Включення у допис у <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">блозі Python Sofware Foundation</a>, <strong>з іншими " -"спонсорами</strong>, чиє спонсорство розпочато протягом того ж кварталу" +"Включення у допис у <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">блозі Python Sofware Foundation</a>, " +"<strong>з іншими спонсорами</strong>, чиє спонсорство розпочато протягом " +"того ж кварталу" #: warehouse/templates/pages/sponsor.html:171 msgid "Gold" @@ -5951,8 +6019,8 @@ msgstr "$20,000 на рік, або еквівалент у наданих по #: warehouse/templates/pages/sponsor.html:176 msgid "" -"Logo on <strong>medium rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>medium rotation</strong> in a prominent position on the " +"PyPI project detail page" msgstr "" #: warehouse/templates/pages/sponsor.html:194 @@ -5965,8 +6033,8 @@ msgstr "$10,000 на рік, або еквівалент у наданих по #: warehouse/templates/pages/sponsor.html:199 msgid "" -"Logo on <strong>low rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>low rotation</strong> in a prominent position on the PyPI" +" project detail page" msgstr "" #: warehouse/templates/pages/sponsor.html:200 @@ -5982,19 +6050,20 @@ msgid "" "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " "Foundation</a>" msgstr "" -"<strong>Дворічні</strong> твіти з подякою від <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a>" +"<strong>Дворічні</strong> твіти з подякою від <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a>" #: warehouse/templates/pages/sponsor.html:203 #, python-format msgid "" "<strong>Bi-yearly</strong> thank you tweet from the <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</" -"a>" +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" -"<strong>Дворічні</strong> твіти з подякою від <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Твітер акаунту PyPI</a>" +"<strong>Дворічні</strong> твіти з подякою від <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Твітер акаунту " +"PyPI</a>" #: warehouse/templates/pages/sponsor.html:216 msgid "Bronze" @@ -6007,24 +6076,26 @@ msgstr "$5,000 на рік, або еквівалент у наданих пос #: warehouse/templates/pages/sponsor.html:223 #, python-format msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a> (on initial sponsorship, and on each subsequent renewal)" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a> (on initial sponsorship, and on each subsequent renewal)" msgstr "" -"<strong>Одноразовий</strong>твіт з подякою від <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a> (під час першого спонсорства і після кожного його поновлення)" +"<strong>Одноразовий</strong>твіт з подякою від <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a> (під час першого спонсорства і після кожного його " +"поновлення)" #: warehouse/templates/pages/sponsor.html:224 #, python-format msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</a> " -"(on initial sponsorship, and on each subsequent renewal)" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a> (on initial sponsorship, and on each subsequent renewal)" msgstr "" -"<strong>Єдиний</strong> твіт з подякою від <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Твітер акаунту PyPI</a> " -"(під час початкового спонсорства і після кожного наступного поновлення)" +"<strong>Єдиний</strong> твіт з подякою від <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Твітер акаунту " +"PyPI</a> (під час початкового спонсорства і після кожного наступного " +"поновлення)" #: warehouse/templates/pages/sponsor.html:238 msgid "One time grants / custom donations" @@ -6033,49 +6104,52 @@ msgstr "Одноразові гранти / спеціальні пожертв #: warehouse/templates/pages/sponsor.html:239 #, python-format msgid "" -"Sponsorship of a specific feature, feature set, or community sprint, valued " -"at over $50,000. See <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">fundable packaging improvements</a> for ideas." +"Sponsorship of a specific feature, feature set, or community sprint, " +"valued at over $50,000. See <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">fundable packaging improvements</a> " +"for ideas." msgstr "" -"Спорнсорство специфічного функціоналу, набору функцій або спринта спільноти, " -"оцінене понад $50,000. Подивіться <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">удосконалення пакунків, що підлягають " -"спонсоруванню,</a> для ідей." +"Спорнсорство специфічного функціоналу, набору функцій або спринта " +"спільноти, оцінене понад $50,000. Подивіться <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">удосконалення " +"пакунків, що підлягають спонсоруванню,</a> для ідей." +# | msgid "" +# | "<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Sofware " +# | "Foundation blog</a>, explaining what the funds will be used for" #: warehouse/templates/pages/sponsor.html:244 #, fuzzy, python-format -#| msgid "" -#| "<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Sofware " -#| "Foundation blog</a>, explaining what the funds will be used for" msgid "" -"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation " -"blog</a>, explaining what the funds will be used for" +"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation blog</a>, explaining what the funds will be used for" msgstr "" -"<strong>Особистий</strong> допис у <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">блозі Python Sofware Foundation</a>, який " -"пояснить, як будуть витрачені кошти" +"<strong>Особистий</strong> допис у <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">блозі Python " +"Sofware Foundation</a>, який пояснить, як будуть витрачені кошти" #: warehouse/templates/pages/sponsor.html:245 #, python-format msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a>" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a>" msgstr "" -"<strong>Одноразовий</strong> твіт з подякою від <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a>" +"<strong>Одноразовий</strong> твіт з подякою від <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a>" #: warehouse/templates/pages/sponsor.html:246 #, python-format msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</a>" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" -"<strong>Одноразовий</strong>твіт з подякою від <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Твітер акаунту PyPI</a>" +"<strong>Одноразовий</strong>твіт з подякою від <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Твітер акаунту " +"PyPI</a>" #: warehouse/templates/pages/sponsor.html:248 msgid "" @@ -6090,11 +6164,11 @@ msgstr "Статистика PyPI" #: warehouse/templates/pages/stats.html:23 msgid "" "We all love stats, so here are some useful statistics about PyPI. The " -"statistics page is cached for 24 hours, so don't expect the numbers to be " -"realtime." +"statistics page is cached for 24 hours, so don't expect the numbers to be" +" realtime." msgstr "" -"Ми всі полюбляємо статистику, тож ось кілька корисних статистик про PyPI. " -"Сторінка статистики кешується на 24 години, тож не очікуйте що ці числа " +"Ми всі полюбляємо статистику, тож ось кілька корисних статистик про PyPI." +" Сторінка статистики кешується на 24 години, тож не очікуйте що ці числа " "будуть в реальному часі." #: warehouse/templates/pages/stats.html:30 @@ -6103,11 +6177,11 @@ msgstr "Топ-проекти за загальним розміром паку #: warehouse/templates/pages/stats.html:32 msgid "" -"Here is a list of the top 100 projects based on the sum of their packages' " -"sizes (in bytes)." +"Here is a list of the top 100 projects based on the sum of their " +"packages' sizes (in bytes)." msgstr "" -"Ось перелік із топ-100 проектів, впорядкованих за сумою розмірів їх пакунків " -"(у байтах)." +"Ось перелік із топ-100 проектів, впорядкованих за сумою розмірів їх " +"пакунків (у байтах)." #: warehouse/templates/pages/stats.html:39 msgid "Statistics by project" @@ -6268,8 +6342,7 @@ msgstr[2] "" " " #~ msgid "A new collaborator has been added to a project you own on PyPI:" -#~ msgstr "" -#~ "Нового поплічника було додано до проекту на PyPI, власником якого є ви:" +#~ msgstr "Нового поплічника було додано до проекту на PyPI, власником якого є ви:" #~ msgid "<strong>Username</strong>: %(username)s" #~ msgstr "<strong>Ім'я користувача</strong>: %(username)s" @@ -6284,11 +6357,14 @@ msgstr[2] "" #~ msgstr "<strong>Додано</strong>: %(submitter)s" #~ msgid "" -#~ "If this was a mistake, you can email <a href=\"%(href)s\">" -#~ "%(email_address)s</a> to communicate with the PyPI administrators." +#~ "If this was a mistake, you can " +#~ "email <a href=\"%(href)s\">%(email_address)s</a> to" +#~ " communicate with the PyPI administrators." #~ msgstr "" -#~ "Якщо це було помилкою, ви можете надіслати листа на <a href=\"%(href)s\">" -#~ "%(email_address)s</a>, щоб зв'язатися з адміністраторами PyPI." +#~ "Якщо це було помилкою, ви можете " +#~ "надіслати листа на <a " +#~ "href=\"%(href)s\">%(email_address)s</a>, щоб зв'язатися" +#~ " з адміністраторами PyPI." #~ msgid "You are receiving this because you are an owner of this project." #~ msgstr "Ви отримали це, оскільки ви власник цього проекту." @@ -6305,27 +6381,27 @@ msgstr[2] "" #~ msgid "" #~ "If this was a mistake, you can email <a\n" -#~ " href=\"%(href)s\">%(email_address)s</a> to communicate with the PyPI " -#~ "administrators." +#~ " href=\"%(href)s\">%(email_address)s</a> to " +#~ "communicate with the PyPI administrators." #~ msgstr "" #~ "Якщо це було помилкою, ви можете надіслати листа на <a\n" -#~ " href=\"%(href)s\">%(email_address)s</a>, щоб зв'язатися з " -#~ "адміністраторами PyPI." +#~ " href=\"%(href)s\">%(email_address)s</a>, щоб " +#~ "зв'язатися з адміністраторами PyPI." #~ msgid "" -#~ "You are receiving this because you are %(recipient_role_descr)s of this " -#~ "project." +#~ "You are receiving this because you " +#~ "are %(recipient_role_descr)s of this project." #~ msgstr "Ви отримали це, оскільки ви %(recipient_role_descr)s цього проекту." #~ msgid "" -#~ "The %(project)s release %(release)s released on %(date)s has been deleted." -#~ msgstr "" -#~ "Випуск %(project)s %(release)s, опублікований %(date)s було видалено." +#~ "The %(project)s release %(release)s released" +#~ " on %(date)s has been deleted." +#~ msgstr "Випуск %(project)s %(release)s, опублікований %(date)s було видалено." #~ msgid "" #~ "\n" -#~ "You are receiving this because you are %(recipient_role_descr)s of this " -#~ "project." +#~ "You are receiving this because you " +#~ "are %(recipient_role_descr)s of this project." #~ msgstr "" #~ "\n" #~ "Ви отримали це, оскільки ви %(recipient_role_descr)s цього проекту." @@ -6337,66 +6413,88 @@ msgstr[2] "" #~ msgstr "Бета-функція" #~ msgid "" -#~ "If you lose your %(method)s and can no longer log in, the PyPI team " -#~ "<strong>cannot</strong> currently help you recover your account. We plan " -#~ "to develop a <a href=\"%(policy_href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">manual account recovery policy</a> and " -#~ "implement <a href=\"%(recovery_codes_href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">account recovery codes</a> to address this " -#~ "issue." +#~ "If you lose your %(method)s and " +#~ "can no longer log in, the PyPI " +#~ "team <strong>cannot</strong> currently help " +#~ "you recover your account. We plan " +#~ "to develop a <a href=\"%(policy_href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">manual account recovery policy</a>" +#~ " and implement <a " +#~ "href=\"%(recovery_codes_href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\">account recovery " +#~ "codes</a> to address this issue." #~ msgstr "" -#~ "Якщо ви втратите свій %(method)s та більше не можете увійти, команда PyPI " -#~ "наразі <strong>не може</strong> допомогти вам відновити свій обліковий " -#~ "запис. Для вирішення цього питання, ми плануємо розробити <a href=" -#~ "\"%(policy_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -#~ "\">політику ручного відновлення облікових записів</a> та впровадити <a " -#~ "href=\"%(recovery_codes_href)s\" title=\"%(title)s\" target=\"_blank\" " -#~ "rel=\"noopener\">коди для відновлення облікових записів</a>." +#~ "Якщо ви втратите свій %(method)s та " +#~ "більше не можете увійти, команда PyPI" +#~ " наразі <strong>не може</strong> допомогти " +#~ "вам відновити свій обліковий запис. Для" +#~ " вирішення цього питання, ми плануємо " +#~ "розробити <a href=\"%(policy_href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">політику ручного відновлення " +#~ "облікових записів</a> та впровадити <a " +#~ "href=\"%(recovery_codes_href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\">коди для " +#~ "відновлення облікових записів</a>." #~ msgid "" #~ "\n" -#~ " In the short term, we recommend that all PyPI users set up " -#~ "<em>both</em>\n" -#~ " supported two factor authentication methods - using an " -#~ "authentication\n" -#~ " application <em>and</em> setting up a security device (e.g. USB " -#~ "key).\n" +#~ " In the short term, we " +#~ "recommend that all PyPI users set " +#~ "up <em>both</em>\n" +#~ " supported two factor authentication" +#~ " methods - using an authentication\n" +#~ " application <em>and</em> setting up" +#~ " a security device (e.g. USB key)." +#~ "\n" #~ " " #~ msgstr "" #~ "\n" -#~ " У короткостроковій перспективі, ми радимо усім користувачам PyPI " -#~ "налаштувати <em>обидва</em>\n" -#~ " підтримувані способи двофакторної автентифікації — використати " -#~ "застосунок\n" -#~ " автентифікації <em>та</em> налаштувати пристрій безпеки (напр. " -#~ "USB-ключ).\n" +#~ " У короткостроковій перспективі, ми " +#~ "радимо усім користувачам PyPI налаштувати " +#~ "<em>обидва</em>\n" +#~ " підтримувані способи двофакторної " +#~ "автентифікації — використати застосунок\n" +#~ " автентифікації <em>та</em> налаштувати " +#~ "пристрій безпеки (напр. USB-ключ).\n" #~ " " #~ msgid "Top storage users" #~ msgstr "Найбільші користувачі сховища" #~ msgid "" -#~ "There is currently no established process for performing this " -#~ "administrative task that is explicit and fair for all parties. However, " -#~ "one is currently in development per <a href=\"%(href)s\" title=\"%(title)s" -#~ "\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python enhancement " +#~ "There is currently no established " +#~ "process for performing this administrative " +#~ "task that is explicit and fair for" +#~ " all parties. However, one is " +#~ "currently in development per <a " +#~ "href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\"" +#~ " rel=\"noopener\"><abbr title=\"Python enhancement " #~ "proposal\">PEP</abbr> 541</a>." #~ msgstr "" -#~ "Нині немає вкоріненого процесу виконання цього адміністративного " -#~ "завдання, який би був прозорим і чесним для усіх сторін. Однак, він є в " -#~ "процесі розробки через <a href=\"%(href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\"><abbr title=\"Пропозиція покращення Python" -#~ "\">PEP</abbr> 541</a>." +#~ "Нині немає вкоріненого процесу виконання " +#~ "цього адміністративного завдання, який би " +#~ "був прозорим і чесним для усіх " +#~ "сторін. Однак, він є в процесі " +#~ "розробки через <a href=\"%(href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\"><abbr title=\"Пропозиція покращення " +#~ "Python\">PEP</abbr> 541</a>." #~ msgid "" -#~ "<abbr title=\"Python enhancement proposal\">PEP</abbr> 541 has been " -#~ "accepted, and PyPI is <a href=\"%(href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">creating a workflow</a> which will be " -#~ "documented here." +#~ "<abbr title=\"Python enhancement " +#~ "proposal\">PEP</abbr> 541 has been accepted," +#~ " and PyPI is <a href=\"%(href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">creating a workflow</a> which " +#~ "will be documented here." #~ msgstr "" -#~ "<abbr title=\"Пропозиція покращення Python\">PEP</abbr> 541 було схвалено " -#~ "і PyPI <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -#~ "\"noopener\">створює робочий процес</a>, який буде задокументовано тут." +#~ "<abbr title=\"Пропозиція покращення " +#~ "Python\">PEP</abbr> 541 було схвалено і " +#~ "PyPI <a href=\"%(href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\">створює робочий " +#~ "процес</a>, який буде задокументовано тут." #~ msgid "Log Out" #~ msgstr "Вийти" @@ -6409,3 +6507,4 @@ msgstr[2] "" #~ msgid "User's username" #~ msgstr "Ім'я користувача" + diff --git a/warehouse/locale/zh_Hans/LC_MESSAGES/messages.mo b/warehouse/locale/zh_Hans/LC_MESSAGES/messages.mo index f07411b9c214..9fd17ab22ab5 100644 Binary files a/warehouse/locale/zh_Hans/LC_MESSAGES/messages.mo and b/warehouse/locale/zh_Hans/LC_MESSAGES/messages.mo differ diff --git a/warehouse/locale/zh_Hans/LC_MESSAGES/messages.po b/warehouse/locale/zh_Hans/LC_MESSAGES/messages.po index ecaed0d57158..20f48ff3a715 100644 --- a/warehouse/locale/zh_Hans/LC_MESSAGES/messages.po +++ b/warehouse/locale/zh_Hans/LC_MESSAGES/messages.po @@ -1,37 +1,6 @@ -# Translations template for Warehouse. -# Copyright (C) 2019 PyPA -# This file is distributed under the same license as the Warehouse project. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2019. -# 王赛 <wangsai@bootcss.com>, 2019. -# Allan Nordhøy <epost@anotheragency.no>, 2019. -# liushuyu011 <liushuyu011@gmail.com>, 2019. -# Jesse201147 <tjx201147@163.com>, 2019. -# 谭九鼎 <109224573@qq.com>, 2019. -# zhaoying <zhaoying1258@qq.com>, 2019. -# eronglee <larbbt@163.com>, 2019. -# Eana Hufwe <ilove@1a23.com>, 2020. -# 李博豪 <xiaolizi20070827@163.com>, 2020. -# Dustin Ingram <dustin.ingram@gmail.com>, 2020. -msgid "" -msgstr "" -"Project-Id-Version: Warehouse VERSION\n" -"Report-Msgid-Bugs-To: https://github.com/pypa/warehouse/issues/new\n" -"POT-Creation-Date: 2020-01-15 20:11+0200\n" -"PO-Revision-Date: 2020-04-03 03:48+0000\n" -"Last-Translator: Dustin Ingram <dustin.ingram@gmail.com>\n" -"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" -"pypa/warehouse/zh_Hans/>\n" -"Language: zh_Hans\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 4.0-dev\n" -"Generated-By: Babel 2.7.0\n" - +# | msgid "Stay updated:" #: warehouse/views.py:254 #, fuzzy -#| msgid "Stay updated:" msgid "Locale updated" msgstr "保持更新：" @@ -50,16 +19,14 @@ msgstr "选择一个不超过50个字符的用户名。" #: warehouse/accounts/forms.py:85 msgid "" "The username is invalid. Usernames must be composed of letters, numbers, " -"dots, hyphens and underscores. And must also start and finish with a letter " -"or number. Choose a different username." -msgstr "" -"用户名无效。用户名必须由字母、数字、点、连字符和下划线组成。也必须以字母或数" -"字开头和结尾。请选择其他用户名。" +"dots, hyphens and underscores. And must also start and finish with a " +"letter or number. Choose a different username." +msgstr "用户名无效。用户名必须由字母、数字、点、连字符和下划线组成。也必须以字母或数字开头和结尾。请选择其他用户名。" #: warehouse/accounts/forms.py:99 msgid "" -"This username is already being used by another account. Choose a different " -"username." +"This username is already being used by another account. Choose a " +"different username." msgstr "此用户名已被其他帐户使用。请重新选择用户名。" #: warehouse/accounts/forms.py:122 @@ -84,14 +51,14 @@ msgstr "您不能使用来自该域名的电子邮件地址。请换一个电子 #: warehouse/accounts/forms.py:209 msgid "" -"This email address is already being used by this account. Use a different " -"email." +"This email address is already being used by this account. Use a different" +" email." msgstr "此帐户已使用此电子邮件地址。请使用一个不同的电子邮件。" #: warehouse/accounts/forms.py:216 msgid "" -"This email address is already being used by another account. Use a different " -"email." +"This email address is already being used by another account. Use a " +"different email." msgstr "此电子邮件地址已被另一个帐户使用。使用一个不同的电子邮件。" #: warehouse/accounts/forms.py:238 @@ -106,9 +73,9 @@ msgstr "无效的 TOTP 代码。" msgid "Invalid WebAuthn assertion: Bad payload" msgstr "无效的 WebAuthn 断言：数据错误" +# | msgid "Invalid TOTP code." #: warehouse/accounts/forms.py:344 #, fuzzy -#| msgid "Invalid TOTP code." msgid "Invalid Recovery Code." msgstr "无效的 TOTP 代码。" @@ -136,11 +103,9 @@ msgstr "接受恢复代码。无法再次使用提供的代码。" #: warehouse/accounts/views.py:455 msgid "" -"New user registration temporarily disabled. See https://pypi.org/help#admin-" -"intervention for details." -msgstr "" -"新用户注册暂时被禁用。有关详细信息，请参见https://pypi.org/help#admin-" -"intervention。" +"New user registration temporarily disabled. See https://pypi.org/help" +"#admin-intervention for details." +msgstr "新用户注册暂时被禁用。有关详细信息，请参见https://pypi.org/help#admin-intervention。" #: warehouse/accounts/views.py:552 msgid "Expired token: request a new password reset link" @@ -214,7 +179,8 @@ msgstr "电子邮件${email_address}已添加 - 请检查邮箱中的验证链 #: warehouse/manage/views.py:667 warehouse/manage/views.py:703 msgid "" -"You must provision a two factor method before recovery codes can be generated" +"You must provision a two factor method before recovery codes can be " +"generated" msgstr "在生成恢复代码之前，必须提供双因素方法" #: warehouse/manage/views.py:678 @@ -400,12 +366,10 @@ msgstr "出问题了" #: warehouse/templates/500.html:22 msgid "" -"<p>We are experiencing technical issues that are affecting our ability to " -"serve you this site.</p> <p>We are aware of the problem and are working to " -"resolve it as soon as possible.</p>" -msgstr "" -"<p>我们遇到了影响我们为您提供本网站服务的技术问题 </p>。<p>我们已经意识到这个" -"问题，并正在努力尽快解决它。</p>" +"<p>We are experiencing technical issues that are affecting our ability to" +" serve you this site.</p> <p>We are aware of the problem and are working " +"to resolve it as soon as possible.</p>" +msgstr "<p>我们遇到了影响我们为您提供本网站服务的技术问题 </p>。<p>我们已经意识到这个问题，并正在努力尽快解决它。</p>" #: warehouse/templates/500.html:28 msgid "Check our status page" @@ -425,23 +389,22 @@ msgstr "是否依靠 PyPI 完成工作？" #: warehouse/templates/500.html:37 msgid "" -"Consider <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\" rel=" -"\"noopener\"> contributing </a> or <a href=\"https://psfmember.org/civicrm/" -"contribute/transact?reset=1&id=13\" target=\"_blank\" rel=\"noopener\"> " -"donating </a> to help us build a more stable and secure platform." +"Consider <a href=\"https://github.com/pypa/warehouse\" target=\"_blank\" " +"rel=\"noopener\"> contributing </a> or <a " +"href=\"https://psfmember.org/civicrm/contribute/transact?reset=1&id=13\" " +"target=\"_blank\" rel=\"noopener\"> donating </a> to help us build a more" +" stable and secure platform." msgstr "" "请考虑向我们<a href=\"https://github.com/pypa/warehouse\" target=\"_blank\" " -"rel=\"noopener\">贡献</a>或<a href=\"https://psfmember.org/civicrm/" -"contribute/transact?reset=1&id=13\" target=\"_blank\" rel=\"noopener\"> 捐赠" -"</a>，帮助我们建立一个更稳定、更安全的平台。" +"rel=\"noopener\">贡献</a>或<a " +"href=\"https://psfmember.org/civicrm/contribute/transact?reset=1&id=13\" " +"target=\"_blank\" rel=\"noopener\"> 捐赠</a>，帮助我们建立一个更稳定、更安全的平台。" #: warehouse/templates/base.html:23 msgid "" -"Choose a strong password that contains letters (uppercase and lowercase), " -"numbers and special characters. Avoid common words or repetition." -msgstr "" -"输入一个含有字母（大写和小写都有的），数字和特殊符号的高强度密码。避免输入常" -"用词句和重复字符。" +"Choose a strong password that contains letters (uppercase and lowercase)," +" numbers and special characters. Avoid common words or repetition." +msgstr "输入一个含有字母（大写和小写都有的），数字和特殊符号的高强度密码。避免输入常用词句和重复字符。" #: warehouse/templates/base.html:26 msgid "Password strength:" @@ -464,10 +427,10 @@ msgstr "主导航" msgid "Help" msgstr "帮助" +# | msgid "Sponsors" #: warehouse/templates/base.html:40 warehouse/templates/base.html:54 #: warehouse/templates/includes/current-user-indicator.html:60 #, fuzzy -#| msgid "Sponsors" msgid "Sponsor" msgstr "赞助商" @@ -498,8 +461,8 @@ msgstr "主菜单" #: warehouse/templates/base.html:76 warehouse/templates/index.html:79 msgid "" -"The Python Package Index (PyPI) is a repository of software for the Python " -"programming language." +"The Python Package Index (PyPI) is a repository of software for the " +"Python programming language." msgstr "Python 包索引 （PyPI） 是 Python 编程语言的软件存储库。" #: warehouse/templates/base.html:92 @@ -537,18 +500,15 @@ msgstr "您正在使用不受支持的浏览器访问此站，请更新您的浏 #: warehouse/templates/base.html:167 msgid "" "You are using TestPyPI – a separate instance of the Python Package Index " -"that allows you to try distribution tools and processes without affecting " -"the real index." -msgstr "" -"您正在使用TestPyPI – Python包索引的单独实例，可让您尝试分发工具包并且不会影响" -"实际索引." +"that allows you to try distribution tools and processes without affecting" +" the real index." +msgstr "您正在使用TestPyPI – Python包索引的单独实例，可让您尝试分发工具包并且不会影响实际索引." #: warehouse/templates/base.html:177 msgid "" -"Some features may not work without JavaScript. Please try enabling it if you " -"encounter problems." -msgstr "" -"没有JavaScript一些功能可能无法使用。如果你遇到此问题，请尝试允许JavaScript。" +"Some features may not work without JavaScript. Please try enabling it if " +"you encounter problems." +msgstr "没有JavaScript一些功能可能无法使用。如果你遇到此问题，请尝试允许JavaScript。" #: warehouse/templates/base.html:210 warehouse/templates/base.html:231 #: warehouse/templates/error-base-with-search.html:20 @@ -670,7 +630,8 @@ msgstr "所有系统工作正常" #: warehouse/templates/base.html:311 msgid "" -"Developed and maintained by the Python community, for the Python community." +"Developed and maintained by the Python community, for the Python " +"community." msgstr "由Python社区针对Python社区开发和维护。" #: warehouse/templates/base.html:313 @@ -732,8 +693,8 @@ msgstr "%(num_users)s 个用户" #: warehouse/templates/index.html:81 msgid "" -"PyPI helps you find and install software developed and shared by the Python " -"community." +"PyPI helps you find and install software developed and shared by the " +"Python community." msgstr "PyPI 可帮助您查找和安装由 Python 社区开发和共享的软件。" #: warehouse/templates/index.html:82 @@ -771,17 +732,18 @@ msgstr "此 URL 是用于将文件上载到 PyPI 的 API 端点。" #: warehouse/templates/upload.html:26 #, python-format msgid "" -"For more information on uploading projects to PyPI, visit the <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python " -"Packaging User Guide</a>." +"For more information on uploading projects to PyPI, visit the <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" -"有关将项目上载到 PyPI 的详细信息，请访问 <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python 软件包打包指南</a>。" +"有关将项目上载到 PyPI 的详细信息，请访问 <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python 软件包打包指南</a>。" #: warehouse/templates/upload.html:28 #, python-format msgid "" -"Otherwise, we suggest you <a href=\"%(href)s\">go to the PyPI homepage</a>." +"Otherwise, we suggest you <a href=\"%(href)s\">go to the PyPI " +"homepage</a>." msgstr "否则，建议您 <a href=\"%(href)s\">进入PyPI 主页</a>。" #: warehouse/templates/accounts/login.html:17 @@ -930,9 +892,9 @@ msgstr "恢复代码" msgid "Login using Recovery Code" msgstr "使用恢复代码登录" +# | msgid "Error code" #: warehouse/templates/accounts/recovery-code.html:40 #, fuzzy -#| msgid "Error code" msgid "Enter recovery code" msgstr "错误代码" @@ -943,17 +905,15 @@ msgstr "验证" #: warehouse/templates/accounts/recovery-code.html:58 msgid "" -"PyPI allows for generating recovery codes to be stored securely offline in " -"the event that your device or application is lost. Enter one of these codes " -"in the form to verify your identity. Once used, the recovery code will no " -"longer be valid." -msgstr "" -"PyPI允许在设备或应用程序丢失时生成安全脱机存储的恢复代码。在表单中输入这些代" -"码之一以验证您的身份。一旦使用，恢复代码将不再有效。" +"PyPI allows for generating recovery codes to be stored securely offline " +"in the event that your device or application is lost. Enter one of these " +"codes in the form to verify your identity. Once used, the recovery code " +"will no longer be valid." +msgstr "PyPI允许在设备或应用程序丢失时生成安全脱机存储的恢复代码。在表单中输入这些代码之一以验证您的身份。一旦使用，恢复代码将不再有效。" +# | msgid "Lost your device? Not working? <a href=\"%(href)s\">Get help</a>." #: warehouse/templates/accounts/recovery-code.html:59 #, fuzzy, python-format -#| msgid "Lost your device? Not working? <a href=\"%(href)s\">Get help</a>." msgid "<p>Not working? <a href=\"%(href)s\">Get help</a>.</p>" msgstr "你的设备丢失了？还是罢工了？<a href=\"%(href)s\">在此寻求帮助</a>。" @@ -1015,11 +975,11 @@ msgstr "确认密码" #: warehouse/templates/accounts/register.html:157 msgid "" "This password appears in a security breach or has been compromised and " -"cannot be used. Please refer to the <a href=\"/help/#compromised-password" -"\">FAQ</a> for more information." +"cannot be used. Please refer to the <a href=\"/help/#compromised-" +"password\">FAQ</a> for more information." msgstr "" -"此密码出现在安全漏洞中或已被盗用，无法使用。请参阅<a href=\"/help/" -"#compromised-password\">常见问题解答</a>以获得更多信息。" +"此密码出现在安全漏洞中或已被盗用，无法使用。请参阅<a href=\"/help/#compromised-" +"password\">常见问题解答</a>以获得更多信息。" #: warehouse/templates/accounts/register.html:162 msgid "Create account" @@ -1053,8 +1013,8 @@ msgstr "我们已向您发送了一封电子邮件到您注册的电子邮件地 #: warehouse/templates/accounts/request-password-reset.html:52 #, python-format msgid "" -"The email contains a link to reset your password. This link will expire in " -"%(n_hours)s hours." +"The email contains a link to reset your password. This link will expire " +"in %(n_hours)s hours." msgstr "电子邮件包含重置密码的链接。此链接将在 %(n_hours)s 小时后过期。" #: warehouse/templates/accounts/reset-password.html:18 @@ -1098,11 +1058,12 @@ msgstr "使用设备进行身份验证" #: warehouse/templates/accounts/two-factor.html:55 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" rel=\"%(rel)s" -"\">Upgrade your browser</a> to log in with a security device (e.g. USB key)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" " +"rel=\"%(rel)s\">Upgrade your browser</a> to log in with a security device" +" (e.g. USB key)" msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" rel=\"%(rel)s" -"\">升级浏览器</a>以使用安全设备（例如 USB 密钥）登录" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"%(target)s\" " +"rel=\"%(rel)s\">升级浏览器</a>以使用安全设备（例如 USB 密钥）登录" #: warehouse/templates/accounts/two-factor.html:60 #, python-format @@ -1120,17 +1081,17 @@ msgstr "输入验证码" #: warehouse/templates/accounts/two-factor.html:105 #, python-format msgid "" -"<p>Generate a code using the authentication application connected to your " -"PyPI account. Enter this code in the form to verify your identity.</p> " -"<p>Lost your application? Not working? <a href=\"%(href)s\">Get help</a>.</p>" +"<p>Generate a code using the authentication application connected to your" +" PyPI account. Enter this code in the form to verify your identity.</p> " +"<p>Lost your application? Not working? <a href=\"%(href)s\">Get " +"help</a>.</p>" msgstr "" -"<p>使用连接到您的PyPI帐户的身份验证应用程序生成代码。 在表单中输入此代码以验" -"证您的身份。</p> 3<p>Appt丢失？无法工作？点击<a href=\"%(href)s\">获取帮助</" -"a>。</p>" +"<p>使用连接到您的PyPI帐户的身份验证应用程序生成代码。 在表单中输入此代码以验证您的身份。</p> 3<p>Appt丢失？无法工作？点击<a" +" href=\"%(href)s\">获取帮助</a>。</p>" +# | msgid "Set up your application" #: warehouse/templates/accounts/two-factor.html:117 #, fuzzy -#| msgid "Set up your application" msgid "Lost your security key or application?" msgstr "设置您的应用程序" @@ -1141,12 +1102,12 @@ msgstr "使用恢复代码登录" #: warehouse/templates/accounts/two-factor.html:122 #, python-format msgid "" -"<p><strong>You have not generated account recovery codes.</strong></p> <p>If " -"you lose access to your two factor methods, you may lose access to your " -"account. <a href=\"%(href)s\">Get help with recovery codes.</a></p>" +"<p><strong>You have not generated account recovery codes.</strong></p> " +"<p>If you lose access to your two factor methods, you may lose access to " +"your account. <a href=\"%(href)s\">Get help with recovery codes.</a></p>" msgstr "" -"<p><strong>您尚未生成帐户恢复代码。</strong></p><p>如果您无法访问双因素方法，" -"则可能无法访问您的帐户。<a href=\"%(href)s\">获取有关恢复代码的帮助。</a></p>" +"<p><strong>您尚未生成帐户恢复代码。</strong></p><p>如果您无法访问双因素方法，则可能无法访问您的帐户。<a " +"href=\"%(href)s\">获取有关恢复代码的帮助。</a></p>" #: warehouse/templates/email/account-deleted/body.html:18 #, python-format @@ -1160,11 +1121,12 @@ msgstr "您的 PyPI 帐户 <strong>%(username)s</strong> 已被删除。" #: warehouse/templates/email/two-factor-removed/body.html:20 #, python-format msgid "" -"If you did not make this change, you can email <a href=\"%(href)s\">" -"%(email_address)s</a> to communicate with the PyPI administrators." +"If you did not make this change, you can email <a " +"href=\"%(href)s\">%(email_address)s</a> to communicate with the PyPI " +"administrators." msgstr "" -"如果未进行此项更改，可以通过向 <a href=\"%(href)s\">%(email_address)s</a> 发" -"送电子邮件的方式与 PyPI 管理员进行沟通。" +"如果未进行此项更改，可以通过向 <a href=\"%(href)s\">%(email_address)s</a> 发送电子邮件的方式与 " +"PyPI 管理员进行沟通。" #: warehouse/templates/email/added-as-collaborator/body.html:19 #, python-format @@ -1172,8 +1134,8 @@ msgid "" "You have been added as <strong>%(role)s</strong> to the %(site)s project " "%(project)s by %(submitter)s." msgstr "" -"您已被 %(submitter)s 添加为 %(site)s 的项目 %(project)s 的 <strong>%(role)s</" -"strong> 角色。" +"您已被 %(submitter)s 添加为 %(site)s 的项目 %(project)s 的 " +"<strong>%(role)s</strong> 角色。" #: warehouse/templates/email/added-as-collaborator/body.html:24 #, python-format @@ -1185,10 +1147,9 @@ msgstr "您收到此邮件是因为您已被 %(submitter)s 添加到 %(site)s #: warehouse/templates/email/password-change/body.html:18 #, python-format msgid "" -"Someone, perhaps you, has changed the password for your PyPI account <strong>" -"%(username)s</strong>." -msgstr "" -"有人（可能是您）更改了您的 PyPI 帐户的密码<strong>%(username)s</strong>。" +"Someone, perhaps you, has changed the password for your PyPI account " +"<strong>%(username)s</strong>." +msgstr "有人（可能是您）更改了您的 PyPI 帐户的密码<strong>%(username)s</strong>。" #: warehouse/templates/email/password-compromised-hibp/body.html:18 #: warehouse/templates/email/password-compromised/body.html:18 @@ -1197,15 +1158,16 @@ msgstr "什么？" #: warehouse/templates/email/password-compromised/body.html:20 msgid "" -"PyPI administrators have determined that your password is compromised. To\n" -" protect you and other users, we have preemptively reset your password and " -"you\n" +"PyPI administrators have determined that your password is compromised. To" +"\n" +" protect you and other users, we have preemptively reset your password " +"and you\n" " will no longer be able to log in or upload to PyPI with your existing\n" " password." msgstr "" "PyPI 管理员已确定您的密码已泄露。为了\n" -" 保护您和其他用户，我们已抢先重置了您的密码，您 and other users, we have " -"preemptively reset your password and you\n" +" 保护您和其他用户，我们已抢先重置了您的密码，您 and other users, we have preemptively reset " +"your password and you\n" " 将不能使用现有密码登录或上传文件到 PyPI 了。" #: warehouse/templates/email/password-compromised/body.html:26 @@ -1225,11 +1187,9 @@ msgstr "我该怎么办？" #: warehouse/templates/email/password-compromised/body.html:33 #, python-format msgid "" -"To regain access to your account, <a href=\"%(href)s\">reset your password</" -"a> on PyPI." -msgstr "" -"要重新获得对您的帐户的访问权限，<a href=\"%(href)s\">请重置 PyPI 上的密码</" -"a>。" +"To regain access to your account, <a href=\"%(href)s\">reset your " +"password</a> on PyPI." +msgstr "要重新获得对您的帐户的访问权限，<a href=\"%(href)s\">请重置 PyPI 上的密码</a>。" #: warehouse/templates/email/password-compromised/body.html:39 msgid "How can I contact you?" @@ -1238,7 +1198,8 @@ msgstr "如何联系您？" #: warehouse/templates/email/password-compromised/body.html:41 #, python-format msgid "" -"For more information, you can email %(email_address)s to communicate with\n" +"For more information, you can email %(email_address)s to communicate with" +"\n" " the PyPI administrators." msgstr "" "有关详细信息，您可以向 %(email_address)s 发送电子邮件并\n" @@ -1250,8 +1211,8 @@ msgid "" "password appears\n" " in public data breaches. To protect you and other users, we have " "preemptively reset your\n" -" password and you will no longer be able to log in or upload to PyPI with " -"your existing\n" +" password and you will no longer be able to log in or upload to PyPI " +"with your existing\n" " password." msgstr "" "在您最近尝试登录或上传到 PyPI 期间，我们注意到您的密码出现 在\n" @@ -1265,21 +1226,19 @@ msgid "" "reduce the\n" " risk of <a href=\"%(href)s\">credential stuffing</a>\n" " attacks against PyPI and its users." -msgstr "" -"PyPI本身并未遭受破坏。 这是一种保护措施，可降低针对PyPI及其用户的<a href=" -"\"%(href)s\">凭据填充</a>攻击的风险。" +msgstr "PyPI本身并未遭受破坏。 这是一种保护措施，可降低针对PyPI及其用户的<a href=\"%(href)s\">凭据填充</a>攻击的风险。" #: warehouse/templates/email/password-compromised-hibp/body.html:34 #, python-format msgid "" -"To regain access to your account, <a href=\"%(reset_pw_url)s\">reset your " -"password</a> on PyPI. We also recommend that you go to <a href=" -"\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> and check your other " -"passwords and get yourself familiar with good password practices." +"To regain access to your account, <a href=\"%(reset_pw_url)s\">reset your" +" password</a> on PyPI. We also recommend that you go to <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> and check your " +"other passwords and get yourself familiar with good password practices." msgstr "" -"要重新访问您的帐户，请在 PyPI 上<a href=\"%(reset_pw_url)s\">重置您的密码</" -"a>。我们同时建议您到 <a href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</" -"a> 检查您的其他密码是否被泄露，并了解如何创建更安全的密码。" +"要重新访问您的帐户，请在 PyPI 上<a href=\"%(reset_pw_url)s\">重置您的密码</a>。我们同时建议您到 <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a> " +"检查您的其他密码是否被泄露，并了解如何创建更安全的密码。" #: warehouse/templates/email/password-compromised-hibp/body.html:40 msgid "How do you know this?" @@ -1288,27 +1247,26 @@ msgstr "你是怎么知道的？" #: warehouse/templates/email/password-compromised-hibp/body.html:42 #, python-format msgid "" -"We use a free security service from <a href=\"%(have_i_been_pwned_url)s" -"\">HaveIBeenPwned</a>. When registering, authenticating, or updating your " -"password, we generate a SHA1 hash of your password and use the first 5 " -"characters of the hash to decide if the password is compromised. The " -"plaintext password is never stored by PyPI or sent to HaveIBeenPwned." +"We use a free security service from <a " +"href=\"%(have_i_been_pwned_url)s\">HaveIBeenPwned</a>. When registering, " +"authenticating, or updating your password, we generate a SHA1 hash of " +"your password and use the first 5 characters of the hash to decide if the" +" password is compromised. The plaintext password is never stored by PyPI " +"or sent to HaveIBeenPwned." msgstr "" -"我们从<a href=\"%(have_i_been_pwned_url)s\"> HaveIBeenPwned </a>使用免费的安" -"全服务。 在注册，认证或更新密码时会生成密码的SHA1哈希，并使用哈希的前5个字符" -"来确定密码是否会受到威胁。 纯文本密码永远不会被PyPI存储或发送给" -"HaveIBeenPwned。" +"我们从<a href=\"%(have_i_been_pwned_url)s\"> HaveIBeenPwned </a>使用免费的安全服务。 " +"在注册，认证或更新密码时会生成密码的SHA1哈希，并使用哈希的前5个字符来确定密码是否会受到威胁。 " +"纯文本密码永远不会被PyPI存储或发送给HaveIBeenPwned。" #: warehouse/templates/email/password-compromised-hibp/body.html:47 #, python-format msgid "" -"For more information, see our <a href=\"%(faq_url)s\">FAQ</a>. For help, you " -"can email <a href=\"%(email_href)s\">%(email_address)s</a> to communicate " -"with the PyPI administrators." +"For more information, see our <a href=\"%(faq_url)s\">FAQ</a>. For help, " +"you can email <a href=\"%(email_href)s\">%(email_address)s</a> to " +"communicate with the PyPI administrators." msgstr "" -"更多信息，请参阅我们的 <a href=\"%(faq_url)s\">FAQ</a>。如需帮助，您可以向 " -"<a href=\"%(email_href)s\">%(email_address)s</a> 发送电子邮件并与 PyPI 管理员" -"沟通。" +"更多信息，请参阅我们的 <a href=\"%(faq_url)s\">FAQ</a>。如需帮助，您可以向 <a " +"href=\"%(email_href)s\">%(email_address)s</a> 发送电子邮件并与 PyPI 管理员沟通。" #: warehouse/templates/email/password-reset/body.html:18 #, python-format @@ -1322,8 +1280,7 @@ msgstr "有人（可能是您）为 PyPI 帐户 '%(username)s' 提出了密码 msgid "" "If you wish to proceed with this request, <a href=\"%(href)s\">click to " "reset your password</a>." -msgstr "" -"如果您希望继续执行此请求，请单击链接 <a href=\"%(href)s\">重置密码</a>。" +msgstr "如果您希望继续执行此请求，请单击链接 <a href=\"%(href)s\">重置密码</a>。" #: warehouse/templates/email/password-reset/body.html:22 #: warehouse/templates/email/verify-email/body.html:22 @@ -1340,54 +1297,50 @@ msgstr "如果您没有提出此请求，您可以安全地忽略此电子邮件 #: warehouse/templates/email/primary-email-change/body.html:18 #, python-format msgid "" -"The primary email for your PyPI account <strong>%(username)s</strong> has " -"been changed from <code>%(old_email)s</code> to <code>%(new_email)s</code>" +"The primary email for your PyPI account <strong>%(username)s</strong> has" +" been changed from <code>%(old_email)s</code> to " +"<code>%(new_email)s</code>" msgstr "" -"您的 PyPI 帐户（ <strong>%(username)s</strong>）的主电子邮件已经从 <code>" -"%(old_email)s</code> 更改为 <code>%(new_email)s</code>" +"您的 PyPI 帐户（ <strong>%(username)s</strong>）的主电子邮件已经从 " +"<code>%(old_email)s</code> 更改为 <code>%(new_email)s</code>" +# | msgid "" +# | "Someone, perhaps you, has changed the password for your PyPI account " +# | "<strong>%(username)s</strong>." #: warehouse/templates/email/two-factor-added/body.html:18 #, fuzzy, python-format -#| msgid "" -#| "Someone, perhaps you, has changed the password for your PyPI account " -#| "<strong>%(username)s</strong>." msgid "" "Someone, perhaps you, has added a %(method)s two-factor authentication " "method to your PyPI account <strong>%(username)s</strong>." -msgstr "" -"有人（可能是您）更改了您的 PyPI 帐户的密码<strong>%(username)s</strong>。" +msgstr "有人（可能是您）更改了您的 PyPI 帐户的密码<strong>%(username)s</strong>。" +# | msgid "" +# | "Someone, perhaps you, has changed the password for your PyPI account " +# | "<strong>%(username)s</strong>." #: warehouse/templates/email/two-factor-removed/body.html:18 #, fuzzy, python-format -#| msgid "" -#| "Someone, perhaps you, has changed the password for your PyPI account " -#| "<strong>%(username)s</strong>." msgid "" "Someone, perhaps you, has removed a %(method)s two-factor authentication " "method from your PyPI account <strong>%(username)s</strong>." -msgstr "" -"有人（可能是您）更改了您的 PyPI 帐户的密码<strong>%(username)s</strong>。" +msgstr "有人（可能是您）更改了您的 PyPI 帐户的密码<strong>%(username)s</strong>。" #: warehouse/templates/email/verify-email/body.html:18 #, python-format msgid "" -"Someone, perhaps you, has added this email address (<code>%(email_address)s</" -"code>) to their PyPI account." -msgstr "" -"有人（可能是您）已将此电子邮件地址(<code>%(email_address)s</code>) 添加到了" -"其 PyPI 账户。" +"Someone, perhaps you, has added this email address " +"(<code>%(email_address)s</code>) to their PyPI account." +msgstr "有人（可能是您）已将此电子邮件地址(<code>%(email_address)s</code>) 添加到了其 PyPI 账户。" +# | msgid "" +# | "If you wish to proceed with this request, <a href=\"%(href)s\">click this +# " +# | "link to verify your email address</a>" #: warehouse/templates/email/verify-email/body.html:20 #, fuzzy, python-format -#| msgid "" -#| "If you wish to proceed with this request, <a href=\"%(href)s\">click this " -#| "link to verify your email address</a>" msgid "" -"If you wish to proceed with this request, <a href=\"%(href)s\">click this " -"link to verify your email address</a>." -msgstr "" -"如果您希望继续处理请求，<a href=\"%(href)s\">请单击此链接以验证您的电子邮件地" -"址</a>" +"If you wish to proceed with this request, <a href=\"%(href)s\">click this" +" link to verify your email address</a>." +msgstr "如果您希望继续处理请求，<a href=\"%(href)s\">请单击此链接以验证您的电子邮件地址</a>" #: warehouse/templates/includes/current-user-indicator.html:29 msgid "Admin" @@ -1448,11 +1401,11 @@ msgstr "成功" #: warehouse/templates/includes/hash-modal.html:23 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Hashes</a> for %(filename)s" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Hashes</a> for %(filename)s" msgstr "" -"%(filename)s 的 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">哈希值</a>" +"%(filename)s 的 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\"" +" rel=\"noopener\">哈希值</a>" #: warehouse/templates/includes/hash-modal.html:28 #, python-format @@ -1518,8 +1471,8 @@ msgstr "验证您的电子邮件或添加新地址。" #: warehouse/templates/includes/session-notifications.html:37 #, python-format msgid "" -"Two factor authentication is available, <a href=\"%(href)s\">enable it now " -"for your account.</a>" +"Two factor authentication is available, <a href=\"%(href)s\">enable it " +"now for your account.</a>" msgstr "双因素身份验证已可用，<a href=\"%(href)s\">现在为您的帐户启用它。</a>" #: warehouse/templates/includes/accounts/profile-actions.html:16 @@ -1537,39 +1490,40 @@ msgstr "统计" #: warehouse/templates/includes/accounts/profile-actions.html:21 #, python-format msgid "" -"View statistics for your projects via <a href=\"%(libs_io_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or by " -"using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our public " -"dataset on Google BigQuery</a>" +"View statistics for your projects via <a href=\"%(libs_io_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, " +"or by using <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">our public dataset on Google BigQuery</a>" msgstr "" -"通过 <a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.io</a> 或者使用 <a href=\"%(gbq_href)s\" target=" -"\"_blank\" rel=\"noopener\">我们在Google BigQuery上的公开数据集</a> 查看项目" -"的统计信息" +"通过 <a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io</a> 或者使用 <a href=\"%(gbq_href)s\" " +"target=\"_blank\" rel=\"noopener\">我们在Google BigQuery上的公开数据集</a> " +"查看项目的统计信息" #: warehouse/templates/includes/accounts/profile-actions.html:30 #, python-format msgid "" -"View statistics for %(username)s's projects via <a href=\"%(libs_io_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or " -"by using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our " -"public dataset on Google BigQuery</a>" +"View statistics for %(username)s's projects via <a " +"href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io</a>, or by using <a href=\"%(gbq_href)s\" " +"target=\"_blank\" rel=\"noopener\">our public dataset on Google " +"BigQuery</a>" msgstr "" -"通过 <a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.io</a> 或者使用 <a href=\"%(gbq_href)s\" target=" -"\"_blank\" rel=\"noopener\">Google BigQuery</a> 查看 %(username)s 的项目的统" -"计信息" +"通过 <a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io</a> 或者使用 <a href=\"%(gbq_href)s\" " +"target=\"_blank\" rel=\"noopener\">Google BigQuery</a> 查看 %(username)s " +"的项目的统计信息" #: warehouse/templates/includes/accounts/profile-callout.html:18 #, python-format msgid "" "You have not uploaded any projects to PyPI, yet. To learn how to get " -"started, visit the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">Python Packaging User Guide</a>" +"started, visit the <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" -"您还没有将任何项目上传到 PyPI，要了解如何开始，请访问 <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python 打包指南" -"（Python Packaging User Guide）</a>" +"您还没有将任何项目上传到 PyPI，要了解如何开始，请访问 <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python 打包指南（Python Packaging User " +"Guide）</a>" #: warehouse/templates/includes/accounts/profile-callout.html:23 #, python-format @@ -1636,15 +1590,14 @@ msgstr "未解决的问题/ PR：" #: warehouse/templates/includes/packaging/project-data.html:66 #, python-format msgid "" -"View statistics for this project via <a href=\"%(libs_io_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, or by " -"using <a href=\"%(gbq_href)s\" target=\"_blank\" rel=\"noopener\">our public " -"dataset on Google BigQuery</a>" +"View statistics for this project via <a href=\"%(libs_io_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Libraries.io</a>, " +"or by using <a href=\"%(gbq_href)s\" target=\"_blank\" " +"rel=\"noopener\">our public dataset on Google BigQuery</a>" msgstr "" -"通过 <a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.io</a> 或者使用 <a href=\"%(gbq_href)s\" target=" -"\"_blank\" rel=\"noopener\">Google BigQuery上公开的数据集</a> 查看此项目的统" -"计信息" +"通过 <a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io</a> 或者使用 <a href=\"%(gbq_href)s\" " +"target=\"_blank\" rel=\"noopener\">Google BigQuery上公开的数据集</a> 查看此项目的统计信息" #: warehouse/templates/includes/packaging/project-data.html:74 msgid "Meta" @@ -1765,17 +1718,15 @@ msgstr "删除电子邮件" #: warehouse/templates/manage/account.html:138 msgid "" -"Add <abbr title=\"two factor authentication\">2FA</abbr> with authentication " -"application" -msgstr "" -"在身份验证应用程序中添加 <abbr title=\"two factor authentication\">2FA</abbr>" +"Add <abbr title=\"two factor authentication\">2FA</abbr> with " +"authentication application" +msgstr "在身份验证应用程序中添加 <abbr title=\"two factor authentication\">2FA</abbr>" #: warehouse/templates/manage/account.html:140 msgid "" "Add <abbr title=\"two factor authentication\">2FA</abbr> with security " "device (e.g. USB key)" -msgstr "" -"通过安全设备添加（例如USB密钥）的 <abbr title=\"两因素认证\">2FA</abbr>" +msgstr "通过安全设备添加（例如USB密钥）的 <abbr title=\"两因素认证\">2FA</abbr>" #: warehouse/templates/manage/account.html:142 msgid "Generate Recovery Codes" @@ -1784,20 +1735,20 @@ msgstr "生成恢复代码" #: warehouse/templates/manage/account.html:147 #: warehouse/templates/manage/account/webauthn-provision.html:37 msgid "" -"Enable JavaScript to set up two factor authentication with a security device " -"(e.g. USB key)" +"Enable JavaScript to set up two factor authentication with a security " +"device (e.g. USB key)" msgstr "通过安全设备（如USB密钥）允许JavaScript进行二个认证要素的设置" #: warehouse/templates/manage/account.html:152 #: warehouse/templates/manage/account/webauthn-provision.html:53 #, python-format msgid "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Upgrade your browser</a> to set up two factor authentication with a " -"security device (e.g. USB key)" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Upgrade your browser</a> to set up two factor " +"authentication with a security device (e.g. USB key)" msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">" -"升级浏览器</a> 以使用安全设备（例如USB密钥）设置两因素身份验证" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">升级浏览器</a> 以使用安全设备（例如USB密钥）设置两因素身份验证" #: warehouse/templates/manage/account.html:166 #: warehouse/templates/manage/account.html:528 @@ -1846,7 +1797,8 @@ msgstr "删除 API 令牌" #: warehouse/templates/manage/account.html:216 #: warehouse/templates/manage/token.html:59 msgid "" -"Applications or scripts using this token will no longer have access to PyPI." +"Applications or scripts using this token will no longer have access to " +"PyPI." msgstr "使用此token的应用程序或脚本将不再有权访问PyPI。" #: warehouse/templates/manage/account.html:227 @@ -1861,12 +1813,12 @@ msgstr "个人资料图片" #: warehouse/templates/manage/account.html:250 #, python-format msgid "" -"We use <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">gravatar.com</a> to generate your profile picture based on your " -"primary email address" +"We use <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">gravatar.com</a> to generate your profile picture based " +"on your primary email address" msgstr "" -"我们使用<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">gravatar.com</a>来根据您的主要电子邮件地址生成个人资料图片" +"我们使用<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">gravatar.com</a>来根据您的主要电子邮件地址生成个人资料图片" #: warehouse/templates/manage/account.html:257 msgid "Change image on gravatar.com" @@ -1883,7 +1835,8 @@ msgstr "加入日期" #: warehouse/templates/manage/account.html:279 #, python-format msgid "" -"Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be changed." +"Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be " +"changed." msgstr "显示在您的 <a href=\"%(href)s\">公开资料</a>。无法更改。" #: warehouse/templates/manage/account.html:290 @@ -1899,20 +1852,20 @@ msgstr "未设置名称" msgid "Displayed on your <a href=\"%(href)s\">public profile</a>" msgstr "显示在您的<a href=\"%(href)s\">公开资料</a>" +# | msgid "Public profile" #: warehouse/templates/manage/account.html:307 #, fuzzy -#| msgid "Public profile" msgid "️Public email" msgstr "公开个人资料" +# | msgid "" +# | "Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be " +# | "changed." #: warehouse/templates/manage/account.html:319 #, fuzzy, python-format -#| msgid "" -#| "Displayed on your <a href=\"%(href)s\">public profile</a>. Cannot be " -#| "changed." msgid "" -"One of your verified emails can be displayed on your <a href=\"%(href)s" -"\">public profile</a> to logged-in users." +"One of your verified emails can be displayed on your <a " +"href=\"%(href)s\">public profile</a> to logged-in users." msgstr "显示在您的 <a href=\"%(href)s\">公开资料</a>。无法更改。" #: warehouse/templates/manage/account.html:324 @@ -1925,15 +1878,15 @@ msgstr "帐户电子邮件" #: warehouse/templates/manage/account.html:334 msgid "" -"You can associate several emails with your account. You can use any <span " -"class=\"badge badge--success\"><i class=\"fa fa-check\" aria-hidden=\"true" -"\"></i> Verified</span> email to recover your account, but only your <span " -"class=\"badge\">Primary</span> email will receive notifications." +"You can associate several emails with your account. You can use any <span" +" class=\"badge badge--success\"><i class=\"fa fa-check\" aria-" +"hidden=\"true\"></i> Verified</span> email to recover your account, but " +"only your <span class=\"badge\">Primary</span> email will receive " +"notifications." msgstr "" -"您可以将您的帐户相关联关联到多个电子邮件地址。您可以使用任何 <span class=" -"\"badge badge--success\"><i class=\"fa fa-check\" aria-hidden=\"true\"></i> " -"已验证</span>的电子邮件来恢复您的帐户，但只有您的<span class=\"badge\">主电子" -"邮件</span>将收到通知。" +"您可以将您的帐户相关联关联到多个电子邮件地址。您可以使用任何 <span class=\"badge badge--success\"><i " +"class=\"fa fa-check\" aria-hidden=\"true\"></i> " +"已验证</span>的电子邮件来恢复您的帐户，但只有您的<span class=\"badge\">主电子邮件</span>将收到通知。" #: warehouse/templates/manage/account.html:345 msgid "Emails associated with your account" @@ -1979,8 +1932,8 @@ msgid "" "account. <a href=\"%(href)s\">Learn more about <abbr title=\"two factor " "authentication\">2FA</abbr></a>." msgstr "" -"双因素身份验证可以为您的帐户添加一层额外的安全保护。<a href=\"%(href)s\">进一" -"步了解 <abbr title=\"two factor authentication\">2FA</abbr></a>。" +"双因素身份验证可以为您的帐户添加一层额外的安全保护。<a href=\"%(href)s\">进一步了解 <abbr title=\"two " +"factor authentication\">2FA</abbr></a>。" #: warehouse/templates/manage/account.html:451 msgid "Two factor authentication methods enabled" @@ -1993,8 +1946,8 @@ msgstr "双因素身份验证" #: warehouse/templates/manage/account.html:460 #: warehouse/templates/manage/account.html:570 msgid "" -"Authentication application (<abbr title=\"time-based one-time password" -"\">TOTP</abbr>)" +"Authentication application (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>)" msgstr "申请认证(<abbr title=\"time-based one-time password\">TOTP2</abbr>)" #: warehouse/templates/manage/account.html:462 @@ -2051,10 +2004,9 @@ msgstr "您的帐户尚未启用双因素身份验证。" #: warehouse/templates/manage/account.html:512 #, python-format msgid "" -"<a href=\"%(href)s\">Verify your primary email address</a> to add two factor " -"authentication to your account." -msgstr "" -"<a href=\"%(href)s\">验证主要电子邮件地址</a>以向您的帐户添加两要素身份验证。" +"<a href=\"%(href)s\">Verify your primary email address</a> to add two " +"factor authentication to your account." +msgstr "<a href=\"%(href)s\">验证主要电子邮件地址</a>以向您的帐户添加两要素身份验证。" #: warehouse/templates/manage/account.html:519 #: warehouse/templates/manage/settings.html:23 @@ -2084,11 +2036,9 @@ msgstr "添加 API 令牌" #: warehouse/templates/manage/account.html:544 #, python-format msgid "" -"<a href=\"%(href)s\">Verify your primary email address</a> to add API tokens " -"to your account." -msgstr "" -"<a href=\"%(href)s\">验证主要电子邮件地址</a> ，以便将API令牌添加到您的帐户" -"中。" +"<a href=\"%(href)s\">Verify your primary email address</a> to add API " +"tokens to your account." +msgstr "<a href=\"%(href)s\">验证主要电子邮件地址</a> ，以便将API令牌添加到您的帐户中。" #: warehouse/templates/manage/account.html:559 msgid "Account created" @@ -2163,7 +2113,8 @@ msgstr "已添加双因素身份验证" #: warehouse/templates/manage/account.html:613 #: warehouse/templates/manage/account.html:623 msgid "" -"Method: Security device (<abbr title=\"web authentication\">WebAuthn</abbr>)" +"Method: Security device (<abbr title=\"web " +"authentication\">WebAuthn</abbr>)" msgstr "方式：安全设备（<abbr title=\"web authentication\">WebAuthn</abbr>）" #: warehouse/templates/manage/account.html:614 @@ -2176,9 +2127,7 @@ msgstr "设备名称：" msgid "" "Method: Authentication application (<abbr title=\"time-based one-time " "password\">TOTP</abbr>)" -msgstr "" -"方式：身份验证程序（<abbr title=\"time-based one-time password\">TOTP</" -"abbr>）" +msgstr "方式：身份验证程序（<abbr title=\"time-based one-time password\">TOTP</abbr>）" #: warehouse/templates/manage/account.html:620 msgid "Two factor authentication removed" @@ -2253,8 +2202,7 @@ msgid "IP address" msgstr "IP 地址" #: warehouse/templates/manage/account.html:687 -msgid "" -"Events will appear here as security-related actions occur on your account." +msgid "Events will appear here as security-related actions occur on your account." msgstr "当您的帐户发生与安全相关的操作时，事件将显示在此处。" #: warehouse/templates/manage/account.html:694 @@ -2285,13 +2233,13 @@ msgstr[0] "" #: warehouse/templates/manage/account.html:704 msgid "" "\n" -" You must transfer ownership or delete this project before you can " -"delete your account.\n" +" You must transfer ownership or delete this project before you " +"can delete your account.\n" " " msgid_plural "" "\n" -" You must transfer ownership or delete these projects before you " -"can delete your account.\n" +" You must transfer ownership or delete these projects before you" +" can delete your account.\n" " " msgstr[0] "" "\n" @@ -2301,11 +2249,9 @@ msgstr[0] "" #: warehouse/templates/manage/account.html:714 #, python-format msgid "" -"<a href=\"%(transfer_href)s\">transfer ownership</a> or <a href=" -"\"%(delete_href)s\">delete project</a>" -msgstr "" -"<a href=\"%(transfer_href)s\">转移</a>或者<a href=\"%(delete_href)s\">删除</" -"a>" +"<a href=\"%(transfer_href)s\">transfer ownership</a> or <a " +"href=\"%(delete_href)s\">delete project</a>" +msgstr "<a href=\"%(transfer_href)s\">转移</a>或者<a href=\"%(delete_href)s\">删除</a>" #: warehouse/templates/manage/account.html:723 #: warehouse/templates/manage/token.html:162 @@ -2332,12 +2278,12 @@ msgstr "销毁文档" #: warehouse/templates/manage/documentation.html:28 #, python-format msgid "" -"If you would like to DESTROY any existing documentation hosted at <a href=" -"\"%(url)s\">%(url)s</a> there is <strong>no</strong> undo, as uploading new " -"documentation is no longer supported." +"If you would like to DESTROY any existing documentation hosted at <a " +"href=\"%(url)s\">%(url)s</a> there is <strong>no</strong> undo, as " +"uploading new documentation is no longer supported." msgstr "" -"如果您需要销毁所有储存在 <a href=\"%(url)s\">%(url)s</a> 的文档，此操作将" -"<strong>不能</strong>撤销。上传新的文档已不再被支持。" +"如果您需要销毁所有储存在 <a href=\"%(url)s\">%(url)s</a> " +"的文档，此操作将<strong>不能</strong>撤销。上传新的文档已不再被支持。" #: warehouse/templates/manage/documentation.html:35 msgid "Destroy Documentation for project" @@ -2364,11 +2310,9 @@ msgstr "'%(project_name)s' 项目的历史记录" #: warehouse/templates/manage/history.html:25 msgid "" -"Each time you (or your collaborators) perform a security action related to " -"this project, the action is recorded and displayed here." -msgstr "" -"每次您（或您的协作者）执行与此项目相关的安全操作时，都会在此处记录和显示该操" -"作。" +"Each time you (or your collaborators) perform a security action related " +"to this project, the action is recorded and displayed here." +msgstr "每次您（或您的协作者）执行与此项目相关的安全操作时，都会在此处记录和显示该操作。" #: warehouse/templates/manage/history.html:29 msgid "Project created" @@ -2461,8 +2405,8 @@ msgstr "每次您或您的协作者更新此项目时，都会在此处记录和 #: warehouse/templates/manage/journal.html:28 #, python-format msgid "" -"This feature will be deprecated in the future, replaced by the <a href=" -"\"%(href)s\">security history page</a>." +"This feature will be deprecated in the future, replaced by the <a " +"href=\"%(href)s\">security history page</a>." msgstr "此功能将被弃用，并由<a href=\"%(href)s\">安全历史记录页</a>作为代替。" #: warehouse/templates/manage/journal.html:32 @@ -2589,11 +2533,11 @@ msgstr "视图" #, python-format msgid "" "You have not uploaded any projects to PyPI, yet. To learn how to get " -"started, visit the <a href=\"%(href)s\" target=\"_blank\" rel=\"noopener" -"\">Python Packaging User Guide</a>" +"started, visit the <a href=\"%(href)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" -"你还没有向PyPI上传任何的程序呢。去学习如何开始，前往<a href=\"%(href)s\" " -"target=\"_blank\" rel=\"noopener\">Python程序打包用户指南</a>" +"你还没有向PyPI上传任何的程序呢。去学习如何开始，前往<a href=\"%(href)s\" target=\"_blank\" " +"rel=\"noopener\">Python程序打包用户指南</a>" #: warehouse/templates/manage/release.html:18 #, python-format @@ -2697,11 +2641,11 @@ msgstr "消除" #: warehouse/templates/manage/release.html:119 #, python-format msgid "" -"Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" +"Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgstr "" -"前往 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python用户打包指南</a>去学习如何上传程序" +"前往 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python用户打包指南</a>去学习如何上传程序" #: warehouse/templates/manage/release.html:122 msgid "Release settings" @@ -2716,13 +2660,13 @@ msgstr "删除版本" #, python-format msgid "" "\n" -" Deleting will irreversibly delete this release along with %(count)s " -"file.\n" +" Deleting will irreversibly delete this release along with " +"%(count)s file.\n" " " msgid_plural "" "\n" -" Deleting will irreversibly delete this release along with %(count)s " -"files.\n" +" Deleting will irreversibly delete this release along with " +"%(count)s files.\n" " " msgstr[0] "" "\n" @@ -2737,14 +2681,13 @@ msgstr "删除此版本后将不可撤消。" #: warehouse/templates/manage/releases.html:91 #, python-format msgid "" -"You will not be able to re-upload a new distribution of the same type with " -"the same version number. Consider making a new release or a <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">post " -"release</a> instead." +"You will not be able to re-upload a new distribution of the same type " +"with the same version number. Consider making a new release or a <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">post release</a> instead." msgstr "" -"您将无法重新上载具有相同版本号的同一类型的新发行版。考虑制作一个新版本或<a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">发布" -"后</a>版本。" +"您将无法重新上载具有相同版本号的同一类型的新发行版。考虑制作一个新版本或<a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">发布后</a>版本。" #: warehouse/templates/manage/release.html:142 #: warehouse/templates/manage/releases.html:27 @@ -2822,12 +2765,12 @@ msgstr "未找到版本" #: warehouse/templates/manage/releases.html:109 #, python-format msgid "" -"Learn how to create a new release on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -"Guide</a>" +"Learn how to create a new release on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " +"User Guide</a>" msgstr "" -"在<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Python打包用户指南</a>上获取如何创建新的发布版本" +"在<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python打包用户指南</a>上获取如何创建新的发布版本" #: warehouse/templates/manage/roles.html:18 #, python-format @@ -2855,8 +2798,8 @@ msgstr "维护者" #: warehouse/templates/manage/roles.html:28 #: warehouse/templates/pages/help.html:510 msgid "" -"Can upload releases for a package. Cannot add collaborators. Cannot delete " -"files, releases, or the project." +"Can upload releases for a package. Cannot add collaborators. Cannot " +"delete files, releases, or the project." msgstr "可以上传软件包的发行版。无法添加协作者。无法删除文件，发行版或项目。" #: warehouse/templates/manage/roles.html:29 @@ -2925,8 +2868,7 @@ msgstr "为 %(project_name)s 项目创建一个令牌" msgid "" "<a href=\"%(href)s\">Verify your primary email address</a> to add an API " "token for %(project_name)s." -msgstr "" -"<a href=\"%(href)s\">验证您的主邮件地址</a>来为%(project_name)s添加API秘钥。" +msgstr "<a href=\"%(href)s\">验证您的主邮件地址</a>来为%(project_name)s添加API秘钥。" #: warehouse/templates/manage/settings.html:41 msgid "Project description and sidebar" @@ -2935,23 +2877,23 @@ msgstr "项目描述和侧边栏" #: warehouse/templates/manage/settings.html:43 #, python-format msgid "" -"To set the '%(project_name)s' description, author, links, classifiers, and " -"other details for your next release, use the <a href=\"%(setup_args_href)s\" " -"rel=\"noopener\" target=\"_blank\"><code>setup()</code> arguments in your " -"<code>setup.py</code> file</a>. Updating these fields will not change the " -"metadata for past releases. Additionally, you <strong>must</strong> use <a " -"href=\"%(twine_docs_href)s\" rel=\"noopener\" target=\"_blank\">Twine</a> to " -"upload your files in order to get full support for these fields. See <a href=" -"\"%(distribution_href)s\" rel=\"noopener\" target=\"_blank\">the Python " -"Packaging User Guide</a> for more help." -msgstr "" -"<a href=\"%(setup_args_href)s\" rel=\"noopener\" target=\"_blank\">在您的" -"<code>setup.py</code>文件中的<code>setup()</code>函数里</a>来为您的下一次版本" -"设置‘%(project_name)s’的描述、作者、链接、分类器和其他详细信息。更新这些数据" -"并不会更改以前的发布版本的元数据。另外，为了得到充分的支持，你<strong>必须</" -"strong>使用<a href=\"%(twine_docs_href)s\" rel=\"noopener\" target=\"_blank" -"\">Twine</a>来上传您的这些数据。在<a href=\"%(distribution_href)s\" rel=" -"\"noopener\" target=\"_blank\">Python打包用户指南</a>获取更多帮助。" +"To set the '%(project_name)s' description, author, links, classifiers, " +"and other details for your next release, use the <a " +"href=\"%(setup_args_href)s\" rel=\"noopener\" " +"target=\"_blank\"><code>setup()</code> arguments in your " +"<code>setup.py</code> file</a>. Updating these fields will not change the" +" metadata for past releases. Additionally, you <strong>must</strong> use " +"<a href=\"%(twine_docs_href)s\" rel=\"noopener\" " +"target=\"_blank\">Twine</a> to upload your files in order to get full " +"support for these fields. See <a href=\"%(distribution_href)s\" " +"rel=\"noopener\" target=\"_blank\">the Python Packaging User Guide</a> " +"for more help." +msgstr "" +"<a href=\"%(setup_args_href)s\" rel=\"noopener\" " +"target=\"_blank\">在您的<code>setup.py</code>文件中的<code>setup()</code>函数里</a>来为您的下一次版本设置‘%(project_name)s’的描述、作者、链接、分类器和其他详细信息。更新这些数据并不会更改以前的发布版本的元数据。另外，为了得到充分的支持，你<strong>必须</strong>使用<a" +" href=\"%(twine_docs_href)s\" rel=\"noopener\" " +"target=\"_blank\">Twine</a>来上传您的这些数据。在<a href=\"%(distribution_href)s\" " +"rel=\"noopener\" target=\"_blank\">Python打包用户指南</a>获取更多帮助。" #: warehouse/templates/manage/settings.html:54 #: warehouse/templates/manage/settings.html:85 @@ -2965,11 +2907,11 @@ msgstr "删除此项目将：" #: warehouse/templates/manage/settings.html:62 #, python-format msgid "" -"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s " -"release</a>" +"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s" +" release</a>" msgid_plural "" -"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s " -"releases</a>" +"Irreversibly delete the project along with <a href=\"%(href)s\">%(count)s" +" releases</a>" msgstr[0] "彻底删除此项目和其 <a href=\"%(href)s\">%(count)s 个释出版本</a>" #: warehouse/templates/manage/settings.html:68 @@ -2982,15 +2924,12 @@ msgstr "使该文件名称向<strong>其他任何PyPI</strong>用户公开" #: warehouse/templates/manage/settings.html:74 msgid "" -"This user will be able to make new releases under this project name, so long " -"as the distribution filenames do not match filenames from a previously " -"released distribution (all PyPI distribution filenames are unique, as they " -"are generated by combining the project name + version number + distribution " -"type)" -msgstr "" -"只要分发文件名与以前发布的分发文件名不匹配（所有PyPI分发文件名都是唯一的，因" -"为它们是通过组合项目名+版本号+分发类型生成的），此用户就可以在此项目名下创建" -"新版本" +"This user will be able to make new releases under this project name, so " +"long as the distribution filenames do not match filenames from a " +"previously released distribution (all PyPI distribution filenames are " +"unique, as they are generated by combining the project name + version " +"number + distribution type)" +msgstr "只要分发文件名与以前发布的分发文件名不匹配（所有PyPI分发文件名都是唯一的，因为它们是通过组合项目名+版本号+分发类型生成的），此用户就可以在此项目名下创建新版本" #: warehouse/templates/manage/settings.html:85 msgid "Project Name" @@ -3027,8 +2966,8 @@ msgstr "项目 \"%(project)s\"" #: warehouse/templates/manage/token.html:44 msgid "" -"For security reasons this token will only appear once. <strong>Copy it now.</" -"strong>" +"For security reasons this token will only appear once. <strong>Copy it " +"now.</strong>" msgstr "出于安全原因，该秘钥只会出现一次。<strong>现在就去复制它。</strong>" #: warehouse/templates/manage/token.html:46 @@ -3055,18 +2994,19 @@ msgstr "请将您的用户名设为 <code>%(token)s</code>" #: warehouse/templates/manage/token.html:71 #, python-format msgid "" -"Set your password to the token value, including the <code>%(prefix)s</code> " -"prefix" +"Set your password to the token value, including the " +"<code>%(prefix)s</code> prefix" msgstr "将密码设置为令牌值，包括<code>%(prefix)s</code>前缀" #: warehouse/templates/manage/token.html:77 #, python-format msgid "" -"For example, if you are using <a href=\"%(href)s\">Twine</a> to upload your " -"projects to PyPI, set up your <code>%(filename)s</code> file like this:" +"For example, if you are using <a href=\"%(href)s\">Twine</a> to upload " +"your projects to PyPI, set up your <code>%(filename)s</code> file like " +"this:" msgstr "" -"举个例子，如果你使用<a href=\"%(href)s\">Twine</a>来将您的程序上传至PyPI，像" -"这样来设置您的<code>%(filename)s</code>文件：" +"举个例子，如果你使用<a " +"href=\"%(href)s\">Twine</a>来将您的程序上传至PyPI，像这样来设置您的<code>%(filename)s</code>文件：" #: warehouse/templates/manage/token.html:87 #, python-format @@ -3075,13 +3015,13 @@ msgid "" "multiple projects to PyPI, you can set up your <code>%(filename)s</code> " "file like this:" msgstr "" -"举个例子，如果你使用<a href=\"%(href)s\">Twine</a>来将您的多个程序上传至" -"PyPI，像这样来设置您的<code>%(filename)s</code>文件：" +"举个例子，如果你使用<a " +"href=\"%(href)s\">Twine</a>来将您的多个程序上传至PyPI，像这样来设置您的<code>%(filename)s</code>文件：" #: warehouse/templates/manage/token.html:99 msgid "" -"either a user-scoped token or a project-scoped token you want to set as the " -"default" +"either a user-scoped token or a project-scoped token you want to set as " +"the default" msgstr "要设置为默认值的用户范围内的令牌或项目范围内的令牌" #: warehouse/templates/manage/token.html:104 @@ -3093,14 +3033,13 @@ msgstr "管理项目" msgid "" "You can then use <code>%(command)s</code> to switch to the correct token " "when uploading to PyPI." -msgstr "" -"然后，您可以使用<code>%(command)s</code>在上载到PyPI时切换到正确的令牌。" +msgstr "然后，您可以使用<code>%(command)s</code>在上载到PyPI时切换到正确的令牌。" #: warehouse/templates/manage/token.html:112 #, python-format msgid "" -"For further instructions on how to use this token, <a href=\"%(href)s" -"\">visit the PyPI help page</a>." +"For further instructions on how to use this token, <a " +"href=\"%(href)s\">visit the PyPI help page</a>." msgstr "否则，建议您 <a href=\"%(href)s\">进入PyPI 主页</a>。" #: warehouse/templates/manage/token.html:120 @@ -3129,8 +3068,8 @@ msgstr "项目：" #: warehouse/templates/manage/token.html:163 msgid "" -"An API token scoped to your entire account will have upload permissions for " -"all of your current and future projects." +"An API token scoped to your entire account will have upload permissions " +"for all of your current and future projects." msgstr "作用于整个帐户的API令牌将对您当前和将来的所有项目具有上传权限。" #: warehouse/templates/manage/token.html:166 @@ -3147,35 +3086,32 @@ msgstr "Account recovery code" #: warehouse/templates/manage/account/recovery_codes-provision.html:46 msgid "" -"If you lose access to your authentication application or security key(s), " -"you’ll need to use one of these recovery codes to log into your PyPI " +"If you lose access to your authentication application or security key(s)," +" you’ll need to use one of these recovery codes to log into your PyPI " "account. Each code can only be used <strong>once</strong>." -msgstr "" -"如果您失去对身份验证应用程序或安全密钥的访问，则需要使用这些恢复代码之一登录" -"到您的PyPI帐户。每个代码只能使用<strong>一次</strong>。" +msgstr "如果您失去对身份验证应用程序或安全密钥的访问，则需要使用这些恢复代码之一登录到您的PyPI帐户。每个代码只能使用<strong>一次</strong>。" #: warehouse/templates/manage/account/recovery_codes-provision.html:47 msgid "" -"These codes should <strong>only</strong> be used for account recovery, not " -"for typical logins." +"These codes should <strong>only</strong> be used for account recovery, " +"not for typical logins." msgstr "这些代码<strong>只能</strong>用于帐户恢复，而不能用于典型登录。" #: warehouse/templates/manage/account/recovery_codes-provision.html:48 msgid "" -"<strong>Keep these somewhere safe</strong>. If you lose your authentication " -"application or security key(s) and do not have access to these recovery " -"codes, you may permanently lose access to your PyPI account!" -msgstr "" -"<strong>把这些放在安全的地方</strong>。如果您丢失了身份验证应用程序或安全密" -"钥，并且无法访问这些恢复代码，则可能会永久性地失去对您的PyPI帐户的访问权限！" +"<strong>Keep these somewhere safe</strong>. If you lose your " +"authentication application or security key(s) and do not have access to " +"these recovery codes, you may permanently lose access to your PyPI " +"account!" +msgstr "<strong>把这些放在安全的地方</strong>。如果您丢失了身份验证应用程序或安全密钥，并且无法访问这些恢复代码，则可能会永久性地失去对您的PyPI帐户的访问权限！" #: warehouse/templates/manage/account/recovery_codes-provision.html:52 msgid "Save your Recovery Codes" msgstr "保存恢复代码" +# | msgid "Download files" #: warehouse/templates/manage/account/recovery_codes-provision.html:64 #, fuzzy -#| msgid "Download files" msgid "Download as file" msgstr "下载文件" @@ -3200,13 +3136,13 @@ msgstr "使用身份验证应用程序 （TOTP） 设置 2FA" #: warehouse/templates/manage/account/totp-provision.html:32 #, python-format msgid "" -"PyPI supports any application that follows the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based " -"one-time password\">TOTP</abbr> standard</a>." +"PyPI supports any application that follows the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title" +"=\"time-based one-time password\">TOTP</abbr> standard</a>." msgstr "" "PyPI支持任何符合<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\"><abbr title=\"time-based one-time password\">TOTP</abbr>标准" -"</a>的应用。" +"rel=\"noopener\"><abbr title=\"time-based one-time " +"password\">TOTP</abbr>标准</a>的应用。" #: warehouse/templates/manage/account/totp-provision.html:36 #, python-format @@ -3225,8 +3161,8 @@ msgstr "使用您选择的身份验证应用程序扫描 QR 代码。" #: warehouse/templates/manage/account/totp-provision.html:46 msgid "" -"For security reasons, you can only associate one authentication application " -"per PyPI account." +"For security reasons, you can only associate one authentication " +"application per PyPI account." msgstr "出于安全原因，每个PyPI帐户只能关联一个身份验证应用程序。" #: warehouse/templates/manage/account/totp-provision.html:52 @@ -3247,8 +3183,8 @@ msgstr "验证码" #: warehouse/templates/manage/account/totp-provision.html:73 msgid "" -"To finalize the set up process, enter the authentication code provided by " -"your application." +"To finalize the set up process, enter the authentication code provided by" +" your application." msgstr "要完成设置过程，请输入应用程序提供的身份验证代码。" #: warehouse/templates/manage/account/totp-provision.html:85 @@ -3262,8 +3198,8 @@ msgstr "添加2FA安全设备（如USB密钥）" #: warehouse/templates/manage/account/webauthn-provision.html:26 #, python-format msgid "" -"PyPI supports any device that adheres to the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." +"PyPI supports any device that adheres to the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." msgstr "" "PyPI支持任何遵循<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " "rel=\"noopener\">FIDO标准</a>的设备。" @@ -3271,17 +3207,17 @@ msgstr "" #: warehouse/templates/manage/account/webauthn-provision.html:28 #, python-format msgid "" -"Popular <em>USB keys</em> include <a href=\"%(yubico_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=" -"\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Google Titan</a> and <a href=\"%(thetis_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Thetis</a>." +"Popular <em>USB keys</em> include <a href=\"%(yubico_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> and <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." msgstr "" "流行的<em>USB秘钥</em>包括<a href=\"%(yubico_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Yubikey</a>、<a href=\"%(titan_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</a>和<a " -"href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Thetis</a>。" +"target=\"_blank\" rel=\"noopener\">Yubikey</a>、<a href=\"%(titan_href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google " +"Titan</a>和<a href=\"%(thetis_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Thetis</a>。" #: warehouse/templates/manage/account/webauthn-provision.html:43 msgid "Name your device to begin" @@ -3304,20 +3240,21 @@ msgstr "设置安全设备" #: warehouse/templates/manage/account/webauthn-provision.html:74 #, python-format msgid "" -"<strong>Not working?</strong> Check you're using a device that follows the " -"<a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">FIDO specification</a> and a <a href=\"%(mozilla_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">compatible browser</a>." +"<strong>Not working?</strong> Check you're using a device that follows " +"the <a href=\"%(fido_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">FIDO specification</a> and a <a " +"href=\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">compatible browser</a>." msgstr "" "<strong>不起作用？</strong>检查你是否使用的是符合<a href=\"%(fido_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO规范</a>并<a href=" -"\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">" -"兼容游览器</a>。" +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO规范</a>并<a " +"href=\"%(mozilla_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">兼容游览器</a>。" #: warehouse/templates/manage/account/webauthn-provision.html:78 msgid "" -"Note that some older USB keys do not adhere to the FIDO standard and will " -"not work with PyPI." +"Note that some older USB keys do not adhere to the FIDO standard and will" +" not work with PyPI." msgstr "请注意，一些旧的USB密钥不符合FIDO标准，不能与PyPI一起使用。" #: warehouse/templates/packaging/detail.html:94 @@ -3419,12 +3356,12 @@ msgstr "新版本" #, python-format msgid "" "Download the file for your platform. If you're not sure which to choose, " -"learn more about <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">installing packages</a>." +"learn more about <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">installing packages</a>." msgstr "" -"您还没有将任何项目上传到 PyPI，要了解如何开始，请访问 <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python 打包指南" -"（Python Packaging User Guide）</a>。" +"您还没有将任何项目上传到 PyPI，要了解如何开始，请访问 <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python 打包指南（Python Packaging User " +"Guide）</a>。" #: warehouse/templates/packaging/detail.html:273 #, python-format @@ -3443,34 +3380,32 @@ msgstr "查看哈希值" #: warehouse/templates/pages/classifiers.html:22 msgid "" -"Each project's maintainers provide PyPI with a list of \"trove classifiers\" " -"to categorize each release, describing who it's for, what systems it can run " -"on, and how mature it is." -msgstr "" -"每个项目的维护人员都向PyPI提供一个“trove分类器”列表，用于对每个版本进行分类，" -"描述版本的目的、可以运行的系统以及版本的成熟程度。" +"Each project's maintainers provide PyPI with a list of \"trove " +"classifiers\" to categorize each release, describing who it's for, what " +"systems it can run on, and how mature it is." +msgstr "每个项目的维护人员都向PyPI提供一个“trove分类器”列表，用于对每个版本进行分类，描述版本的目的、可以运行的系统以及版本的成熟程度。" #: warehouse/templates/pages/classifiers.html:23 msgid "" -"These standardized classifiers can then be used by community members to find " -"projects based on their desired criteria." +"These standardized classifiers can then be used by community members to " +"find projects based on their desired criteria." msgstr "然后，社区成员可以使用这些标准化的分类器根据他们所需的标准来查找项目。" #: warehouse/templates/pages/classifiers.html:25 #, python-format msgid "" -"Instructions for how to add trove classifiers to a project can be found on " -"the <a href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging User Guide</a>. To read the original " -"classifier specification, refer to <a href=\"%(pep301_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python " -"enhancement proposal\">PEP</abbr> 301</a>." +"Instructions for how to add trove classifiers to a project can be found " +"on the <a href=\"%(ppug_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>. To read the original " +"classifier specification, refer to <a href=\"%(pep301_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 301</a>." msgstr "" -"有关如何将trove分类器添加到项目的说明，请参见<a href=\"%(ppug_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python打包指南</a>。要阅读原" -"始分类器规范，请参阅<a href=\"%(pep301_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\"><abbr title=\"Python enhancement proposal\">PEP</" -"abbr> 301</a>。" +"有关如何将trove分类器添加到项目的说明，请参见<a href=\"%(ppug_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python打包指南</a>。要阅读原始分类器规范，请参阅<a " +"href=\"%(pep301_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><abbr title=\"Python enhancement proposal\">PEP</abbr> " +"301</a>。" #: warehouse/templates/pages/classifiers.html:31 msgid "List of classifiers" @@ -3484,42 +3419,42 @@ msgstr "注：" #: warehouse/templates/pages/help.html:20 #, python-format msgid "" -"All users submitting feedback, reporting issues or contributing to Warehouse " -"are expected to follow the <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">PyPA Code of Conduct</a>." +"All users submitting feedback, reporting issues or contributing to " +"Warehouse are expected to follow the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPA Code of " +"Conduct</a>." msgstr "" -"所有提交反馈、报告问题或对仓库作出贡献的用户都应遵守<a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPA行为准则</a>。" +"所有提交反馈、报告问题或对仓库作出贡献的用户都应遵守<a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">PyPA行为准则</a>。" #: warehouse/templates/pages/help.html:31 #, python-format msgid "" "If you lose your %(method)s and can no longer log in, you may " "<strong>permanently lose access to your account</strong>. You should " -"generate and securely store <a href=\"#recoverycodes\">recovery codes</a> to " -"regain access in that event.." +"generate and securely store <a href=\"#recoverycodes\">recovery codes</a>" +" to regain access in that event.." msgstr "" -"如果您丢失了您的%(method)s并且无法再登录，您可能会<strong>永久地失去对您的帐" -"户的访问</strong>。您应该生成并安全地存储<a href=\"#recoverycodes\">恢复代码" -"</a>，以便在这种情况下重新获得访问权限。。" +"如果您丢失了您的%(method)s并且无法再登录，您可能会<strong>永久地失去对您的帐户的访问</strong>。您应该生成并安全地存储<a" +" href=\"#recoverycodes\">恢复代码</a>，以便在这种情况下重新获得访问权限。。" #: warehouse/templates/pages/help.html:37 msgid "" -"We recommend that all PyPI users set up <em>at least two</em> supported two " -"factor authentication methods and provision <a href=\"#recoverycodes" -"\">recovery codes</a>." +"We recommend that all PyPI users set up <em>at least two</em> supported " +"two factor authentication methods and provision <a " +"href=\"#recoverycodes\">recovery codes</a>." msgstr "" "我们建议所有PyPI用户<em>至少设置两个</em>受支持的双因素身份验证方法和提供<a " "href=\"#recoverycodes\">恢复代码</a>。" #: warehouse/templates/pages/help.html:43 msgid "" -"If you've lost access to all two factor methods for your account and do not " -"have <a href=\"#recoverycodes\">recovery codes</a>, you can request help <a " -"href=\"#account-recovery\">with account recovery</a>." +"If you've lost access to all two factor methods for your account and do " +"not have <a href=\"#recoverycodes\">recovery codes</a>, you can request " +"help <a href=\"#account-recovery\">with account recovery</a>." msgstr "" -"如果您无法访问帐户的所有两个因素方法，并且没有<a href=\"#recoverycodes\">恢复" -"代码</a>，则可以请求<a href=\"#account-recovery\">有关帐户恢复</a>的帮助。" +"如果您无法访问帐户的所有两个因素方法，并且没有<a href=\"#recoverycodes\">恢复代码</a>，则可以请求<a href" +"=\"#account-recovery\">有关帐户恢复</a>的帮助。" #: warehouse/templates/pages/help.html:52 msgid "What's a package, project, or release?" @@ -3551,34 +3486,33 @@ msgstr "什么是双因素身份验证？它在PyPI上是如何工作的？" #: warehouse/templates/pages/help.html:60 msgid "" -"How does two factor authentication with an authentication application (<abbr " -"title=\"time-based one-time password\">TOTP</abbr>) work? How do I set it up " -"on PyPI?" +"How does two factor authentication with an authentication application " +"(<abbr title=\"time-based one-time password\">TOTP</abbr>) work? How do I" +" set it up on PyPI?" msgstr "" -"使用身份验证应用程序（<abbr title=\"time-based one-time password\">TOTP</" -"abbr>）的双因素身份验证如何工作？我如何在PyPI上设置它？" +"使用身份验证应用程序（<abbr title=\"time-based one-time " +"password\">TOTP</abbr>）的双因素身份验证如何工作？我如何在PyPI上设置它？" #: warehouse/templates/pages/help.html:61 msgid "" "How does two factor authentication with a security device (e.g. USB key) " "work? How do I set it up on PyPI?" -msgstr "" -"使用安全设备（如USB密钥）的双因素身份验证如何工作？我如何在PyPI上设置它？" +msgstr "使用安全设备（如USB密钥）的双因素身份验证如何工作？我如何在PyPI上设置它？" #: warehouse/templates/pages/help.html:62 msgid "What devices (other than a USB key) can I use as a security device?" msgstr "我可以将哪些设备（USB 密钥以外的设备）用作安全设备？" +# | msgid "" +# | "How does two factor authentication with a security device (e.g. USB key) +# " +# | "work? How do I set it up on PyPI?" #: warehouse/templates/pages/help.html:63 #, fuzzy -#| msgid "" -#| "How does two factor authentication with a security device (e.g. USB key) " -#| "work? How do I set it up on PyPI?" msgid "" -"How does two factor authentication with a recovery code work? How do I set " -"it up on PyPI?" -msgstr "" -"使用安全设备（如USB密钥）的双因素身份验证如何工作？我如何在PyPI上设置它？" +"How does two factor authentication with a recovery code work? How do I " +"set it up on PyPI?" +msgstr "使用安全设备（如USB密钥）的双因素身份验证如何工作？我如何在PyPI上设置它？" #: warehouse/templates/pages/help.html:64 msgid "How can I use API tokens to authenticate with PyPI?" @@ -3598,31 +3532,32 @@ msgstr "如何在项目的新版本发布时得到通知？" #: warehouse/templates/pages/help.html:69 msgid "" -"Where can I see statistics about PyPI, downloads, and project/package usage?" +"Where can I see statistics about PyPI, downloads, and project/package " +"usage?" msgstr "在哪里可以查看有关 PyPI、下载和项目/包使用情况的统计信息？" #: warehouse/templates/pages/help.html:71 msgid "I forgot my PyPI password. Can you help me?" msgstr "我忘记了我的 PyPI 密码。你可以帮我吗？" +# | msgid "I forgot my PyPI password. Can you help me?" #: warehouse/templates/pages/help.html:72 #, fuzzy -#| msgid "I forgot my PyPI password. Can you help me?" msgid "I've lost access to my PyPI account. Can you help me?" msgstr "我忘记了我的 PyPI 密码。你可以帮我吗？" #: warehouse/templates/pages/help.html:73 msgid "" -"Why am I getting a \"Invalid or non-existent authentication information.\" " -"error when uploading files?" +"Why am I getting a \"Invalid or non-existent authentication " +"information.\" error when uploading files?" msgstr "" -"为什么我会收到“Invalid or non-existent authentication information.”（无效或不" -"存在的身份验证信息）。上传文件时出错？" +"为什么我会收到“Invalid or non-existent authentication " +"information.”（无效或不存在的身份验证信息）。上传文件时出错？" #: warehouse/templates/pages/help.html:74 msgid "" -"Why am I getting \"No matching distribution found\" or \"Could not fetch URL" -"\" errors during <code>pip install</code>?" +"Why am I getting \"No matching distribution found\" or \"Could not fetch " +"URL\" errors during <code>pip install</code>?" msgstr "" "为什么我会在使用<code>pip install</code>时发现“No matching distribution " "found”（找不到匹配的分发）或“Could not fetch URL”（无法获取URL）错误？" @@ -3632,8 +3567,7 @@ msgid "I am having trouble using the PyPI website. Can you help me?" msgstr "我在使用 PyPI 网站时遇到问题。你可以帮我吗？" #: warehouse/templates/pages/help.html:76 -msgid "" -"Why can't I manually upload files to PyPI, through the browser interface?" +msgid "Why can't I manually upload files to PyPI, through the browser interface?" msgstr "为什么我不能通过浏览器界面手动将文件上载到 PyPI？" #: warehouse/templates/pages/help.html:77 @@ -3650,11 +3584,11 @@ msgstr "如何获得项目的文件大小限制豁免或增加？" #: warehouse/templates/pages/help.html:81 msgid "" -"Why am I getting a \"Filename or contents already exists\" or \"Filename has " -"been previously used\" error?" +"Why am I getting a \"Filename or contents already exists\" or \"Filename " +"has been previously used\" error?" msgstr "" -"为什么我得到一个“Filename or contents already exists”（文件名或内容已经存在）" -"或“Filename has been previously used”（文件名已被使用）错误？" +"为什么我得到一个“Filename or contents already exists”（文件名或内容已经存在）或“Filename has " +"been previously used”（文件名已被使用）错误？" #: warehouse/templates/pages/help.html:82 msgid "Why isn't my desired project name available?" @@ -3706,10 +3640,9 @@ msgstr "如何跟上 PyPI 的最新进展？" #: warehouse/templates/pages/help.html:95 msgid "" -"What does the \"beta feature\" badge mean? What are Warehouse's current beta " -"features?" -msgstr "" -"“beta feature”（beta特性）徽章是什么意思？Warehouse当前的beta特性是什么？" +"What does the \"beta feature\" badge mean? What are Warehouse's current " +"beta features?" +msgstr "“beta feature”（beta特性）徽章是什么意思？Warehouse当前的beta特性是什么？" #: warehouse/templates/pages/help.html:96 msgid "How do I pronounce \"PyPI\"?" @@ -3753,75 +3686,74 @@ msgstr "关于" msgid "" "\n" " <p>We use a number of terms to describe software available on " -"PyPI, like \"project\", \"release\", \"file\", and \"package\". Sometimes " -"those terms are confusing because they're used to describe different things " -"in other contexts. Here's how we use them on PyPI:</p>\n" -" <p>A \"project\" on PyPI is the name of a collection of releases " -"and files, and information about them. Projects on PyPI are made and shared " -"by other members of the Python community so that you can use them.</p>\n" -" <p>A \"release\" on PyPI is a specific version of a project. For " -"example, the <a href=\"%(requests_href)s\">requests</a> project has many " -"releases, like \"requests 2.10\" and \"requests 1.2.1\". A release consists " -"of one or more \"files\".</p>\n" -" <p>A \"file\", also known as a \"package\", on PyPI is something " -"that you can download and install. Because of different hardware, operating " -"systems, and file formats, a release may have several files (packages), like " -"an archive containing source code or a binary <a href=\"%(wheel_href)s" -"\">wheel</a>.</p>\n" +"PyPI, like \"project\", \"release\", \"file\", and \"package\". Sometimes" +" those terms are confusing because they're used to describe different " +"things in other contexts. Here's how we use them on PyPI:</p>\n" +" <p>A \"project\" on PyPI is the name of a collection of " +"releases and files, and information about them. Projects on PyPI are made" +" and shared by other members of the Python community so that you can use " +"them.</p>\n" +" <p>A \"release\" on PyPI is a specific version of a project. " +"For example, the <a href=\"%(requests_href)s\">requests</a> project has " +"many releases, like \"requests 2.10\" and \"requests 1.2.1\". A release " +"consists of one or more \"files\".</p>\n" +" <p>A \"file\", also known as a \"package\", on PyPI is " +"something that you can download and install. Because of different " +"hardware, operating systems, and file formats, a release may have several" +" files (packages), like an archive containing source code or a binary <a " +"href=\"%(wheel_href)s\">wheel</a>.</p>\n" " " msgstr "" "\n" -" <p>我们使用许多术语来描述PyPI上可用的软件，比如“project”（程" -"序）、“release”（发布）、“file”（文件）和“package”（包）。有时这些术语会让人" -"困惑，因为它们被用于在其他上下文中描述不同的事物。下面是我们如何在PyPI上使用" -"它们：</p>\n" -" <p>PyPI上的“项目”是发布和文件的集合的名称，以及有关它们的信息。PyPI" -"上的项目由Python社区的其他成员创建和共享，以便您可以使用它们。</p>\n" -" <p>PyPI上的“发行版”是项目的特定版本。例如，<a href=" -"\"%(requests_href)s\">requests</a>项目有许多版本，如“requests " -"2.10”和“requests 1.2.1”。发行版由一个或多个“文件”组成。</p>\n" -" <p>PyPI上的“文件”（也称为“包”）可以下载和安装。由于不同的硬件、操作" -"系统和文件格式，一个版本可能有多个文件（包），像包含源代码或一个二进制的<a " -"href=\"%(wheel_href)s\">wheel</a>文件。</p>\n" +" " +"<p>我们使用许多术语来描述PyPI上可用的软件，比如“project”（程序）、“release”（发布）、“file”（文件）和“package”（包）。有时这些术语会让人困惑，因为它们被用于在其他上下文中描述不同的事物。下面是我们如何在PyPI上使用它们：</p>" +"\n" +" " +"<p>PyPI上的“项目”是发布和文件的集合的名称，以及有关它们的信息。PyPI上的项目由Python社区的其他成员创建和共享，以便您可以使用它们。</p>" +"\n" +" <p>PyPI上的“发行版”是项目的特定版本。例如，<a " +"href=\"%(requests_href)s\">requests</a>项目有许多版本，如“requests 2.10”和“requests" +" 1.2.1”。发行版由一个或多个“文件”组成。</p>\n" +" " +"<p>PyPI上的“文件”（也称为“包”）可以下载和安装。由于不同的硬件、操作系统和文件格式，一个版本可能有多个文件（包），像包含源代码或一个二进制的<a" +" href=\"%(wheel_href)s\">wheel</a>文件。</p>\n" " " #: warehouse/templates/pages/help.html:194 #, python-format msgid "" -"To learn how to install a file from PyPI, visit the <a href=" -"\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">installation tutorial</a> on the <a href=\"%(user_guide_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging " -"User Guide</a>." +"To learn how to install a file from PyPI, visit the <a " +"href=\"%(installation_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">installation tutorial</a> on the <a " +"href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" -"在<a href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python打包指南</a>中的<a href=\"%(installation_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">安装教程</a>学习如何从PyPI安" -"装一个文件。" +"在<a href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python打包指南</a>中的<a href=\"%(installation_href)s\" " +"title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">安装教程</a>学习如何从PyPI安装一个文件。" #: warehouse/templates/pages/help.html:201 #, python-format msgid "" -"For full instructions on configuring, packaging and distributing your Python " -"project, refer to the <a href=\"%(packaging_tutorial_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">packaging tutorial</a> on " -"the <a href=\"%(user_guide_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Python Packaging User Guide</a>." +"For full instructions on configuring, packaging and distributing your " +"Python project, refer to the <a href=\"%(packaging_tutorial_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">packaging " +"tutorial</a> on the <a href=\"%(user_guide_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>." msgstr "" -"有关配置、打包和分发Python项目的完整说明，请参阅<a href=\"%(user_guide_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python打包指南</a>" -"中的<a href=\"%(packaging_tutorial_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">打包教程</a>。" +"有关配置、打包和分发Python项目的完整说明，请参阅<a href=\"%(user_guide_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python打包指南</a>中的<a" +" href=\"%(packaging_tutorial_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">打包教程</a>。" #: warehouse/templates/pages/help.html:208 #, python-format msgid "" -"Classifiers are used to categorize projects on PyPI. See <a href=\"%(href)s" -"\">the classifiers page</a> for more information, as well as a list of valid " -"classifiers." -msgstr "" -"分类器用于对PyPI上的项目进行分类。有关更多信息，请参见<a href=\"%(href)s\">分" -"类器页面</a>，以及有效分类器的列表。" +"Classifiers are used to categorize projects on PyPI. See <a " +"href=\"%(href)s\">the classifiers page</a> for more information, as well " +"as a list of valid classifiers." +msgstr "分类器用于对PyPI上的项目进行分类。有关更多信息，请参见<a href=\"%(href)s\">分类器页面</a>，以及有效分类器的列表。" #: warehouse/templates/pages/help.html:215 msgid "My account" @@ -3829,8 +3761,8 @@ msgstr "我的帐户" #: warehouse/templates/pages/help.html:218 msgid "" -"Currently, PyPI requires a verified email address to perform the following " -"operations:" +"Currently, PyPI requires a verified email address to perform the " +"following operations:" msgstr "目前，PyPI 需要经过验证的电子邮件地址才能执行以下操作：" #: warehouse/templates/pages/help.html:220 @@ -3843,141 +3775,142 @@ msgstr "上传新版本或文件。" #: warehouse/templates/pages/help.html:223 msgid "" -"The list of activities that require a verified email address is likely to " -"grow over time." +"The list of activities that require a verified email address is likely to" +" grow over time." msgstr "需要经过验证的电子邮件地址的活动列表可能会随着时间的推移而增长。" #: warehouse/templates/pages/help.html:224 #, python-format msgid "" -"This policy will allow us to enforce a key policy of <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"Python " -"enhancement proposal\">PEP</abbr> 541</a> regarding maintainer reachability. " -"It also reduces the viability of spam attacks to create many accounts in an " -"automated fashion." +"This policy will allow us to enforce a key policy of <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 541</a> regarding " +"maintainer reachability. It also reduces the viability of spam attacks to" +" create many accounts in an automated fashion." msgstr "" -"此策略将允许我们执行 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\"><abbr title=\"Python enhancement proposal\">PEP</abbr> " -"541</a>中有关维护者可达性的关键策略。它还降低了垃圾邮件攻击以自动方式创建多个" -"帐户的可行性。" +"此策略将允许我们执行 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><abbr title=\"Python enhancement proposal\">PEP</abbr> " +"541</a>中有关维护者可达性的关键策略。它还降低了垃圾邮件攻击以自动方式创建多个帐户的可行性。" #: warehouse/templates/pages/help.html:225 #, python-format msgid "" -"You can manage your account's email addresses in your <a href=\"%(href)s" -"\">account settings</a>. This also allows for sending a new confirmation " -"email for users who signed up in the past, before we began enforcing this " -"policy." +"You can manage your account's email addresses in your <a " +"href=\"%(href)s\">account settings</a>. This also allows for sending a " +"new confirmation email for users who signed up in the past, before we " +"began enforcing this policy." msgstr "" -"您可以在<a href=\"%(href)s\">帐户设置</a>中管理帐户的电子邮件地址。这还允许在" -"我们开始执行此策略之前，为以前注册的用户发送新的确认电子邮件。" +"您可以在<a " +"href=\"%(href)s\">帐户设置</a>中管理帐户的电子邮件地址。这还允许在我们开始执行此策略之前，为以前注册的用户发送新的确认电子邮件。" #: warehouse/templates/pages/help.html:228 #, python-format msgid "" -"<p> PyPI itself has not suffered a breach. This is a protective measure to " -"reduce the risk of <a href=\"%(credential_stuffing_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">credential stuffing</a> attacks " -"against PyPI and its users. </p> <p> Each time a user supplies a password — " -"while registering, authenticating, or updating their password — PyPI " -"securely checks whether that password has appeared in public data breaches. " -"</p> <p> During each of these processes, PyPI generates a SHA-1 hash of the " -"supplied password and uses the first five (5) characters of the hash to " -"check the <a href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Have I Been Pwned API</a> and determine if the " -"password has been previously compromised. The plaintext password is never " -"stored by PyPI or submitted to the Have I Been Pwned API. </p> <p> PyPI will " -"not allow such passwords to be used when setting a password at registration " -"or updating your password. </p> <p> If you receive an error message saying " -"that \"This password appears in a breach or has been compromised and cannot " -"be used\", you should change it all other places that you use it as soon as " -"possible. </p> <p> If you have received this error while attempting to log " -"in or upload to PyPI, then your password has been reset and you cannot log " -"in to PyPI until you <a href=\"%(reset_pwd_href)s\">reset your password</a>. " -"</p>" +"<p> PyPI itself has not suffered a breach. This is a protective measure " +"to reduce the risk of <a href=\"%(credential_stuffing_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">credential " +"stuffing</a> attacks against PyPI and its users. </p> <p> Each time a " +"user supplies a password — while registering, authenticating, or updating" +" their password — PyPI securely checks whether that password has appeared" +" in public data breaches. </p> <p> During each of these processes, PyPI " +"generates a SHA-1 hash of the supplied password and uses the first five " +"(5) characters of the hash to check the <a " +"href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Have I Been Pwned API</a> and determine if the password " +"has been previously compromised. The plaintext password is never stored " +"by PyPI or submitted to the Have I Been Pwned API. </p> <p> PyPI will not" +" allow such passwords to be used when setting a password at registration " +"or updating your password. </p> <p> If you receive an error message " +"saying that \"This password appears in a breach or has been compromised " +"and cannot be used\", you should change it all other places that you use " +"it as soon as possible. </p> <p> If you have received this error while " +"attempting to log in or upload to PyPI, then your password has been reset" +" and you cannot log in to PyPI until you <a " +"href=\"%(reset_pwd_href)s\">reset your password</a>. </p>" msgstr "" "<p>PyPI本身并没有受到破坏。这是一种保护措施，可以降低针对PyPI及其用户的<a " -"href=\"%(credential_stuffing_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">凭证填充</a>攻击的风险。 </p> <p> 每次用户提供密码时（在注" -"册、验证或更新密码时），PyPI都会安全地检查该密码是否出现在公开数据泄露中。</" -"p> <p> 在每个过程中，PyPI都会生成所提供密码的SHA-1散列，并使用散列的前五（5）" -"个字符来检查<a href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Have I Been Pwned API</a>，并确定密码以前是否已被" -"泄露。明文密码从不由PyPI存储或提交给Have I Been Pwned API。</p> <p> 在注册时" -"设置密码或更新密码时，PyPI将不允许使用此类密码。 </p> <p> 如果您收到一条错误" -"消息，说“This password appears in a breach or has been compromised and " -"cannot be used”（此密码出现了漏洞或已被泄露，无法使用），您应尽快将其更改到您" -"使用的所有其他位置。</p> <p> 如果您在尝试登录或上载到PyPI时收到此错误，则您的" -"密码已重置，在<a href=\"%(reset_pwd_href)s\">重置密码</a>之前无法登录到PyPI。" -"</p>" +"href=\"%(credential_stuffing_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">凭证填充</a>攻击的风险。 </p> <p> " +"每次用户提供密码时（在注册、验证或更新密码时），PyPI都会安全地检查该密码是否出现在公开数据泄露中。</p> <p> " +"在每个过程中，PyPI都会生成所提供密码的SHA-1散列，并使用散列的前五（5）个字符来检查<a " +"href=\"%(haveibeenpwned_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Have I Been Pwned " +"API</a>，并确定密码以前是否已被泄露。明文密码从不由PyPI存储或提交给Have I Been Pwned API。</p> <p> " +"在注册时设置密码或更新密码时，PyPI将不允许使用此类密码。 </p> <p> 如果您收到一条错误消息，说“This password " +"appears in a breach or has been compromised and cannot be " +"used”（此密码出现了漏洞或已被泄露，无法使用），您应尽快将其更改到您使用的所有其他位置。</p> <p> " +"如果您在尝试登录或上载到PyPI时收到此错误，则您的密码已重置，在<a " +"href=\"%(reset_pwd_href)s\">重置密码</a>之前无法登录到PyPI。</p>" #: warehouse/templates/pages/help.html:263 #, python-format msgid "" "<p> Two factor authentication (2FA) makes your account more secure by " "requiring two things in order to log in: <em>something you know</em> and " -"<em>something you own</em>. </p> <p> In PyPI's case, \"something you know\" " -"is your username and password, while \"something you own\" can be <a href=" -"\"#totp\">an application to generate a temporary code</a>, or a <a href=" -"\"#utfkey\">security device</a> (most commonly a USB key). </p> <p> It is " -"strongly recommended that you set up two factor authentication on your PyPI " -"account. </p> <p> Users who have chosen to set up two factor authentication " -"will be asked to provide their second method of identity verification during " -"the log in process. This only affects logging in via a web browser, and not " -"(yet) package uploads. </p> <p>You can follow the improvements to <abbr " -"title=\"two factor authentication\">2FA</abbr> on <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">discuss.python.org</a>.</p>" -msgstr "" -"<p> 双因素身份验证（2FA）使您的帐户更安全，因为登录需要两件事：<em>您知道的事" -"</em>和<em>您拥有的事</em>。</p> <p> 在PyPI的例子中，“你知道的东西”是你的用户" -"名和密码，而“你拥有的东西”可以是<a href=\"#totp\">生成临时代码的应用程序</" -"a>，或者是一个<a href=\"#utfkey\">安全设备</a>（最常见的是一个USB密钥）。</" -"p> <p>强烈建议您在PyPI帐户上设置双因素身份验证。</p> <p>选择设置双因素身份验" -"证的用户将在登录过程中被要求提供其第二种身份验证方法。这只会影响通过web浏览器" -"登录，而不会（现在）包上载。</p> <p>您可以在<a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">discus.python.org</a>上跟踪" -"<abbr title=\"two factor authentication\">2FA</abbr>的改进。</p>" +"<em>something you own</em>. </p> <p> In PyPI's case, \"something you " +"know\" is your username and password, while \"something you own\" can be " +"<a href=\"#totp\">an application to generate a temporary code</a>, or a " +"<a href=\"#utfkey\">security device</a> (most commonly a USB key). </p> " +"<p> It is strongly recommended that you set up two factor authentication " +"on your PyPI account. </p> <p> Users who have chosen to set up two factor" +" authentication will be asked to provide their second method of identity " +"verification during the log in process. This only affects logging in via " +"a web browser, and not (yet) package uploads. </p> <p>You can follow the " +"improvements to <abbr title=\"two factor authentication\">2FA</abbr> on " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">discuss.python.org</a>.</p>" +msgstr "" +"<p> 双因素身份验证（2FA）使您的帐户更安全，因为登录需要两件事：<em>您知道的事</em>和<em>您拥有的事</em>。</p> <p>" +" 在PyPI的例子中，“你知道的东西”是你的用户名和密码，而“你拥有的东西”可以是<a " +"href=\"#totp\">生成临时代码的应用程序</a>，或者是一个<a " +"href=\"#utfkey\">安全设备</a>（最常见的是一个USB密钥）。</p> " +"<p>强烈建议您在PyPI帐户上设置双因素身份验证。</p> " +"<p>选择设置双因素身份验证的用户将在登录过程中被要求提供其第二种身份验证方法。这只会影响通过web浏览器登录，而不会（现在）包上载。</p> " +"<p>您可以在<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">discus.python.org</a>上跟踪<abbr title=\"two factor " +"authentication\">2FA</abbr>的改进。</p>" #: warehouse/templates/pages/help.html:290 #, python-format msgid "" "PyPI users can set up two-factor authentication using any authentication " "application that supports the <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based one-time password" -"\">TOTP</abbr> standard</a>." +"target=\"_blank\" rel=\"noopener\"><abbr title=\"time-based one-time " +"password\">TOTP</abbr> standard</a>." msgstr "" -"PyPI用户可以使用支持<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\"><abbr title=\"time-based one-time password\">TOTP</abbr>" -"标准</a>的任何身份验证应用程序设置双因素身份验证。" +"PyPI用户可以使用支持<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><abbr title=\"time-based one-time " +"password\">TOTP</abbr>标准</a>的任何身份验证应用程序设置双因素身份验证。" #: warehouse/templates/pages/help.html:291 msgid "" "<abbr title=\"time-based one-time password\">TOTP</abbr> authentication " -"applications generate a regularly changing authentication code to use when " -"logging into your account." +"applications generate a regularly changing authentication code to use " +"when logging into your account." msgstr "" -"<abbr title=\"time-based one-time password\">TOTP</abbr>身份验证应用程序生成" -"定期更改的身份验证代码，以便在登录到您的帐户时使用。" +"<abbr title=\"time-based one-time " +"password\">TOTP</abbr>身份验证应用程序生成定期更改的身份验证代码，以便在登录到您的帐户时使用。" #: warehouse/templates/pages/help.html:292 msgid "" -"Because <abbr title=\"time-based one-time password\">TOTP</abbr> is an open " -"standard, there are many applications that are compatible with your PyPI " -"account. Popular applications include:" +"Because <abbr title=\"time-based one-time password\">TOTP</abbr> is an " +"open standard, there are many applications that are compatible with your " +"PyPI account. Popular applications include:" msgstr "" -"因为<abbr title=\"time-based one-time password\">TOTP</abbr>是一个开放的标" -"准，所以有许多应用程序与您的PyPI帐户兼容。流行的应用程序包括：" +"因为<abbr title=\"time-based one-time " +"password\">TOTP</abbr>是一个开放的标准，所以有许多应用程序与您的PyPI帐户兼容。流行的应用程序包括：" #: warehouse/templates/pages/help.html:295 #, python-format msgid "" -"Google Authenticator for <a href=\"%(android_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Google Authenticator for <a href=\"%(android_href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">Android</a> or <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" msgstr "" -"用于<a href=\"%(android_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Android</a>或<a href=\"%(ios_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">iOS</a>的Google身份验证程序" +"用于<a href=\"%(android_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Android</a>或<a href=\"%(ios_href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">iOS</a>的Google身份验证程序" #: warehouse/templates/pages/help.html:298 #: warehouse/templates/pages/help.html:300 @@ -3989,13 +3922,14 @@ msgstr "（专有）" #: warehouse/templates/pages/help.html:302 #, python-format msgid "" -"Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" +"Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Android</a> or <a " +"href=\"%(ios_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">iOS</a>" msgstr "" -"适用于<a href=\"%(android_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Android</a>或<a href=\"%(ios_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">iOS</a>的Duo Mobile" +"适用于<a href=\"%(android_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Android</a>或<a href=\"%(ios_href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">iOS</a>的Duo Mobile" #: warehouse/templates/pages/help.html:308 #: warehouse/templates/pages/help.html:309 @@ -4005,68 +3939,60 @@ msgstr "（开源）" #: warehouse/templates/pages/help.html:313 #, python-format msgid "" -"Some password managers (e.g. <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">1Password</a>) can also generate authentication " -"codes. For security reasons, PyPI only allows you to set up one application " -"per account." +"Some password managers (e.g. <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">1Password</a>) can also generate " +"authentication codes. For security reasons, PyPI only allows you to set " +"up one application per account." msgstr "" -"一些密码管理器（例如<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">1Password</a>）也可以生成身份验证码。出于安全原因，PyPI只" -"允许您为每个帐户设置一个应用程序。" +"一些密码管理器（例如<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">1Password</a>）也可以生成身份验证码。出于安全原因，PyPI只允许您为每个帐户设置一个应用程序。" #: warehouse/templates/pages/help.html:321 msgid "" "To set up <abbr title=\"two factor authentication\">2FA</abbr> with an " "authentication application:" -msgstr "" -"要使用身份验证应用程序设置<abbr title=\"two factor authentication\">2FA</" -"abbr>，请执行以下操作：" +msgstr "要使用身份验证应用程序设置<abbr title=\"two factor authentication\">2FA</abbr>，请执行以下操作：" #: warehouse/templates/pages/help.html:323 msgid "" -"Open an authentication (<abbr title=\"time-based one-time password\">TOTP</" -"abbr>) application" -msgstr "" -"打开身份验证（<abbr title=\"time-based one-time password\">TOTP</abbr>）应用" -"程序" +"Open an authentication (<abbr title=\"time-based one-time " +"password\">TOTP</abbr>) application" +msgstr "打开身份验证（<abbr title=\"time-based one-time password\">TOTP</abbr>）应用程序" #: warehouse/templates/pages/help.html:324 msgid "" -"Log in to your PyPI account, go to your account settings, and choose \"Add " -"<abbr title=\"two factor authentication\">2FA</abbr> with authentication " -"application\"" +"Log in to your PyPI account, go to your account settings, and choose " +"\"Add <abbr title=\"two factor authentication\">2FA</abbr> with " +"authentication application\"" msgstr "" -"登录到您的PyPI帐户，转到您的帐户设置，然后选择“使用身份验证应用程序添加<abbr " -"title=\"two factor authentication\">2FA</abbr>”" +"登录到您的PyPI帐户，转到您的帐户设置，然后选择“使用身份验证应用程序添加<abbr title=\"two factor " +"authentication\">2FA</abbr>”" #: warehouse/templates/pages/help.html:325 msgid "" -"PyPI will generate a secret key, specific to your account. This is displayed " -"as a QR code, and as a text code." +"PyPI will generate a secret key, specific to your account. This is " +"displayed as a QR code, and as a text code." msgstr "PyPI 将生成特定于您的帐户的密钥。这显示为二维码和文本代码。" #: warehouse/templates/pages/help.html:326 msgid "" "Scan the QR code with your authentication application, or type it in " -"manually. The method of input will depend on the application you have chosen." -msgstr "" -"使用您的认证应用程序扫描二维码，或手动输入。输入方法将取决于您选择的应用程" -"序。" +"manually. The method of input will depend on the application you have " +"chosen." +msgstr "使用您的认证应用程序扫描二维码，或手动输入。输入方法将取决于您选择的应用程序。" #: warehouse/templates/pages/help.html:327 msgid "" -"Your application will generate an authentication code - use this to verify " -"your set up on PyPI" +"Your application will generate an authentication code - use this to " +"verify your set up on PyPI" msgstr "您的应用程序将生成一个身份验证代码——使用此代码验证您在PyPI上的设置" #: warehouse/templates/pages/help.html:330 msgid "" "The PyPI server and your application now share your PyPI secret key, " -"allowing your application to generate valid authentication codes for your " -"PyPI account." -msgstr "" -"PyPI服务器和应用程序现在共享PyPI密钥，允许应用程序为PyPI帐户生成有效的身份验" -"证代码。" +"allowing your application to generate valid authentication codes for your" +" PyPI account." +msgstr "PyPI服务器和应用程序现在共享PyPI密钥，允许应用程序为PyPI帐户生成有效的身份验证代码。" #: warehouse/templates/pages/help.html:332 #: warehouse/templates/pages/help.html:374 @@ -4088,29 +4014,29 @@ msgstr "使用此代码完成登录 PyPI" #: warehouse/templates/pages/help.html:342 msgid "" -"A security device is a USB key or <a href=\"#utfdevices\">other device</a> " -"that generates a one-time password and sends that password to the browser. " -"This password is then used by PyPI to authenticate you as a user." +"A security device is a USB key or <a href=\"#utfdevices\">other " +"device</a> that generates a one-time password and sends that password to " +"the browser. This password is then used by PyPI to authenticate you as a " +"user." msgstr "" -"安全设备是生成一次性密码并将该密码发送到浏览器的USB密钥或<a href=" -"\"#utfdevices\">其他设备</a>。然后，PyPI使用这个密码来验证您的用户身份。" +"安全设备是生成一次性密码并将该密码发送到浏览器的USB密钥或<a " +"href=\"#utfdevices\">其他设备</a>。然后，PyPI使用这个密码来验证您的用户身份。" #: warehouse/templates/pages/help.html:344 -msgid "" -"To set up two factor authentication with a <em>USB key</em>, you'll need:" +msgid "To set up two factor authentication with a <em>USB key</em>, you'll need:" msgstr "要使用<em>USB密钥</em>设置双因素身份验证，您需要：" #: warehouse/templates/pages/help.html:346 #, python-format msgid "" -"To use a <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">browser that supports <abbr title=\"web authentication" -"\">WebAuthn</abbr> and PublicKeyCredential</a>, as this is the standard " -"implemented by PyPI." +"To use a <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">browser that supports <abbr title=\"web " +"authentication\">WebAuthn</abbr> and PublicKeyCredential</a>, as this is " +"the standard implemented by PyPI." msgstr "" -"使用<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">支持<abbr title=\"web authentication\">WebAuthn</abbr>和" -"PublicKeyCredential的浏览器</a>，因为这是PyPI实现的标准。" +"使用<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">支持<abbr title=\"web " +"authentication\">WebAuthn</abbr>和PublicKeyCredential的浏览器</a>，因为这是PyPI实现的标准。" #: warehouse/templates/pages/help.html:347 msgid "To be running JavaScript on your browser" @@ -4119,34 +4045,33 @@ msgstr "在浏览器上运行 JavaScript" #: warehouse/templates/pages/help.html:348 #, python-format msgid "" -"To use a USB key that adheres to the <a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">FIDO U2F specification</a>:" +"To use a USB key that adheres to the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO U2F " +"specification</a>:" msgstr "" -"要使用符合<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">FIDO U2F规范</a>的USB密钥：" +"要使用符合<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">FIDO U2F规范</a>的USB密钥：" #: warehouse/templates/pages/help.html:351 #, python-format msgid "" -"Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</a> and <a " -"href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Thetis</a>." +"Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a " +"href=\"%(titan_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Google Titan</a> and <a href=\"%(thetis_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Thetis</a>." msgstr "" -"流行的秘钥包括<a href=\"%(yubikey_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Yubikey</a>、<a href=\"%(titan_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</a>和<a href=" -"\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Thetis</a>。" +"流行的秘钥包括<a href=\"%(yubikey_href)s\" title=\"%(title)s\" target=\"_blank\"" +" rel=\"noopener\">Yubikey</a>、<a href=\"%(titan_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google " +"Titan</a>和<a href=\"%(thetis_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Thetis</a>。" #: warehouse/templates/pages/help.html:358 msgid "" "Note that some older Yubico USB keys <strong>do not follow the FIDO " "specification</strong>, and will therefore not work with PyPI" -msgstr "" -"注意，一些旧的Yubico USB密钥<strong>不遵循FIDO规范</strong>，因此不能与PyPI一" -"起使用" +msgstr "注意，一些旧的Yubico USB密钥<strong>不遵循FIDO规范</strong>，因此不能与PyPI一起使用" #: warehouse/templates/pages/help.html:363 msgid "Follow these steps:" @@ -4155,37 +4080,36 @@ msgstr "按照以下步骤操作：" #: warehouse/templates/pages/help.html:365 msgid "" "\n" -" <li>Log in to your PyPI account, go to your account settings, and " -"choose \"Add <abbr title=\"two factor authentication\">2FA</abbr> with " -"security device (e.g. USB key)\"</li>\n" -" <li>Give your key a name. This is necessary because it's possible " -"to add more than one security device to your account.</li>\n" +" <li>Log in to your PyPI account, go to your account settings, " +"and choose \"Add <abbr title=\"two factor authentication\">2FA</abbr> " +"with security device (e.g. USB key)\"</li>\n" +" <li>Give your key a name. This is necessary because it's " +"possible to add more than one security device to your account.</li>\n" " <li>Click on the \"Set up security device\" button</li>\n" -" <li>Insert and touch your USB key, as instructed by your browser</" -"li>\n" +" <li>Insert and touch your USB key, as instructed by your " +"browser</li>\n" " " msgstr "" "\n" -" <li>登录到您的PyPI帐户，转到您的帐户设置，然后选择“使用安全设备（如" -"USB密钥）添加<abbr title=\"two factor authentication\">2FA</abbr>”</li>\n" -" <li>给你的钥匙起个名字。这是必要的，因为可以向您的帐户添加多个安全" -"设备。</li>\n" +" <li>登录到您的PyPI帐户，转到您的帐户设置，然后选择“使用安全设备（如USB密钥）添加<abbr title=\"two" +" factor authentication\">2FA</abbr>”</li>\n" +" <li>给你的钥匙起个名字。这是必要的，因为可以向您的帐户添加多个安全设备。</li>\n" " <li>点击“设置安全设备”按钮</li>\n" " <li>按照浏览器的指示插入并加载USB密钥</li>\n" " " #: warehouse/templates/pages/help.html:372 msgid "" -"Once complete, your USB key will be registered to your PyPI account and can " -"be used during the log in process." +"Once complete, your USB key will be registered to your PyPI account and " +"can be used during the log in process." msgstr "完成后，您的USB密钥将注册到您的PyPI帐户，并可在登录过程中使用。" #: warehouse/templates/pages/help.html:376 msgid "" "\n" " <li>Provide your username and password, as normal</li>\n" -" <li>Insert and touch your USB key to finish logging into PyPI</" -"li>\n" +" <li>Insert and touch your USB key to finish logging into " +"PyPI</li>\n" " " msgstr "" "\n" @@ -4197,89 +4121,85 @@ msgstr "" #, python-format msgid "" "There is a growing ecosystem of <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">devices that are FIDO compliant</a>, and " -"can therefore be used with PyPI." +"target=\"_blank\" rel=\"noopener\">devices that are FIDO compliant</a>, " +"and can therefore be used with PyPI." msgstr "" -"越来越多的设备<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">符合FIDO</a>，因此可以与PyPI一起使用。" +"越来越多的设备<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">符合FIDO</a>，因此可以与PyPI一起使用。" #: warehouse/templates/pages/help.html:392 #, python-format msgid "" -"Emerging solutions include biometric (facial and fingerprint) scanners and " -"FIDO compatible credit cards. There is also growing support for <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">mobile " -"phones to act as security devices</a>." +"Emerging solutions include biometric (facial and fingerprint) scanners " +"and FIDO compatible credit cards. There is also growing support for <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">mobile phones to act as security devices</a>." msgstr "" -"新兴的解决方案包括生物识别（面部和指纹）扫描仪和与FIDO兼容的信用卡。人们也越" -"来越支持<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">手机作为安全设备</a>。" +"新兴的解决方案包括生物识别（面部和指纹）扫描仪和与FIDO兼容的信用卡。人们也越来越支持<a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">手机作为安全设备</a>。" #: warehouse/templates/pages/help.html:398 #, python-format msgid "" -"As PyPI's two factor implementation follows the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"web " -"authentication\">WebAuthn</abbr> standard</a>, PyPI users will be able to " -"take advantage of any future developments in this field." +"As PyPI's two factor implementation follows the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\"><abbr title=\"web " +"authentication\">WebAuthn</abbr> standard</a>, PyPI users will be able to" +" take advantage of any future developments in this field." msgstr "" -"由于PyPI的双因素实现遵循<a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\"><abbr title=\"web authentication\">WebAuthn</" -"abbr>标准</a>，PyPI用户将能够利用该领域未来的任何发展。" +"由于PyPI的双因素实现遵循<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><abbr title=\"web " +"authentication\">WebAuthn</abbr>标准</a>，PyPI用户将能够利用该领域未来的任何发展。" #: warehouse/templates/pages/help.html:407 msgid "" -"If you lose access to your <a href=\"#totp\">authentication application</a> " -"or <a href=\"#utfkey\">security device</a>, you can use these codes to sign " -"into PyPI." +"If you lose access to your <a href=\"#totp\">authentication " +"application</a> or <a href=\"#utfkey\">security device</a>, you can use " +"these codes to sign into PyPI." msgstr "" -"如果您失去了对<a href=\"#totp\">身份验证应用程序</a>或<a href=\"#utfkey\">安" -"全设备</a>的访问，可以使用这些代码登录到PyPI。" +"如果您失去了对<a href=\"#totp\">身份验证应用程序</a>或<a " +"href=\"#utfkey\">安全设备</a>的访问，可以使用这些代码登录到PyPI。" #: warehouse/templates/pages/help.html:410 msgid "" -"Recovery codes are <strong>one time use</strong>. They are not a substitute " -"for a <a href=\"#totp\">authentication application</a> or <a href=\"#utfkey" -"\">security device</a> and should only be used for recovery. After using a " -"recovery code to sign in, it becomes inactive." +"Recovery codes are <strong>one time use</strong>. They are not a " +"substitute for a <a href=\"#totp\">authentication application</a> or <a " +"href=\"#utfkey\">security device</a> and should only be used for " +"recovery. After using a recovery code to sign in, it becomes inactive." msgstr "" -"恢复代码是<strong>一次性</strong>使用的。它们不能替代<a href=\"#totp\">身份验" -"证应用程序</a>或<a href=\"#utfkey\">安全设备</a>，只能用于恢复。使用恢复代码" -"登录后，它将变为非活动状态。" +"恢复代码是<strong>一次性</strong>使用的。它们不能替代<a href=\"#totp\">身份验证应用程序</a>或<a " +"href=\"#utfkey\">安全设备</a>，只能用于恢复。使用恢复代码登录后，它将变为非活动状态。" #: warehouse/templates/pages/help.html:416 msgid "To provision recovery codes:" msgstr "提供恢复代码：" +# | msgid "" +# | "Log in to your PyPI account, go to your account settings, and choose " +# | "\"Add <abbr title=\"two factor authentication\">2FA</abbr> with " +# | "authentication application\"" #: warehouse/templates/pages/help.html:418 #, fuzzy -#| msgid "" -#| "Log in to your PyPI account, go to your account settings, and choose " -#| "\"Add <abbr title=\"two factor authentication\">2FA</abbr> with " -#| "authentication application\"" msgid "" "Log in to your PyPI account, go to your account settings, and choose " "\"Generate recovery codes\"" msgstr "" -"登录到您的PyPI帐户，转到您的帐户设置，然后选择“使用身份验证应用程序添加<abbr " -"title=\"two factor authentication\">2FA</abbr>”" +"登录到您的PyPI帐户，转到您的帐户设置，然后选择“使用身份验证应用程序添加<abbr title=\"two factor " +"authentication\">2FA</abbr>”" #: warehouse/templates/pages/help.html:419 msgid "" -"Securely store the displayed recovery codes! Consider printing them out and " -"storing them in a safe location or saving them in a password manager." -msgstr "" -"安全存储显示的恢复代码！考虑将它们打印出来并存储在安全的位置，或者保存在密码" -"管理器中。" +"Securely store the displayed recovery codes! Consider printing them out " +"and storing them in a safe location or saving them in a password manager." +msgstr "安全存储显示的恢复代码！考虑将它们打印出来并存储在安全的位置，或者保存在密码管理器中。" #: warehouse/templates/pages/help.html:422 msgid "" -"If you lose access to your stored recovery codes or use all of them, you can " -"get new ones by selecting \"Regenerate recovery codes\" in your account " -"settings." +"If you lose access to your stored recovery codes or use all of them, you " +"can get new ones by selecting \"Regenerate recovery codes\" in your " +"account settings." msgstr "" -"如果您无法访问存储的恢复代码或使用所有恢复代码，可以通过在帐户设置中选" -"择“Regenerate recovery codes”（重新生成恢复代码）来获取新的恢复代码。" +"如果您无法访问存储的恢复代码或使用所有恢复代码，可以通过在帐户设置中选择“Regenerate recovery " +"codes”（重新生成恢复代码）来获取新的恢复代码。" #: warehouse/templates/pages/help.html:424 msgid "To sign in with a recovery code:" @@ -4287,44 +4207,43 @@ msgstr "要使用恢复代码登录：" #: warehouse/templates/pages/help.html:427 msgid "" -"When prompted for Two-Factor Authentication, select \"Login using a Recovery " -"Code\"" -msgstr "" -"当提示您进行双因素身份验证时，请选择“Login using a Recovery Code”（使用恢复代" -"码登录）" +"When prompted for Two-Factor Authentication, select \"Login using a " +"Recovery Code\"" +msgstr "当提示您进行双因素身份验证时，请选择“Login using a Recovery Code”（使用恢复代码登录）" #: warehouse/templates/pages/help.html:428 msgid "" -"As each code can be used only once, you might want to mark the code as used" +"As each code can be used only once, you might want to mark the code as " +"used" msgstr "由于每个代码只能使用一次，您可能希望将代码标记为已使用" #: warehouse/templates/pages/help.html:429 msgid "" -"If you have few recovery codes remaining, you may also want to generate a " -"new set using the \"Regenerate recovery codes\" button in your account " +"If you have few recovery codes remaining, you may also want to generate a" +" new set using the \"Regenerate recovery codes\" button in your account " "settings." -msgstr "" -"如果只剩下很少的恢复代码，您可能还希望使用帐户设置中的“Regenerate recovery " -"codes”（重新生成恢复代码）按钮生成新的集。" - +msgstr "如果只剩下很少的恢复代码，您可能还希望使用帐户设置中的“Regenerate recovery codes”（重新生成恢复代码）按钮生成新的集。" + +# | msgid "" +# | "\n" +# | " <p>API tokens provide an alternative way (instead of username " +# | "and password) to authenticate when <strong>uploading packages</strong> to +# " +# | "PyPI.</p>\n" +# | " <p>You can create a token for an entire PyPI account, in which +# | "case, the token will work for all projects associated with that account. +# | "Alternatively, you can limit a token's scope to a specific +# project.</p>\n" +# | " <p><strong>We strongly recommend you authenticate with an API " +# | "token where possible.</strong></p>\n" +# | " " #: warehouse/templates/pages/help.html:434 #, fuzzy -#| msgid "" -#| "\n" -#| " <p>API tokens provide an alternative way (instead of username " -#| "and password) to authenticate when <strong>uploading packages</strong> to " -#| "PyPI.</p>\n" -#| " <p>You can create a token for an entire PyPI account, in which " -#| "case, the token will work for all projects associated with that account. " -#| "Alternatively, you can limit a token's scope to a specific project.</p>\n" -#| " <p><strong>We strongly recommend you authenticate with an API " -#| "token where possible.</strong></p>\n" -#| " " msgid "" "\n" -" <p>API tokens provide an alternative way (instead of username and " -"password) to authenticate when <strong>uploading packages</strong> to PyPI.</" -"p>\n" +" <p>API tokens provide an alternative way (instead of username " +"and password) to authenticate when <strong>uploading packages</strong> to" +" PyPI.</p>\n" " <p>You can create a token for an entire PyPI account, in which " "case, the token will work for all projects associated with that account. " "Alternatively, you can limit a token's scope to a specific project.</p>\n" @@ -4334,12 +4253,11 @@ msgid "" " " msgstr "" "\n" -" <p>API令牌提供了一种在<strong>将包上载</strong>到PyPI时进行身份验证" -"的替代方法（而不是用户名和密码）。</p>\n" -" <p>您可以为整个PyPI帐户创建一个令牌，在这种情况下，该令牌将适用于与" -"该帐户关联的所有项目。或者，可以将令牌的范围限制为特定项目。</p>\n" -" <p><strong>我们强烈建议您尽可能使用API令牌进行身份验证。</strong></" -"p>\n" +" " +"<p>API令牌提供了一种在<strong>将包上载</strong>到PyPI时进行身份验证的替代方法（而不是用户名和密码）。</p>\n" +" " +"<p>您可以为整个PyPI帐户创建一个令牌，在这种情况下，该令牌将适用于与该帐户关联的所有项目。或者，可以将令牌的范围限制为特定项目。</p>\n" +" <p><strong>我们强烈建议您尽可能使用API令牌进行身份验证。</strong></p>\n" "\n" " " @@ -4361,8 +4279,7 @@ msgstr "（检查<a href=\"%(href)s\">帐户设置</a>）" msgid "" "In your <a href=\"%(href)s\">account settings</a>, go to the API tokens " "section and select \"Add API token\"" -msgstr "" -"在您的<a href=\"%(href)s\">帐户设置</a>中，转到API令牌部分并选择“添加API令牌”" +msgstr "在您的<a href=\"%(href)s\">帐户设置</a>中，转到API令牌部分并选择“添加API令牌”" #: warehouse/templates/pages/help.html:448 msgid "To use an API token:" @@ -4374,32 +4291,33 @@ msgstr "将用户名设置为<code>__token__</code>" #: warehouse/templates/pages/help.html:452 msgid "" -"Set your password to the token value, including the <code>pypi-</code> prefix" +"Set your password to the token value, including the <code>pypi-</code> " +"prefix" msgstr "将密码设置为令牌值，包括<code>pypi-</code>前缀" #: warehouse/templates/pages/help.html:456 #, python-format msgid "" -"Where you edit or add these values will depend on your individual use case. " -"For example, some users may need to edit <a href=\"%(pypirc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">their <code>.pypirc</code> " -"file</a>, while others may need to update their CI configuration file (e.g. " -"<a href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\"><code>.travis.yml</code> if you are using Travis</a>)." +"Where you edit or add these values will depend on your individual use " +"case. For example, some users may need to edit <a " +"href=\"%(pypirc_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">their <code>.pypirc</code> file</a>, while others may " +"need to update their CI configuration file (e.g. <a " +"href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>.travis.yml</code> if you are using Travis</a>)." msgstr "" -"编辑或添加这些值的位置将取决于您的单个用例。例如，某些用户可能需要编辑<a " -"href=\"%(pypirc_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">其<code>.pypirc</code>文件</a>，而其他用户可能需要更新其CI配置文件（例如 " -"<a href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">如果使用travis，则需要更新<code>travis.yml</code></a>）。" +"编辑或添加这些值的位置将取决于您的单个用例。例如，某些用户可能需要编辑<a href=\"%(pypirc_href)s\" " +"title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">其<code>.pypirc</code>文件</a>，而其他用户可能需要更新其CI配置文件（例如 <a " +"href=\"%(travis_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">如果使用travis，则需要更新<code>travis.yml</code></a>）。" #: warehouse/templates/pages/help.html:460 msgid "" -"Advanced users may wish to inspect their token by decoding it with base64, " -"and checking the output against the unique identifier displayed on PyPI." -msgstr "" -"高级用户可能希望通过使用base64解码令牌，并根据PyPI上显示的唯一标识符检查输出" -"来检查其令牌。" +"Advanced users may wish to inspect their token by decoding it with " +"base64, and checking the output against the unique identifier displayed " +"on PyPI." +msgstr "高级用户可能希望通过使用base64解码令牌，并根据PyPI上显示的唯一标识符检查输出来检查其令牌。" #: warehouse/templates/pages/help.html:468 msgid "Yes, including RSS feeds of new packages and new releases." @@ -4412,125 +4330,124 @@ msgstr "请参阅 API 参考手册。" #: warehouse/templates/pages/help.html:471 #, python-format msgid "" -"If you need to run your own mirror of PyPI, the <a href=\"%(href)s" -"\">bandersnatch project</a> is the recommended solution. Note that the " -"storage requirements for a PyPI mirror would exceed 1 terabyte—and growing!" +"If you need to run your own mirror of PyPI, the <a " +"href=\"%(href)s\">bandersnatch project</a> is the recommended solution. " +"Note that the storage requirements for a PyPI mirror would exceed 1 " +"terabyte—and growing!" msgstr "" -"如果需要运行自己的PyPI镜像，建议使用<a href=\"%(href)s\">bandersnatch项目</" -"a>。请注意，PyPI镜像的存储需求将超过1tb并不断增长！" +"如果需要运行自己的PyPI镜像，建议使用<a " +"href=\"%(href)s\">bandersnatch项目</a>。请注意，PyPI镜像的存储需求将超过1tb并不断增长！" #: warehouse/templates/pages/help.html:474 #, python-format msgid "" -"PyPI itself does not offer a way to get notified when a project uploads new " -"releases. However, there are several third-party services that offer " +"PyPI itself does not offer a way to get notified when a project uploads " +"new releases. However, there are several third-party services that offer " "comprehensive monitoring and notifications for project releases and " -"vulnerabilities listed as <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">GitHub apps</a>." +"vulnerabilities listed as <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">GitHub apps</a>." msgstr "" -"PyPI本身不提供在项目上载新版本时获得通知的方法。但是，有一些第三方服务为项目" -"版本和漏洞提供全面的监视和通知，如<a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">GitHub apps</a>。" +"PyPI本身不提供在项目上载新版本时获得通知的方法。但是，有一些第三方服务为项目版本和漏洞提供全面的监视和通知，如<a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">GitHub apps</a>。" #: warehouse/templates/pages/help.html:477 #, python-format msgid "" -"You can <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">analyze PyPI download usage statistics via our public dataset " -"on Google BigQuery</a>." +"You can <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">analyze PyPI download usage statistics via our public " +"dataset on Google BigQuery</a>." msgstr "" -"%(filename)s 的 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">哈希值</a>。" +"%(filename)s 的 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\"" +" rel=\"noopener\">哈希值</a>。" #: warehouse/templates/pages/help.html:479 #, python-format msgid "" -"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.io provides statistics for PyPI projects</a> (<a href=" -"\"%(libs_io_example_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">example</a>, <a href=\"%(libs_io_api_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">API</a>) including GitHub stars and " -"forks, dependency tracking (<a href=\"%(in_progress_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">in progress</a>), and <a " -"href=\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">other relevant factors</a>." -msgstr "" -"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Libraries.io提供了PyPI项目</a>（<a href=" -"\"%(libs_io_example_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">example</a>， <a href=\"%(libs_io_api_href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">API</a>）的统计信息，包括GitHub stars和" -"fork、依赖项跟踪（<a href=\"%(in_progress_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">in progress</a>）和<a href=" -"\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">其他相关因素</a>。" +"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io provides statistics for PyPI projects</a> " +"(<a href=\"%(libs_io_example_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">example</a>, <a " +"href=\"%(libs_io_api_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">API</a>) including GitHub stars and forks, dependency " +"tracking (<a href=\"%(in_progress_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">in progress</a>), and <a " +"href=\"%(other_factors_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">other relevant factors</a>." +msgstr "" +"<a href=\"%(libs_io_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Libraries.io提供了PyPI项目</a>（<a " +"href=\"%(libs_io_example_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">example</a>， <a href=\"%(libs_io_api_href)s\" " +"title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">API</a>）的统计信息，包括GitHub stars和fork、依赖项跟踪（<a " +"href=\"%(in_progress_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">in progress</a>）和<a href=\"%(other_factors_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">其他相关因素</a>。" #: warehouse/templates/pages/help.html:488 #, python-format msgid "" -"For recent statistics on uptime and performance, see <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status page</a>." +"For recent statistics on uptime and performance, see <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status " +"page</a>." msgstr "" -"有关正常运行时间和性能的最新统计信息，请参阅<a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">我们的状态页</a>。" +"有关正常运行时间和性能的最新统计信息，请参阅<a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">我们的状态页</a>。" #: warehouse/templates/pages/help.html:495 #, python-format msgid "" -"PyPI does not support publishing private packages. If you need to publish " -"your private package to a package index, the recommended solution is to run " -"your own deployment of the <a href=\"%(href)s\">devpi project</a>." +"PyPI does not support publishing private packages. If you need to publish" +" your private package to a package index, the recommended solution is to " +"run your own deployment of the <a href=\"%(href)s\">devpi project</a>." msgstr "" -"PyPI不支持发布私有包。如果需要将私有包发布到包索引，建议的解决方案是运行自己" -"的<a href=\"%(href)s\">devpi项目</a>部署。" +"PyPI不支持发布私有包。如果需要将私有包发布到包索引，建议的解决方案是运行自己的<a " +"href=\"%(href)s\">devpi项目</a>部署。" #: warehouse/templates/pages/help.html:498 msgid "" "Your publishing tool may return an error that your new project can't be " -"created with your desired name, despite no evidence of a project or release " -"of the same name on PyPI. Currently, there are three primary reasons this " -"may occur:" -msgstr "" -"您的发布工具可能会返回一个错误，即无法使用所需的名称创建新项目，尽管在PyPI上" -"没有相同名称的项目或版本的证据。目前，这可能有三个主要原因：" +"created with your desired name, despite no evidence of a project or " +"release of the same name on PyPI. Currently, there are three primary " +"reasons this may occur:" +msgstr "您的发布工具可能会返回一个错误，即无法使用所需的名称创建新项目，尽管在PyPI上没有相同名称的项目或版本的证据。目前，这可能有三个主要原因：" #: warehouse/templates/pages/help.html:500 #, python-format msgid "" -"The project name conflicts with a <a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python Standard Library</a> module from " -"any major version from 2.5 to present." +"The project name conflicts with a <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Standard " +"Library</a> module from any major version from 2.5 to present." msgstr "" -"项目名称与从2.5到现在的任何主要版本的<a href=\"%(href)s\" title=\"%(title)s" -"\" target=\"_blank\" rel=\"noopener\">Python标准库</a>模块冲突。" +"项目名称与从2.5到现在的任何主要版本的<a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Python标准库</a>模块冲突。" #: warehouse/templates/pages/help.html:501 #, python-format msgid "" -"The project name has been explicitly prohibited by the PyPI administrators. " -"For example, <code>%(incorrect_code)s</code> is a common typo for <code>" -"%(correct_code)s</code>, and should not surprise the user with a malicious " -"package." -msgstr "" -"PyPI管理员已明确禁止该项目名称。例如，<code>%(incorrect_code)s</code>是<code>" -"%(correct_code)s</code>的常见拼写错误，不应使用恶意软件包让用户感到惊讶。" +"The project name has been explicitly prohibited by the PyPI " +"administrators. For example, <code>%(incorrect_code)s</code> is a common " +"typo for <code>%(correct_code)s</code>, and should not surprise the user " +"with a malicious package." +msgstr "PyPI管理员已明确禁止该项目名称。例如，<code>%(incorrect_code)s</code>是<code>%(correct_code)s</code>的常见拼写错误，不应使用恶意软件包让用户感到惊讶。" #: warehouse/templates/pages/help.html:502 msgid "" -"The project name has been registered by another user, but no releases have " -"been created." +"The project name has been registered by another user, but no releases " +"have been created." msgstr "项目名称已由其他用户注册，但尚未创建任何版本。" #: warehouse/templates/pages/help.html:506 #, python-format msgid "" -"Follow the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">\"How to request a name transfer\"</a> section of <abbr title=" -"\"Python enhancement proposal\">PEP</abbr> 541." +"Follow the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">\"How to request a name transfer\"</a> section of <abbr " +"title=\"Python enhancement proposal\">PEP</abbr> 541." msgstr "" -"按照<abbr title=\"Python enhancement proposal\">PEP 541</abbr>中的<a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">“如何请求" -"名称转移”</a>部分进行操作。" +"按照<abbr title=\"Python enhancement proposal\">PEP 541</abbr>中的<a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">“如何请求名称转移”</a>部分进行操作。" #: warehouse/templates/pages/help.html:511 msgid "Owner:" @@ -4538,73 +4455,69 @@ msgstr "所有者：" #: warehouse/templates/pages/help.html:514 msgid "" -"Only the current owners of a project have the ability to add new owners or " -"maintainers. If you need to request ownership, you should contact the " -"current owner(s) of the project directly. Many project owners provide their " -"contact details in the 'Author' field of the 'Meta' details on the project " -"page." -msgstr "" -"只有项目的当前所有者才能添加新的所有者或维护者。如果需要请求所有权，应直接与" -"项目的当前所有者联系。许多项目所有者在项目页面的“Meta”详细信息的“Author”字段" -"中提供了他们的联系方式。" +"Only the current owners of a project have the ability to add new owners " +"or maintainers. If you need to request ownership, you should contact the " +"current owner(s) of the project directly. Many project owners provide " +"their contact details in the 'Author' field of the 'Meta' details on the " +"project page." +msgstr "只有项目的当前所有者才能添加新的所有者或维护者。如果需要请求所有权，应直接与项目的当前所有者联系。许多项目所有者在项目页面的“Meta”详细信息的“Author”字段中提供了他们的联系方式。" #: warehouse/templates/pages/help.html:515 #, python-format -msgid "" -"If the owner is unresponsive, see <a href=\"%(href)s\">%(anchor_text)s</a>" +msgid "If the owner is unresponsive, see <a href=\"%(href)s\">%(anchor_text)s</a>" msgstr "如果所有者没有响应，前往<a href=\"%(href)s\">%(anchor_text)s</a>" #: warehouse/templates/pages/help.html:518 #, python-format msgid "" -"By default, an upload's description will render with <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">reStructuredText</a>. " -"If the description is in an alternate format like Markdown, a package may " -"set the <code>long_description_content_type</code> in <code>setup.py</code> " -"to the alternate format." +"By default, an upload's description will render with <a href=\"%(href)s\"" +" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">reStructuredText</a>. If the description is in an " +"alternate format like Markdown, a package may set the " +"<code>long_description_content_type</code> in <code>setup.py</code> to " +"the alternate format." msgstr "" -"默认情况下，上载的描述将使用<a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">reStructuredText</a>呈现。如果描述采用类似于" -"Markdown的替代格式，则包可以将<code>setup.py</code>中的" -"<code>long_description_content_type</code>设置为替代格式。" +"默认情况下，上载的描述将使用<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">reStructuredText</a>呈现。如果描述采用类似于Markdown的替代格式，则包可以将<code>setup.py</code>中的<code>long_description_content_type</code>设置为替代格式。" #: warehouse/templates/pages/help.html:519 #, python-format msgid "" -"Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging User Guide</a> for details on the available " -"formats." +"Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging User Guide</a> for details on the " +"available formats." msgstr "" -"有关可用格式的详细信息，请参阅<a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python打包指南</a>。" +"有关可用格式的详细信息，请参阅<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\"" +" rel=\"noopener\">Python打包指南</a>。" #: warehouse/templates/pages/help.html:520 #, python-format msgid "" "PyPI will reject uploads if the description fails to render. To check a " -"description locally for validity, you may use <a href=\"%(href)s" -"\">readme_renderer</a>, which is the same description renderer used by PyPI." +"description locally for validity, you may use <a " +"href=\"%(href)s\">readme_renderer</a>, which is the same description " +"renderer used by PyPI." msgstr "" -"如果描述无法呈现，PyPI将拒绝上载。要在本地检查描述的有效性，可以使用<a href=" -"\"%(href)s\">readme_renderer</a>，它与PyPI使用的描述渲染器相同。" +"如果描述无法呈现，PyPI将拒绝上载。要在本地检查描述的有效性，可以使用<a " +"href=\"%(href)s\">readme_renderer</a>，它与PyPI使用的描述渲染器相同。" #: warehouse/templates/pages/help.html:524 #, python-format msgid "" -"If you can't upload your project's release to PyPI because you're hitting " -"the upload file size limit, we can sometimes increase your limit. Make sure " -"you've uploaded at least one release for the project that's <em>under</em> " -"the limit (a <a href=\"%(dev_release_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">developmental release version number</a> is " -"fine). Then, <a href=\"%(file_issue_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">file an issue</a> and tell us:</p>" +"If you can't upload your project's release to PyPI because you're hitting" +" the upload file size limit, we can sometimes increase your limit. Make " +"sure you've uploaded at least one release for the project that's " +"<em>under</em> the limit (a <a href=\"%(dev_release_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">developmental " +"release version number</a> is fine). Then, <a " +"href=\"%(file_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">file an issue</a> and tell us:</p>" msgstr "" -"如果您无法将项目的版本上载到PyPI，因为您达到了上载文件大小限制，我们有时可以" -"增加您的限制。确保您至少为项目上传了一个<em>低于</em>限制的版本（<a href=" -"\"%(dev_release_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">开发版本号可以</a>）。然后，<a href=\"%(file_issue_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">提出一个问题</a>并告诉我们：" -"</p>" +"如果您无法将项目的版本上载到PyPI，因为您达到了上载文件大小限制，我们有时可以增加您的限制。确保您至少为项目上传了一个<em>低于</em>限制的版本（<a" +" href=\"%(dev_release_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">开发版本号可以</a>）。然后，<a href=\"%(file_issue_href)s\" " +"title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">提出一个问题</a>并告诉我们：</p>" #: warehouse/templates/pages/help.html:532 msgid "A link to your project on PyPI (or Test PyPI)" @@ -4615,22 +4528,20 @@ msgid "The size of your release, in megabytes" msgstr "发布的大小，以兆字节为单位" #: warehouse/templates/pages/help.html:534 -msgid "" -"Which index/indexes you need the increase for (PyPI, Test PyPI, or both)" +msgid "Which index/indexes you need the increase for (PyPI, Test PyPI, or both)" msgstr "需要增加哪些索引（PyPI、Test PyPI或两者都增加）" #: warehouse/templates/pages/help.html:535 msgid "" -"A brief description of your project, including the reason for the additional " -"size." +"A brief description of your project, including the reason for the " +"additional size." msgstr "对您的项目的简要描述，包括额外大小的原因。" #: warehouse/templates/pages/help.html:544 msgid "" -"If you've forgotten your PyPI password but you remember your email address " -"or username, follow these steps to reset your password:" -msgstr "" -"如果您忘记了PyPI密码，但记住了电子邮件地址或用户名，请按照以下步骤重置密码：" +"If you've forgotten your PyPI password but you remember your email " +"address or username, follow these steps to reset your password:" +msgstr "如果您忘记了PyPI密码，但记住了电子邮件地址或用户名，请按照以下步骤重置密码：" #: warehouse/templates/pages/help.html:546 #, python-format @@ -4638,8 +4549,7 @@ msgid "Go to <a href=\"%(href)s\">reset your password</a>." msgstr "去<a href=\"%(href)s\">重置你的密码</a>。" #: warehouse/templates/pages/help.html:547 -msgid "" -"Enter the email address or username you used for PyPI and submit the form." +msgid "Enter the email address or username you used for PyPI and submit the form." msgstr "输入用于PyPI的电子邮件地址或用户名并提交表单。" #: warehouse/templates/pages/help.html:548 @@ -4650,44 +4560,44 @@ msgstr "您将收到一封带有密码重置链接的电子邮件。" msgid "If you've lost access to your PyPI account due to:" msgstr "如果由于以下原因而无法访问PyPI帐户：" +# | msgid "Emails associated with your account" #: warehouse/templates/pages/help.html:555 #, fuzzy -#| msgid "Emails associated with your account" msgid "Lost access to the email address associated with your account" msgstr "与您的帐户关联的电子邮件" #: warehouse/templates/pages/help.html:556 msgid "" -"Lost two factor authentication <a href=\"#totp\">application</a>, <a href=" -"\"#utfkey\">device</a>, and <a href=\"#recoverycodes\">recovery codes</a>" +"Lost two factor authentication <a href=\"#totp\">application</a>, <a " +"href=\"#utfkey\">device</a>, and <a href=\"#recoverycodes\">recovery " +"codes</a>" msgstr "" -"丢失双因素身份验证<a href=\"#totp\">应用程序</a>、<a href=\"#utfkey\">设备</" -"a>和<a href=\"#recoverycodes\">恢复代码</a>" +"丢失双因素身份验证<a href=\"#totp\">应用程序</a>、<a href=\"#utfkey\">设备</a>和<a " +"href=\"#recoverycodes\">恢复代码</a>" +# | msgid "" +# | "If you no longer have access to the email address associated with your " +# | "account, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" +# | "\"noopener\">file an issue on our tracker</a>." #: warehouse/templates/pages/help.html:559 #, fuzzy, python-format -#| msgid "" -#| "If you no longer have access to the email address associated with your " -#| "account, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -#| "\"noopener\">file an issue on our tracker</a>." msgid "" -"You can proceed to, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">file an issue on our tracker</a> to request assistance " -"with account recovery." +"You can proceed to, <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">file an issue on our tracker</a> to " +"request assistance with account recovery." msgstr "" -"如果您不再有权访问与您的帐户关联的电子邮件地址，<a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">请在我们的跟踪器上提交问题</" -"a>。" +"如果您不再有权访问与您的帐户关联的电子邮件地址，<a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">请在我们的跟踪器上提交问题</a>。" +# | msgid "Provide your username and password, as normal" #: warehouse/templates/pages/help.html:566 #, fuzzy -#| msgid "Provide your username and password, as normal" msgid "If you are using a username and password for uploads:" msgstr "像往常一样提供您的用户名和密码" +# | msgid "Provide your username and password, as normal" #: warehouse/templates/pages/help.html:568 #, fuzzy -#| msgid "Provide your username and password, as normal" msgid "Check to see if your username or password are incorrect." msgstr "像往常一样提供您的用户名和密码" @@ -4707,142 +4617,133 @@ msgstr "" #: warehouse/templates/pages/help.html:574 msgid "" -"Ensure that your API Token is <a href=\"#apitoken\">properly formatted</a> " -"and does not contain any trailing characters such as newlines." +"Ensure that your API Token is <a href=\"#apitoken\">properly " +"formatted</a> and does not contain any trailing characters such as " +"newlines." msgstr "" #: warehouse/templates/pages/help.html:579 #, python-format msgid "" -"Transport Layer Security, or TLS, is part of how we make sure connections " -"between your computer and PyPI are private and secure. It's a cryptographic " -"protocol that's had several versions over time. PyPI <a href=" -"\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">turned off support for TLS versions 1.0 and 1.1</a> in April " -"2018. <a href=\"%(reason_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Learn why on the PSF blog</a>." +"Transport Layer Security, or TLS, is part of how we make sure connections" +" between your computer and PyPI are private and secure. It's a " +"cryptographic protocol that's had several versions over time. PyPI <a " +"href=\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">turned off support for TLS versions 1.0 and 1.1</a> in " +"April 2018. <a href=\"%(reason_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Learn why on the PSF blog</a>." msgstr "" -"传输层安全性（Transport Layer Security，简称TLS）是确保您的计算机和PyPI之间的" -"连接是私有和安全的一部分。这是一个密码协议，随着时间的推移已经有好几个版本。" -"2018年4月，PyPI<a href=\"%(announcement_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">关闭了对TLS版本1.0和1.1的支持</a>。<a href=" -"\"%(reason_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">在" -"PSF博客上了解原因</a>。" +"传输层安全性（Transport Layer " +"Security，简称TLS）是确保您的计算机和PyPI之间的连接是私有和安全的一部分。这是一个密码协议，随着时间的推移已经有好几个版本。2018年4月，PyPI<a" +" href=\"%(announcement_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">关闭了对TLS版本1.0和1.1的支持</a>。<a href=\"%(reason_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">在PSF博客上了解原因</a>。" #: warehouse/templates/pages/help.html:586 #, python-format msgid "" -"If you are having trouble with <code>%(command)s</code> and get a <code>No " -"matching distribution found</code> or <code>Could not fetch URL</code> " -"error, try adding <code>-v</code> to the command to get more information:" +"If you are having trouble with <code>%(command)s</code> and get a " +"<code>No matching distribution found</code> or <code>Could not fetch " +"URL</code> error, try adding <code>-v</code> to the command to get more " +"information:" msgstr "" -"如果您在使用<code>%(command)s</code>时遇到问题，并且得到一个<code>No " -"matching distribution found</code>（找到不匹配的发行版）或<code>Could not " -"fetch URL</code>（无法获取URL）错误，请尝试将<code>-v</code>添加到命令以获取" -"更多信息：" +"如果您在使用<code>%(command)s</code>时遇到问题，并且得到一个<code>No matching distribution " +"found</code>（找到不匹配的发行版）或<code>Could not fetch " +"URL</code>（无法获取URL）错误，请尝试将<code>-v</code>添加到命令以获取更多信息：" #: warehouse/templates/pages/help.html:588 msgid "" "If you see an error like <code>There was a problem confirming the ssl " "certificate</code> or <code>tlsv1 alert protocol version</code> or " -"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, you need to be connecting to PyPI " -"with a newer TLS support library." +"<code>TLSV1_ALERT_PROTOCOL_VERSION</code>, you need to be connecting to " +"PyPI with a newer TLS support library." msgstr "" -"如果您看到<code>There was a problem confirming the ssl certificate</code>（确" -"认ssl证书时出现问题）、<code>tlsv1 alert protocol version</code>（tlsv1警报协" -"议版本）或<code>TLSV1_ALERT_PROTOCOL_VERSION</code>（TLSV1_警报协议版本）之类" -"的错误，则需要使用更新的TLS支持库连接到PyPI。" +"如果您看到<code>There was a problem confirming the ssl " +"certificate</code>（确认ssl证书时出现问题）、<code>tlsv1 alert protocol " +"version</code>（tlsv1警报协议版本）或<code>TLSV1_ALERT_PROTOCOL_VERSION</code>（TLSV1_警报协议版本）之类的错误，则需要使用更新的TLS支持库连接到PyPI。" #: warehouse/templates/pages/help.html:589 msgid "" "The specific steps you need to take will depend on your operating system " -"version, where your installation of Python originated (python.org, your OS " -"vendor, or an intermediate distributor), and the installed versions of " -"Python, <code>setuptools</code>, and <code>pip</code>." -msgstr "" -"您需要采取的具体步骤将取决于您的操作系统版本（Python.org、您的操作系统供应商" -"或中间发行商）以及Python、<code>setuptools</code>和<code>pip</code>的安装版" -"本。" +"version, where your installation of Python originated (python.org, your " +"OS vendor, or an intermediate distributor), and the installed versions of" +" Python, <code>setuptools</code>, and <code>pip</code>." +msgstr "您需要采取的具体步骤将取决于您的操作系统版本（Python.org、您的操作系统供应商或中间发行商）以及Python、<code>setuptools</code>和<code>pip</code>的安装版本。" #: warehouse/templates/pages/help.html:591 #, python-format msgid "" -"For help, go to <a href=\"%(irc_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">the <code>#pypa</code> IRC channel on Freenode</a>, file " -"an issue at <a href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">pypa/packaging-problems/issues</a>, or <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">post to the python-help mailing list</a>, including your OS and " -"installation details and the output of <code>%(command)s</code>." +"For help, go to <a href=\"%(irc_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">the <code>#pypa</code> IRC channel on " +"Freenode</a>, file an issue at <a href=\"%(issue_tracker_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">pypa/packaging-" +"problems/issues</a>, or <a href=\"%(mailing_list_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">post to the " +"python-help mailing list</a>, including your OS and installation details " +"and the output of <code>%(command)s</code>." msgstr "" -"要获得帮助，请转到<a href=\"%(irc_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Freenode上的<code>#pypa</code> apple IRC频道</" -"a>，在<a href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">pypa/packaging-problems/issues</a>上提交问题，或<a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">发布到python帮助邮件列表</a>，包括操作系统和安装详细信息以及" -"<code>%(command)s</code>的输出。" +"要获得帮助，请转到<a href=\"%(irc_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Freenode上的<code>#pypa</code> apple IRC频道</a>，在<a " +"href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">pypa/packaging-problems/issues</a>上提交问题，或<a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">发布到python帮助邮件列表</a>，包括操作系统和安装详细信息以及<code>%(command)s</code>的输出。" #: warehouse/templates/pages/help.html:602 #, python-format msgid "" -"We take <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">accessibility</a> very seriously and want to make the website " -"easy to use for everyone." +"We take <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">accessibility</a> very seriously and want to make the " +"website easy to use for everyone." msgstr "" -"我们非常重视<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">可访问性</a>，并希望使网站易于每个人使用。" +"我们非常重视<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">可访问性</a>，并希望使网站易于每个人使用。" #: warehouse/templates/pages/help.html:607 #, python-format msgid "" -"If you are experiencing an accessibility problem, <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">report it to us on GitHub</" -"a>, so we can try to fix the problem, for you and others." +"If you are experiencing an accessibility problem, <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">report it to us on" +" GitHub</a>, so we can try to fix the problem, for you and others." msgstr "" -"如果您遇到可访问性问题，<a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">请在GitHub上向我们报告</a>，以便我们可以尝试为您" -"和其他人修复该问题。" +"如果您遇到可访问性问题，<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">请在GitHub上向我们报告</a>，以便我们可以尝试为您和其他人修复该问题。" #: warehouse/templates/pages/help.html:615 #, python-format msgid "" "In a previous version of PyPI, it used to be possible for maintainers to " -"upload releases to PyPI using a form in the web browser. This feature was " -"deprecated with the new version of PyPI – we instead recommend that you <a " -"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">use " -"twine to upload your project to PyPI</a>." +"upload releases to PyPI using a form in the web browser. This feature was" +" deprecated with the new version of PyPI – we instead recommend that you " +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">use twine to upload your project to PyPI</a>." msgstr "" -"在以前的PyPI版本中，维护人员可以使用web浏览器中的表单将版本上载到PyPI。新版本" -"的PyPI不赞成使用此功能，我们建议您<a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">使用twine将项目上载到PyPI</a>。" +"在以前的PyPI版本中，维护人员可以使用web浏览器中的表单将版本上载到PyPI。新版本的PyPI不赞成使用此功能，我们建议您<a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">使用twine将项目上载到PyPI</a>。" #: warehouse/templates/pages/help.html:624 msgid "" -"Spammers return to PyPI with some regularity hoping to place their Search " -"Engine Optimized phishing, scam, and click-farming content on the site. " +"Spammers return to PyPI with some regularity hoping to place their Search" +" Engine Optimized phishing, scam, and click-farming content on the site. " "Since PyPI allows for indexing of the Long Description and other data " "related to projects and has a generally solid search reputation, it is a " "prime target." -msgstr "" -"垃圾邮件发送者会定期返回到PyPI，希望将他们的搜索引擎优化后的钓鱼、诈骗和点击" -"内容放到网站上。由于PyPI允许对长描述和其他与项目相关的数据进行索引，并且通常" -"具有良好的搜索信誉，所以它是首要目标。" +msgstr "垃圾邮件发送者会定期返回到PyPI，希望将他们的搜索引擎优化后的钓鱼、诈骗和点击内容放到网站上。由于PyPI允许对长描述和其他与项目相关的数据进行索引，并且通常具有良好的搜索信誉，所以它是首要目标。" #: warehouse/templates/pages/help.html:626 #, python-format msgid "" "When the PyPI administrators are overwhelmed by spam <strong>or</strong> " -"determine that there is some other threat to PyPI, new user registration and/" -"or new project registration may be disabled. Check <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">our status page</a> " -"for more details, as we'll likely have updated it with reasoning for the " -"intervention." +"determine that there is some other threat to PyPI, new user registration " +"and/or new project registration may be disabled. Check <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">our status page</a> for more details, as we'll likely " +"have updated it with reasoning for the intervention." msgstr "" -"当PyPI管理员被垃圾邮件淹没<strong>或</strong>确定PyPI存在其他威胁时，可能会禁" -"用新用户注册和/或新项目注册。查看<a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">我们的状态页面</a>了解更多详细信息，因为我" -"们可能已经用干预的理由更新了它。" +"当PyPI管理员被垃圾邮件淹没<strong>或</strong>确定PyPI存在其他威胁时，可能会禁用新用户注册和/或新项目注册。查看<a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">我们的状态页面</a>了解更多详细信息，因为我们可能已经用干预的理由更新了它。" #: warehouse/templates/pages/help.html:635 msgid "PyPI will return these errors for one of these reasons:" @@ -4869,151 +4770,147 @@ msgstr "PyPI不允许重用文件名，即使项目已被删除并重新创建 #: warehouse/templates/pages/help.html:643 #, python-format msgid "" -"To avoid this situation, <a href=\"%(test_pypi_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">use Test PyPI to perform and check your " -"upload first</a>, before uploading to <a href=\"%(pypi_href)s\">pypi.org</a>." +"To avoid this situation, <a href=\"%(test_pypi_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">use Test PyPI to " +"perform and check your upload first</a>, before uploading to <a " +"href=\"%(pypi_href)s\">pypi.org</a>." msgstr "" "为了避免这种情况，在上传到<a href=\"%(pypi_href)s\">pypi.org</a>之前，<a " -"href=\"%(test_pypi_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">首先使用Test PyPI执行并检查上传</a>。" - +"href=\"%(test_pypi_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">首先使用Test PyPI执行并检查上传</a>。" + +# | msgid "" +# | "If you would like to request a new trove classifier file a bug on our <a +# " +# | "href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" +# | "\">issue tracker</a>. Include the name of the requested classifier and a +# | "brief justification of why it is important." #: warehouse/templates/pages/help.html:650 #, fuzzy, python-format -#| msgid "" -#| "If you would like to request a new trove classifier file a bug on our <a " -#| "href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -#| "\">issue tracker</a>. Include the name of the requested classifier and a " -#| "brief justification of why it is important." msgid "" -"If you would like to request a new trove classifier file a pull request on " -"the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\"><code>pypa/trove-classifiers</code> project</a>. Be sure to include a " -"brief justification of why it is important." +"If you would like to request a new trove classifier file a pull request " +"on the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\"><code>pypa/trove-classifiers</code> project</a>. Be sure" +" to include a brief justification of why it is important." msgstr "" -"如果您想请求一个新的trove分类器文件，在我们的<a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">问题跟踪程序</a>上有一个" -"bug。包括请求的分类器的名称和为什么它是重要的简要理由。" +"如果您想请求一个新的trove分类器文件，在我们的<a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" " +"rel=\"noopener\">问题跟踪程序</a>上有一个bug。包括请求的分类器的名称和为什么它是重要的简要理由。" #: warehouse/templates/pages/help.html:658 #, python-format msgid "" "If you're experiencing an issue with PyPI itself, we welcome " -"<strong>constructive</strong> feedback and bug reports via our <a href=" -"\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">issue " -"tracker</a>. Please note that this tracker is only for issues with the " -"software that runs PyPI. Before writing a new issue, first check that a " -"similar issue does not already exist." +"<strong>constructive</strong> feedback and bug reports via our <a " +"href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">issue tracker</a>. Please note that this tracker is only" +" for issues with the software that runs PyPI. Before writing a new issue," +" first check that a similar issue does not already exist." msgstr "" -"如果您遇到PyPI本身的问题，我们欢迎通过我们的<a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">问题跟踪程序</a>提供<strong>" -"建设性</strong>的反馈和错误报告。请注意，此跟踪器仅用于运行PyPI的软件的问题。" -"在编写一个新的问题之前，首先要检查一个类似的问题是否已经存在。" +"如果您遇到PyPI本身的问题，我们欢迎通过我们的<a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" " +"rel=\"noopener\">问题跟踪程序</a>提供<strong>建设性</strong>的反馈和错误报告。请注意，此跟踪器仅用于运行PyPI的软件的问题。在编写一个新的问题之前，首先要检查一个类似的问题是否已经存在。" #: warehouse/templates/pages/help.html:665 msgid "" -"If you are having an issue is with a specific package installed from PyPI, " -"you should reach out to the maintainers of that project directly instead." -msgstr "" -"如果您遇到的问题是从PyPI安装的特定包，那么您应该直接联系该项目的维护人员。" +"If you are having an issue is with a specific package installed from " +"PyPI, you should reach out to the maintainers of that project directly " +"instead." +msgstr "如果您遇到的问题是从PyPI安装的特定包，那么您应该直接联系该项目的维护人员。" #: warehouse/templates/pages/help.html:674 #, python-format msgid "" -"PyPI is powered by the Warehouse project; <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> is an open " -"source project developed under the umbrella of the Python Packaging " -"Authority (PyPA) and supported by the Python Packaging Working Group " -"(PackagingWG)." +"PyPI is powered by the Warehouse project; <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Warehouse</a> is " +"an open source project developed under the umbrella of the Python " +"Packaging Authority (PyPA) and supported by the Python Packaging Working " +"Group (PackagingWG)." msgstr "" -"PyPI由Warehouse项目提供支持；<a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Warehouse</a>是在Python打包机构（PyPA）的保护下开" -"发的一个开源项目，由Python打包工作组（PackagingWG）提供支持。" +"PyPI由Warehouse项目提供支持；<a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" " +"rel=\"noopener\">Warehouse</a>是在Python打包机构（PyPA）的保护下开发的一个开源项目，由Python打包工作组（PackagingWG）提供支持。" #: warehouse/templates/pages/help.html:679 #, python-format msgid "" -"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPA</a> is an independent group of developers whose goal is to improve " -"and maintain many of the core projects related to Python packaging." +"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA</a> is an independent group of developers whose " +"goal is to improve and maintain many of the core projects related to " +"Python packaging." msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPA</a>是一个独立的开发团队，其目标是改进和维护与Python打包相关的许多核心" -"项目。" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA</a>是一个独立的开发团队，其目标是改进和维护与Python打包相关的许多核心项目。" #: warehouse/templates/pages/help.html:684 #, python-format msgid "" -"The <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">PackagingWG</a> is a working group of the Python Software " -"Foundation (PSF) whose goal is to raise and disburse funds to support the " -"ongoing improvement of Python packaging. Most recently it <a href=" -"\"%(otf_award_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">secured an award from the Open Technology Fund</a> whose funding is " -"enabling developers to improve Warehouse's security and accessibility." +"The <a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">PackagingWG</a> is a working group of " +"the Python Software Foundation (PSF) whose goal is to raise and disburse " +"funds to support the ongoing improvement of Python packaging. Most " +"recently it <a href=\"%(otf_award_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">secured an award from the Open " +"Technology Fund</a> whose funding is enabling developers to improve " +"Warehouse's security and accessibility." msgstr "" -"<a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">PackagingWG</a>是Python软件基金会（PSF）的一个工作组，其目标是筹" -"集和支付资金，以支持Python打包的持续改进。最近，它<a href=" -"\"%(otf_award_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">获得了开放技术基金的一个奖项</a>，该基金的资金使开发人员能够提高仓库的安全" -"性和可访问性。" +"<a href=\"%(packaging_wg_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PackagingWG</a>是Python软件基金会（PSF）的一个工作组，其目标是筹集和支付资金，以支持Python打包的持续改进。最近，它<a" +" href=\"%(otf_award_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">获得了开放技术基金的一个奖项</a>，该基金的资金使开发人员能够提高仓库的安全性和可访问性。" #: warehouse/templates/pages/help.html:694 #, python-format msgid "" -"PyPI is powered by <a href=\"%(warehouse_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Warehouse</a> and by a variety of tools and " -"services provided by our <a href=\"%(sponsors_href)s\">generous sponsors</a>." +"PyPI is powered by <a href=\"%(warehouse_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Warehouse</a> and by a variety of " +"tools and services provided by our <a href=\"%(sponsors_href)s\">generous" +" sponsors</a>." msgstr "" -"PyPI由<a href=\"%(warehouse_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">Warehouse</a>和我们<a href=\"%(sponsors_href)s\">慷慨的赞助" -"商</a>提供的各种工具和服务提供动力。" +"PyPI由<a href=\"%(warehouse_href)s\" title=\"%(title)s\" target=\"_blank\"" +" rel=\"noopener\">Warehouse</a>和我们<a " +"href=\"%(sponsors_href)s\">慷慨的赞助商</a>提供的各种工具和服务提供动力。" #: warehouse/templates/pages/help.html:701 msgid "" -"As of April 16, 2018, PyPI.org is at \"production\" status, meaning that it " -"has moved out of beta and replaced the old site (pypi.python.org). It is now " -"robust, tested, and ready for expected browser and API traffic." -msgstr "" -"截至2018年4月16日，PyPI.org处于“生产”状态，这意味着它已经退出beta版并取代了旧" -"站点（pypi.python.org）。它现在是健壮的，经过测试的，并且已经为预期的浏览器和" -"API流量做好了准备。" +"As of April 16, 2018, PyPI.org is at \"production\" status, meaning that " +"it has moved out of beta and replaced the old site (pypi.python.org). It " +"is now robust, tested, and ready for expected browser and API traffic." +msgstr "截至2018年4月16日，PyPI.org处于“生产”状态，这意味着它已经退出beta版并取代了旧站点（pypi.python.org）。它现在是健壮的，经过测试的，并且已经为预期的浏览器和API流量做好了准备。" #: warehouse/templates/pages/help.html:703 #, python-format msgid "" -"PyPI is heavily cached and distributed via <abbr title=\"content delivery " -"network\">CDN</abbr> thanks to our sponsor <a href=\"%(fastly_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Fastly</a> and thus is " -"generally available globally. However, the site is mostly maintained by " -"volunteers, we do not provide any specific Service Level Agreement, and as " -"could be expected for a giant distributed system, things can and sometimes " -"do go wrong. See <a href=\"%(status_page_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">our status page</a> for current and past outages " -"and incidents. If you have high availability requirements for your package " -"index, consider either a <a href=\"%(mirror_href)s\">mirror</a> or a <a href=" -"\"%(private_index_href)s\">private index</a>." -msgstr "" -"由于我们的赞助商<a href=\"%(fastly_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Fastly</a>，PyPI通过<abbr title=\"content " -"delivery network\">CDN</abbr>进行了大量缓存和分发，因此在全球范围内普遍可用。" -"然而，网站大部分是由志愿者维护的，我们没有提供任何具体的服务级别协议，正如一" -"个巨大的分布式系统所期望的那样，事情可能会，有时确实会出错。有关当前和过去的" -"停机和事件，请参阅<a href=\"%(status_page_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">我们的状态页</a>。如果您对包索引有高可用性" -"要求，请考虑使用<a href=\"%(mirror_href)s\">镜像索引</a>或<a href=" -"\"%(private_index_href)s\">专用索引</a>。" +"PyPI is heavily cached and distributed via <abbr title=\"content delivery" +" network\">CDN</abbr> thanks to our sponsor <a href=\"%(fastly_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Fastly</a> and " +"thus is generally available globally. However, the site is mostly " +"maintained by volunteers, we do not provide any specific Service Level " +"Agreement, and as could be expected for a giant distributed system, " +"things can and sometimes do go wrong. See <a " +"href=\"%(status_page_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">our status page</a> for current and past outages and " +"incidents. If you have high availability requirements for your package " +"index, consider either a <a href=\"%(mirror_href)s\">mirror</a> or a <a " +"href=\"%(private_index_href)s\">private index</a>." +msgstr "" +"由于我们的赞助商<a href=\"%(fastly_href)s\" title=\"%(title)s\" target=\"_blank\"" +" rel=\"noopener\">Fastly</a>，PyPI通过<abbr title=\"content delivery " +"network\">CDN</abbr>进行了大量缓存和分发，因此在全球范围内普遍可用。然而，网站大部分是由志愿者维护的，我们没有提供任何具体的服务级别协议，正如一个巨大的分布式系统所期望的那样，事情可能会，有时确实会出错。有关当前和过去的停机和事件，请参阅<a" +" href=\"%(status_page_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">我们的状态页</a>。如果您对包索引有高可用性要求，请考虑使用<a " +"href=\"%(mirror_href)s\">镜像索引</a>或<a " +"href=\"%(private_index_href)s\">专用索引</a>。" #: warehouse/templates/pages/help.html:717 #, python-format msgid "" -"We have a huge amount of work to do to continue to maintain and improve PyPI " -"(also known as <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">the Warehouse project</a>)." +"We have a huge amount of work to do to continue to maintain and improve " +"PyPI (also known as <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">the Warehouse project</a>)." msgstr "" "为了继续维护和改进PyPI（也称为<a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Warehouse项目</a>），我们还有大量的工作要" -"做。" +"target=\"_blank\" rel=\"noopener\">Warehouse项目</a>），我们还有大量的工作要做。" #: warehouse/templates/pages/help.html:722 msgid "Financial:" @@ -5032,47 +4929,44 @@ msgstr "发展：" #: warehouse/templates/pages/help.html:723 msgid "" -"Warehouse is open source, and we would love to see some new faces working on " -"the project. You <strong>do not</strong> need to be an experienced open-" -"source developer to make a contribution – in fact, we'd love to help you " -"make your first open source pull request!" -msgstr "" -"Warehouse是开源的，我们希望看到一些新的面孔在这个项目上工作。您<strong>不</" -"strong>需要成为一个有经验的开源开发人员就可以做出贡献——事实上，我们很乐意帮助" -"您提出第一个开源请求！" +"Warehouse is open source, and we would love to see some new faces working" +" on the project. You <strong>do not</strong> need to be an experienced " +"open-source developer to make a contribution – in fact, we'd love to help" +" you make your first open source pull request!" +msgstr "Warehouse是开源的，我们希望看到一些新的面孔在这个项目上工作。您<strong>不</strong>需要成为一个有经验的开源开发人员就可以做出贡献——事实上，我们很乐意帮助您提出第一个开源请求！" #: warehouse/templates/pages/help.html:725 #, python-format msgid "" "If you have skills in Python, ElasticSearch, HTML, SCSS, JavaScript, or " -"SQLAlchemy then skim our <a href=\"%(getting_started_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">\"Getting started\" guide</" -"a>, then take a look at the <a href=\"%(issue_tracker_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">issue tracker</a>. We've " -"created a <a href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">'Good first issue'</a> label – we recommend you " -"start here." -msgstr "" -"如果您在Python、ElasticSearch、HTML、SCSS、JavaScript或SQLAlchemy方面有技能，" -"那么请浏览我们的<a href=\"%(getting_started_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">“入门”</a>指南，然后查看<a href=" -"\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">问题跟踪程序</a>。我们已经创建了一个<a href=" -"\"%(good_first_issue_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">“好的第一期”</a>标签——我们建议您从这里开始。" +"SQLAlchemy then skim our <a href=\"%(getting_started_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">\"Getting " +"started\" guide</a>, then take a look at the <a " +"href=\"%(issue_tracker_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">issue tracker</a>. We've created a <a " +"href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">'Good first issue'</a> label – we recommend you start " +"here." +msgstr "" +"如果您在Python、ElasticSearch、HTML、SCSS、JavaScript或SQLAlchemy方面有技能，那么请浏览我们的<a " +"href=\"%(getting_started_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">“入门”</a>指南，然后查看<a href=\"%(issue_tracker_href)s\" " +"title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">问题跟踪程序</a>。我们已经创建了一个<a " +"href=\"%(good_first_issue_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">“好的第一期”</a>标签——我们建议您从这里开始。" #: warehouse/templates/pages/help.html:733 #, python-format msgid "" -"Issues are grouped into <a href=\"%(href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">milestones</a>; working on issues in the current " -"milestone is a great way to help push the project forward. If you're " -"interested in working on a particular issue, leave a comment and we can " -"guide you through the contribution process." +"Issues are grouped into <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">milestones</a>; working on issues in " +"the current milestone is a great way to help push the project forward. If" +" you're interested in working on a particular issue, leave a comment and " +"we can guide you through the contribution process." msgstr "" -"问题被分为<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">里程碑</a>；在当前里程碑中处理问题是帮助推进项目的一个好方法。如" -"果您对某个特定问题感兴趣，请留下评论，我们可以指导您完成贡献过程。" +"问题被分为<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">里程碑</a>；在当前里程碑中处理问题是帮助推进项目的一个好方法。如果您对某个特定问题感兴趣，请留下评论，我们可以指导您完成贡献过程。" #: warehouse/templates/pages/help.html:740 msgid "Stay updated:" @@ -5081,64 +4975,64 @@ msgstr "保持更新：" #: warehouse/templates/pages/help.html:741 #, python-format msgid "" -"You can also follow the ongoing development of the project on the <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">distutils-sig mailing list</a> and the <a href=" -"\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">PyPA Dev message group</a>." +"You can also follow the ongoing development of the project on the <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">distutils-sig mailing list</a> and the <a " +"href=\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA Dev message group</a>." msgstr "" -"您还可以在<a href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">distutils sig邮件列表</a>和<a href=" -"\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">PyPA Dev消息组</a>上跟踪项目的正在进行的开发。" +"您还可以在<a href=\"%(mailing_list_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">distutils sig邮件列表</a>和<a " +"href=\"%(message_group_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA Dev消息组</a>上跟踪项目的正在进行的开发。" #: warehouse/templates/pages/help.html:751 #, python-format msgid "" -"Changes to PyPI are generally announced on both the <a href=" -"\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">pypi-announce mailing list</a> and the <a href=\"%(blog_href)s" -"\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PSF blog</a> under " -"the label \"pypi\". The PSF blog also has <a href=\"%(atom_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Atom</a> and <a href=" -"\"%(rss_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</" -"a> feeds for the \"pypi\" label." +"Changes to PyPI are generally announced on both the <a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">pypi-announce mailing list</a> and the <a " +"href=\"%(blog_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PSF blog</a> under the label \"pypi\". The PSF blog also" +" has <a href=\"%(atom_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Atom</a> and <a href=\"%(rss_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">RSS</a> feeds for " +"the \"pypi\" label." msgstr "" "对PyPI的更改通常在<a href=\"%(mailing_list_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">PyPI announce邮件列表</a>和<a href=" -"\"%(blog_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PSF" -"博客</a>上以“PyPI”的标签公布。PSF博客还为“pypi”标签提供了<a href=" -"\"%(atom_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Atom</a>和<a href=\"%(rss_href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">RSS</a>提要。" +"target=\"_blank\" rel=\"noopener\">PyPI announce邮件列表</a>和<a " +"href=\"%(blog_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PSF博客</a>上以“PyPI”的标签公布。PSF博客还为“pypi”标签提供了<a " +"href=\"%(atom_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Atom</a>和<a href=\"%(rss_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">RSS</a>提要。" #: warehouse/templates/pages/help.html:761 msgid "" -"When Warehouse's maintainers are deploying new features, at first we mark " -"them with a small \"beta feature\" symbol to tell you: this should probably " -"work fine, but it's new and less tested than other site functionality." -msgstr "" -"当Warehouse的维护人员部署新功能时，首先我们用一个小的“beta功能”符号来标记它" -"们，告诉您：这可能工作得很好，但它是新的，比其他站点功能测试得更少。" +"When Warehouse's maintainers are deploying new features, at first we mark" +" them with a small \"beta feature\" symbol to tell you: this should " +"probably work fine, but it's new and less tested than other site " +"functionality." +msgstr "当Warehouse的维护人员部署新功能时，首先我们用一个小的“beta功能”符号来标记它们，告诉您：这可能工作得很好，但它是新的，比其他站点功能测试得更少。" +# | msgid "Currently, the following features are in beta:" #: warehouse/templates/pages/help.html:762 #, fuzzy -#| msgid "Currently, the following features are in beta:" msgid "Currently, no features are in beta." msgstr "目前，以下功能处于测试阶段：" #: warehouse/templates/pages/help.html:766 #, python-format msgid "" -"\"PyPI\" should be pronounced like \"pie pea eye\", specifically with the " -"\"PI\" pronounced as individual letters, rather as a single sound. This " -"minimizes confusion with the <a href=\"%(href)s\" title=\"%(title)s\">PyPy</" -"a> project, which is a popular alternative implementation of the Python " -"language." +"\"PyPI\" should be pronounced like \"pie pea eye\", specifically with the" +" \"PI\" pronounced as individual letters, rather as a single sound. This " +"minimizes confusion with the <a href=\"%(href)s\" " +"title=\"%(title)s\">PyPy</a> project, which is a popular alternative " +"implementation of the Python language." msgstr "" -"“PyPI”的发音应该像“pie pea eye”，特别是“PI”发音成单个字母，而不是单个声音。这" -"将减少与<a href=\"%(href)s\" title=\"%(title)s\">PyPy</a>项目的混淆，PyPy项目" -"是Python语言的一种流行的替代实现。" +"“PyPI”的发音应该像“pie pea eye”，特别是“PI”发音成单个字母，而不是单个声音。这将减少与<a " +"href=\"%(href)s\" " +"title=\"%(title)s\">PyPy</a>项目的混淆，PyPy项目是Python语言的一种流行的替代实现。" #: warehouse/templates/pages/help.html:778 msgid "Resources" @@ -5175,20 +5069,21 @@ msgstr "联系" #: warehouse/templates/pages/help.html:789 #, python-format msgid "" -"The <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python Packaging Authority (PyPA)</a> is a working group who " -"work together to improve Python packaging. If you'd like to get in touch " -"with a core packaging developer, use <a href=\"%(irc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">#pypa on IRC (freenode)</" -"a>, or <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">join the distutils-sig mailing list</a>." +"The <a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python Packaging Authority (PyPA)</a> is a working group" +" who work together to improve Python packaging. If you'd like to get in " +"touch with a core packaging developer, use <a href=\"%(irc_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">#pypa on IRC " +"(freenode)</a>, or <a href=\"%(mailing_list_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">join the distutils-sig mailing " +"list</a>." msgstr "" -"<a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python打包机构（PyPA）</a>是一个工作组，他们共同努力改进Python打" -"包。如果您想与核心打包开发人员联系，请在 <a href=\"%(irc_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">IRC（freenode）</a>上使用" -"pypa，或者<a href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">加入distutils sig邮件列表</a>。" +"<a href=\"%(pypa_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python打包机构（PyPA）</a>是一个工作组，他们共同努力改进Python打包。如果您想与核心打包开发人员联系，请在" +" <a href=\"%(irc_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">IRC（freenode）</a>上使用pypa，或者<a " +"href=\"%(mailing_list_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">加入distutils sig邮件列表</a>。" #: warehouse/templates/pages/security.html:15 msgid "Security" @@ -5200,8 +5095,8 @@ msgstr "报告安全问题" #: warehouse/templates/pages/security.html:22 msgid "" -"We take security very seriously and ask that you follow our security policy " -"carefully." +"We take security very seriously and ask that you follow our security " +"policy carefully." msgstr "我们非常重视安全，请您认真遵守我们的安全政策。" #: warehouse/templates/pages/security.html:24 @@ -5210,12 +5105,10 @@ msgstr "重要！" #: warehouse/templates/pages/security.html:24 msgid "" -"If you believe you've identified a security issue with Warehouse, <strong>DO " -"NOT</strong> report the issue in any public forum, including (but not " -"limited to):" -msgstr "" -"如果您认为您发现了仓库的安全问题，请<strong>不要</strong>在任何公共论坛上报告" -"该问题，包括（但不限于）：" +"If you believe you've identified a security issue with Warehouse, " +"<strong>DO NOT</strong> report the issue in any public forum, including " +"(but not limited to):" +msgstr "如果您认为您发现了仓库的安全问题，请<strong>不要</strong>在任何公共论坛上报告该问题，包括（但不限于）：" #: warehouse/templates/pages/security.html:27 msgid "Our GitHub issue tracker" @@ -5232,21 +5125,19 @@ msgstr "官方或非官方邮件列表" #: warehouse/templates/pages/security.html:35 #, python-format msgid "" -"Instead, email <a href=\"%(href)s\">security at python dot org</a> directly, " -"providing as much relevant information as possible." -msgstr "" -"相反，<a href=\"%(href)s\">python dot org的电子邮件安全性</a>直接提供尽可能多" -"的相关信息。" +"Instead, email <a href=\"%(href)s\">security at python dot org</a> " +"directly, providing as much relevant information as possible." +msgstr "相反，<a href=\"%(href)s\">python dot org的电子邮件安全性</a>直接提供尽可能多的相关信息。" #: warehouse/templates/pages/security.html:36 #, python-format msgid "" "Messages may be optionally encrypted with GPG using key fingerprints " -"available <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">at the Python Security page</a>." +"available <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">at the Python Security page</a>." msgstr "" -"可以选择使用<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python安全页面上</a>提供的密钥指纹使用GPG对消息进行加密。" +"可以选择使用<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python安全页面上</a>提供的密钥指纹使用GPG对消息进行加密。" #: warehouse/templates/pages/security.html:38 msgid "What happens next?" @@ -5301,9 +5192,9 @@ msgstr "安全策略" msgid "Sponsor the Packaging Working Group" msgstr "" +# | msgid "Search and filter projects" #: warehouse/templates/pages/sponsor.html:23 #, fuzzy -#| msgid "Search and filter projects" msgid "Sponsor PyPI and related projects" msgstr "搜索和筛选项目" @@ -5311,22 +5202,22 @@ msgstr "搜索和筛选项目" msgid "Donate to the Packaging Working Group" msgstr "" +# | msgid "" +# | "The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" +# | "\"noopener\">PyPA</a> is an independent group of developers whose goal is +# " +# | "to improve and maintain many of the core projects related to Python " +# | "packaging." #: warehouse/templates/pages/sponsor.html:27 #, fuzzy, python-format -#| msgid "" -#| "The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -#| "\"noopener\">PyPA</a> is an independent group of developers whose goal is " -#| "to improve and maintain many of the core projects related to Python " -#| "packaging." msgid "" -"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Packaging Working Group</a> is a work group of the Python Software " -"Foundation which raises and distributes funds to improve Python's packaging " -"ecosystem." +"The <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Packaging Working Group</a> is a work group of the " +"Python Software Foundation which raises and distributes funds to improve " +"Python's packaging ecosystem." msgstr "" -"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">PyPA</a>是一个独立的开发团队，其目标是改进和维护与Python打包相关的许多核心" -"项目。" +"<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">PyPA</a>是一个独立的开发团队，其目标是改进和维护与Python打包相关的许多核心项目。" #: warehouse/templates/pages/sponsor.html:29 msgid "Recent projects funded through the working group include:" @@ -5338,86 +5229,90 @@ msgid "" "'Warehouse' codebase" msgstr "" +# | msgid "" +# | "Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" +# | "\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" +# title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/sponsor.html:33 #, fuzzy, python-format -#| msgid "" -#| "Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -#| "\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$170,000 in funding</a> from the <a href=\"%(funder_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Mozilla Open Source " -"Support Program</a> in 2018" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$170,000 in funding</a> from the <a " +"href=\"%(funder_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Mozilla Open Source Support Program</a> in 2018" msgstr "" -"适用于<a href=\"%(android_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Android</a>或<a href=\"%(ios_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">iOS</a>的Duo Mobile" +"适用于<a href=\"%(android_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Android</a>或<a href=\"%(ios_href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">iOS</a>的Duo Mobile" #: warehouse/templates/pages/sponsor.html:36 msgid "" -"Improving PyPI's security and accessibility, and adding support for multiple " -"locales" +"Improving PyPI's security and accessibility, and adding support for " +"multiple locales" msgstr "" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:37 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" -"With $80,000 in funding from the <a href=\"%(funder_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology Fund</a> in " -"2019" +"With $80,000 in funding from the <a href=\"%(funder_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Open Technology " +"Fund</a> in 2019" msgstr "" -"前往 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python用户打包指南</a>去学习如何上传程序" +"前往 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python用户打包指南</a>去学习如何上传程序" #: warehouse/templates/pages/sponsor.html:40 msgid "Additional security-focused features for PyPI" msgstr "" +# | msgid "" +# | "Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" +# | "\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" +# title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" #: warehouse/templates/pages/sponsor.html:41 #, fuzzy, python-format -#| msgid "" -#| "Duo Mobile for <a href=\"%(android_href)s\" title=\"%(title)s\" target=" -#| "\"_blank\" rel=\"noopener\">Android</a> or <a href=\"%(ios_href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">iOS</a>" msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$100,000 in funding</a> from <a href=\"%(funder_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Facebook Research</a> in " -"2019 and 2020" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$100,000 in funding</a> from <a href=\"%(funder_href)s\"" +" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Facebook " +"Research</a> in 2019 and 2020" msgstr "" -"适用于<a href=\"%(android_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Android</a>或<a href=\"%(ios_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">iOS</a>的Duo Mobile" +"适用于<a href=\"%(android_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Android</a>或<a href=\"%(ios_href)s\" title=\"%(title)s\"" +" target=\"_blank\" rel=\"noopener\">iOS</a>的Duo Mobile" #: warehouse/templates/pages/sponsor.html:44 msgid "Overhauling pip's user experience and dependency resolver" msgstr "" +# | msgid "" +# | "Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" " +# | "target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s" +# | "\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</" +# | "a> and <a href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" +# " +# | "rel=\"noopener\">Thetis</a>." #: warehouse/templates/pages/sponsor.html:45 #, fuzzy, python-format -#| msgid "" -#| "Popular keys include <a href=\"%(yubikey_href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Yubikey</a>, <a href=\"%(titan_href)s" -#| "\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</" -#| "a> and <a href=\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Thetis</a>." -msgid "" -"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">$407,000 in funding</a> from the <a href=\"%(funder0_href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Chan Zuckerberg " -"Initiative</a> and the <a href=\"%(funder1_href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Mozilla Open Source Support Program</a> " -"in 2020" -msgstr "" -"流行的秘钥包括<a href=\"%(yubikey_href)s\" title=\"%(title)s\" target=" -"\"_blank\" rel=\"noopener\">Yubikey</a>、<a href=\"%(titan_href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google Titan</a>和<a href=" -"\"%(thetis_href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Thetis</a>。" +msgid "" +"With <a href=\"%(project_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">$407,000 in funding</a> from the <a " +"href=\"%(funder0_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Chan Zuckerberg Initiative</a> and the <a " +"href=\"%(funder1_href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Mozilla Open Source Support Program</a> in 2020" +msgstr "" +"流行的秘钥包括<a href=\"%(yubikey_href)s\" title=\"%(title)s\" target=\"_blank\"" +" rel=\"noopener\">Yubikey</a>、<a href=\"%(titan_href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Google " +"Titan</a>和<a href=\"%(thetis_href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">Thetis</a>。" #: warehouse/templates/pages/sponsor.html:49 msgid "" @@ -5425,9 +5320,9 @@ msgid "" "improvements, benefiting millions of Python users around the world." msgstr "" +# | msgid "Common questions" #: warehouse/templates/pages/sponsor.html:57 #, fuzzy -#| msgid "Common questions" msgid "Community donations" msgstr "常见问题" @@ -5435,33 +5330,34 @@ msgstr "常见问题" msgid "We greatly appreciate both one-time and recurring donations." msgstr "" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:61 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" -"For US taxpayers, <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -"rel=\"noopener\">your donation may be tax-deductible</a>." +"For US taxpayers, <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">your donation may be tax-" +"deductible</a>." msgstr "" -"前往 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python用户打包指南</a>去学习如何上传程序" +"前往 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python用户打包指南</a>去学习如何上传程序" #: warehouse/templates/pages/sponsor.html:62 msgid "Every donation counts!" msgstr "" +# | msgid "Donate" #: warehouse/templates/pages/sponsor.html:65 #, fuzzy -#| msgid "Donate" msgid "Donate here" msgstr "捐赠" +# | msgid "Go to <a href=\"%(href)s\">reset your password</a>." #: warehouse/templates/pages/sponsor.html:66 #, fuzzy, python-format -#| msgid "Go to <a href=\"%(href)s\">reset your password</a>." -msgid "" -"Donating over $5,000? <a href=\"%(href)s\">Become a sponsor</a> instead." +msgid "Donating over $5,000? <a href=\"%(href)s\">Become a sponsor</a> instead." msgstr "去<a href=\"%(href)s\">重置你的密码</a>。" #: warehouse/templates/pages/sponsor.html:77 @@ -5470,8 +5366,8 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:78 msgid "" -"Looking for brand visibility? In the last year*, 21.1 million people from " -"237 countries visited PyPI.org." +"Looking for brand visibility? In the last year*, 21.1 million people from" +" 237 countries visited PyPI.org." msgstr "" #: warehouse/templates/pages/sponsor.html:79 @@ -5484,8 +5380,8 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:83 msgid "" -"Funds raised by the packaging working group go directly towards improving " -"the tools your company uses every day." +"Funds raised by the packaging working group go directly towards improving" +" the tools your company uses every day." msgstr "" #: warehouse/templates/pages/sponsor.html:86 @@ -5494,13 +5390,13 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:87 msgid "" -"Enhance your company's reputation by investing in Python and the open source " -"community." +"Enhance your company's reputation by investing in Python and the open " +"source community." msgstr "" +# | msgid "Uploading packages" #: warehouse/templates/pages/sponsor.html:96 #, fuzzy -#| msgid "Uploading packages" msgid "Sponsorship packages" msgstr "正在上传软件包" @@ -5522,19 +5418,20 @@ msgid "" "perpetuity</strong>" msgstr "" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:112 #: warehouse/templates/pages/sponsor.html:133 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" -"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation " -"blog</a>" +"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation blog</a>" msgstr "" -"前往 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python用户打包指南</a>去学习如何上传程序" +"前往 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python用户打包指南</a>去学习如何上传程序" #: warehouse/templates/pages/sponsor.html:116 #: warehouse/templates/pages/sponsor.html:139 @@ -5556,7 +5453,8 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:130 msgid "" -"Logo in a <strong>prominent position</strong> on the PyPI project detail page" +"Logo in a <strong>prominent position</strong> on the PyPI project detail " +"page" msgstr "" #: warehouse/templates/pages/sponsor.html:131 @@ -5571,36 +5469,37 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:243 #, python-format msgid "" -"Logo <strong>and write up</strong> on the <a href=\"%(href)s\">PyPI sponsors " -"page</a>" +"Logo <strong>and write up</strong> on the <a href=\"%(href)s\">PyPI " +"sponsors page</a>" msgstr "" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:134 #: warehouse/templates/pages/sponsor.html:157 #: warehouse/templates/pages/sponsor.html:180 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" "<strong>Quarterly</strong> thank you tweet from the <a href=\"%(href)s\" " "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " "Foundation</a>" msgstr "" -"前往 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python用户打包指南</a>去学习如何上传程序" +"前往 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python用户打包指南</a>去学习如何上传程序" +# | msgid "" +# | "PyPI supports any device that adheres to the <a href=\"%(href)s\" title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." #: warehouse/templates/pages/sponsor.html:135 #: warehouse/templates/pages/sponsor.html:158 #: warehouse/templates/pages/sponsor.html:181 #, fuzzy, python-format -#| msgid "" -#| "PyPI supports any device that adheres to the <a href=\"%(href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">FIDO standard</a>." msgid "" "<strong>Quarterly</strong> thank you tweet from the <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</" -"a>" +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" "PyPI支持任何遵循<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " "rel=\"noopener\">FIDO标准</a>的设备。" @@ -5615,27 +5514,27 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:153 msgid "" -"Logo on <strong>high rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>high rotation</strong> in a prominent position on the " +"PyPI project detail page" msgstr "" +# | msgid "" +# | "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +# | "rel=\"noopener\">Python Packaging User Guide</a> for details on the " +# | "available formats." #: warehouse/templates/pages/sponsor.html:156 #: warehouse/templates/pages/sponsor.html:179 #: warehouse/templates/pages/sponsor.html:201 #: warehouse/templates/pages/sponsor.html:222 #, fuzzy, python-format -#| msgid "" -#| "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Python Packaging User Guide</a> for details on the " -#| "available formats." msgid "" "Inclusion in a blog post on the <a href=\"%(href)s\" title=\"%(title)s\" " "target=\"_blank\" rel=\"noopener\">Python Software Foundation blog</a>, " -"<strong>with other sponsors</strong> whose sponsorship commenced during the " -"same quarter" +"<strong>with other sponsors</strong> whose sponsorship commenced during " +"the same quarter" msgstr "" -"有关可用格式的详细信息，请参阅<a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python打包指南</a>。" +"有关可用格式的详细信息，请参阅<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\"" +" rel=\"noopener\">Python打包指南</a>。" #: warehouse/templates/pages/sponsor.html:171 msgid "Gold" @@ -5647,8 +5546,8 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:176 msgid "" -"Logo on <strong>medium rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>medium rotation</strong> in a prominent position on the " +"PyPI project detail page" msgstr "" #: warehouse/templates/pages/sponsor.html:194 @@ -5661,42 +5560,44 @@ msgstr "" #: warehouse/templates/pages/sponsor.html:199 msgid "" -"Logo on <strong>low rotation</strong> in a prominent position on the PyPI " -"project detail page" +"Logo on <strong>low rotation</strong> in a prominent position on the PyPI" +" project detail page" msgstr "" +# | msgid "Go to <a href=\"%(href)s\">reset your password</a>." #: warehouse/templates/pages/sponsor.html:200 #: warehouse/templates/pages/sponsor.html:221 #, fuzzy, python-format -#| msgid "Go to <a href=\"%(href)s\">reset your password</a>." msgid "Logo on the <a href=\"%(href)s\">PyPI sponsors page</a>" msgstr "去<a href=\"%(href)s\">重置你的密码</a>。" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:202 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" "<strong>Bi-yearly</strong> thank you tweet from the <a href=\"%(href)s\" " "title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " "Foundation</a>" msgstr "" -"前往 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python用户打包指南</a>去学习如何上传程序" +"前往 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python用户打包指南</a>去学习如何上传程序" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:203 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" "<strong>Bi-yearly</strong> thank you tweet from the <a href=\"%(href)s\" " -"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</" -"a>" +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" -"前往 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python用户打包指南</a>去学习如何上传程序" +"前往 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python用户打包指南</a>去学习如何上传程序" #: warehouse/templates/pages/sponsor.html:216 msgid "Bronze" @@ -5706,90 +5607,94 @@ msgstr "" msgid "$5,000 per year, or equivalent in donated services" msgstr "" +# | msgid "" +# | "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +# | "rel=\"noopener\">Python Packaging User Guide</a> for details on the " +# | "available formats." #: warehouse/templates/pages/sponsor.html:223 #, fuzzy, python-format -#| msgid "" -#| "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Python Packaging User Guide</a> for details on the " -#| "available formats." msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a> (on initial sponsorship, and on each subsequent renewal)" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a> (on initial sponsorship, and on each subsequent renewal)" msgstr "" -"有关可用格式的详细信息，请参阅<a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python打包指南</a>。" +"有关可用格式的详细信息，请参阅<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\"" +" rel=\"noopener\">Python打包指南</a>。" +# | msgid "" +# | "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +# | "rel=\"noopener\">Python Packaging User Guide</a> for details on the " +# | "available formats." #: warehouse/templates/pages/sponsor.html:224 #, fuzzy, python-format -#| msgid "" -#| "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Python Packaging User Guide</a> for details on the " -#| "available formats." msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</a> " -"(on initial sponsorship, and on each subsequent renewal)" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a> (on initial sponsorship, and on each subsequent renewal)" msgstr "" -"有关可用格式的详细信息，请参阅<a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python打包指南</a>。" +"有关可用格式的详细信息，请参阅<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\"" +" rel=\"noopener\">Python打包指南</a>。" #: warehouse/templates/pages/sponsor.html:238 msgid "One time grants / custom donations" msgstr "" +# | msgid "" +# | "Learn how to create a new release on the <a href=\"%(href)s\" title=" +# | "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " +# | "Guide</a>" #: warehouse/templates/pages/sponsor.html:239 #, fuzzy, python-format -#| msgid "" -#| "Learn how to create a new release on the <a href=\"%(href)s\" title=" -#| "\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Packaging User " -#| "Guide</a>" msgid "" -"Sponsorship of a specific feature, feature set, or community sprint, valued " -"at over $50,000. See <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank" -"\" rel=\"noopener\">fundable packaging improvements</a> for ideas." +"Sponsorship of a specific feature, feature set, or community sprint, " +"valued at over $50,000. See <a href=\"%(href)s\" title=\"%(title)s\" " +"target=\"_blank\" rel=\"noopener\">fundable packaging improvements</a> " +"for ideas." msgstr "" -"在<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=\"noopener" -"\">Python打包用户指南</a>上获取如何创建新的发布版本" +"在<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python打包用户指南</a>上获取如何创建新的发布版本" +# | msgid "" +# | "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +# | "rel=\"noopener\">Python Packaging User Guide</a> for details on the " +# | "available formats." #: warehouse/templates/pages/sponsor.html:244 #, fuzzy, python-format -#| msgid "" -#| "Refer to the <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " -#| "rel=\"noopener\">Python Packaging User Guide</a> for details on the " -#| "available formats." msgid "" -"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation " -"blog</a>, explaining what the funds will be used for" +"<strong>Individual</strong> blog post on the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation blog</a>, explaining what the funds will be used for" msgstr "" -"有关可用格式的详细信息，请参阅<a href=\"%(href)s\" title=\"%(title)s\" " -"target=\"_blank\" rel=\"noopener\">Python打包指南</a>。" +"有关可用格式的详细信息，请参阅<a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\"" +" rel=\"noopener\">Python打包指南</a>。" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:245 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software Foundation</" -"a>" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">Python Software " +"Foundation</a>" msgstr "" -"前往 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python用户打包指南</a>去学习如何上传程序" +"前往 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python用户打包指南</a>去学习如何上传程序" +# | msgid "" +# | "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" +# " +# | "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" #: warehouse/templates/pages/sponsor.html:246 #, fuzzy, python-format -#| msgid "" -#| "Learn how to upload files on the <a href=\"%(href)s\" title=\"%(title)s\" " -#| "target=\"_blank\" rel=\"noopener\">Python Packaging User Guide</a>" msgid "" -"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" title=" -"\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter account</a>" +"<strong>Single</strong> thank you tweet from the <a href=\"%(href)s\" " +"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">PyPI Twitter " +"account</a>" msgstr "" -"前往 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -"\"noopener\">Python用户打包指南</a>去学习如何上传程序" +"前往 <a href=\"%(href)s\" title=\"%(title)s\" target=\"_blank\" " +"rel=\"noopener\">Python用户打包指南</a>去学习如何上传程序" #: warehouse/templates/pages/sponsor.html:248 msgid "" @@ -5804,24 +5709,22 @@ msgstr "PyPI统计" #: warehouse/templates/pages/stats.html:23 msgid "" "We all love stats, so here are some useful statistics about PyPI. The " -"statistics page is cached for 24 hours, so don't expect the numbers to be " -"realtime." -msgstr "" -"我们都喜欢统计数据，所以这里有一些关于PyPI的有用统计数据。统计页面被缓存了24" -"小时，所以不要期望数字是实时的。" +"statistics page is cached for 24 hours, so don't expect the numbers to be" +" realtime." +msgstr "我们都喜欢统计数据，所以这里有一些关于PyPI的有用统计数据。统计页面被缓存了24小时，所以不要期望数字是实时的。" #: warehouse/templates/pages/stats.html:30 msgid "Top projects by total package size" msgstr "" +# | msgid "" +# | "Here is a list of the top 100 packages based on sum of their packages " +# | "sizes (in bytes)." #: warehouse/templates/pages/stats.html:32 #, fuzzy -#| msgid "" -#| "Here is a list of the top 100 packages based on sum of their packages " -#| "sizes (in bytes)." msgid "" -"Here is a list of the top 100 projects based on the sum of their packages' " -"sizes (in bytes)." +"Here is a list of the top 100 projects based on the sum of their " +"packages' sizes (in bytes)." msgstr "下面是根据包大小（字节）的总和列出的前100个包。" #: warehouse/templates/pages/stats.html:39 @@ -5974,52 +5877,41 @@ msgstr[0] "" #~ msgstr "<strong>添加人</strong>：%(submitter)s" #~ msgid "" -#~ "If this was a mistake, you can email <a href=\"%(href)s\">" -#~ "%(email_address)s</a> to communicate with the PyPI administrators." +#~ "If this was a mistake, you can " +#~ "email <a href=\"%(href)s\">%(email_address)s</a> to" +#~ " communicate with the PyPI administrators." #~ msgstr "" -#~ "如果这是一个错误，您可以向 <a href=\"%(href)s\">%(email_address)s</a> 发送" -#~ "电子邮件并于 PyPI 管理员沟通。" +#~ "如果这是一个错误，您可以向 <a href=\"%(href)s\">%(email_address)s</a>" +#~ " 发送电子邮件并于 PyPI 管理员沟通。" #~ msgid "You are receiving this because you are an owner of this project." #~ msgstr "您收到此邮件是因为您是该项目的所有者。" -#, fuzzy -#~| msgid "This project has no releases" #~ msgid "The project %(project)s has been deleted." #~ msgstr "此项目没有发布过版本" -#, fuzzy -#~| msgid "<strong>Added by</strong>: %(submitter)s" #~ msgid "" #~ "<strong>Deleted by:</strong> %(submitter)s with a role:\n" #~ " %(role)s." #~ msgstr "<strong>添加人</strong>：%(submitter)s" -#, fuzzy -#~| msgid "" -#~| "If this was a mistake, you can email <a href=\"%(href)s\">" -#~| "%(email_address)s</a> to communicate with the PyPI administrators." #~ msgid "" #~ "If this was a mistake, you can email <a\n" -#~ " href=\"%(href)s\">%(email_address)s</a> to communicate with the PyPI " -#~ "administrators." +#~ " href=\"%(href)s\">%(email_address)s</a> to " +#~ "communicate with the PyPI administrators." #~ msgstr "" -#~ "如果这是一个错误，您可以向 <a href=\"%(href)s\">%(email_address)s</a> 发送" -#~ "电子邮件并于 PyPI 管理员沟通。" +#~ "如果这是一个错误，您可以向 <a href=\"%(href)s\">%(email_address)s</a>" +#~ " 发送电子邮件并于 PyPI 管理员沟通。" -#, fuzzy -#~| msgid "You are receiving this because you are an owner of this project." #~ msgid "" -#~ "You are receiving this because you are %(recipient_role_descr)s of this " -#~ "project." +#~ "You are receiving this because you " +#~ "are %(recipient_role_descr)s of this project." #~ msgstr "您收到此邮件是因为您是该项目的所有者。" -#, fuzzy -#~| msgid "You are receiving this because you are an owner of this project." #~ msgid "" #~ "\n" -#~ "You are receiving this because you are %(recipient_role_descr)s of this " -#~ "project." +#~ "You are receiving this because you " +#~ "are %(recipient_role_descr)s of this project." #~ msgstr "您收到此邮件是因为您是该项目的所有者。" #~ msgid "View <span>hashes</span>" @@ -6029,33 +5921,38 @@ msgstr[0] "" #~ msgstr "测试版功能" #~ msgid "" -#~ "If you lose your %(method)s and can no longer log in, the PyPI team " -#~ "<strong>cannot</strong> currently help you recover your account. We plan " -#~ "to develop a <a href=\"%(policy_href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">manual account recovery policy</a> and " -#~ "implement <a href=\"%(recovery_codes_href)s\" title=\"%(title)s\" target=" -#~ "\"_blank\" rel=\"noopener\">account recovery codes</a> to address this " -#~ "issue." +#~ "If you lose your %(method)s and " +#~ "can no longer log in, the PyPI " +#~ "team <strong>cannot</strong> currently help " +#~ "you recover your account. We plan " +#~ "to develop a <a href=\"%(policy_href)s\" " +#~ "title=\"%(title)s\" target=\"_blank\" " +#~ "rel=\"noopener\">manual account recovery policy</a>" +#~ " and implement <a " +#~ "href=\"%(recovery_codes_href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\">account recovery " +#~ "codes</a> to address this issue." #~ msgstr "" -#~ "如果你忘记了您的%(method)s并且无法登录，PyPI团队目前<strong>无法</strong>" -#~ "帮助您恢复帐户。我们计划制定<a href=\"%(policy_href)s\" title=\"%(title)s" -#~ "\" target=\"_blank\" rel=\"noopener\">手动帐户恢复策略</a>并实施<a href=" -#~ "\"%(recovery_codes_href)s\" title=\"%(title)s\" target=\"_blank\" rel=" -#~ "\"noopener\">帐户恢复代码</a>来解决此问题。" +#~ "如果你忘记了您的%(method)s并且无法登录，PyPI团队目前<strong>无法</strong>帮助您恢复帐户。我们计划制定<a" +#~ " href=\"%(policy_href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\">手动帐户恢复策略</a>并实施<a " +#~ "href=\"%(recovery_codes_href)s\" title=\"%(title)s\" " +#~ "target=\"_blank\" rel=\"noopener\">帐户恢复代码</a>来解决此问题。" #~ msgid "" #~ "\n" -#~ " In the short term, we recommend that all PyPI users set up " -#~ "<em>both</em>\n" -#~ " supported two factor authentication methods - using an " -#~ "authentication\n" -#~ " application <em>and</em> setting up a security device (e.g. USB " -#~ "key).\n" +#~ " In the short term, we " +#~ "recommend that all PyPI users set " +#~ "up <em>both</em>\n" +#~ " supported two factor authentication" +#~ " methods - using an authentication\n" +#~ " application <em>and</em> setting up" +#~ " a security device (e.g. USB key)." +#~ "\n" #~ " " #~ msgstr "" #~ "\n" -#~ " 短期内，我们建议所有PyPI用户<em>都</em>设置支持的两种身份验证方" -#~ "法\n" +#~ " 短期内，我们建议所有PyPI用户<em>都</em>设置支持的两种身份验证方法\n" #~ " ——使用身份验证应用程序<em>和</em>设置安全设备（例如USB密钥）\n" #~ " " @@ -6071,8 +5968,7 @@ msgstr[0] "" #~ msgid "Simple index" #~ msgstr "简单索引" -#~ msgid "" -#~ "There have been too many unsuccessful login attempts, try again later." +#~ msgid "There have been too many unsuccessful login attempts, try again later." #~ msgstr "登录尝试失败次数过多，请稍后再试。" #~ msgid "Created on" @@ -6080,3 +5976,4 @@ msgstr[0] "" #~ msgid "User's username" #~ msgstr "用户的用户名" +
getpelican__pelican-905
[ { "content": "#!/usr/bin/env python\n\n# -*- coding: utf-8 -*-\nfrom __future__ import unicode_literals, print_function\nimport six\n\nimport os\nimport string\nimport argparse\nimport sys\nimport codecs\n\nfrom pelican import __version__\n\n_TEMPLATES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)),\n \"templates\")\n\nCONF = {\n 'pelican': 'pelican',\n 'pelicanopts': '',\n 'basedir': os.curdir,\n 'ftp_host': 'localhost',\n 'ftp_user': 'anonymous',\n 'ftp_target_dir': '/',\n 'ssh_host': 'localhost',\n 'ssh_port': 22,\n 'ssh_user': 'root',\n 'ssh_target_dir': '/var/www',\n 's3_bucket': 'my_s3_bucket',\n 'dropbox_dir': '~/Dropbox/Public/',\n 'default_pagination': 10,\n 'siteurl': '',\n 'lang': 'en'\n}\n\ndef _input_compat(prompt):\n if six.PY3:\n r = input(prompt)\n else:\n # FIXME: why use this with @decoding_strings?\n r = raw_input(prompt).decode('utf-8')\n return r\n\nif six.PY3:\n str_compat = str\nelse:\n str_compat = unicode\n\ndef decoding_strings(f):\n def wrapper(*args, **kwargs):\n out = f(*args, **kwargs)\n if isinstance(out, six.string_types) and not six.PY3:\n # todo: make encoding configurable?\n if six.PY3:\n return out\n else:\n return out.decode(sys.stdin.encoding)\n return out\n return wrapper\n\n\ndef get_template(name, as_encoding='utf-8'):\n template = os.path.join(_TEMPLATES_DIR, \"{0}.in\".format(name))\n\n if not os.path.isfile(template):\n raise RuntimeError(\"Cannot open {0}\".format(template))\n\n with codecs.open(template, 'r', as_encoding) as fd:\n line = fd.readline()\n while line:\n yield line\n line = fd.readline()\n fd.close()\n\n\n@decoding_strings\ndef ask(question, answer=str_compat, default=None, l=None):\n if answer == str_compat:\n r = ''\n while True:\n if default:\n r = _input_compat('> {0} [{1}] '.format(question, default))\n else:\n r = _input_compat('> {0} '.format(question, default))\n\n r = r.strip()\n\n if len(r) <= 0:\n if default:\n r = default\n break\n else:\n print('You must enter something')\n else:\n if l and len(r) != l:\n print('You must enter a {0} letters long string'.format(l))\n else:\n break\n\n return r\n\n elif answer == bool:\n r = None\n while True:\n if default is True:\n r = _input_compat('> {0} (Y/n) '.format(question))\n elif default is False:\n r = _input_compat('> {0} (y/N) '.format(question))\n else:\n r = _input_compat('> {0} (y/n) '.format(question))\n\n r = r.strip().lower()\n\n if r in ('y', 'yes'):\n r = True\n break\n elif r in ('n', 'no'):\n r = False\n break\n elif not r:\n r = default\n break\n else:\n print(\"You must answer 'yes' or 'no'\")\n return r\n elif answer == int:\n r = None\n while True:\n if default:\n r = _input_compat('> {0} [{1}] '.format(question, default))\n else:\n r = _input_compat('> {0} '.format(question))\n\n r = r.strip()\n\n if not r:\n r = default\n break\n\n try:\n r = int(r)\n break\n except:\n print('You must enter an integer')\n return r\n else:\n raise NotImplemented('Argument `answer` must be str_compat, bool, or integer')\n\n\ndef main():\n parser = argparse.ArgumentParser(\n description=\"A kickstarter for Pelican\",\n formatter_class=argparse.ArgumentDefaultsHelpFormatter)\n parser.add_argument('-p', '--path', default=os.curdir,\n help=\"The path to generate the blog into\")\n parser.add_argument('-t', '--title', metavar=\"title\",\n help='Set the title of the website')\n parser.add_argument('-a', '--author', metavar=\"author\",\n help='Set the author name of the website')\n parser.add_argument('-l', '--lang', metavar=\"lang\",\n help='Set the default web site language')\n\n args = parser.parse_args()\n\n print('''Welcome to pelican-quickstart v{v}.\n\nThis script will help you create a new Pelican-based website.\n\nPlease answer the following questions so this script can generate the files\nneeded by Pelican.\n\n '''.format(v=__version__))\n\n project = os.path.join(\n os.environ.get('VIRTUAL_ENV', os.curdir), '.project')\n if os.path.isfile(project):\n CONF['basedir'] = open(project, 'r').read().rstrip(\"\\n\")\n print('Using project associated with current virtual environment.'\n 'Will save to:\\n%s\\n' % CONF['basedir'])\n else:\n CONF['basedir'] = os.path.abspath(ask('Where do you want to create your new web site?', answer=str_compat, default=args.path))\n\n CONF['sitename'] = ask('What will be the title of this web site?', answer=str_compat, default=args.title)\n CONF['author'] = ask('Who will be the author of this web site?', answer=str_compat, default=args.author)\n CONF['lang'] = ask('What will be the default language of this web site?', str_compat, args.lang or CONF['lang'], 2)\n\n if ask('Do you want to specify a URL prefix? e.g., http://example.com ', answer=bool, default=True):\n CONF['siteurl'] = ask('What is your URL prefix? (see above example; no trailing slash)', str_compat, CONF['siteurl'])\n\n CONF['with_pagination'] = ask('Do you want to enable article pagination?', bool, bool(CONF['default_pagination']))\n\n if CONF['with_pagination']:\n CONF['default_pagination'] = ask('How many articles per page do you want?', int, CONF['default_pagination'])\n else:\n CONF['default_pagination'] = False\n\n mkfile = ask('Do you want to generate a Makefile to easily manage your website?', bool, True)\n develop = ask('Do you want an auto-reload & simpleHTTP script to assist with theme and site development?', bool, True)\n\n if mkfile:\n if ask('Do you want to upload your website using FTP?', answer=bool, default=False):\n CONF['ftp_host'] = ask('What is the hostname of your FTP server?', str_compat, CONF['ftp_host'])\n CONF['ftp_user'] = ask('What is your username on that server?', str_compat, CONF['ftp_user'])\n CONF['ftp_target_dir'] = ask('Where do you want to put your web site on that server?', str_compat, CONF['ftp_target_dir'])\n if ask('Do you want to upload your website using SSH?', answer=bool, default=False):\n CONF['ssh_host'] = ask('What is the hostname of your SSH server?', str_compat, CONF['ssh_host'])\n CONF['ssh_port'] = ask('What is the port of your SSH server?', int, CONF['ssh_port'])\n CONF['ssh_user'] = ask('What is your username on that server?', str_compat, CONF['ssh_user'])\n CONF['ssh_target_dir'] = ask('Where do you want to put your web site on that server?', str_compat, CONF['ssh_target_dir'])\n if ask('Do you want to upload your website using Dropbox?', answer=bool, default=False):\n CONF['dropbox_dir'] = ask('Where is your Dropbox directory?', str_compat, CONF['dropbox_dir'])\n if ask('Do you want to upload your website using S3?', answer=bool, default=False):\n CONF['s3_bucket'] = ask('What is the name of your S3 bucket?', str_compat, CONF['s3_bucket'])\n\n try:\n os.makedirs(os.path.join(CONF['basedir'], 'content'))\n except OSError as e:\n print('Error: {0}'.format(e))\n\n try:\n os.makedirs(os.path.join(CONF['basedir'], 'output'))\n except OSError as e:\n print('Error: {0}'.format(e))\n\n try:\n with codecs.open(os.path.join(CONF['basedir'], 'pelicanconf.py'), 'w', 'utf-8') as fd:\n conf_python = dict()\n for key, value in CONF.items():\n conf_python[key] = repr(value)\n\n for line in get_template('pelicanconf.py'):\n template = string.Template(line)\n fd.write(template.safe_substitute(conf_python))\n fd.close()\n except OSError as e:\n print('Error: {0}'.format(e))\n\n try:\n with codecs.open(os.path.join(CONF['basedir'], 'publishconf.py'), 'w', 'utf-8') as fd:\n for line in get_template('publishconf.py'):\n template = string.Template(line)\n fd.write(template.safe_substitute(CONF))\n fd.close()\n except OSError as e:\n print('Error: {0}'.format(e))\n\n if mkfile:\n try:\n with codecs.open(os.path.join(CONF['basedir'], 'Makefile'), 'w', 'utf-8') as fd:\n mkfile_template_name = 'Makefile'\n py_v = 'PY=python'\n if six.PY3:\n py_v = 'PY=python3'\n template = string.Template(py_v)\n fd.write(template.safe_substitute(CONF))\n fd.write('\\n')\n for line in get_template(mkfile_template_name):\n template = string.Template(line)\n fd.write(template.safe_substitute(CONF))\n fd.close()\n except OSError as e:\n print('Error: {0}'.format(e))\n\n if develop:\n conf_shell = dict()\n for key, value in CONF.items():\n if isinstance(value, six.string_types) and ' ' in value:\n value = '\"' + value.replace('\"', '\\\\\"') + '\"'\n conf_shell[key] = value\n try:\n with codecs.open(os.path.join(CONF['basedir'], 'develop_server.sh'), 'w', 'utf-8') as fd:\n lines = list(get_template('develop_server.sh'))\n py_v = 'PY=python\\n'\n if six.PY3:\n py_v = 'PY=python3\\n'\n lines = lines[:4] + [py_v] + lines[4:]\n for line in lines:\n template = string.Template(line)\n fd.write(template.safe_substitute(conf_shell))\n fd.close()\n os.chmod((os.path.join(CONF['basedir'], 'develop_server.sh')), 493) # mode 0o755\n except OSError as e:\n print('Error: {0}'.format(e))\n\n print('Done. Your new project is available at %s' % CONF['basedir'])\n", "path": "pelican/tools/pelican_quickstart.py" } ]
[ { "content": "#!/usr/bin/env python\n\n# -*- coding: utf-8 -*-\nfrom __future__ import unicode_literals, print_function\nimport six\n\nimport os\nimport string\nimport argparse\nimport sys\nimport codecs\n\nfrom pelican import __version__\n\n_TEMPLATES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)),\n \"templates\")\n\nCONF = {\n 'pelican': 'pelican',\n 'pelicanopts': '',\n 'basedir': os.curdir,\n 'ftp_host': 'localhost',\n 'ftp_user': 'anonymous',\n 'ftp_target_dir': '/',\n 'ssh_host': 'localhost',\n 'ssh_port': 22,\n 'ssh_user': 'root',\n 'ssh_target_dir': '/var/www',\n 's3_bucket': 'my_s3_bucket',\n 'dropbox_dir': '~/Dropbox/Public/',\n 'default_pagination': 10,\n 'siteurl': '',\n 'lang': 'en'\n}\n\ndef _input_compat(prompt):\n if six.PY3:\n r = input(prompt)\n else:\n r = raw_input(prompt)\n return r\n\nif six.PY3:\n str_compat = str\nelse:\n str_compat = unicode\n\ndef decoding_strings(f):\n def wrapper(*args, **kwargs):\n out = f(*args, **kwargs)\n if isinstance(out, six.string_types) and not six.PY3:\n # todo: make encoding configurable?\n if six.PY3:\n return out\n else:\n return out.decode(sys.stdin.encoding)\n return out\n return wrapper\n\n\ndef get_template(name, as_encoding='utf-8'):\n template = os.path.join(_TEMPLATES_DIR, \"{0}.in\".format(name))\n\n if not os.path.isfile(template):\n raise RuntimeError(\"Cannot open {0}\".format(template))\n\n with codecs.open(template, 'r', as_encoding) as fd:\n line = fd.readline()\n while line:\n yield line\n line = fd.readline()\n fd.close()\n\n\n@decoding_strings\ndef ask(question, answer=str_compat, default=None, l=None):\n if answer == str_compat:\n r = ''\n while True:\n if default:\n r = _input_compat('> {0} [{1}] '.format(question, default))\n else:\n r = _input_compat('> {0} '.format(question, default))\n\n r = r.strip()\n\n if len(r) <= 0:\n if default:\n r = default\n break\n else:\n print('You must enter something')\n else:\n if l and len(r) != l:\n print('You must enter a {0} letters long string'.format(l))\n else:\n break\n\n return r\n\n elif answer == bool:\n r = None\n while True:\n if default is True:\n r = _input_compat('> {0} (Y/n) '.format(question))\n elif default is False:\n r = _input_compat('> {0} (y/N) '.format(question))\n else:\n r = _input_compat('> {0} (y/n) '.format(question))\n\n r = r.strip().lower()\n\n if r in ('y', 'yes'):\n r = True\n break\n elif r in ('n', 'no'):\n r = False\n break\n elif not r:\n r = default\n break\n else:\n print(\"You must answer 'yes' or 'no'\")\n return r\n elif answer == int:\n r = None\n while True:\n if default:\n r = _input_compat('> {0} [{1}] '.format(question, default))\n else:\n r = _input_compat('> {0} '.format(question))\n\n r = r.strip()\n\n if not r:\n r = default\n break\n\n try:\n r = int(r)\n break\n except:\n print('You must enter an integer')\n return r\n else:\n raise NotImplemented('Argument `answer` must be str_compat, bool, or integer')\n\n\ndef main():\n parser = argparse.ArgumentParser(\n description=\"A kickstarter for Pelican\",\n formatter_class=argparse.ArgumentDefaultsHelpFormatter)\n parser.add_argument('-p', '--path', default=os.curdir,\n help=\"The path to generate the blog into\")\n parser.add_argument('-t', '--title', metavar=\"title\",\n help='Set the title of the website')\n parser.add_argument('-a', '--author', metavar=\"author\",\n help='Set the author name of the website')\n parser.add_argument('-l', '--lang', metavar=\"lang\",\n help='Set the default web site language')\n\n args = parser.parse_args()\n\n print('''Welcome to pelican-quickstart v{v}.\n\nThis script will help you create a new Pelican-based website.\n\nPlease answer the following questions so this script can generate the files\nneeded by Pelican.\n\n '''.format(v=__version__))\n\n project = os.path.join(\n os.environ.get('VIRTUAL_ENV', os.curdir), '.project')\n if os.path.isfile(project):\n CONF['basedir'] = open(project, 'r').read().rstrip(\"\\n\")\n print('Using project associated with current virtual environment.'\n 'Will save to:\\n%s\\n' % CONF['basedir'])\n else:\n CONF['basedir'] = os.path.abspath(ask('Where do you want to create your new web site?', answer=str_compat, default=args.path))\n\n CONF['sitename'] = ask('What will be the title of this web site?', answer=str_compat, default=args.title)\n CONF['author'] = ask('Who will be the author of this web site?', answer=str_compat, default=args.author)\n CONF['lang'] = ask('What will be the default language of this web site?', str_compat, args.lang or CONF['lang'], 2)\n\n if ask('Do you want to specify a URL prefix? e.g., http://example.com ', answer=bool, default=True):\n CONF['siteurl'] = ask('What is your URL prefix? (see above example; no trailing slash)', str_compat, CONF['siteurl'])\n\n CONF['with_pagination'] = ask('Do you want to enable article pagination?', bool, bool(CONF['default_pagination']))\n\n if CONF['with_pagination']:\n CONF['default_pagination'] = ask('How many articles per page do you want?', int, CONF['default_pagination'])\n else:\n CONF['default_pagination'] = False\n\n mkfile = ask('Do you want to generate a Makefile to easily manage your website?', bool, True)\n develop = ask('Do you want an auto-reload & simpleHTTP script to assist with theme and site development?', bool, True)\n\n if mkfile:\n if ask('Do you want to upload your website using FTP?', answer=bool, default=False):\n CONF['ftp_host'] = ask('What is the hostname of your FTP server?', str_compat, CONF['ftp_host'])\n CONF['ftp_user'] = ask('What is your username on that server?', str_compat, CONF['ftp_user'])\n CONF['ftp_target_dir'] = ask('Where do you want to put your web site on that server?', str_compat, CONF['ftp_target_dir'])\n if ask('Do you want to upload your website using SSH?', answer=bool, default=False):\n CONF['ssh_host'] = ask('What is the hostname of your SSH server?', str_compat, CONF['ssh_host'])\n CONF['ssh_port'] = ask('What is the port of your SSH server?', int, CONF['ssh_port'])\n CONF['ssh_user'] = ask('What is your username on that server?', str_compat, CONF['ssh_user'])\n CONF['ssh_target_dir'] = ask('Where do you want to put your web site on that server?', str_compat, CONF['ssh_target_dir'])\n if ask('Do you want to upload your website using Dropbox?', answer=bool, default=False):\n CONF['dropbox_dir'] = ask('Where is your Dropbox directory?', str_compat, CONF['dropbox_dir'])\n if ask('Do you want to upload your website using S3?', answer=bool, default=False):\n CONF['s3_bucket'] = ask('What is the name of your S3 bucket?', str_compat, CONF['s3_bucket'])\n\n try:\n os.makedirs(os.path.join(CONF['basedir'], 'content'))\n except OSError as e:\n print('Error: {0}'.format(e))\n\n try:\n os.makedirs(os.path.join(CONF['basedir'], 'output'))\n except OSError as e:\n print('Error: {0}'.format(e))\n\n try:\n with codecs.open(os.path.join(CONF['basedir'], 'pelicanconf.py'), 'w', 'utf-8') as fd:\n conf_python = dict()\n for key, value in CONF.items():\n conf_python[key] = repr(value)\n\n for line in get_template('pelicanconf.py'):\n template = string.Template(line)\n fd.write(template.safe_substitute(conf_python))\n fd.close()\n except OSError as e:\n print('Error: {0}'.format(e))\n\n try:\n with codecs.open(os.path.join(CONF['basedir'], 'publishconf.py'), 'w', 'utf-8') as fd:\n for line in get_template('publishconf.py'):\n template = string.Template(line)\n fd.write(template.safe_substitute(CONF))\n fd.close()\n except OSError as e:\n print('Error: {0}'.format(e))\n\n if mkfile:\n try:\n with codecs.open(os.path.join(CONF['basedir'], 'Makefile'), 'w', 'utf-8') as fd:\n mkfile_template_name = 'Makefile'\n py_v = 'PY=python'\n if six.PY3:\n py_v = 'PY=python3'\n template = string.Template(py_v)\n fd.write(template.safe_substitute(CONF))\n fd.write('\\n')\n for line in get_template(mkfile_template_name):\n template = string.Template(line)\n fd.write(template.safe_substitute(CONF))\n fd.close()\n except OSError as e:\n print('Error: {0}'.format(e))\n\n if develop:\n conf_shell = dict()\n for key, value in CONF.items():\n if isinstance(value, six.string_types) and ' ' in value:\n value = '\"' + value.replace('\"', '\\\\\"') + '\"'\n conf_shell[key] = value\n try:\n with codecs.open(os.path.join(CONF['basedir'], 'develop_server.sh'), 'w', 'utf-8') as fd:\n lines = list(get_template('develop_server.sh'))\n py_v = 'PY=python\\n'\n if six.PY3:\n py_v = 'PY=python3\\n'\n lines = lines[:4] + [py_v] + lines[4:]\n for line in lines:\n template = string.Template(line)\n fd.write(template.safe_substitute(conf_shell))\n fd.close()\n os.chmod((os.path.join(CONF['basedir'], 'develop_server.sh')), 493) # mode 0o755\n except OSError as e:\n print('Error: {0}'.format(e))\n\n print('Done. Your new project is available at %s' % CONF['basedir'])\n", "path": "pelican/tools/pelican_quickstart.py" } ]
diff --git a/pelican/tools/pelican_quickstart.py b/pelican/tools/pelican_quickstart.py index a60452563..e62bc5cad 100755 --- a/pelican/tools/pelican_quickstart.py +++ b/pelican/tools/pelican_quickstart.py @@ -37,8 +37,7 @@ def _input_compat(prompt): if six.PY3: r = input(prompt) else: - # FIXME: why use this with @decoding_strings? - r = raw_input(prompt).decode('utf-8') + r = raw_input(prompt) return r if six.PY3:
searxng__searxng-299
[ { "content": "# SPDX-License-Identifier: AGPL-3.0-or-later\n# lint: pylint\n\"\"\"OpenStreetMap (Map)\n\n\"\"\"\n# pylint: disable=missing-function-docstring\n\nimport re\nfrom json import loads\nfrom urllib.parse import urlencode\nfrom functools import partial\n\nfrom flask_babel import gettext\n\nfrom searx.data import OSM_KEYS_TAGS, CURRENCIES\nfrom searx.utils import searx_useragent\nfrom searx.external_urls import get_external_url\nfrom searx.engines.wikidata import send_wikidata_query, sparql_string_escape\n\n# about\nabout = {\n \"website\": 'https://www.openstreetmap.org/',\n \"wikidata_id\": 'Q936',\n \"official_api_documentation\": 'http://wiki.openstreetmap.org/wiki/Nominatim',\n \"use_official_api\": True,\n \"require_api_key\": False,\n \"results\": 'JSON',\n}\n\n# engine dependent config\ncategories = ['map']\npaging = False\n\n# search-url\nbase_url = 'https://nominatim.openstreetmap.org/'\nsearch_string = 'search?{query}&polygon_geojson=1&format=jsonv2&addressdetails=1&extratags=1&dedupe=1'\nresult_id_url = 'https://openstreetmap.org/{osm_type}/{osm_id}'\nresult_lat_lon_url = 'https://www.openstreetmap.org/?mlat={lat}&mlon={lon}&zoom={zoom}&layers=M'\n\nroute_url = 'https://graphhopper.com/maps/?point={}&point={}&locale=en-US&vehicle=car&weighting=fastest&turn_costs=true&use_miles=false&layer=Omniscale' # pylint: disable=line-too-long\nroute_re = re.compile('(?:from )?(.+) to (.+)')\n\nwikidata_image_sparql = \"\"\"\nselect ?item ?itemLabel ?image ?sign ?symbol ?website ?wikipediaName\nwhere {\n values ?item { %WIKIDATA_IDS% }\n OPTIONAL { ?item wdt:P18|wdt:P8517|wdt:P4291|wdt:P5252|wdt:P3451|wdt:P4640|wdt:P5775|wdt:P2716|wdt:P1801|wdt:P4896 ?image }\n OPTIONAL { ?item wdt:P1766|wdt:P8505|wdt:P8667 ?sign }\n OPTIONAL { ?item wdt:P41|wdt:P94|wdt:P154|wdt:P158|wdt:P2910|wdt:P4004|wdt:P5962|wdt:P8972 ?symbol }\n OPTIONAL { ?item wdt:P856 ?website }\n SERVICE wikibase:label {\n bd:serviceParam wikibase:language \"%LANGUAGE%,en\".\n ?item rdfs:label ?itemLabel .\n }\n OPTIONAL {\n ?wikipediaUrl schema:about ?item;\n schema:isPartOf/wikibase:wikiGroup \"wikipedia\";\n schema:name ?wikipediaName;\n schema:inLanguage \"%LANGUAGE%\" .\n }\n}\nORDER by ?item\n\"\"\"\n\n\n# key value that are link: mapping functions\n# 'mapillary': P1947\n# but https://github.com/kartaview/openstreetcam.org/issues/60\n# but https://taginfo.openstreetmap.org/keys/kartaview ...\ndef value_to_https_link(value):\n http = 'http://'\n if value.startswith(http):\n value = 'https://' + value[len(http) :]\n return (value, value)\n\n\ndef value_to_website_link(value):\n value = value.split(';')[0]\n return (value, value)\n\n\ndef value_wikipedia_link(value):\n value = value.split(':', 1)\n return ('https://{0}.wikipedia.org/wiki/{1}'.format(*value), '{1} ({0})'.format(*value))\n\n\ndef value_with_prefix(prefix, value):\n return (prefix + value, value)\n\n\nVALUE_TO_LINK = {\n 'website': value_to_website_link,\n 'contact:website': value_to_website_link,\n 'email': partial(value_with_prefix, 'mailto:'),\n 'contact:email': partial(value_with_prefix, 'mailto:'),\n 'contact:phone': partial(value_with_prefix, 'tel:'),\n 'phone': partial(value_with_prefix, 'tel:'),\n 'fax': partial(value_with_prefix, 'fax:'),\n 'contact:fax': partial(value_with_prefix, 'fax:'),\n 'contact:mastodon': value_to_https_link,\n 'facebook': value_to_https_link,\n 'contact:facebook': value_to_https_link,\n 'contact:foursquare': value_to_https_link,\n 'contact:instagram': value_to_https_link,\n 'contact:linkedin': value_to_https_link,\n 'contact:pinterest': value_to_https_link,\n 'contact:telegram': value_to_https_link,\n 'contact:tripadvisor': value_to_https_link,\n 'contact:twitter': value_to_https_link,\n 'contact:yelp': value_to_https_link,\n 'contact:youtube': value_to_https_link,\n 'contact:webcam': value_to_website_link,\n 'wikipedia': value_wikipedia_link,\n 'wikidata': partial(value_with_prefix, 'https://wikidata.org/wiki/'),\n 'brand:wikidata': partial(value_with_prefix, 'https://wikidata.org/wiki/'),\n}\nKEY_ORDER = [\n 'cuisine',\n 'organic',\n 'delivery',\n 'delivery:covid19',\n 'opening_hours',\n 'opening_hours:covid19',\n 'fee',\n 'payment:*',\n 'currency:*',\n 'outdoor_seating',\n 'bench',\n 'wheelchair',\n 'level',\n 'building:levels',\n 'bin',\n 'public_transport',\n 'internet_access:ssid',\n]\nKEY_RANKS = {k: i for i, k in enumerate(KEY_ORDER)}\n\n\ndef request(query, params):\n \"\"\"do search-request\"\"\"\n params['url'] = base_url + search_string.format(query=urlencode({'q': query}))\n params['route'] = route_re.match(query)\n params['headers']['User-Agent'] = searx_useragent()\n return params\n\n\ndef response(resp):\n \"\"\"get response from search-request\"\"\"\n results = []\n nominatim_json = loads(resp.text)\n user_language = resp.search_params['language']\n\n if resp.search_params['route']:\n results.append({\n 'answer': gettext('Get directions'),\n 'url': route_url.format(*resp.search_params['route'].groups()),\n })\n\n fetch_wikidata(nominatim_json, user_language)\n\n for result in nominatim_json:\n title, address = get_title_address(result)\n\n # ignore result without title\n if not title:\n continue\n\n url, osm, geojson = get_url_osm_geojson(result)\n img_src = get_img_src(result)\n links, link_keys = get_links(result, user_language)\n data = get_data(result, user_language, link_keys)\n\n results.append({\n 'template': 'map.html',\n 'title': title,\n 'address': address,\n 'address_label': get_key_label('addr', user_language),\n 'url': url,\n 'osm': osm,\n 'geojson': geojson,\n 'img_src': img_src,\n 'links': links,\n 'data': data,\n 'type': get_tag_label(\n result.get('category'), result.get('type', ''), user_language\n ),\n 'type_icon': result.get('icon'),\n 'content': '',\n 'longitude': result['lon'],\n 'latitude': result['lat'],\n 'boundingbox': result['boundingbox'],\n })\n\n return results\n\n\ndef get_wikipedia_image(raw_value):\n if not raw_value:\n return None\n return get_external_url('wikimedia_image', raw_value)\n\n\ndef fetch_wikidata(nominatim_json, user_langage):\n \"\"\"Update nominatim_json using the result of an unique to wikidata\n\n For result in nominatim_json:\n If result['extratags']['wikidata'] or r['extratags']['wikidata link']:\n Set result['wikidata'] to { 'image': ..., 'image_sign':..., 'image_symbal':... }\n Set result['extratags']['wikipedia'] if not defined\n Set result['extratags']['contact:website'] if not defined\n \"\"\"\n wikidata_ids = []\n wd_to_results = {}\n for result in nominatim_json:\n e = result.get(\"extratags\")\n if e:\n # ignore brand:wikidata\n wd_id = e.get(\"wikidata\", e.get(\"wikidata link\"))\n if wd_id and wd_id not in wikidata_ids:\n wikidata_ids.append(\"wd:\" + wd_id)\n wd_to_results.setdefault(wd_id, []).append(result)\n\n if wikidata_ids:\n wikidata_ids_str = \" \".join(wikidata_ids)\n query = wikidata_image_sparql.replace('%WIKIDATA_IDS%', sparql_string_escape(wikidata_ids_str)).replace(\n '%LANGUAGE%', sparql_string_escape(user_langage)\n )\n wikidata_json = send_wikidata_query(query)\n for wd_result in wikidata_json.get('results', {}).get('bindings', {}):\n wd_id = wd_result['item']['value'].replace('http://www.wikidata.org/entity/', '')\n for result in wd_to_results.get(wd_id, []):\n result['wikidata'] = {\n 'itemLabel': wd_result['itemLabel']['value'],\n 'image': get_wikipedia_image(wd_result.get('image', {}).get('value')),\n 'image_sign': get_wikipedia_image(wd_result.get('sign', {}).get('value')),\n 'image_symbol': get_wikipedia_image(wd_result.get('symbol', {}).get('value')),\n }\n # overwrite wikipedia link\n wikipedia_name = wd_result.get('wikipediaName', {}).get('value')\n if wikipedia_name:\n result['extratags']['wikipedia'] = user_langage + ':' + wikipedia_name\n # get website if not already defined\n website = wd_result.get('website', {}).get('value')\n if (\n website\n and not result['extratags'].get('contact:website')\n and not result['extratags'].get('website')\n ):\n result['extratags']['contact:website'] = website\n\n\ndef get_title_address(result):\n \"\"\"Return title and address\n\n title may be None\n \"\"\"\n address_raw = result.get('address')\n address_name = None\n address = {}\n\n # get name\n if (\n result['category'] == 'amenity'\n or result['category'] == 'shop'\n or result['category'] == 'tourism'\n or result['category'] == 'leisure'\n ):\n if address_raw.get('address29'):\n # https://github.com/osm-search/Nominatim/issues/1662\n address_name = address_raw.get('address29')\n else:\n address_name = address_raw.get(result['category'])\n elif result['type'] in address_raw:\n address_name = address_raw.get(result['type'])\n\n # add rest of adressdata, if something is already found\n if address_name:\n title = address_name\n address.update(\n {\n 'name': address_name,\n 'house_number': address_raw.get('house_number'),\n 'road': address_raw.get('road'),\n 'locality': address_raw.get(\n 'city', address_raw.get('town', address_raw.get('village')) # noqa\n ), # noqa\n 'postcode': address_raw.get('postcode'),\n 'country': address_raw.get('country'),\n 'country_code': address_raw.get('country_code'),\n }\n )\n else:\n title = result.get('display_name')\n\n return title, address\n\n\ndef get_url_osm_geojson(result):\n \"\"\"Get url, osm and geojson\n \"\"\"\n osm_type = result.get('osm_type', result.get('type'))\n if 'osm_id' not in result:\n # see https://github.com/osm-search/Nominatim/issues/1521\n # query example: \"EC1M 5RF London\"\n url = result_lat_lon_url.format(lat=result['lat'], lon=result['lon'], zoom=12)\n osm = {}\n else:\n url = result_id_url.format(osm_type=osm_type, osm_id=result['osm_id'])\n osm = {'type': osm_type, 'id': result['osm_id']}\n\n geojson = result.get('geojson')\n # if no geojson is found and osm_type is a node, add geojson Point\n if not geojson and osm_type == 'node':\n geojson = {'type': 'Point', 'coordinates': [result['lon'], result['lat']]}\n\n return url, osm, geojson\n\n\ndef get_img_src(result):\n \"\"\"Get image URL from either wikidata or r['extratags']\"\"\"\n # wikidata\n img_src = None\n if 'wikidata' in result:\n img_src = result['wikidata']['image']\n if not img_src:\n img_src = result['wikidata']['image_symbol']\n if not img_src:\n img_src = result['wikidata']['image_sign']\n\n # img_src\n if not img_src and result.get('extratags', {}).get('image'):\n img_src = result['extratags']['image']\n del result['extratags']['image']\n if not img_src and result.get('extratags', {}).get('wikimedia_commons'):\n img_src = get_external_url('wikimedia_image', result['extratags']['wikimedia_commons'])\n del result['extratags']['wikimedia_commons']\n\n return img_src\n\n\ndef get_links(result, user_language):\n \"\"\"Return links from result['extratags']\"\"\"\n links = []\n link_keys = set()\n for k, mapping_function in VALUE_TO_LINK.items():\n raw_value = result['extratags'].get(k)\n if raw_value:\n url, url_label = mapping_function(raw_value)\n if url.startswith('https://wikidata.org'):\n url_label = result.get('wikidata', {}).get('itemLabel') or url_label\n links.append({\n 'label': get_key_label(k, user_language),\n 'url': url,\n 'url_label': url_label,\n })\n link_keys.add(k)\n return links, link_keys\n\n\ndef get_data(result, user_language, ignore_keys):\n \"\"\"Return key, value of result['extratags']\n\n Must be call after get_links\n\n Note: the values are not translated\n \"\"\"\n data = []\n for k, v in result['extratags'].items():\n if k in ignore_keys:\n continue\n if get_key_rank(k) is None:\n continue\n k_label = get_key_label(k, user_language)\n if k_label:\n data.append({\n 'label': k_label,\n 'key': k,\n 'value': v,\n })\n data.sort(key=lambda entry: (get_key_rank(entry['key']), entry['label']))\n return data\n\n\ndef get_key_rank(k):\n \"\"\"Get OSM key rank\n\n The rank defines in which order the key are displayed in the HTML result\n \"\"\"\n key_rank = KEY_RANKS.get(k)\n if key_rank is None:\n # \"payment:*\" in KEY_ORDER matches \"payment:cash\", \"payment:debit card\", etc...\n key_rank = KEY_RANKS.get(k.split(':')[0] + ':*')\n return key_rank\n\n\ndef get_label(labels, lang):\n \"\"\"Get label from labels in OSM_KEYS_TAGS\n\n in OSM_KEYS_TAGS, labels have key == '*'\n \"\"\"\n tag_label = labels.get(lang.lower())\n if tag_label is None:\n # example: if 'zh-hk' is not found, check 'zh'\n tag_label = labels.get(lang.split('-')[0])\n if tag_label is None and lang != 'en':\n # example: if 'zh' is not found, check 'en'\n tag_label = labels.get('en')\n if tag_label is None and len(labels.values()) > 0:\n # example: if still not found, use the first entry\n tag_label = labels.values()[0]\n return tag_label\n\n\ndef get_tag_label(tag_category, tag_name, lang):\n \"\"\"Get tag label from OSM_KEYS_TAGS\"\"\"\n tag_name = '' if tag_name is None else tag_name\n tag_labels = OSM_KEYS_TAGS['tags'].get(tag_category, {}).get(tag_name, {})\n return get_label(tag_labels, lang)\n\n\ndef get_key_label(key_name, lang):\n \"\"\"Get key label from OSM_KEYS_TAGS\"\"\"\n if key_name.startswith('currency:'):\n # currency:EUR --> get the name from the CURRENCIES variable\n # see https://wiki.openstreetmap.org/wiki/Key%3Acurrency\n # and for exampe https://taginfo.openstreetmap.org/keys/currency:EUR#values\n # but there is also currency=EUR (currently not handled)\n # https://taginfo.openstreetmap.org/keys/currency#values\n currency = key_name.split(':')\n if len(currency) > 1:\n o = CURRENCIES['iso4217'].get(currency)\n if o:\n return get_label(o, lang).lower()\n return currency\n\n labels = OSM_KEYS_TAGS['keys']\n for k in key_name.split(':') + ['*']:\n labels = labels.get(k)\n if labels is None:\n return None\n return get_label(labels, lang)\n", "path": "searx/engines/openstreetmap.py" } ]
[ { "content": "# SPDX-License-Identifier: AGPL-3.0-or-later\n# lint: pylint\n\"\"\"OpenStreetMap (Map)\n\n\"\"\"\n# pylint: disable=missing-function-docstring\n\nimport re\nfrom json import loads\nfrom urllib.parse import urlencode\nfrom functools import partial\n\nfrom flask_babel import gettext\n\nfrom searx.data import OSM_KEYS_TAGS, CURRENCIES\nfrom searx.utils import searx_useragent\nfrom searx.external_urls import get_external_url\nfrom searx.engines.wikidata import send_wikidata_query, sparql_string_escape\n\n# about\nabout = {\n \"website\": 'https://www.openstreetmap.org/',\n \"wikidata_id\": 'Q936',\n \"official_api_documentation\": 'http://wiki.openstreetmap.org/wiki/Nominatim',\n \"use_official_api\": True,\n \"require_api_key\": False,\n \"results\": 'JSON',\n}\n\n# engine dependent config\ncategories = ['map']\npaging = False\n\n# search-url\nbase_url = 'https://nominatim.openstreetmap.org/'\nsearch_string = 'search?{query}&polygon_geojson=1&format=jsonv2&addressdetails=1&extratags=1&dedupe=1'\nresult_id_url = 'https://openstreetmap.org/{osm_type}/{osm_id}'\nresult_lat_lon_url = 'https://www.openstreetmap.org/?mlat={lat}&mlon={lon}&zoom={zoom}&layers=M'\n\nroute_url = 'https://graphhopper.com/maps/?point={}&point={}&locale=en-US&vehicle=car&weighting=fastest&turn_costs=true&use_miles=false&layer=Omniscale' # pylint: disable=line-too-long\nroute_re = re.compile('(?:from )?(.+) to (.+)')\n\nwikidata_image_sparql = \"\"\"\nselect ?item ?itemLabel ?image ?sign ?symbol ?website ?wikipediaName\nwhere {\n values ?item { %WIKIDATA_IDS% }\n OPTIONAL { ?item wdt:P18|wdt:P8517|wdt:P4291|wdt:P5252|wdt:P3451|wdt:P4640|wdt:P5775|wdt:P2716|wdt:P1801|wdt:P4896 ?image }\n OPTIONAL { ?item wdt:P1766|wdt:P8505|wdt:P8667 ?sign }\n OPTIONAL { ?item wdt:P41|wdt:P94|wdt:P154|wdt:P158|wdt:P2910|wdt:P4004|wdt:P5962|wdt:P8972 ?symbol }\n OPTIONAL { ?item wdt:P856 ?website }\n SERVICE wikibase:label {\n bd:serviceParam wikibase:language \"%LANGUAGE%,en\".\n ?item rdfs:label ?itemLabel .\n }\n OPTIONAL {\n ?wikipediaUrl schema:about ?item;\n schema:isPartOf/wikibase:wikiGroup \"wikipedia\";\n schema:name ?wikipediaName;\n schema:inLanguage \"%LANGUAGE%\" .\n }\n}\nORDER by ?item\n\"\"\"\n\n\n# key value that are link: mapping functions\n# 'mapillary': P1947\n# but https://github.com/kartaview/openstreetcam.org/issues/60\n# but https://taginfo.openstreetmap.org/keys/kartaview ...\ndef value_to_https_link(value):\n http = 'http://'\n if value.startswith(http):\n value = 'https://' + value[len(http) :]\n return (value, value)\n\n\ndef value_to_website_link(value):\n value = value.split(';')[0]\n return (value, value)\n\n\ndef value_wikipedia_link(value):\n value = value.split(':', 1)\n return ('https://{0}.wikipedia.org/wiki/{1}'.format(*value), '{1} ({0})'.format(*value))\n\n\ndef value_with_prefix(prefix, value):\n return (prefix + value, value)\n\n\nVALUE_TO_LINK = {\n 'website': value_to_website_link,\n 'contact:website': value_to_website_link,\n 'email': partial(value_with_prefix, 'mailto:'),\n 'contact:email': partial(value_with_prefix, 'mailto:'),\n 'contact:phone': partial(value_with_prefix, 'tel:'),\n 'phone': partial(value_with_prefix, 'tel:'),\n 'fax': partial(value_with_prefix, 'fax:'),\n 'contact:fax': partial(value_with_prefix, 'fax:'),\n 'contact:mastodon': value_to_https_link,\n 'facebook': value_to_https_link,\n 'contact:facebook': value_to_https_link,\n 'contact:foursquare': value_to_https_link,\n 'contact:instagram': value_to_https_link,\n 'contact:linkedin': value_to_https_link,\n 'contact:pinterest': value_to_https_link,\n 'contact:telegram': value_to_https_link,\n 'contact:tripadvisor': value_to_https_link,\n 'contact:twitter': value_to_https_link,\n 'contact:yelp': value_to_https_link,\n 'contact:youtube': value_to_https_link,\n 'contact:webcam': value_to_website_link,\n 'wikipedia': value_wikipedia_link,\n 'wikidata': partial(value_with_prefix, 'https://wikidata.org/wiki/'),\n 'brand:wikidata': partial(value_with_prefix, 'https://wikidata.org/wiki/'),\n}\nKEY_ORDER = [\n 'cuisine',\n 'organic',\n 'delivery',\n 'delivery:covid19',\n 'opening_hours',\n 'opening_hours:covid19',\n 'fee',\n 'payment:*',\n 'currency:*',\n 'outdoor_seating',\n 'bench',\n 'wheelchair',\n 'level',\n 'building:levels',\n 'bin',\n 'public_transport',\n 'internet_access:ssid',\n]\nKEY_RANKS = {k: i for i, k in enumerate(KEY_ORDER)}\n\n\ndef request(query, params):\n \"\"\"do search-request\"\"\"\n params['url'] = base_url + search_string.format(query=urlencode({'q': query}))\n params['route'] = route_re.match(query)\n params['headers']['User-Agent'] = searx_useragent()\n return params\n\n\ndef response(resp):\n \"\"\"get response from search-request\"\"\"\n results = []\n nominatim_json = loads(resp.text)\n user_language = resp.search_params['language']\n\n if resp.search_params['route']:\n results.append({\n 'answer': gettext('Get directions'),\n 'url': route_url.format(*resp.search_params['route'].groups()),\n })\n\n fetch_wikidata(nominatim_json, user_language)\n\n for result in nominatim_json:\n title, address = get_title_address(result)\n\n # ignore result without title\n if not title:\n continue\n\n url, osm, geojson = get_url_osm_geojson(result)\n img_src = get_img_src(result)\n links, link_keys = get_links(result, user_language)\n data = get_data(result, user_language, link_keys)\n\n results.append({\n 'template': 'map.html',\n 'title': title,\n 'address': address,\n 'address_label': get_key_label('addr', user_language),\n 'url': url,\n 'osm': osm,\n 'geojson': geojson,\n 'img_src': img_src,\n 'links': links,\n 'data': data,\n 'type': get_tag_label(\n result.get('category'), result.get('type', ''), user_language\n ),\n 'type_icon': result.get('icon'),\n 'content': '',\n 'longitude': result['lon'],\n 'latitude': result['lat'],\n 'boundingbox': result['boundingbox'],\n })\n\n return results\n\n\ndef get_wikipedia_image(raw_value):\n if not raw_value:\n return None\n return get_external_url('wikimedia_image', raw_value)\n\n\ndef fetch_wikidata(nominatim_json, user_langage):\n \"\"\"Update nominatim_json using the result of an unique to wikidata\n\n For result in nominatim_json:\n If result['extratags']['wikidata'] or r['extratags']['wikidata link']:\n Set result['wikidata'] to { 'image': ..., 'image_sign':..., 'image_symbal':... }\n Set result['extratags']['wikipedia'] if not defined\n Set result['extratags']['contact:website'] if not defined\n \"\"\"\n wikidata_ids = []\n wd_to_results = {}\n for result in nominatim_json:\n e = result.get(\"extratags\")\n if e:\n # ignore brand:wikidata\n wd_id = e.get(\"wikidata\", e.get(\"wikidata link\"))\n if wd_id and wd_id not in wikidata_ids:\n wikidata_ids.append(\"wd:\" + wd_id)\n wd_to_results.setdefault(wd_id, []).append(result)\n\n if wikidata_ids:\n wikidata_ids_str = \" \".join(wikidata_ids)\n query = wikidata_image_sparql.replace('%WIKIDATA_IDS%', sparql_string_escape(wikidata_ids_str)).replace(\n '%LANGUAGE%', sparql_string_escape(user_langage)\n )\n wikidata_json = send_wikidata_query(query)\n for wd_result in wikidata_json.get('results', {}).get('bindings', {}):\n wd_id = wd_result['item']['value'].replace('http://www.wikidata.org/entity/', '')\n for result in wd_to_results.get(wd_id, []):\n result['wikidata'] = {\n 'itemLabel': wd_result['itemLabel']['value'],\n 'image': get_wikipedia_image(wd_result.get('image', {}).get('value')),\n 'image_sign': get_wikipedia_image(wd_result.get('sign', {}).get('value')),\n 'image_symbol': get_wikipedia_image(wd_result.get('symbol', {}).get('value')),\n }\n # overwrite wikipedia link\n wikipedia_name = wd_result.get('wikipediaName', {}).get('value')\n if wikipedia_name:\n result['extratags']['wikipedia'] = user_langage + ':' + wikipedia_name\n # get website if not already defined\n website = wd_result.get('website', {}).get('value')\n if (\n website\n and not result['extratags'].get('contact:website')\n and not result['extratags'].get('website')\n ):\n result['extratags']['contact:website'] = website\n\n\ndef get_title_address(result):\n \"\"\"Return title and address\n\n title may be None\n \"\"\"\n address_raw = result.get('address')\n address_name = None\n address = {}\n\n # get name\n if (\n result['category'] == 'amenity'\n or result['category'] == 'shop'\n or result['category'] == 'tourism'\n or result['category'] == 'leisure'\n ):\n if address_raw.get('address29'):\n # https://github.com/osm-search/Nominatim/issues/1662\n address_name = address_raw.get('address29')\n else:\n address_name = address_raw.get(result['category'])\n elif result['type'] in address_raw:\n address_name = address_raw.get(result['type'])\n\n # add rest of adressdata, if something is already found\n if address_name:\n title = address_name\n address.update(\n {\n 'name': address_name,\n 'house_number': address_raw.get('house_number'),\n 'road': address_raw.get('road'),\n 'locality': address_raw.get(\n 'city', address_raw.get('town', address_raw.get('village')) # noqa\n ), # noqa\n 'postcode': address_raw.get('postcode'),\n 'country': address_raw.get('country'),\n 'country_code': address_raw.get('country_code'),\n }\n )\n else:\n title = result.get('display_name')\n\n return title, address\n\n\ndef get_url_osm_geojson(result):\n \"\"\"Get url, osm and geojson\n \"\"\"\n osm_type = result.get('osm_type', result.get('type'))\n if 'osm_id' not in result:\n # see https://github.com/osm-search/Nominatim/issues/1521\n # query example: \"EC1M 5RF London\"\n url = result_lat_lon_url.format(lat=result['lat'], lon=result['lon'], zoom=12)\n osm = {}\n else:\n url = result_id_url.format(osm_type=osm_type, osm_id=result['osm_id'])\n osm = {'type': osm_type, 'id': result['osm_id']}\n\n geojson = result.get('geojson')\n # if no geojson is found and osm_type is a node, add geojson Point\n if not geojson and osm_type == 'node':\n geojson = {'type': 'Point', 'coordinates': [result['lon'], result['lat']]}\n\n return url, osm, geojson\n\n\ndef get_img_src(result):\n \"\"\"Get image URL from either wikidata or r['extratags']\"\"\"\n # wikidata\n img_src = None\n if 'wikidata' in result:\n img_src = result['wikidata']['image']\n if not img_src:\n img_src = result['wikidata']['image_symbol']\n if not img_src:\n img_src = result['wikidata']['image_sign']\n\n # img_src\n if not img_src and result.get('extratags', {}).get('image'):\n img_src = result['extratags']['image']\n del result['extratags']['image']\n if not img_src and result.get('extratags', {}).get('wikimedia_commons'):\n img_src = get_external_url('wikimedia_image', result['extratags']['wikimedia_commons'])\n del result['extratags']['wikimedia_commons']\n\n return img_src\n\n\ndef get_links(result, user_language):\n \"\"\"Return links from result['extratags']\"\"\"\n links = []\n link_keys = set()\n for k, mapping_function in VALUE_TO_LINK.items():\n raw_value = result['extratags'].get(k)\n if raw_value:\n url, url_label = mapping_function(raw_value)\n if url.startswith('https://wikidata.org'):\n url_label = result.get('wikidata', {}).get('itemLabel') or url_label\n links.append({\n 'label': get_key_label(k, user_language),\n 'url': url,\n 'url_label': url_label,\n })\n link_keys.add(k)\n return links, link_keys\n\n\ndef get_data(result, user_language, ignore_keys):\n \"\"\"Return key, value of result['extratags']\n\n Must be call after get_links\n\n Note: the values are not translated\n \"\"\"\n data = []\n for k, v in result['extratags'].items():\n if k in ignore_keys:\n continue\n if get_key_rank(k) is None:\n continue\n k_label = get_key_label(k, user_language)\n if k_label:\n data.append({\n 'label': k_label,\n 'key': k,\n 'value': v,\n })\n data.sort(key=lambda entry: (get_key_rank(entry['key']), entry['label']))\n return data\n\n\ndef get_key_rank(k):\n \"\"\"Get OSM key rank\n\n The rank defines in which order the key are displayed in the HTML result\n \"\"\"\n key_rank = KEY_RANKS.get(k)\n if key_rank is None:\n # \"payment:*\" in KEY_ORDER matches \"payment:cash\", \"payment:debit card\", etc...\n key_rank = KEY_RANKS.get(k.split(':')[0] + ':*')\n return key_rank\n\n\ndef get_label(labels, lang):\n \"\"\"Get label from labels in OSM_KEYS_TAGS\n\n in OSM_KEYS_TAGS, labels have key == '*'\n \"\"\"\n tag_label = labels.get(lang.lower())\n if tag_label is None:\n # example: if 'zh-hk' is not found, check 'zh'\n tag_label = labels.get(lang.split('-')[0])\n if tag_label is None and lang != 'en':\n # example: if 'zh' is not found, check 'en'\n tag_label = labels.get('en')\n if tag_label is None and len(labels.values()) > 0:\n # example: if still not found, use the first entry\n tag_label = labels.values()[0]\n return tag_label\n\n\ndef get_tag_label(tag_category, tag_name, lang):\n \"\"\"Get tag label from OSM_KEYS_TAGS\"\"\"\n tag_name = '' if tag_name is None else tag_name\n tag_labels = OSM_KEYS_TAGS['tags'].get(tag_category, {}).get(tag_name, {})\n return get_label(tag_labels, lang)\n\n\ndef get_key_label(key_name, lang):\n \"\"\"Get key label from OSM_KEYS_TAGS\"\"\"\n if key_name.startswith('currency:'):\n # currency:EUR --> get the name from the CURRENCIES variable\n # see https://wiki.openstreetmap.org/wiki/Key%3Acurrency\n # and for exampe https://taginfo.openstreetmap.org/keys/currency:EUR#values\n # but there is also currency=EUR (currently not handled)\n # https://taginfo.openstreetmap.org/keys/currency#values\n currency = key_name.split(':')\n if len(currency) > 1:\n o = CURRENCIES['iso4217'].get(currency)\n if o:\n return get_label(o, lang).lower()\n return currency\n\n labels = OSM_KEYS_TAGS['keys']\n for k in key_name.split(':') + ['*']:\n labels = labels.get(k)\n if labels is None:\n return None\n return get_label(labels, lang)\n\n\ndef init(_):\n import searx.engines.wikidata # pylint: disable=import-outside-toplevel\n searx.engines.wikidata.logger = logger\n", "path": "searx/engines/openstreetmap.py" } ]
diff --git a/searx/engines/openstreetmap.py b/searx/engines/openstreetmap.py index 6920356c3a8..721769a25e8 100644 --- a/searx/engines/openstreetmap.py +++ b/searx/engines/openstreetmap.py @@ -439,3 +439,8 @@ def get_key_label(key_name, lang): if labels is None: return None return get_label(labels, lang) + + +def init(_): + import searx.engines.wikidata # pylint: disable=import-outside-toplevel + searx.engines.wikidata.logger = logger
googleapis__google-api-python-client-1030
[ { "content": "# Copyright 2014 Google Inc. All Rights Reserved.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\n\"\"\"Setup script for Google API Python client.\n\nAlso installs included versions of third party libraries, if those libraries\nare not already installed.\n\"\"\"\nfrom __future__ import print_function\n\nimport sys\n\nif sys.version_info < (2, 7):\n print(\"google-api-python-client requires python version >= 2.7.\", file=sys.stderr)\n sys.exit(1)\nif (3, 1) <= sys.version_info < (3, 4):\n print(\"google-api-python-client requires python3 version >= 3.4.\", file=sys.stderr)\n sys.exit(1)\n\nimport io\nimport os\nfrom setuptools import setup\n\npackages = [\"apiclient\", \"googleapiclient\", \"googleapiclient/discovery_cache\"]\n\ninstall_requires = [\n # NOTE: Apache Beam tests depend on this library and cannot\n # currently upgrade their httplib2 version.\n # Please see https://github.com/googleapis/google-api-python-client/pull/841\n \"httplib2>=0.9.2,<1dev\",\n \"google-auth>=1.16.0\",\n \"google-auth-httplib2>=0.0.3\",\n \"google-api-core>=1.21.0,<2dev\",\n \"six>=1.6.1,<2dev\",\n \"uritemplate>=3.0.0,<4dev\",\n]\n\npackage_root = os.path.abspath(os.path.dirname(__file__))\n\nreadme_filename = os.path.join(package_root, \"README.md\")\nwith io.open(readme_filename, encoding=\"utf-8\") as readme_file:\n readme = readme_file.read()\n\nversion = \"1.12.0\"\n\nsetup(\n name=\"google-api-python-client\",\n version=version,\n description=\"Google API Client Library for Python\",\n long_description=readme,\n long_description_content_type='text/markdown',\n author=\"Google LLC\",\n author_email=\"googleapis-packages@google.com\",\n url=\"https://github.com/googleapis/google-api-python-client/\",\n install_requires=install_requires,\n python_requires=\">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*\",\n packages=packages,\n package_data={},\n license=\"Apache 2.0\",\n keywords=\"google api client\",\n classifiers=[\n \"Programming Language :: Python :: 2\",\n \"Programming Language :: Python :: 2.7\",\n \"Programming Language :: Python :: 3\",\n \"Programming Language :: Python :: 3.5\",\n \"Programming Language :: Python :: 3.6\",\n \"Programming Language :: Python :: 3.7\",\n \"Development Status :: 5 - Production/Stable\",\n \"Intended Audience :: Developers\",\n \"License :: OSI Approved :: Apache Software License\",\n \"Operating System :: OS Independent\",\n \"Topic :: Internet :: WWW/HTTP\",\n ],\n)\n", "path": "setup.py" } ]
[ { "content": "# Copyright 2014 Google Inc. All Rights Reserved.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\n\"\"\"Setup script for Google API Python client.\n\nAlso installs included versions of third party libraries, if those libraries\nare not already installed.\n\"\"\"\nfrom __future__ import print_function\n\nimport sys\n\nif sys.version_info < (2, 7):\n print(\"google-api-python-client requires python version >= 2.7.\", file=sys.stderr)\n sys.exit(1)\nif (3, 1) <= sys.version_info < (3, 4):\n print(\"google-api-python-client requires python3 version >= 3.4.\", file=sys.stderr)\n sys.exit(1)\n\nimport io\nimport os\nfrom setuptools import setup\n\npackages = [\"apiclient\", \"googleapiclient\", \"googleapiclient/discovery_cache\"]\n\ninstall_requires = [\n # NOTE: Apache Beam tests depend on this library and cannot\n # currently upgrade their httplib2 version.\n # Please see https://github.com/googleapis/google-api-python-client/pull/841\n \"httplib2>=0.9.2,<1dev\",\n \"google-auth>=1.16.0\",\n \"google-auth-httplib2>=0.0.3\",\n \"google-api-core>=1.21.0,<2dev\",\n \"six>=1.13.0,<2dev\",\n \"uritemplate>=3.0.0,<4dev\",\n]\n\npackage_root = os.path.abspath(os.path.dirname(__file__))\n\nreadme_filename = os.path.join(package_root, \"README.md\")\nwith io.open(readme_filename, encoding=\"utf-8\") as readme_file:\n readme = readme_file.read()\n\nversion = \"1.12.0\"\n\nsetup(\n name=\"google-api-python-client\",\n version=version,\n description=\"Google API Client Library for Python\",\n long_description=readme,\n long_description_content_type='text/markdown',\n author=\"Google LLC\",\n author_email=\"googleapis-packages@google.com\",\n url=\"https://github.com/googleapis/google-api-python-client/\",\n install_requires=install_requires,\n python_requires=\">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*\",\n packages=packages,\n package_data={},\n license=\"Apache 2.0\",\n keywords=\"google api client\",\n classifiers=[\n \"Programming Language :: Python :: 2\",\n \"Programming Language :: Python :: 2.7\",\n \"Programming Language :: Python :: 3\",\n \"Programming Language :: Python :: 3.5\",\n \"Programming Language :: Python :: 3.6\",\n \"Programming Language :: Python :: 3.7\",\n \"Development Status :: 5 - Production/Stable\",\n \"Intended Audience :: Developers\",\n \"License :: OSI Approved :: Apache Software License\",\n \"Operating System :: OS Independent\",\n \"Topic :: Internet :: WWW/HTTP\",\n ],\n)\n", "path": "setup.py" } ]
diff --git a/setup.py b/setup.py index 231e9d2ba45..eb069151ee1 100644 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ "google-auth>=1.16.0", "google-auth-httplib2>=0.0.3", "google-api-core>=1.21.0,<2dev", - "six>=1.6.1,<2dev", + "six>=1.13.0,<2dev", "uritemplate>=3.0.0,<4dev", ]
pypi__warehouse-3600
[ { "content": "# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nimport functools\nimport time\n\nimport msgpack\nimport msgpack.exceptions\nimport redis\n\nfrom pyramid import viewderivers\nfrom pyramid.interfaces import ISession, ISessionFactory\nfrom zope.interface import implementer\n\nfrom warehouse.cache.http import add_vary\nfrom warehouse.utils import crypto\n\n\ndef _invalid_method(method):\n @functools.wraps(method)\n def wrapped(self, *args, **kwargs):\n self._error_message()\n return wrapped\n\n\n@implementer(ISession)\nclass InvalidSession(dict):\n\n __contains__ = _invalid_method(dict.__contains__)\n __delitem__ = _invalid_method(dict.__delitem__)\n __getitem__ = _invalid_method(dict.__getitem__)\n __iter__ = _invalid_method(dict.__iter__)\n __len__ = _invalid_method(dict.__len__)\n __setitem__ = _invalid_method(dict.__setitem__)\n clear = _invalid_method(dict.clear)\n copy = _invalid_method(dict.copy)\n fromkeys = _invalid_method(dict.fromkeys)\n get = _invalid_method(dict.get)\n items = _invalid_method(dict.items)\n keys = _invalid_method(dict.keys)\n pop = _invalid_method(dict.pop)\n popitem = _invalid_method(dict.popitem)\n setdefault = _invalid_method(dict.setdefault)\n update = _invalid_method(dict.update)\n values = _invalid_method(dict.values)\n\n def _error_message(self):\n raise RuntimeError(\n \"Cannot use request.session in a view without uses_session=True.\"\n )\n\n def __getattr__(self, name):\n self._error_message()\n\n @property\n def created(self):\n self._error_message()\n\n\ndef _changed_method(method):\n @functools.wraps(method)\n def wrapped(self, *args, **kwargs):\n self.changed()\n return method(self, *args, **kwargs)\n return wrapped\n\n\n@implementer(ISession)\nclass Session(dict):\n\n _csrf_token_key = \"_csrf_token\"\n _flash_key = \"_flash_messages\"\n\n # A number of our methods need to be decorated so that they also call\n # self.changed()\n __delitem__ = _changed_method(dict.__delitem__)\n __setitem__ = _changed_method(dict.__setitem__)\n clear = _changed_method(dict.clear)\n pop = _changed_method(dict.pop)\n popitem = _changed_method(dict.popitem)\n setdefault = _changed_method(dict.setdefault)\n update = _changed_method(dict.update)\n\n def __init__(self, data=None, session_id=None, new=True):\n # Brand new sessions don't have any data, so we'll just create an empty\n # dictionary for them.\n if data is None:\n data = {}\n\n # Initialize our actual dictionary here.\n super().__init__(data)\n\n # We need to track the state of our Session.\n self._sid = session_id\n self._changed = False\n self.new = new\n self.created = int(time.time())\n\n # We'll track all of the IDs that have been invalidated here\n self.invalidated = set()\n\n @property\n def sid(self):\n if self._sid is None:\n self._sid = crypto.random_token()\n return self._sid\n\n def changed(self):\n self._changed = True\n\n def invalidate(self):\n self.clear()\n self.new = True\n self.created = int(time.time())\n self._changed = False\n\n # If the current session id isn't None we'll want to record it as one\n # of the ones that have been invalidated.\n if self._sid is not None:\n self.invalidated.add(self._sid)\n self._sid = None\n\n def should_save(self):\n return self._changed\n\n # Flash Messages Methods\n def _get_flash_queue_key(self, queue):\n return \".\".join(filter(None, [self._flash_key, queue]))\n\n def flash(self, msg, queue=\"\", allow_duplicate=True):\n queue_key = self._get_flash_queue_key(queue)\n\n # If we're not allowing duplicates check if this message is already\n # in the queue, and if it is just return immediately.\n if not allow_duplicate and msg in self[queue_key]:\n return\n\n self.setdefault(queue_key, []).append(msg)\n\n def peek_flash(self, queue=\"\"):\n return self.get(self._get_flash_queue_key(queue), [])\n\n def pop_flash(self, queue=\"\"):\n queue_key = self._get_flash_queue_key(queue)\n messages = self.get(queue_key, [])\n self.pop(queue_key, None)\n return messages\n\n # CSRF Methods\n def new_csrf_token(self):\n self[self._csrf_token_key] = crypto.random_token()\n return self[self._csrf_token_key]\n\n def get_csrf_token(self):\n token = self.get(self._csrf_token_key)\n if token is None:\n token = self.new_csrf_token()\n return token\n\n\n@implementer(ISessionFactory)\nclass SessionFactory:\n\n cookie_name = \"session_id\"\n max_age = 12 * 60 * 60 # 12 hours\n\n def __init__(self, secret, url):\n self.redis = redis.StrictRedis.from_url(url)\n self.signer = crypto.TimestampSigner(secret, salt=\"session\")\n\n def __call__(self, request):\n return self._process_request(request)\n\n def _redis_key(self, session_id):\n return \"warehouse/session/data/{}\".format(session_id)\n\n def _process_request(self, request):\n # Register a callback with the request so we can save the session once\n # it's finished.\n request.add_response_callback(self._process_response)\n\n # Load our session ID from the request.\n session_id = request.cookies.get(self.cookie_name)\n\n # If we do not have a session ID then we'll just use a new empty\n # session.\n if session_id is None:\n return Session()\n\n # Check to make sure we have a valid session id\n try:\n session_id = self.signer.unsign(session_id, max_age=self.max_age)\n session_id = session_id.decode(\"utf8\")\n except crypto.BadSignature:\n return Session()\n\n # Fetch the serialized data from redis\n bdata = self.redis.get(self._redis_key(session_id))\n\n # If the session didn't exist in redis, we'll give the user a new\n # session.\n if bdata is None:\n return Session()\n\n # De-serialize our session data\n try:\n data = msgpack.unpackb(bdata, encoding=\"utf8\", use_list=True)\n except (msgpack.exceptions.UnpackException,\n msgpack.exceptions.ExtraData):\n # If the session data was invalid we'll give the user a new session\n return Session()\n\n # If we were able to load existing session data, load it into a\n # Session class\n session = Session(data, session_id, False)\n\n return session\n\n def _process_response(self, request, response):\n # If the request has an InvalidSession, then the view can't have\n # accessed the session, and we can just skip all of this anyways.\n if isinstance(request.session, InvalidSession):\n return\n\n # Check to see if the session has been marked to be deleted, if it has\n # benn then we'll delete it, and tell our response to delete the\n # session cookie as well.\n if request.session.invalidated:\n for session_id in request.session.invalidated:\n self.redis.delete(self._redis_key(session_id))\n\n if not request.session.should_save():\n response.delete_cookie(self.cookie_name)\n\n # Check to see if the session has been marked to be saved, generally\n # this means that the session data has been modified and thus we need\n # to store the new data.\n if request.session.should_save():\n # Save our session in Redis\n self.redis.setex(\n self._redis_key(request.session.sid),\n self.max_age,\n msgpack.packb(\n request.session,\n encoding=\"utf8\",\n use_bin_type=True,\n ),\n )\n\n # Send our session cookie to the client\n response.set_cookie(\n self.cookie_name,\n self.signer.sign(request.session.sid.encode(\"utf8\")),\n max_age=self.max_age,\n httponly=True,\n secure=request.scheme == \"https\",\n )\n\n\ndef session_view(view, info):\n if info.options.get(\"uses_session\"):\n # If we're using the session, then we'll just return the original view\n # with a small wrapper around it to ensure that it has a Vary: Cookie\n # header.\n return add_vary(\"Cookie\")(view)\n elif info.exception_only:\n return view\n else:\n # If we're not using the session on this view, then we'll wrap the view\n # with a wrapper that just ensures that the session cannot be used.\n @functools.wraps(view)\n def wrapped(context, request):\n # This whole method is a little bit of an odd duck, we want to make\n # sure that we don't actually *access* request.session, because\n # doing so triggers the machinery to create a new session. So\n # instead we will dig into the request object __dict__ to\n # effectively do the same thing, jsut without triggering an access\n # on request.session.\n\n # Save the original session so that we can restore it once the\n # inner views have been called.\n nothing = object()\n original_session = request.__dict__.get(\"session\", nothing)\n\n # This particular view hasn't been set to allow access to the\n # session, so we'll just assign an InvalidSession to\n # request.session\n request.__dict__[\"session\"] = InvalidSession()\n\n try:\n # Invoke the real view\n return view(context, request)\n finally:\n # Restore the original session so that things like\n # pyramid_debugtoolbar can access it.\n if original_session is nothing:\n del request.__dict__[\"session\"]\n else:\n request.__dict__[\"session\"] = original_session\n\n return wrapped\n\n\nsession_view.options = {\"uses_session\"}\n\n\ndef includeme(config):\n config.set_session_factory(\n SessionFactory(\n config.registry.settings[\"sessions.secret\"],\n config.registry.settings[\"sessions.url\"],\n ),\n )\n\n config.add_view_deriver(\n session_view,\n over=\"csrf_view\",\n under=viewderivers.INGRESS,\n )\n", "path": "warehouse/sessions.py" } ]
[ { "content": "# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nimport functools\nimport time\n\nimport msgpack\nimport msgpack.exceptions\nimport redis\n\nfrom pyramid import viewderivers\nfrom pyramid.interfaces import ISession, ISessionFactory\nfrom zope.interface import implementer\n\nfrom warehouse.cache.http import add_vary\nfrom warehouse.utils import crypto\n\n\ndef _invalid_method(method):\n @functools.wraps(method)\n def wrapped(self, *args, **kwargs):\n self._error_message()\n return wrapped\n\n\n@implementer(ISession)\nclass InvalidSession(dict):\n\n __contains__ = _invalid_method(dict.__contains__)\n __delitem__ = _invalid_method(dict.__delitem__)\n __getitem__ = _invalid_method(dict.__getitem__)\n __iter__ = _invalid_method(dict.__iter__)\n __len__ = _invalid_method(dict.__len__)\n __setitem__ = _invalid_method(dict.__setitem__)\n clear = _invalid_method(dict.clear)\n copy = _invalid_method(dict.copy)\n fromkeys = _invalid_method(dict.fromkeys)\n get = _invalid_method(dict.get)\n items = _invalid_method(dict.items)\n keys = _invalid_method(dict.keys)\n pop = _invalid_method(dict.pop)\n popitem = _invalid_method(dict.popitem)\n setdefault = _invalid_method(dict.setdefault)\n update = _invalid_method(dict.update)\n values = _invalid_method(dict.values)\n\n def _error_message(self):\n raise RuntimeError(\n \"Cannot use request.session in a view without uses_session=True.\"\n )\n\n def __getattr__(self, name):\n self._error_message()\n\n @property\n def created(self):\n self._error_message()\n\n\ndef _changed_method(method):\n @functools.wraps(method)\n def wrapped(self, *args, **kwargs):\n self.changed()\n return method(self, *args, **kwargs)\n return wrapped\n\n\n@implementer(ISession)\nclass Session(dict):\n\n _csrf_token_key = \"_csrf_token\"\n _flash_key = \"_flash_messages\"\n\n # A number of our methods need to be decorated so that they also call\n # self.changed()\n __delitem__ = _changed_method(dict.__delitem__)\n __setitem__ = _changed_method(dict.__setitem__)\n clear = _changed_method(dict.clear)\n pop = _changed_method(dict.pop)\n popitem = _changed_method(dict.popitem)\n setdefault = _changed_method(dict.setdefault)\n update = _changed_method(dict.update)\n\n def __init__(self, data=None, session_id=None, new=True):\n # Brand new sessions don't have any data, so we'll just create an empty\n # dictionary for them.\n if data is None:\n data = {}\n\n # Initialize our actual dictionary here.\n super().__init__(data)\n\n # We need to track the state of our Session.\n self._sid = session_id\n self._changed = False\n self.new = new\n self.created = int(time.time())\n\n # We'll track all of the IDs that have been invalidated here\n self.invalidated = set()\n\n @property\n def sid(self):\n if self._sid is None:\n self._sid = crypto.random_token()\n return self._sid\n\n def changed(self):\n self._changed = True\n\n def invalidate(self):\n self.clear()\n self.new = True\n self.created = int(time.time())\n self._changed = False\n\n # If the current session id isn't None we'll want to record it as one\n # of the ones that have been invalidated.\n if self._sid is not None:\n self.invalidated.add(self._sid)\n self._sid = None\n\n def should_save(self):\n return self._changed\n\n # Flash Messages Methods\n def _get_flash_queue_key(self, queue):\n return \".\".join(filter(None, [self._flash_key, queue]))\n\n def flash(self, msg, queue=\"\", allow_duplicate=True):\n queue_key = self._get_flash_queue_key(queue)\n\n # If we're not allowing duplicates check if this message is already\n # in the queue, and if it is just return immediately.\n if not allow_duplicate and msg in self[queue_key]:\n return\n\n self.setdefault(queue_key, []).append(msg)\n\n def peek_flash(self, queue=\"\"):\n return self.get(self._get_flash_queue_key(queue), [])\n\n def pop_flash(self, queue=\"\"):\n queue_key = self._get_flash_queue_key(queue)\n messages = self.get(queue_key, [])\n self.pop(queue_key, None)\n return messages\n\n # CSRF Methods\n def new_csrf_token(self):\n self[self._csrf_token_key] = crypto.random_token()\n return self[self._csrf_token_key]\n\n def get_csrf_token(self):\n token = self.get(self._csrf_token_key)\n if token is None:\n token = self.new_csrf_token()\n return token\n\n\n@implementer(ISessionFactory)\nclass SessionFactory:\n\n cookie_name = \"session_id\"\n max_age = 12 * 60 * 60 # 12 hours\n\n def __init__(self, secret, url):\n self.redis = redis.StrictRedis.from_url(url)\n self.signer = crypto.TimestampSigner(secret, salt=\"session\")\n\n def __call__(self, request):\n return self._process_request(request)\n\n def _redis_key(self, session_id):\n return \"warehouse/session/data/{}\".format(session_id)\n\n def _process_request(self, request):\n # Register a callback with the request so we can save the session once\n # it's finished.\n request.add_response_callback(self._process_response)\n\n # Load our session ID from the request.\n session_id = request.cookies.get(self.cookie_name)\n\n # If we do not have a session ID then we'll just use a new empty\n # session.\n if session_id is None:\n return Session()\n\n # Check to make sure we have a valid session id\n try:\n session_id = self.signer.unsign(session_id, max_age=self.max_age)\n session_id = session_id.decode(\"utf8\")\n except crypto.BadSignature:\n return Session()\n\n # Fetch the serialized data from redis\n bdata = self.redis.get(self._redis_key(session_id))\n\n # If the session didn't exist in redis, we'll give the user a new\n # session.\n if bdata is None:\n return Session()\n\n # De-serialize our session data\n try:\n data = msgpack.unpackb(bdata, encoding=\"utf8\", use_list=True)\n except (msgpack.exceptions.UnpackException,\n msgpack.exceptions.ExtraData):\n # If the session data was invalid we'll give the user a new session\n return Session()\n\n # If we were able to load existing session data, load it into a\n # Session class\n session = Session(data, session_id, False)\n\n return session\n\n def _process_response(self, request, response):\n # If the request has an InvalidSession, then the view can't have\n # accessed the session, and we can just skip all of this anyways.\n if isinstance(request.session, InvalidSession):\n return\n\n # Check to see if the session has been marked to be deleted, if it has\n # benn then we'll delete it, and tell our response to delete the\n # session cookie as well.\n if request.session.invalidated:\n for session_id in request.session.invalidated:\n self.redis.delete(self._redis_key(session_id))\n\n if not request.session.should_save():\n response.delete_cookie(self.cookie_name)\n\n # Check to see if the session has been marked to be saved, generally\n # this means that the session data has been modified and thus we need\n # to store the new data.\n if request.session.should_save():\n # Save our session in Redis\n self.redis.setex(\n self._redis_key(request.session.sid),\n self.max_age,\n msgpack.packb(\n request.session,\n encoding=\"utf8\",\n use_bin_type=True,\n ),\n )\n\n # Send our session cookie to the client\n response.set_cookie(\n self.cookie_name,\n self.signer.sign(request.session.sid.encode(\"utf8\")),\n max_age=self.max_age,\n httponly=True,\n secure=request.scheme == \"https\",\n samesite=b\"lax\"\n )\n\n\ndef session_view(view, info):\n if info.options.get(\"uses_session\"):\n # If we're using the session, then we'll just return the original view\n # with a small wrapper around it to ensure that it has a Vary: Cookie\n # header.\n return add_vary(\"Cookie\")(view)\n elif info.exception_only:\n return view\n else:\n # If we're not using the session on this view, then we'll wrap the view\n # with a wrapper that just ensures that the session cannot be used.\n @functools.wraps(view)\n def wrapped(context, request):\n # This whole method is a little bit of an odd duck, we want to make\n # sure that we don't actually *access* request.session, because\n # doing so triggers the machinery to create a new session. So\n # instead we will dig into the request object __dict__ to\n # effectively do the same thing, jsut without triggering an access\n # on request.session.\n\n # Save the original session so that we can restore it once the\n # inner views have been called.\n nothing = object()\n original_session = request.__dict__.get(\"session\", nothing)\n\n # This particular view hasn't been set to allow access to the\n # session, so we'll just assign an InvalidSession to\n # request.session\n request.__dict__[\"session\"] = InvalidSession()\n\n try:\n # Invoke the real view\n return view(context, request)\n finally:\n # Restore the original session so that things like\n # pyramid_debugtoolbar can access it.\n if original_session is nothing:\n del request.__dict__[\"session\"]\n else:\n request.__dict__[\"session\"] = original_session\n\n return wrapped\n\n\nsession_view.options = {\"uses_session\"}\n\n\ndef includeme(config):\n config.set_session_factory(\n SessionFactory(\n config.registry.settings[\"sessions.secret\"],\n config.registry.settings[\"sessions.url\"],\n ),\n )\n\n config.add_view_deriver(\n session_view,\n over=\"csrf_view\",\n under=viewderivers.INGRESS,\n )\n", "path": "warehouse/sessions.py" } ]
diff --git a/requirements/main.txt b/requirements/main.txt index a76118b5f594..18025daa798d 100644 --- a/requirements/main.txt +++ b/requirements/main.txt @@ -457,9 +457,9 @@ vine==1.1.4 \ webencodings==0.5.1 \ --hash=sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78 \ --hash=sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923 -WebOb==1.7.4 \ - --hash=sha256:63f4220492476c5c716b615baed7bf3d27040b3105014375787160dee0943115 \ - --hash=sha256:8d10af182fda4b92193113ee1edeb687ab9dc44336b37d6804e413f0240d40d9 +WebOb==1.8.0 \ + --hash=sha256:ae809c05b667c3457a2937cdb4a7c7f07e90f26c651a340d37fdd1d5cf1fed27 \ + --hash=sha256:6fca7aa39bd2f6d2ff71f15a22223ff256c91f60b1ab52dac0ab38dc6ea9142f whitenoise==3.3.1 \ --hash=sha256:15f43b2e701821b95c9016cf469d29e2a546cb1c7dead584ba82c36f843995cf \ --hash=sha256:9d81515f2b5b27051910996e1e860b1332e354d9e7bcf30c98f21dcb6713e0dd diff --git a/requirements/tests.txt b/requirements/tests.txt index e701d7ddbb66..f8094f4a357c 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -224,9 +224,9 @@ urllib3==1.22 \ waitress==1.1.0 \ --hash=sha256:40b0f297a7f3af61fbfbdc67e59090c70dc150a1601c39ecc9f5f1d283fb931b \ --hash=sha256:d33cd3d62426c0f1b3cd84ee3d65779c7003aae3fc060dee60524d10a57f05a9 -WebOb==1.7.4 \ - --hash=sha256:63f4220492476c5c716b615baed7bf3d27040b3105014375787160dee0943115 \ - --hash=sha256:8d10af182fda4b92193113ee1edeb687ab9dc44336b37d6804e413f0240d40d9 +WebOb==1.8.0 \ + --hash=sha256:ae809c05b667c3457a2937cdb4a7c7f07e90f26c651a340d37fdd1d5cf1fed27 \ + --hash=sha256:6fca7aa39bd2f6d2ff71f15a22223ff256c91f60b1ab52dac0ab38dc6ea9142f WebTest==2.0.29 \ --hash=sha256:9136514159a2e76a21751bf4ab5d3371e539c8ada8b950fcf68e307d9e584a07 \ --hash=sha256:dbbccc15ac2465066c95dc3a7de0d30cde3791e886ccbd7e91d5d2a2580c922d diff --git a/tests/unit/test_sessions.py b/tests/unit/test_sessions.py index 0baee1c117b5..8bc57b3c27b0 100644 --- a/tests/unit/test_sessions.py +++ b/tests/unit/test_sessions.py @@ -497,7 +497,7 @@ def test_invalidated_deletes_save_non_secure(self, monkeypatch, ) response = pretend.stub( set_cookie=pretend.call_recorder( - lambda cookie, data, max_age, httponly, secure: None + lambda cookie, data, max_age, httponly, secure, samesite: None ) ) session_factory._process_response(pyramid_request, response) @@ -532,6 +532,7 @@ def test_invalidated_deletes_save_non_secure(self, monkeypatch, max_age=12 * 60 * 60, httponly=True, secure=False, + samesite=b"lax", ), ] diff --git a/tests/unit/utils/test_compression.py b/tests/unit/utils/test_compression.py index 8fba42cc342e..ca30c68f575f 100644 --- a/tests/unit/utils/test_compression.py +++ b/tests/unit/utils/test_compression.py @@ -14,7 +14,7 @@ import pytest from pyramid.response import Response -from webob.acceptparse import Accept, NoAccept +from webob.acceptparse import AcceptEncodingValidHeader, AcceptEncodingNoHeader from webob.response import gzip_app_iter from warehouse.utils.compression import _compressor as compressor @@ -54,7 +54,7 @@ def test_bails_if_content_encoding(self): ], ) def test_sets_vary(self, vary, expected): - request = pretend.stub(accept_encoding=NoAccept()) + request = pretend.stub(accept_encoding=AcceptEncodingNoHeader()) response = Response(body=b"foo") response.vary = vary @@ -66,7 +66,9 @@ def test_compresses_non_streaming(self): decompressed_body = b"foofoofoofoofoofoofoofoofoofoofoofoofoofoo" compressed_body = b"".join(list(gzip_app_iter([decompressed_body]))) - request = pretend.stub(accept_encoding=Accept("gzip")) + request = pretend.stub( + accept_encoding=AcceptEncodingValidHeader("gzip") + ) response = Response(body=decompressed_body) response.md5_etag() @@ -83,7 +85,9 @@ def test_compresses_streaming(self): decompressed_body = b"foofoofoofoofoofoofoofoofoofoofoofoofoofoo" compressed_body = b"".join(list(gzip_app_iter([decompressed_body]))) - request = pretend.stub(accept_encoding=Accept("gzip")) + request = pretend.stub( + accept_encoding=AcceptEncodingValidHeader("gzip") + ) response = Response(app_iter=iter([decompressed_body])) compressor(request, response) @@ -96,7 +100,9 @@ def test_compresses_streaming_with_etag(self): decompressed_body = b"foofoofoofoofoofoofoofoofoofoofoofoofoofoo" compressed_body = b"".join(list(gzip_app_iter([decompressed_body]))) - request = pretend.stub(accept_encoding=Accept("gzip")) + request = pretend.stub( + accept_encoding=AcceptEncodingValidHeader("gzip") + ) response = Response(app_iter=iter([decompressed_body])) response.etag = "foo" @@ -111,7 +117,9 @@ def test_buffers_small_streaming(self): decompressed_body = b"foofoofoofoofoofoofoofoofoofoofoofoofoofoo" compressed_body = b"".join(list(gzip_app_iter([decompressed_body]))) - request = pretend.stub(accept_encoding=Accept("gzip")) + request = pretend.stub( + accept_encoding=AcceptEncodingValidHeader("gzip") + ) response = Response( app_iter=iter([decompressed_body]), content_length=len(decompressed_body), @@ -124,7 +132,9 @@ def test_buffers_small_streaming(self): assert response.body == compressed_body def test_doesnt_compress_too_small(self): - request = pretend.stub(accept_encoding=Accept("gzip")) + request = pretend.stub( + accept_encoding=AcceptEncodingValidHeader("gzip") + ) response = Response(body=b"foo") compressor(request, response) diff --git a/warehouse/sessions.py b/warehouse/sessions.py index a52318f0eb7c..548f760c757a 100644 --- a/warehouse/sessions.py +++ b/warehouse/sessions.py @@ -263,6 +263,7 @@ def _process_response(self, request, response): max_age=self.max_age, httponly=True, secure=request.scheme == "https", + samesite=b"lax" )
conda__conda-2472
[ { "content": "# (c) 2012-2015 Continuum Analytics, Inc. / http://continuum.io\n# All Rights Reserved\n#\n# conda is distributed under the terms of the BSD 3-clause license.\n# Consult LICENSE.txt or http://opensource.org/licenses/BSD-3-Clause.\n\nfrom __future__ import print_function, division, absolute_import\n\nimport logging\nimport os\nimport re\nimport sys\nfrom collections import OrderedDict\nfrom os.path import abspath, expanduser, isfile, isdir, join\nfrom platform import machine\n\nfrom conda.compat import urlparse\nfrom conda.utils import try_write, memoized, yaml_load\n\nlog = logging.getLogger(__name__)\nstderrlog = logging.getLogger('stderrlog')\n\ndefault_python = '%d.%d' % sys.version_info[:2]\n# CONDA_FORCE_32BIT should only be used when running conda-build (in order\n# to build 32-bit packages on a 64-bit system). We don't want to mention it\n# in the documentation, because it can mess up a lot of things.\nforce_32bit = bool(int(os.getenv('CONDA_FORCE_32BIT', 0)))\n\n# ----- operating system and architecture -----\n\n_sys_map = {'linux2': 'linux', 'linux': 'linux',\n 'darwin': 'osx', 'win32': 'win', 'openbsd5': 'openbsd'}\nnon_x86_linux_machines = {'armv6l', 'armv7l', 'ppc64le'}\nplatform = _sys_map.get(sys.platform, 'unknown')\nbits = 8 * tuple.__itemsize__\nif force_32bit:\n bits = 32\n\nif platform == 'linux' and machine() in non_x86_linux_machines:\n arch_name = machine()\n subdir = 'linux-%s' % arch_name\nelse:\n arch_name = {64: 'x86_64', 32: 'x86'}[bits]\n subdir = '%s-%d' % (platform, bits)\n\n# ----- rc file -----\n\n# This is used by conda config to check which keys are allowed in the config\n# file. Be sure to update it when new keys are added.\n\n#################################################################\n# Also update the example condarc file when you add a key here! #\n#################################################################\n\nrc_list_keys = [\n 'channels',\n 'disallow',\n 'create_default_packages',\n 'track_features',\n 'envs_dirs',\n 'default_channels',\n]\n\nDEFAULT_CHANNEL_ALIAS = 'https://conda.anaconda.org/'\n\nADD_BINSTAR_TOKEN = True\n\nrc_bool_keys = [\n 'add_binstar_token',\n 'add_anaconda_token',\n 'add_pip_as_python_dependency',\n 'always_yes',\n 'always_copy',\n 'allow_softlinks',\n 'changeps1',\n 'use_pip',\n 'offline',\n 'binstar_upload',\n 'anaconda_upload',\n 'show_channel_urls',\n 'allow_other_channels',\n 'update_dependencies',\n 'channel_priority',\n]\n\nrc_string_keys = [\n 'ssl_verify',\n 'channel_alias',\n 'root_dir',\n]\n\n# Not supported by conda config yet\nrc_other = [\n 'proxy_servers',\n]\n\nuser_rc_path = abspath(expanduser('~/.condarc'))\nsys_rc_path = join(sys.prefix, '.condarc')\nlocal_channel = []\n\ndef get_rc_path():\n path = os.getenv('CONDARC')\n if path == ' ':\n return None\n if path:\n return path\n for path in user_rc_path, sys_rc_path:\n if isfile(path):\n return path\n return None\n\nrc_path = get_rc_path()\n\ndef load_condarc(path):\n if not path or not isfile(path):\n print(\"no path!\")\n return {}\n with open(path) as f:\n return yaml_load(f) or {}\n\nrc = load_condarc(rc_path)\nsys_rc = load_condarc(sys_rc_path) if isfile(sys_rc_path) else {}\n\n# ----- local directories -----\n\n# root_dir should only be used for testing, which is why don't mention it in\n# the documentation, to avoid confusion (it can really mess up a lot of\n# things)\nroot_dir = abspath(expanduser(os.getenv('CONDA_ROOT',\n rc.get('root_dir', sys.prefix))))\nroot_writable = try_write(root_dir)\nroot_env_name = 'root'\n\ndef _default_envs_dirs():\n lst = [join(root_dir, 'envs')]\n if not root_writable:\n # ~/envs for backwards compatibility\n lst = ['~/.conda/envs', '~/envs'] + lst\n return lst\n\ndef _pathsep_env(name):\n x = os.getenv(name)\n if x is None:\n return []\n res = []\n for path in x.split(os.pathsep):\n if path == 'DEFAULTS':\n for p in rc.get('envs_dirs') or _default_envs_dirs():\n res.append(p)\n else:\n res.append(path)\n return res\n\nenvs_dirs = [abspath(expanduser(path)) for path in (\n _pathsep_env('CONDA_ENVS_PATH') or\n rc.get('envs_dirs') or\n _default_envs_dirs()\n )]\n\ndef pkgs_dir_from_envs_dir(envs_dir):\n if abspath(envs_dir) == abspath(join(root_dir, 'envs')):\n return join(root_dir, 'pkgs32' if force_32bit else 'pkgs')\n else:\n return join(envs_dir, '.pkgs')\n\npkgs_dirs = [pkgs_dir_from_envs_dir(envs_dir) for envs_dir in envs_dirs]\n\n# ----- default environment prefix -----\n\n_default_env = os.getenv('CONDA_DEFAULT_ENV')\nif _default_env in (None, root_env_name):\n default_prefix = root_dir\nelif os.sep in _default_env:\n default_prefix = abspath(_default_env)\nelse:\n for envs_dir in envs_dirs:\n default_prefix = join(envs_dir, _default_env)\n if isdir(default_prefix):\n break\n else:\n default_prefix = join(envs_dirs[0], _default_env)\n\n# ----- channels -----\n\n# Note, get_*_urls() return unnormalized urls.\n\ndef get_local_urls(clear_cache=True):\n # remove the cache such that a refetch is made,\n # this is necessary because we add the local build repo URL\n if clear_cache:\n from conda.fetch import fetch_index\n fetch_index.cache = {}\n if local_channel:\n return local_channel\n from os.path import exists\n from conda.utils import url_path\n try:\n from conda_build.config import croot\n if exists(croot):\n local_channel.append(url_path(croot))\n except ImportError:\n pass\n return local_channel\n\ndef get_default_urls():\n if isfile(sys_rc_path):\n sys_rc = load_condarc(sys_rc_path)\n if 'default_channels' in sys_rc:\n return sys_rc['default_channels']\n\n return ['https://repo.continuum.io/pkgs/free',\n 'https://repo.continuum.io/pkgs/pro']\n\ndef get_rc_urls():\n if rc.get('channels') is None:\n return []\n if 'system' in rc['channels']:\n raise RuntimeError(\"system cannot be used in .condarc\")\n return rc['channels']\n\ndef is_url(url):\n return urlparse.urlparse(url).scheme != \"\"\n\n@memoized\ndef binstar_channel_alias(channel_alias):\n if rc.get('add_anaconda_token',\n rc.get('add_binstar_token', ADD_BINSTAR_TOKEN)):\n try:\n from binstar_client.utils import get_binstar\n bs = get_binstar()\n channel_alias = bs.domain.replace(\"api\", \"conda\")\n if not channel_alias.endswith('/'):\n channel_alias += '/'\n if bs.token:\n channel_alias += 't/%s/' % bs.token\n except ImportError:\n log.debug(\"Could not import binstar\")\n pass\n except Exception as e:\n stderrlog.info(\"Warning: could not import binstar_client (%s)\" % e)\n return channel_alias\n\nchannel_alias = rc.get('channel_alias', DEFAULT_CHANNEL_ALIAS)\nif not sys_rc.get('allow_other_channels', True) and 'channel_alias' in sys_rc:\n channel_alias = sys_rc['channel_alias']\n\n_binstar = r'((:?%s|binstar\\.org|anaconda\\.org)/?)(t/[0-9a-zA-Z\\-<>]{4,})/'\nBINSTAR_TOKEN_PAT = re.compile(_binstar % re.escape(channel_alias))\n\ndef hide_binstar_tokens(url):\n return BINSTAR_TOKEN_PAT.sub(r'\\1t/<TOKEN>/', url)\n\ndef remove_binstar_tokens(url):\n return BINSTAR_TOKEN_PAT.sub(r'\\1', url)\n\nchannel_alias = remove_binstar_tokens(channel_alias.rstrip('/') + '/')\n\ndef normalize_urls(urls, platform=None, offline_only=False):\n platform = platform or subdir\n defaults = tuple(x.rstrip('/') + '/' for x in get_default_urls())\n alias = binstar_channel_alias(channel_alias)\n\n def normalize_(url):\n url = url.rstrip('/')\n if is_url(url):\n url_s = canonical_channel_name(url, True)\n else:\n url_s = url\n url = alias + url\n return url_s, url\n newurls = OrderedDict()\n priority = 0\n while urls:\n url = urls[0]\n urls = urls[1:]\n if url == \"system\" and rc_path:\n urls = get_rc_urls() + urls\n continue\n elif url in (\"defaults\", \"system\"):\n t_urls = defaults\n elif url == \"local\":\n t_urls = get_local_urls()\n else:\n t_urls = [url]\n priority += 1\n for url0 in t_urls:\n url_s, url0 = normalize_(url0)\n if offline_only and not url0.startswith('file:'):\n continue\n for plat in (platform, 'noarch'):\n newurls.setdefault('%s/%s/' % (url0, plat), (url_s, priority))\n return newurls\n\noffline = bool(rc.get('offline', False))\n\ndef get_channel_urls(platform=None, offline=False):\n if os.getenv('CIO_TEST'):\n import cio_test\n base_urls = cio_test.base_urls\n elif 'channels' in rc:\n base_urls = ['system']\n else:\n base_urls = ['defaults']\n res = normalize_urls(base_urls, platform, offline)\n return res\n\ndef canonical_channel_name(channel, hide=True, no_unknown=False):\n if channel is None:\n return 'defaults' if no_unknown else '<unknown>'\n channel = remove_binstar_tokens(channel).rstrip('/')\n if any(channel.startswith(i) for i in get_default_urls()):\n return 'defaults'\n elif any(channel.startswith(i) for i in get_local_urls(clear_cache=False)):\n return 'local'\n elif channel.startswith('http://filer/'):\n return 'filer'\n elif channel.startswith(channel_alias):\n return channel.split(channel_alias, 1)[1]\n elif channel.startswith('http:/'):\n channel2 = 'https' + channel[4:]\n channel3 = canonical_channel_name(channel2, hide, no_unknown)\n return channel3 if channel3 != channel2 else channel\n else:\n return channel\n\ndef url_channel(url):\n if url is None:\n return None, '<unknown>'\n channel = url.rsplit('/', 2)[0]\n schannel = canonical_channel_name(channel)\n return channel, schannel\n\n# ----- allowed channels -----\n\ndef get_allowed_channels():\n if not isfile(sys_rc_path):\n return None\n if sys_rc.get('allow_other_channels', True):\n return None\n if 'channels' in sys_rc:\n base_urls = ['system']\n else:\n base_urls = ['default']\n return normalize_urls(base_urls)\n\nallowed_channels = get_allowed_channels()\n\n# ----- proxy -----\n\ndef get_proxy_servers():\n res = rc.get('proxy_servers') or {}\n if isinstance(res, dict):\n return res\n sys.exit(\"Error: proxy_servers setting not a mapping\")\n\n# ----- foreign -----\n\ntry:\n with open(join(root_dir, 'conda-meta', 'foreign')) as fi:\n foreign = fi.read().split()\nexcept IOError:\n foreign = [] if isdir(join(root_dir, 'conda-meta')) else ['python']\n\n# ----- misc -----\n\nadd_pip_as_python_dependency = bool(rc.get('add_pip_as_python_dependency', True))\nalways_yes = bool(rc.get('always_yes', False))\nalways_copy = bool(rc.get('always_copy', False))\nchangeps1 = bool(rc.get('changeps1', True))\nuse_pip = bool(rc.get('use_pip', True))\nbinstar_upload = rc.get('anaconda_upload',\n rc.get('binstar_upload', None)) # None means ask\nallow_softlinks = bool(rc.get('allow_softlinks', True))\nself_update = bool(rc.get('self_update', True))\n# show channel URLs when displaying what is going to be downloaded\nshow_channel_urls = rc.get('show_channel_urls', None) # None means letting conda decide\n# set packages disallowed to be installed\ndisallow = set(rc.get('disallow', []))\n# packages which are added to a newly created environment by default\ncreate_default_packages = list(rc.get('create_default_packages', []))\nupdate_dependencies = bool(rc.get('update_dependencies', True))\nchannel_priority = bool(rc.get('channel_priority', True))\n\n# ssl_verify can be a boolean value or a filename string\nssl_verify = rc.get('ssl_verify', True)\n\ntry:\n track_features = set(rc['track_features'])\nexcept KeyError:\n track_features = None\n", "path": "conda/config.py" } ]
[ { "content": "# (c) 2012-2015 Continuum Analytics, Inc. / http://continuum.io\n# All Rights Reserved\n#\n# conda is distributed under the terms of the BSD 3-clause license.\n# Consult LICENSE.txt or http://opensource.org/licenses/BSD-3-Clause.\n\nfrom __future__ import print_function, division, absolute_import\n\nimport logging\nimport os\nimport re\nimport sys\nfrom collections import OrderedDict\nfrom os.path import abspath, expanduser, isfile, isdir, join\nfrom platform import machine\n\nfrom conda.compat import urlparse\nfrom conda.utils import try_write, memoized, yaml_load\n\nlog = logging.getLogger(__name__)\nstderrlog = logging.getLogger('stderrlog')\n\ndefault_python = '%d.%d' % sys.version_info[:2]\n# CONDA_FORCE_32BIT should only be used when running conda-build (in order\n# to build 32-bit packages on a 64-bit system). We don't want to mention it\n# in the documentation, because it can mess up a lot of things.\nforce_32bit = bool(int(os.getenv('CONDA_FORCE_32BIT', 0)))\n\n# ----- operating system and architecture -----\n\n_sys_map = {'linux2': 'linux', 'linux': 'linux',\n 'darwin': 'osx', 'win32': 'win', 'openbsd5': 'openbsd'}\nnon_x86_linux_machines = {'armv6l', 'armv7l', 'ppc64le'}\nplatform = _sys_map.get(sys.platform, 'unknown')\nbits = 8 * tuple.__itemsize__\nif force_32bit:\n bits = 32\n\nif platform == 'linux' and machine() in non_x86_linux_machines:\n arch_name = machine()\n subdir = 'linux-%s' % arch_name\nelse:\n arch_name = {64: 'x86_64', 32: 'x86'}[bits]\n subdir = '%s-%d' % (platform, bits)\n\n# ----- rc file -----\n\n# This is used by conda config to check which keys are allowed in the config\n# file. Be sure to update it when new keys are added.\n\n#################################################################\n# Also update the example condarc file when you add a key here! #\n#################################################################\n\nrc_list_keys = [\n 'channels',\n 'disallow',\n 'create_default_packages',\n 'track_features',\n 'envs_dirs',\n 'default_channels',\n]\n\nDEFAULT_CHANNEL_ALIAS = 'https://conda.anaconda.org/'\n\nADD_BINSTAR_TOKEN = True\n\nrc_bool_keys = [\n 'add_binstar_token',\n 'add_anaconda_token',\n 'add_pip_as_python_dependency',\n 'always_yes',\n 'always_copy',\n 'allow_softlinks',\n 'changeps1',\n 'use_pip',\n 'offline',\n 'binstar_upload',\n 'anaconda_upload',\n 'show_channel_urls',\n 'allow_other_channels',\n 'update_dependencies',\n 'channel_priority',\n]\n\nrc_string_keys = [\n 'ssl_verify',\n 'channel_alias',\n 'root_dir',\n]\n\n# Not supported by conda config yet\nrc_other = [\n 'proxy_servers',\n]\n\nuser_rc_path = abspath(expanduser('~/.condarc'))\nsys_rc_path = join(sys.prefix, '.condarc')\nlocal_channel = []\n\ndef get_rc_path():\n path = os.getenv('CONDARC')\n if path == ' ':\n return None\n if path:\n return path\n for path in user_rc_path, sys_rc_path:\n if isfile(path):\n return path\n return None\n\nrc_path = get_rc_path()\n\ndef load_condarc(path):\n if not path or not isfile(path):\n return {}\n with open(path) as f:\n return yaml_load(f) or {}\n\nrc = load_condarc(rc_path)\nsys_rc = load_condarc(sys_rc_path) if isfile(sys_rc_path) else {}\n\n# ----- local directories -----\n\n# root_dir should only be used for testing, which is why don't mention it in\n# the documentation, to avoid confusion (it can really mess up a lot of\n# things)\nroot_dir = abspath(expanduser(os.getenv('CONDA_ROOT',\n rc.get('root_dir', sys.prefix))))\nroot_writable = try_write(root_dir)\nroot_env_name = 'root'\n\ndef _default_envs_dirs():\n lst = [join(root_dir, 'envs')]\n if not root_writable:\n # ~/envs for backwards compatibility\n lst = ['~/.conda/envs', '~/envs'] + lst\n return lst\n\ndef _pathsep_env(name):\n x = os.getenv(name)\n if x is None:\n return []\n res = []\n for path in x.split(os.pathsep):\n if path == 'DEFAULTS':\n for p in rc.get('envs_dirs') or _default_envs_dirs():\n res.append(p)\n else:\n res.append(path)\n return res\n\nenvs_dirs = [abspath(expanduser(path)) for path in (\n _pathsep_env('CONDA_ENVS_PATH') or\n rc.get('envs_dirs') or\n _default_envs_dirs()\n )]\n\ndef pkgs_dir_from_envs_dir(envs_dir):\n if abspath(envs_dir) == abspath(join(root_dir, 'envs')):\n return join(root_dir, 'pkgs32' if force_32bit else 'pkgs')\n else:\n return join(envs_dir, '.pkgs')\n\npkgs_dirs = [pkgs_dir_from_envs_dir(envs_dir) for envs_dir in envs_dirs]\n\n# ----- default environment prefix -----\n\n_default_env = os.getenv('CONDA_DEFAULT_ENV')\nif _default_env in (None, root_env_name):\n default_prefix = root_dir\nelif os.sep in _default_env:\n default_prefix = abspath(_default_env)\nelse:\n for envs_dir in envs_dirs:\n default_prefix = join(envs_dir, _default_env)\n if isdir(default_prefix):\n break\n else:\n default_prefix = join(envs_dirs[0], _default_env)\n\n# ----- channels -----\n\n# Note, get_*_urls() return unnormalized urls.\n\ndef get_local_urls(clear_cache=True):\n # remove the cache such that a refetch is made,\n # this is necessary because we add the local build repo URL\n if clear_cache:\n from conda.fetch import fetch_index\n fetch_index.cache = {}\n if local_channel:\n return local_channel\n from os.path import exists\n from conda.utils import url_path\n try:\n from conda_build.config import croot\n if exists(croot):\n local_channel.append(url_path(croot))\n except ImportError:\n pass\n return local_channel\n\ndef get_default_urls():\n if isfile(sys_rc_path):\n sys_rc = load_condarc(sys_rc_path)\n if 'default_channels' in sys_rc:\n return sys_rc['default_channels']\n\n return ['https://repo.continuum.io/pkgs/free',\n 'https://repo.continuum.io/pkgs/pro']\n\ndef get_rc_urls():\n if rc.get('channels') is None:\n return []\n if 'system' in rc['channels']:\n raise RuntimeError(\"system cannot be used in .condarc\")\n return rc['channels']\n\ndef is_url(url):\n return urlparse.urlparse(url).scheme != \"\"\n\n@memoized\ndef binstar_channel_alias(channel_alias):\n if rc.get('add_anaconda_token',\n rc.get('add_binstar_token', ADD_BINSTAR_TOKEN)):\n try:\n from binstar_client.utils import get_binstar\n bs = get_binstar()\n channel_alias = bs.domain.replace(\"api\", \"conda\")\n if not channel_alias.endswith('/'):\n channel_alias += '/'\n if bs.token:\n channel_alias += 't/%s/' % bs.token\n except ImportError:\n log.debug(\"Could not import binstar\")\n pass\n except Exception as e:\n stderrlog.info(\"Warning: could not import binstar_client (%s)\" % e)\n return channel_alias\n\nchannel_alias = rc.get('channel_alias', DEFAULT_CHANNEL_ALIAS)\nif not sys_rc.get('allow_other_channels', True) and 'channel_alias' in sys_rc:\n channel_alias = sys_rc['channel_alias']\n\n_binstar = r'((:?%s|binstar\\.org|anaconda\\.org)/?)(t/[0-9a-zA-Z\\-<>]{4,})/'\nBINSTAR_TOKEN_PAT = re.compile(_binstar % re.escape(channel_alias))\n\ndef hide_binstar_tokens(url):\n return BINSTAR_TOKEN_PAT.sub(r'\\1t/<TOKEN>/', url)\n\ndef remove_binstar_tokens(url):\n return BINSTAR_TOKEN_PAT.sub(r'\\1', url)\n\nchannel_alias = remove_binstar_tokens(channel_alias.rstrip('/') + '/')\n\ndef normalize_urls(urls, platform=None, offline_only=False):\n platform = platform or subdir\n defaults = tuple(x.rstrip('/') + '/' for x in get_default_urls())\n alias = binstar_channel_alias(channel_alias)\n\n def normalize_(url):\n url = url.rstrip('/')\n if is_url(url):\n url_s = canonical_channel_name(url, True)\n else:\n url_s = url\n url = alias + url\n return url_s, url\n newurls = OrderedDict()\n priority = 0\n while urls:\n url = urls[0]\n urls = urls[1:]\n if url == \"system\" and rc_path:\n urls = get_rc_urls() + urls\n continue\n elif url in (\"defaults\", \"system\"):\n t_urls = defaults\n elif url == \"local\":\n t_urls = get_local_urls()\n else:\n t_urls = [url]\n priority += 1\n for url0 in t_urls:\n url_s, url0 = normalize_(url0)\n if offline_only and not url0.startswith('file:'):\n continue\n for plat in (platform, 'noarch'):\n newurls.setdefault('%s/%s/' % (url0, plat), (url_s, priority))\n return newurls\n\noffline = bool(rc.get('offline', False))\n\ndef get_channel_urls(platform=None, offline=False):\n if os.getenv('CIO_TEST'):\n import cio_test\n base_urls = cio_test.base_urls\n elif 'channels' in rc:\n base_urls = ['system']\n else:\n base_urls = ['defaults']\n res = normalize_urls(base_urls, platform, offline)\n return res\n\ndef canonical_channel_name(channel, hide=True, no_unknown=False):\n if channel is None:\n return 'defaults' if no_unknown else '<unknown>'\n channel = remove_binstar_tokens(channel).rstrip('/')\n if any(channel.startswith(i) for i in get_default_urls()):\n return 'defaults'\n elif any(channel.startswith(i) for i in get_local_urls(clear_cache=False)):\n return 'local'\n elif channel.startswith('http://filer/'):\n return 'filer'\n elif channel.startswith(channel_alias):\n return channel.split(channel_alias, 1)[1]\n elif channel.startswith('http:/'):\n channel2 = 'https' + channel[4:]\n channel3 = canonical_channel_name(channel2, hide, no_unknown)\n return channel3 if channel3 != channel2 else channel\n else:\n return channel\n\ndef url_channel(url):\n if url is None:\n return None, '<unknown>'\n channel = url.rsplit('/', 2)[0]\n schannel = canonical_channel_name(channel)\n return channel, schannel\n\n# ----- allowed channels -----\n\ndef get_allowed_channels():\n if not isfile(sys_rc_path):\n return None\n if sys_rc.get('allow_other_channels', True):\n return None\n if 'channels' in sys_rc:\n base_urls = ['system']\n else:\n base_urls = ['default']\n return normalize_urls(base_urls)\n\nallowed_channels = get_allowed_channels()\n\n# ----- proxy -----\n\ndef get_proxy_servers():\n res = rc.get('proxy_servers') or {}\n if isinstance(res, dict):\n return res\n sys.exit(\"Error: proxy_servers setting not a mapping\")\n\n# ----- foreign -----\n\ntry:\n with open(join(root_dir, 'conda-meta', 'foreign')) as fi:\n foreign = fi.read().split()\nexcept IOError:\n foreign = [] if isdir(join(root_dir, 'conda-meta')) else ['python']\n\n# ----- misc -----\n\nadd_pip_as_python_dependency = bool(rc.get('add_pip_as_python_dependency', True))\nalways_yes = bool(rc.get('always_yes', False))\nalways_copy = bool(rc.get('always_copy', False))\nchangeps1 = bool(rc.get('changeps1', True))\nuse_pip = bool(rc.get('use_pip', True))\nbinstar_upload = rc.get('anaconda_upload',\n rc.get('binstar_upload', None)) # None means ask\nallow_softlinks = bool(rc.get('allow_softlinks', True))\nself_update = bool(rc.get('self_update', True))\n# show channel URLs when displaying what is going to be downloaded\nshow_channel_urls = rc.get('show_channel_urls', None) # None means letting conda decide\n# set packages disallowed to be installed\ndisallow = set(rc.get('disallow', []))\n# packages which are added to a newly created environment by default\ncreate_default_packages = list(rc.get('create_default_packages', []))\nupdate_dependencies = bool(rc.get('update_dependencies', True))\nchannel_priority = bool(rc.get('channel_priority', True))\n\n# ssl_verify can be a boolean value or a filename string\nssl_verify = rc.get('ssl_verify', True)\n\ntry:\n track_features = set(rc['track_features'])\nexcept KeyError:\n track_features = None\n", "path": "conda/config.py" } ]
diff --git a/conda/config.py b/conda/config.py index 8870864317e..75dbfed7dff 100644 --- a/conda/config.py +++ b/conda/config.py @@ -113,7 +113,6 @@ def get_rc_path(): def load_condarc(path): if not path or not isfile(path): - print("no path!") return {} with open(path) as f: return yaml_load(f) or {}
urllib3__urllib3-1028
[ { "content": "from __future__ import absolute_import\nimport datetime\nimport logging\nimport os\nimport sys\nimport socket\nfrom socket import error as SocketError, timeout as SocketTimeout\nimport warnings\nfrom .packages import six\nfrom .packages.six.moves.http_client import HTTPConnection as _HTTPConnection\nfrom .packages.six.moves.http_client import HTTPException # noqa: F401\n\ntry: # Compiled with SSL?\n import ssl\n BaseSSLError = ssl.SSLError\nexcept (ImportError, AttributeError): # Platform-specific: No SSL.\n ssl = None\n\n class BaseSSLError(BaseException):\n pass\n\n\ntry: # Python 3:\n # Not a no-op, we're adding this to the namespace so it can be imported.\n ConnectionError = ConnectionError\nexcept NameError: # Python 2:\n class ConnectionError(Exception):\n pass\n\n\nfrom .exceptions import (\n NewConnectionError,\n ConnectTimeoutError,\n SubjectAltNameWarning,\n SystemTimeWarning,\n)\nfrom .packages.ssl_match_hostname import match_hostname, CertificateError\n\nfrom .util.ssl_ import (\n resolve_cert_reqs,\n resolve_ssl_version,\n assert_fingerprint,\n create_urllib3_context,\n ssl_wrap_socket\n)\n\n\nfrom .util import connection\n\nfrom ._collections import HTTPHeaderDict\n\nlog = logging.getLogger(__name__)\n\nport_by_scheme = {\n 'http': 80,\n 'https': 443,\n}\n\nRECENT_DATE = datetime.date(2014, 1, 1)\n\n\nclass DummyConnection(object):\n \"\"\"Used to detect a failed ConnectionCls import.\"\"\"\n pass\n\n\nclass HTTPConnection(_HTTPConnection, object):\n \"\"\"\n Based on httplib.HTTPConnection but provides an extra constructor\n backwards-compatibility layer between older and newer Pythons.\n\n Additional keyword parameters are used to configure attributes of the connection.\n Accepted parameters include:\n\n - ``strict``: See the documentation on :class:`urllib3.connectionpool.HTTPConnectionPool`\n - ``source_address``: Set the source address for the current connection.\n\n .. note:: This is ignored for Python 2.6. It is only applied for 2.7 and 3.x\n\n - ``socket_options``: Set specific options on the underlying socket. If not specified, then\n defaults are loaded from ``HTTPConnection.default_socket_options`` which includes disabling\n Nagle's algorithm (sets TCP_NODELAY to 1) unless the connection is behind a proxy.\n\n For example, if you wish to enable TCP Keep Alive in addition to the defaults,\n you might pass::\n\n HTTPConnection.default_socket_options + [\n (socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1),\n ]\n\n Or you may want to disable the defaults by passing an empty list (e.g., ``[]``).\n \"\"\"\n\n default_port = port_by_scheme['http']\n\n #: Disable Nagle's algorithm by default.\n #: ``[(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)]``\n default_socket_options = [(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)]\n\n #: Whether this connection verifies the host's certificate.\n is_verified = False\n\n def __init__(self, *args, **kw):\n if six.PY3: # Python 3\n kw.pop('strict', None)\n\n # Pre-set source_address in case we have an older Python like 2.6.\n self.source_address = kw.get('source_address')\n\n if sys.version_info < (2, 7): # Python 2.6\n # _HTTPConnection on Python 2.6 will balk at this keyword arg, but\n # not newer versions. We can still use it when creating a\n # connection though, so we pop it *after* we have saved it as\n # self.source_address.\n kw.pop('source_address', None)\n\n #: The socket options provided by the user. If no options are\n #: provided, we use the default options.\n self.socket_options = kw.pop('socket_options', self.default_socket_options)\n\n # Superclass also sets self.source_address in Python 2.7+.\n _HTTPConnection.__init__(self, *args, **kw)\n\n def _new_conn(self):\n \"\"\" Establish a socket connection and set nodelay settings on it.\n\n :return: New socket connection.\n \"\"\"\n extra_kw = {}\n if self.source_address:\n extra_kw['source_address'] = self.source_address\n\n if self.socket_options:\n extra_kw['socket_options'] = self.socket_options\n\n try:\n conn = connection.create_connection(\n (self.host, self.port), self.timeout, **extra_kw)\n\n except SocketTimeout as e:\n raise ConnectTimeoutError(\n self, \"Connection to %s timed out. (connect timeout=%s)\" %\n (self.host, self.timeout))\n\n except SocketError as e:\n raise NewConnectionError(\n self, \"Failed to establish a new connection: %s\" % e)\n\n return conn\n\n def _prepare_conn(self, conn):\n self.sock = conn\n # the _tunnel_host attribute was added in python 2.6.3 (via\n # http://hg.python.org/cpython/rev/0f57b30a152f) so pythons 2.6(0-2) do\n # not have them.\n if getattr(self, '_tunnel_host', None):\n # TODO: Fix tunnel so it doesn't depend on self.sock state.\n self._tunnel()\n # Mark this connection as not reusable\n self.auto_open = 0\n\n def connect(self):\n conn = self._new_conn()\n self._prepare_conn(conn)\n\n def request_chunked(self, method, url, body=None, headers=None):\n \"\"\"\n Alternative to the common request method, which sends the\n body with chunked encoding and not as one block\n \"\"\"\n headers = HTTPHeaderDict(headers if headers is not None else {})\n skip_accept_encoding = 'accept-encoding' in headers\n skip_host = 'host' in headers\n self.putrequest(\n method,\n url,\n skip_accept_encoding=skip_accept_encoding,\n skip_host=skip_host\n )\n for header, value in headers.items():\n self.putheader(header, value)\n if 'transfer-encoding' not in headers:\n self.putheader('Transfer-Encoding', 'chunked')\n self.endheaders()\n\n if body is not None:\n stringish_types = six.string_types + (six.binary_type,)\n if isinstance(body, stringish_types):\n body = (body,)\n for chunk in body:\n if not chunk:\n continue\n if not isinstance(chunk, six.binary_type):\n chunk = chunk.encode('utf8')\n len_str = hex(len(chunk))[2:]\n self.send(len_str.encode('utf-8'))\n self.send(b'\\r\\n')\n self.send(chunk)\n self.send(b'\\r\\n')\n\n # After the if clause, to always have a closed body\n self.send(b'0\\r\\n\\r\\n')\n\n\nclass HTTPSConnection(HTTPConnection):\n default_port = port_by_scheme['https']\n\n ssl_version = None\n\n def __init__(self, host, port=None, key_file=None, cert_file=None,\n strict=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,\n ssl_context=None, **kw):\n\n HTTPConnection.__init__(self, host, port, strict=strict,\n timeout=timeout, **kw)\n\n self.key_file = key_file\n self.cert_file = cert_file\n self.ssl_context = ssl_context\n\n # Required property for Google AppEngine 1.9.0 which otherwise causes\n # HTTPS requests to go out as HTTP. (See Issue #356)\n self._protocol = 'https'\n\n def connect(self):\n conn = self._new_conn()\n self._prepare_conn(conn)\n\n if self.ssl_context is None:\n self.ssl_context = create_urllib3_context(\n ssl_version=resolve_ssl_version(None),\n cert_reqs=resolve_cert_reqs(None),\n )\n\n self.sock = ssl_wrap_socket(\n sock=conn,\n keyfile=self.key_file,\n certfile=self.cert_file,\n ssl_context=self.ssl_context,\n )\n\n\nclass VerifiedHTTPSConnection(HTTPSConnection):\n \"\"\"\n Based on httplib.HTTPSConnection but wraps the socket with\n SSL certification.\n \"\"\"\n cert_reqs = None\n ca_certs = None\n ca_cert_dir = None\n ssl_version = None\n assert_fingerprint = None\n\n def set_cert(self, key_file=None, cert_file=None,\n cert_reqs=None, ca_certs=None,\n assert_hostname=None, assert_fingerprint=None,\n ca_cert_dir=None):\n \"\"\"\n This method should only be called once, before the connection is used.\n \"\"\"\n # If cert_reqs is not provided, we can try to guess. If the user gave\n # us a cert database, we assume they want to use it: otherwise, if\n # they gave us an SSL Context object we should use whatever is set for\n # it.\n if cert_reqs is None:\n if ca_certs or ca_cert_dir:\n cert_reqs = 'CERT_REQUIRED'\n elif self.ssl_context is not None:\n cert_reqs = self.ssl_context.verify_mode\n\n self.key_file = key_file\n self.cert_file = cert_file\n self.cert_reqs = cert_reqs\n self.assert_hostname = assert_hostname\n self.assert_fingerprint = assert_fingerprint\n self.ca_certs = ca_certs and os.path.expanduser(ca_certs)\n self.ca_cert_dir = ca_cert_dir and os.path.expanduser(ca_cert_dir)\n\n def connect(self):\n # Add certificate verification\n conn = self._new_conn()\n\n hostname = self.host\n if getattr(self, '_tunnel_host', None):\n # _tunnel_host was added in Python 2.6.3\n # (See: http://hg.python.org/cpython/rev/0f57b30a152f)\n\n self.sock = conn\n # Calls self._set_hostport(), so self.host is\n # self._tunnel_host below.\n self._tunnel()\n # Mark this connection as not reusable\n self.auto_open = 0\n\n # Override the host with the one we're requesting data from.\n hostname = self._tunnel_host\n\n is_time_off = datetime.date.today() < RECENT_DATE\n if is_time_off:\n warnings.warn((\n 'System time is way off (before {0}). This will probably '\n 'lead to SSL verification errors').format(RECENT_DATE),\n SystemTimeWarning\n )\n\n # Wrap socket using verification with the root certs in\n # trusted_root_certs\n if self.ssl_context is None:\n self.ssl_context = create_urllib3_context(\n ssl_version=resolve_ssl_version(self.ssl_version),\n cert_reqs=resolve_cert_reqs(self.cert_reqs),\n )\n\n context = self.ssl_context\n context.verify_mode = resolve_cert_reqs(self.cert_reqs)\n self.sock = ssl_wrap_socket(\n sock=conn,\n keyfile=self.key_file,\n certfile=self.cert_file,\n ca_certs=self.ca_certs,\n ca_cert_dir=self.ca_cert_dir,\n server_hostname=hostname,\n ssl_context=context)\n\n if self.assert_fingerprint:\n assert_fingerprint(self.sock.getpeercert(binary_form=True),\n self.assert_fingerprint)\n elif context.verify_mode != ssl.CERT_NONE \\\n and self.assert_hostname is not False:\n cert = self.sock.getpeercert()\n if not cert.get('subjectAltName', ()):\n warnings.warn((\n 'Certificate for {0} has no `subjectAltName`, falling back to check for a '\n '`commonName` for now. This feature is being removed by major browsers and '\n 'deprecated by RFC 2818. (See https://github.com/shazow/urllib3/issues/497 '\n 'for details.)'.format(hostname)),\n SubjectAltNameWarning\n )\n _match_hostname(cert, self.assert_hostname or hostname)\n\n self.is_verified = (\n context.verify_mode == ssl.CERT_REQUIRED or\n self.assert_fingerprint is not None\n )\n\n\ndef _match_hostname(cert, asserted_hostname):\n try:\n match_hostname(cert, asserted_hostname)\n except CertificateError as e:\n log.error(\n 'Certificate did not match expected hostname: %s. '\n 'Certificate: %s', asserted_hostname, cert\n )\n # Add cert to exception and reraise so client code can inspect\n # the cert when catching the exception, if they want to\n e._peer_cert = cert\n raise\n\n\nif ssl:\n # Make a copy for testing.\n UnverifiedHTTPSConnection = HTTPSConnection\n HTTPSConnection = VerifiedHTTPSConnection\nelse:\n HTTPSConnection = DummyConnection\n", "path": "urllib3/connection.py" } ]
[ { "content": "from __future__ import absolute_import\nimport datetime\nimport logging\nimport os\nimport sys\nimport socket\nfrom socket import error as SocketError, timeout as SocketTimeout\nimport warnings\nfrom .packages import six\nfrom .packages.six.moves.http_client import HTTPConnection as _HTTPConnection\nfrom .packages.six.moves.http_client import HTTPException # noqa: F401\n\ntry: # Compiled with SSL?\n import ssl\n BaseSSLError = ssl.SSLError\nexcept (ImportError, AttributeError): # Platform-specific: No SSL.\n ssl = None\n\n class BaseSSLError(BaseException):\n pass\n\n\ntry: # Python 3:\n # Not a no-op, we're adding this to the namespace so it can be imported.\n ConnectionError = ConnectionError\nexcept NameError: # Python 2:\n class ConnectionError(Exception):\n pass\n\n\nfrom .exceptions import (\n NewConnectionError,\n ConnectTimeoutError,\n SubjectAltNameWarning,\n SystemTimeWarning,\n)\nfrom .packages.ssl_match_hostname import match_hostname, CertificateError\n\nfrom .util.ssl_ import (\n resolve_cert_reqs,\n resolve_ssl_version,\n assert_fingerprint,\n create_urllib3_context,\n ssl_wrap_socket\n)\n\n\nfrom .util import connection\n\nfrom ._collections import HTTPHeaderDict\n\nlog = logging.getLogger(__name__)\n\nport_by_scheme = {\n 'http': 80,\n 'https': 443,\n}\n\n# When updating RECENT_DATE, move it to\n# within two years of the current date, and no\n# earlier than 6 months ago.\nRECENT_DATE = datetime.date(2016, 1, 1)\n\n\nclass DummyConnection(object):\n \"\"\"Used to detect a failed ConnectionCls import.\"\"\"\n pass\n\n\nclass HTTPConnection(_HTTPConnection, object):\n \"\"\"\n Based on httplib.HTTPConnection but provides an extra constructor\n backwards-compatibility layer between older and newer Pythons.\n\n Additional keyword parameters are used to configure attributes of the connection.\n Accepted parameters include:\n\n - ``strict``: See the documentation on :class:`urllib3.connectionpool.HTTPConnectionPool`\n - ``source_address``: Set the source address for the current connection.\n\n .. note:: This is ignored for Python 2.6. It is only applied for 2.7 and 3.x\n\n - ``socket_options``: Set specific options on the underlying socket. If not specified, then\n defaults are loaded from ``HTTPConnection.default_socket_options`` which includes disabling\n Nagle's algorithm (sets TCP_NODELAY to 1) unless the connection is behind a proxy.\n\n For example, if you wish to enable TCP Keep Alive in addition to the defaults,\n you might pass::\n\n HTTPConnection.default_socket_options + [\n (socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1),\n ]\n\n Or you may want to disable the defaults by passing an empty list (e.g., ``[]``).\n \"\"\"\n\n default_port = port_by_scheme['http']\n\n #: Disable Nagle's algorithm by default.\n #: ``[(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)]``\n default_socket_options = [(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)]\n\n #: Whether this connection verifies the host's certificate.\n is_verified = False\n\n def __init__(self, *args, **kw):\n if six.PY3: # Python 3\n kw.pop('strict', None)\n\n # Pre-set source_address in case we have an older Python like 2.6.\n self.source_address = kw.get('source_address')\n\n if sys.version_info < (2, 7): # Python 2.6\n # _HTTPConnection on Python 2.6 will balk at this keyword arg, but\n # not newer versions. We can still use it when creating a\n # connection though, so we pop it *after* we have saved it as\n # self.source_address.\n kw.pop('source_address', None)\n\n #: The socket options provided by the user. If no options are\n #: provided, we use the default options.\n self.socket_options = kw.pop('socket_options', self.default_socket_options)\n\n # Superclass also sets self.source_address in Python 2.7+.\n _HTTPConnection.__init__(self, *args, **kw)\n\n def _new_conn(self):\n \"\"\" Establish a socket connection and set nodelay settings on it.\n\n :return: New socket connection.\n \"\"\"\n extra_kw = {}\n if self.source_address:\n extra_kw['source_address'] = self.source_address\n\n if self.socket_options:\n extra_kw['socket_options'] = self.socket_options\n\n try:\n conn = connection.create_connection(\n (self.host, self.port), self.timeout, **extra_kw)\n\n except SocketTimeout as e:\n raise ConnectTimeoutError(\n self, \"Connection to %s timed out. (connect timeout=%s)\" %\n (self.host, self.timeout))\n\n except SocketError as e:\n raise NewConnectionError(\n self, \"Failed to establish a new connection: %s\" % e)\n\n return conn\n\n def _prepare_conn(self, conn):\n self.sock = conn\n # the _tunnel_host attribute was added in python 2.6.3 (via\n # http://hg.python.org/cpython/rev/0f57b30a152f) so pythons 2.6(0-2) do\n # not have them.\n if getattr(self, '_tunnel_host', None):\n # TODO: Fix tunnel so it doesn't depend on self.sock state.\n self._tunnel()\n # Mark this connection as not reusable\n self.auto_open = 0\n\n def connect(self):\n conn = self._new_conn()\n self._prepare_conn(conn)\n\n def request_chunked(self, method, url, body=None, headers=None):\n \"\"\"\n Alternative to the common request method, which sends the\n body with chunked encoding and not as one block\n \"\"\"\n headers = HTTPHeaderDict(headers if headers is not None else {})\n skip_accept_encoding = 'accept-encoding' in headers\n skip_host = 'host' in headers\n self.putrequest(\n method,\n url,\n skip_accept_encoding=skip_accept_encoding,\n skip_host=skip_host\n )\n for header, value in headers.items():\n self.putheader(header, value)\n if 'transfer-encoding' not in headers:\n self.putheader('Transfer-Encoding', 'chunked')\n self.endheaders()\n\n if body is not None:\n stringish_types = six.string_types + (six.binary_type,)\n if isinstance(body, stringish_types):\n body = (body,)\n for chunk in body:\n if not chunk:\n continue\n if not isinstance(chunk, six.binary_type):\n chunk = chunk.encode('utf8')\n len_str = hex(len(chunk))[2:]\n self.send(len_str.encode('utf-8'))\n self.send(b'\\r\\n')\n self.send(chunk)\n self.send(b'\\r\\n')\n\n # After the if clause, to always have a closed body\n self.send(b'0\\r\\n\\r\\n')\n\n\nclass HTTPSConnection(HTTPConnection):\n default_port = port_by_scheme['https']\n\n ssl_version = None\n\n def __init__(self, host, port=None, key_file=None, cert_file=None,\n strict=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,\n ssl_context=None, **kw):\n\n HTTPConnection.__init__(self, host, port, strict=strict,\n timeout=timeout, **kw)\n\n self.key_file = key_file\n self.cert_file = cert_file\n self.ssl_context = ssl_context\n\n # Required property for Google AppEngine 1.9.0 which otherwise causes\n # HTTPS requests to go out as HTTP. (See Issue #356)\n self._protocol = 'https'\n\n def connect(self):\n conn = self._new_conn()\n self._prepare_conn(conn)\n\n if self.ssl_context is None:\n self.ssl_context = create_urllib3_context(\n ssl_version=resolve_ssl_version(None),\n cert_reqs=resolve_cert_reqs(None),\n )\n\n self.sock = ssl_wrap_socket(\n sock=conn,\n keyfile=self.key_file,\n certfile=self.cert_file,\n ssl_context=self.ssl_context,\n )\n\n\nclass VerifiedHTTPSConnection(HTTPSConnection):\n \"\"\"\n Based on httplib.HTTPSConnection but wraps the socket with\n SSL certification.\n \"\"\"\n cert_reqs = None\n ca_certs = None\n ca_cert_dir = None\n ssl_version = None\n assert_fingerprint = None\n\n def set_cert(self, key_file=None, cert_file=None,\n cert_reqs=None, ca_certs=None,\n assert_hostname=None, assert_fingerprint=None,\n ca_cert_dir=None):\n \"\"\"\n This method should only be called once, before the connection is used.\n \"\"\"\n # If cert_reqs is not provided, we can try to guess. If the user gave\n # us a cert database, we assume they want to use it: otherwise, if\n # they gave us an SSL Context object we should use whatever is set for\n # it.\n if cert_reqs is None:\n if ca_certs or ca_cert_dir:\n cert_reqs = 'CERT_REQUIRED'\n elif self.ssl_context is not None:\n cert_reqs = self.ssl_context.verify_mode\n\n self.key_file = key_file\n self.cert_file = cert_file\n self.cert_reqs = cert_reqs\n self.assert_hostname = assert_hostname\n self.assert_fingerprint = assert_fingerprint\n self.ca_certs = ca_certs and os.path.expanduser(ca_certs)\n self.ca_cert_dir = ca_cert_dir and os.path.expanduser(ca_cert_dir)\n\n def connect(self):\n # Add certificate verification\n conn = self._new_conn()\n\n hostname = self.host\n if getattr(self, '_tunnel_host', None):\n # _tunnel_host was added in Python 2.6.3\n # (See: http://hg.python.org/cpython/rev/0f57b30a152f)\n\n self.sock = conn\n # Calls self._set_hostport(), so self.host is\n # self._tunnel_host below.\n self._tunnel()\n # Mark this connection as not reusable\n self.auto_open = 0\n\n # Override the host with the one we're requesting data from.\n hostname = self._tunnel_host\n\n is_time_off = datetime.date.today() < RECENT_DATE\n if is_time_off:\n warnings.warn((\n 'System time is way off (before {0}). This will probably '\n 'lead to SSL verification errors').format(RECENT_DATE),\n SystemTimeWarning\n )\n\n # Wrap socket using verification with the root certs in\n # trusted_root_certs\n if self.ssl_context is None:\n self.ssl_context = create_urllib3_context(\n ssl_version=resolve_ssl_version(self.ssl_version),\n cert_reqs=resolve_cert_reqs(self.cert_reqs),\n )\n\n context = self.ssl_context\n context.verify_mode = resolve_cert_reqs(self.cert_reqs)\n self.sock = ssl_wrap_socket(\n sock=conn,\n keyfile=self.key_file,\n certfile=self.cert_file,\n ca_certs=self.ca_certs,\n ca_cert_dir=self.ca_cert_dir,\n server_hostname=hostname,\n ssl_context=context)\n\n if self.assert_fingerprint:\n assert_fingerprint(self.sock.getpeercert(binary_form=True),\n self.assert_fingerprint)\n elif context.verify_mode != ssl.CERT_NONE \\\n and self.assert_hostname is not False:\n cert = self.sock.getpeercert()\n if not cert.get('subjectAltName', ()):\n warnings.warn((\n 'Certificate for {0} has no `subjectAltName`, falling back to check for a '\n '`commonName` for now. This feature is being removed by major browsers and '\n 'deprecated by RFC 2818. (See https://github.com/shazow/urllib3/issues/497 '\n 'for details.)'.format(hostname)),\n SubjectAltNameWarning\n )\n _match_hostname(cert, self.assert_hostname or hostname)\n\n self.is_verified = (\n context.verify_mode == ssl.CERT_REQUIRED or\n self.assert_fingerprint is not None\n )\n\n\ndef _match_hostname(cert, asserted_hostname):\n try:\n match_hostname(cert, asserted_hostname)\n except CertificateError as e:\n log.error(\n 'Certificate did not match expected hostname: %s. '\n 'Certificate: %s', asserted_hostname, cert\n )\n # Add cert to exception and reraise so client code can inspect\n # the cert when catching the exception, if they want to\n e._peer_cert = cert\n raise\n\n\nif ssl:\n # Make a copy for testing.\n UnverifiedHTTPSConnection = HTTPSConnection\n HTTPSConnection = VerifiedHTTPSConnection\nelse:\n HTTPSConnection = DummyConnection\n", "path": "urllib3/connection.py" } ]
diff --git a/test/test_connection.py b/test/test_connection.py index 376c315561..343695bec0 100644 --- a/test/test_connection.py +++ b/test/test_connection.py @@ -1,4 +1,9 @@ -import unittest +import datetime +import sys +if sys.version_info >= (2, 7): + import unittest +else: + import unittest2 as unittest import mock @@ -6,6 +11,7 @@ CertificateError, VerifiedHTTPSConnection, _match_hostname, + RECENT_DATE ) @@ -43,6 +49,14 @@ def test_match_hostname_mismatch(self): ) self.assertEqual(e._peer_cert, cert) + def test_recent_date(self): + # This test is to make sure that the RECENT_DATE value + # doesn't get too far behind what the current date is. + # When this test fails update urllib3.connection.RECENT_DATE + # according to the rules defined in that file. + two_years = datetime.timedelta(days=365 * 2) + self.assertGreater(RECENT_DATE, (datetime.datetime.today() - two_years).date()) + if __name__ == '__main__': unittest.main() diff --git a/urllib3/connection.py b/urllib3/connection.py index e24f5e3241..9f06c39589 100644 --- a/urllib3/connection.py +++ b/urllib3/connection.py @@ -56,7 +56,10 @@ class ConnectionError(Exception): 'https': 443, } -RECENT_DATE = datetime.date(2014, 1, 1) +# When updating RECENT_DATE, move it to +# within two years of the current date, and no +# earlier than 6 months ago. +RECENT_DATE = datetime.date(2016, 1, 1) class DummyConnection(object):
conda__conda-build-4062
[ { "content": "from __future__ import absolute_import, division, print_function\n\nimport io\nimport locale\nimport os\nfrom os.path import join, isdir, isfile, abspath, basename, exists, normpath, expanduser\nimport re\nimport shutil\nfrom subprocess import CalledProcessError\nimport sys\nimport time\n\nfrom .conda_interface import download, TemporaryDirectory\nfrom .conda_interface import hashsum_file\n\nfrom conda_build.os_utils import external\nfrom conda_build.conda_interface import url_path, CondaHTTPError\nfrom conda_build.utils import (decompressible_exts, tar_xf, safe_print_unicode, copy_into, on_win, ensure_list,\n check_output_env, check_call_env, convert_path_for_cygwin_or_msys2,\n get_logger, rm_rf, LoggingContext)\n\n\nif on_win:\n from conda_build.utils import convert_unix_path_to_win\n\nif sys.version_info[0] == 3:\n from urllib.parse import urljoin\nelse:\n from urlparse import urljoin\n\ngit_submod_re = re.compile(r'(?:.+)\\.(.+)\\.(?:.+)\\s(.+)')\next_re = re.compile(r\"(.*?)(\\.(?:tar\\.)?[^.]+)$\")\n\n\ndef append_hash_to_fn(fn, hash_value):\n return ext_re.sub(r\"\\1_{}\\2\".format(hash_value[:10]), fn)\n\n\ndef download_to_cache(cache_folder, recipe_path, source_dict, verbose=False):\n ''' Download a source to the local cache. '''\n log = get_logger(__name__)\n if verbose:\n log.info('Source cache directory is: %s' % cache_folder)\n if not isdir(cache_folder) and not os.path.islink(cache_folder):\n os.makedirs(cache_folder)\n\n source_urls = source_dict['url']\n if not isinstance(source_urls, list):\n source_urls = [source_urls]\n unhashed_fn = fn = source_dict['fn'] if 'fn' in source_dict else basename(source_urls[0])\n hash_added = False\n for hash_type in ('md5', 'sha1', 'sha256'):\n if hash_type in source_dict:\n if source_dict[hash_type] in (None, \"\"):\n raise ValueError('Empty {} hash provided for {}'.format(hash_type, fn))\n fn = append_hash_to_fn(fn, source_dict[hash_type])\n hash_added = True\n break\n else:\n log.warn(\"No hash (md5, sha1, sha256) provided for {}. Source download forced. \"\n \"Add hash to recipe to use source cache.\".format(unhashed_fn))\n path = join(cache_folder, fn)\n if isfile(path):\n if verbose:\n log.info('Found source in cache: %s' % fn)\n else:\n if verbose:\n log.info('Downloading source to cache: %s' % fn)\n\n for url in source_urls:\n if \"://\" not in url:\n if url.startswith('~'):\n url = expanduser(url)\n if not os.path.isabs(url):\n url = os.path.normpath(os.path.join(recipe_path, url))\n url = url_path(url)\n else:\n if url.startswith('file:///~'):\n url = 'file:///' + expanduser(url[8:]).replace('\\\\', '/')\n try:\n if verbose:\n log.info(\"Downloading %s\" % url)\n with LoggingContext():\n download(url, path)\n except CondaHTTPError as e:\n log.warn(\"Error: %s\" % str(e).strip())\n rm_rf(path)\n except RuntimeError as e:\n log.warn(\"Error: %s\" % str(e).strip())\n rm_rf(path)\n else:\n if verbose:\n log.info(\"Success\")\n break\n else: # no break\n rm_rf(path)\n raise RuntimeError(\"Could not download %s\" % url)\n\n hashed = None\n for tp in ('md5', 'sha1', 'sha256'):\n if tp in source_dict:\n expected_hash = source_dict[tp]\n hashed = hashsum_file(path, tp)\n if expected_hash != hashed:\n rm_rf(path)\n raise RuntimeError(\"%s mismatch: '%s' != '%s'\" %\n (tp.upper(), hashed, expected_hash))\n break\n\n # this is really a fallback. If people don't provide the hash, we still need to prevent\n # collisions in our source cache, but the end user will get no benefirt from the cache.\n if not hash_added:\n if not hashed:\n hashed = hashsum_file(path, 'sha256')\n dest_path = append_hash_to_fn(path, hashed)\n if not os.path.isfile(dest_path):\n shutil.move(path, dest_path)\n path = dest_path\n\n return path, unhashed_fn\n\n\ndef hoist_single_extracted_folder(nested_folder):\n \"\"\"Moves all files/folders one level up.\n\n This is for when your archive extracts into its own folder, so that we don't need to\n know exactly what that folder is called.\"\"\"\n parent = os.path.dirname(nested_folder)\n flist = os.listdir(nested_folder)\n with TemporaryDirectory() as tmpdir:\n for entry in flist:\n shutil.move(os.path.join(nested_folder, entry), os.path.join(tmpdir, entry))\n rm_rf(nested_folder)\n for entry in flist:\n shutil.move(os.path.join(tmpdir, entry), os.path.join(parent, entry))\n\n\ndef unpack(source_dict, src_dir, cache_folder, recipe_path, croot, verbose=False,\n timeout=900, locking=True):\n ''' Uncompress a downloaded source. '''\n src_path, unhashed_fn = download_to_cache(cache_folder, recipe_path, source_dict, verbose)\n\n if not isdir(src_dir):\n os.makedirs(src_dir)\n if verbose:\n print(\"Extracting download\")\n with TemporaryDirectory(dir=croot) as tmpdir:\n unhashed_dest = os.path.join(tmpdir, unhashed_fn)\n if src_path.lower().endswith(decompressible_exts):\n tar_xf(src_path, tmpdir)\n else:\n # In this case, the build script will need to deal with unpacking the source\n print(\"Warning: Unrecognized source format. Source file will be copied to the SRC_DIR\")\n copy_into(src_path, unhashed_dest, timeout, locking=locking)\n if src_path.lower().endswith('.whl'):\n # copy wheel itself *and* unpack it\n # This allows test_files or about.license_file to locate files in the wheel,\n # as well as `pip install name-version.whl` as install command\n copy_into(src_path, unhashed_dest, timeout, locking=locking)\n flist = os.listdir(tmpdir)\n folder = os.path.join(tmpdir, flist[0])\n # Hoisting is destructive of information, in CDT packages, a single top level\n # folder of /usr64 must not be discarded.\n if len(flist) == 1 and os.path.isdir(folder) and 'no_hoist' not in source_dict:\n hoist_single_extracted_folder(folder)\n flist = os.listdir(tmpdir)\n for f in flist:\n shutil.move(os.path.join(tmpdir, f), os.path.join(src_dir, f))\n\n\ndef git_mirror_checkout_recursive(git, mirror_dir, checkout_dir, git_url, git_cache, git_ref=None,\n git_depth=-1, is_top_level=True, verbose=True):\n \"\"\" Mirror (and checkout) a Git repository recursively.\n\n It's not possible to use `git submodule` on a bare\n repository, so the checkout must be done before we\n know which submodules there are.\n\n Worse, submodules can be identified by using either\n absolute URLs or relative paths. If relative paths\n are used those need to be relocated upon mirroring,\n but you could end up with `../../../../blah` and in\n that case conda-build could be tricked into writing\n to the root of the drive and overwriting the system\n folders unless steps are taken to prevent that.\n \"\"\"\n\n if verbose:\n stdout = None\n stderr = None\n else:\n FNULL = open(os.devnull, 'w')\n stdout = FNULL\n stderr = FNULL\n\n if not mirror_dir.startswith(git_cache + os.sep):\n sys.exit(\"Error: Attempting to mirror to %s which is outside of GIT_CACHE %s\"\n % (mirror_dir, git_cache))\n\n # This is necessary for Cygwin git and m2-git, although it is fixed in newer MSYS2.\n git_mirror_dir = convert_path_for_cygwin_or_msys2(git, mirror_dir).rstrip('/')\n git_checkout_dir = convert_path_for_cygwin_or_msys2(git, checkout_dir).rstrip('/')\n\n # Set default here to catch empty dicts\n git_ref = git_ref or 'HEAD'\n\n mirror_dir = mirror_dir.rstrip('/')\n if not isdir(os.path.dirname(mirror_dir)):\n os.makedirs(os.path.dirname(mirror_dir))\n if isdir(mirror_dir):\n try:\n if git_ref != 'HEAD':\n check_call_env([git, 'fetch'], cwd=mirror_dir, stdout=stdout, stderr=stderr)\n else:\n # Unlike 'git clone', fetch doesn't automatically update the cache's HEAD,\n # So here we explicitly store the remote HEAD in the cache's local refs/heads,\n # and then explicitly set the cache's HEAD.\n # This is important when the git repo is a local path like \"git_url: ../\",\n # but the user is working with a branch other than 'master' without\n # explicitly providing git_rev.\n check_call_env([git, 'fetch', 'origin', '+HEAD:_conda_cache_origin_head'],\n cwd=mirror_dir, stdout=stdout, stderr=stderr)\n check_call_env([git, 'symbolic-ref', 'HEAD', 'refs/heads/_conda_cache_origin_head'],\n cwd=mirror_dir, stdout=stdout, stderr=stderr)\n except CalledProcessError:\n msg = (\"Failed to update local git cache. \"\n \"Deleting local cached repo: {} \".format(mirror_dir))\n print(msg)\n\n # Maybe the failure was caused by a corrupt mirror directory.\n # Delete it so the user can try again.\n shutil.rmtree(mirror_dir)\n raise\n else:\n args = [git, 'clone', '--mirror']\n if git_depth > 0:\n args += ['--depth', str(git_depth)]\n try:\n check_call_env(args + [git_url, git_mirror_dir], stdout=stdout, stderr=stderr)\n except CalledProcessError:\n # on windows, remote URL comes back to us as cygwin or msys format. Python doesn't\n # know how to normalize it. Need to convert it to a windows path.\n if sys.platform == 'win32' and git_url.startswith('/'):\n git_url = convert_unix_path_to_win(git_url)\n\n if os.path.exists(git_url):\n # Local filepaths are allowed, but make sure we normalize them\n git_url = normpath(git_url)\n check_call_env(args + [git_url, git_mirror_dir], stdout=stdout, stderr=stderr)\n assert isdir(mirror_dir)\n\n # Now clone from mirror_dir into checkout_dir.\n check_call_env([git, 'clone', git_mirror_dir, git_checkout_dir], stdout=stdout, stderr=stderr)\n if is_top_level:\n checkout = git_ref\n if git_url.startswith('.'):\n output = check_output_env([git, \"rev-parse\", checkout], stdout=stdout, stderr=stderr)\n checkout = output.decode('utf-8')\n if verbose:\n print('checkout: %r' % checkout)\n if checkout:\n check_call_env([git, 'checkout', checkout],\n cwd=checkout_dir, stdout=stdout, stderr=stderr)\n\n # submodules may have been specified using relative paths.\n # Those paths are relative to git_url, and will not exist\n # relative to mirror_dir, unless we do some work to make\n # it so.\n try:\n submodules = check_output_env([git, 'config', '--file', '.gitmodules', '--get-regexp',\n 'url'], stderr=stdout, cwd=checkout_dir)\n submodules = submodules.decode('utf-8').splitlines()\n except CalledProcessError:\n submodules = []\n for submodule in submodules:\n matches = git_submod_re.match(submodule)\n if matches and matches.group(2)[0] == '.':\n submod_name = matches.group(1)\n submod_rel_path = matches.group(2)\n submod_url = urljoin(git_url + '/', submod_rel_path)\n submod_mirror_dir = os.path.normpath(\n os.path.join(mirror_dir, submod_rel_path))\n if verbose:\n print('Relative submodule %s found: url is %s, submod_mirror_dir is %s' % (\n submod_name, submod_url, submod_mirror_dir))\n with TemporaryDirectory() as temp_checkout_dir:\n git_mirror_checkout_recursive(git, submod_mirror_dir, temp_checkout_dir, submod_url,\n git_cache=git_cache, git_ref=git_ref,\n git_depth=git_depth, is_top_level=False,\n verbose=verbose)\n\n if is_top_level:\n # Now that all relative-URL-specified submodules are locally mirrored to\n # relatively the same place we can go ahead and checkout the submodules.\n check_call_env([git, 'submodule', 'update', '--init',\n '--recursive'], cwd=checkout_dir, stdout=stdout, stderr=stderr)\n git_info(checkout_dir, verbose=verbose)\n if not verbose:\n FNULL.close()\n\n\ndef git_source(source_dict, git_cache, src_dir, recipe_path=None, verbose=True):\n ''' Download a source from a Git repo (or submodule, recursively) '''\n if not isdir(git_cache):\n os.makedirs(git_cache)\n\n git = external.find_executable('git')\n if not git:\n sys.exit(\"Error: git is not installed in your root environment or as a build requirement.\")\n\n git_depth = int(source_dict.get('git_depth', -1))\n git_ref = source_dict.get('git_rev') or 'HEAD'\n\n git_url = source_dict['git_url']\n if git_url.startswith('~'):\n git_url = os.path.expanduser(git_url)\n if git_url.startswith('.'):\n # It's a relative path from the conda recipe\n git_url = abspath(normpath(os.path.join(recipe_path, git_url)))\n if sys.platform == 'win32':\n git_dn = git_url.replace(':', '_')\n else:\n git_dn = git_url[1:]\n else:\n git_dn = git_url.split('://')[-1].replace('/', os.sep)\n if git_dn.startswith(os.sep):\n git_dn = git_dn[1:]\n git_dn = git_dn.replace(':', '_')\n mirror_dir = join(git_cache, git_dn)\n git_mirror_checkout_recursive(\n git, mirror_dir, src_dir, git_url, git_cache=git_cache, git_ref=git_ref,\n git_depth=git_depth, is_top_level=True, verbose=verbose)\n return git\n\n\ndef git_info(src_dir, verbose=True, fo=None):\n ''' Print info about a Git repo. '''\n assert isdir(src_dir)\n\n git = external.find_executable('git')\n if not git:\n log = get_logger(__name__)\n log.warn(\"git not installed in root environment. Skipping recording of git info.\")\n return\n\n if verbose:\n stderr = None\n else:\n FNULL = open(os.devnull, 'w')\n stderr = FNULL\n\n # Ensure to explicitly set GIT_DIR as some Linux machines will not\n # properly execute without it.\n env = os.environ.copy()\n env['GIT_DIR'] = join(src_dir, '.git')\n env = {str(key): str(value) for key, value in env.items()}\n for cmd, check_error in [\n ('git log -n1', True),\n ('git describe --tags --dirty', False),\n ('git status', True)]:\n try:\n stdout = check_output_env(cmd.split(), stderr=stderr, cwd=src_dir, env=env)\n except CalledProcessError as e:\n if check_error:\n raise Exception(\"git error: %s\" % str(e))\n encoding = locale.getpreferredencoding()\n if not fo:\n encoding = sys.stdout.encoding\n encoding = encoding or 'utf-8'\n if hasattr(stdout, 'decode'):\n stdout = stdout.decode(encoding, 'ignore')\n if fo:\n fo.write(u'==> %s <==\\n' % cmd)\n if verbose:\n fo.write(stdout + u'\\n')\n else:\n if verbose:\n print(u'==> %s <==\\n' % cmd)\n safe_print_unicode(stdout + u'\\n')\n\n\ndef hg_source(source_dict, src_dir, hg_cache, verbose):\n ''' Download a source from Mercurial repo. '''\n if verbose:\n stdout = None\n stderr = None\n else:\n FNULL = open(os.devnull, 'w')\n stdout = FNULL\n stderr = FNULL\n\n hg_url = source_dict['hg_url']\n if not isdir(hg_cache):\n os.makedirs(hg_cache)\n hg_dn = hg_url.split(':')[-1].replace('/', '_')\n cache_repo = join(hg_cache, hg_dn)\n if isdir(cache_repo):\n check_call_env(['hg', 'pull'], cwd=cache_repo, stdout=stdout, stderr=stderr)\n else:\n check_call_env(['hg', 'clone', hg_url, cache_repo], stdout=stdout, stderr=stderr)\n assert isdir(cache_repo)\n\n # now clone in to work directory\n update = source_dict.get('hg_tag') or 'tip'\n if verbose:\n print('checkout: %r' % update)\n\n check_call_env(['hg', 'clone', cache_repo, src_dir], stdout=stdout,\n stderr=stderr)\n check_call_env(['hg', 'update', '-C', update], cwd=src_dir, stdout=stdout,\n stderr=stderr)\n\n if not verbose:\n FNULL.close()\n\n return src_dir\n\n\ndef svn_source(source_dict, src_dir, svn_cache, verbose=True, timeout=900, locking=True):\n ''' Download a source from SVN repo. '''\n if verbose:\n stdout = None\n stderr = None\n else:\n FNULL = open(os.devnull, 'w')\n stdout = FNULL\n stderr = FNULL\n\n def parse_bool(s):\n return str(s).lower().strip() in ('yes', 'true', '1', 'on')\n\n svn_url = source_dict['svn_url']\n svn_revision = source_dict.get('svn_rev') or 'head'\n svn_ignore_externals = parse_bool(source_dict.get('svn_ignore_externals') or 'no')\n if not isdir(svn_cache):\n os.makedirs(svn_cache)\n svn_dn = svn_url.split(':', 1)[-1].replace('/', '_').replace(':', '_')\n cache_repo = join(svn_cache, svn_dn)\n if svn_ignore_externals:\n extra_args = ['--ignore-externals']\n else:\n extra_args = []\n if isdir(cache_repo):\n check_call_env(['svn', 'up', '-r', svn_revision] + extra_args, cwd=cache_repo,\n stdout=stdout, stderr=stderr)\n else:\n check_call_env(['svn', 'co', '-r', svn_revision] + extra_args + [svn_url, cache_repo],\n stdout=stdout, stderr=stderr)\n assert isdir(cache_repo)\n\n # now copy into work directory\n copy_into(cache_repo, src_dir, timeout, symlinks=True, locking=locking)\n\n if not verbose:\n FNULL.close()\n\n return src_dir\n\n\ndef get_repository_info(recipe_path):\n \"\"\"This tries to get information about where a recipe came from. This is different\n from the source - you can have a recipe in svn that gets source via git.\"\"\"\n try:\n if exists(join(recipe_path, \".git\")):\n origin = check_output_env([\"git\", \"config\", \"--get\", \"remote.origin.url\"],\n cwd=recipe_path)\n rev = check_output_env([\"git\", \"rev-parse\", \"HEAD\"], cwd=recipe_path)\n return \"Origin {}, commit {}\".format(origin, rev)\n elif isdir(join(recipe_path, \".hg\")):\n origin = check_output_env([\"hg\", \"paths\", \"default\"], cwd=recipe_path)\n rev = check_output_env([\"hg\", \"id\"], cwd=recipe_path).split()[0]\n return \"Origin {}, commit {}\".format(origin, rev)\n elif isdir(join(recipe_path, \".svn\")):\n info = check_output_env([\"svn\", \"info\"], cwd=recipe_path)\n info = info.decode(\"utf-8\") # Py3 returns a byte string, but re needs unicode or str.\n server = re.search(\"Repository Root: (.*)$\", info, flags=re.M).group(1)\n revision = re.search(\"Revision: (.*)$\", info, flags=re.M).group(1)\n return \"{}, Revision {}\".format(server, revision)\n else:\n return \"{}, last modified {}\".format(recipe_path,\n time.ctime(os.path.getmtime(\n join(recipe_path, \"meta.yaml\"))))\n except CalledProcessError:\n get_logger(__name__).debug(\"Failed to checkout source in \" + recipe_path)\n return \"{}, last modified {}\".format(recipe_path,\n time.ctime(os.path.getmtime(\n join(recipe_path, \"meta.yaml\"))))\n\n\ndef _ensure_unix_line_endings(path):\n \"\"\"Replace windows line endings with Unix. Return path to modified file.\"\"\"\n out_path = path + \"_unix\"\n with open(path, \"rb\") as inputfile:\n with open(out_path, \"wb\") as outputfile:\n for line in inputfile:\n outputfile.write(line.replace(b\"\\r\\n\", b\"\\n\"))\n return out_path\n\n\ndef _ensure_win_line_endings(path):\n \"\"\"Replace unix line endings with win. Return path to modified file.\"\"\"\n out_path = path + \"_win\"\n with open(path, \"rb\") as inputfile:\n with open(out_path, \"wb\") as outputfile:\n for line in inputfile:\n outputfile.write(line.replace(b\"\\n\", b\"\\r\\n\"))\n return out_path\n\n\ndef _guess_patch_strip_level(filesstr, src_dir):\n \"\"\" Determine the patch strip level automatically. \"\"\"\n maxlevel = None\n files = {filestr.encode(errors='ignore') for filestr in filesstr}\n src_dir = src_dir.encode(errors='ignore')\n for file in files:\n numslash = file.count(b'/')\n maxlevel = numslash if maxlevel is None else min(maxlevel, numslash)\n if maxlevel == 0:\n patchlevel = 0\n else:\n histo = dict()\n histo = {i: 0 for i in range(maxlevel + 1)}\n for file in files:\n parts = file.split(b'/')\n for level in range(maxlevel + 1):\n if os.path.exists(join(src_dir, *parts[-len(parts) + level:])):\n histo[level] += 1\n order = sorted(histo, key=histo.get, reverse=True)\n if histo[order[0]] == histo[order[1]]:\n print(\"Patch level ambiguous, selecting least deep\")\n patchlevel = min([key for key, value\n in histo.items() if value == histo[order[0]]])\n return patchlevel\n\n\ndef _get_patch_file_details(path):\n re_files = re.compile(r'^(?:---|\\+\\+\\+) ([^\\n\\t]+)')\n files = set()\n with io.open(path, errors='ignore') as f:\n files = []\n first_line = True\n is_git_format = True\n for line in f.readlines():\n if first_line and not re.match(r'From [0-9a-f]{40}', line):\n is_git_format = False\n first_line = False\n m = re_files.search(line)\n if m and m.group(1) != '/dev/null':\n files.append(m.group(1))\n elif is_git_format and line.startswith('git') and not line.startswith('git --diff'):\n is_git_format = False\n return (files, is_git_format)\n\n\ndef apply_patch(src_dir, path, config, git=None):\n def patch_or_reverse(patch, patch_args, cwd, stdout, stderr):\n # An old reference: https://unix.stackexchange.com/a/243748/34459\n #\n # I am worried that '--ignore-whitespace' may be destructive. If so we should\n # avoid passing it, particularly in the initial (most likely to succeed) calls.\n #\n # From here-in I define a 'native' patch as one which has:\n # 1. LF for the patch block metadata.\n # 2. CRLF or LF for the actual patched lines matching those of the source lines.\n #\n # Calls to a raw 'patch' are destructive in various ways:\n # 1. It leaves behind .rej and .orig files\n # 2. If you pass it a patch with incorrect CRLF changes and do not pass --binary and\n # if any of those blocks *can* be applied, then the whole file gets written out with\n # LF. This cannot be reversed either; the text changes will be reversed but not\n # line-feed changes (since all line-endings get changed, not just those of the of\n # patched lines)\n # 3. If patching fails, the bits that succeeded remain, so patching is not at all\n # atomic.\n #\n # Still, we do our best to mitigate all of this as follows:\n # 1. We disable .orig and .rej that for GNU patch via a temp file *\n # 2 (1). We check for native application of a native patch (--binary, without --ignore-whitespace)\n # 2 (2). We defer destructive calls to this until after the non-destructive ones.\n # 3. When patch indicates failure, we call it with -R to reverse the damage.\n #\n # * Some may bemoan the loss of these, but they it is fairly random which patch and patch\n # attempt they apply to so their informational value is low, besides that, they are ugly.\n # (and destructive to the future patchability of the source tree).\n #\n import tempfile\n temp_name = os.path.join(tempfile.gettempdir(), next(tempfile._get_candidate_names()))\n patch_args.append('-r')\n patch_args.append(temp_name)\n patch_args = ['--no-backup-if-mismatch', '--batch'] + patch_args\n log = get_logger(__name__)\n try:\n log.debug(\"Applying with\\n{} {}\".format(patch, patch_args))\n check_call_env([patch] + patch_args, cwd=cwd, stdout=stdout, stderr=stderr)\n # You can use this to pretend the patch failed so as to test reversal!\n # raise CalledProcessError(-1, ' '.join([patch] + patch_args))\n except Exception as e:\n try:\n if '--ignore-whitespace' in patch_args:\n patch_args.remove('--ignore-whitespace')\n patch_args.insert(0, '-R')\n patch_args.append('--binary')\n patch_args.append('--force')\n log.debug(\"Reversing with\\n{} {}\".format(patch, patch_args))\n check_call_env([patch] + patch_args, cwd=cwd, stdout=stdout, stderr=stderr)\n except:\n pass\n raise e\n finally:\n if os.path.exists(temp_name):\n os.unlink(temp_name)\n\n exception = None\n if not isfile(path):\n sys.exit('Error: no such patch: %s' % path)\n\n if config.verbose:\n stdout = None\n stderr = None\n else:\n FNULL = open(os.devnull, 'w')\n stdout = FNULL\n stderr = FNULL\n\n files, is_git_format = _get_patch_file_details(path)\n if git and is_git_format:\n # Prevents git from asking interactive questions,\n # also necessary to achieve sha1 reproducibility;\n # as is --committer-date-is-author-date. By this,\n # we mean a round-trip of git am/git format-patch\n # gives the same file.\n git_env = os.environ\n git_env['GIT_COMMITTER_NAME'] = 'conda-build'\n git_env['GIT_COMMITTER_EMAIL'] = 'conda@conda-build.org'\n check_call_env([git, 'am', '-3', '--committer-date-is-author-date', path],\n cwd=src_dir, stdout=stdout, stderr=stderr, env=git_env)\n config.git_commits_since_tag += 1\n else:\n if config.verbose:\n print('Applying patch: %r' % path)\n patch = external.find_executable('patch', config.build_prefix)\n if patch is None or len(patch) == 0:\n sys.exit(\"\"\"\\\n Error:\n Cannot use 'git' (not a git repo and/or patch) and did not find 'patch' in: %s\n You can install 'patch' using apt-get, yum (Linux), Xcode (MacOSX),\n or conda, m2-patch (Windows),\n \"\"\" % (os.pathsep.join(external.dir_paths)))\n patch_strip_level = _guess_patch_strip_level(files, src_dir)\n path_args = ['-i', path]\n patch_args = ['-p%d' % patch_strip_level]\n\n try:\n log = get_logger(__name__)\n # This is the case we check first of all as it is the case that allows a properly line-ended\n # patch to apply correctly to a properly line-ended source tree, modifying it following the\n # patch chunks exactly.\n patch_or_reverse(patch, patch_args + ['--binary'] + path_args,\n cwd=src_dir, stdout=stdout, stderr=stderr)\n except CalledProcessError as e:\n # Capture the first exception\n exception = e\n if config.verbose:\n log.info(\"Applying patch natively failed. \"\n \"Trying to apply patch non-binary with --ignore-whitespace\")\n try:\n patch_or_reverse(patch, patch_args + ['--ignore-whitespace'] + path_args,\n cwd=src_dir, stdout=stdout, stderr=stderr)\n except CalledProcessError as e: # noqa\n unix_ending_file = _ensure_unix_line_endings(path)\n path_args[-1] = unix_ending_file\n try:\n if config.verbose:\n log.info(\"Applying natively *and* non-binary failed! \"\n \"Converting to unix line endings and trying again. \"\n \"WARNING :: This is destructive to the source file line-endings.\")\n # If this succeeds, it will change the source files' CRLFs to LFs. This can\n # mess things up both for subsequent attempts (this line-ending change is not\n # reversible) but worse, for subsequent, correctly crafted (I'm calling these\n # \"native\" from now on) patches.\n patch_or_reverse(patch, patch_args + ['--ignore-whitespace'] + path_args,\n cwd=src_dir, stdout=stdout, stderr=stderr)\n except CalledProcessError:\n if config.verbose:\n log.warning(\"Applying natively, non-binary *and* unix attempts all failed!? \"\n \"Converting to CRLF line endings and trying again with \"\n \"--ignore-whitespace and --binary. This can be destructive (even\"\n \"with attempted reversal) to the source files' line-endings.\")\n win_ending_file = _ensure_win_line_endings(path)\n path_args[-1] = win_ending_file\n try:\n patch_or_reverse(patch, patch_args + ['--ignore-whitespace', '--binary'] + path_args,\n cwd=src_dir, stdout=stdout, stderr=stderr)\n except:\n pass\n else:\n exception = None\n finally:\n if os.path.exists(win_ending_file):\n os.remove(win_ending_file) # clean up .patch_unix file\n else:\n exception = None\n finally:\n if os.path.exists(unix_ending_file):\n os.remove(unix_ending_file)\n if exception:\n raise exception\n\n\ndef provide(metadata):\n \"\"\"\n given a recipe_dir:\n - download (if necessary)\n - unpack\n - apply patches (if any)\n \"\"\"\n meta = metadata.get_section('source')\n if not os.path.isdir(metadata.config.build_folder):\n os.makedirs(metadata.config.build_folder)\n git = None\n\n if hasattr(meta, 'keys'):\n dicts = [meta]\n else:\n dicts = meta\n\n try:\n for source_dict in dicts:\n folder = source_dict.get('folder')\n src_dir = os.path.join(metadata.config.work_dir, folder if folder else '')\n if any(k in source_dict for k in ('fn', 'url')):\n unpack(source_dict, src_dir, metadata.config.src_cache, recipe_path=metadata.path,\n croot=metadata.config.croot, verbose=metadata.config.verbose,\n timeout=metadata.config.timeout, locking=metadata.config.locking)\n elif 'git_url' in source_dict:\n git = git_source(source_dict, metadata.config.git_cache, src_dir, metadata.path,\n verbose=metadata.config.verbose)\n # build to make sure we have a work directory with source in it. We\n # want to make sure that whatever version that is does not\n # interfere with the test we run next.\n elif 'hg_url' in source_dict:\n hg_source(source_dict, src_dir, metadata.config.hg_cache,\n verbose=metadata.config.verbose)\n elif 'svn_url' in source_dict:\n svn_source(source_dict, src_dir, metadata.config.svn_cache,\n verbose=metadata.config.verbose, timeout=metadata.config.timeout,\n locking=metadata.config.locking)\n elif 'path' in source_dict:\n source_path = os.path.expanduser(source_dict['path'])\n path = normpath(abspath(join(metadata.path, source_path)))\n path_via_symlink = 'path_via_symlink' in source_dict\n if path_via_symlink and not folder:\n print(\"WARNING: `path_via_symlink` is too dangerous without specifying a folder,\\n\"\n \" conda could end up changing - or deleting - your local source code!\\n\"\n \" Going to make copies instead. When using `path_via_symlink` you should\\n\"\n \" also take care to run the build outside of your local source code folder(s)\\n\"\n \" unless that is your intention.\")\n path_via_symlink = False\n sys.exit(1)\n if path_via_symlink:\n src_dir_symlink = os.path.dirname(src_dir)\n if not isdir(src_dir_symlink):\n os.makedirs(src_dir_symlink)\n if metadata.config.verbose:\n print(\"Creating sybmolic link pointing to %s at %s\" % (path, src_dir))\n os.symlink(path, src_dir)\n else:\n if metadata.config.verbose:\n print(\"Copying %s to %s\" % (path, src_dir))\n # careful here: we set test path to be outside of conda-build root in setup.cfg.\n # If you don't do that, this is a recursive function\n copy_into(path, src_dir, metadata.config.timeout, symlinks=True,\n locking=metadata.config.locking, clobber=True)\n else: # no source\n if not isdir(src_dir):\n os.makedirs(src_dir)\n\n patches = ensure_list(source_dict.get('patches', []))\n for patch in patches:\n apply_patch(src_dir, join(metadata.path, patch), metadata.config, git)\n\n except CalledProcessError:\n shutil.move(metadata.config.work_dir, metadata.config.work_dir + '_failed_provide')\n raise\n\n return metadata.config.work_dir\n", "path": "conda_build/source.py" } ]
[ { "content": "from __future__ import absolute_import, division, print_function\n\nimport io\nimport locale\nimport os\nfrom os.path import join, isdir, isfile, abspath, basename, exists, normpath, expanduser\nimport re\nimport shutil\nfrom subprocess import CalledProcessError\nimport sys\nimport time\n\nfrom .conda_interface import download, TemporaryDirectory\nfrom .conda_interface import hashsum_file\n\nfrom conda_build.os_utils import external\nfrom conda_build.conda_interface import url_path, CondaHTTPError\nfrom conda_build.utils import (decompressible_exts, tar_xf, safe_print_unicode, copy_into, on_win, ensure_list,\n check_output_env, check_call_env, convert_path_for_cygwin_or_msys2,\n get_logger, rm_rf, LoggingContext)\n\n\nif on_win:\n from conda_build.utils import convert_unix_path_to_win\n\nif sys.version_info[0] == 3:\n from urllib.parse import urljoin\nelse:\n from urlparse import urljoin\n\ngit_submod_re = re.compile(r'(?:.+)\\.(.+)\\.(?:.+)\\s(.+)')\next_re = re.compile(r\"(.*?)(\\.(?:tar\\.)?[^.]+)$\")\n\n\ndef append_hash_to_fn(fn, hash_value):\n return ext_re.sub(r\"\\1_{}\\2\".format(hash_value[:10]), fn)\n\n\ndef download_to_cache(cache_folder, recipe_path, source_dict, verbose=False):\n ''' Download a source to the local cache. '''\n log = get_logger(__name__)\n if verbose:\n log.info('Source cache directory is: %s' % cache_folder)\n if not isdir(cache_folder) and not os.path.islink(cache_folder):\n os.makedirs(cache_folder)\n\n source_urls = source_dict['url']\n if not isinstance(source_urls, list):\n source_urls = [source_urls]\n unhashed_fn = fn = source_dict['fn'] if 'fn' in source_dict else basename(source_urls[0])\n hash_added = False\n for hash_type in ('md5', 'sha1', 'sha256'):\n if hash_type in source_dict:\n if source_dict[hash_type] in (None, \"\"):\n raise ValueError('Empty {} hash provided for {}'.format(hash_type, fn))\n fn = append_hash_to_fn(fn, source_dict[hash_type])\n hash_added = True\n break\n else:\n log.warn(\"No hash (md5, sha1, sha256) provided for {}. Source download forced. \"\n \"Add hash to recipe to use source cache.\".format(unhashed_fn))\n path = join(cache_folder, fn)\n if isfile(path):\n if verbose:\n log.info('Found source in cache: %s' % fn)\n else:\n if verbose:\n log.info('Downloading source to cache: %s' % fn)\n\n for url in source_urls:\n if \"://\" not in url:\n if url.startswith('~'):\n url = expanduser(url)\n if not os.path.isabs(url):\n url = os.path.normpath(os.path.join(recipe_path, url))\n url = url_path(url)\n else:\n if url.startswith('file:///~'):\n url = 'file:///' + expanduser(url[8:]).replace('\\\\', '/')\n try:\n if verbose:\n log.info(\"Downloading %s\" % url)\n with LoggingContext():\n download(url, path)\n except CondaHTTPError as e:\n log.warn(\"Error: %s\" % str(e).strip())\n rm_rf(path)\n except RuntimeError as e:\n log.warn(\"Error: %s\" % str(e).strip())\n rm_rf(path)\n else:\n if verbose:\n log.info(\"Success\")\n break\n else: # no break\n rm_rf(path)\n raise RuntimeError(\"Could not download %s\" % url)\n\n hashed = None\n for tp in ('md5', 'sha1', 'sha256'):\n if tp in source_dict:\n expected_hash = source_dict[tp]\n hashed = hashsum_file(path, tp)\n if expected_hash != hashed:\n rm_rf(path)\n raise RuntimeError(\"%s mismatch: '%s' != '%s'\" %\n (tp.upper(), hashed, expected_hash))\n break\n\n # this is really a fallback. If people don't provide the hash, we still need to prevent\n # collisions in our source cache, but the end user will get no benefirt from the cache.\n if not hash_added:\n if not hashed:\n hashed = hashsum_file(path, 'sha256')\n dest_path = append_hash_to_fn(path, hashed)\n if not os.path.isfile(dest_path):\n shutil.move(path, dest_path)\n path = dest_path\n\n return path, unhashed_fn\n\n\ndef hoist_single_extracted_folder(nested_folder):\n \"\"\"Moves all files/folders one level up.\n\n This is for when your archive extracts into its own folder, so that we don't need to\n know exactly what that folder is called.\"\"\"\n parent = os.path.dirname(nested_folder)\n flist = os.listdir(nested_folder)\n with TemporaryDirectory() as tmpdir:\n for entry in flist:\n shutil.move(os.path.join(nested_folder, entry), os.path.join(tmpdir, entry))\n rm_rf(nested_folder)\n for entry in flist:\n shutil.move(os.path.join(tmpdir, entry), os.path.join(parent, entry))\n\n\ndef unpack(source_dict, src_dir, cache_folder, recipe_path, croot, verbose=False,\n timeout=900, locking=True):\n ''' Uncompress a downloaded source. '''\n src_path, unhashed_fn = download_to_cache(cache_folder, recipe_path, source_dict, verbose)\n\n if not isdir(src_dir):\n os.makedirs(src_dir)\n if verbose:\n print(\"Extracting download\")\n with TemporaryDirectory(dir=croot) as tmpdir:\n unhashed_dest = os.path.join(tmpdir, unhashed_fn)\n if src_path.lower().endswith(decompressible_exts):\n tar_xf(src_path, tmpdir)\n else:\n # In this case, the build script will need to deal with unpacking the source\n print(\"Warning: Unrecognized source format. Source file will be copied to the SRC_DIR\")\n copy_into(src_path, unhashed_dest, timeout, locking=locking)\n if src_path.lower().endswith('.whl'):\n # copy wheel itself *and* unpack it\n # This allows test_files or about.license_file to locate files in the wheel,\n # as well as `pip install name-version.whl` as install command\n copy_into(src_path, unhashed_dest, timeout, locking=locking)\n flist = os.listdir(tmpdir)\n folder = os.path.join(tmpdir, flist[0])\n # Hoisting is destructive of information, in CDT packages, a single top level\n # folder of /usr64 must not be discarded.\n if len(flist) == 1 and os.path.isdir(folder) and 'no_hoist' not in source_dict:\n hoist_single_extracted_folder(folder)\n flist = os.listdir(tmpdir)\n for f in flist:\n shutil.move(os.path.join(tmpdir, f), os.path.join(src_dir, f))\n\n\ndef git_mirror_checkout_recursive(git, mirror_dir, checkout_dir, git_url, git_cache, git_ref=None,\n git_depth=-1, is_top_level=True, verbose=True):\n \"\"\" Mirror (and checkout) a Git repository recursively.\n\n It's not possible to use `git submodule` on a bare\n repository, so the checkout must be done before we\n know which submodules there are.\n\n Worse, submodules can be identified by using either\n absolute URLs or relative paths. If relative paths\n are used those need to be relocated upon mirroring,\n but you could end up with `../../../../blah` and in\n that case conda-build could be tricked into writing\n to the root of the drive and overwriting the system\n folders unless steps are taken to prevent that.\n \"\"\"\n\n if verbose:\n stdout = None\n stderr = None\n else:\n FNULL = open(os.devnull, 'w')\n stdout = FNULL\n stderr = FNULL\n\n if not mirror_dir.startswith(git_cache + os.sep):\n sys.exit(\"Error: Attempting to mirror to %s which is outside of GIT_CACHE %s\"\n % (mirror_dir, git_cache))\n\n # This is necessary for Cygwin git and m2-git, although it is fixed in newer MSYS2.\n git_mirror_dir = convert_path_for_cygwin_or_msys2(git, mirror_dir).rstrip('/')\n git_checkout_dir = convert_path_for_cygwin_or_msys2(git, checkout_dir).rstrip('/')\n\n # Set default here to catch empty dicts\n git_ref = git_ref or 'HEAD'\n\n mirror_dir = mirror_dir.rstrip('/')\n if not isdir(os.path.dirname(mirror_dir)):\n os.makedirs(os.path.dirname(mirror_dir))\n if isdir(mirror_dir):\n try:\n if git_ref != 'HEAD':\n check_call_env([git, 'fetch'], cwd=mirror_dir, stdout=stdout, stderr=stderr)\n else:\n # Unlike 'git clone', fetch doesn't automatically update the cache's HEAD,\n # So here we explicitly store the remote HEAD in the cache's local refs/heads,\n # and then explicitly set the cache's HEAD.\n # This is important when the git repo is a local path like \"git_url: ../\",\n # but the user is working with a branch other than 'master' without\n # explicitly providing git_rev.\n check_call_env([git, 'fetch', 'origin', '+HEAD:_conda_cache_origin_head'],\n cwd=mirror_dir, stdout=stdout, stderr=stderr)\n check_call_env([git, 'symbolic-ref', 'HEAD', 'refs/heads/_conda_cache_origin_head'],\n cwd=mirror_dir, stdout=stdout, stderr=stderr)\n except CalledProcessError:\n msg = (\"Failed to update local git cache. \"\n \"Deleting local cached repo: {} \".format(mirror_dir))\n print(msg)\n\n # Maybe the failure was caused by a corrupt mirror directory.\n # Delete it so the user can try again.\n shutil.rmtree(mirror_dir)\n raise\n else:\n args = [git, 'clone', '--mirror']\n if git_depth > 0:\n args += ['--depth', str(git_depth)]\n try:\n check_call_env(args + [git_url, git_mirror_dir], stdout=stdout, stderr=stderr)\n except CalledProcessError:\n # on windows, remote URL comes back to us as cygwin or msys format. Python doesn't\n # know how to normalize it. Need to convert it to a windows path.\n if sys.platform == 'win32' and git_url.startswith('/'):\n git_url = convert_unix_path_to_win(git_url)\n\n if os.path.exists(git_url):\n # Local filepaths are allowed, but make sure we normalize them\n git_url = normpath(git_url)\n check_call_env(args + [git_url, git_mirror_dir], stdout=stdout, stderr=stderr)\n assert isdir(mirror_dir)\n\n # Now clone from mirror_dir into checkout_dir.\n check_call_env([git, 'clone', git_mirror_dir, git_checkout_dir], stdout=stdout, stderr=stderr)\n if is_top_level:\n checkout = git_ref\n if git_url.startswith('.'):\n output = check_output_env([git, \"rev-parse\", checkout], stdout=stdout, stderr=stderr)\n checkout = output.decode('utf-8')\n if verbose:\n print('checkout: %r' % checkout)\n if checkout:\n check_call_env([git, 'checkout', checkout],\n cwd=checkout_dir, stdout=stdout, stderr=stderr)\n\n # submodules may have been specified using relative paths.\n # Those paths are relative to git_url, and will not exist\n # relative to mirror_dir, unless we do some work to make\n # it so.\n try:\n submodules = check_output_env([git, 'config', '--file', '.gitmodules', '--get-regexp',\n 'url'], stderr=stdout, cwd=checkout_dir)\n submodules = submodules.decode('utf-8').splitlines()\n except CalledProcessError:\n submodules = []\n for submodule in submodules:\n matches = git_submod_re.match(submodule)\n if matches and matches.group(2)[0] == '.':\n submod_name = matches.group(1)\n submod_rel_path = matches.group(2)\n submod_url = urljoin(git_url + '/', submod_rel_path)\n submod_mirror_dir = os.path.normpath(\n os.path.join(mirror_dir, submod_rel_path))\n if verbose:\n print('Relative submodule %s found: url is %s, submod_mirror_dir is %s' % (\n submod_name, submod_url, submod_mirror_dir))\n with TemporaryDirectory() as temp_checkout_dir:\n git_mirror_checkout_recursive(git, submod_mirror_dir, temp_checkout_dir, submod_url,\n git_cache=git_cache, git_ref=git_ref,\n git_depth=git_depth, is_top_level=False,\n verbose=verbose)\n\n if is_top_level:\n # Now that all relative-URL-specified submodules are locally mirrored to\n # relatively the same place we can go ahead and checkout the submodules.\n check_call_env([git, 'submodule', 'update', '--init',\n '--recursive'], cwd=checkout_dir, stdout=stdout, stderr=stderr)\n git_info(checkout_dir, verbose=verbose)\n if not verbose:\n FNULL.close()\n\n\ndef git_source(source_dict, git_cache, src_dir, recipe_path=None, verbose=True):\n ''' Download a source from a Git repo (or submodule, recursively) '''\n if not isdir(git_cache):\n os.makedirs(git_cache)\n\n git = external.find_executable('git')\n if not git:\n sys.exit(\"Error: git is not installed in your root environment or as a build requirement.\")\n\n git_depth = int(source_dict.get('git_depth', -1))\n git_ref = source_dict.get('git_rev') or 'HEAD'\n\n git_url = source_dict['git_url']\n if git_url.startswith('~'):\n git_url = os.path.expanduser(git_url)\n if git_url.startswith('.'):\n # It's a relative path from the conda recipe\n git_url = abspath(normpath(os.path.join(recipe_path, git_url)))\n if sys.platform == 'win32':\n git_dn = git_url.replace(':', '_')\n else:\n git_dn = git_url[1:]\n else:\n git_dn = git_url.split('://')[-1].replace('/', os.sep)\n if git_dn.startswith(os.sep):\n git_dn = git_dn[1:]\n git_dn = git_dn.replace(':', '_')\n mirror_dir = join(git_cache, git_dn)\n git_mirror_checkout_recursive(\n git, mirror_dir, src_dir, git_url, git_cache=git_cache, git_ref=git_ref,\n git_depth=git_depth, is_top_level=True, verbose=verbose)\n return git\n\n\ndef git_info(src_dir, verbose=True, fo=None):\n ''' Print info about a Git repo. '''\n assert isdir(src_dir)\n\n git = external.find_executable('git')\n if not git:\n log = get_logger(__name__)\n log.warn(\"git not installed in root environment. Skipping recording of git info.\")\n return\n\n if verbose:\n stderr = None\n else:\n FNULL = open(os.devnull, 'w')\n stderr = FNULL\n\n # Ensure to explicitly set GIT_DIR as some Linux machines will not\n # properly execute without it.\n env = os.environ.copy()\n env['GIT_DIR'] = join(src_dir, '.git')\n env = {str(key): str(value) for key, value in env.items()}\n for cmd, check_error in [\n ('git log -n1', True),\n ('git describe --tags --dirty', False),\n ('git status', True)]:\n try:\n stdout = check_output_env(cmd.split(), stderr=stderr, cwd=src_dir, env=env)\n except CalledProcessError as e:\n if check_error:\n raise Exception(\"git error: %s\" % str(e))\n encoding = locale.getpreferredencoding()\n if not fo:\n encoding = sys.stdout.encoding\n encoding = encoding or 'utf-8'\n if hasattr(stdout, 'decode'):\n stdout = stdout.decode(encoding, 'ignore')\n if fo:\n fo.write(u'==> %s <==\\n' % cmd)\n if verbose:\n fo.write(stdout + u'\\n')\n else:\n if verbose:\n print(u'==> %s <==\\n' % cmd)\n safe_print_unicode(stdout + u'\\n')\n\n\ndef hg_source(source_dict, src_dir, hg_cache, verbose):\n ''' Download a source from Mercurial repo. '''\n if verbose:\n stdout = None\n stderr = None\n else:\n FNULL = open(os.devnull, 'w')\n stdout = FNULL\n stderr = FNULL\n\n hg_url = source_dict['hg_url']\n if not isdir(hg_cache):\n os.makedirs(hg_cache)\n hg_dn = hg_url.split(':')[-1].replace('/', '_')\n cache_repo = join(hg_cache, hg_dn)\n if isdir(cache_repo):\n check_call_env(['hg', 'pull'], cwd=cache_repo, stdout=stdout, stderr=stderr)\n else:\n check_call_env(['hg', 'clone', hg_url, cache_repo], stdout=stdout, stderr=stderr)\n assert isdir(cache_repo)\n\n # now clone in to work directory\n update = source_dict.get('hg_tag') or 'tip'\n if verbose:\n print('checkout: %r' % update)\n\n check_call_env(['hg', 'clone', cache_repo, src_dir], stdout=stdout,\n stderr=stderr)\n check_call_env(['hg', 'update', '-C', update], cwd=src_dir, stdout=stdout,\n stderr=stderr)\n\n if not verbose:\n FNULL.close()\n\n return src_dir\n\n\ndef svn_source(source_dict, src_dir, svn_cache, verbose=True, timeout=900, locking=True):\n ''' Download a source from SVN repo. '''\n if verbose:\n stdout = None\n stderr = None\n else:\n FNULL = open(os.devnull, 'w')\n stdout = FNULL\n stderr = FNULL\n\n def parse_bool(s):\n return str(s).lower().strip() in ('yes', 'true', '1', 'on')\n\n svn_url = source_dict['svn_url']\n svn_revision = source_dict.get('svn_rev') or 'head'\n svn_ignore_externals = parse_bool(source_dict.get('svn_ignore_externals') or 'no')\n if not isdir(svn_cache):\n os.makedirs(svn_cache)\n svn_dn = svn_url.split(':', 1)[-1].replace('/', '_').replace(':', '_')\n cache_repo = join(svn_cache, svn_dn)\n if svn_ignore_externals:\n extra_args = ['--ignore-externals']\n else:\n extra_args = []\n if isdir(cache_repo):\n check_call_env(['svn', 'up', '-r', svn_revision] + extra_args, cwd=cache_repo,\n stdout=stdout, stderr=stderr)\n else:\n check_call_env(['svn', 'co', '-r', svn_revision] + extra_args + [svn_url, cache_repo],\n stdout=stdout, stderr=stderr)\n assert isdir(cache_repo)\n\n # now copy into work directory\n copy_into(cache_repo, src_dir, timeout, symlinks=True, locking=locking)\n\n if not verbose:\n FNULL.close()\n\n return src_dir\n\n\ndef get_repository_info(recipe_path):\n \"\"\"This tries to get information about where a recipe came from. This is different\n from the source - you can have a recipe in svn that gets source via git.\"\"\"\n try:\n if exists(join(recipe_path, \".git\")):\n origin = check_output_env([\"git\", \"config\", \"--get\", \"remote.origin.url\"],\n cwd=recipe_path)\n rev = check_output_env([\"git\", \"rev-parse\", \"HEAD\"], cwd=recipe_path)\n return \"Origin {}, commit {}\".format(origin, rev)\n elif isdir(join(recipe_path, \".hg\")):\n origin = check_output_env([\"hg\", \"paths\", \"default\"], cwd=recipe_path)\n rev = check_output_env([\"hg\", \"id\"], cwd=recipe_path).split()[0]\n return \"Origin {}, commit {}\".format(origin, rev)\n elif isdir(join(recipe_path, \".svn\")):\n info = check_output_env([\"svn\", \"info\"], cwd=recipe_path)\n info = info.decode(\"utf-8\") # Py3 returns a byte string, but re needs unicode or str.\n server = re.search(\"Repository Root: (.*)$\", info, flags=re.M).group(1)\n revision = re.search(\"Revision: (.*)$\", info, flags=re.M).group(1)\n return \"{}, Revision {}\".format(server, revision)\n else:\n return \"{}, last modified {}\".format(recipe_path,\n time.ctime(os.path.getmtime(\n join(recipe_path, \"meta.yaml\"))))\n except CalledProcessError:\n get_logger(__name__).debug(\"Failed to checkout source in \" + recipe_path)\n return \"{}, last modified {}\".format(recipe_path,\n time.ctime(os.path.getmtime(\n join(recipe_path, \"meta.yaml\"))))\n\n\ndef _ensure_unix_line_endings(path):\n \"\"\"Replace windows line endings with Unix. Return path to modified file.\"\"\"\n out_path = path + \"_unix\"\n with open(path, \"rb\") as inputfile:\n with open(out_path, \"wb\") as outputfile:\n for line in inputfile:\n outputfile.write(line.replace(b\"\\r\\n\", b\"\\n\"))\n return out_path\n\n\ndef _ensure_win_line_endings(path):\n \"\"\"Replace unix line endings with win. Return path to modified file.\"\"\"\n out_path = path + \"_win\"\n with open(path, \"rb\") as inputfile:\n with open(out_path, \"wb\") as outputfile:\n for line in inputfile:\n outputfile.write(line.replace(b\"\\n\", b\"\\r\\n\"))\n return out_path\n\n\ndef _guess_patch_strip_level(filesstr, src_dir):\n \"\"\" Determine the patch strip level automatically. \"\"\"\n maxlevel = None\n files = {filestr.encode(errors='ignore') for filestr in filesstr}\n src_dir = src_dir.encode(errors='ignore')\n for file in files:\n numslash = file.count(b'/')\n maxlevel = numslash if maxlevel is None else min(maxlevel, numslash)\n if maxlevel == 0:\n patchlevel = 0\n else:\n histo = dict()\n histo = {i: 0 for i in range(maxlevel + 1)}\n for file in files:\n parts = file.split(b'/')\n for level in range(maxlevel + 1):\n if os.path.exists(join(src_dir, *parts[-len(parts) + level:])):\n histo[level] += 1\n order = sorted(histo, key=histo.get, reverse=True)\n if histo[order[0]] == histo[order[1]]:\n print(\"Patch level ambiguous, selecting least deep\")\n patchlevel = min([key for key, value\n in histo.items() if value == histo[order[0]]])\n return patchlevel\n\n\ndef _get_patch_file_details(path):\n re_files = re.compile(r'^(?:---|\\+\\+\\+) ([^\\n\\t]+)')\n files = set()\n with io.open(path, errors='ignore') as f:\n files = []\n first_line = True\n is_git_format = True\n for line in f.readlines():\n if first_line and not re.match(r'From [0-9a-f]{40}', line):\n is_git_format = False\n first_line = False\n m = re_files.search(line)\n if m and m.group(1) != '/dev/null':\n files.append(m.group(1))\n elif is_git_format and line.startswith('git') and not line.startswith('git --diff'):\n is_git_format = False\n return (files, is_git_format)\n\n\ndef apply_patch(src_dir, path, config, git=None):\n def patch_or_reverse(patch, patch_args, cwd, stdout, stderr):\n # An old reference: https://unix.stackexchange.com/a/243748/34459\n #\n # I am worried that '--ignore-whitespace' may be destructive. If so we should\n # avoid passing it, particularly in the initial (most likely to succeed) calls.\n #\n # From here-in I define a 'native' patch as one which has:\n # 1. LF for the patch block metadata.\n # 2. CRLF or LF for the actual patched lines matching those of the source lines.\n #\n # Calls to a raw 'patch' are destructive in various ways:\n # 1. It leaves behind .rej and .orig files\n # 2. If you pass it a patch with incorrect CRLF changes and do not pass --binary and\n # if any of those blocks *can* be applied, then the whole file gets written out with\n # LF. This cannot be reversed either; the text changes will be reversed but not\n # line-feed changes (since all line-endings get changed, not just those of the of\n # patched lines)\n # 3. If patching fails, the bits that succeeded remain, so patching is not at all\n # atomic.\n #\n # Still, we do our best to mitigate all of this as follows:\n # 1. We disable .orig and .rej that for GNU patch via a temp file *\n # 2 (1). We check for native application of a native patch (--binary, without --ignore-whitespace)\n # 2 (2). We defer destructive calls to this until after the non-destructive ones.\n # 3. When patch indicates failure, we call it with -R to reverse the damage.\n #\n # * Some may bemoan the loss of these, but they it is fairly random which patch and patch\n # attempt they apply to so their informational value is low, besides that, they are ugly.\n # (and destructive to the future patchability of the source tree).\n #\n import tempfile\n temp_name = os.path.join(tempfile.gettempdir(), next(tempfile._get_candidate_names()))\n patch_args.append('-r')\n patch_args.append(temp_name)\n patch_args = ['--no-backup-if-mismatch', '--batch'] + patch_args\n log = get_logger(__name__)\n try:\n log.debug(\"Applying with\\n{} {}\".format(patch, patch_args))\n check_call_env([patch] + patch_args, cwd=cwd, stdout=stdout, stderr=stderr)\n # You can use this to pretend the patch failed so as to test reversal!\n # raise CalledProcessError(-1, ' '.join([patch] + patch_args))\n except Exception as e:\n try:\n if '--ignore-whitespace' in patch_args:\n patch_args.remove('--ignore-whitespace')\n patch_args.insert(0, '-R')\n patch_args.append('--binary')\n patch_args.append('--force')\n log.debug(\"Reversing with\\n{} {}\".format(patch, patch_args))\n check_call_env([patch] + patch_args, cwd=cwd, stdout=stdout, stderr=stderr)\n except:\n pass\n raise e\n finally:\n if os.path.exists(temp_name):\n os.unlink(temp_name)\n\n exception = None\n if not isfile(path):\n raise RuntimeError('Error: no such patch: %s' % path)\n\n if config.verbose:\n stdout = None\n stderr = None\n else:\n FNULL = open(os.devnull, 'w')\n stdout = FNULL\n stderr = FNULL\n\n files, is_git_format = _get_patch_file_details(path)\n if git and is_git_format:\n # Prevents git from asking interactive questions,\n # also necessary to achieve sha1 reproducibility;\n # as is --committer-date-is-author-date. By this,\n # we mean a round-trip of git am/git format-patch\n # gives the same file.\n git_env = os.environ\n git_env['GIT_COMMITTER_NAME'] = 'conda-build'\n git_env['GIT_COMMITTER_EMAIL'] = 'conda@conda-build.org'\n check_call_env([git, 'am', '-3', '--committer-date-is-author-date', path],\n cwd=src_dir, stdout=stdout, stderr=stderr, env=git_env)\n config.git_commits_since_tag += 1\n else:\n if config.verbose:\n print('Applying patch: %r' % path)\n patch = external.find_executable('patch', config.build_prefix)\n if patch is None or len(patch) == 0:\n sys.exit(\"\"\"\\\n Error:\n Cannot use 'git' (not a git repo and/or patch) and did not find 'patch' in: %s\n You can install 'patch' using apt-get, yum (Linux), Xcode (MacOSX),\n or conda, m2-patch (Windows),\n \"\"\" % (os.pathsep.join(external.dir_paths)))\n patch_strip_level = _guess_patch_strip_level(files, src_dir)\n path_args = ['-i', path]\n patch_args = ['-p%d' % patch_strip_level]\n\n try:\n log = get_logger(__name__)\n # This is the case we check first of all as it is the case that allows a properly line-ended\n # patch to apply correctly to a properly line-ended source tree, modifying it following the\n # patch chunks exactly.\n patch_or_reverse(patch, patch_args + ['--binary'] + path_args,\n cwd=src_dir, stdout=stdout, stderr=stderr)\n except CalledProcessError as e:\n # Capture the first exception\n exception = e\n if config.verbose:\n log.info(\"Applying patch natively failed. \"\n \"Trying to apply patch non-binary with --ignore-whitespace\")\n try:\n patch_or_reverse(patch, patch_args + ['--ignore-whitespace'] + path_args,\n cwd=src_dir, stdout=stdout, stderr=stderr)\n except CalledProcessError as e: # noqa\n unix_ending_file = _ensure_unix_line_endings(path)\n path_args[-1] = unix_ending_file\n try:\n if config.verbose:\n log.info(\"Applying natively *and* non-binary failed! \"\n \"Converting to unix line endings and trying again. \"\n \"WARNING :: This is destructive to the source file line-endings.\")\n # If this succeeds, it will change the source files' CRLFs to LFs. This can\n # mess things up both for subsequent attempts (this line-ending change is not\n # reversible) but worse, for subsequent, correctly crafted (I'm calling these\n # \"native\" from now on) patches.\n patch_or_reverse(patch, patch_args + ['--ignore-whitespace'] + path_args,\n cwd=src_dir, stdout=stdout, stderr=stderr)\n except CalledProcessError:\n if config.verbose:\n log.warning(\"Applying natively, non-binary *and* unix attempts all failed!? \"\n \"Converting to CRLF line endings and trying again with \"\n \"--ignore-whitespace and --binary. This can be destructive (even\"\n \"with attempted reversal) to the source files' line-endings.\")\n win_ending_file = _ensure_win_line_endings(path)\n path_args[-1] = win_ending_file\n try:\n patch_or_reverse(patch, patch_args + ['--ignore-whitespace', '--binary'] + path_args,\n cwd=src_dir, stdout=stdout, stderr=stderr)\n except:\n pass\n else:\n exception = None\n finally:\n if os.path.exists(win_ending_file):\n os.remove(win_ending_file) # clean up .patch_unix file\n else:\n exception = None\n finally:\n if os.path.exists(unix_ending_file):\n os.remove(unix_ending_file)\n if exception:\n raise exception\n\n\ndef provide(metadata):\n \"\"\"\n given a recipe_dir:\n - download (if necessary)\n - unpack\n - apply patches (if any)\n \"\"\"\n meta = metadata.get_section('source')\n if not os.path.isdir(metadata.config.build_folder):\n os.makedirs(metadata.config.build_folder)\n git = None\n\n if hasattr(meta, 'keys'):\n dicts = [meta]\n else:\n dicts = meta\n\n try:\n for source_dict in dicts:\n folder = source_dict.get('folder')\n src_dir = os.path.join(metadata.config.work_dir, folder if folder else '')\n if any(k in source_dict for k in ('fn', 'url')):\n unpack(source_dict, src_dir, metadata.config.src_cache, recipe_path=metadata.path,\n croot=metadata.config.croot, verbose=metadata.config.verbose,\n timeout=metadata.config.timeout, locking=metadata.config.locking)\n elif 'git_url' in source_dict:\n git = git_source(source_dict, metadata.config.git_cache, src_dir, metadata.path,\n verbose=metadata.config.verbose)\n # build to make sure we have a work directory with source in it. We\n # want to make sure that whatever version that is does not\n # interfere with the test we run next.\n elif 'hg_url' in source_dict:\n hg_source(source_dict, src_dir, metadata.config.hg_cache,\n verbose=metadata.config.verbose)\n elif 'svn_url' in source_dict:\n svn_source(source_dict, src_dir, metadata.config.svn_cache,\n verbose=metadata.config.verbose, timeout=metadata.config.timeout,\n locking=metadata.config.locking)\n elif 'path' in source_dict:\n source_path = os.path.expanduser(source_dict['path'])\n path = normpath(abspath(join(metadata.path, source_path)))\n path_via_symlink = 'path_via_symlink' in source_dict\n if path_via_symlink and not folder:\n print(\"WARNING: `path_via_symlink` is too dangerous without specifying a folder,\\n\"\n \" conda could end up changing - or deleting - your local source code!\\n\"\n \" Going to make copies instead. When using `path_via_symlink` you should\\n\"\n \" also take care to run the build outside of your local source code folder(s)\\n\"\n \" unless that is your intention.\")\n path_via_symlink = False\n sys.exit(1)\n if path_via_symlink:\n src_dir_symlink = os.path.dirname(src_dir)\n if not isdir(src_dir_symlink):\n os.makedirs(src_dir_symlink)\n if metadata.config.verbose:\n print(\"Creating sybmolic link pointing to %s at %s\" % (path, src_dir))\n os.symlink(path, src_dir)\n else:\n if metadata.config.verbose:\n print(\"Copying %s to %s\" % (path, src_dir))\n # careful here: we set test path to be outside of conda-build root in setup.cfg.\n # If you don't do that, this is a recursive function\n copy_into(path, src_dir, metadata.config.timeout, symlinks=True,\n locking=metadata.config.locking, clobber=True)\n else: # no source\n if not isdir(src_dir):\n os.makedirs(src_dir)\n\n patches = ensure_list(source_dict.get('patches', []))\n for patch in patches:\n apply_patch(src_dir, join(metadata.path, patch), metadata.config, git)\n\n except CalledProcessError:\n shutil.move(metadata.config.work_dir, metadata.config.work_dir + '_failed_provide')\n raise\n\n return metadata.config.work_dir\n", "path": "conda_build/source.py" } ]
diff --git a/conda_build/source.py b/conda_build/source.py index fdd361c779..724b00fa91 100644 --- a/conda_build/source.py +++ b/conda_build/source.py @@ -612,7 +612,7 @@ def patch_or_reverse(patch, patch_args, cwd, stdout, stderr): exception = None if not isfile(path): - sys.exit('Error: no such patch: %s' % path) + raise RuntimeError('Error: no such patch: %s' % path) if config.verbose: stdout = None
python-discord__site-758
[ { "content": "\"\"\"Converters from Django models to data interchange formats and back.\"\"\"\nfrom django.db.models.query import QuerySet\nfrom django.db.utils import IntegrityError\nfrom rest_framework.exceptions import NotFound\nfrom rest_framework.serializers import (\n IntegerField,\n ListSerializer,\n ModelSerializer,\n PrimaryKeyRelatedField,\n ValidationError\n)\nfrom rest_framework.settings import api_settings\nfrom rest_framework.validators import UniqueTogetherValidator\n\nfrom .models import (\n AocAccountLink,\n AocCompletionistBlock,\n BotSetting,\n BumpedThread,\n DeletedMessage,\n DocumentationLink,\n FilterList,\n Infraction,\n MessageDeletionContext,\n Nomination,\n NominationEntry,\n OffTopicChannelName,\n OffensiveMessage,\n Reminder,\n Role,\n User\n)\n\n\nclass BotSettingSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `BotSetting` instances.\"\"\"\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = BotSetting\n fields = ('name', 'data')\n\n\nclass ListBumpedThreadSerializer(ListSerializer):\n \"\"\"Custom ListSerializer to override to_representation() when list views are triggered.\"\"\"\n\n def to_representation(self, objects: list[BumpedThread]) -> int:\n \"\"\"\n Used by the `ListModelMixin` to return just the list of bumped thread ids.\n\n Only the thread_id field is useful, hence it is unnecessary to create a nested dictionary.\n\n Additionally, this allows bumped thread routes to simply return an\n array of thread_id ints instead of objects, saving on bandwidth.\n \"\"\"\n return [obj.thread_id for obj in objects]\n\n\nclass BumpedThreadSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `BumpedThread` instances.\"\"\"\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n list_serializer_class = ListBumpedThreadSerializer\n model = BumpedThread\n fields = ('thread_id',)\n\n\nclass DeletedMessageSerializer(ModelSerializer):\n \"\"\"\n A class providing (de-)serialization of `DeletedMessage` instances.\n\n The serializer generally requires a valid `deletion_context` to be\n given, which should be created beforehand. See the `DeletedMessage`\n model for more information.\n \"\"\"\n\n author = PrimaryKeyRelatedField(\n queryset=User.objects.all()\n )\n deletion_context = PrimaryKeyRelatedField(\n queryset=MessageDeletionContext.objects.all(),\n # This will be overridden in the `create` function\n # of the deletion context serializer.\n required=False\n )\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = DeletedMessage\n fields = (\n 'id', 'author',\n 'channel_id', 'content',\n 'embeds', 'deletion_context',\n 'attachments'\n )\n\n\nclass MessageDeletionContextSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `MessageDeletionContext` instances.\"\"\"\n\n actor = PrimaryKeyRelatedField(queryset=User.objects.all(), allow_null=True)\n deletedmessage_set = DeletedMessageSerializer(many=True)\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = MessageDeletionContext\n fields = ('actor', 'creation', 'id', 'deletedmessage_set')\n depth = 1\n\n def create(self, validated_data: dict) -> MessageDeletionContext:\n \"\"\"\n Return a `MessageDeletionContext` based on the given data.\n\n In addition to the normal attributes expected by the `MessageDeletionContext` model\n itself, this serializer also allows for passing the `deletedmessage_set` element\n which contains messages that were deleted as part of this context.\n \"\"\"\n messages = validated_data.pop('deletedmessage_set')\n deletion_context = MessageDeletionContext.objects.create(**validated_data)\n for message in messages:\n DeletedMessage.objects.create(\n deletion_context=deletion_context,\n **message\n )\n\n return deletion_context\n\n\nclass DocumentationLinkSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `DocumentationLink` instances.\"\"\"\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = DocumentationLink\n fields = ('package', 'base_url', 'inventory_url')\n\n\nclass FilterListSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `FilterList` instances.\"\"\"\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = FilterList\n fields = ('id', 'created_at', 'updated_at', 'type', 'allowed', 'content', 'comment')\n\n # This validator ensures only one filterlist with the\n # same content can exist. This means that we cannot have both an allow\n # and a deny for the same item, and we cannot have duplicates of the\n # same item.\n validators = [\n UniqueTogetherValidator(\n queryset=FilterList.objects.all(),\n fields=['content', 'type'],\n message=(\n \"A filterlist for this item already exists. \"\n \"Please note that you cannot add the same item to both allow and deny.\"\n )\n ),\n ]\n\n\nclass InfractionSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `Infraction` instances.\"\"\"\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = Infraction\n fields = (\n 'id',\n 'inserted_at',\n 'expires_at',\n 'active',\n 'user',\n 'actor',\n 'type',\n 'reason',\n 'hidden',\n 'dm_sent'\n )\n\n def validate(self, attrs: dict) -> dict:\n \"\"\"Validate data constraints for the given data and abort if it is invalid.\"\"\"\n infr_type = attrs.get('type')\n\n active = attrs.get('active')\n if active and infr_type in ('note', 'warning', 'kick'):\n raise ValidationError({'active': [f'{infr_type} infractions cannot be active.']})\n\n expires_at = attrs.get('expires_at')\n if expires_at and infr_type in ('kick', 'warning'):\n raise ValidationError({'expires_at': [f'{infr_type} infractions cannot expire.']})\n\n hidden = attrs.get('hidden')\n if hidden and infr_type in ('superstar', 'warning', 'voice_ban', 'voice_mute'):\n raise ValidationError({'hidden': [f'{infr_type} infractions cannot be hidden.']})\n\n if not hidden and infr_type in ('note', ):\n raise ValidationError({'hidden': [f'{infr_type} infractions must be hidden.']})\n\n return attrs\n\n\nclass ExpandedInfractionSerializer(InfractionSerializer):\n \"\"\"\n A class providing expanded (de-)serialization of `Infraction` instances.\n\n In addition to the fields of `Infraction` objects themselves, this\n serializer also attaches the `user` and `actor` fields when serializing.\n \"\"\"\n\n def to_representation(self, instance: Infraction) -> dict:\n \"\"\"Return the dictionary representation of this infraction.\"\"\"\n ret = super().to_representation(instance)\n\n user = User.objects.get(id=ret['user'])\n user_data = UserSerializer(user).data\n ret['user'] = user_data\n\n actor = User.objects.get(id=ret['actor'])\n actor_data = UserSerializer(actor).data\n ret['actor'] = actor_data\n\n return ret\n\n\nclass OffTopicChannelNameListSerializer(ListSerializer):\n \"\"\"Custom ListSerializer to override to_representation() when list views are triggered.\"\"\"\n\n def to_representation(self, objects: list[OffTopicChannelName]) -> list[str]:\n \"\"\"\n Return a list with all `OffTopicChannelName`s in the database.\n\n This returns the list of off topic channel names. We want to only return\n the name attribute, hence it is unnecessary to create a nested dictionary.\n Additionally, this allows off topic channel name routes to simply return an\n array of names instead of objects, saving on bandwidth.\n \"\"\"\n return [obj.name for obj in objects]\n\n\nclass OffTopicChannelNameSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `OffTopicChannelName` instances.\"\"\"\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n list_serializer_class = OffTopicChannelNameListSerializer\n model = OffTopicChannelName\n fields = ('name', 'used', 'active')\n\n\nclass ReminderSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `Reminder` instances.\"\"\"\n\n author = PrimaryKeyRelatedField(queryset=User.objects.all())\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = Reminder\n fields = (\n 'active',\n 'author',\n 'jump_url',\n 'channel_id',\n 'content',\n 'expiration',\n 'id',\n 'mentions',\n 'failures'\n )\n\n\nclass AocCompletionistBlockSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `AocCompletionistBlock` instances.\"\"\"\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = AocCompletionistBlock\n fields = (\"user\", \"is_blocked\", \"reason\")\n\n\nclass AocAccountLinkSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `AocAccountLink` instances.\"\"\"\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = AocAccountLink\n fields = (\"user\", \"aoc_username\")\n\n\nclass RoleSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `Role` instances.\"\"\"\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = Role\n fields = ('id', 'name', 'colour', 'permissions', 'position')\n\n\nclass UserListSerializer(ListSerializer):\n \"\"\"List serializer for User model to handle bulk updates.\"\"\"\n\n def create(self, validated_data: list) -> list:\n \"\"\"Override create method to optimize django queries.\"\"\"\n new_users = []\n seen = set()\n\n for user_dict in validated_data:\n if user_dict[\"id\"] in seen:\n raise ValidationError(\n {\"id\": [f\"User with ID {user_dict['id']} given multiple times.\"]}\n )\n seen.add(user_dict[\"id\"])\n new_users.append(User(**user_dict))\n\n User.objects.bulk_create(new_users, ignore_conflicts=True)\n return []\n\n def update(self, queryset: QuerySet, validated_data: list) -> list:\n \"\"\"\n Override update method to support bulk updates.\n\n ref:https://www.django-rest-framework.org/api-guide/serializers/#customizing-multiple-update\n \"\"\"\n object_ids = set()\n\n for data in validated_data:\n try:\n if data[\"id\"] in object_ids:\n # If request data contains users with same ID.\n raise ValidationError(\n {\"id\": [f\"User with ID {data['id']} given multiple times.\"]}\n )\n except KeyError:\n # If user ID not provided in request body.\n raise ValidationError(\n {\"id\": [\"This field is required.\"]}\n )\n object_ids.add(data[\"id\"])\n\n # filter queryset\n filtered_instances = queryset.filter(id__in=object_ids)\n\n instance_mapping = {user.id: user for user in filtered_instances}\n\n updated = []\n fields_to_update = set()\n for user_data in validated_data:\n for key in user_data:\n fields_to_update.add(key)\n\n try:\n user = instance_mapping[user_data[\"id\"]]\n except KeyError:\n raise NotFound({\"detail\": f\"User with id {user_data['id']} not found.\"})\n\n user.__dict__.update(user_data)\n updated.append(user)\n\n fields_to_update.remove(\"id\")\n\n if not fields_to_update:\n # Raise ValidationError when only id field is given.\n raise ValidationError(\n {api_settings.NON_FIELD_ERRORS_KEY: [\"Insufficient data provided.\"]}\n )\n\n User.objects.bulk_update(updated, fields_to_update)\n return updated\n\n\nclass UserSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `User` instances.\"\"\"\n\n # ID field must be explicitly set as the default id field is read-only.\n id = IntegerField(min_value=0)\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = User\n fields = ('id', 'name', 'discriminator', 'roles', 'in_guild')\n depth = 1\n list_serializer_class = UserListSerializer\n\n def create(self, validated_data: dict) -> User:\n \"\"\"Override create method to catch IntegrityError.\"\"\"\n try:\n return super().create(validated_data)\n except IntegrityError:\n raise ValidationError({\"id\": [\"User with ID already present.\"]})\n\n\nclass NominationEntrySerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `NominationEntry` instances.\"\"\"\n\n # We need to define it here, because we don't want that nomination ID\n # return inside nomination response entry, because ID is already available\n # as top-level field. Queryset is required if field is not read only.\n nomination = PrimaryKeyRelatedField(\n queryset=Nomination.objects.all(),\n write_only=True\n )\n\n class Meta:\n \"\"\"Metadata defined for the Django REST framework.\"\"\"\n\n model = NominationEntry\n fields = ('nomination', 'actor', 'reason', 'inserted_at')\n\n\nclass NominationSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `Nomination` instances.\"\"\"\n\n entries = NominationEntrySerializer(many=True, read_only=True)\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = Nomination\n fields = (\n 'id', 'active', 'user', 'inserted_at', 'end_reason', 'ended_at', 'reviewed', 'entries'\n )\n\n\nclass OffensiveMessageSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `OffensiveMessage` instances.\"\"\"\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = OffensiveMessage\n fields = ('id', 'channel_id', 'delete_date')\n", "path": "pydis_site/apps/api/serializers.py" } ]
[ { "content": "\"\"\"Converters from Django models to data interchange formats and back.\"\"\"\nfrom django.db.models.query import QuerySet\nfrom django.db.utils import IntegrityError\nfrom rest_framework.exceptions import NotFound\nfrom rest_framework.serializers import (\n IntegerField,\n ListSerializer,\n ModelSerializer,\n PrimaryKeyRelatedField,\n ValidationError\n)\nfrom rest_framework.settings import api_settings\nfrom rest_framework.validators import UniqueTogetherValidator\n\nfrom .models import (\n AocAccountLink,\n AocCompletionistBlock,\n BotSetting,\n BumpedThread,\n DeletedMessage,\n DocumentationLink,\n FilterList,\n Infraction,\n MessageDeletionContext,\n Nomination,\n NominationEntry,\n OffTopicChannelName,\n OffensiveMessage,\n Reminder,\n Role,\n User\n)\n\n\nclass BotSettingSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `BotSetting` instances.\"\"\"\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = BotSetting\n fields = ('name', 'data')\n\n\nclass ListBumpedThreadSerializer(ListSerializer):\n \"\"\"Custom ListSerializer to override to_representation() when list views are triggered.\"\"\"\n\n def to_representation(self, objects: list[BumpedThread]) -> int:\n \"\"\"\n Used by the `ListModelMixin` to return just the list of bumped thread ids.\n\n Only the thread_id field is useful, hence it is unnecessary to create a nested dictionary.\n\n Additionally, this allows bumped thread routes to simply return an\n array of thread_id ints instead of objects, saving on bandwidth.\n \"\"\"\n return [obj.thread_id for obj in objects]\n\n\nclass BumpedThreadSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `BumpedThread` instances.\"\"\"\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n list_serializer_class = ListBumpedThreadSerializer\n model = BumpedThread\n fields = ('thread_id',)\n\n\nclass DeletedMessageSerializer(ModelSerializer):\n \"\"\"\n A class providing (de-)serialization of `DeletedMessage` instances.\n\n The serializer generally requires a valid `deletion_context` to be\n given, which should be created beforehand. See the `DeletedMessage`\n model for more information.\n \"\"\"\n\n author = PrimaryKeyRelatedField(\n queryset=User.objects.all()\n )\n deletion_context = PrimaryKeyRelatedField(\n queryset=MessageDeletionContext.objects.all(),\n # This will be overridden in the `create` function\n # of the deletion context serializer.\n required=False\n )\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = DeletedMessage\n fields = (\n 'id', 'author',\n 'channel_id', 'content',\n 'embeds', 'deletion_context',\n 'attachments'\n )\n\n\nclass MessageDeletionContextSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `MessageDeletionContext` instances.\"\"\"\n\n actor = PrimaryKeyRelatedField(queryset=User.objects.all(), allow_null=True)\n deletedmessage_set = DeletedMessageSerializer(many=True)\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = MessageDeletionContext\n fields = ('actor', 'creation', 'id', 'deletedmessage_set')\n depth = 1\n\n def create(self, validated_data: dict) -> MessageDeletionContext:\n \"\"\"\n Return a `MessageDeletionContext` based on the given data.\n\n In addition to the normal attributes expected by the `MessageDeletionContext` model\n itself, this serializer also allows for passing the `deletedmessage_set` element\n which contains messages that were deleted as part of this context.\n \"\"\"\n messages = validated_data.pop('deletedmessage_set')\n deletion_context = MessageDeletionContext.objects.create(**validated_data)\n for message in messages:\n DeletedMessage.objects.create(\n deletion_context=deletion_context,\n **message\n )\n\n return deletion_context\n\n\nclass DocumentationLinkSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `DocumentationLink` instances.\"\"\"\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = DocumentationLink\n fields = ('package', 'base_url', 'inventory_url')\n\n\nclass FilterListSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `FilterList` instances.\"\"\"\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = FilterList\n fields = ('id', 'created_at', 'updated_at', 'type', 'allowed', 'content', 'comment')\n\n # This validator ensures only one filterlist with the\n # same content can exist. This means that we cannot have both an allow\n # and a deny for the same item, and we cannot have duplicates of the\n # same item.\n validators = [\n UniqueTogetherValidator(\n queryset=FilterList.objects.all(),\n fields=['content', 'type'],\n message=(\n \"A filterlist for this item already exists. \"\n \"Please note that you cannot add the same item to both allow and deny.\"\n )\n ),\n ]\n\n\nclass InfractionSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `Infraction` instances.\"\"\"\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = Infraction\n fields = (\n 'id',\n 'inserted_at',\n 'last_applied',\n 'expires_at',\n 'active',\n 'user',\n 'actor',\n 'type',\n 'reason',\n 'hidden',\n 'dm_sent'\n )\n\n def validate(self, attrs: dict) -> dict:\n \"\"\"Validate data constraints for the given data and abort if it is invalid.\"\"\"\n infr_type = attrs.get('type')\n\n active = attrs.get('active')\n if active and infr_type in ('note', 'warning', 'kick'):\n raise ValidationError({'active': [f'{infr_type} infractions cannot be active.']})\n\n expires_at = attrs.get('expires_at')\n if expires_at and infr_type in ('kick', 'warning'):\n raise ValidationError({'expires_at': [f'{infr_type} infractions cannot expire.']})\n\n hidden = attrs.get('hidden')\n if hidden and infr_type in ('superstar', 'warning', 'voice_ban', 'voice_mute'):\n raise ValidationError({'hidden': [f'{infr_type} infractions cannot be hidden.']})\n\n if not hidden and infr_type in ('note', ):\n raise ValidationError({'hidden': [f'{infr_type} infractions must be hidden.']})\n\n return attrs\n\n\nclass ExpandedInfractionSerializer(InfractionSerializer):\n \"\"\"\n A class providing expanded (de-)serialization of `Infraction` instances.\n\n In addition to the fields of `Infraction` objects themselves, this\n serializer also attaches the `user` and `actor` fields when serializing.\n \"\"\"\n\n def to_representation(self, instance: Infraction) -> dict:\n \"\"\"Return the dictionary representation of this infraction.\"\"\"\n ret = super().to_representation(instance)\n\n user = User.objects.get(id=ret['user'])\n user_data = UserSerializer(user).data\n ret['user'] = user_data\n\n actor = User.objects.get(id=ret['actor'])\n actor_data = UserSerializer(actor).data\n ret['actor'] = actor_data\n\n return ret\n\n\nclass OffTopicChannelNameListSerializer(ListSerializer):\n \"\"\"Custom ListSerializer to override to_representation() when list views are triggered.\"\"\"\n\n def to_representation(self, objects: list[OffTopicChannelName]) -> list[str]:\n \"\"\"\n Return a list with all `OffTopicChannelName`s in the database.\n\n This returns the list of off topic channel names. We want to only return\n the name attribute, hence it is unnecessary to create a nested dictionary.\n Additionally, this allows off topic channel name routes to simply return an\n array of names instead of objects, saving on bandwidth.\n \"\"\"\n return [obj.name for obj in objects]\n\n\nclass OffTopicChannelNameSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `OffTopicChannelName` instances.\"\"\"\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n list_serializer_class = OffTopicChannelNameListSerializer\n model = OffTopicChannelName\n fields = ('name', 'used', 'active')\n\n\nclass ReminderSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `Reminder` instances.\"\"\"\n\n author = PrimaryKeyRelatedField(queryset=User.objects.all())\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = Reminder\n fields = (\n 'active',\n 'author',\n 'jump_url',\n 'channel_id',\n 'content',\n 'expiration',\n 'id',\n 'mentions',\n 'failures'\n )\n\n\nclass AocCompletionistBlockSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `AocCompletionistBlock` instances.\"\"\"\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = AocCompletionistBlock\n fields = (\"user\", \"is_blocked\", \"reason\")\n\n\nclass AocAccountLinkSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `AocAccountLink` instances.\"\"\"\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = AocAccountLink\n fields = (\"user\", \"aoc_username\")\n\n\nclass RoleSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `Role` instances.\"\"\"\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = Role\n fields = ('id', 'name', 'colour', 'permissions', 'position')\n\n\nclass UserListSerializer(ListSerializer):\n \"\"\"List serializer for User model to handle bulk updates.\"\"\"\n\n def create(self, validated_data: list) -> list:\n \"\"\"Override create method to optimize django queries.\"\"\"\n new_users = []\n seen = set()\n\n for user_dict in validated_data:\n if user_dict[\"id\"] in seen:\n raise ValidationError(\n {\"id\": [f\"User with ID {user_dict['id']} given multiple times.\"]}\n )\n seen.add(user_dict[\"id\"])\n new_users.append(User(**user_dict))\n\n User.objects.bulk_create(new_users, ignore_conflicts=True)\n return []\n\n def update(self, queryset: QuerySet, validated_data: list) -> list:\n \"\"\"\n Override update method to support bulk updates.\n\n ref:https://www.django-rest-framework.org/api-guide/serializers/#customizing-multiple-update\n \"\"\"\n object_ids = set()\n\n for data in validated_data:\n try:\n if data[\"id\"] in object_ids:\n # If request data contains users with same ID.\n raise ValidationError(\n {\"id\": [f\"User with ID {data['id']} given multiple times.\"]}\n )\n except KeyError:\n # If user ID not provided in request body.\n raise ValidationError(\n {\"id\": [\"This field is required.\"]}\n )\n object_ids.add(data[\"id\"])\n\n # filter queryset\n filtered_instances = queryset.filter(id__in=object_ids)\n\n instance_mapping = {user.id: user for user in filtered_instances}\n\n updated = []\n fields_to_update = set()\n for user_data in validated_data:\n for key in user_data:\n fields_to_update.add(key)\n\n try:\n user = instance_mapping[user_data[\"id\"]]\n except KeyError:\n raise NotFound({\"detail\": f\"User with id {user_data['id']} not found.\"})\n\n user.__dict__.update(user_data)\n updated.append(user)\n\n fields_to_update.remove(\"id\")\n\n if not fields_to_update:\n # Raise ValidationError when only id field is given.\n raise ValidationError(\n {api_settings.NON_FIELD_ERRORS_KEY: [\"Insufficient data provided.\"]}\n )\n\n User.objects.bulk_update(updated, fields_to_update)\n return updated\n\n\nclass UserSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `User` instances.\"\"\"\n\n # ID field must be explicitly set as the default id field is read-only.\n id = IntegerField(min_value=0)\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = User\n fields = ('id', 'name', 'discriminator', 'roles', 'in_guild')\n depth = 1\n list_serializer_class = UserListSerializer\n\n def create(self, validated_data: dict) -> User:\n \"\"\"Override create method to catch IntegrityError.\"\"\"\n try:\n return super().create(validated_data)\n except IntegrityError:\n raise ValidationError({\"id\": [\"User with ID already present.\"]})\n\n\nclass NominationEntrySerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `NominationEntry` instances.\"\"\"\n\n # We need to define it here, because we don't want that nomination ID\n # return inside nomination response entry, because ID is already available\n # as top-level field. Queryset is required if field is not read only.\n nomination = PrimaryKeyRelatedField(\n queryset=Nomination.objects.all(),\n write_only=True\n )\n\n class Meta:\n \"\"\"Metadata defined for the Django REST framework.\"\"\"\n\n model = NominationEntry\n fields = ('nomination', 'actor', 'reason', 'inserted_at')\n\n\nclass NominationSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `Nomination` instances.\"\"\"\n\n entries = NominationEntrySerializer(many=True, read_only=True)\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = Nomination\n fields = (\n 'id', 'active', 'user', 'inserted_at', 'end_reason', 'ended_at', 'reviewed', 'entries'\n )\n\n\nclass OffensiveMessageSerializer(ModelSerializer):\n \"\"\"A class providing (de-)serialization of `OffensiveMessage` instances.\"\"\"\n\n class Meta:\n \"\"\"Metadata defined for the Django REST Framework.\"\"\"\n\n model = OffensiveMessage\n fields = ('id', 'channel_id', 'delete_date')\n", "path": "pydis_site/apps/api/serializers.py" } ]
diff --git a/pydis_site/apps/api/serializers.py b/pydis_site/apps/api/serializers.py index e53ccffae..9228c1f44 100644 --- a/pydis_site/apps/api/serializers.py +++ b/pydis_site/apps/api/serializers.py @@ -176,6 +176,7 @@ class Meta: fields = ( 'id', 'inserted_at', + 'last_applied', 'expires_at', 'active', 'user',
OBOFoundry__OBOFoundry.github.io-1378
[ { "content": "#!/usr/bin/env python3\n\nimport json\nimport jsonschema\nimport os\nimport re\nimport sys\nimport yaml\n\nfrom argparse import ArgumentParser\n\n\n# Path to JSON schema file:\nSCHEMA_FILE = 'util/schema/registry_schema.json'\n\n# The metadata grid to be generated:\nmetadata_grid = {}\n\n\ndef main(args):\n global metadata_grid\n parser = ArgumentParser(description='''\n Validate registry metadata in the given YAML file yaml_infile and produce two output files:\n 1) violations_outfile: a CSV, TSV, or TXT file which contain all metadata violations, and\n 2) grid_outfile: a CSV, TSV, or TXT file which will contain a custom sorted metadata grid''')\n parser.add_argument('yaml_infile', type=str, help='YAML file containing registry data')\n parser.add_argument('violations_outfile', type=str,\n help='Output file (CSV, TSV, or TXT) to contain metadata violations')\n parser.add_argument('grid_outfile', type=str,\n help='Output file (CSV, TSV, or TXT) to contain custom sorted metadata grid')\n args = parser.parse_args()\n\n yaml_infile = args.yaml_infile\n violations_outfile = args.violations_outfile\n grid_outfile = args.grid_outfile\n\n # Load in the YAML and the JSON schemas that we will need:\n data = load_data(yaml_infile)\n schema = get_schema()\n\n results = {'error': [], 'warn': [], 'info': []}\n\n # Validate each object\n for item in data[\"ontologies\"]:\n add = validate_metadata(item, schema)\n results = update_results(results, add)\n\n # save the metadata-grid with ALL results\n headers = []\n for s in schema['properties']:\n if 'level' in s:\n headers.append(s)\n save_grid(metadata_grid, headers, grid_outfile)\n\n # print and save the results that did not pass\n print_results(results)\n save_results(results, violations_outfile)\n if results['error']:\n print('Metadata validation failed with %d errors - see %s for details'\n % (len(results['error']), violations_outfile))\n sys.exit(1)\n else:\n print('Metadata validation passed - see %s for warnings' % violations_outfile)\n sys.exit(0)\n\n\ndef load_data(yaml_infile):\n '''Given a YAML data file, load the data to validate.'''\n with open(yaml_infile, 'r') as stream:\n data = yaml.load(stream, Loader=yaml.SafeLoader)\n return data\n\n\ndef get_schema():\n '''Return a schema from the master schema directory.'''\n schema = None\n try:\n file = SCHEMA_FILE\n with open(file, 'r') as s:\n schema = json.load(s)\n except Exception as e:\n print('Unable to load %s: %s' % (f, str(e)))\n return schema\n\n\ndef validate_metadata(item, schema):\n '''Given an item and a schema, validate the item against the\n schema. Add the full results to the metadata_grid and return a map of\n errors, warnings, and infos for any active ontologies.'''\n global metadata_grid\n\n ont_id = item['id']\n # these lists will be displayed on the console:\n errors = []\n warnings = []\n infos = []\n # these results are put into the metadata grid:\n results = {}\n\n # determine how to sort this item in the grid:\n results['foundry'] = True if item.get('in_foundry_order') == 1 else False\n results['obsolete'] = True if item.get('is_obsolete') is True else False\n # if there is no status, put them at the bottom with inactive:\n results['ontology_status'] = item['activity_status'] if 'activity_status' in item else 'inactive'\n\n has_error = False\n has_warn = False\n has_info = False\n try:\n jsonschema.validate(item, schema)\n except jsonschema.exceptions.ValidationError as ve:\n title = list(ve.absolute_schema_path)[0] # Find the named section within the schema\n if title == \"required\":\n field_names = re.findall(r\"\\'(.*?)\\'\", ve.message) # Rather get which field\n if len(field_names) > 0:\n title = field_names[0]\n if title == \"properties\":\n title = list(ve.absolute_schema_path)[1] # Get which field\n # Get the schema \"level\" for this field dynamically, if we can\n if title in list(ve.absolute_schema_path) or title in schema['properties']:\n if title in list(ve.absolute_schema_path):\n title_index = list(ve.absolute_schema_path).index(title)\n path = list(ve.absolute_schema_path)[0:(title_index+1)]\n else:\n path = ['properties',title]\n abs_schema = schema\n for schema_item in path:\n if schema_item in abs_schema:\n if 'level' in abs_schema[schema_item]:\n level = abs_schema[schema_item]['level']\n abs_schema = abs_schema[schema_item]\n\n # add to the results map\n results[title] = level\n\n # flag for errors, warnings, and infos\n # without adding results to the lists that are logged\n if level == 'error':\n has_error = True\n elif level == 'warning':\n has_warn = True\n elif level == 'info':\n has_info = True\n\n # these cases will not cause test failure and will not be logged\n # the results are just added to the metadata grid:\n # - orphaned ontology on contact or license check\n # - inactive ontology\n # - obsolete ontology\n # - ontology annotated with `validate: false`\n if not ( (item.get('activity_status') == 'orphaned' and \\\n title in ['contact', 'license', 'license-lite']) or \\\n (item.get('is_obsolete') is True or item.get('activity_status') == 'inactive' or \\\n item.get('validate') is False) ):\n # get a message for displaying on terminal\n msg = ve.message\n if title in ['license', 'license-lite']:\n # license error message can show up in a few different ways\n search = re.search('\\'(.+?)\\' is not one of', msg)\n if search:\n msg = '\\'%s\\' is not a recommended license' % search.group(1)\n else:\n search = re.search('({\\'label\\'.+?\\'url\\'.+?}) is not valid', msg)\n if search:\n msg = format_license_msg(search.group(1))\n else:\n search = re.search('({\\'url\\'.+?\\'label\\'.+?}) is not valid', msg)\n if search:\n msg = format_license_msg(search.group(1))\n\n # format the message with the ontology ID\n msg = '%s %s: %s' % (ont_id.upper(), title, msg)\n\n # append to correct set of warnings\n if level == 'error':\n errors.append(msg)\n elif level == 'warning':\n # warnings are recommended fixes, not required\n if 'required' in msg:\n msg = msg.replace('required', 'recommended')\n warnings.append(msg)\n elif level == 'info':\n infos.append(msg)\n\n # add an overall validation status to the grid entry\n if has_error:\n results['validation_status'] = 'FAIL'\n elif has_warn:\n results['validation_status'] = 'WARN'\n elif has_info:\n results['validation_status'] = 'INFO'\n else:\n results['validation_status'] = 'PASS'\n metadata_grid[ont_id] = results\n\n return {'error': errors, 'warn': warnings, 'info': infos}\n\n\ndef format_license_msg(substr):\n '''Format an exception message for a license issue.'''\n # process to dict\n d = json.loads(substr.replace('\\'', '\"'))\n url = d['url']\n label = d['label']\n return '\\'{0}\\' <{1}> is not a recommended license'.format(label, url)\n\n\ndef update_results(results, add):\n '''Given a map of results for all ontologies and a map of results to add,\n append the results to the lists in the map.'''\n results['error'] = results['error'] + add['error']\n results['warn'] = results['warn'] + add['warn']\n results['info'] = results['info'] + add['info']\n return results\n\n\ndef sort_grid(metadata_grid):\n \"\"\"\n Given a metadata grid as a map, sort the grid based on:\n 1. Foundry status\n 2. Ontology activity status\n 3. Validation status\n 4. Alphabetical\n Return a sorted list of IDs.\n \"\"\"\n foundry = {'PASS': [], 'INFO': [], 'WARN': [], 'FAIL': []}\n active = {'PASS': [], 'INFO': [], 'WARN': [], 'FAIL': []}\n orphaned = {'PASS': [], 'INFO': [], 'WARN': [], 'FAIL': []}\n inactive = {'PASS': [], 'INFO': [], 'WARN': [], 'FAIL': []}\n obsolete = {'PASS': [], 'INFO': [], 'WARN': [], 'FAIL': []}\n\n for ont_id, results in metadata_grid.items():\n # get the info about the ontology to sort on\n ontology_status = results['ontology_status']\n validation_status = results['validation_status']\n\n # foundry ontologies are displayed first\n # they must be active\n if results['foundry']:\n foundry[validation_status].append(ont_id)\n continue\n\n # obsolete ontologies are displayed last\n # they are always inactive\n # (inactive does not mean obsolete)\n if results['obsolete']:\n obsolete[validation_status].append(ont_id)\n continue\n\n # finally, sort by: active, orphaned, inactive\n if ontology_status == 'active':\n active[validation_status].append(ont_id)\n elif ontology_status == 'orphaned':\n orphaned[validation_status].append(ont_id)\n elif ontology_status == 'inactive':\n inactive[validation_status].append(ont_id)\n\n # concatenate everything to a sorted list:\n def sort_list(arr):\n arr.sort(key=str.lower)\n if not arr:\n return []\n return arr\n\n sort = []\n for ont_type in [foundry, active, orphaned, inactive, obsolete]:\n for v_status in ['PASS', 'INFO', 'WARN', 'FAIL']:\n sort = sort + sort_list(ont_type[v_status])\n\n return sort\n\n\ndef save_grid(metadata_grid, headers, grid_outfile):\n '''Given a metadata grid of all results and a grid file to write to, create\n a sorted table of the full results.'''\n if '.csv' in grid_outfile:\n separator = ','\n elif '.tsv' or '.txt' in grid_outfile:\n separator = '\\t'\n else:\n print('Grid file must be CSV, TSV, or TXT', file=sys.stderr)\n return\n\n # Determine order of ontologies based on statuses\n sort_order = sort_grid(metadata_grid)\n\n # First three help to see overall details\n header = 'Ontology{0}Activity Status{0}Validation Status'.format(separator)\n # After that, we show the results of each check\n for h in headers:\n header += separator + h\n header += '\\n'\n\n with open(grid_outfile, 'w') as f:\n f.write(header)\n for ont_id in sort_order:\n results = metadata_grid[ont_id]\n s = '{1}{0}{2}{0}{3}'.format(separator, ont_id, results['ontology_status'],\n results['validation_status'])\n for h in headers:\n if h == 'license':\n # license has two checks\n # so the license entry will be the more severe violation\n all_res = [results['license'], results['license-lite']]\n if 'error' in all_res:\n s += separator + 'error'\n elif 'warning' in all_res:\n s += separator + 'warning'\n elif 'info' in all_res:\n s += separator + 'info'\n else:\n s += separator + 'pass'\n continue\n s += separator + results[h]\n s += '\\n'\n f.write(s)\n\n print('Full validation results written to %s' % grid_outfile)\n\n\ndef print_results(results):\n '''Given a map of results, log results on the console.'''\n for level, messages in results.items():\n for m in messages:\n print('%s\\t%s' % (level.upper(), m))\n\n\ndef save_results(results, violations_outfile):\n '''Given a map of results and an output file to write to, write each result\n on a line.'''\n if '.csv' in violations_outfile:\n separator = ','\n elif '.tsv' or '.txt' in violations_outfile:\n separator = '\\t'\n else:\n print('Output file must be CSV, TSV, or TXT', file=sys.stderr)\n return\n with open(violations_outfile, 'w') as f:\n f.write('Level%sMessage\\n' % separator)\n for level, messages in results.items():\n for m in messages:\n f.write('%s%s%s\\n' % (level.upper(), separator, m))\n\n\nif __name__ == '__main__':\n main(sys.argv)\n", "path": "util/validate-metadata.py" } ]
[ { "content": "#!/usr/bin/env python3\n\nimport json\nimport jsonschema\nimport os\nimport re\nimport sys\nimport yaml\n\nfrom argparse import ArgumentParser\n\n\n# Path to JSON schema file:\nSCHEMA_FILE = 'util/schema/registry_schema.json'\n\n# The metadata grid to be generated:\nmetadata_grid = {}\n\n\ndef main(args):\n global metadata_grid\n parser = ArgumentParser(description='''\n Validate registry metadata in the given YAML file yaml_infile and produce two output files:\n 1) violations_outfile: a CSV, TSV, or TXT file which contain all metadata violations, and\n 2) grid_outfile: a CSV, TSV, or TXT file which will contain a custom sorted metadata grid''')\n parser.add_argument('yaml_infile', type=str, help='YAML file containing registry data')\n parser.add_argument('violations_outfile', type=str,\n help='Output file (CSV, TSV, or TXT) to contain metadata violations')\n parser.add_argument('grid_outfile', type=str,\n help='Output file (CSV, TSV, or TXT) to contain custom sorted metadata grid')\n args = parser.parse_args()\n\n yaml_infile = args.yaml_infile\n violations_outfile = args.violations_outfile\n grid_outfile = args.grid_outfile\n\n # Load in the YAML and the JSON schemas that we will need:\n data = load_data(yaml_infile)\n schema = get_schema()\n\n results = {'error': [], 'warn': [], 'info': []}\n\n # Validate each object\n for item in data[\"ontologies\"]:\n add = validate_metadata(item, schema)\n results = update_results(results, add)\n\n # save the metadata-grid with ALL results\n headers = []\n for s in schema['properties']:\n if 'level' in s:\n headers.append(s)\n save_grid(metadata_grid, headers, grid_outfile)\n\n # print and save the results that did not pass\n print_results(results)\n save_results(results, violations_outfile)\n if results['error']:\n print('Metadata validation failed with %d errors - see %s for details'\n % (len(results['error']), violations_outfile))\n sys.exit(1)\n else:\n print('Metadata validation passed - see %s for warnings' % violations_outfile)\n sys.exit(0)\n\n\ndef load_data(yaml_infile):\n '''Given a YAML data file, load the data to validate.'''\n with open(yaml_infile, 'r') as stream:\n data = yaml.load(stream, Loader=yaml.SafeLoader)\n return data\n\n\ndef get_schema():\n '''Return a schema from the master schema directory.'''\n schema = None\n try:\n file = SCHEMA_FILE\n with open(file, 'r') as s:\n schema = json.load(s)\n except Exception as e:\n print('Unable to load %s: %s' % (file, str(e)))\n return schema\n\n\ndef validate_metadata(item, schema):\n '''Given an item and a schema, validate the item against the\n schema. Add the full results to the metadata_grid and return a map of\n errors, warnings, and infos for any active ontologies.'''\n global metadata_grid\n\n ont_id = item['id']\n # these lists will be displayed on the console:\n errors = []\n warnings = []\n infos = []\n # these results are put into the metadata grid:\n results = {}\n\n # determine how to sort this item in the grid:\n results['foundry'] = True if item.get('in_foundry_order') == 1 else False\n results['obsolete'] = True if item.get('is_obsolete') is True else False\n # if there is no status, put them at the bottom with inactive:\n results['ontology_status'] = item['activity_status'] if 'activity_status' in item else 'inactive'\n\n has_error = False\n has_warn = False\n has_info = False\n try:\n jsonschema.validate(item, schema)\n except jsonschema.exceptions.ValidationError as ve:\n title = list(ve.absolute_schema_path)[0] # Find the named section within the schema\n if title == \"required\":\n field_names = re.findall(r\"\\'(.*?)\\'\", ve.message) # Rather get which field\n if len(field_names) > 0:\n title = field_names[0]\n if title == \"properties\":\n title = list(ve.absolute_schema_path)[1] # Get which field\n # Get the schema \"level\" for this field dynamically, if we can\n if title in list(ve.absolute_schema_path) or title in schema['properties']:\n if title in list(ve.absolute_schema_path):\n title_index = list(ve.absolute_schema_path).index(title)\n path = list(ve.absolute_schema_path)[0:(title_index+1)]\n else:\n path = ['properties',title]\n abs_schema = schema\n for schema_item in path:\n if schema_item in abs_schema:\n if 'level' in abs_schema[schema_item]:\n level = abs_schema[schema_item]['level']\n abs_schema = abs_schema[schema_item]\n\n # add to the results map\n results[title] = level\n\n # flag for errors, warnings, and infos\n # without adding results to the lists that are logged\n if level == 'error':\n has_error = True\n elif level == 'warning':\n has_warn = True\n elif level == 'info':\n has_info = True\n\n # these cases will not cause test failure and will not be logged\n # the results are just added to the metadata grid:\n # - orphaned ontology on contact or license check\n # - inactive ontology\n # - obsolete ontology\n # - ontology annotated with `validate: false`\n if not ( (item.get('activity_status') == 'orphaned' and \\\n title in ['contact', 'license', 'license-lite']) or \\\n (item.get('is_obsolete') is True or item.get('activity_status') == 'inactive' or \\\n item.get('validate') is False) ):\n # get a message for displaying on terminal\n msg = ve.message\n if title in ['license', 'license-lite']:\n # license error message can show up in a few different ways\n search = re.search('\\'(.+?)\\' is not one of', msg)\n if search:\n msg = '\\'%s\\' is not a recommended license' % search.group(1)\n else:\n search = re.search('({\\'label\\'.+?\\'url\\'.+?}) is not valid', msg)\n if search:\n msg = format_license_msg(search.group(1))\n else:\n search = re.search('({\\'url\\'.+?\\'label\\'.+?}) is not valid', msg)\n if search:\n msg = format_license_msg(search.group(1))\n\n # format the message with the ontology ID\n msg = '%s %s: %s' % (ont_id.upper(), title, msg)\n\n # append to correct set of warnings\n if level == 'error':\n errors.append(msg)\n elif level == 'warning':\n # warnings are recommended fixes, not required\n if 'required' in msg:\n msg = msg.replace('required', 'recommended')\n warnings.append(msg)\n elif level == 'info':\n infos.append(msg)\n\n # add an overall validation status to the grid entry\n if has_error:\n results['validation_status'] = 'FAIL'\n elif has_warn:\n results['validation_status'] = 'WARN'\n elif has_info:\n results['validation_status'] = 'INFO'\n else:\n results['validation_status'] = 'PASS'\n metadata_grid[ont_id] = results\n\n return {'error': errors, 'warn': warnings, 'info': infos}\n\n\ndef format_license_msg(substr):\n '''Format an exception message for a license issue.'''\n # process to dict\n d = json.loads(substr.replace('\\'', '\"'))\n url = d['url']\n label = d['label']\n return '\\'{0}\\' <{1}> is not a recommended license'.format(label, url)\n\n\ndef update_results(results, add):\n '''Given a map of results for all ontologies and a map of results to add,\n append the results to the lists in the map.'''\n results['error'] = results['error'] + add['error']\n results['warn'] = results['warn'] + add['warn']\n results['info'] = results['info'] + add['info']\n return results\n\n\ndef sort_grid(metadata_grid):\n \"\"\"\n Given a metadata grid as a map, sort the grid based on:\n 1. Foundry status\n 2. Ontology activity status\n 3. Validation status\n 4. Alphabetical\n Return a sorted list of IDs.\n \"\"\"\n foundry = {'PASS': [], 'INFO': [], 'WARN': [], 'FAIL': []}\n active = {'PASS': [], 'INFO': [], 'WARN': [], 'FAIL': []}\n orphaned = {'PASS': [], 'INFO': [], 'WARN': [], 'FAIL': []}\n inactive = {'PASS': [], 'INFO': [], 'WARN': [], 'FAIL': []}\n obsolete = {'PASS': [], 'INFO': [], 'WARN': [], 'FAIL': []}\n\n for ont_id, results in metadata_grid.items():\n # get the info about the ontology to sort on\n ontology_status = results['ontology_status']\n validation_status = results['validation_status']\n\n # foundry ontologies are displayed first\n # they must be active\n if results['foundry']:\n foundry[validation_status].append(ont_id)\n continue\n\n # obsolete ontologies are displayed last\n # they are always inactive\n # (inactive does not mean obsolete)\n if results['obsolete']:\n obsolete[validation_status].append(ont_id)\n continue\n\n # finally, sort by: active, orphaned, inactive\n if ontology_status == 'active':\n active[validation_status].append(ont_id)\n elif ontology_status == 'orphaned':\n orphaned[validation_status].append(ont_id)\n elif ontology_status == 'inactive':\n inactive[validation_status].append(ont_id)\n\n # concatenate everything to a sorted list:\n def sort_list(arr):\n arr.sort(key=str.lower)\n if not arr:\n return []\n return arr\n\n sort = []\n for ont_type in [foundry, active, orphaned, inactive, obsolete]:\n for v_status in ['PASS', 'INFO', 'WARN', 'FAIL']:\n sort = sort + sort_list(ont_type[v_status])\n\n return sort\n\n\ndef save_grid(metadata_grid, headers, grid_outfile):\n '''Given a metadata grid of all results and a grid file to write to, create\n a sorted table of the full results.'''\n if '.csv' in grid_outfile:\n separator = ','\n elif '.tsv' or '.txt' in grid_outfile:\n separator = '\\t'\n else:\n print('Grid file must be CSV, TSV, or TXT', file=sys.stderr)\n return\n\n # Determine order of ontologies based on statuses\n sort_order = sort_grid(metadata_grid)\n\n # First three help to see overall details\n header = 'Ontology{0}Activity Status{0}Validation Status'.format(separator)\n # After that, we show the results of each check\n for h in headers:\n header += separator + h\n header += '\\n'\n\n with open(grid_outfile, 'w') as f:\n f.write(header)\n for ont_id in sort_order:\n results = metadata_grid[ont_id]\n s = '{1}{0}{2}{0}{3}'.format(separator, ont_id, results['ontology_status'],\n results['validation_status'])\n for h in headers:\n if h == 'license':\n # license has two checks\n # so the license entry will be the more severe violation\n all_res = [results['license'], results['license-lite']]\n if 'error' in all_res:\n s += separator + 'error'\n elif 'warning' in all_res:\n s += separator + 'warning'\n elif 'info' in all_res:\n s += separator + 'info'\n else:\n s += separator + 'pass'\n continue\n s += separator + results[h]\n s += '\\n'\n f.write(s)\n\n print('Full validation results written to %s' % grid_outfile)\n\n\ndef print_results(results):\n '''Given a map of results, log results on the console.'''\n for level, messages in results.items():\n for m in messages:\n print('%s\\t%s' % (level.upper(), m))\n\n\ndef save_results(results, violations_outfile):\n '''Given a map of results and an output file to write to, write each result\n on a line.'''\n if '.csv' in violations_outfile:\n separator = ','\n elif '.tsv' or '.txt' in violations_outfile:\n separator = '\\t'\n else:\n print('Output file must be CSV, TSV, or TXT', file=sys.stderr)\n return\n with open(violations_outfile, 'w') as f:\n f.write('Level%sMessage\\n' % separator)\n for level, messages in results.items():\n for m in messages:\n f.write('%s%s%s\\n' % (level.upper(), separator, m))\n\n\nif __name__ == '__main__':\n main(sys.argv)\n", "path": "util/validate-metadata.py" } ]
diff --git a/_layouts/ontology_detail.html b/_layouts/ontology_detail.html index 8b62ddcb6..cf74772e6 100644 --- a/_layouts/ontology_detail.html +++ b/_layouts/ontology_detail.html @@ -2,10 +2,10 @@ layout: default --- {% include navbar.html %} -<div class="content"> +<div class="content"> - <div> + <div> <div class="page-header"> <h1> {% if page.depicted_by %} @@ -13,15 +13,15 @@ <h1> {% endif %} {{ page.title }} <small>{{ page.tagline }}</small> - </h1> + </h1> <p> {{page.description}} </p> {% if page.twitter %} - <iframe style="position: static; visibility: visible; width: 190px; height: 20px;" - data-twttr-rendered="true" title="Twitter Follow Button" - class="twitter-follow-button twitter-follow-button" - src="http://platform.twitter.com/widgets/follow_button.a64cf823bcb784855b86e2970134bd2a.en.html#_=1438577078419&amp;dnt=false&amp;id=twitter-widget-0&amp;lang=en&amp;screen_name={{page.twitter}}&amp;show_count=true&amp;show_screen_name=true&amp;size=m" + <iframe style="position: static; visibility: visible; width: 190px; height: 20px;" + data-twttr-rendered="true" title="Twitter Follow Button" + class="twitter-follow-button twitter-follow-button" + src="http://platform.twitter.com/widgets/follow_button.a64cf823bcb784855b86e2970134bd2a.en.html#_=1438577078419&amp;dnt=false&amp;id=twitter-widget-0&amp;lang=en&amp;screen_name={{page.twitter}}&amp;show_count=true&amp;show_screen_name=true&amp;size=m" allowtransparency="true" scrolling="no" id="twitter-widget-0" frameborder="0"> </iframe> {% endif %} @@ -106,16 +106,55 @@ <h2>Products</h2> </tbody> </table> </div> - + {% if page.usages %} + <div> + <h2>Usages</h2> + {% for p in page.usages %} + <dl class="dl-horizontal"> + <dt>User</dt> <dd><a href="{{p.user}}">{{p.user}}</a></dd> + <dt>Description</dt><dd>{{p.description}}</dd> + {% if p.type %} + <dt>Type</dt> <dd>{{p.type}}</dd> + {% endif %} + {% if p.seeAlso %} + <dt>See also</dt> <dd><a href="{{p.seeAlso}}">{{p.seeAlso}}</a></dd> + {% endif %} + {% if p.examples %} + <dt>Examples</dt> + <dd> + <ul style="padding-left: 20px"> + {% for example in p.examples %} + <li><a href="{{example.url}}">{{example.description}}</a></li> + {% endfor %} + </ul> + </dd> + {% endif %} + {% if p.publications %} + <dt>Publications</dt> + <dd> + <ul style="padding-left: 20px"> + {% for publication in p.publications %} + <li><a href="{{publication.id}}">{{publication.title}}</a></li> + {% endfor %} + </ul> + </dd> + {% endif %} + </dl> + {% endfor %} + </div> + {% endif %} + </div> + + <div class="col-md-4"> <dl class="dl-horizontal" style="dd { margin-left: 0 }"> <dt> ID Space - <span data-toggle="tooltip" - title="ID prefix" + <span data-toggle="tooltip" + title="ID prefix" html="true"> </span> </dt> @@ -166,7 +205,7 @@ <h2>Products</h2> {% endif %} <dd> {% endif %} - + <dt>Homepage</dt> <dd> <a href="{{page.homepage}}">{{page.homepage}}</a> @@ -185,7 +224,7 @@ <h2>Products</h2> <dt>Contact</dt> <dd> - <a href="mailto:{{page.contact.email}}">{{page.contact.label}}</a> + <a href="mailto:{{page.contact.email}}">{{page.contact.label}}</a> </dd> <dt>Trackers</dt> @@ -197,7 +236,7 @@ <h2>Products</h2> <dd> <a href="/domain/{{page.domain}}.html">{{page.domain}}</a> </dd> - + {% if page.mailing_list %} <dt>Mail List</dt> <dd> @@ -271,14 +310,16 @@ <h2>Products</h2> {% endif %} + + </dl> - + <div class="btn-group" role="group" aria-label="Source"> <a href="https://github.com/OBOFoundry/OBOFoundry.github.io/blob/master/ontology/{{page.id}}.md"> - <button type="button" - data-toggle="tooltip" - title="See FAQ entry: How is metadata stored?" + <button type="button" + data-toggle="tooltip" + title="See FAQ entry: How is metadata stored?" html="true" class="btn btn-default"> View @@ -286,18 +327,18 @@ <h2>Products</h2> </a> <a href="https://github.com/OBOFoundry/OBOFoundry.github.io/edit/master/ontology/{{page.id}}.md"> - <button type="button" - data-toggle="tooltip" - title="See FAQ entry: How I do edit my metadata?" + <button type="button" + data-toggle="tooltip" + title="See FAQ entry: How I do edit my metadata?" html="true" class="btn btn-default"> Edit</button> </a> <a href="https://github.com/OBOFoundry/purl.obolibrary.org/blob/master/config/{{page.id}}.yml"> - <button type="button" - data-toggle="tooltip" - title="See FAQ entry: How I do edit my PURL?" + <button type="button" + data-toggle="tooltip" + title="See FAQ entry: How I do edit my PURL?" html="true" class="btn btn-default"> PURL</button> @@ -326,10 +367,10 @@ <h2>Products</h2> </div> {% if page.comments %} - <div> - <div > + <div> + <div > <h2>Comments Section</h2> - <p>Feel free to comment on the post but keep it clean and on topic.</p> + <p>Feel free to comment on the post but keep it clean and on topic.</p> <div id="disqus_thread"></div> <script type="text/javascript"> /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ @@ -347,9 +388,8 @@ <h2>Comments Section</h2> </div> </div> {% endif %} - + <!-- Twitter --> <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script> </div> - diff --git a/ontology/cl.md b/ontology/cl.md index f23ddf4cf..72b3a616c 100644 --- a/ontology/cl.md +++ b/ontology/cl.md @@ -62,7 +62,9 @@ usages: seeAlso: https://www.biosharing.org/biodbcore-000034 type: annotation description: The National Human Genome Research Institute (NHGRI) launched a public research consortium named ENCODE, the Encyclopedia Of DNA Elements, in September 2003, to carry out a project to identify all functional elements in the human genome sequence. The ENCODE DCC users Uberon to annotate samples - reference: https://doi.org/10.1093/database/bav010 + publications: + - id: https://doi.org/10.1093/database/bav010 + title: "Ontology application and use at the ENCODE DCC" - user: http://fantom5-collaboration.gsc.riken.jp/ type: annotation description: FANTOM5 is using Uberon and CL to annotate samples allowing for transcriptome analyses with cell-type and tissue-level specificity. diff --git a/ontology/dpo.md b/ontology/dpo.md index 739b4d52f..4240ca2f7 100644 --- a/ontology/dpo.md +++ b/ontology/dpo.md @@ -34,7 +34,7 @@ publications: usages: - user: http://flybase.org description: FlyBase uses dpo for phenotype data annotation in Drosophila - example: + examples: - url: "http://flybase.org/cgi-bin/cvreport.html?rel=is_a&id=FBcv:0002030" description: "alleles and constructs annotated to pupal lethal in FlyBase" activity_status: active diff --git a/ontology/eco.md b/ontology/eco.md index 749f18bd0..8e730e6cf 100644 --- a/ontology/eco.md +++ b/ontology/eco.md @@ -42,8 +42,11 @@ usages: type: annotation description: ECO is used by the Monarch Initiative for evidence types for disease to phenotype annotations. examples: - - url: https://monarchinitiative.org/phenotype/HP%3A0001300#diseases - reference: https://academic.oup.com/nar/article/45/D1/D712/2605791 + - url: https://monarchinitiative.org/phenotype/HP%3A0001300#disease + description: "Parkinsonism: Characteristic neurologic anomaly resulting form degeneration of dopamine-generating cells in the substantia nigra, a region of the midbrain, characterized clinically by shaking, rigidity, slowness of movement and difficulty with walking and gait." + publications: + - id: https://academic.oup.com/nar/article/45/D1/D712/2605791 + title: "The Monarch Initiative: an integrative data and analytic platform connecting phenotypes to genotypes across species" activity_status: active --- @@ -53,7 +56,7 @@ The Evidence & Conclusion Ontology (ECO) describes types of scientific evidence ECO comprises two high-level classes, evidence and assertion method, where evidence is defined as “a type of information that is used to support an assertion,” and assertion method is defined as “a means by which a statement is made about an entity.” Together evidence and assertion method can be combined to describe both the support for an assertion and whether that assertion was made by a human being or a computer. However, ECO is _not_ used to make the assertion itself; for that, one would use another ontology, free text description, or some other means. -ECO was originally created around the year 2000 to support gene product annotation by the Gene Ontology, which now displays ECO in AmiGO 2. Today ECO is used by many groups concerned with evidence in scientific research. +ECO was originally created around the year 2000 to support gene product annotation by the Gene Ontology, which now displays ECO in AmiGO 2. Today ECO is used by many groups concerned with evidence in scientific research. *** For **advice on requesting new terms**, please see **[the Evidence & Conclusion Ontology wiki](https://github.com/evidenceontology/evidenceontology/wiki/New-term-request-how-to)**. diff --git a/ontology/envo.md b/ontology/envo.md index 40226da4c..4bdd3ab9d 100644 --- a/ontology/envo.md +++ b/ontology/envo.md @@ -42,40 +42,32 @@ dependencies: - id: po - id: go usages: - - type: data-annotation + - user: http://eol.org + type: data-annotation description: "describing species habitats" examples: - url: http://eol.org/pages/211700/data - resources: - url: http://eol.org - label: EOL - - type: data-annotation + - url: http://eol.org/pages/211700/data + description: "Pseudobarbus burchelli (Tradou Redfin) is a species of bony fishes in the family Cyprinidae. They are associated with freshwater habitat. Individuals can grow to 13.5 cm. They have sexual reproduction." + - user: http://globalbioticinteractions.org + type: data-annotation description: "describing stomach contents" - datasets: - url: https://s3.amazonaws.com/globi/snapshot/target/data/taxa/interactions.csv.gz - resources: - url: http://globalbioticinteractions.org - label: GloBI - - type: dataset-description + - user: http://www.nature.com/sdata/ + type: dataset-description description: "annotating datasets in data repositories" seeAlso: http://blogs.nature.com/scientificdata/2015/12/17/isa-explorer/ - search: http://scientificdata.isa-explorer.org/ - resources: - url: http://www.nature.com/sdata/ - label: Nature Scientific Data - user: http://oceans.taraexpeditions.org/en/ description: Samples collected during Tara Oceans expedition are annotated with ENVO - example: + examples: - url: https://www.ebi.ac.uk/metagenomics/projects/ERP001736/samples/ERS487899 description: "Sample collected during the Tara Oceans expedition (2009-2013) at station TARA_004 (latitudeN=36.5533, longitudeE=-6.5669)" - user: https://www.ncbi.nlm.nih.gov/ description: Annotation of habitats of microbes - example: + examples: - url: https://www.ncbi.nlm.nih.gov/nuccore/NC_016642 description: "Annotation of habitat of Pseudovibrio sp. FO-BEG1 to marine environment" - user: https://www.planetmicrobe.org/project/ description: Annotation and semantic search over microbial data sets - example: + examples: - url: https://www.planetmicrobe.org/project/#/samples/200 description: "Example metadata of a sample of marine water near Lisboa, taken as part of the Ocean Sampling Day Project (https://www.microb3.eu/osd.html). ENVO is used for the fields environmental feature, material, and biome." jobs: diff --git a/ontology/fbbt.md b/ontology/fbbt.md index 259b8e644..80cc3d004 100644 --- a/ontology/fbbt.md +++ b/ontology/fbbt.md @@ -55,7 +55,7 @@ usages: description: "genes expressed in ring neuron R2 in VFB" - user: http://flybase.org description: Flybase uses FBbt for expression and phenotype data annotation in Drosophila - example: + examples: - url: "http://flybase.org/cgi-bin/cvreport.html?rel=is_a&id=FBbt:00005106" description: "alleles, constructs and insertions annotated to neuron in FlyBase" activity_status: active diff --git a/ontology/fbcv.md b/ontology/fbcv.md index 82605a6e9..3596283c3 100644 --- a/ontology/fbcv.md +++ b/ontology/fbcv.md @@ -28,7 +28,7 @@ browsers: usages: - user: http://flybase.org description: FlyBase uses FBcv for phenotype data annotation in Drosophila - example: + examples: - url: "http://flybase.org/cgi-bin/cvreport.html?rel=is_a&id=FBcv:0000391" description: "alleles and constructs annotated to bang sensitive in FlyBase" activity_status: active diff --git a/ontology/fypo.md b/ontology/fypo.md index f62dfcdd6..86924def8 100644 --- a/ontology/fypo.md +++ b/ontology/fypo.md @@ -30,7 +30,7 @@ depicted_by: https://github.com/pombase/website/blob/master/src/assets/FYPO_logo usages: - user: https://www.pombase.org description: Pombase uses fypo for phenotype data annotation in fission yeast - example: + examples: - url: https://www.pombase.org/term/FYPO:0000059 description: "genotypes annotated to abnormal mitotic cell cycle in fission yeast" activity_status: active diff --git a/ontology/hancestro.md b/ontology/hancestro.md index cf1bcea6e..1bc922b71 100644 --- a/ontology/hancestro.md +++ b/ontology/hancestro.md @@ -22,19 +22,25 @@ license: usages: - user: http://www.ebi.ac.uk/efo description: The Experimental Factor Ontology (EFO) provides a systematic description of many experimental variables available in EBI databases, and for external projects such as the NHGRI GWAS catalogue. It combines parts of several biological ontologies, such as anatomy, disease and chemical compounds. - example: https://www.ebi.ac.uk/ols/ontologies/efo/terms?iri=http%3A%2F%2Fpurl.obolibrary.org%2Fobo%2FHANCESTRO_0004&viewMode=All&siblings=false + examples: + - url: https://www.ebi.ac.uk/ols/ontologies/efo/terms?iri=http%3A%2F%2Fpurl.obolibrary.org%2Fobo%2FHANCESTRO_0004&viewMode=All&siblings=false + description: Population category defined using ancestry informative markers (AIMs) based on genetic/genomic data - user: https://genepio.org/ description: The Genomic Epidemiology Ontology (GenEpiO) covers vocabulary necessary to identify, document and research foodborne pathogens and associated outbreaks. - example: https://www.ebi.ac.uk/ols/ontologies/genepio/terms?iri=http%3A%2F%2Fpurl.obolibrary.org%2Fobo%2FHANCESTRO_0004&viewMode=All&siblings=false + examples: + - url: https://www.ebi.ac.uk/ols/ontologies/genepio/terms?iri=http%3A%2F%2Fpurl.obolibrary.org%2Fobo%2FHANCESTRO_0004&viewMode=All&siblings=false + description: Population category defined using ancestry informative markers (AIMs) based on genetic/genomic data - user: http://foodon.org description: FoodOn (http://foodon.org) is a consortium-driven project to build a comprehensive and easily accessible global farm-to-fork ontology about food, that accurately and consistently describes foods commonly known in cultures from around the world. - example: https://www.ebi.ac.uk/ols/ontologies/foodon/terms?iri=http%3A%2F%2Fpurl.obolibrary.org%2Fobo%2FHANCESTRO_0004&viewMode=All&siblings=false + examples: + - url: https://www.ebi.ac.uk/ols/ontologies/foodon/terms?iri=http%3A%2F%2Fpurl.obolibrary.org%2Fobo%2FHANCESTRO_0004&viewMode=All&siblings=false + description: Population category defined using ancestry informative markers (AIMs) based on genetic/genomic data activity_status: active --- # Summary -The Human Ancestry Ontology (HANCESTRO) provides a systematic description of the ancestry concepts used in the NHGRI-EBI Catalog of published genome-wide association studies. +The Human Ancestry Ontology (HANCESTRO) provides a systematic description of the ancestry concepts used in the NHGRI-EBI Catalog of published genome-wide association studies. * Home: [https://github.com/EBISPOT/ancestro](https://github.com/EBISPOT/ancestro) @@ -43,7 +49,7 @@ The Human Ancestry Ontology (HANCESTRO) provides a systematic description of the Use the following URI to download this ontology * [http://purl.obolibrary.org/obo/hancestro.owl](http://purl.obolibrary.org/obo/hancestro.owl) -* This should point to: [https://raw.githubusercontent.com/EBISPOT/ancestro/master/hancestro_inferred.owl](https://raw.githubusercontent.com/EBISPOT/ancestro/master/hancestro_inferred.owl) +* This should point to: [https://raw.githubusercontent.com/EBISPOT/ancestro/master/hancestro_inferred.owl](https://raw.githubusercontent.com/EBISPOT/ancestro/master/hancestro_inferred.owl) A non-reasoned version of the ontology is available at [https://raw.githubusercontent.com/EBISPOT/ancestro/master/hancestro.owl](https://raw.githubusercontent.com/EBISPOT/ancestro/master/hancestro.owl) diff --git a/ontology/mondo.md b/ontology/mondo.md index deca96159..b4def9064 100644 --- a/ontology/mondo.md +++ b/ontology/mondo.md @@ -45,8 +45,11 @@ usages: type: annotation description: Mondo is used by the Monarch Initiative for disease annotations. examples: - - url: https://monarchinitiative.org/phenotype/HP:0001300#diseases - reference: https://academic.oup.com/nar/article/45/D1/D712/2605791 + - url: https://monarchinitiative.org/phenotype/HP:0001300#disease + description: "Parkinsonism: Characteristic neurologic anomaly resulting form degeneration of dopamine-generating cells in the substantia nigra, a region of the midbrain, characterized clinically by shaking, rigidity, slowness of movement and difficulty with walking and gait." + publications: + - id: https://academic.oup.com/nar/article/45/D1/D712/2605791 + title: "The Monarch Initiative: an integrative data and analytic platform connecting phenotypes to genotypes across species " activity_status: active --- @@ -59,7 +62,7 @@ These precise mappings are available in three ways depending on the format: - the [mondo-with-equivalent](http://purl.obolibrary.org/obo/mondo/mondo-with-equivalents.owl) edition uses OWL equivalence axioms directly in the ontology. Note this makes it harder to browse in some portals, but this edition may be preferable for computational use. The owl edition also includes axiomatization using CL, Uberon, GO, HP, RO, NCBITaxon. - the primary release versions (mondo.owl, mondo.obo) are simpler, lacking owl equivalence axioms from Mondo classes to terms from other databases; instead, xrefs are used for linking these terms. If the ID is one of Orphanet, OMIM, DOID or EFO then the xref precisely shadows the equivalence axiom. - The [mondo-with-equivalents json edition](http://purl.obolibrary.org/obo/mondo/mondo-with-equivalents.json) has all owl equivalencies as well as all xrefs to other disease sources. - + Tracker - https://github.com/monarch-initiative/mondo/issues diff --git a/ontology/mro.md b/ontology/mro.md index d4f44ac13..e4a7c6840 100644 --- a/ontology/mro.md +++ b/ontology/mro.md @@ -21,7 +21,10 @@ usages: description: MRO is used by the The Immune Epitope Database (IEDB) annotations examples: - url: https://www.iedb.org/assay/1357035 - reference: DOI:10.1093/nar/gky1006 + description: "Epitope ID: 59611 based on reference 1003499" + publications: + - id: https://doi.org/10.1093/nar/gky1006 + title: "The Immune Epitope Database (IEDB): 2018 update" activity_status: active --- diff --git a/ontology/nomen.md b/ontology/nomen.md index 899a3d125..04ace8435 100644 --- a/ontology/nomen.md +++ b/ontology/nomen.md @@ -24,8 +24,8 @@ build: system: git usages: - user: https://taxonworks.org - label: TaxonWorks seeAlso: https://github.com/SpeciesFileGroup/taxonworks + description: TaxonWorks is an integrated web-based workbench for taxonomists and biodiversity scientists. type: application mailing_list: https://groups.google.com/forum/#!forum/nomen-discuss tracker: https://github.com/SpeciesFileGroup/nomen/issues diff --git a/ontology/obi.md b/ontology/obi.md index f2e36e18e..a978329a8 100644 --- a/ontology/obi.md +++ b/ontology/obi.md @@ -41,12 +41,12 @@ browsers: usages: - user: http://upibi.org/turbo/ description: PennTURBO accelerates the processes of finding and connecting key information from clinical records, via semantic modeling of the processes that generated the data. This makes the discovery of previously unappreciated relations between the data possible for research and for operational tasks. - example: + examples: - url: https://github.com/PennTURBO/Turbo-Documentation/blob/master/IBI_CIC_TURBO_MAM_20190102.pdf description: "CYP2C1*2/*2 MI patient taking Clopidogrel" - user: http://evidenceontology.org/ description: The Evidence & Conclusion Ontology (ECO) describes types of scientific evidence within the biological research domain. ECO uses OBI to logically describe how the evidence arises from an investigation. - example: + examples: - url: http://purl.obolibrary.org/obo/ECO_0001820 description: "rapid amplification of cDNA ends polymerase chain reaction evidence" activity_status: active diff --git a/ontology/pato.md b/ontology/pato.md index 0b28b236b..e2da3cc2e 100644 --- a/ontology/pato.md +++ b/ontology/pato.md @@ -40,7 +40,10 @@ usages: description: PATO is used by the Human Phenotype Ontology (HPO) for logical definitions of phenotypes that facilitate cross-species integration. examples: - url: https://www.ebi.ac.uk/ols/ontologies/hp/terms?iri=http%3A%2F%2Fpurl.obolibrary.org%2Fobo%2FHP_0011017&viewMode=All&siblings=false - reference: https://www.ncbi.nlm.nih.gov/pmc/articles/PMC6324074/ + description: An abnormality in a cellular process. + publications: + - id: https://www.ncbi.nlm.nih.gov/pmc/articles/PMC6324074/ + title: "Expansion of the Human Phenotype Ontology (HPO) knowledge base and resources" activity_status: active --- diff --git a/ontology/po.md b/ontology/po.md index e740d669b..fa7cbbd8e 100644 --- a/ontology/po.md +++ b/ontology/po.md @@ -54,10 +54,12 @@ usages: description: Maize CELL genomics DB uses PO to annotate images examples: - url: http://maize.jcvi.org/cellgenomics/geneDB_list.php?filter=3 + description: LhG4 Promoter Drivers - user: http://maizegdb.org/ description: MaizeGDB uses PO for annotation of genes examples: - url: http://maizegdb.org/gene_center/gene/GRMZM5G863962 + description: Introduced in gene model set 5b in assembly version RefGen_v2. - user: http://gramene.org/ description: Gramene uses PO for the annotation of plant genes examples: diff --git a/ontology/ro.md b/ontology/ro.md index 1226cc4dc..ca263f155 100644 --- a/ontology/ro.md +++ b/ontology/ro.md @@ -53,13 +53,13 @@ license: usages: - user: http://geneontology.org type: annotation - description: RO is used for annotation extensions in the GO - reference: https://doi.org/10.1186/1471-2105-15-155 - - user: http://geneontology.org - type: annotation - description: RO is used for GO Causal Activity Models + description: RO is used for annotation extensions in the GO and GO Causal Activity Models. + publications: + - id: https://doi.org/10.1186/1471-2105-15-155 + title: "A method for increasing expressivity of Gene Ontology annotations using a compositional approach" examples: - - http://model.geneontology.org/56d1143000003402 + - url: http://model.geneontology.org/56d1143000003402 + description: wg_biogenesis_FlyBase activity_status: active --- diff --git a/ontology/uberon.md b/ontology/uberon.md index 7c40c3c77..7693a6317 100644 --- a/ontology/uberon.md +++ b/ontology/uberon.md @@ -31,7 +31,9 @@ usages: seeAlso: https://www.biosharing.org/biodbcore-000034 type: annotation description: The National Human Genome Research Institute (NHGRI) launched a public research consortium named ENCODE, the Encyclopedia Of DNA Elements, in September 2003, to carry out a project to identify all functional elements in the human genome sequence. The ENCODE DCC users Uberon to annotate samples - reference: https://doi.org/10.1093/database/bav010 + publications: + - id: https://doi.org/10.1093/database/bav010 + title: "Ontology application and use at the ENCODE DCC" - user: http://fantom5-collaboration.gsc.riken.jp/ type: annotation description: FANTOM5 is using Uberon and CL to annotate samples allowing for transcriptome analyses with cell-type and tissue-level specificity. @@ -42,30 +44,31 @@ usages: type: query description: Querying expression and phenotype data - user: https://geneontology.org/ - label: GO Database type: query - description: Querying for functional annotations relevant to a tissue + description: GO Database is used for querying for functional annotations relevant to a tissue examples: - url: http://amigo.geneontology.org/amigo/term/UBERON:0000955 description: GO annotations relevant to the uberon class for brain - user: http://phenoscape.org - label: Phenoscape description: The Phenoscape project is both a major driver of and contributor to Uberon, contibuting thousands of terms. The teleost (bony fishes) component of Uberon was derived from the Teleost Anatomy Ontology, developed by the Phenoscape group. Most of the high level design of the skeletal system comes from the Vertebrate Skeletal Anatomy Ontology (VSAO), also created by the Phenoscape group. Phenoscape curators continue to extend the ontology, covering a wide variety of tetrapod structures, with an emphasis on the appendicular system. - - url: https://neuinfo.org/ - label: Neuroscience Information Framework + - user: https://neuinfo.org/ + description: Searchable collection of neuroscience data and ontology for neuroscience type: Database - - url: https://scicrunch.org/ - label: SciCrunch + - user: https://scicrunch.org/ + description: "cooperative data platform to be used by diverse communities in making data more FAIR." type: Database - - url: http://single-cell.clst.riken.jp/ - label: SCPortalen - reference: https://doi.org/10.1093/nar/gkx949 + - user: http://single-cell.clst.riken.jp/ + description: SCPortalen + publications: + - id: https://doi.org/10.1093/nar/gkx949 + title: "SCPortalen: human and mouse single-cell centric database" type: Database - - url: https://www.ebi.ac.uk/chembl/ - label: ChEMBL + - user: https://www.ebi.ac.uk/chembl/ description: "ChEMBL uses Uberon to describe organ/tissue information in assays" - reference: https://doi.org/10.1093/nar/gky1075 type: Database + publications: + - id: https://doi.org/10.1093/nar/gky1075 + title: "ChEMBL: towards direct deposition of bioassay data" funded_by: - "NIH R24OD011883" - "NIH R01HG004838" diff --git a/ontology/upheno.md b/ontology/upheno.md index 73c33fb7b..8fcf39aaa 100644 --- a/ontology/upheno.md +++ b/ontology/upheno.md @@ -24,8 +24,11 @@ usages: type: analysis description: uPheno is used by the Monarch Initiative for cross-species inference. examples: - - url: https://monarchinitiative.org/phenotype/HP:0001300#diseases - reference: https://academic.oup.com/nar/article/45/D1/D712/2605791 + - url: https://monarchinitiative.org/phenotype/HP:0001300#disease + description: "Characteristic neurologic anomaly resulting form degeneration of dopamine-generating cells in the substantia nigra, a region of the midbrain, characterized clinically by shaking, rigidity, slowness of movement and difficulty with walking and gait." + publications: + - id: https://academic.oup.com/nar/article/45/D1/D712/2605791 + title: "The Monarch Initiative: an integrative data and analytic platform connecting phenotypes to genotypes across species " build: source_url: http://build.berkeleybop.org/job/build-pheno-ontologies/lastSuccessfulBuild/artifact/*zip*/archive.zip path: archive/ontology diff --git a/ontology/wbbt.md b/ontology/wbbt.md index c61284b40..e62740d63 100644 --- a/ontology/wbbt.md +++ b/ontology/wbbt.md @@ -32,7 +32,10 @@ usages: description: WormBase uses WBbt to curate anatomical expression patterns and anatomy function annotations, and to allow search and indexing on the WormBase site examples: - url: http://www.wormbase.org/db/get?name=WBGene00000912;class=Gene;widget=expression - reference: https://academic.oup.com/nar/article/48/D1/D762/5603222 + description: "Expression for gene daf-16 with WormBase ID WBGene00000912" + publications: + - id: https://academic.oup.com/nar/article/48/D1/D762/5603222 + title: "WormBase: a modern Model Organism Information Resource" activity_status: active --- diff --git a/ontology/wbls.md b/ontology/wbls.md index 5645d0887..ff6f7a639 100644 --- a/ontology/wbls.md +++ b/ontology/wbls.md @@ -32,7 +32,10 @@ usages: description: WormBase uses WBls to curate temporal expression patterns, and to allow search and indexing on the WormBase site examples: - url: http://www.wormbase.org/db/get?name=WBGene00000912;class=Gene;widget=expression - reference: https://academic.oup.com/nar/article/48/D1/D762/5603222 + description: Expression for daf-16 gene with WormBase ID WBGene00000912. + publications: + - id: https://academic.oup.com/nar/article/48/D1/D762/5603222 + title: "WormBase: a modern Model Organism Information Resource" activity_status: active --- diff --git a/ontology/wbphenotype.md b/ontology/wbphenotype.md index 54fd7d788..e78ab35ee 100644 --- a/ontology/wbphenotype.md +++ b/ontology/wbphenotype.md @@ -32,14 +32,20 @@ usages: type: annotation description: WormBase uses WBPhenotype to curate worm phenotypes, and to allow search and indexing on the WormBase site examples: - - url: http://www.wormbase.org/db/get?name=WBGene00000912;class=Gene;widget=phenotype - reference: https://academic.oup.com/nar/article/48/D1/D762/5603222 + - url: http://www.wormbase.org/db/get?name=WBGene00000912;class=Gene;widget=expression + description: Expression for daf-16 gene with WormBase ID WBGene00000912. + publications: + - id: https://academic.oup.com/nar/article/48/D1/D762/5603222 + title: "WormBase: a modern Model Organism Information Resource" - user: https://monarchinitiative.org/ type: annotation description: Monarch integrates phenotype annotations from sources such as WormBase, and allows for querying using the WBPhenotype ontology. examples: - url: https://monarchinitiative.org/phenotype/WBPhenotype%3A0000370 - reference: https://academic.oup.com/nar/article/45/D1/D712/2605791 + description: "Egg long: The fertilized oocytes have a greater than standard length measured end to end compared to control." + publications: + - id: https://academic.oup.com/nar/article/45/D1/D712/2605791 + title: "The Monarch Initiative: an integrative data and analytic platform connecting phenotypes to genotypes across species " activity_status: active --- diff --git a/ontology/zp.md b/ontology/zp.md index 1d6afe3e8..bb461cec9 100644 --- a/ontology/zp.md +++ b/ontology/zp.md @@ -36,6 +36,9 @@ usages: description: Monarch integrates phenotype annotations from sources such as ZFIIN, and allows for querying using the ZP ontology. examples: - url: https://monarchinitiative.org/phenotype/ZP:0005692 - reference: https://academic.oup.com/nar/article/45/D1/D712/2605791 + description: "adaxial cell absent, abnormal: Abnormal(ly) absent (of) adaxial cell." + publications: + - id: https://academic.oup.com/nar/article/45/D1/D712/2605791 + title: "The Monarch Initiative: an integrative data and analytic platform connecting phenotypes to genotypes across species" activity_status: active --- diff --git a/registry/ontologies.yml b/registry/ontologies.yml index b3ebcb348..6a2571901 100644 --- a/registry/ontologies.yml +++ b/registry/ontologies.yml @@ -330,14 +330,14 @@ ontologies: information from clinical records, via semantic modeling of the processes that generated the data. This makes the discovery of previously unappreciated relations between the data possible for research and for operational tasks. - example: + examples: - description: CYP2C1*2/*2 MI patient taking Clopidogrel url: https://github.com/PennTURBO/Turbo-Documentation/blob/master/IBI_CIC_TURBO_MAM_20190102.pdf user: http://upibi.org/turbo/ - description: The Evidence & Conclusion Ontology (ECO) describes types of scientific evidence within the biological research domain. ECO uses OBI to logically describe how the evidence arises from an investigation. - example: + examples: - description: rapid amplification of cDNA ends polymerase chain reaction evidence url: http://purl.obolibrary.org/obo/ECO_0001820 user: http://evidenceontology.org/ @@ -388,8 +388,11 @@ ontologies: - description: PATO is used by the Human Phenotype Ontology (HPO) for logical definitions of phenotypes that facilitate cross-species integration. examples: - - url: https://www.ebi.ac.uk/ols/ontologies/hp/terms?iri=http%3A%2F%2Fpurl.obolibrary.org%2Fobo%2FHP_0011017&viewMode=All&siblings=false - reference: https://www.ncbi.nlm.nih.gov/pmc/articles/PMC6324074/ + - description: An abnormality in a cellular process. + url: https://www.ebi.ac.uk/ols/ontologies/hp/terms?iri=http%3A%2F%2Fpurl.obolibrary.org%2Fobo%2FHP_0011017&viewMode=All&siblings=false + publications: + - id: https://www.ncbi.nlm.nih.gov/pmc/articles/PMC6324074/ + title: Expansion of the Human Phenotype Ontology (HPO) knowledge base and resources type: annotation user: https://hpo.jax.org/app/ - activity_status: active @@ -455,11 +458,13 @@ ontologies: user: http://planteome.org/ - description: Maize CELL genomics DB uses PO to annotate images examples: - - url: http://maize.jcvi.org/cellgenomics/geneDB_list.php?filter=3 + - description: LhG4 Promoter Drivers + url: http://maize.jcvi.org/cellgenomics/geneDB_list.php?filter=3 user: http://maize.jcvi.org/ - description: MaizeGDB uses PO for annotation of genes examples: - - url: http://maizegdb.org/gene_center/gene/GRMZM5G863962 + - description: Introduced in gene model set 5b in assembly version RefGen_v2. + url: http://maizegdb.org/gene_center/gene/GRMZM5G863962 user: http://maizegdb.org/ - description: Gramene uses PO for the annotation of plant genes examples: @@ -1027,6 +1032,27 @@ ontologies: ontology_purl: http://purl.obolibrary.org/obo/cido.owl title: Coronavirus Infectious Disease Ontology tracker: https://github.com/cido-ontology/cido/issues +- activity_status: active + contact: + email: bgee@sib.swiss + github: fbastian + label: Frederic Bastian + description: An ontology to capture confidence information about annotations. + homepage: https://github.com/BgeeDB/confidence-information-ontology + id: cio + layout: ontology_detail + license: + label: CC0 + logo: http://mirrors.creativecommons.org/presskit/buttons/80x15/png/cc-zero.png + url: https://creativecommons.org/publicdomain/zero/1.0/ + ontology_purl: http://purl.obolibrary.org/obo/cio.owl + products: + - id: cio.owl + ontology_purl: http://purl.obolibrary.org/obo/cio.owl + - id: cio.obo + ontology_purl: http://purl.obolibrary.org/obo/cio.obo + title: Confidence Information Ontology + tracker: https://github.com/BgeeDB/confidence-information-ontology - activity_status: active build: checkout: git clone https://github.com/obophenotype/cell-ontology.git @@ -1105,7 +1131,9 @@ ontologies: research consortium named ENCODE, the Encyclopedia Of DNA Elements, in September 2003, to carry out a project to identify all functional elements in the human genome sequence. The ENCODE DCC users Uberon to annotate samples - reference: https://doi.org/10.1093/database/bav010 + publications: + - id: https://doi.org/10.1093/database/bav010 + title: Ontology application and use at the ENCODE DCC seeAlso: https://www.biosharing.org/biodbcore-000034 type: annotation user: https://www.encodeproject.org/ @@ -1486,7 +1514,7 @@ ontologies: tracker: https://github.com/FlyBase/drosophila-phenotype-ontology/issues usages: - description: FlyBase uses dpo for phenotype data annotation in Drosophila - example: + examples: - description: alleles and constructs annotated to pupal lethal in FlyBase url: http://flybase.org/cgi-bin/cvreport.html?rel=is_a&id=FBcv:0002030 user: http://flybase.org @@ -1622,8 +1650,15 @@ ontologies: - description: ECO is used by the Monarch Initiative for evidence types for disease to phenotype annotations. examples: - - url: https://monarchinitiative.org/phenotype/HP%3A0001300#diseases - reference: https://academic.oup.com/nar/article/45/D1/D712/2605791 + - description: 'Parkinsonism: Characteristic neurologic anomaly resulting form + degeneration of dopamine-generating cells in the substantia nigra, a region + of the midbrain, characterized clinically by shaking, rigidity, slowness of + movement and difficulty with walking and gait.' + url: https://monarchinitiative.org/phenotype/HP%3A0001300#disease + publications: + - id: https://academic.oup.com/nar/article/45/D1/D712/2605791 + title: 'The Monarch Initiative: an integrative data and analytic platform connecting + phenotypes to genotypes across species' type: annotation user: https://monarchinitiative.org/ - activity_status: active @@ -1839,39 +1874,33 @@ ontologies: usages: - description: describing species habitats examples: + - description: Pseudobarbus burchelli (Tradou Redfin) is a species of bony fishes + in the family Cyprinidae. They are associated with freshwater habitat. Individuals + can grow to 13.5 cm. They have sexual reproduction. url: http://eol.org/pages/211700/data - resources: - label: EOL - url: http://eol.org type: data-annotation - - datasets: - url: https://s3.amazonaws.com/globi/snapshot/target/data/taxa/interactions.csv.gz - description: describing stomach contents - resources: - label: GloBI - url: http://globalbioticinteractions.org + user: http://eol.org + - description: describing stomach contents type: data-annotation + user: http://globalbioticinteractions.org - description: annotating datasets in data repositories - resources: - label: Nature Scientific Data - url: http://www.nature.com/sdata/ - search: http://scientificdata.isa-explorer.org/ seeAlso: http://blogs.nature.com/scientificdata/2015/12/17/isa-explorer/ type: dataset-description + user: http://www.nature.com/sdata/ - description: Samples collected during Tara Oceans expedition are annotated with ENVO - example: + examples: - description: Sample collected during the Tara Oceans expedition (2009-2013) at station TARA_004 (latitudeN=36.5533, longitudeE=-6.5669) url: https://www.ebi.ac.uk/metagenomics/projects/ERP001736/samples/ERS487899 user: http://oceans.taraexpeditions.org/en/ - description: Annotation of habitats of microbes - example: + examples: - description: Annotation of habitat of Pseudovibrio sp. FO-BEG1 to marine environment url: https://www.ncbi.nlm.nih.gov/nuccore/NC_016642 user: https://www.ncbi.nlm.nih.gov/ - description: Annotation and semantic search over microbial data sets - example: + examples: - description: Example metadata of a sample of marine water near Lisboa, taken as part of the Ocean Sampling Day Project (https://www.microb3.eu/osd.html). ENVO is used for the fields environmental feature, material, and biome. @@ -1931,6 +1960,7 @@ ontologies: url: https://creativecommons.org/licenses/by/4.0/ ontology_purl: http://purl.obolibrary.org/obo/exo.owl page: http://ctdbase.org/downloads/#exposures + preferredPrefix: ExO products: - id: exo.owl ontology_purl: http://purl.obolibrary.org/obo/exo.owl @@ -2048,18 +2078,15 @@ ontologies: tracker: http://purl.obolibrary.org/obo/fbbt/tracker usages: - description: VFB uses FBbt to annotate brain images - example: + examples: - description: Ring neuron R2 in VFB url: http://www.virtualflybrain.org/site/stacks/index.htm?id=FBbt_00003651 - user: http://www.virtualflybrain.org/ - - description: VFB uses FBbt to annotate brain images - example: - description: genes expressed in ring neuron R2 in VFB url: http://www.virtualflybrain.org/do/gene_list.html?action=geneex&id=FBbt:00003651 user: http://www.virtualflybrain.org/ - description: Flybase uses FBbt for expression and phenotype data annotation in Drosophila - example: + examples: - description: alleles, constructs and insertions annotated to neuron in FlyBase url: http://flybase.org/cgi-bin/cvreport.html?rel=is_a&id=FBbt:00005106 user: http://flybase.org @@ -2098,7 +2125,7 @@ ontologies: tracker: https://github.com/FlyBase/flybase-controlled-vocabulary/issues usages: - description: FlyBase uses FBcv for phenotype data annotation in Drosophila - example: + examples: - description: alleles and constructs annotated to bang sensitive in FlyBase url: http://flybase.org/cgi-bin/cvreport.html?rel=is_a&id=FBcv:0000391 user: http://flybase.org @@ -2346,7 +2373,7 @@ ontologies: tracker: https://github.com/pombase/fypo/issues usages: - description: Pombase uses fypo for phenotype data annotation in fission yeast - example: + examples: - description: genotypes annotated to abnormal mitotic cell cycle in fission yeast url: https://www.pombase.org/term/FYPO:0000059 user: https://www.pombase.org @@ -2550,17 +2577,26 @@ ontologies: of many experimental variables available in EBI databases, and for external projects such as the NHGRI GWAS catalogue. It combines parts of several biological ontologies, such as anatomy, disease and chemical compounds. - example: https://www.ebi.ac.uk/ols/ontologies/efo/terms?iri=http%3A%2F%2Fpurl.obolibrary.org%2Fobo%2FHANCESTRO_0004&viewMode=All&siblings=false + examples: + - description: Population category defined using ancestry informative markers + (AIMs) based on genetic/genomic data + url: https://www.ebi.ac.uk/ols/ontologies/efo/terms?iri=http%3A%2F%2Fpurl.obolibrary.org%2Fobo%2FHANCESTRO_0004&viewMode=All&siblings=false user: http://www.ebi.ac.uk/efo - description: The Genomic Epidemiology Ontology (GenEpiO) covers vocabulary necessary to identify, document and research foodborne pathogens and associated outbreaks. - example: https://www.ebi.ac.uk/ols/ontologies/genepio/terms?iri=http%3A%2F%2Fpurl.obolibrary.org%2Fobo%2FHANCESTRO_0004&viewMode=All&siblings=false + examples: + - description: Population category defined using ancestry informative markers + (AIMs) based on genetic/genomic data + url: https://www.ebi.ac.uk/ols/ontologies/genepio/terms?iri=http%3A%2F%2Fpurl.obolibrary.org%2Fobo%2FHANCESTRO_0004&viewMode=All&siblings=false user: https://genepio.org/ - description: FoodOn (http://foodon.org) is a consortium-driven project to build a comprehensive and easily accessible global farm-to-fork ontology about food, that accurately and consistently describes foods commonly known in cultures from around the world. - example: https://www.ebi.ac.uk/ols/ontologies/foodon/terms?iri=http%3A%2F%2Fpurl.obolibrary.org%2Fobo%2FHANCESTRO_0004&viewMode=All&siblings=false + examples: + - description: Population category defined using ancestry informative markers + (AIMs) based on genetic/genomic data + url: https://www.ebi.ac.uk/ols/ontologies/foodon/terms?iri=http%3A%2F%2Fpurl.obolibrary.org%2Fobo%2FHANCESTRO_0004&viewMode=All&siblings=false user: http://foodon.org - activity_status: active build: @@ -2608,9 +2644,9 @@ ontologies: id: hom layout: ontology_detail license: - label: CC-BY - logo: http://mirrors.creativecommons.org/presskit/buttons/80x15/png/by.png - url: http://creativecommons.org/licenses/by/3.0/ + label: CC0 + logo: http://mirrors.creativecommons.org/presskit/buttons/80x15/png/cc-zero.png + url: https://creativecommons.org/publicdomain/zero/1.0/ ontology_purl: http://purl.obolibrary.org/obo/hom.owl products: - id: hom.owl @@ -2635,6 +2671,7 @@ ontologies: url: http://creativecommons.org/licenses/by/3.0/ ontology_purl: http://purl.obolibrary.org/obo/hsapdv.owl page: https://github.com/obophenotype/developmental-stage-ontologies + preferredPrefix: HsapDv products: - id: hsapdv.owl ontology_purl: http://purl.obolibrary.org/obo/hsapdv.owl @@ -3205,6 +3242,7 @@ ontologies: url: http://creativecommons.org/licenses/by/3.0/ ontology_purl: http://purl.obolibrary.org/obo/mmusdv.owl page: https://github.com/obophenotype/developmental-stage-ontologies + preferredPrefix: MmusDv products: - id: mmusdv.owl ontology_purl: http://purl.obolibrary.org/obo/mmusdv.owl @@ -3299,8 +3337,15 @@ ontologies: usages: - description: Mondo is used by the Monarch Initiative for disease annotations. examples: - - url: https://monarchinitiative.org/phenotype/HP:0001300#diseases - reference: https://academic.oup.com/nar/article/45/D1/D712/2605791 + - description: 'Parkinsonism: Characteristic neurologic anomaly resulting form + degeneration of dopamine-generating cells in the substantia nigra, a region + of the midbrain, characterized clinically by shaking, rigidity, slowness of + movement and difficulty with walking and gait.' + url: https://monarchinitiative.org/phenotype/HP:0001300#disease + publications: + - id: https://academic.oup.com/nar/article/45/D1/D712/2605791 + title: 'The Monarch Initiative: an integrative data and analytic platform connecting + phenotypes to genotypes across species ' type: annotation user: https://monarchinitiative.org/ - activity_status: active @@ -3459,10 +3504,50 @@ ontologies: usages: - description: MRO is used by the The Immune Epitope Database (IEDB) annotations examples: - - url: https://www.iedb.org/assay/1357035 - reference: DOI:10.1093/nar/gky1006 + - description: 'Epitope ID: 59611 based on reference 1003499' + url: https://www.iedb.org/assay/1357035 + publications: + - id: https://doi.org/10.1093/nar/gky1006 + title: 'The Immune Epitope Database (IEDB): 2018 update' type: annotation user: https://www.iedb.org/ +- activity_status: active + build: + method: obo2owl + source_url: https://raw.githubusercontent.com/HUPO-PSI/psi-ms-CV/master/psi-ms.obo + contact: + email: gerhard.mayer@rub.de + label: Gerhard Mayer + createdWith: http://oboedit.org + dependencies: + - id: pato + - id: uo + description: A structured controlled vocabulary for the annotation of experiments + concerned with proteomics mass spectrometry. + domain: MS experiments + homepage: http://www.psidev.info/groups/controlled-vocabularies + id: ms + integration_server: https://raw.githubusercontent.com/HUPO-PSI/psi-ms-CV/master + label: MS + layout: ontology_detail + license: + label: CC-BY + logo: http://mirrors.creativecommons.org/presskit/buttons/80x15/png/by.png + url: https://creativecommons.org/licenses/by/3.0/ + mailing_list: psidev-ms-vocab@lists.sourceforge.net + ontology_purl: http://purl.obolibrary.org/obo/ms.owl + page: http://www.psidev.info/groups/controlled-vocabularies + products: + - id: ms.obo + ontology_purl: http://purl.obolibrary.org/obo/ms.obo + - id: ms.owl + ontology_purl: http://purl.obolibrary.org/obo/ms.owl + publications: + - id: http://www.ncbi.nlm.nih.gov/pubmed/23482073 + title: The HUPO proteomics standards initiative- mass spectrometry controlled + vocabulary. + title: Mass spectrometry ontology + tracker: https://github.com/HUPO-PSI/psi-ms-CV/issues - activity_status: active browsers: - label: BioPortal @@ -3643,7 +3728,8 @@ ontologies: tracker: https://github.com/SpeciesFileGroup/nomen/issues type: owl:Ontology usages: - - label: TaxonWorks + - description: TaxonWorks is an integrated web-based workbench for taxonomists and + biodiversity scientists. seeAlso: https://github.com/SpeciesFileGroup/taxonworks type: application user: https://taxonworks.org @@ -3926,6 +4012,7 @@ ontologies: url: http://creativecommons.org/licenses/by/3.0/ ontology_purl: http://purl.obolibrary.org/obo/olatdv.owl page: https://github.com/obophenotype/developmental-stage-ontologies + preferredPrefix: OlatDv products: - id: olatdv.obo ontology_purl: http://purl.obolibrary.org/obo/olatdv.obo @@ -4097,6 +4184,7 @@ ontologies: domain: nutrition, nutritional studies, nutrition professionals homepage: https://github.com/enpadasi/Ontology-for-Nutritional-Studies id: ons + label: Ontology for Nutritional Studies layout: ontology_detail license: label: CC-BY @@ -4108,7 +4196,7 @@ ontologies: - id: ons.owl ontology_purl: http://purl.obolibrary.org/obo/ons.owl title: ONS latest release - title: ONS + title: Ontology for Nutritional Studies tracker: https://github.com/enpadasi/Ontology-for-Nutritional-Studies/issues - activity_status: active browsers: @@ -4322,6 +4410,7 @@ ontologies: url: http://creativecommons.org/licenses/by/3.0/ ontology_purl: http://purl.obolibrary.org/obo/pdumdv.owl page: https://github.com/obophenotype/developmental-stage-ontologies + preferredPrefix: PdumDv products: - id: pdumdv.owl ontology_purl: http://purl.obolibrary.org/obo/pdumdv.owl @@ -4671,13 +4760,15 @@ ontologies: title: Relation Ontology tracker: https://github.com/oborel/obo-relations/issues usages: - - description: RO is used for annotation extensions in the GO - reference: https://doi.org/10.1186/1471-2105-15-155 - type: annotation - user: http://geneontology.org - - description: RO is used for GO Causal Activity Models + - description: RO is used for annotation extensions in the GO and GO Causal Activity + Models. examples: - - http://model.geneontology.org/56d1143000003402 + - description: wg_biogenesis_FlyBase + url: http://model.geneontology.org/56d1143000003402 + publications: + - id: https://doi.org/10.1186/1471-2105-15-155 + title: A method for increasing expressivity of Gene Ontology annotations using + a compositional approach type: annotation user: http://geneontology.org - activity_status: active @@ -4853,6 +4944,31 @@ ontologies: ontology_purl: http://purl.obolibrary.org/obo/stato.owl title: The Statistical Methods Ontology tracker: https://github.com/ISA-tools/stato/issues +- activity_status: active + build: + method: owl2obo + source_url: https://raw.githubusercontent.com/allysonlister/swo/master/release/swo_inferred.owl + contact: + email: allyson.lister@oerc.ox.ac.uk + label: Allyson Lister + description: The Software Ontology (SWO) is a resource for describing software tools, + their types, tasks, versions, provenance and associated data. It contains detailed + information on licensing and formats as well as software applications themselves, + mainly (but not limited) to the bioinformatics community. + domain: software + homepage: https://github.com/allysonlister/swo + id: swo + layout: ontology_detail + license: + label: CC BY 4.0 + logo: http://mirrors.creativecommons.org/presskit/buttons/80x15/png/by.png + url: https://creativecommons.org/licenses/by/4.0/ + ontology_purl: http://purl.obolibrary.org/obo/swo.owl + products: + - id: swo.owl + ontology_purl: http://purl.obolibrary.org/obo/swo.owl + title: Software ontology + tracker: https://github.com/allysonlister/swo/issues - activity_status: active build: infallible: 1 @@ -5191,7 +5307,9 @@ ontologies: research consortium named ENCODE, the Encyclopedia Of DNA Elements, in September 2003, to carry out a project to identify all functional elements in the human genome sequence. The ENCODE DCC users Uberon to annotate samples - reference: https://doi.org/10.1093/database/bav010 + publications: + - id: https://doi.org/10.1093/database/bav010 + title: Ontology application and use at the ENCODE DCC seeAlso: https://www.biosharing.org/biodbcore-000034 type: annotation user: https://www.encodeproject.org/ @@ -5205,11 +5323,11 @@ ontologies: - description: Querying expression and phenotype data type: query user: https://monarchinitiative.org/ - - description: Querying for functional annotations relevant to a tissue + - description: GO Database is used for querying for functional annotations relevant + to a tissue examples: - description: GO annotations relevant to the uberon class for brain url: http://amigo.geneontology.org/amigo/term/UBERON:0000955 - label: GO Database type: query user: https://geneontology.org/ - description: The Phenoscape project is both a major driver of and contributor @@ -5219,23 +5337,26 @@ ontologies: Skeletal Anatomy Ontology (VSAO), also created by the Phenoscape group. Phenoscape curators continue to extend the ontology, covering a wide variety of tetrapod structures, with an emphasis on the appendicular system. - label: Phenoscape user: http://phenoscape.org - - label: Neuroscience Information Framework + - description: Searchable collection of neuroscience data and ontology for neuroscience type: Database - url: https://neuinfo.org/ - - label: SciCrunch + user: https://neuinfo.org/ + - description: cooperative data platform to be used by diverse communities in making + data more FAIR. type: Database - url: https://scicrunch.org/ - - label: SCPortalen - reference: https://doi.org/10.1093/nar/gkx949 + user: https://scicrunch.org/ + - description: SCPortalen + publications: + - id: https://doi.org/10.1093/nar/gkx949 + title: 'SCPortalen: human and mouse single-cell centric database' type: Database - url: http://single-cell.clst.riken.jp/ + user: http://single-cell.clst.riken.jp/ - description: ChEMBL uses Uberon to describe organ/tissue information in assays - label: ChEMBL - reference: https://doi.org/10.1093/nar/gky1075 + publications: + - id: https://doi.org/10.1093/nar/gky1075 + title: 'ChEMBL: towards direct deposition of bioassay data' type: Database - url: https://www.ebi.ac.uk/chembl/ + user: https://www.ebi.ac.uk/chembl/ wikidata_template: https://en.wikipedia.org/wiki/Template:Uberon - activity_status: active build: @@ -5293,8 +5414,15 @@ ontologies: usages: - description: uPheno is used by the Monarch Initiative for cross-species inference. examples: - - url: https://monarchinitiative.org/phenotype/HP:0001300#diseases - reference: https://academic.oup.com/nar/article/45/D1/D712/2605791 + - description: Characteristic neurologic anomaly resulting form degeneration of + dopamine-generating cells in the substantia nigra, a region of the midbrain, + characterized clinically by shaking, rigidity, slowness of movement and difficulty + with walking and gait. + url: https://monarchinitiative.org/phenotype/HP:0001300#disease + publications: + - id: https://academic.oup.com/nar/article/45/D1/D712/2605791 + title: 'The Monarch Initiative: an integrative data and analytic platform connecting + phenotypes to genotypes across species ' type: analysis user: https://monarchinitiative.org/ - activity_status: active @@ -5318,6 +5446,28 @@ ontologies: ontology_purl: http://purl.obolibrary.org/obo/vo.owl title: Vaccine Ontology tracker: https://github.com/vaccineontology/VO/issues +- activity_status: active + build: + checkout: svn co http://phenotype-ontologies.googlecode.com/svn/trunk/src/ontology/vt + method: vcs + system: svn + contact: + email: caripark@iastate.edu + label: Carissa Park + description: An ontology of traits covering vertebrates + homepage: https://github.com/AnimalGenome/vertebrate-trait-ontology + id: vt + layout: ontology_detail + license: + label: CC BY 4.0 + logo: http://mirrors.creativecommons.org/presskit/buttons/80x15/png/by.png + url: https://creativecommons.org/licenses/by/4.0/ + ontology_purl: http://purl.obolibrary.org/obo/vt.owl + products: + - id: vt.owl + ontology_purl: http://purl.obolibrary.org/obo/vt.owl + title: Vertebrate trait ontology + tracker: https://github.com/AnimalGenome/vertebrate-trait-ontology/issues - activity_status: active contact: email: balhoff@renci.org @@ -5381,8 +5531,11 @@ ontologies: - description: WormBase uses WBbt to curate anatomical expression patterns and anatomy function annotations, and to allow search and indexing on the WormBase site examples: - - url: http://www.wormbase.org/db/get?name=WBGene00000912;class=Gene;widget=expression - reference: https://academic.oup.com/nar/article/48/D1/D762/5603222 + - description: Expression for gene daf-16 with WormBase ID WBGene00000912 + url: http://www.wormbase.org/db/get?name=WBGene00000912;class=Gene;widget=expression + publications: + - id: https://academic.oup.com/nar/article/48/D1/D762/5603222 + title: 'WormBase: a modern Model Organism Information Resource' type: annotation user: https://www.wormbase.org/ - activity_status: active @@ -5422,8 +5575,11 @@ ontologies: - description: WormBase uses WBls to curate temporal expression patterns, and to allow search and indexing on the WormBase site examples: - - url: http://www.wormbase.org/db/get?name=WBGene00000912;class=Gene;widget=expression - reference: https://academic.oup.com/nar/article/48/D1/D762/5603222 + - description: Expression for daf-16 gene with WormBase ID WBGene00000912. + url: http://www.wormbase.org/db/get?name=WBGene00000912;class=Gene;widget=expression + publications: + - id: https://academic.oup.com/nar/article/48/D1/D762/5603222 + title: 'WormBase: a modern Model Organism Information Resource' type: annotation user: https://www.wormbase.org/ - activity_status: active @@ -5466,15 +5622,23 @@ ontologies: - description: WormBase uses WBPhenotype to curate worm phenotypes, and to allow search and indexing on the WormBase site examples: - - url: http://www.wormbase.org/db/get?name=WBGene00000912;class=Gene;widget=phenotype - reference: https://academic.oup.com/nar/article/48/D1/D762/5603222 + - description: Expression for daf-16 gene with WormBase ID WBGene00000912. + url: http://www.wormbase.org/db/get?name=WBGene00000912;class=Gene;widget=expression + publications: + - id: https://academic.oup.com/nar/article/48/D1/D762/5603222 + title: 'WormBase: a modern Model Organism Information Resource' type: annotation user: https://www.wormbase.org/ - description: Monarch integrates phenotype annotations from sources such as WormBase, and allows for querying using the WBPhenotype ontology. examples: - - url: https://monarchinitiative.org/phenotype/WBPhenotype%3A0000370 - reference: https://academic.oup.com/nar/article/45/D1/D712/2605791 + - description: 'Egg long: The fertilized oocytes have a greater than standard + length measured end to end compared to control.' + url: https://monarchinitiative.org/phenotype/WBPhenotype%3A0000370 + publications: + - id: https://academic.oup.com/nar/article/45/D1/D712/2605791 + title: 'The Monarch Initiative: an integrative data and analytic platform connecting + phenotypes to genotypes across species ' type: annotation user: https://monarchinitiative.org/ - activity_status: active @@ -5512,6 +5676,34 @@ ontologies: ontologies: expansion, improvements and new applications.' title: Experimental condition ontology tracker: https://github.com/rat-genome-database/XCO-experimental-condition-ontology/issues +- activity_status: active + build: + method: obo2owl + source_url: https://raw.githubusercontent.com/HUPO-PSI/mzIdentML/master/cv/XLMOD.obo + contact: + email: gerhard.mayer@rub.de + label: Gerhard Mayer + createdWith: http://oboedit.org + description: A structured controlled vocabulary for cross-linking reagents used + with proteomics mass spectrometry. + domain: MS cross-linker reagents + homepage: http://www.psidev.info/groups/controlled-vocabularies + id: xlmod + integration_server: https://raw.githubusercontent.com/HUPO-PSI/mzIdentML/tree/master/cv + label: xlmod + layout: ontology_detail + license: + label: CC-BY + logo: http://mirrors.creativecommons.org/presskit/buttons/80x15/png/by.png + url: https://creativecommons.org/licenses/by/3.0/ + mailing_list: psidev-ms-vocab@lists.sourceforge.net + ontology_purl: http://purl.obolibrary.org/obo/xlmod.owl + page: http://www.psidev.info/groups/controlled-vocabularies + products: + - id: xlmod.obo + ontology_purl: http://purl.obolibrary.org/obo/xlmod.obo + title: HUPO-PSI cross-linking and derivatization reagents controlled vocabulary + tracker: https://github.com/HUPO-PSI/mzIdentML/issues - activity_status: active build: checkout: git clone https://github.com/obophenotype/xenopus-phenotype-ontology.git @@ -5625,30 +5817,15 @@ ontologies: - description: Monarch integrates phenotype annotations from sources such as ZFIIN, and allows for querying using the ZP ontology. examples: - - url: https://monarchinitiative.org/phenotype/ZP:0005692 - reference: https://academic.oup.com/nar/article/45/D1/D712/2605791 + - description: 'adaxial cell absent, abnormal: Abnormal(ly) absent (of) adaxial + cell.' + url: https://monarchinitiative.org/phenotype/ZP:0005692 + publications: + - id: https://academic.oup.com/nar/article/45/D1/D712/2605791 + title: 'The Monarch Initiative: an integrative data and analytic platform connecting + phenotypes to genotypes across species' type: annotation user: https://monarchinitiative.org/ -- activity_status: active - contact: - email: bgee@sib.swiss - github: fbastian - label: Frederic Bastian - description: An ontology to capture confidence information about annotations. - homepage: https://github.com/BgeeDB/confidence-information-ontology - id: cio - layout: ontology_detail - license: - label: GNU GPL 3.0 - url: https://www.gnu.org/licenses/gpl-3.0.en.html - ontology_purl: http://purl.obolibrary.org/obo/cio.owl - products: - - id: cio.owl - ontology_purl: http://purl.obolibrary.org/obo/cio.owl - - id: cio.obo - ontology_purl: http://purl.obolibrary.org/obo/cio.obo - title: Confidence Information Ontology - tracker: https://github.com/BgeeDB/confidence-information-ontology - activity_status: active build: method: owl2obo @@ -5832,42 +6009,6 @@ ontologies: ontology_purl: http://purl.obolibrary.org/obo/mamo.owl title: Mathematical modeling ontology tracker: http://sourceforge.net/p/mamo-ontology/tickets/ -- activity_status: active - build: - method: obo2owl - source_url: https://raw.githubusercontent.com/HUPO-PSI/psi-ms-CV/master/psi-ms.obo - contact: - email: gerhard.mayer@rub.de - label: Gerhard Mayer - createdWith: http://oboedit.org - dependencies: - - id: pato - - id: uo - description: A structured controlled vocabulary for the annotation of experiments - concerned with proteomics mass spectrometry. - domain: MS experiments - homepage: http://www.psidev.info/groups/controlled-vocabularies - id: ms - integration_server: https://raw.githubusercontent.com/HUPO-PSI/psi-ms-CV/master - label: MS - layout: ontology_detail - license: - label: CC-BY - logo: http://mirrors.creativecommons.org/presskit/buttons/80x15/png/by.png - url: https://creativecommons.org/licenses/by/3.0/ - mailing_list: psidev-ms-vocab@lists.sourceforge.net - ontology_purl: http://purl.obolibrary.org/obo/ms.owl - page: http://www.psidev.info/groups/controlled-vocabularies - products: - - id: ms.obo - ontology_purl: http://purl.obolibrary.org/obo/ms.obo - - id: ms.owl - ontology_purl: http://purl.obolibrary.org/obo/ms.owl - publications: - - id: http://www.ncbi.nlm.nih.gov/pubmed/23482073 - title: The HUPO proteomics standards initiative- mass spectrometry controlled - vocabulary. - title: Mass spectrometry ontology - activity_status: active build: insert_ontology_id: true @@ -5891,30 +6032,6 @@ ontologies: ontology_purl: http://purl.obolibrary.org/obo/sbo.owl title: Systems Biology Ontology tracker: https://sourceforge.net/p/sbo/term-request/ -- activity_status: active - build: - method: owl2obo - source_url: https://raw.githubusercontent.com/allysonlister/swo/master/release/swo_inferred.owl - contact: - email: allyson.lister@oerc.ox.ac.uk - label: Allyson Lister - description: The Software Ontology (SWO) is a resource for describing software tools, - their types, tasks, versions, provenance and associated data. It contains detailed - information on licensing and formats as well as software applications themselves, - mainly (but not limited) to the bioinformatics community. - domain: software - homepage: https://github.com/allysonlister/swo - id: swo - layout: ontology_detail - license: - label: CC BY 4.0 - logo: http://mirrors.creativecommons.org/presskit/buttons/80x15/png/by.png - url: https://creativecommons.org/licenses/by/4.0/ - ontology_purl: http://purl.obolibrary.org/obo/swo.owl - products: - - id: swo.owl - ontology_purl: http://purl.obolibrary.org/obo/swo.owl - title: Software ontology - activity_status: active browsers: - label: BioPortal @@ -5937,61 +6054,13 @@ ontologies: license: label: CC-BY version 3.0 logo: http://mirrors.creativecommons.org/presskit/buttons/80x15/png/by.png - url: http://creativecommons.org/licenses/by/3.0/ + url: https://creativecommons.org/licenses/by/3.0/ ontology_purl: http://purl.obolibrary.org/obo/txpo.owl products: - id: txpo.owl ontology_purl: http://purl.obolibrary.org/obo/txpo.owl title: Toxic Process Ontology tracker: https://github.com/txpo-ontology/TXPO/issues -- activity_status: active - build: - checkout: svn co http://phenotype-ontologies.googlecode.com/svn/trunk/src/ontology/vt - method: vcs - system: svn - contact: - email: caripark@iastate.edu - label: Carissa Park - description: An ontology of traits covering vertebrates - homepage: https://github.com/AnimalGenome/vertebrate-trait-ontology - id: vt - layout: ontology_detail - license: - label: CC BY 4.0 - logo: http://mirrors.creativecommons.org/presskit/buttons/80x15/png/by.png - url: https://creativecommons.org/licenses/by/4.0/ - ontology_purl: http://purl.obolibrary.org/obo/vt.owl - products: - - id: vt.owl - ontology_purl: http://purl.obolibrary.org/obo/vt.owl - title: Vertebrate trait ontology -- activity_status: active - build: - method: obo2owl - source_url: https://raw.githubusercontent.com/HUPO-PSI/mzIdentML/master/cv/XLMOD.obo - contact: - email: gerhard.mayer@rub.de - label: Gerhard Mayer - createdWith: http://oboedit.org - description: A structured controlled vocabulary for cross-linking reagents used - with proteomics mass spectrometry. - domain: MS cross-linker reagents - homepage: http://www.psidev.info/groups/controlled-vocabularies - id: xlmod - integration_server: https://raw.githubusercontent.com/HUPO-PSI/mzIdentML/tree/master/cv - label: xlmod - layout: ontology_detail - license: - label: CC-BY - logo: http://mirrors.creativecommons.org/presskit/buttons/80x15/png/by.png - url: https://creativecommons.org/licenses/by/3.0/ - mailing_list: psidev-ms-vocab@lists.sourceforge.net - ontology_purl: http://purl.obolibrary.org/obo/xlmod.owl - page: http://www.psidev.info/groups/controlled-vocabularies - products: - - id: xlmod.obo - ontology_purl: http://purl.obolibrary.org/obo/xlmod.obo - title: HUPO-PSI cross-linking and derivatization reagents controlled vocabulary - activity_status: active build: infallible: 1 diff --git a/util/schema/registry_schema.json b/util/schema/registry_schema.json index 54f09e2dc..4f7b8595a 100644 --- a/util/schema/registry_schema.json +++ b/util/schema/registry_schema.json @@ -415,7 +415,60 @@ "suggest": false }, "usages": { - "suggest": false + "suggest": false, + "level": "error", + "description": "Information on usage of particular ontology.", + "type": "array", + "items": { + "type": "object", + "additionalProperties" : false, + "properties": { + "user": { + "type": "string", + "format": "uri" + }, + "type": { "type": "string" }, + "description": {"type":"string"}, + "seeAlso": { + "description": "secondary link to the user, such as a FAIR Sharing entry", + "type": "string", + "format": "uri" + }, + "examples": { + "description": "specific page showing how the ontology is used by that user/resource", + "type": "array", + "items": { + "type": "object", + "additionalProperties" : false, + "properties": { + "url": { + "type": "string", + "format": "uri" + }, + "description": {"type": "string"} + }, + "required": ["url", "description"] + } + }, + "publications": { + "description": "how the user uses the ontology, not specific examples of use", + "type": "array", + "items": { + "type": "object", + "additionalProperties" : false, + "properties": { + "id": { + "type": "string", + "format": "uri" + }, + "title": {"type": "string"} + }, + "required": ["id", "title"] + } + } + }, + "required": ["user", "description"] + } }, "used_by": { "suggest": false @@ -438,4 +491,3 @@ "title", "tracker"], "level": "error" } - diff --git a/util/validate-metadata.py b/util/validate-metadata.py index a0f74806e..0e60754fb 100755 --- a/util/validate-metadata.py +++ b/util/validate-metadata.py @@ -79,7 +79,7 @@ def get_schema(): with open(file, 'r') as s: schema = json.load(s) except Exception as e: - print('Unable to load %s: %s' % (f, str(e))) + print('Unable to load %s: %s' % (file, str(e))) return schema
mars-project__mars-126
[ { "content": "#!/usr/bin/env python\n# -*- coding: utf-8 -*-\n# Copyright 1999-2018 Alibaba Group Holding Ltd.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\n\nimport itertools\nfrom operator import attrgetter, mul\nfrom weakref import WeakKeyDictionary, ref\nfrom collections import Iterable\nimport threading\n\nimport numpy as np\n\nfrom ..core import Entity\nfrom ..compat import builtins, reduce\nfrom ..graph import DAG\nfrom ..tiles import Tilesable, handler\nfrom ..serialize import SerializableWithKey, ValueType, ProviderType, \\\n ListField, TupleField, DictField, DataTypeField, KeyField, BoolField\nfrom ..utils import AttributeDict, on_serialize_shape, on_deserialize_shape, tokenize\nfrom .expressions.utils import get_chunk_slices\n\n\nclass ChunkData(SerializableWithKey):\n __slots__ = '__weakref__',\n\n # required fields\n _shape = TupleField('shape', ValueType.int64,\n on_serialize=on_serialize_shape, on_deserialize=on_deserialize_shape)\n _op = KeyField('op') # store key of operand here\n # optional fields\n _dtype = DataTypeField('dtype')\n _index = TupleField('index', ValueType.uint32)\n _cached = BoolField('cached')\n _composed = ListField('composed', ValueType.reference('self'))\n _params = DictField('params', key_type=ValueType.string, on_deserialize=AttributeDict)\n\n def __init__(self, *args, **kwargs):\n extras = AttributeDict((k, kwargs.pop(k)) for k in set(kwargs) - set(self.__slots__))\n kwargs['_params'] = kwargs.pop('_params', extras)\n super(ChunkData, self).__init__(*args, **kwargs)\n\n def __repr__(self):\n return 'Chunk <op={0}, key={1}>'.format(self.op.__class__.__name__, self.key)\n\n @classmethod\n def cls(cls, provider):\n if provider.type == ProviderType.protobuf:\n from ..serialize.protos.chunk_pb2 import ChunkDef\n return ChunkDef\n return super(ChunkData, cls).cls(provider)\n\n @property\n def shape(self):\n return getattr(self, '_shape', None)\n\n @property\n def ndim(self):\n return len(self.shape)\n\n @property\n def index(self):\n return getattr(self, '_index', None)\n\n @property\n def op(self):\n try:\n return self._op\n except AttributeError:\n return None\n\n @property\n def cached(self):\n return getattr(self, '_cached', None)\n\n @property\n def inputs(self):\n return self.op.inputs\n\n @inputs.setter\n def inputs(self, new_inputs):\n self.op.inputs = new_inputs\n\n @property\n def dtype(self):\n return getattr(self, '_dtype', None) or self.op.dtype\n\n @property\n def nbytes(self):\n return np.prod(self.shape) * self.dtype.itemsize\n\n @property\n def composed(self):\n return getattr(self, '_composed', None)\n\n @property\n def device(self):\n return self.op.device\n\n def is_sparse(self):\n return self.op.is_sparse()\n\n issparse = is_sparse\n\n def update_key(self):\n object.__setattr__(self, '_key', tokenize(\n type(self), *(getattr(self, k, None) for k in self.__slots__ if k != '_index')))\n\n\nclass Chunk(Entity):\n __slots__ = ()\n _allow_data_type_ = (ChunkData,)\n\n\nclass TensorData(SerializableWithKey, Tilesable):\n __slots__ = '__weakref__', '_siblings', '_cix'\n _no_copy_attrs_ = SerializableWithKey._no_copy_attrs_ | {'_cix'}\n\n # required fields\n _shape = TupleField('shape', ValueType.int64,\n on_serialize=on_serialize_shape, on_deserialize=on_deserialize_shape)\n _dtype = DataTypeField('dtype')\n _op = KeyField('op')\n # optional fields\n # `nsplits` means the sizes of chunks for each dimension\n _nsplits = TupleField('nsplits', ValueType.tuple(ValueType.uint64))\n _chunks = ListField('chunks', ValueType.reference(Chunk))\n _params = DictField('params', key_type=ValueType.string, on_deserialize=AttributeDict)\n\n def __init__(self, *args, **kwargs):\n extras = AttributeDict((k, kwargs.pop(k)) for k in set(kwargs) - set(self.__slots__))\n kwargs['_params'] = kwargs.pop('_params', extras)\n if '_nsplits' in kwargs:\n kwargs['_nsplits'] = tuple(tuple(s) for s in kwargs['_nsplits'])\n\n super(TensorData, self).__init__(*args, **kwargs)\n\n if hasattr(self, '_chunks') and self._chunks:\n self._chunks = sorted(self._chunks, key=attrgetter('index'))\n\n @classmethod\n def cls(cls, provider):\n if provider.type == ProviderType.protobuf:\n from ..serialize.protos.tensor_pb2 import TensorDef\n return TensorDef\n return super(TensorData, cls).cls(provider)\n\n def __repr__(self):\n return 'Tensor <op={0}, key={1}>'.format(self.op.__class__.__name__, self.key)\n\n @property\n def shape(self):\n if hasattr(self, '_shape') and self._shape is not None:\n return self._shape\n if hasattr(self, '_nsplits') and self._nsplits is not None:\n self._shape = tuple(builtins.sum(nsplit) for nsplit in self._nsplits)\n return self._shape\n\n def _update_shape(self, new_shape):\n self._shape = new_shape\n\n @property\n def ndim(self):\n return len(self.shape)\n\n def __len__(self):\n try:\n return self.shape[0]\n except IndexError:\n if build_mode().is_build_mode:\n return 0\n raise TypeError('len() of unsized object')\n\n @property\n def nbytes(self):\n return np.prod(self.shape) * self.dtype.itemsize\n\n @property\n def chunk_shape(self):\n if hasattr(self, '_nsplits') and self._nsplits is not None:\n return tuple(map(len, self._nsplits))\n\n @property\n def chunks(self):\n return getattr(self, '_chunks', None)\n\n @property\n def op(self):\n return getattr(self, '_op', None)\n\n @property\n def nsplits(self):\n return getattr(self, '_nsplits', None)\n\n @nsplits.setter\n def nsplits(self, new_nsplits):\n self._nsplits = new_nsplits\n\n @property\n def size(self):\n return np.prod(self.shape).item()\n\n @property\n def inputs(self):\n return self.op.inputs or []\n\n @inputs.setter\n def inputs(self, new_inputs):\n self.op.inputs = new_inputs\n\n @property\n def dtype(self):\n return getattr(self, '_dtype', None) or self.op.dtype\n\n @property\n def params(self):\n return self._params\n\n @property\n def real(self):\n from .expressions.arithmetic import real\n return real(self)\n\n @property\n def imag(self):\n from .expressions.arithmetic import imag\n return imag(self)\n\n def get_chunk_slices(self, idx):\n return get_chunk_slices(self.nsplits, idx)\n\n def is_coarse(self):\n return not hasattr(self, '_chunks') or self._chunks is None or len(self._chunks) == 0\n\n def is_scalar(self):\n return self.ndim == 0\n\n isscalar = is_scalar\n\n def is_sparse(self):\n return self.op.is_sparse()\n\n issparse = is_sparse\n\n def tosparse(self):\n if self.issparse():\n return self\n\n from .expressions.datasource import fromdense\n return fromdense(self)\n\n def todense(self):\n if not self.issparse():\n return self\n\n from .expressions.datasource import fromsparse\n return fromsparse(self)\n\n @property\n def cix(self):\n if self.ndim == 0:\n return ChunksIndexer(self)\n\n try:\n if getattr(self, '_cix', None) is None:\n self._cix = ChunksIndexer(self)\n return self._cix\n except (TypeError, ValueError):\n return ChunksIndexer(self)\n\n def tiles(self):\n return handler.tiles(self)\n\n def single_tiles(self):\n return handler.single_tiles(self)\n\n def build_graph(self, graph=None, cls=DAG, tiled=False, compose=True):\n if tiled and self.is_coarse():\n self.tiles()\n\n graph = graph if graph is not None else cls()\n keys = None\n\n if tiled:\n nodes = list(c.data for c in self.chunks)\n keys = list(c.key for c in self.chunks)\n else:\n nodes = list(self.op.outputs)\n visited = set()\n while len(nodes) > 0:\n chunk = nodes.pop()\n visited.add(chunk)\n if not graph.contains(chunk):\n graph.add_node(chunk)\n children = chunk.inputs or []\n for c in children:\n if not graph.contains(c):\n graph.add_node(c)\n if not graph.has_successor(c, chunk):\n graph.add_edge(c, chunk)\n nodes.extend([c for c in itertools.chain(*[inp.op.outputs for inp in chunk.inputs or []])\n if c not in visited])\n if tiled and compose:\n graph.compose(keys=keys)\n return graph\n\n def transpose(self, *axes):\n \"\"\"\n Returns a view of the tensor with axes transposed.\n\n For a 1-D tensor, this has no effect. (To change between column and\n row vectors, first cast the 1-D tensor into a matrix object.)\n For a 2-D tensor, this is the usual matrix transpose.\n For an n-D tensor, if axes are given, their order indicates how the\n axes are permuted (see Examples). If axes are not provided and\n ``a.shape = (i[0], i[1], ... i[n-2], i[n-1])``, then\n ``a.transpose().shape = (i[n-1], i[n-2], ... i[1], i[0])``.\n\n Parameters\n ----------\n axes : None, tuple of ints, or `n` ints\n\n * None or no argument: reverses the order of the axes.\n\n * tuple of ints: `i` in the `j`-th place in the tuple means `a`'s\n `i`-th axis becomes `a.transpose()`'s `j`-th axis.\n\n * `n` ints: same as an n-tuple of the same ints (this form is\n intended simply as a \"convenience\" alternative to the tuple form)\n\n Returns\n -------\n out : Tensor\n View of `a`, with axes suitably permuted.\n\n See Also\n --------\n Tensor.T : Tensor property returning the tensor transposed.\n\n Examples\n --------\n >>> import mars.tensor as mt\n\n >>> a = mt.array([[1, 2], [3, 4]])\n >>> a.execute()\n array([[1, 2],\n [3, 4]])\n >>> a.transpose().execute()\n array([[1, 3],\n [2, 4]])\n >>> a.transpose((1, 0))\n array([[1, 3],\n [2, 4]])\n >>> a.transpose(1, 0).execute()\n array([[1, 3],\n [2, 4]])\n \"\"\"\n from .expressions.base import transpose\n\n if len(axes) == 1 and isinstance(axes[0], Iterable):\n axes = axes[0]\n\n return transpose(self, axes)\n\n @property\n def T(self):\n \"\"\"\n Same as self.transpose(), except that self is returned if\n self.ndim < 2.\n\n Examples\n --------\n >>> import mars.tensor as mt\n\n >>> x = mt.array([[1.,2.],[3.,4.]])\n >>> x.execute()\n array([[ 1., 2.],\n [ 3., 4.]])\n >>> x.T.execute()\n array([[ 1., 3.],\n [ 2., 4.]])\n >>> x = mt.array([1.,2.,3.,4.])\n >>> x.execute()\n array([ 1., 2., 3., 4.])\n >>> x.T.execute()\n array([ 1., 2., 3., 4.])\n \"\"\"\n return self.transpose()\n\n def reshape(self, shape, *shapes):\n \"\"\"\n Returns a tensor containing the same data with a new shape.\n\n Refer to `mt.reshape` for full documentation.\n\n See Also\n --------\n mt.reshape : equivalent function\n\n Notes\n -----\n Unlike the free function `mt.reshape`, this method on `Tensor` allows\n the elements of the shape parameter to be passed in as separate arguments.\n For example, ``a.reshape(10, 11)`` is equivalent to\n ``a.reshape((10, 11))``.\n \"\"\"\n from .expressions.reshape import reshape\n\n if isinstance(shape, Iterable):\n shape = tuple(shape)\n else:\n shape = (shape,)\n shape += shapes\n\n return reshape(self, shape)\n\n def ravel(self):\n \"\"\"\n Return a flattened tensor.\n\n Refer to `mt.ravel` for full documentation.\n\n See Also\n --------\n mt.ravel : equivalent function\n \"\"\"\n from .expressions.base import ravel\n\n return ravel(self)\n\n flatten = ravel\n\n def _equals(self, o):\n return self is o\n\n def execute(self, session=None, **kw):\n from ..session import Session\n\n if session is None:\n session = Session.default_or_local()\n return session.run(self, **kw)\n\n def _set_execute_session(self, session):\n _cleaner.register(self, session)\n\n _execute_session = property(fset=_set_execute_session)\n\n def visualize(self, graph_attrs=None, node_attrs=None, **kw):\n from graphviz import Source\n\n g = self.build_graph(**kw)\n dot = g.to_dot(graph_attrs=graph_attrs, node_attrs=node_attrs)\n\n return Source(dot)\n\n\nclass ExecutableTuple(tuple):\n def execute(self, session=None, **kw):\n from ..session import Session\n\n if session is None:\n session = Session.default_or_local()\n return session.run(*self, **kw)\n\n\nclass ChunksIndexer(object):\n __slots__ = '_tensor',\n\n def __init__(self, tensor):\n self._tensor = tensor\n\n def __getitem__(self, item):\n if isinstance(item, tuple):\n if len(item) == 0 and self._tensor.is_scalar():\n return self._tensor.chunks[0]\n elif all(np.issubdtype(type(it), np.integer) for it in item):\n if len(item) != self._tensor.ndim:\n raise ValueError('Cannot get tensor chunk by %s, expect length %d' % (\n item, self._tensor.ndim))\n\n s = self._tensor.chunk_shape\n item = tuple(i if i >= 0 else i + s for i, s in zip(item, s))\n idx = sum(idx * reduce(mul, s[i+1:], 1) for i, idx\n in zip(itertools.count(0), item))\n return self._tensor._chunks[idx]\n\n raise ValueError('Cannot get tensor chunk by {0}'.format(item))\n\n\nclass Tensor(Entity):\n __slots__ = ()\n _allow_data_type_ = (TensorData,)\n\n def __len__(self):\n return len(self._data)\n\n def copy(self):\n return Tensor(self._data)\n\n def tiles(self):\n return handler.tiles(self)\n\n def single_tiles(self):\n return handler.single_tiles(self)\n\n @property\n def shape(self):\n return self.data.shape\n\n @shape.setter\n def shape(self, new_shape):\n self._data = self._data.reshape(new_shape).data\n\n def _update_shape(self, new_shape):\n self._data._update_shape(new_shape)\n\n @property\n def real(self):\n return self.data.real\n\n @real.setter\n def real(self, new_real):\n from .expressions.arithmetic.setreal import set_real\n\n self._data = set_real(self._data, new_real).data\n\n @property\n def imag(self):\n return self.data.imag\n\n @imag.setter\n def imag(self, new_imag):\n from .expressions.arithmetic.setimag import set_imag\n\n self._data = set_imag(self._data, new_imag).data\n\n\nclass SparseTensor(Tensor):\n __slots__ = ()\n\n\nTENSOR_TYPE = (Tensor, TensorData)\nCHUNK_TYPE = (Chunk, ChunkData)\n\n_threading_local = threading.local()\n\n\nclass _TensorSession(object):\n def __init__(self, tensor, session):\n key = tensor.key, tensor.id\n\n def cb(_, sess=ref(session)):\n s = sess()\n if s:\n s.decref(key)\n self._tensor = ref(tensor, cb)\n\n\nclass _TensorCleaner(object):\n def __init__(self):\n self._tensor_to_sessions = WeakKeyDictionary()\n\n def register(self, tensor, session):\n with build_mode():\n self._tensor_to_sessions[tensor] = _TensorSession(tensor, session)\n\n\n# we don't use __del__ to decref because a tensor holds an op,\n# and op's outputs contains the tensor, so a circular references exists\n_cleaner = _TensorCleaner()\n\n\nclass BuildMode(object):\n def __init__(self):\n self.is_build_mode = False\n self._old_mode = None\n\n def __enter__(self):\n if self._old_mode is None:\n # check to prevent nested enter and exit\n self._old_mode = self.is_build_mode\n self.is_build_mode = True\n\n def __exit__(self, *_):\n if self._old_mode is not None:\n self.is_build_mode = self._old_mode\n self._old_mode = None\n\n\ndef build_mode():\n ret = getattr(_threading_local, 'build_mode', None)\n if ret is None:\n ret = BuildMode()\n _threading_local.build_mode = ret\n\n return ret\n", "path": "mars/tensor/core.py" } ]
[ { "content": "#!/usr/bin/env python\n# -*- coding: utf-8 -*-\n# Copyright 1999-2018 Alibaba Group Holding Ltd.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\n\nimport itertools\nfrom operator import attrgetter, mul\nfrom weakref import WeakKeyDictionary, ref\nfrom collections import Iterable\nimport threading\n\nimport numpy as np\n\nfrom ..core import Entity\nfrom ..compat import builtins, reduce\nfrom ..graph import DAG\nfrom ..tiles import Tilesable, handler\nfrom ..serialize import SerializableWithKey, ValueType, ProviderType, \\\n ListField, TupleField, DictField, DataTypeField, KeyField, BoolField\nfrom ..utils import AttributeDict, on_serialize_shape, on_deserialize_shape, tokenize\nfrom .expressions.utils import get_chunk_slices\n\n\nclass ChunkData(SerializableWithKey):\n __slots__ = '__weakref__',\n\n # required fields\n _shape = TupleField('shape', ValueType.int64,\n on_serialize=on_serialize_shape, on_deserialize=on_deserialize_shape)\n _op = KeyField('op') # store key of operand here\n # optional fields\n _dtype = DataTypeField('dtype')\n _index = TupleField('index', ValueType.uint32)\n _cached = BoolField('cached')\n _composed = ListField('composed', ValueType.reference('self'))\n _params = DictField('params', key_type=ValueType.string, on_deserialize=AttributeDict)\n\n def __init__(self, *args, **kwargs):\n extras = AttributeDict((k, kwargs.pop(k)) for k in set(kwargs) - set(self.__slots__))\n kwargs['_params'] = kwargs.pop('_params', extras)\n super(ChunkData, self).__init__(*args, **kwargs)\n\n def __repr__(self):\n return 'Chunk <op={0}, key={1}>'.format(self.op.__class__.__name__, self.key)\n\n @classmethod\n def cls(cls, provider):\n if provider.type == ProviderType.protobuf:\n from ..serialize.protos.chunk_pb2 import ChunkDef\n return ChunkDef\n return super(ChunkData, cls).cls(provider)\n\n @property\n def shape(self):\n return getattr(self, '_shape', None)\n\n @property\n def ndim(self):\n return len(self.shape)\n\n @property\n def index(self):\n return getattr(self, '_index', None)\n\n @property\n def op(self):\n try:\n return self._op\n except AttributeError:\n return None\n\n @property\n def cached(self):\n return getattr(self, '_cached', None)\n\n @property\n def inputs(self):\n return self.op.inputs\n\n @inputs.setter\n def inputs(self, new_inputs):\n self.op.inputs = new_inputs\n\n @property\n def dtype(self):\n return getattr(self, '_dtype', None) or self.op.dtype\n\n @property\n def nbytes(self):\n return np.prod(self.shape) * self.dtype.itemsize\n\n @property\n def composed(self):\n return getattr(self, '_composed', None)\n\n @property\n def device(self):\n return self.op.device\n\n def is_sparse(self):\n return self.op.is_sparse()\n\n issparse = is_sparse\n\n def update_key(self):\n object.__setattr__(self, '_key', tokenize(\n type(self), *(getattr(self, k, None) for k in self.__slots__ if k != '_index')))\n\n\nclass Chunk(Entity):\n __slots__ = ()\n _allow_data_type_ = (ChunkData,)\n\n\nclass TensorData(SerializableWithKey, Tilesable):\n __slots__ = '__weakref__', '_siblings', '_cix'\n _no_copy_attrs_ = SerializableWithKey._no_copy_attrs_ | {'_cix'}\n\n # required fields\n _shape = TupleField('shape', ValueType.int64,\n on_serialize=on_serialize_shape, on_deserialize=on_deserialize_shape)\n _dtype = DataTypeField('dtype')\n _op = KeyField('op')\n # optional fields\n # `nsplits` means the sizes of chunks for each dimension\n _nsplits = TupleField('nsplits', ValueType.tuple(ValueType.uint64))\n _chunks = ListField('chunks', ValueType.reference(Chunk))\n _params = DictField('params', key_type=ValueType.string, on_deserialize=AttributeDict)\n\n def __init__(self, *args, **kwargs):\n extras = AttributeDict((k, kwargs.pop(k)) for k in set(kwargs) - set(self.__slots__))\n kwargs['_params'] = kwargs.pop('_params', extras)\n if '_nsplits' in kwargs:\n kwargs['_nsplits'] = tuple(tuple(s) for s in kwargs['_nsplits'])\n\n super(TensorData, self).__init__(*args, **kwargs)\n\n if hasattr(self, '_chunks') and self._chunks:\n self._chunks = sorted(self._chunks, key=attrgetter('index'))\n\n @classmethod\n def cls(cls, provider):\n if provider.type == ProviderType.protobuf:\n from ..serialize.protos.tensor_pb2 import TensorDef\n return TensorDef\n return super(TensorData, cls).cls(provider)\n\n def __repr__(self):\n return 'Tensor <op={0}, key={1}>'.format(self.op.__class__.__name__, self.key)\n\n @property\n def shape(self):\n if hasattr(self, '_shape') and self._shape is not None:\n return self._shape\n if hasattr(self, '_nsplits') and self._nsplits is not None:\n self._shape = tuple(builtins.sum(nsplit) for nsplit in self._nsplits)\n return self._shape\n\n def _update_shape(self, new_shape):\n self._shape = new_shape\n\n @property\n def ndim(self):\n return len(self.shape)\n\n def __len__(self):\n try:\n return self.shape[0]\n except IndexError:\n if build_mode().is_build_mode:\n return 0\n raise TypeError('len() of unsized object')\n\n @property\n def nbytes(self):\n return np.prod(self.shape) * self.dtype.itemsize\n\n @property\n def chunk_shape(self):\n if hasattr(self, '_nsplits') and self._nsplits is not None:\n return tuple(map(len, self._nsplits))\n\n @property\n def chunks(self):\n return getattr(self, '_chunks', None)\n\n @property\n def op(self):\n return getattr(self, '_op', None)\n\n @property\n def nsplits(self):\n return getattr(self, '_nsplits', None)\n\n @nsplits.setter\n def nsplits(self, new_nsplits):\n self._nsplits = new_nsplits\n\n @property\n def size(self):\n return np.prod(self.shape).item()\n\n @property\n def inputs(self):\n return self.op.inputs or []\n\n @inputs.setter\n def inputs(self, new_inputs):\n self.op.inputs = new_inputs\n\n @property\n def dtype(self):\n return getattr(self, '_dtype', None) or self.op.dtype\n\n @property\n def params(self):\n return self._params\n\n @property\n def real(self):\n from .expressions.arithmetic import real\n return real(self)\n\n @property\n def imag(self):\n from .expressions.arithmetic import imag\n return imag(self)\n\n def get_chunk_slices(self, idx):\n return get_chunk_slices(self.nsplits, idx)\n\n def is_coarse(self):\n return not hasattr(self, '_chunks') or self._chunks is None or len(self._chunks) == 0\n\n def is_scalar(self):\n return self.ndim == 0\n\n isscalar = is_scalar\n\n def is_sparse(self):\n return self.op.is_sparse()\n\n issparse = is_sparse\n\n def tosparse(self):\n if self.issparse():\n return self\n\n from .expressions.datasource import fromdense\n return fromdense(self)\n\n def todense(self):\n if not self.issparse():\n return self\n\n from .expressions.datasource import fromsparse\n return fromsparse(self)\n\n @property\n def cix(self):\n if self.ndim == 0:\n return ChunksIndexer(self)\n\n try:\n if getattr(self, '_cix', None) is None:\n self._cix = ChunksIndexer(self)\n return self._cix\n except (TypeError, ValueError):\n return ChunksIndexer(self)\n\n def tiles(self):\n return handler.tiles(self)\n\n def single_tiles(self):\n return handler.single_tiles(self)\n\n def build_graph(self, graph=None, cls=DAG, tiled=False, compose=True):\n if tiled and self.is_coarse():\n self.tiles()\n\n graph = graph if graph is not None else cls()\n keys = None\n\n if tiled:\n nodes = list(c.data for c in self.chunks)\n keys = list(c.key for c in self.chunks)\n else:\n nodes = list(self.op.outputs)\n visited = set()\n while len(nodes) > 0:\n chunk = nodes.pop()\n visited.add(chunk)\n if not graph.contains(chunk):\n graph.add_node(chunk)\n children = chunk.inputs or []\n for c in children:\n if not graph.contains(c):\n graph.add_node(c)\n if not graph.has_successor(c, chunk):\n graph.add_edge(c, chunk)\n nodes.extend([c for c in itertools.chain(*[inp.op.outputs for inp in chunk.inputs or []])\n if c not in visited])\n if tiled and compose:\n graph.compose(keys=keys)\n return graph\n\n def transpose(self, *axes):\n \"\"\"\n Returns a view of the tensor with axes transposed.\n\n For a 1-D tensor, this has no effect. (To change between column and\n row vectors, first cast the 1-D tensor into a matrix object.)\n For a 2-D tensor, this is the usual matrix transpose.\n For an n-D tensor, if axes are given, their order indicates how the\n axes are permuted (see Examples). If axes are not provided and\n ``a.shape = (i[0], i[1], ... i[n-2], i[n-1])``, then\n ``a.transpose().shape = (i[n-1], i[n-2], ... i[1], i[0])``.\n\n Parameters\n ----------\n axes : None, tuple of ints, or `n` ints\n\n * None or no argument: reverses the order of the axes.\n\n * tuple of ints: `i` in the `j`-th place in the tuple means `a`'s\n `i`-th axis becomes `a.transpose()`'s `j`-th axis.\n\n * `n` ints: same as an n-tuple of the same ints (this form is\n intended simply as a \"convenience\" alternative to the tuple form)\n\n Returns\n -------\n out : Tensor\n View of `a`, with axes suitably permuted.\n\n See Also\n --------\n Tensor.T : Tensor property returning the tensor transposed.\n\n Examples\n --------\n >>> import mars.tensor as mt\n\n >>> a = mt.array([[1, 2], [3, 4]])\n >>> a.execute()\n array([[1, 2],\n [3, 4]])\n >>> a.transpose().execute()\n array([[1, 3],\n [2, 4]])\n >>> a.transpose((1, 0))\n array([[1, 3],\n [2, 4]])\n >>> a.transpose(1, 0).execute()\n array([[1, 3],\n [2, 4]])\n \"\"\"\n from .expressions.base import transpose\n\n if len(axes) == 1 and isinstance(axes[0], Iterable):\n axes = axes[0]\n\n return transpose(self, axes)\n\n @property\n def T(self):\n \"\"\"\n Same as self.transpose(), except that self is returned if\n self.ndim < 2.\n\n Examples\n --------\n >>> import mars.tensor as mt\n\n >>> x = mt.array([[1.,2.],[3.,4.]])\n >>> x.execute()\n array([[ 1., 2.],\n [ 3., 4.]])\n >>> x.T.execute()\n array([[ 1., 3.],\n [ 2., 4.]])\n >>> x = mt.array([1.,2.,3.,4.])\n >>> x.execute()\n array([ 1., 2., 3., 4.])\n >>> x.T.execute()\n array([ 1., 2., 3., 4.])\n \"\"\"\n return self.transpose()\n\n def reshape(self, shape, *shapes):\n \"\"\"\n Returns a tensor containing the same data with a new shape.\n\n Refer to `mt.reshape` for full documentation.\n\n See Also\n --------\n mt.reshape : equivalent function\n\n Notes\n -----\n Unlike the free function `mt.reshape`, this method on `Tensor` allows\n the elements of the shape parameter to be passed in as separate arguments.\n For example, ``a.reshape(10, 11)`` is equivalent to\n ``a.reshape((10, 11))``.\n \"\"\"\n from .expressions.reshape import reshape\n\n if isinstance(shape, Iterable):\n shape = tuple(shape)\n else:\n shape = (shape,)\n shape += shapes\n\n return reshape(self, shape)\n\n def ravel(self):\n \"\"\"\n Return a flattened tensor.\n\n Refer to `mt.ravel` for full documentation.\n\n See Also\n --------\n mt.ravel : equivalent function\n \"\"\"\n from .expressions.base import ravel\n\n return ravel(self)\n\n flatten = ravel\n\n def _equals(self, o):\n return self is o\n\n def execute(self, session=None, **kw):\n from ..session import Session\n\n if session is None:\n session = Session.default_or_local()\n return session.run(self, **kw)\n\n def _set_execute_session(self, session):\n _cleaner.register(self, session)\n\n _execute_session = property(fset=_set_execute_session)\n\n def visualize(self, graph_attrs=None, node_attrs=None, **kw):\n from graphviz import Source\n\n g = self.build_graph(**kw)\n dot = g.to_dot(graph_attrs=graph_attrs, node_attrs=node_attrs)\n\n return Source(dot)\n\n\nclass ExecutableTuple(tuple):\n def execute(self, session=None, **kw):\n from ..session import Session\n\n if session is None:\n session = Session.default_or_local()\n return session.run(*self, **kw)\n\n\nclass ChunksIndexer(object):\n __slots__ = '_tensor',\n\n def __init__(self, tensor):\n self._tensor = tensor\n\n def __getitem__(self, item):\n if isinstance(item, tuple):\n if len(item) == 0 and self._tensor.is_scalar():\n return self._tensor.chunks[0]\n elif all(np.issubdtype(type(it), np.integer) for it in item):\n if len(item) != self._tensor.ndim:\n raise ValueError('Cannot get tensor chunk by %s, expect length %d' % (\n item, self._tensor.ndim))\n\n s = self._tensor.chunk_shape\n item = tuple(i if i >= 0 else i + s for i, s in zip(item, s))\n idx = sum(idx * reduce(mul, s[i+1:], 1) for i, idx\n in zip(itertools.count(0), item))\n return self._tensor._chunks[idx]\n\n raise ValueError('Cannot get tensor chunk by {0}'.format(item))\n\n\nclass Tensor(Entity):\n __slots__ = ()\n _allow_data_type_ = (TensorData,)\n\n def __len__(self):\n return len(self._data)\n\n def copy(self):\n return Tensor(self._data)\n\n def tiles(self):\n return handler.tiles(self)\n\n def single_tiles(self):\n return handler.single_tiles(self)\n\n @property\n def shape(self):\n return self.data.shape\n\n @shape.setter\n def shape(self, new_shape):\n self._data = self._data.reshape(new_shape).data\n\n def _update_shape(self, new_shape):\n self._data._update_shape(new_shape)\n\n @property\n def real(self):\n return self.data.real\n\n @real.setter\n def real(self, new_real):\n from .expressions.arithmetic.setreal import set_real\n\n self._data = set_real(self._data, new_real).data\n\n @property\n def imag(self):\n return self.data.imag\n\n @imag.setter\n def imag(self, new_imag):\n from .expressions.arithmetic.setimag import set_imag\n\n self._data = set_imag(self._data, new_imag).data\n\n def __array__(self, dtype=None):\n return np.asarray(self.execute(), dtype=dtype)\n\n\nclass SparseTensor(Tensor):\n __slots__ = ()\n\n\nTENSOR_TYPE = (Tensor, TensorData)\nCHUNK_TYPE = (Chunk, ChunkData)\n\n_threading_local = threading.local()\n\n\nclass _TensorSession(object):\n def __init__(self, tensor, session):\n key = tensor.key, tensor.id\n\n def cb(_, sess=ref(session)):\n s = sess()\n if s:\n s.decref(key)\n self._tensor = ref(tensor, cb)\n\n\nclass _TensorCleaner(object):\n def __init__(self):\n self._tensor_to_sessions = WeakKeyDictionary()\n\n def register(self, tensor, session):\n with build_mode():\n self._tensor_to_sessions[tensor] = _TensorSession(tensor, session)\n\n\n# we don't use __del__ to decref because a tensor holds an op,\n# and op's outputs contains the tensor, so a circular references exists\n_cleaner = _TensorCleaner()\n\n\nclass BuildMode(object):\n def __init__(self):\n self.is_build_mode = False\n self._old_mode = None\n\n def __enter__(self):\n if self._old_mode is None:\n # check to prevent nested enter and exit\n self._old_mode = self.is_build_mode\n self.is_build_mode = True\n\n def __exit__(self, *_):\n if self._old_mode is not None:\n self.is_build_mode = self._old_mode\n self._old_mode = None\n\n\ndef build_mode():\n ret = getattr(_threading_local, 'build_mode', None)\n if ret is None:\n ret = BuildMode()\n _threading_local.build_mode = ret\n\n return ret\n", "path": "mars/tensor/core.py" } ]
diff --git a/mars/tensor/core.py b/mars/tensor/core.py index ecbb7d6ff5..234d28f7a6 100644 --- a/mars/tensor/core.py +++ b/mars/tensor/core.py @@ -546,6 +546,9 @@ def imag(self, new_imag): self._data = set_imag(self._data, new_imag).data + def __array__(self, dtype=None): + return np.asarray(self.execute(), dtype=dtype) + class SparseTensor(Tensor): __slots__ = () diff --git a/mars/tests/test_session.py b/mars/tests/test_session.py index 3dc7bec38c..70215aa72f 100644 --- a/mars/tests/test_session.py +++ b/mars/tests/test_session.py @@ -162,3 +162,24 @@ def testBoolIndexing(self): arr3 = arr2.reshape((5, 5)) expected = np.ones((5, 5)) np.testing.assert_array_equal(arr3.execute(), expected) + + def testArrayProtocol(self): + arr = mt.ones((10, 20)) + + result = np.asarray(arr) + np.testing.assert_array_equal(result, np.ones((10, 20))) + + arr2 = mt.ones((10, 20)) + + result = np.asarray(arr2, mt.bool_) + np.testing.assert_array_equal(result, np.ones((10, 20), dtype=np.bool_)) + + arr3 = mt.ones((10, 20)).sum() + + result = np.asarray(arr3) + np.testing.assert_array_equal(result, np.asarray(200)) + + arr4 = mt.ones((10, 20)).sum() + + result = np.asarray(arr4, dtype=np.float_) + np.testing.assert_array_equal(result, np.asarray(200, dtype=np.float_))
ivy-llc__ivy-16291
[ { "content": "# local\nimport ivy\nfrom ivy.func_wrapper import with_supported_dtypes\nfrom ivy.functional.frontends.paddle.func_wrapper import to_ivy_arrays_and_back\nfrom ivy.functional.frontends.paddle.tensor.math import tanh as paddle_tanh\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef selu(\n x,\n /,\n *,\n alpha=1.6732632423543772848170429916717,\n scale=1.0507009873554804934193349852946,\n name=None,\n):\n if scale <= 1.0:\n raise ValueError(f\"The scale must be greater than 1.0. Received: {scale}.\")\n\n if alpha < 0:\n raise ValueError(f\"The alpha must be no less than zero. Received: {alpha}.\")\n\n ret = ivy.where(x > 0, x, alpha * ivy.expm1(x))\n arr = scale * ret\n return ivy.astype(arr, x.dtype)\n\n\ntanh = paddle_tanh\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef hardshrink(x, threshold=0.5, name=None):\n mask = ivy.logical_or(ivy.greater(x, threshold), ivy.less(x, -threshold))\n return ivy.where(mask, x, 0.0)\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef hardswish(x, name=None):\n relu6_val = ivy.relu6(ivy.add(x, 3))\n ret = ivy.multiply(x, ivy.divide(relu6_val, 6))\n return ret\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef hardtanh(\n x,\n /,\n *,\n min=-1.0,\n max=1.0,\n name=None,\n):\n less = ivy.where(ivy.less(x, min), min, x)\n ret = ivy.where(ivy.greater(x, max), max, less).astype(x.dtype)\n return ret\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef gelu(x, approximate=False, name=None):\n return ivy.gelu(x, approximate=approximate)\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef hardsigmoid(x, slope=0.1666667, offset=0.5, name=None):\n ret = ivy.minimum(ivy.maximum(ivy.add(ivy.multiply(x, slope), offset), 0), 1)\n return ret\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef relu6(x, name=None):\n return ivy.relu6(x)\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef softshrink(\n x,\n /,\n *,\n threshold=0.5,\n name=None,\n):\n low = ivy.where(ivy.less(x, -threshold), ivy.add(x, threshold), 0)\n up = ivy.where(ivy.greater(x, threshold), ivy.subtract(x, threshold), 0)\n add = ivy.add(low, up)\n return ivy.astype(add, x.dtype)\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef softsign(\n x,\n /,\n *,\n name=None,\n):\n return ivy.divide(x, ivy.add(1, ivy.abs(x)))\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef log_softmax(x, axis=-1, dtype=None, name=None):\n x = ivy.astype(x, dtype) if dtype else x\n ret = ivy.log_softmax(x, axis=axis)\n ret = ivy.astype(ret, dtype) if dtype else ret\n return ret\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef prelu(x, weight, data_format=\"NCHW\", name=None):\n return ivy.add(ivy.maximum(0, x), ivy.multiply(weight, ivy.minimum(0, x)))\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef celu(\n x,\n /,\n *,\n alpha=1.0,\n name=None,\n):\n prod = alpha * (ivy.exp(x / alpha) - 1)\n ret = ivy.maximum(0, x) + ivy.minimum(0, prod)\n return ret\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef rrelu(\n x,\n /,\n *,\n lower=0.125,\n upper=0.3333333333333333,\n training=False,\n name=None,\n):\n if lower < 0 or lower > 1:\n raise ValueError(\n \"The lower value must be no less than zero or greater than one. Received:\"\n f\" {lower}.\"\n )\n\n if upper < lower:\n raise ValueError(\n \"The upper value must be greater than lower value. Received: lower\"\n f\" {lower}, upper {upper}.\"\n )\n\n if upper > 1:\n raise ValueError(\n f\"The upper value must be no greater than one. Received: {upper}.\"\n )\n\n is_test = not training\n if is_test:\n add = lower + upper\n ret = add * x * 0.5\n out = ivy.where(x >= 0, x, ret)\n return out.astype(x.dtype)\n # else:\n # ToDo implement a correctly after fixing ivy.random_uniform\n # a = ivy.random_normal(low=lower, high=upper)\n # ret = ivy.where(x >= 0, x, ivy.multiply(a, x))\n # return ret.astype(x.dtype)\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef tanhshrink(\n x,\n /,\n *,\n name=None,\n):\n return ivy.subtract(x, ivy.tanh(x))\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef relu_(x, name=None):\n ret = ivy.relu(x)\n ivy.inplace_update(x, ret)\n return x\n", "path": "ivy/functional/frontends/paddle/nn/functional/activation.py" } ]
[ { "content": "# local\nimport ivy\nfrom ivy.func_wrapper import with_supported_dtypes\nfrom ivy.functional.frontends.paddle.func_wrapper import to_ivy_arrays_and_back\nfrom ivy.functional.frontends.paddle.tensor.math import tanh as paddle_tanh\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef selu(\n x,\n /,\n *,\n alpha=1.6732632423543772848170429916717,\n scale=1.0507009873554804934193349852946,\n name=None,\n):\n if scale <= 1.0:\n raise ValueError(f\"The scale must be greater than 1.0. Received: {scale}.\")\n\n if alpha < 0:\n raise ValueError(f\"The alpha must be no less than zero. Received: {alpha}.\")\n\n ret = ivy.where(x > 0, x, alpha * ivy.expm1(x))\n arr = scale * ret\n return ivy.astype(arr, x.dtype)\n\n\ntanh = paddle_tanh\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef hardshrink(x, threshold=0.5, name=None):\n mask = ivy.logical_or(ivy.greater(x, threshold), ivy.less(x, -threshold))\n return ivy.where(mask, x, 0.0)\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef hardswish(x, name=None):\n relu6_val = ivy.relu6(ivy.add(x, 3))\n ret = ivy.multiply(x, ivy.divide(relu6_val, 6))\n return ret\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef hardtanh(\n x,\n /,\n *,\n min=-1.0,\n max=1.0,\n name=None,\n):\n less = ivy.where(ivy.less(x, min), min, x)\n ret = ivy.where(ivy.greater(x, max), max, less).astype(x.dtype)\n return ret\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef gelu(x, approximate=False, name=None):\n return ivy.gelu(x, approximate=approximate)\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef hardsigmoid(x, slope=0.1666667, offset=0.5, name=None):\n ret = ivy.minimum(ivy.maximum(ivy.add(ivy.multiply(x, slope), offset), 0), 1)\n return ret\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef relu6(x, name=None):\n return ivy.relu6(x)\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef softshrink(\n x,\n /,\n *,\n threshold=0.5,\n name=None,\n):\n low = ivy.where(ivy.less(x, -threshold), ivy.add(x, threshold), 0)\n up = ivy.where(ivy.greater(x, threshold), ivy.subtract(x, threshold), 0)\n add = ivy.add(low, up)\n return ivy.astype(add, x.dtype)\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef softsign(\n x,\n /,\n *,\n name=None,\n):\n return ivy.divide(x, ivy.add(1, ivy.abs(x)))\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef log_softmax(x, axis=-1, dtype=None, name=None):\n x = ivy.astype(x, dtype) if dtype else x\n ret = ivy.log_softmax(x, axis=axis)\n ret = ivy.astype(ret, dtype) if dtype else ret\n return ret\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef prelu(x, weight, data_format=\"NCHW\", name=None):\n return ivy.add(ivy.maximum(0, x), ivy.multiply(weight, ivy.minimum(0, x)))\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef celu(\n x,\n /,\n *,\n alpha=1.0,\n name=None,\n):\n prod = alpha * (ivy.exp(x / alpha) - 1)\n ret = ivy.maximum(0, x) + ivy.minimum(0, prod)\n return ret\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef rrelu(\n x,\n /,\n *,\n lower=0.125,\n upper=0.3333333333333333,\n training=False,\n name=None,\n):\n if lower < 0 or lower > 1:\n raise ValueError(\n \"The lower value must be no less than zero or greater than one. Received:\"\n f\" {lower}.\"\n )\n\n if upper < lower:\n raise ValueError(\n \"The upper value must be greater than lower value. Received: lower\"\n f\" {lower}, upper {upper}.\"\n )\n\n if upper > 1:\n raise ValueError(\n f\"The upper value must be no greater than one. Received: {upper}.\"\n )\n\n is_test = not training\n if is_test:\n add = lower + upper\n ret = add * x * 0.5\n out = ivy.where(x >= 0, x, ret)\n return out.astype(x.dtype)\n # else:\n # ToDo implement a correctly after fixing ivy.random_uniform\n # a = ivy.random_normal(low=lower, high=upper)\n # ret = ivy.where(x >= 0, x, ivy.multiply(a, x))\n # return ret.astype(x.dtype)\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef tanhshrink(\n x,\n /,\n *,\n name=None,\n):\n return ivy.subtract(x, ivy.tanh(x))\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef relu_(x, name=None):\n ret = ivy.relu(x)\n ivy.inplace_update(x, ret)\n return x\n\n\n@with_supported_dtypes({\"2.4.2 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef mish(x, name=None):\n return ivy.mish(x)\n", "path": "ivy/functional/frontends/paddle/nn/functional/activation.py" } ]
diff --git a/ivy/functional/frontends/paddle/nn/functional/activation.py b/ivy/functional/frontends/paddle/nn/functional/activation.py index ab27534a50dc5..080f784936d7e 100644 --- a/ivy/functional/frontends/paddle/nn/functional/activation.py +++ b/ivy/functional/frontends/paddle/nn/functional/activation.py @@ -191,3 +191,9 @@ def relu_(x, name=None): ret = ivy.relu(x) ivy.inplace_update(x, ret) return x + + +@with_supported_dtypes({"2.4.2 and below": ("float32", "float64")}, "paddle") +@to_ivy_arrays_and_back +def mish(x, name=None): + return ivy.mish(x) diff --git a/ivy_tests/test_ivy/test_frontends/test_paddle/test_nn/test_functional/test_paddle_activation.py b/ivy_tests/test_ivy/test_frontends/test_paddle/test_nn/test_functional/test_paddle_activation.py index adec769321f4b..97632cd88ba38 100644 --- a/ivy_tests/test_ivy/test_frontends/test_paddle/test_nn/test_functional/test_paddle_activation.py +++ b/ivy_tests/test_ivy/test_frontends/test_paddle/test_nn/test_functional/test_paddle_activation.py @@ -457,3 +457,31 @@ def test_paddle_relu_( fn_tree=fn_tree, x=x[0], ) + + +# mish +@handle_frontend_test( + fn_tree="paddle.nn.functional.mish", + dtype_and_input=helpers.dtype_and_values( + available_dtypes=helpers.get_dtypes("valid"), + safety_factor_scale="log", + small_abs_safety_factor=20, + ), +) +def test_paddle_mish( + *, + dtype_and_input, + on_device, + fn_tree, + frontend, + test_flags, +): + input_dtype, x = dtype_and_input + helpers.test_frontend_function( + input_dtypes=input_dtype, + frontend=frontend, + test_flags=test_flags, + fn_tree=fn_tree, + on_device=on_device, + x=x[0], + )
paperless-ngx__paperless-ngx-2371
[ { "content": "from django.conf import settings\nfrom django.conf.urls import include\nfrom django.contrib import admin\nfrom django.contrib.auth.decorators import login_required\nfrom django.urls import path\nfrom django.urls import re_path\nfrom django.utils.translation import gettext_lazy as _\nfrom django.views.decorators.csrf import csrf_exempt\nfrom django.views.generic import RedirectView\nfrom documents.views import AcknowledgeTasksView\nfrom documents.views import BulkDownloadView\nfrom documents.views import BulkEditView\nfrom documents.views import CorrespondentViewSet\nfrom documents.views import DocumentTypeViewSet\nfrom documents.views import IndexView\nfrom documents.views import LogViewSet\nfrom documents.views import PostDocumentView\nfrom documents.views import RemoteVersionView\nfrom documents.views import SavedViewViewSet\nfrom documents.views import SearchAutoCompleteView\nfrom documents.views import SelectionDataView\nfrom documents.views import StatisticsView\nfrom documents.views import StoragePathViewSet\nfrom documents.views import TagViewSet\nfrom documents.views import TasksViewSet\nfrom documents.views import UiSettingsView\nfrom documents.views import UnifiedSearchViewSet\nfrom paperless.consumers import StatusConsumer\nfrom paperless.views import FaviconView\nfrom paperless_mail.views import MailAccountViewSet\nfrom paperless_mail.views import MailRuleViewSet\nfrom rest_framework.authtoken import views\nfrom rest_framework.routers import DefaultRouter\n\napi_router = DefaultRouter()\napi_router.register(r\"correspondents\", CorrespondentViewSet)\napi_router.register(r\"document_types\", DocumentTypeViewSet)\napi_router.register(r\"documents\", UnifiedSearchViewSet)\napi_router.register(r\"logs\", LogViewSet, basename=\"logs\")\napi_router.register(r\"tags\", TagViewSet)\napi_router.register(r\"saved_views\", SavedViewViewSet)\napi_router.register(r\"storage_paths\", StoragePathViewSet)\napi_router.register(r\"tasks\", TasksViewSet, basename=\"tasks\")\napi_router.register(r\"mail_accounts\", MailAccountViewSet)\napi_router.register(r\"mail_rules\", MailRuleViewSet)\n\n\nurlpatterns = [\n re_path(\n r\"^api/\",\n include(\n [\n re_path(\n r\"^auth/\",\n include(\n (\"rest_framework.urls\", \"rest_framework\"),\n namespace=\"rest_framework\",\n ),\n ),\n re_path(\n r\"^search/autocomplete/\",\n SearchAutoCompleteView.as_view(),\n name=\"autocomplete\",\n ),\n re_path(r\"^statistics/\", StatisticsView.as_view(), name=\"statistics\"),\n re_path(\n r\"^documents/post_document/\",\n PostDocumentView.as_view(),\n name=\"post_document\",\n ),\n re_path(\n r\"^documents/bulk_edit/\",\n BulkEditView.as_view(),\n name=\"bulk_edit\",\n ),\n re_path(\n r\"^documents/selection_data/\",\n SelectionDataView.as_view(),\n name=\"selection_data\",\n ),\n re_path(\n r\"^documents/bulk_download/\",\n BulkDownloadView.as_view(),\n name=\"bulk_download\",\n ),\n re_path(\n r\"^remote_version/\",\n RemoteVersionView.as_view(),\n name=\"remoteversion\",\n ),\n re_path(\n r\"^ui_settings/\",\n UiSettingsView.as_view(),\n name=\"ui_settings\",\n ),\n re_path(\n r\"^acknowledge_tasks/\",\n AcknowledgeTasksView.as_view(),\n name=\"acknowledge_tasks\",\n ),\n path(\"token/\", views.obtain_auth_token),\n ]\n + api_router.urls,\n ),\n ),\n re_path(r\"^favicon.ico$\", FaviconView.as_view(), name=\"favicon\"),\n re_path(r\"admin/\", admin.site.urls),\n re_path(\n r\"^fetch/\",\n include(\n [\n re_path(\n r\"^doc/(?P<pk>\\d+)$\",\n RedirectView.as_view(\n url=settings.BASE_URL + \"api/documents/%(pk)s/download/\",\n ),\n ),\n re_path(\n r\"^thumb/(?P<pk>\\d+)$\",\n RedirectView.as_view(\n url=settings.BASE_URL + \"api/documents/%(pk)s/thumb/\",\n ),\n ),\n re_path(\n r\"^preview/(?P<pk>\\d+)$\",\n RedirectView.as_view(\n url=settings.BASE_URL + \"api/documents/%(pk)s/preview/\",\n ),\n ),\n ],\n ),\n ),\n re_path(\n r\"^push$\",\n csrf_exempt(\n RedirectView.as_view(\n url=settings.BASE_URL + \"api/documents/post_document/\",\n ),\n ),\n ),\n # Frontend assets TODO: this is pretty bad, but it works.\n path(\n \"assets/<path:path>\",\n RedirectView.as_view(\n url=settings.STATIC_URL + \"frontend/en-US/assets/%(path)s\",\n ),\n ),\n # TODO: with localization, this is even worse! :/\n # login, logout\n path(\"accounts/\", include(\"django.contrib.auth.urls\")),\n # Root of the Frontent\n re_path(r\".*\", login_required(IndexView.as_view()), name=\"base\"),\n]\n\n\nwebsocket_urlpatterns = [\n re_path(r\"ws/status/$\", StatusConsumer.as_asgi()),\n]\n\n# Text in each page's <h1> (and above login form).\nadmin.site.site_header = \"Paperless-ngx\"\n# Text at the end of each page's <title>.\nadmin.site.site_title = \"Paperless-ngx\"\n# Text at the top of the admin index page.\nadmin.site.index_title = _(\"Paperless-ngx administration\")\n", "path": "src/paperless/urls.py" } ]
[ { "content": "from django.conf import settings\nfrom django.conf.urls import include\nfrom django.contrib import admin\nfrom django.contrib.auth.decorators import login_required\nfrom django.urls import path\nfrom django.urls import re_path\nfrom django.utils.translation import gettext_lazy as _\nfrom django.views.decorators.csrf import csrf_exempt\nfrom django.views.generic import RedirectView\nfrom documents.views import AcknowledgeTasksView\nfrom documents.views import BulkDownloadView\nfrom documents.views import BulkEditView\nfrom documents.views import CorrespondentViewSet\nfrom documents.views import DocumentTypeViewSet\nfrom documents.views import IndexView\nfrom documents.views import LogViewSet\nfrom documents.views import PostDocumentView\nfrom documents.views import RemoteVersionView\nfrom documents.views import SavedViewViewSet\nfrom documents.views import SearchAutoCompleteView\nfrom documents.views import SelectionDataView\nfrom documents.views import StatisticsView\nfrom documents.views import StoragePathViewSet\nfrom documents.views import TagViewSet\nfrom documents.views import TasksViewSet\nfrom documents.views import UiSettingsView\nfrom documents.views import UnifiedSearchViewSet\nfrom paperless.consumers import StatusConsumer\nfrom paperless.views import FaviconView\nfrom paperless_mail.views import MailAccountViewSet\nfrom paperless_mail.views import MailRuleViewSet\nfrom rest_framework.authtoken import views\nfrom rest_framework.routers import DefaultRouter\n\napi_router = DefaultRouter()\napi_router.register(r\"correspondents\", CorrespondentViewSet)\napi_router.register(r\"document_types\", DocumentTypeViewSet)\napi_router.register(r\"documents\", UnifiedSearchViewSet)\napi_router.register(r\"logs\", LogViewSet, basename=\"logs\")\napi_router.register(r\"tags\", TagViewSet)\napi_router.register(r\"saved_views\", SavedViewViewSet)\napi_router.register(r\"storage_paths\", StoragePathViewSet)\napi_router.register(r\"tasks\", TasksViewSet, basename=\"tasks\")\napi_router.register(r\"mail_accounts\", MailAccountViewSet)\napi_router.register(r\"mail_rules\", MailRuleViewSet)\n\n\nurlpatterns = [\n re_path(\n r\"^api/\",\n include(\n [\n re_path(\n r\"^auth/\",\n include(\n (\"rest_framework.urls\", \"rest_framework\"),\n namespace=\"rest_framework\",\n ),\n ),\n re_path(\n r\"^search/autocomplete/\",\n SearchAutoCompleteView.as_view(),\n name=\"autocomplete\",\n ),\n re_path(r\"^statistics/\", StatisticsView.as_view(), name=\"statistics\"),\n re_path(\n r\"^documents/post_document/\",\n PostDocumentView.as_view(),\n name=\"post_document\",\n ),\n re_path(\n r\"^documents/bulk_edit/\",\n BulkEditView.as_view(),\n name=\"bulk_edit\",\n ),\n re_path(\n r\"^documents/selection_data/\",\n SelectionDataView.as_view(),\n name=\"selection_data\",\n ),\n re_path(\n r\"^documents/bulk_download/\",\n BulkDownloadView.as_view(),\n name=\"bulk_download\",\n ),\n re_path(\n r\"^remote_version/\",\n RemoteVersionView.as_view(),\n name=\"remoteversion\",\n ),\n re_path(\n r\"^ui_settings/\",\n UiSettingsView.as_view(),\n name=\"ui_settings\",\n ),\n re_path(\n r\"^acknowledge_tasks/\",\n AcknowledgeTasksView.as_view(),\n name=\"acknowledge_tasks\",\n ),\n path(\"token/\", views.obtain_auth_token),\n ]\n + api_router.urls,\n ),\n ),\n re_path(r\"^favicon.ico$\", FaviconView.as_view(), name=\"favicon\"),\n re_path(r\"admin/\", admin.site.urls),\n re_path(\n r\"^fetch/\",\n include(\n [\n re_path(\n r\"^doc/(?P<pk>\\d+)$\",\n RedirectView.as_view(\n url=settings.BASE_URL + \"api/documents/%(pk)s/download/\",\n ),\n ),\n re_path(\n r\"^thumb/(?P<pk>\\d+)$\",\n RedirectView.as_view(\n url=settings.BASE_URL + \"api/documents/%(pk)s/thumb/\",\n ),\n ),\n re_path(\n r\"^preview/(?P<pk>\\d+)$\",\n RedirectView.as_view(\n url=settings.BASE_URL + \"api/documents/%(pk)s/preview/\",\n ),\n ),\n ],\n ),\n ),\n re_path(\n r\"^push$\",\n csrf_exempt(\n RedirectView.as_view(\n url=settings.BASE_URL + \"api/documents/post_document/\",\n ),\n ),\n ),\n # Frontend assets TODO: this is pretty bad, but it works.\n path(\n \"assets/<path:path>\",\n RedirectView.as_view(\n url=settings.STATIC_URL + \"frontend/en-US/assets/%(path)s\",\n ),\n ),\n # TODO: with localization, this is even worse! :/\n # login, logout\n path(\"accounts/\", include(\"django.contrib.auth.urls\")),\n # Root of the Frontent\n re_path(r\".*\", login_required(IndexView.as_view()), name=\"base\"),\n]\n\n\nwebsocket_urlpatterns = [\n path(settings.BASE_URL.lstrip(\"/\") + \"ws/status/\", StatusConsumer.as_asgi()),\n]\n\n# Text in each page's <h1> (and above login form).\nadmin.site.site_header = \"Paperless-ngx\"\n# Text at the end of each page's <title>.\nadmin.site.site_title = \"Paperless-ngx\"\n# Text at the top of the admin index page.\nadmin.site.index_title = _(\"Paperless-ngx administration\")\n", "path": "src/paperless/urls.py" } ]
diff --git a/src/paperless/urls.py b/src/paperless/urls.py index 8e8f4b40490..490be525a99 100644 --- a/src/paperless/urls.py +++ b/src/paperless/urls.py @@ -154,7 +154,7 @@ websocket_urlpatterns = [ - re_path(r"ws/status/$", StatusConsumer.as_asgi()), + path(settings.BASE_URL.lstrip("/") + "ws/status/", StatusConsumer.as_asgi()), ] # Text in each page's <h1> (and above login form).
marshmallow-code__webargs-385
[ { "content": "# -*- coding: utf-8 -*-\nimport sys\nimport re\nfrom setuptools import setup, find_packages\n\nINSTALL_REQUIRES = [\"marshmallow>=2.15.2\"]\nif sys.version_info[0] < 3:\n INSTALL_REQUIRES.append(\"simplejson>=2.1.0\")\n\nFRAMEWORKS = [\n \"Flask>=0.12.2\",\n \"Django>=1.11.16\",\n \"bottle>=0.12.13\",\n \"tornado>=4.5.2\",\n \"pyramid>=1.9.1\",\n \"webapp2>=3.0.0b1\",\n \"falcon>=1.4.0\",\n 'aiohttp>=3.0.0; python_version >= \"3.5\"',\n]\nEXTRAS_REQUIRE = {\n \"frameworks\": FRAMEWORKS,\n \"tests\": [\n \"pytest\",\n \"mock\",\n \"webtest==2.0.32\",\n 'webtest-aiohttp==2.0.0; python_version >= \"3.5\"',\n 'pytest-aiohttp>=0.3.0; python_version >= \"3.5\"',\n ]\n + FRAMEWORKS,\n \"lint\": [\n 'mypy==0.650; python_version >= \"3.5\"',\n \"flake8==3.6.0\",\n 'flake8-bugbear==18.8.0; python_version >= \"3.5\"',\n \"pre-commit==1.13.0\",\n ],\n}\nEXTRAS_REQUIRE[\"dev\"] = EXTRAS_REQUIRE[\"tests\"] + EXTRAS_REQUIRE[\"lint\"] + [\"tox\"]\n\n\ndef find_version(fname):\n \"\"\"Attempts to find the version number in the file names fname.\n Raises RuntimeError if not found.\n \"\"\"\n version = \"\"\n with open(fname, \"r\") as fp:\n reg = re.compile(r'__version__ = [\\'\"]([^\\'\"]*)[\\'\"]')\n for line in fp:\n m = reg.match(line)\n if m:\n version = m.group(1)\n break\n if not version:\n raise RuntimeError(\"Cannot find version information\")\n return version\n\n\ndef read(fname):\n with open(fname) as fp:\n content = fp.read()\n return content\n\n\nsetup(\n name=\"webargs\",\n version=find_version(\"src/webargs/__init__.py\"),\n description=(\n \"Declarative parsing and validation of HTTP request objects, \"\n \"with built-in support for popular web frameworks, including \"\n \"Flask, Django, Bottle, Tornado, Pyramid, webapp2, Falcon, and aiohttp.\"\n ),\n long_description=read(\"README.rst\"),\n author=\"Steven Loria\",\n author_email=\"sloria1@gmail.com\",\n url=\"https://github.com/marshmallow-code/webargs\",\n packages=find_packages(\"src\"),\n package_dir={\"\": \"src\"},\n install_requires=INSTALL_REQUIRES,\n extras_require=EXTRAS_REQUIRE,\n license=\"MIT\",\n zip_safe=False,\n keywords=(\n \"webargs\",\n \"http\",\n \"flask\",\n \"django\",\n \"bottle\",\n \"tornado\",\n \"aiohttp\",\n \"webapp2\",\n \"request\",\n \"arguments\",\n \"validation\",\n \"parameters\",\n \"rest\",\n \"api\",\n \"marshmallow\",\n ),\n classifiers=[\n \"Development Status :: 5 - Production/Stable\",\n \"Intended Audience :: Developers\",\n \"License :: OSI Approved :: MIT License\",\n \"Natural Language :: English\",\n \"Programming Language :: Python :: 2\",\n \"Programming Language :: Python :: 2.7\",\n \"Programming Language :: Python :: 3\",\n \"Programming Language :: Python :: 3.5\",\n \"Programming Language :: Python :: 3.6\",\n \"Programming Language :: Python :: 3.7\",\n \"Topic :: Internet :: WWW/HTTP :: Dynamic Content\",\n \"Topic :: Internet :: WWW/HTTP :: WSGI :: Application\",\n ],\n test_suite=\"tests\",\n project_urls={\n \"Changelog\": \"https://webargs.readthedocs.io/en/latest/changelog.html\",\n \"Issues\": \"https://github.com/marshmallow-code/webargs/issues\",\n \"Funding\": \"https://opencollective.com/marshmallow\",\n \"Tidelift\": \"https://tidelift.com/subscription/pkg/pypi-webargs?utm_source=pypi-marshmallow&utm_medium=pypi\", # noqa\n },\n)\n", "path": "setup.py" } ]
[ { "content": "# -*- coding: utf-8 -*-\nimport sys\nimport re\nfrom setuptools import setup, find_packages\n\nINSTALL_REQUIRES = [\"marshmallow>=2.15.2\"]\nif sys.version_info[0] < 3:\n INSTALL_REQUIRES.append(\"simplejson>=2.1.0\")\n\nFRAMEWORKS = [\n \"Flask>=0.12.2\",\n \"Django>=1.11.16\",\n \"bottle>=0.12.13\",\n \"tornado>=4.5.2\",\n \"pyramid>=1.9.1\",\n \"webapp2>=3.0.0b1\",\n \"falcon>=1.4.0,<2.0\",\n 'aiohttp>=3.0.0; python_version >= \"3.5\"',\n]\nEXTRAS_REQUIRE = {\n \"frameworks\": FRAMEWORKS,\n \"tests\": [\n \"pytest\",\n \"mock\",\n \"webtest==2.0.32\",\n 'webtest-aiohttp==2.0.0; python_version >= \"3.5\"',\n 'pytest-aiohttp>=0.3.0; python_version >= \"3.5\"',\n ]\n + FRAMEWORKS,\n \"lint\": [\n 'mypy==0.650; python_version >= \"3.5\"',\n \"flake8==3.6.0\",\n 'flake8-bugbear==18.8.0; python_version >= \"3.5\"',\n \"pre-commit==1.13.0\",\n ],\n}\nEXTRAS_REQUIRE[\"dev\"] = EXTRAS_REQUIRE[\"tests\"] + EXTRAS_REQUIRE[\"lint\"] + [\"tox\"]\n\n\ndef find_version(fname):\n \"\"\"Attempts to find the version number in the file names fname.\n Raises RuntimeError if not found.\n \"\"\"\n version = \"\"\n with open(fname, \"r\") as fp:\n reg = re.compile(r'__version__ = [\\'\"]([^\\'\"]*)[\\'\"]')\n for line in fp:\n m = reg.match(line)\n if m:\n version = m.group(1)\n break\n if not version:\n raise RuntimeError(\"Cannot find version information\")\n return version\n\n\ndef read(fname):\n with open(fname) as fp:\n content = fp.read()\n return content\n\n\nsetup(\n name=\"webargs\",\n version=find_version(\"src/webargs/__init__.py\"),\n description=(\n \"Declarative parsing and validation of HTTP request objects, \"\n \"with built-in support for popular web frameworks, including \"\n \"Flask, Django, Bottle, Tornado, Pyramid, webapp2, Falcon, and aiohttp.\"\n ),\n long_description=read(\"README.rst\"),\n author=\"Steven Loria\",\n author_email=\"sloria1@gmail.com\",\n url=\"https://github.com/marshmallow-code/webargs\",\n packages=find_packages(\"src\"),\n package_dir={\"\": \"src\"},\n install_requires=INSTALL_REQUIRES,\n extras_require=EXTRAS_REQUIRE,\n license=\"MIT\",\n zip_safe=False,\n keywords=(\n \"webargs\",\n \"http\",\n \"flask\",\n \"django\",\n \"bottle\",\n \"tornado\",\n \"aiohttp\",\n \"webapp2\",\n \"request\",\n \"arguments\",\n \"validation\",\n \"parameters\",\n \"rest\",\n \"api\",\n \"marshmallow\",\n ),\n classifiers=[\n \"Development Status :: 5 - Production/Stable\",\n \"Intended Audience :: Developers\",\n \"License :: OSI Approved :: MIT License\",\n \"Natural Language :: English\",\n \"Programming Language :: Python :: 2\",\n \"Programming Language :: Python :: 2.7\",\n \"Programming Language :: Python :: 3\",\n \"Programming Language :: Python :: 3.5\",\n \"Programming Language :: Python :: 3.6\",\n \"Programming Language :: Python :: 3.7\",\n \"Topic :: Internet :: WWW/HTTP :: Dynamic Content\",\n \"Topic :: Internet :: WWW/HTTP :: WSGI :: Application\",\n ],\n test_suite=\"tests\",\n project_urls={\n \"Changelog\": \"https://webargs.readthedocs.io/en/latest/changelog.html\",\n \"Issues\": \"https://github.com/marshmallow-code/webargs/issues\",\n \"Funding\": \"https://opencollective.com/marshmallow\",\n \"Tidelift\": \"https://tidelift.com/subscription/pkg/pypi-webargs?utm_source=pypi-marshmallow&utm_medium=pypi\", # noqa\n },\n)\n", "path": "setup.py" } ]
diff --git a/setup.py b/setup.py index 9d144912..f8657281 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ "tornado>=4.5.2", "pyramid>=1.9.1", "webapp2>=3.0.0b1", - "falcon>=1.4.0", + "falcon>=1.4.0,<2.0", 'aiohttp>=3.0.0; python_version >= "3.5"', ] EXTRAS_REQUIRE = {
AnalogJ__lexicon-164
[ { "content": "from __future__ import absolute_import\nfrom __future__ import print_function\n\nimport logging\n\nimport namecheap\n\nfrom .base import Provider as BaseProvider\n\nlogger = logging.getLogger(__name__)\n\n\ndef ProviderParser(subparser):\n subparser.add_argument(\n '--auth-token',\n help='specify api token used to authenticate'\n )\n subparser.add_argument(\n '--auth-username',\n help='specify email address used to authenticate'\n )\n # FIXME What is the client IP used for?\n subparser.add_argument(\n '--auth-client-ip',\n help='Client IP address to send to Namecheap API calls',\n default='127.0.0.1'\n )\n subparser.add_argument(\n '--auth-sandbox',\n help='Whether to use the sandbox server',\n action='store_true'\n )\n\nclass Provider(BaseProvider):\n\n def __init__(self, options, engine_overrides=None):\n super(Provider, self).__init__(options, engine_overrides)\n self.options = options\n self.client = namecheap.Api(\n ApiUser=options.get('auth_username',''),\n ApiKey=options.get('auth_token',''),\n UserName=options.get('auth_username',''),\n ClientIP=options.get('auth_client_ip',''),\n sandbox=options.get('auth_sandbox', False),\n debug=False\n )\n self.domain = self.options['domain']\n self.domain_id = None\n\n def authenticate(self):\n try:\n domain_names = [x['Name'] for x in self.client.domains_getList()]\n except namecheap.ApiError:\n raise Exception('Authentication failed')\n if self.domain not in domain_names:\n raise Exception('The domain {} is not controlled by this Namecheap '\n 'account'.format(self.domain))\n # FIXME What is this for?\n self.domain_id = self.domain\n\n # Create record. If record already exists with the same content, do nothing\n def create_record(self, type, name, content):\n record = {\n # required\n 'Type': type,\n 'Name': self._relative_name(name),\n 'Address': content\n }\n # logger.debug('create_record: %s', 'id' in payload)\n # return 'id' in payload\n self.client.domains_dns_addHost(self.domain, record)\n return True\n\n # List all records. Return an empty list if no records found.\n # type, name and content are used to filter records.\n # If possible filter during the query, otherwise filter after response is\n # received.\n def list_records(self, type=None, name=None, content=None, id=None):\n\n\n records = []\n raw_records = self.client.domains_dns_getHosts(self.domain)\n for record in raw_records:\n records.append(self._convert_to_lexicon(record))\n\n if id:\n records = [record for record in records if record['id'] == id]\n if type:\n records = [record for record in records if record['type'] == type]\n if name:\n if name.endswith('.'):\n name = name[:-1]\n records = [record for record in records if name in record['name'] ]\n if content:\n records = [record for record in records if record['content'].lower() == content.lower()]\n\n logger.debug('list_records: %s', records)\n return records\n\n # Create or update a record.\n def update_record(self, identifier, type=None, name=None, content=None):\n # Delete record if it exists\n self.delete_record(identifier, type, name, content)\n return self.create_record(type, name, content)\n\n # Delete an existing record.\n # If record does not exist, do nothing.\n def delete_record(self, identifier=None, type=None, name=None, content=None):\n\n record = self.list_records(type=type, name=name, content=content, id=identifier)\n if record:\n self.client.domains_dns_delHost(self.domain, self._convert_to_namecheap(record[0]))\n return True\n else:\n return False\n\n def _convert_to_namecheap(self, record):\n \"\"\" converts from lexicon format record to namecheap format record,\n suitable to sending through the api to namecheap\"\"\"\n\n name = record['name']\n if name.endswith('.'):\n name = name[:-1]\n\n short_name = name[:name.find(self.domain)-1]\n processed_record = {\n 'Type': record['type'],\n 'Name': short_name,\n 'TTL': record['ttl'],\n 'Address': record['content'],\n 'HostId': record['id']\n }\n\n return processed_record\n\n def _convert_to_lexicon(self, record):\n \"\"\" converts from namecheap raw record format to lexicon format record\n \"\"\"\n\n name = record['Name']\n if self.domain not in name:\n name = \"{}.{}\".format(name,self.domain)\n\n processed_record = {\n 'type': record['Type'],\n 'name': '{0}.{1}'.format(record['Name'], self.domain),\n 'ttl': record['TTL'],\n 'content': record['Address'],\n 'id': record['HostId']\n }\n\n return processed_record\n", "path": "lexicon/providers/namecheap.py" } ]
[ { "content": "from __future__ import absolute_import\nfrom __future__ import print_function\n\nimport logging\n\n\nfrom .base import Provider as BaseProvider\n\ntry:\n import namecheap #optional dep\nexcept ImportError:\n pass\n\nlogger = logging.getLogger(__name__)\n\n\ndef ProviderParser(subparser):\n subparser.add_argument(\n '--auth-token',\n help='specify api token used to authenticate'\n )\n subparser.add_argument(\n '--auth-username',\n help='specify email address used to authenticate'\n )\n # FIXME What is the client IP used for?\n subparser.add_argument(\n '--auth-client-ip',\n help='Client IP address to send to Namecheap API calls',\n default='127.0.0.1'\n )\n subparser.add_argument(\n '--auth-sandbox',\n help='Whether to use the sandbox server',\n action='store_true'\n )\n\nclass Provider(BaseProvider):\n\n def __init__(self, options, engine_overrides=None):\n super(Provider, self).__init__(options, engine_overrides)\n self.options = options\n self.client = namecheap.Api(\n ApiUser=options.get('auth_username',''),\n ApiKey=options.get('auth_token',''),\n UserName=options.get('auth_username',''),\n ClientIP=options.get('auth_client_ip',''),\n sandbox=options.get('auth_sandbox', False),\n debug=False\n )\n self.domain = self.options['domain']\n self.domain_id = None\n\n def authenticate(self):\n try:\n domain_names = [x['Name'] for x in self.client.domains_getList()]\n except namecheap.ApiError:\n raise Exception('Authentication failed')\n if self.domain not in domain_names:\n raise Exception('The domain {} is not controlled by this Namecheap '\n 'account'.format(self.domain))\n # FIXME What is this for?\n self.domain_id = self.domain\n\n # Create record. If record already exists with the same content, do nothing\n def create_record(self, type, name, content):\n record = {\n # required\n 'Type': type,\n 'Name': self._relative_name(name),\n 'Address': content\n }\n # logger.debug('create_record: %s', 'id' in payload)\n # return 'id' in payload\n self.client.domains_dns_addHost(self.domain, record)\n return True\n\n # List all records. Return an empty list if no records found.\n # type, name and content are used to filter records.\n # If possible filter during the query, otherwise filter after response is\n # received.\n def list_records(self, type=None, name=None, content=None, id=None):\n\n\n records = []\n raw_records = self.client.domains_dns_getHosts(self.domain)\n for record in raw_records:\n records.append(self._convert_to_lexicon(record))\n\n if id:\n records = [record for record in records if record['id'] == id]\n if type:\n records = [record for record in records if record['type'] == type]\n if name:\n if name.endswith('.'):\n name = name[:-1]\n records = [record for record in records if name in record['name'] ]\n if content:\n records = [record for record in records if record['content'].lower() == content.lower()]\n\n logger.debug('list_records: %s', records)\n return records\n\n # Create or update a record.\n def update_record(self, identifier, type=None, name=None, content=None):\n # Delete record if it exists\n self.delete_record(identifier, type, name, content)\n return self.create_record(type, name, content)\n\n # Delete an existing record.\n # If record does not exist, do nothing.\n def delete_record(self, identifier=None, type=None, name=None, content=None):\n\n record = self.list_records(type=type, name=name, content=content, id=identifier)\n if record:\n self.client.domains_dns_delHost(self.domain, self._convert_to_namecheap(record[0]))\n return True\n else:\n return False\n\n def _convert_to_namecheap(self, record):\n \"\"\" converts from lexicon format record to namecheap format record,\n suitable to sending through the api to namecheap\"\"\"\n\n name = record['name']\n if name.endswith('.'):\n name = name[:-1]\n\n short_name = name[:name.find(self.domain)-1]\n processed_record = {\n 'Type': record['type'],\n 'Name': short_name,\n 'TTL': record['ttl'],\n 'Address': record['content'],\n 'HostId': record['id']\n }\n\n return processed_record\n\n def _convert_to_lexicon(self, record):\n \"\"\" converts from namecheap raw record format to lexicon format record\n \"\"\"\n\n name = record['Name']\n if self.domain not in name:\n name = \"{}.{}\".format(name,self.domain)\n\n processed_record = {\n 'type': record['Type'],\n 'name': '{0}.{1}'.format(record['Name'], self.domain),\n 'ttl': record['TTL'],\n 'content': record['Address'],\n 'id': record['HostId']\n }\n\n return processed_record\n", "path": "lexicon/providers/namecheap.py" } ]
diff --git a/lexicon/providers/namecheap.py b/lexicon/providers/namecheap.py index 2a9f36ae0..39a7053db 100644 --- a/lexicon/providers/namecheap.py +++ b/lexicon/providers/namecheap.py @@ -3,10 +3,14 @@ import logging -import namecheap from .base import Provider as BaseProvider +try: + import namecheap #optional dep +except ImportError: + pass + logger = logging.getLogger(__name__)
ivy-llc__ivy-19479
[ { "content": "# global\n\n# local\nimport ivy\nimport ivy.functional.frontends.numpy as np_frontend\nfrom ivy.functional.frontends.numpy.func_wrapper import _to_ivy_array\n\n\nclass ndarray:\n def __init__(self, shape, dtype=\"float32\", order=None, _init_overload=False):\n if isinstance(dtype, np_frontend.dtype):\n dtype = dtype.ivy_dtype\n\n # in thise case shape is actually the desired array\n if _init_overload:\n self._ivy_array = (\n ivy.array(shape) if not isinstance(shape, ivy.Array) else shape\n )\n else:\n self._ivy_array = ivy.empty(shape=shape, dtype=dtype)\n\n ivy.utils.assertions.check_elem_in_list(\n order,\n [\"C\", \"F\", None],\n message=\"order must be one of 'C', 'F'\",\n )\n if order == \"F\":\n self._f_contiguous = True\n else:\n self._f_contiguous = False\n\n def __repr__(self):\n return str(self.ivy_array.__repr__()).replace(\n \"ivy.array\", \"ivy.frontends.numpy.ndarray\"\n )\n\n # Properties #\n # ---------- #\n\n @property\n def ivy_array(self):\n return self._ivy_array\n\n @property\n def T(self):\n return np_frontend.transpose(self)\n\n @property\n def shape(self):\n return self.ivy_array.shape\n\n @property\n def size(self):\n return self.ivy_array.size\n\n @property\n def dtype(self):\n return self.ivy_array.dtype\n\n @property\n def ndim(self):\n return len(self.shape)\n\n @property\n def flat(self):\n self = self.flatten()\n return self\n\n # Setters #\n # --------#\n\n @ivy_array.setter\n def ivy_array(self, array):\n self._ivy_array = (\n ivy.array(array) if not isinstance(array, ivy.Array) else array\n )\n\n # Instance Methods #\n # ---------------- #\n\n def astype(self, dtype, order=\"K\", casting=\"unsafe\", subok=True, copy=True):\n ivy.utils.assertions.check_elem_in_list(\n order,\n [\"C\", \"F\", \"A\", \"K\"],\n message=\"order must be one of 'C', 'F', or 'A'\",\n )\n if copy and self._f_contiguous:\n ret = np_frontend.array(self.ivy_array, order=\"F\")\n else:\n ret = np_frontend.array(self.ivy_array) if copy else self\n\n dtype = np_frontend.to_ivy_dtype(dtype)\n if np_frontend.can_cast(ret, dtype, casting=casting):\n ret.ivy_array = ret.ivy_array.astype(dtype)\n else:\n raise ivy.utils.exceptions.IvyException(\n f\"Cannot cast array data from dtype('{ret.ivy_array.dtype}')\"\n f\" to dtype('{dtype}') according to the rule '{casting}'\"\n )\n if order == \"F\":\n ret._f_contiguous = True\n elif order == \"C\":\n ret._f_contiguous = False\n return ret\n\n def argmax(\n self,\n /,\n *,\n axis=None,\n out=None,\n keepdims=False,\n ):\n return np_frontend.argmax(\n self,\n axis=axis,\n out=out,\n keepdims=keepdims,\n )\n\n def reshape(self, newshape, /, *, order=\"C\"):\n ivy.utils.assertions.check_elem_in_list(\n order,\n [\"C\", \"F\", \"A\"],\n message=\"order must be one of 'C', 'F', or 'A'\",\n )\n if (order == \"A\" and self._f_contiguous) or order == \"F\":\n return np_frontend.reshape(self, newshape, order=\"F\")\n else:\n return np_frontend.reshape(self, newshape, order=\"C\")\n\n def resize(self, newshape, /, *, refcheck=True):\n return np_frontend.resize(self, newshape, refcheck)\n\n def transpose(self, axes, /):\n if axes and isinstance(axes[0], tuple):\n axes = axes[0]\n return np_frontend.transpose(self, axes=axes)\n\n def swapaxes(self, axis1, axis2, /):\n return np_frontend.swapaxes(self, axis1, axis2)\n\n def all(self, axis=None, out=None, keepdims=False, *, where=True):\n return np_frontend.all(self, axis, out, keepdims, where=where)\n\n def any(self, axis=None, out=None, keepdims=False, *, where=True):\n return np_frontend.any(self, axis, out, keepdims, where=where)\n\n def argsort(self, *, axis=-1, kind=None, order=None):\n return np_frontend.argsort(self, axis=axis, kind=kind, order=order)\n\n def mean(self, *, axis=None, dtype=None, out=None, keepdims=False, where=True):\n return np_frontend.mean(\n self,\n axis=axis,\n dtype=dtype,\n out=out,\n keepdims=keepdims,\n where=where,\n )\n\n def min(self, *, axis=None, out=None, keepdims=False, initial=None, where=True):\n return np_frontend.amin(\n self,\n axis=axis,\n out=out,\n keepdims=keepdims,\n initial=initial,\n where=where,\n )\n\n def max(self, *, axis=None, out=None, keepdims=False, initial=None, where=True):\n return np_frontend.amax(\n self,\n axis=axis,\n out=out,\n keepdims=keepdims,\n initial=initial,\n where=where,\n )\n\n def argmin(\n self,\n /,\n *,\n axis=None,\n keepdims=False,\n out=None,\n ):\n return np_frontend.argmin(\n self,\n axis=axis,\n keepdims=keepdims,\n out=out,\n )\n\n def clip(\n self,\n min,\n max,\n /,\n out=None,\n *,\n where=True,\n casting=\"same_kind\",\n order=\"K\",\n dtype=None,\n subok=True,\n ):\n return np_frontend.clip(\n self,\n min,\n max,\n out=out,\n where=where,\n casting=casting,\n order=order,\n dtype=dtype,\n subok=subok,\n )\n\n def compress(self, condition, axis=None, out=None):\n return np_frontend.compress(\n condition=condition,\n a=self,\n axis=axis,\n out=out,\n )\n\n def conj(\n self,\n /,\n out=None,\n *,\n where=True,\n casting=\"same_kind\",\n order=\"K\",\n dtype=None,\n subok=True,\n ):\n return np_frontend.conj(\n self.ivy_array,\n out=out,\n where=where,\n casting=casting,\n order=order,\n dtype=dtype,\n subok=subok,\n )\n\n def cumprod(self, *, axis=None, dtype=None, out=None):\n return np_frontend.cumprod(\n self,\n axis=axis,\n dtype=dtype,\n out=out,\n )\n\n def cumsum(self, *, axis=None, dtype=None, out=None):\n return np_frontend.cumsum(\n self,\n axis=axis,\n dtype=dtype,\n out=out,\n )\n\n def dot(self, b, out=None):\n return np_frontend.dot(self, b, out=out)\n\n def diagonal(self, *, offset=0, axis1=0, axis2=1):\n return np_frontend.diagonal(\n self,\n offset=offset,\n axis1=axis1,\n axis2=axis2,\n )\n\n def sort(self, *, axis=-1, kind=None, order=None):\n return np_frontend.sort(self, axis=axis, kind=kind, order=order)\n\n def copy(self, order=\"C\"):\n return np_frontend.copy(self, order=order)\n\n def nonzero(\n self,\n ):\n return np_frontend.nonzero(self)[0]\n\n def ravel(self, order=\"C\"):\n ivy.utils.assertions.check_elem_in_list(\n order,\n [\"C\", \"F\", \"A\", \"K\"],\n message=\"order must be one of 'C', 'F', 'A', or 'K'\",\n )\n if (order in [\"K\", \"A\"] and self._f_contiguous) or order == \"F\":\n return np_frontend.ravel(self, order=\"F\")\n else:\n return np_frontend.ravel(self, order=\"C\")\n\n def flatten(self, order=\"C\"):\n ivy.utils.assertions.check_elem_in_list(\n order,\n [\"C\", \"F\", \"A\", \"K\"],\n message=\"order must be one of 'C', 'F', 'A', or 'K'\",\n )\n if (order in [\"K\", \"A\"] and self._f_contiguous) or order == \"F\":\n return np_frontend.ravel(self, order=\"F\")\n else:\n return np_frontend.ravel(self, order=\"C\")\n\n def fill(self, num):\n return np_frontend.fill(self, num)\n\n def repeat(self, repeats, axis=None):\n return np_frontend.repeat(self, repeats, axis=axis)\n\n def searchsorted(self, v, side=\"left\", sorter=None):\n return np_frontend.searchsorted(self, v, side=side, sorter=sorter)\n\n def squeeze(self, axis=None):\n return np_frontend.squeeze(self, axis=axis)\n\n def std(\n self, axis=None, dtype=None, out=None, ddof=0, keepdims=False, *, where=True\n ):\n return np_frontend.std(\n self,\n axis=axis,\n dtype=dtype,\n out=out,\n ddof=ddof,\n keepdims=keepdims,\n where=where,\n )\n\n def tobytes(self, order=\"C\") -> bytes:\n return np_frontend.tobytes(self, order=order)\n\n def tostring(self, order=\"C\") -> bytes:\n return np_frontend.tobytes(self.data, order=order)\n\n def prod(\n self,\n *,\n axis=None,\n dtype=None,\n out=None,\n keepdims=False,\n initial=None,\n where=True,\n ):\n return np_frontend.prod(\n self,\n axis=axis,\n dtype=dtype,\n keepdims=keepdims,\n initial=initial,\n where=where,\n out=out,\n )\n\n def tofile(self, fid, /, sep=\"\", format_=\"%s\"):\n if self.ndim == 0:\n string = str(self)\n else:\n string = sep.join([str(item) for item in self.tolist()])\n with open(fid, \"w\") as f:\n f.write(string)\n\n def tolist(self) -> list:\n return self._ivy_array.to_list()\n\n def view(self):\n return np_frontend.reshape(self, tuple(self.shape))\n\n def __add__(self, value, /):\n return np_frontend.add(self, value)\n\n def __radd__(self, value, /):\n return np_frontend.add(self, value)\n\n def __sub__(self, value, /):\n return np_frontend.subtract(self, value)\n\n def __mul__(self, value, /):\n return np_frontend.multiply(self, value)\n\n def __rmul__(self, value, /):\n return np_frontend.multiply(value, self)\n\n def __truediv__(self, value, /):\n return np_frontend.true_divide(self, value)\n\n def __floordiv__(self, value, /):\n return np_frontend.floor_divide(self, value)\n\n def __rtruediv__(self, value, /):\n return np_frontend.true_divide(value, self)\n\n def __pow__(self, value, /):\n return np_frontend.power(self, value)\n\n def __and__(self, value, /):\n return np_frontend.logical_and(self, value)\n\n def __or__(self, value, /):\n return np_frontend.logical_or(self, value)\n\n def __xor__(self, value, /):\n return np_frontend.logical_xor(self, value)\n\n def __matmul__(self, value, /):\n return np_frontend.matmul(self, value)\n\n def __copy__(\n self,\n ):\n return np_frontend.copy(self)\n\n def __deepcopy__(self, memo, /):\n return self.ivy_array.__deepcopy__(memo)\n\n def __neg__(\n self,\n ):\n return np_frontend.negative(self)\n\n def __pos__(\n self,\n ):\n return np_frontend.positive(self)\n\n def __bool__(\n self,\n ):\n if isinstance(self.ivy_array, int):\n return self.ivy_array != 0\n\n temp = ivy.squeeze(ivy.asarray(self.ivy_array), axis=None)\n shape = ivy.shape(temp)\n if shape:\n raise ValueError(\n \"The truth value of an array with more than one element is ambiguous. \"\n \"Use a.any() or a.all()\"\n )\n\n return temp != 0\n\n def __ne__(self, value, /):\n return np_frontend.not_equal(self, value)\n\n def __len__(self):\n return len(self.ivy_array)\n\n def __eq__(self, value, /):\n return np_frontend.equal(self, value)\n\n def __ge__(self, value, /):\n return np_frontend.greater_equal(self, value)\n\n def __gt__(self, value, /):\n return np_frontend.greater(self, value)\n\n def __le__(self, value, /):\n return np_frontend.less_equal(self, value)\n\n def __lt__(self, value, /):\n return np_frontend.less(self, value)\n\n def __int__(\n self,\n ):\n return ivy.to_scalar(ivy.reshape(self.ivy_array, (-1,)).astype(ivy.int64))\n\n def __float__(\n self,\n ):\n return ivy.to_scalar(ivy.reshape(self.ivy_array, (-1,)).astype(ivy.float64))\n\n def __complex__(\n self,\n ):\n return ivy.to_scalar(ivy.reshape(self.ivy_array, (-1,)).astype(ivy.complex128))\n\n def __contains__(self, key, /):\n return key in ivy.reshape(self.ivy_array, -1)\n\n def __iadd__(self, value, /):\n return np_frontend.add(self, value, out=self)\n\n def __isub__(self, value, /):\n return np_frontend.subtract(self, value, out=self)\n\n def __imul__(self, value, /):\n return np_frontend.multiply(self, value, out=self)\n\n def __itruediv__(self, value, /):\n return np_frontend.true_divide(self, value, out=self)\n\n def __ifloordiv__(self, value, /):\n return np_frontend.floor_divide(self, value, out=self)\n\n def __ipow__(self, value, /):\n return np_frontend.power(self, value, out=self)\n\n def __iand__(self, value, /):\n return np_frontend.logical_and(self, value, out=self)\n\n def __ior__(self, value, /):\n return np_frontend.logical_or(self, value, out=self)\n\n def __ixor__(self, value, /):\n return np_frontend.logical_xor(self, value, out=self)\n\n def __imod__(self, value, /):\n return np_frontend.mod(self, value, out=self)\n\n def __invert__(self, /):\n return ivy.bitwise_invert(self.ivy_array)\n\n def __abs__(self):\n return np_frontend.absolute(self)\n\n def __array__(self, dtype=None, /):\n if not dtype:\n return self\n return np_frontend.array(self, dtype=dtype)\n\n def __array_wrap__(self, array, context=None, /):\n if context is None:\n return np_frontend.array(array)\n else:\n return np_frontend.asarray(self)\n\n def __getitem__(self, key, /):\n ivy_args = ivy.nested_map([self, key], _to_ivy_array)\n ret = ivy.get_item(*ivy_args)\n return np_frontend.ndarray(ret, _init_overload=True)\n\n def __setitem__(self, key, value, /):\n key, value = ivy.nested_map([key, value], _to_ivy_array)\n self.ivy_array[key] = value\n\n def __iter__(self):\n if self.ndim == 0:\n raise TypeError(\"iteration over a 0-d ndarray not supported\")\n for i in range(self.shape[0]):\n yield self[i]\n\n def __mod__(self, value, /):\n return np_frontend.mod(self, value, out=self)\n\n def ptp(self, *, axis=None, out=None, keepdims=False):\n xmax = self.max(axis=axis, out=out, keepdims=keepdims)\n xmin = self.min(axis=axis, out=out, keepdims=keepdims)\n return np_frontend.subtract(xmax, xmin)\n\n def __rshift__(self, value, /):\n return ivy.bitwise_right_shift(self.ivy_array, value)\n", "path": "ivy/functional/frontends/numpy/ndarray/ndarray.py" } ]
[ { "content": "# global\n\n# local\nimport ivy\nimport ivy.functional.frontends.numpy as np_frontend\nfrom ivy.functional.frontends.numpy.func_wrapper import _to_ivy_array\n\n\nclass ndarray:\n def __init__(self, shape, dtype=\"float32\", order=None, _init_overload=False):\n if isinstance(dtype, np_frontend.dtype):\n dtype = dtype.ivy_dtype\n\n # in thise case shape is actually the desired array\n if _init_overload:\n self._ivy_array = (\n ivy.array(shape) if not isinstance(shape, ivy.Array) else shape\n )\n else:\n self._ivy_array = ivy.empty(shape=shape, dtype=dtype)\n\n ivy.utils.assertions.check_elem_in_list(\n order,\n [\"C\", \"F\", None],\n message=\"order must be one of 'C', 'F'\",\n )\n if order == \"F\":\n self._f_contiguous = True\n else:\n self._f_contiguous = False\n\n def __repr__(self):\n return str(self.ivy_array.__repr__()).replace(\n \"ivy.array\", \"ivy.frontends.numpy.ndarray\"\n )\n\n # Properties #\n # ---------- #\n\n @property\n def ivy_array(self):\n return self._ivy_array\n\n @property\n def T(self):\n return np_frontend.transpose(self)\n\n @property\n def shape(self):\n return self.ivy_array.shape\n\n @property\n def size(self):\n return self.ivy_array.size\n\n @property\n def dtype(self):\n return self.ivy_array.dtype\n\n @property\n def ndim(self):\n return len(self.shape)\n\n @property\n def flat(self):\n self = self.flatten()\n return self\n\n # Setters #\n # --------#\n\n @ivy_array.setter\n def ivy_array(self, array):\n self._ivy_array = (\n ivy.array(array) if not isinstance(array, ivy.Array) else array\n )\n\n # Instance Methods #\n # ---------------- #\n\n def astype(self, dtype, order=\"K\", casting=\"unsafe\", subok=True, copy=True):\n ivy.utils.assertions.check_elem_in_list(\n order,\n [\"C\", \"F\", \"A\", \"K\"],\n message=\"order must be one of 'C', 'F', or 'A'\",\n )\n if copy and self._f_contiguous:\n ret = np_frontend.array(self.ivy_array, order=\"F\")\n else:\n ret = np_frontend.array(self.ivy_array) if copy else self\n\n dtype = np_frontend.to_ivy_dtype(dtype)\n if np_frontend.can_cast(ret, dtype, casting=casting):\n ret.ivy_array = ret.ivy_array.astype(dtype)\n else:\n raise ivy.utils.exceptions.IvyException(\n f\"Cannot cast array data from dtype('{ret.ivy_array.dtype}')\"\n f\" to dtype('{dtype}') according to the rule '{casting}'\"\n )\n if order == \"F\":\n ret._f_contiguous = True\n elif order == \"C\":\n ret._f_contiguous = False\n return ret\n\n def argmax(\n self,\n /,\n *,\n axis=None,\n out=None,\n keepdims=False,\n ):\n return np_frontend.argmax(\n self,\n axis=axis,\n out=out,\n keepdims=keepdims,\n )\n\n def reshape(self, newshape, /, *, order=\"C\"):\n ivy.utils.assertions.check_elem_in_list(\n order,\n [\"C\", \"F\", \"A\"],\n message=\"order must be one of 'C', 'F', or 'A'\",\n )\n if (order == \"A\" and self._f_contiguous) or order == \"F\":\n return np_frontend.reshape(self, newshape, order=\"F\")\n else:\n return np_frontend.reshape(self, newshape, order=\"C\")\n\n def resize(self, newshape, /, *, refcheck=True):\n return np_frontend.resize(self, newshape, refcheck)\n\n def transpose(self, axes, /):\n if axes and isinstance(axes[0], tuple):\n axes = axes[0]\n return np_frontend.transpose(self, axes=axes)\n\n def swapaxes(self, axis1, axis2, /):\n return np_frontend.swapaxes(self, axis1, axis2)\n\n def all(self, axis=None, out=None, keepdims=False, *, where=True):\n return np_frontend.all(self, axis, out, keepdims, where=where)\n\n def any(self, axis=None, out=None, keepdims=False, *, where=True):\n return np_frontend.any(self, axis, out, keepdims, where=where)\n\n def argsort(self, *, axis=-1, kind=None, order=None):\n return np_frontend.argsort(self, axis=axis, kind=kind, order=order)\n\n def mean(self, *, axis=None, dtype=None, out=None, keepdims=False, where=True):\n return np_frontend.mean(\n self,\n axis=axis,\n dtype=dtype,\n out=out,\n keepdims=keepdims,\n where=where,\n )\n\n def min(self, *, axis=None, out=None, keepdims=False, initial=None, where=True):\n return np_frontend.amin(\n self,\n axis=axis,\n out=out,\n keepdims=keepdims,\n initial=initial,\n where=where,\n )\n\n def max(self, *, axis=None, out=None, keepdims=False, initial=None, where=True):\n return np_frontend.amax(\n self,\n axis=axis,\n out=out,\n keepdims=keepdims,\n initial=initial,\n where=where,\n )\n\n def argmin(\n self,\n /,\n *,\n axis=None,\n keepdims=False,\n out=None,\n ):\n return np_frontend.argmin(\n self,\n axis=axis,\n keepdims=keepdims,\n out=out,\n )\n\n def clip(\n self,\n min,\n max,\n /,\n out=None,\n *,\n where=True,\n casting=\"same_kind\",\n order=\"K\",\n dtype=None,\n subok=True,\n ):\n return np_frontend.clip(\n self,\n min,\n max,\n out=out,\n where=where,\n casting=casting,\n order=order,\n dtype=dtype,\n subok=subok,\n )\n\n def compress(self, condition, axis=None, out=None):\n return np_frontend.compress(\n condition=condition,\n a=self,\n axis=axis,\n out=out,\n )\n\n def conj(\n self,\n /,\n out=None,\n *,\n where=True,\n casting=\"same_kind\",\n order=\"K\",\n dtype=None,\n subok=True,\n ):\n return np_frontend.conj(\n self.ivy_array,\n out=out,\n where=where,\n casting=casting,\n order=order,\n dtype=dtype,\n subok=subok,\n )\n\n def cumprod(self, *, axis=None, dtype=None, out=None):\n return np_frontend.cumprod(\n self,\n axis=axis,\n dtype=dtype,\n out=out,\n )\n\n def cumsum(self, *, axis=None, dtype=None, out=None):\n return np_frontend.cumsum(\n self,\n axis=axis,\n dtype=dtype,\n out=out,\n )\n\n def dot(self, b, out=None):\n return np_frontend.dot(self, b, out=out)\n\n def diagonal(self, *, offset=0, axis1=0, axis2=1):\n return np_frontend.diagonal(\n self,\n offset=offset,\n axis1=axis1,\n axis2=axis2,\n )\n\n def sort(self, *, axis=-1, kind=None, order=None):\n return np_frontend.sort(self, axis=axis, kind=kind, order=order)\n\n def copy(self, order=\"C\"):\n return np_frontend.copy(self, order=order)\n\n def nonzero(\n self,\n ):\n return np_frontend.nonzero(self)[0]\n\n def ravel(self, order=\"C\"):\n ivy.utils.assertions.check_elem_in_list(\n order,\n [\"C\", \"F\", \"A\", \"K\"],\n message=\"order must be one of 'C', 'F', 'A', or 'K'\",\n )\n if (order in [\"K\", \"A\"] and self._f_contiguous) or order == \"F\":\n return np_frontend.ravel(self, order=\"F\")\n else:\n return np_frontend.ravel(self, order=\"C\")\n\n def flatten(self, order=\"C\"):\n ivy.utils.assertions.check_elem_in_list(\n order,\n [\"C\", \"F\", \"A\", \"K\"],\n message=\"order must be one of 'C', 'F', 'A', or 'K'\",\n )\n if (order in [\"K\", \"A\"] and self._f_contiguous) or order == \"F\":\n return np_frontend.ravel(self, order=\"F\")\n else:\n return np_frontend.ravel(self, order=\"C\")\n\n def fill(self, num):\n return np_frontend.fill(self, num)\n\n def repeat(self, repeats, axis=None):\n return np_frontend.repeat(self, repeats, axis=axis)\n\n def searchsorted(self, v, side=\"left\", sorter=None):\n return np_frontend.searchsorted(self, v, side=side, sorter=sorter)\n\n def squeeze(self, axis=None):\n return np_frontend.squeeze(self, axis=axis)\n\n def std(\n self, axis=None, dtype=None, out=None, ddof=0, keepdims=False, *, where=True\n ):\n return np_frontend.std(\n self,\n axis=axis,\n dtype=dtype,\n out=out,\n ddof=ddof,\n keepdims=keepdims,\n where=where,\n )\n\n def tobytes(self, order=\"C\") -> bytes:\n return np_frontend.tobytes(self, order=order)\n\n def tostring(self, order=\"C\") -> bytes:\n return np_frontend.tobytes(self.data, order=order)\n\n def prod(\n self,\n *,\n axis=None,\n dtype=None,\n out=None,\n keepdims=False,\n initial=None,\n where=True,\n ):\n return np_frontend.prod(\n self,\n axis=axis,\n dtype=dtype,\n keepdims=keepdims,\n initial=initial,\n where=where,\n out=out,\n )\n\n def tofile(self, fid, /, sep=\"\", format_=\"%s\"):\n if self.ndim == 0:\n string = str(self)\n else:\n string = sep.join([str(item) for item in self.tolist()])\n with open(fid, \"w\") as f:\n f.write(string)\n\n def tolist(self) -> list:\n return self._ivy_array.to_list()\n\n def view(self):\n return np_frontend.reshape(self, tuple(self.shape))\n\n def __add__(self, value, /):\n return np_frontend.add(self, value)\n\n def __radd__(self, value, /):\n return np_frontend.add(self, value)\n\n def __sub__(self, value, /):\n return np_frontend.subtract(self, value)\n\n def __mul__(self, value, /):\n return np_frontend.multiply(self, value)\n\n def __rmul__(self, value, /):\n return np_frontend.multiply(value, self)\n\n def __truediv__(self, value, /):\n return np_frontend.true_divide(self, value)\n\n def __floordiv__(self, value, /):\n return np_frontend.floor_divide(self, value)\n\n def __rtruediv__(self, value, /):\n return np_frontend.true_divide(value, self)\n\n def __pow__(self, value, /):\n return np_frontend.power(self, value)\n\n def __and__(self, value, /):\n return np_frontend.logical_and(self, value)\n\n def __or__(self, value, /):\n return np_frontend.logical_or(self, value)\n\n def __xor__(self, value, /):\n return np_frontend.logical_xor(self, value)\n\n def __matmul__(self, value, /):\n return np_frontend.matmul(self, value)\n\n def __copy__(\n self,\n ):\n return np_frontend.copy(self)\n\n def __deepcopy__(self, memo, /):\n return self.ivy_array.__deepcopy__(memo)\n\n def __neg__(\n self,\n ):\n return np_frontend.negative(self)\n\n def __pos__(\n self,\n ):\n return np_frontend.positive(self)\n\n def __bool__(\n self,\n ):\n if isinstance(self.ivy_array, int):\n return self.ivy_array != 0\n\n temp = ivy.squeeze(ivy.asarray(self.ivy_array), axis=None)\n shape = ivy.shape(temp)\n if shape:\n raise ValueError(\n \"The truth value of an array with more than one element is ambiguous. \"\n \"Use a.any() or a.all()\"\n )\n\n return temp != 0\n\n def __ne__(self, value, /):\n return np_frontend.not_equal(self, value)\n\n def __len__(self):\n return len(self.ivy_array)\n\n def __eq__(self, value, /):\n return np_frontend.equal(self, value)\n\n def __ge__(self, value, /):\n return np_frontend.greater_equal(self, value)\n\n def __gt__(self, value, /):\n return np_frontend.greater(self, value)\n\n def __le__(self, value, /):\n return np_frontend.less_equal(self, value)\n\n def __lt__(self, value, /):\n return np_frontend.less(self, value)\n\n def __int__(\n self,\n ):\n return ivy.to_scalar(ivy.reshape(self.ivy_array, (-1,)).astype(ivy.int64))\n\n def __float__(\n self,\n ):\n return ivy.to_scalar(ivy.reshape(self.ivy_array, (-1,)).astype(ivy.float64))\n\n def __complex__(\n self,\n ):\n return ivy.to_scalar(ivy.reshape(self.ivy_array, (-1,)).astype(ivy.complex128))\n\n def __contains__(self, key, /):\n return key in ivy.reshape(self.ivy_array, -1)\n\n def __iadd__(self, value, /):\n return np_frontend.add(self, value, out=self)\n\n def __isub__(self, value, /):\n return np_frontend.subtract(self, value, out=self)\n\n def __imul__(self, value, /):\n return np_frontend.multiply(self, value, out=self)\n\n def __itruediv__(self, value, /):\n return np_frontend.true_divide(self, value, out=self)\n\n def __ifloordiv__(self, value, /):\n return np_frontend.floor_divide(self, value, out=self)\n\n def __ipow__(self, value, /):\n return np_frontend.power(self, value, out=self)\n\n def __iand__(self, value, /):\n return np_frontend.logical_and(self, value, out=self)\n\n def __ior__(self, value, /):\n return np_frontend.logical_or(self, value, out=self)\n\n def __ixor__(self, value, /):\n return np_frontend.logical_xor(self, value, out=self)\n\n def __imod__(self, value, /):\n return np_frontend.mod(self, value, out=self)\n\n def __invert__(self, /):\n return ivy.bitwise_invert(self.ivy_array)\n\n def __abs__(self):\n return np_frontend.absolute(self)\n\n def __array__(self, dtype=None, /):\n if not dtype:\n return self\n return np_frontend.array(self, dtype=dtype)\n\n def __array_wrap__(self, array, context=None, /):\n if context is None:\n return np_frontend.array(array)\n else:\n return np_frontend.asarray(self)\n\n def __getitem__(self, key, /):\n ivy_args = ivy.nested_map([self, key], _to_ivy_array)\n ret = ivy.get_item(*ivy_args)\n return np_frontend.ndarray(ret, _init_overload=True)\n\n def __setitem__(self, key, value, /):\n key, value = ivy.nested_map([key, value], _to_ivy_array)\n self.ivy_array[key] = value\n\n def __iter__(self):\n if self.ndim == 0:\n raise TypeError(\"iteration over a 0-d ndarray not supported\")\n for i in range(self.shape[0]):\n yield self[i]\n\n def __mod__(self, value, /):\n return np_frontend.mod(self, value, out=self)\n\n def ptp(self, *, axis=None, out=None, keepdims=False):\n xmax = self.max(axis=axis, out=out, keepdims=keepdims)\n xmin = self.min(axis=axis, out=out, keepdims=keepdims)\n return np_frontend.subtract(xmax, xmin)\n\n def __rshift__(self, value, /):\n return ivy.bitwise_right_shift(self.ivy_array, value)\n\n def __lshift__(self, value, /):\n return ivy.bitwise_left_shift(self.ivy_array, value)\n", "path": "ivy/functional/frontends/numpy/ndarray/ndarray.py" } ]
diff --git a/ivy/functional/frontends/numpy/ndarray/ndarray.py b/ivy/functional/frontends/numpy/ndarray/ndarray.py index dae5f288c02ac..9ddceeb8fb3ac 100644 --- a/ivy/functional/frontends/numpy/ndarray/ndarray.py +++ b/ivy/functional/frontends/numpy/ndarray/ndarray.py @@ -557,3 +557,6 @@ def ptp(self, *, axis=None, out=None, keepdims=False): def __rshift__(self, value, /): return ivy.bitwise_right_shift(self.ivy_array, value) + + def __lshift__(self, value, /): + return ivy.bitwise_left_shift(self.ivy_array, value) diff --git a/ivy_tests/test_ivy/test_frontends/test_numpy/test_ndarray/test_ndarray.py b/ivy_tests/test_ivy/test_frontends/test_numpy/test_ndarray/test_ndarray.py index 239b2707ef1e6..dccc6195f85b3 100644 --- a/ivy_tests/test_ivy/test_frontends/test_numpy/test_ndarray/test_ndarray.py +++ b/ivy_tests/test_ivy/test_frontends/test_numpy/test_ndarray/test_ndarray.py @@ -3210,6 +3210,60 @@ def test_numpy_instance_rshift__( ) +@handle_frontend_method( + class_tree=CLASS_TREE, + init_tree="numpy.array", + method_name="__lshift__", + dtype_and_x=helpers.dtype_and_values( + available_dtypes=helpers.get_dtypes("integer"), + num_arrays=2, + max_dim_size=1, + max_value=2**31 - 1, + ), +) +def test_numpy_instance_lshift__( + dtype_and_x, + frontend_method_data, + init_flags, + method_flags, + frontend, + on_device, +): + input_dtypes, x = dtype_and_x + max_bits = np.iinfo(input_dtypes[0]).bits + max_shift = max_bits - 1 + + x[1] = np.asarray(np.clip(x[1], 0, max_shift), dtype=input_dtypes[1]) + + max_value_before_shift = 2 ** (max_bits - x[1]) - 1 + overflow_threshold = 2 ** (max_bits - 1) + + x[0] = np.asarray( + np.clip(x[0], None, max_value_before_shift), dtype=input_dtypes[0] + ) + + if np.any(x[0] > overflow_threshold): + x[0] = np.clip(x[0], None, overflow_threshold) + if np.any(x[0] < 0): + x[0] = np.abs(x[0]) + + helpers.test_frontend_method( + init_input_dtypes=input_dtypes, + init_all_as_kwargs_np={ + "object": x[0], + }, + method_input_dtypes=input_dtypes, + method_all_as_kwargs_np={ + "value": x[1], + }, + frontend=frontend, + frontend_method_data=frontend_method_data, + init_flags=init_flags, + method_flags=method_flags, + on_device=on_device, + ) + + # __tostring__ @handle_frontend_method( class_tree=CLASS_TREE,
facebookresearch__CompilerGym-364
[ { "content": "\"\"\"A CompilerGym API and web frontend.\n\nThis exposes an API with five operations:\n\n 1. describe() -> dict (/api/v3/describe)\n\n Describe the CompilerGym interface. This generates a list of action\n names and their numeric values, a list of benchmark datasets and the\n benchmarks within them, and a list of reward spaces.\n\n 2. start(reward, actions, benchmark) -> session_id, state[]\n (/api/v3/start/<reward>/<actions>/<benchmark>)\n\n Start a session. This would happen when the user navigates to the page\n in their web browser. One tab = one session. Takes a reward space name,\n a list of actions, and a benchmark URI as inputs. If no actions are to\n be performed, use \"-\". Returns a numeric session ID (this probably isn't\n the right way of doing things but I don't know any better :-) ). Also\n returns a list of states, which is the set of things we want to\n visualize to represent the current environment state. There is an\n initial state, and then one state for each action.\n\n 3. step(session_id, actions) -> state[] (/api/v3/<session_id>/<actions>)\n\n Run a list of actions and produce a list of states, replacing the old\n ones.\n\n 4. undo(session_id, n) -> state (/api/v3/<session_id>/undo/<n>)\n\n Undo `n` previous actions, returning the previous state.\n\n 5. stop(session_id) (/api/v3/stop/<session_id>)\n\n End a session. This would be when the user closes the tab / disconnects.\n\nTo run this script, install the python dependencies using:\n\n pip install flask compiler_gym pydantic\n\nThen launch it by running, in this directory:\n\n FLASK_APP=demo_api.py flask run\n\nInteract with the API through GET requests, such as using curl. A \"describe\"\nendpoint provides details on teh available actions, benchmarks, and rewards.:\n\n $ curl -s localhost:5000/api/v3/describe | jq\n {\n \"actions\": {\n \"-adce\": 1,\n ...\n \"-tailcallelim\": 122\n },\n \"benchmarks\": {\n \"benchmark://anghabench-v1\": [\n \"8cc/extr_buffer.c_buf_append\",\n ...\n \"8cc/extr_buffer.c_quote_cstring_len\"\n ],\n \"benchmark://blas-v0\": [\n ...\n ],\n \"benchmark://cbench-v1\": [\n \"adpcm\",\n ...\n \"jpeg-c\"\n ],\n ...\n },\n \"rewards\": [\n \"IrInstructionCount\",\n ...\n \"ObjectTextSizeOz\"\n ]\n }\n\nTo start a session, specify a reward space and a benchmark. Note that this\nrequires URL-encoding the benchmark name as it contains slashes. e.g. to start a\nnew session using reward IrInstructionCountOz and benchmark\n\"benchmark://cbench-v1/qsort\":\n\n $ curl -s localhost:5000/api/v3/start/IrInstructionCountOz/benchmark%3A%2F%2Fcbench-v1%2Fqsort | jq\n {\n \"session_id\": 0,\n \"states\": [\n {\n \"autophase\": {\n \"ArgsPhi\": 10,\n ...\n \"twoSuccessor\": 31\n },\n \"commandline\": \"opt input.bc -o output.bc\",\n \"done\": false,\n \"instcount\": {\n \"AShrCount\": 0,\n \"AddCount\": 9,\n ...\n \"ZExtCount\": 15\n },\n \"ir\": \"; ModuleID = '-'\\nsource_filename = \\\"-\\\"\\ntarget ...\",\n \"reward\": 0\n }\n ]\n }\n\nThat \"state\" dict contains the things that we would want to visualize in the\nGUI. Our session ID is 0, lets take a step in this session using action \"10\":\n\n $ curl -s localhost:5000/api/v3/step/0/10 | jq\n {\n \"states\": [\n {\n \"autophase\": {\n \"ArgsPhi\": 2,\n ..,\n \"twoSuccessor\": 29\n },\n \"commandline\": \"opt -simplifycfg input.bc -o output.bc\",\n \"done\": false,\n \"instcount\": {\n \"AShrCount\": 0,\n ...\n \"ZExtCount\": 15\n },\n \"ir\": \"; ModuleID = '-'\\nsource_filename = \\\"-\\\"\\ntarget ...\",\n \"reward\": 0.06501547987616099\n }\n ]\n }\n\nNotice that the state dict has changed. Some of the numbers in the \"autophase\"\nand \"instcount\" feature dictionary have changed, there is a reward value, and\nthe commandline now includes the flag needed to run action \"10\" (which turned\nout to be the \"-simplifycfg\" flag).\n\nWe could carry on taking steps, or just end the session:\n\n $ curl -s localhost:5000/api/v3/stop/0\n\"\"\"\nimport logging\nimport os\nimport sys\nfrom itertools import islice\nfrom pathlib import Path\nfrom threading import Lock, Thread\nfrom time import sleep, time\nfrom typing import Dict, List, Tuple\n\nfrom flask import Flask, jsonify, send_file\nfrom flask_cors import CORS\nfrom pydantic import BaseModel\n\nimport compiler_gym\nfrom compiler_gym import CompilerEnv\nfrom compiler_gym.util.truncate import truncate\n\napp = Flask(\"compiler_gym\")\nCORS(app)\n\n\nresource_dir: Path = (Path(__file__).parent / \"frontends/compiler_gym/build\").absolute()\n\nlogger = logging.getLogger(__name__)\n\n\nclass StateToVisualize(BaseModel):\n \"\"\"Encapsulates everything we want to visualize in the frontend. This\n will change from step to step.\n \"\"\"\n\n # This summarizes the sequence of actions that the user has selected so far:\n commandline: str\n\n # If the compiler environment dies, crashes, or encounters some\n # unrecoverable error, this \"done\" flag is set. At this point the user d\n # should start a new session.\n done: bool\n\n # Observations that we would like to visualize. This list will grow over\n # time to include graphs and 2-D matrices:\n ir: str\n instcount: Dict[str, int]\n autophase: Dict[str, int]\n\n # The reward signal measures how \"good\" the previous action was. Over time\n # the sequence of actions that produces the highest cumulative reward is the\n # best:\n reward: float\n\n\nclass Session(BaseModel):\n states: List[Tuple[CompilerEnv, StateToVisualize]]\n last_use: float # As returned by time().\n\n def close(self):\n for env, _ in self.states:\n env.close()\n\n class Config:\n arbitrary_types_allowed = True\n\n\n# A set of sessions that are in use, keyed by a numeric session ID. Each session\n# is represented by a list of (environment, state) tuples, whether the\n# environment is a CompilerGym environment and the state is a StateToVisualize.\n# Initially, a session consists of a single (environment, state) tuple. When an\n# action is taken, this generates a new (environment, state) tuple that is\n# appended the session list. In this way, undoing an operation is as simple as\n# popping the most recent (environment, state) tuple from the list.\nsessions: Dict[int, Session] = {}\nsessions_lock = Lock()\n\n\ndef compute_state(env: CompilerEnv, actions: List[int]) -> StateToVisualize:\n \"\"\"Apply a list of actions and produce a new state to visualize.\"\"\"\n # This is where we get the compiler environment to do its thing, and compute\n # for us all of the features that we would like to visualize.\n (ir, instcount, autophase), (reward,), done, _ = env.raw_step(\n actions=actions,\n observations=[\n env.observation.spaces[\"Ir\"],\n env.observation.spaces[\"InstCountDict\"],\n env.observation.spaces[\"AutophaseDict\"],\n ],\n rewards=[env.reward_space],\n )\n return StateToVisualize(\n commandline=env.commandline(),\n done=done,\n ir=truncate(ir, max_line_len=250, max_lines=1024),\n instcount=instcount,\n autophase=autophase,\n reward=reward,\n )\n\n\n@app.route(\"/api/v3/describe\")\ndef describe():\n with compiler_gym.make(\"llvm-v0\") as env:\n env.reset()\n return jsonify(\n {\n # A mapping from dataset name to benchmark name. To generate a full\n # benchmark URI, join the two values with a '/'. E.g. given a benchmark\n # \"qsort\" in the dataset \"benchmark://cbench-v1\", the full URI is\n # \"benchmark://cbench-v1/qsort\".\n \"benchmarks\": {\n dataset.name: list(\n islice(\n (\n x[len(dataset.name) + 1 :]\n for x in dataset.benchmark_uris()\n ),\n 10,\n )\n )\n for dataset in env.datasets\n },\n # A mapping from the name of an action to the numeric value. This\n # numeric value is what is passed as argument to the step() function.\n \"actions\": {k: v for v, k in enumerate(env.action_space.flags)},\n # A list of reward space names. You select the reward space to use\n # during start().\n \"rewards\": sorted(list(env.reward.spaces.keys())),\n }\n )\n\n\n@app.route(\"/api/v3/start/<reward>/<actions>/<path:benchmark>\")\ndef start(reward: str, actions: str, benchmark: str):\n env = compiler_gym.make(\"llvm-v0\", benchmark=benchmark)\n env.reward_space = reward\n env.reset()\n state = compute_state(env, [])\n with sessions_lock:\n session_id = len(sessions)\n session = Session(states=[(env, state)], last_use=time())\n sessions[session_id] = session\n\n # Accept an optional comma-separated list of actions to compute and return.\n if actions != \"-\":\n step(session_id, actions)\n\n return jsonify(\n {\n \"session_id\": session_id,\n \"states\": [state.dict() for _, state in session.states],\n }\n )\n\n\n@app.route(\"/api/v3/stop/<session_id>\")\ndef stop(session_id: int):\n session_id = int(session_id)\n\n session = sessions[session_id]\n session.close()\n with sessions_lock:\n del sessions[session_id]\n\n return jsonify({\"session_id\": session_id})\n\n\n@app.route(\"/api/v3/step/<session_id>/<actions>\")\ndef step(session_id: int, actions: str):\n session_id = int(session_id)\n\n state_dicts = []\n session = sessions[session_id]\n for action in [int(a) for a in actions.split(\",\")]:\n new_env = session.states[-1][0].fork()\n new_state = compute_state(new_env, [action])\n session.states.append((new_env, new_state))\n state_dicts.append(new_state.dict())\n\n session.last_use = time()\n return jsonify({\"states\": state_dicts})\n\n\n@app.route(\"/api/v3/undo/<session_id>/<n>\")\ndef undo(session_id: int, n: int):\n session_id = int(session_id)\n n = int(n)\n\n session = sessions[session_id]\n for _ in range(n):\n env, _ = session.states.pop()\n env.close()\n _, old_state = session[-1]\n\n session.last_use = time()\n return jsonify({\"state\": old_state.dict()})\n\n\ndef idle_session_watchdog(ttl_seconds: int = 1200):\n \"\"\"Background thread to perform periodic garbage collection of sessions\n that haven't been used in `ttl_seconds` seconds.\n \"\"\"\n while True:\n session_ids_to_remove = []\n for session_id, session in sessions.items():\n if session.last_use + ttl_seconds < time():\n session_ids_to_remove.append(session_id)\n with sessions_lock:\n for session_id in session_ids_to_remove:\n sessions[session_id].close()\n del sessions[session_id]\n logger.info(\"Garbage collected %d sessions\", len(session_ids_to_remove))\n sleep(ttl_seconds)\n\n\n# Web endpoints.\n\n\n@app.route(\"/\")\ndef index_resource():\n return send_file(resource_dir / \"index.html\")\n\n\n@app.route(\"/<path>\")\ndef root_resource(path: str):\n return send_file(resource_dir / path)\n\n\n@app.route(\"/static/css/<path>\")\ndef css_resource(path: str):\n return send_file(resource_dir / \"static/css/\" / path)\n\n\n@app.route(\"/static/js/<path>\")\ndef js_resource(path: str):\n return send_file(resource_dir / \"static/js/\" / path)\n\n\nif __name__ == \"__main__\":\n logger.setLevel(logging.DEBUG)\n handler = logging.StreamHandler(sys.stderr)\n handler.setLevel(logging.DEBUG)\n formatter = logging.Formatter(\n \"%(asctime)s - %(name)s - %(levelname)s - %(message)s\"\n )\n handler.setFormatter(formatter)\n logger.addHandler(handler)\n\n logger.info(\"Serving from %s\", resource_dir)\n Thread(target=idle_session_watchdog).start()\n app.run(port=int(os.environ.get(\"PORT\", \"5000\")))\n", "path": "www/www.py" } ]
[ { "content": "# Copyright (c) Facebook, Inc. and its affiliates.\n#\n# This source code is licensed under the MIT license found in the\n# LICENSE file in the root directory of this source tree.\n\"\"\"A CompilerGym API and web frontend.\n\nThis exposes an API with five operations:\n\n 1. describe() -> dict (/api/v3/describe)\n\n Describe the CompilerGym interface. This generates a list of action\n names and their numeric values, a list of benchmark datasets and the\n benchmarks within them, and a list of reward spaces.\n\n 2. start(reward, actions, benchmark) -> session_id, state[]\n (/api/v3/start/<reward>/<actions>/<benchmark>)\n\n Start a session. This would happen when the user navigates to the page\n in their web browser. One tab = one session. Takes a reward space name,\n a list of actions, and a benchmark URI as inputs. If no actions are to\n be performed, use \"-\". Returns a numeric session ID (this probably isn't\n the right way of doing things but I don't know any better :-) ). Also\n returns a list of states, which is the set of things we want to\n visualize to represent the current environment state. There is an\n initial state, and then one state for each action.\n\n 3. step(session_id, actions) -> state[] (/api/v3/<session_id>/<actions>)\n\n Run a list of actions and produce a list of states, replacing the old\n ones.\n\n 4. undo(session_id, n) -> state (/api/v3/<session_id>/undo/<n>)\n\n Undo `n` previous actions, returning the previous state.\n\n 5. stop(session_id) (/api/v3/stop/<session_id>)\n\n End a session. This would be when the user closes the tab / disconnects.\n\nTo run this script, install the python dependencies using:\n\n pip install flask compiler_gym pydantic\n\nThen launch it by running, in this directory:\n\n FLASK_APP=demo_api.py flask run\n\nInteract with the API through GET requests, such as using curl. A \"describe\"\nendpoint provides details on teh available actions, benchmarks, and rewards.:\n\n $ curl -s localhost:5000/api/v3/describe | jq\n {\n \"actions\": {\n \"-adce\": 1,\n ...\n \"-tailcallelim\": 122\n },\n \"benchmarks\": {\n \"benchmark://anghabench-v1\": [\n \"8cc/extr_buffer.c_buf_append\",\n ...\n \"8cc/extr_buffer.c_quote_cstring_len\"\n ],\n \"benchmark://blas-v0\": [\n ...\n ],\n \"benchmark://cbench-v1\": [\n \"adpcm\",\n ...\n \"jpeg-c\"\n ],\n ...\n },\n \"rewards\": [\n \"IrInstructionCount\",\n ...\n \"ObjectTextSizeOz\"\n ]\n }\n\nTo start a session, specify a reward space and a benchmark. Note that this\nrequires URL-encoding the benchmark name as it contains slashes. e.g. to start a\nnew session using reward IrInstructionCountOz and benchmark\n\"benchmark://cbench-v1/qsort\":\n\n $ curl -s localhost:5000/api/v3/start/IrInstructionCountOz/benchmark%3A%2F%2Fcbench-v1%2Fqsort | jq\n {\n \"session_id\": 0,\n \"states\": [\n {\n \"autophase\": {\n \"ArgsPhi\": 10,\n ...\n \"twoSuccessor\": 31\n },\n \"commandline\": \"opt input.bc -o output.bc\",\n \"done\": false,\n \"instcount\": {\n \"AShrCount\": 0,\n \"AddCount\": 9,\n ...\n \"ZExtCount\": 15\n },\n \"ir\": \"; ModuleID = '-'\\nsource_filename = \\\"-\\\"\\ntarget ...\",\n \"reward\": 0\n }\n ]\n }\n\nThat \"state\" dict contains the things that we would want to visualize in the\nGUI. Our session ID is 0, lets take a step in this session using action \"10\":\n\n $ curl -s localhost:5000/api/v3/step/0/10 | jq\n {\n \"states\": [\n {\n \"autophase\": {\n \"ArgsPhi\": 2,\n ..,\n \"twoSuccessor\": 29\n },\n \"commandline\": \"opt -simplifycfg input.bc -o output.bc\",\n \"done\": false,\n \"instcount\": {\n \"AShrCount\": 0,\n ...\n \"ZExtCount\": 15\n },\n \"ir\": \"; ModuleID = '-'\\nsource_filename = \\\"-\\\"\\ntarget ...\",\n \"reward\": 0.06501547987616099\n }\n ]\n }\n\nNotice that the state dict has changed. Some of the numbers in the \"autophase\"\nand \"instcount\" feature dictionary have changed, there is a reward value, and\nthe commandline now includes the flag needed to run action \"10\" (which turned\nout to be the \"-simplifycfg\" flag).\n\nWe could carry on taking steps, or just end the session:\n\n $ curl -s localhost:5000/api/v3/stop/0\n\"\"\"\nimport logging\nimport os\nimport sys\nfrom itertools import islice\nfrom pathlib import Path\nfrom threading import Lock, Thread\nfrom time import sleep, time\nfrom typing import Dict, List, Tuple\n\nfrom flask import Flask, jsonify, send_file\nfrom flask_cors import CORS\nfrom pydantic import BaseModel\n\nimport compiler_gym\nfrom compiler_gym import CompilerEnv\nfrom compiler_gym.util.truncate import truncate\n\napp = Flask(\"compiler_gym\")\nCORS(app)\n\n\nresource_dir: Path = (Path(__file__).parent / \"frontends/compiler_gym/build\").absolute()\n\nlogger = logging.getLogger(__name__)\n\n\nclass StateToVisualize(BaseModel):\n \"\"\"Encapsulates everything we want to visualize in the frontend. This\n will change from step to step.\n \"\"\"\n\n # This summarizes the sequence of actions that the user has selected so far:\n commandline: str\n\n # If the compiler environment dies, crashes, or encounters some\n # unrecoverable error, this \"done\" flag is set. At this point the user d\n # should start a new session.\n done: bool\n\n # Observations that we would like to visualize. This list will grow over\n # time to include graphs and 2-D matrices:\n ir: str\n instcount: Dict[str, int]\n autophase: Dict[str, int]\n\n # The reward signal measures how \"good\" the previous action was. Over time\n # the sequence of actions that produces the highest cumulative reward is the\n # best:\n reward: float\n\n\nclass Session(BaseModel):\n states: List[Tuple[CompilerEnv, StateToVisualize]]\n last_use: float # As returned by time().\n\n def close(self):\n for env, _ in self.states:\n env.close()\n\n class Config:\n arbitrary_types_allowed = True\n\n\n# A set of sessions that are in use, keyed by a numeric session ID. Each session\n# is represented by a list of (environment, state) tuples, whether the\n# environment is a CompilerGym environment and the state is a StateToVisualize.\n# Initially, a session consists of a single (environment, state) tuple. When an\n# action is taken, this generates a new (environment, state) tuple that is\n# appended the session list. In this way, undoing an operation is as simple as\n# popping the most recent (environment, state) tuple from the list.\nsessions: Dict[int, Session] = {}\nsessions_lock = Lock()\n\n\ndef compute_state(env: CompilerEnv, actions: List[int]) -> StateToVisualize:\n \"\"\"Apply a list of actions and produce a new state to visualize.\"\"\"\n # This is where we get the compiler environment to do its thing, and compute\n # for us all of the features that we would like to visualize.\n (ir, instcount, autophase), (reward,), done, _ = env.raw_step(\n actions=actions,\n observations=[\n env.observation.spaces[\"Ir\"],\n env.observation.spaces[\"InstCountDict\"],\n env.observation.spaces[\"AutophaseDict\"],\n ],\n rewards=[env.reward_space],\n )\n return StateToVisualize(\n commandline=env.commandline(),\n done=done,\n ir=truncate(ir, max_line_len=250, max_lines=1024),\n instcount=instcount,\n autophase=autophase,\n reward=reward,\n )\n\n\n@app.route(\"/api/v3/describe\")\ndef describe():\n with compiler_gym.make(\"llvm-v0\") as env:\n env.reset()\n return jsonify(\n {\n # A mapping from dataset name to benchmark name. To generate a full\n # benchmark URI, join the two values with a '/'. E.g. given a benchmark\n # \"qsort\" in the dataset \"benchmark://cbench-v1\", the full URI is\n # \"benchmark://cbench-v1/qsort\".\n \"benchmarks\": {\n dataset.name: list(\n islice(\n (\n x[len(dataset.name) + 1 :]\n for x in dataset.benchmark_uris()\n ),\n 10,\n )\n )\n for dataset in env.datasets\n },\n # A mapping from the name of an action to the numeric value. This\n # numeric value is what is passed as argument to the step() function.\n \"actions\": {k: v for v, k in enumerate(env.action_space.flags)},\n # A list of reward space names. You select the reward space to use\n # during start().\n \"rewards\": sorted(list(env.reward.spaces.keys())),\n }\n )\n\n\n@app.route(\"/api/v3/start/<reward>/<actions>/<path:benchmark>\")\ndef start(reward: str, actions: str, benchmark: str):\n env = compiler_gym.make(\"llvm-v0\", benchmark=benchmark)\n env.reward_space = reward\n env.reset()\n state = compute_state(env, [])\n with sessions_lock:\n session_id = len(sessions)\n session = Session(states=[(env, state)], last_use=time())\n sessions[session_id] = session\n\n # Accept an optional comma-separated list of actions to compute and return.\n if actions != \"-\":\n step(session_id, actions)\n\n return jsonify(\n {\n \"session_id\": session_id,\n \"states\": [state.dict() for _, state in session.states],\n }\n )\n\n\n@app.route(\"/api/v3/stop/<session_id>\")\ndef stop(session_id: int):\n session_id = int(session_id)\n\n session = sessions[session_id]\n session.close()\n with sessions_lock:\n del sessions[session_id]\n\n return jsonify({\"session_id\": session_id})\n\n\n@app.route(\"/api/v3/step/<session_id>/<actions>\")\ndef step(session_id: int, actions: str):\n session_id = int(session_id)\n\n state_dicts = []\n session = sessions[session_id]\n for action in [int(a) for a in actions.split(\",\")]:\n new_env = session.states[-1][0].fork()\n new_state = compute_state(new_env, [action])\n session.states.append((new_env, new_state))\n state_dicts.append(new_state.dict())\n\n session.last_use = time()\n return jsonify({\"states\": state_dicts})\n\n\n@app.route(\"/api/v3/undo/<session_id>/<n>\")\ndef undo(session_id: int, n: int):\n session_id = int(session_id)\n n = int(n)\n\n session = sessions[session_id]\n for _ in range(n):\n env, _ = session.states.pop()\n env.close()\n _, old_state = session[-1]\n\n session.last_use = time()\n return jsonify({\"state\": old_state.dict()})\n\n\ndef idle_session_watchdog(ttl_seconds: int = 1200):\n \"\"\"Background thread to perform periodic garbage collection of sessions\n that haven't been used in `ttl_seconds` seconds.\n \"\"\"\n while True:\n session_ids_to_remove = []\n for session_id, session in sessions.items():\n if session.last_use + ttl_seconds < time():\n session_ids_to_remove.append(session_id)\n with sessions_lock:\n for session_id in session_ids_to_remove:\n sessions[session_id].close()\n del sessions[session_id]\n logger.info(\"Garbage collected %d sessions\", len(session_ids_to_remove))\n sleep(ttl_seconds)\n\n\n# Web endpoints.\n\n\n@app.route(\"/\")\ndef index_resource():\n return send_file(resource_dir / \"index.html\")\n\n\n@app.route(\"/<path>\")\ndef root_resource(path: str):\n return send_file(resource_dir / path)\n\n\n@app.route(\"/static/css/<path>\")\ndef css_resource(path: str):\n return send_file(resource_dir / \"static/css/\" / path)\n\n\n@app.route(\"/static/js/<path>\")\ndef js_resource(path: str):\n return send_file(resource_dir / \"static/js/\" / path)\n\n\nif __name__ == \"__main__\":\n logger.setLevel(logging.DEBUG)\n handler = logging.StreamHandler(sys.stderr)\n handler.setLevel(logging.DEBUG)\n formatter = logging.Formatter(\n \"%(asctime)s - %(name)s - %(levelname)s - %(message)s\"\n )\n handler.setFormatter(formatter)\n logger.addHandler(handler)\n\n logger.info(\"Serving from %s\", resource_dir)\n Thread(target=idle_session_watchdog).start()\n app.run(port=int(os.environ.get(\"PORT\", \"5000\")))\n", "path": "www/www.py" } ]
diff --git a/www/frontends/compiler_gym/src/App.test.js b/www/frontends/compiler_gym/src/App.test.js index 1f03afeec..d4bb58ae1 100644 --- a/www/frontends/compiler_gym/src/App.test.js +++ b/www/frontends/compiler_gym/src/App.test.js @@ -1,3 +1,7 @@ +// Copyright (c) Facebook, Inc. and its affiliates. +// +// This source code is licensed under the MIT license found in the +// LICENSE file in the root directory of this source tree. import { render, screen } from '@testing-library/react'; import App from './App'; diff --git a/www/frontends/compiler_gym/src/assets/scss/custom.scss b/www/frontends/compiler_gym/src/assets/scss/custom.scss index b8c6c9874..ab032953e 100644 --- a/www/frontends/compiler_gym/src/assets/scss/custom.scss +++ b/www/frontends/compiler_gym/src/assets/scss/custom.scss @@ -1,3 +1,8 @@ +/* + * Copyright (c) Facebook, Inc. and its affiliates. + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ @import "./variables.scss"; @import "./highcharts.scss"; @import "./searchtree.scss"; diff --git a/www/frontends/compiler_gym/src/index.js b/www/frontends/compiler_gym/src/index.js index 79981357e..c42b728fb 100644 --- a/www/frontends/compiler_gym/src/index.js +++ b/www/frontends/compiler_gym/src/index.js @@ -1,3 +1,7 @@ +// Copyright (c) Facebook, Inc. and its affiliates. +// +// This source code is licensed under the MIT license found in the +// LICENSE file in the root directory of this source tree. import React from 'react'; import ReactDOM from 'react-dom'; import App from './App'; diff --git a/www/frontends/compiler_gym/src/reportWebVitals.js b/www/frontends/compiler_gym/src/reportWebVitals.js index 5253d3ad9..de9b55034 100644 --- a/www/frontends/compiler_gym/src/reportWebVitals.js +++ b/www/frontends/compiler_gym/src/reportWebVitals.js @@ -1,3 +1,7 @@ +// Copyright (c) Facebook, Inc. and its affiliates. +// +// This source code is licensed under the MIT license found in the +// LICENSE file in the root directory of this source tree. const reportWebVitals = onPerfEntry => { if (onPerfEntry && onPerfEntry instanceof Function) { import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => { diff --git a/www/frontends/compiler_gym/src/setupTests.js b/www/frontends/compiler_gym/src/setupTests.js index 8f2609b7b..c14577a27 100644 --- a/www/frontends/compiler_gym/src/setupTests.js +++ b/www/frontends/compiler_gym/src/setupTests.js @@ -1,3 +1,8 @@ +// Copyright (c) Facebook, Inc. and its affiliates. +// +// This source code is licensed under the MIT license found in the +// LICENSE file in the root directory of this source tree. +// // jest-dom adds custom jest matchers for asserting on DOM nodes. // allows you to do things like: // expect(element).toHaveTextContent(/react/i) diff --git a/www/www.py b/www/www.py index 6536f958b..3a69b4819 100644 --- a/www/www.py +++ b/www/www.py @@ -1,3 +1,7 @@ +# Copyright (c) Facebook, Inc. and its affiliates. +# +# This source code is licensed under the MIT license found in the +# LICENSE file in the root directory of this source tree. """A CompilerGym API and web frontend. This exposes an API with five operations:
ibis-project__ibis-8929
[ { "content": "\"\"\"Risingwave backend.\"\"\"\n\nfrom __future__ import annotations\n\nfrom functools import partial\nfrom itertools import repeat\nfrom operator import itemgetter\nfrom typing import TYPE_CHECKING\n\nimport psycopg2\nimport sqlglot as sg\nimport sqlglot.expressions as sge\nfrom psycopg2 import extras\n\nimport ibis\nimport ibis.common.exceptions as com\nimport ibis.expr.operations as ops\nimport ibis.expr.types as ir\nfrom ibis import util\nfrom ibis.backends.postgres import Backend as PostgresBackend\nfrom ibis.backends.risingwave.compiler import RisingwaveCompiler\nfrom ibis.util import experimental\n\nif TYPE_CHECKING:\n import pandas as pd\n import pyarrow as pa\n\n\ndef data_and_encode_format(data_format, encode_format, encode_properties):\n res = \"\"\n if data_format is not None:\n res = res + \" FORMAT \" + data_format.upper()\n if encode_format is not None:\n res = res + \" ENCODE \" + encode_format.upper()\n if encode_properties is not None:\n res = res + \" \" + format_properties(encode_properties)\n return res\n\n\ndef format_properties(props):\n tokens = []\n for k, v in props.items():\n tokens.append(f\"{k}='{v}'\")\n return \"( {} ) \".format(\", \".join(tokens))\n\n\nclass Backend(PostgresBackend):\n name = \"risingwave\"\n compiler = RisingwaveCompiler()\n supports_python_udfs = False\n\n def do_connect(\n self,\n host: str | None = None,\n user: str | None = None,\n password: str | None = None,\n port: int = 5432,\n database: str | None = None,\n schema: str | None = None,\n ) -> None:\n \"\"\"Create an Ibis client connected to RisingWave database.\n\n Parameters\n ----------\n host\n Hostname\n user\n Username\n password\n Password\n port\n Port number\n database\n Database to connect to\n schema\n RisingWave schema to use. If `None`, use the default `search_path`.\n\n Examples\n --------\n >>> import os\n >>> import getpass\n >>> import ibis\n >>> host = os.environ.get(\"IBIS_TEST_RISINGWAVE_HOST\", \"localhost\")\n >>> user = os.environ.get(\"IBIS_TEST_RISINGWAVE_USER\", getpass.getuser())\n >>> password = os.environ.get(\"IBIS_TEST_RISINGWAVE_PASSWORD\")\n >>> database = os.environ.get(\"IBIS_TEST_RISINGWAVE_DATABASE\", \"dev\")\n >>> con = connect(database=database, host=host, user=user, password=password)\n >>> con.list_tables() # doctest: +ELLIPSIS\n [...]\n >>> t = con.table(\"functional_alltypes\")\n >>> t\n RisingwaveTable[table]\n name: functional_alltypes\n schema:\n id : int32\n bool_col : boolean\n tinyint_col : int16\n smallint_col : int16\n int_col : int32\n bigint_col : int64\n float_col : float32\n double_col : float64\n date_string_col : string\n string_col : string\n timestamp_col : timestamp\n year : int32\n month : int32\n\n \"\"\"\n\n self.con = psycopg2.connect(\n host=host,\n port=port,\n user=user,\n password=password,\n database=database,\n options=(f\"-csearch_path={schema}\" * (schema is not None)) or None,\n )\n\n with self.begin() as cur:\n cur.execute(\"SET TIMEZONE = UTC\")\n\n def create_table(\n self,\n name: str,\n obj: pd.DataFrame | pa.Table | ir.Table | None = None,\n *,\n schema: ibis.Schema | None = None,\n database: str | None = None,\n temp: bool = False,\n overwrite: bool = False,\n # TODO(Kexiang): add `append only`\n connector_properties: dict | None = None,\n data_format: str | None = None,\n encode_format: str | None = None,\n encode_properties: dict | None = None,\n ):\n \"\"\"Create a table in Risingwave.\n\n Parameters\n ----------\n name\n Name of the table to create\n obj\n The data with which to populate the table; optional, but at least\n one of `obj` or `schema` must be specified\n schema\n The schema of the table to create; optional, but at least one of\n `obj` or `schema` must be specified\n database\n The name of the database in which to create the table; if not\n passed, the current database is used.\n temp\n Create a temporary table\n overwrite\n If `True`, replace the table if it already exists, otherwise fail\n if the table exists\n connector_properties\n The properties of the sink connector, providing the connector settings to push to the downstream data sink.\n Refer https://docs.risingwave.com/docs/current/data-delivery/ for the required properties of different data sink.\n data_format\n The data format for the new source, e.g., \"PLAIN\". data_format and encode_format must be specified at the same time.\n encode_format\n The encode format for the new source, e.g., \"JSON\". data_format and encode_format must be specified at the same time.\n encode_properties\n The properties of encode format, providing information like schema registry url. Refer https://docs.risingwave.com/docs/current/sql-create-source/ for more details.\n\n Returns\n -------\n Table\n Table expression\n \"\"\"\n if obj is None and schema is None:\n raise ValueError(\"Either `obj` or `schema` must be specified\")\n\n if connector_properties is not None and (\n encode_format is None or data_format is None\n ):\n raise com.UnsupportedOperationError(\n \"When creating tables with connector, both encode_format and data_format are required\"\n )\n\n properties = []\n\n if temp:\n raise com.UnsupportedOperationError(\n f\"Creating temp tables is not supported by {self.name}\"\n )\n\n if obj is not None:\n if not isinstance(obj, ir.Expr):\n table = ibis.memtable(obj)\n else:\n table = obj\n\n self._run_pre_execute_hooks(table)\n\n query = self._to_sqlglot(table)\n else:\n query = None\n\n column_defs = [\n sge.ColumnDef(\n this=sg.to_identifier(colname, quoted=self.compiler.quoted),\n kind=self.compiler.type_mapper.from_ibis(typ),\n constraints=(\n None\n if typ.nullable\n else [sge.ColumnConstraint(kind=sge.NotNullColumnConstraint())]\n ),\n )\n for colname, typ in (schema or table.schema()).items()\n ]\n\n if overwrite:\n temp_name = util.gen_name(f\"{self.name}_table\")\n else:\n temp_name = name\n\n table = sg.table(temp_name, db=database, quoted=self.compiler.quoted)\n target = sge.Schema(this=table, expressions=column_defs)\n\n if connector_properties is None:\n create_stmt = sge.Create(\n kind=\"TABLE\",\n this=target,\n properties=sge.Properties(expressions=properties),\n )\n else:\n create_stmt = sge.Create(\n kind=\"TABLE\",\n this=target,\n properties=sge.Properties(\n expressions=sge.Properties.from_dict(connector_properties)\n ),\n )\n create_stmt = create_stmt.sql(self.dialect) + data_and_encode_format(\n data_format, encode_format, encode_properties\n )\n\n this = sg.table(name, db=database, quoted=self.compiler.quoted)\n with self._safe_raw_sql(create_stmt) as cur:\n if query is not None:\n insert_stmt = sge.Insert(this=table, expression=query).sql(self.dialect)\n cur.execute(insert_stmt)\n\n if overwrite:\n self.drop_table(name, database=database, force=True)\n cur.execute(\n f\"ALTER TABLE {table.sql(self.dialect)} RENAME TO {this.sql(self.dialect)}\"\n )\n\n if schema is None:\n return self.table(name, database=database)\n\n # preserve the input schema if it was provided\n return ops.DatabaseTable(\n name, schema=schema, source=self, namespace=ops.Namespace(database=database)\n ).to_expr()\n\n def _register_in_memory_table(self, op: ops.InMemoryTable) -> None:\n schema = op.schema\n if null_columns := [col for col, dtype in schema.items() if dtype.is_null()]:\n raise com.IbisTypeError(\n f\"{self.name} cannot yet reliably handle `null` typed columns; \"\n f\"got null typed columns: {null_columns}\"\n )\n\n # only register if we haven't already done so\n if (name := op.name) not in self.list_tables():\n quoted = self.compiler.quoted\n column_defs = [\n sg.exp.ColumnDef(\n this=sg.to_identifier(colname, quoted=quoted),\n kind=self.compiler.type_mapper.from_ibis(typ),\n constraints=(\n None\n if typ.nullable\n else [\n sg.exp.ColumnConstraint(\n kind=sg.exp.NotNullColumnConstraint()\n )\n ]\n ),\n )\n for colname, typ in schema.items()\n ]\n\n create_stmt = sg.exp.Create(\n kind=\"TABLE\",\n this=sg.exp.Schema(\n this=sg.to_identifier(name, quoted=quoted), expressions=column_defs\n ),\n )\n create_stmt_sql = create_stmt.sql(self.dialect)\n\n columns = schema.keys()\n df = op.data.to_frame()\n data = df.itertuples(index=False)\n cols = \", \".join(\n ident.sql(self.dialect)\n for ident in map(partial(sg.to_identifier, quoted=quoted), columns)\n )\n specs = \", \".join(repeat(\"%s\", len(columns)))\n table = sg.table(name, quoted=quoted)\n sql = f\"INSERT INTO {table.sql(self.dialect)} ({cols}) VALUES ({specs})\"\n with self.begin() as cur:\n cur.execute(create_stmt_sql)\n extras.execute_batch(cur, sql, data, 128)\n\n def list_databases(\n self, *, like: str | None = None, catalog: str | None = None\n ) -> list[str]:\n dbs = \"SHOW SCHEMAS\"\n\n with self._safe_raw_sql(dbs) as cur:\n databases = list(map(itemgetter(0), cur))\n\n return self._filter_with_like(databases, like)\n\n @experimental\n def create_materialized_view(\n self,\n name: str,\n obj: ir.Table,\n *,\n database: str | None = None,\n overwrite: bool = False,\n ) -> ir.Table:\n \"\"\"Create a materialized view. Materialized views can be accessed like a normal table.\n\n Parameters\n ----------\n name\n Materialized view name to Create.\n obj\n The select statement to materialize.\n database\n Name of the database where the view exists, if not the default\n overwrite\n Whether to overwrite the existing materialized view with the same name\n\n Returns\n -------\n Table\n Table expression\n \"\"\"\n if overwrite:\n temp_name = util.gen_name(f\"{self.name}_table\")\n else:\n temp_name = name\n\n table = sg.table(temp_name, db=database, quoted=self.compiler.quoted)\n\n create_stmt = sge.Create(\n this=table,\n kind=\"MATERIALIZED VIEW\",\n expression=self.compile(obj),\n )\n self._register_in_memory_tables(obj)\n\n with self._safe_raw_sql(create_stmt) as cur:\n if overwrite:\n target = sg.table(name, db=database).sql(self.dialect)\n\n self.drop_materialized_view(target, database=database, force=True)\n\n cur.execute(\n f\"ALTER MATERIALIZED VIEW {table.sql(self.dialect)} RENAME TO {target}\"\n )\n\n return self.table(name, database=database)\n\n def drop_materialized_view(\n self,\n name: str,\n *,\n database: str | None = None,\n force: bool = False,\n ) -> None:\n \"\"\"Drop a materialized view.\n\n Parameters\n ----------\n name\n Materialized view name to drop.\n database\n Name of the database where the view exists, if not the default.\n force\n If `False`, an exception is raised if the view does not exist.\n \"\"\"\n src = sge.Drop(\n this=sg.table(name, db=database, quoted=self.compiler.quoted),\n kind=\"MATERIALIZED VIEW\",\n exists=force,\n )\n with self._safe_raw_sql(src):\n pass\n\n def create_source(\n self,\n name: str,\n schema: ibis.Schema,\n *,\n database: str | None = None,\n connector_properties: dict,\n data_format: str,\n encode_format: str,\n encode_properties: dict | None = None,\n ) -> ir.Table:\n \"\"\"Creating a source.\n\n Parameters\n ----------\n name\n Source name to Create.\n schema\n The schema for the new Source.\n database\n Name of the database where the source exists, if not the default.\n connector_properties\n The properties of the source connector, providing the connector settings to access the upstream data source.\n Refer https://docs.risingwave.com/docs/current/data-ingestion/ for the required properties of different data source.\n data_format\n The data format for the new source, e.g., \"PLAIN\". data_format and encode_format must be specified at the same time.\n encode_format\n The encode format for the new source, e.g., \"JSON\". data_format and encode_format must be specified at the same time.\n encode_properties\n The properties of encode format, providing information like schema registry url. Refer https://docs.risingwave.com/docs/current/sql-create-source/ for more details.\n\n Returns\n -------\n Table\n Table expression\n \"\"\"\n column_defs = [\n sge.ColumnDef(\n this=sg.to_identifier(colname, quoted=self.compiler.quoted),\n kind=self.compiler.type_mapper.from_ibis(typ),\n constraints=(\n None\n if typ.nullable\n else [sge.ColumnConstraint(kind=sge.NotNullColumnConstraint())]\n ),\n )\n for colname, typ in schema.items()\n ]\n\n table = sg.table(name, db=database, quoted=self.compiler.quoted)\n target = sge.Schema(this=table, expressions=column_defs)\n\n create_stmt = sge.Create(\n kind=\"SOURCE\",\n this=target,\n properties=sge.Properties(\n expressions=sge.Properties.from_dict(connector_properties)\n ),\n )\n\n create_stmt = create_stmt.sql(self.dialect) + data_and_encode_format(\n data_format, encode_format, encode_properties\n )\n\n with self._safe_raw_sql(create_stmt):\n pass\n\n return self.table(name, database=database)\n\n def drop_source(\n self,\n name: str,\n *,\n database: str | None = None,\n force: bool = False,\n ) -> None:\n \"\"\"Drop a Source.\n\n Parameters\n ----------\n name\n Source name to drop.\n database\n Name of the database where the view exists, if not the default.\n force\n If `False`, an exception is raised if the source does not exist.\n \"\"\"\n src = sge.Drop(\n this=sg.table(name, db=database, quoted=self.compiler.quoted),\n kind=\"SOURCE\",\n exists=force,\n )\n with self._safe_raw_sql(src):\n pass\n\n def create_sink(\n self,\n name: str,\n sink_from: str | None = None,\n connector_properties: dict | None = None,\n *,\n obj: ir.Table | None = None,\n database: str | None = None,\n data_format: str | None = None,\n encode_format: str | None = None,\n encode_properties: dict | None = None,\n ) -> None:\n \"\"\"Creating a sink.\n\n Parameters\n ----------\n name\n Sink name to Create.\n sink_from\n The table or materialized view name to sink from. Only one of `sink_from` or `obj` can be\n provided.\n connector_properties\n The properties of the sink connector, providing the connector settings to push to the downstream data sink.\n Refer https://docs.risingwave.com/docs/current/data-delivery/ for the required properties of different data sink.\n obj\n An Ibis table expression that will be used to extract the schema and the data of the new table. Only one of `sink_from` or `obj` can be provided.\n database\n Name of the database where the source exists, if not the default.\n data_format\n The data format for the new source, e.g., \"PLAIN\". data_format and encode_format must be specified at the same time.\n encode_format\n The encode format for the new source, e.g., \"JSON\". data_format and encode_format must be specified at the same time.\n encode_properties\n The properties of encode format, providing information like schema registry url. Refer https://docs.risingwave.com/docs/current/sql-create-source/ for more details.\n \"\"\"\n table = sg.table(name, db=database, quoted=self.compiler.quoted)\n if sink_from is None and obj is None:\n raise ValueError(\"Either `sink_from` or `obj` must be specified\")\n if sink_from is not None and obj is not None:\n raise ValueError(\"Only one of `sink_from` or `obj` can be specified\")\n\n if (encode_format is None) != (data_format is None):\n raise com.UnsupportedArgumentError(\n \"When creating sinks, both encode_format and data_format must be provided, or neither should be\"\n )\n\n if sink_from is not None:\n create_stmt = f\"CREATE SINK {table.sql(self.dialect)} FROM {sink_from}\"\n else:\n create_stmt = sge.Create(\n this=table,\n kind=\"SINK\",\n expression=self.compile(obj),\n ).sql(self.dialect)\n create_stmt = (\n create_stmt\n + \" WITH \"\n + format_properties(connector_properties)\n + data_and_encode_format(data_format, encode_format, encode_properties)\n )\n with self._safe_raw_sql(create_stmt):\n pass\n\n def drop_sink(\n self,\n name: str,\n *,\n database: str | None = None,\n force: bool = False,\n ) -> None:\n \"\"\"Drop a Sink.\n\n Parameters\n ----------\n name\n Sink name to drop.\n database\n Name of the database where the view exists, if not the default.\n force\n If `False`, an exception is raised if the source does not exist.\n \"\"\"\n src = sge.Drop(\n this=sg.table(name, db=database, quoted=self.compiler.quoted),\n kind=\"SINK\",\n exists=force,\n )\n with self._safe_raw_sql(src):\n pass\n", "path": "ibis/backends/risingwave/__init__.py" } ]
[ { "content": "\"\"\"Risingwave backend.\"\"\"\n\nfrom __future__ import annotations\n\nfrom functools import partial\nfrom itertools import repeat\nfrom operator import itemgetter\nfrom typing import TYPE_CHECKING\n\nimport psycopg2\nimport sqlglot as sg\nimport sqlglot.expressions as sge\nfrom psycopg2 import extras\n\nimport ibis\nimport ibis.common.exceptions as com\nimport ibis.expr.operations as ops\nimport ibis.expr.types as ir\nfrom ibis import util\nfrom ibis.backends.postgres import Backend as PostgresBackend\nfrom ibis.backends.risingwave.compiler import RisingwaveCompiler\nfrom ibis.util import experimental\n\nif TYPE_CHECKING:\n import pandas as pd\n import pyarrow as pa\n\n\ndef data_and_encode_format(data_format, encode_format, encode_properties):\n res = \"\"\n if data_format is not None:\n res = res + \" FORMAT \" + data_format.upper()\n if encode_format is not None:\n res = res + \" ENCODE \" + encode_format.upper()\n if encode_properties is not None:\n res = res + \" \" + format_properties(encode_properties)\n return res\n\n\ndef format_properties(props):\n tokens = []\n for k, v in props.items():\n tokens.append(f\"{k}='{v}'\")\n return \"( {} ) \".format(\", \".join(tokens))\n\n\nclass Backend(PostgresBackend):\n name = \"risingwave\"\n compiler = RisingwaveCompiler()\n supports_python_udfs = False\n\n def do_connect(\n self,\n host: str | None = None,\n user: str | None = None,\n password: str | None = None,\n port: int = 5432,\n database: str | None = None,\n schema: str | None = None,\n ) -> None:\n \"\"\"Create an Ibis client connected to RisingWave database.\n\n Parameters\n ----------\n host\n Hostname\n user\n Username\n password\n Password\n port\n Port number\n database\n Database to connect to\n schema\n RisingWave schema to use. If `None`, use the default `search_path`.\n\n Examples\n --------\n >>> import os\n >>> import getpass\n >>> import ibis\n >>> host = os.environ.get(\"IBIS_TEST_RISINGWAVE_HOST\", \"localhost\")\n >>> user = os.environ.get(\"IBIS_TEST_RISINGWAVE_USER\", getpass.getuser())\n >>> password = os.environ.get(\"IBIS_TEST_RISINGWAVE_PASSWORD\")\n >>> database = os.environ.get(\"IBIS_TEST_RISINGWAVE_DATABASE\", \"dev\")\n >>> con = connect(database=database, host=host, user=user, password=password)\n >>> con.list_tables() # doctest: +ELLIPSIS\n [...]\n >>> t = con.table(\"functional_alltypes\")\n >>> t\n RisingwaveTable[table]\n name: functional_alltypes\n schema:\n id : int32\n bool_col : boolean\n tinyint_col : int16\n smallint_col : int16\n int_col : int32\n bigint_col : int64\n float_col : float32\n double_col : float64\n date_string_col : string\n string_col : string\n timestamp_col : timestamp\n year : int32\n month : int32\n\n \"\"\"\n\n self.con = psycopg2.connect(\n host=host,\n port=port,\n user=user,\n password=password,\n database=database,\n options=(f\"-csearch_path={schema}\" * (schema is not None)) or None,\n )\n\n with self.begin() as cur:\n cur.execute(\"SET TIMEZONE = UTC\")\n cur.execute(\"SET RW_IMPLICIT_FLUSH TO true;\")\n\n def create_table(\n self,\n name: str,\n obj: pd.DataFrame | pa.Table | ir.Table | None = None,\n *,\n schema: ibis.Schema | None = None,\n database: str | None = None,\n temp: bool = False,\n overwrite: bool = False,\n # TODO(Kexiang): add `append only`\n connector_properties: dict | None = None,\n data_format: str | None = None,\n encode_format: str | None = None,\n encode_properties: dict | None = None,\n ):\n \"\"\"Create a table in Risingwave.\n\n Parameters\n ----------\n name\n Name of the table to create\n obj\n The data with which to populate the table; optional, but at least\n one of `obj` or `schema` must be specified\n schema\n The schema of the table to create; optional, but at least one of\n `obj` or `schema` must be specified\n database\n The name of the database in which to create the table; if not\n passed, the current database is used.\n temp\n Create a temporary table\n overwrite\n If `True`, replace the table if it already exists, otherwise fail\n if the table exists\n connector_properties\n The properties of the sink connector, providing the connector settings to push to the downstream data sink.\n Refer https://docs.risingwave.com/docs/current/data-delivery/ for the required properties of different data sink.\n data_format\n The data format for the new source, e.g., \"PLAIN\". data_format and encode_format must be specified at the same time.\n encode_format\n The encode format for the new source, e.g., \"JSON\". data_format and encode_format must be specified at the same time.\n encode_properties\n The properties of encode format, providing information like schema registry url. Refer https://docs.risingwave.com/docs/current/sql-create-source/ for more details.\n\n Returns\n -------\n Table\n Table expression\n \"\"\"\n if obj is None and schema is None:\n raise ValueError(\"Either `obj` or `schema` must be specified\")\n\n if connector_properties is not None and (\n encode_format is None or data_format is None\n ):\n raise com.UnsupportedOperationError(\n \"When creating tables with connector, both encode_format and data_format are required\"\n )\n\n properties = []\n\n if temp:\n raise com.UnsupportedOperationError(\n f\"Creating temp tables is not supported by {self.name}\"\n )\n\n if obj is not None:\n if not isinstance(obj, ir.Expr):\n table = ibis.memtable(obj)\n else:\n table = obj\n\n self._run_pre_execute_hooks(table)\n\n query = self._to_sqlglot(table)\n else:\n query = None\n\n column_defs = [\n sge.ColumnDef(\n this=sg.to_identifier(colname, quoted=self.compiler.quoted),\n kind=self.compiler.type_mapper.from_ibis(typ),\n constraints=(\n None\n if typ.nullable\n else [sge.ColumnConstraint(kind=sge.NotNullColumnConstraint())]\n ),\n )\n for colname, typ in (schema or table.schema()).items()\n ]\n\n if overwrite:\n temp_name = util.gen_name(f\"{self.name}_table\")\n else:\n temp_name = name\n\n table = sg.table(temp_name, db=database, quoted=self.compiler.quoted)\n target = sge.Schema(this=table, expressions=column_defs)\n\n if connector_properties is None:\n create_stmt = sge.Create(\n kind=\"TABLE\",\n this=target,\n properties=sge.Properties(expressions=properties),\n )\n else:\n create_stmt = sge.Create(\n kind=\"TABLE\",\n this=target,\n properties=sge.Properties(\n expressions=sge.Properties.from_dict(connector_properties)\n ),\n )\n create_stmt = create_stmt.sql(self.dialect) + data_and_encode_format(\n data_format, encode_format, encode_properties\n )\n\n this = sg.table(name, db=database, quoted=self.compiler.quoted)\n with self._safe_raw_sql(create_stmt) as cur:\n if query is not None:\n insert_stmt = sge.Insert(this=table, expression=query).sql(self.dialect)\n cur.execute(insert_stmt)\n\n if overwrite:\n self.drop_table(name, database=database, force=True)\n cur.execute(\n f\"ALTER TABLE {table.sql(self.dialect)} RENAME TO {this.sql(self.dialect)}\"\n )\n\n if schema is None:\n return self.table(name, database=database)\n\n # preserve the input schema if it was provided\n return ops.DatabaseTable(\n name, schema=schema, source=self, namespace=ops.Namespace(database=database)\n ).to_expr()\n\n def _register_in_memory_table(self, op: ops.InMemoryTable) -> None:\n schema = op.schema\n if null_columns := [col for col, dtype in schema.items() if dtype.is_null()]:\n raise com.IbisTypeError(\n f\"{self.name} cannot yet reliably handle `null` typed columns; \"\n f\"got null typed columns: {null_columns}\"\n )\n\n # only register if we haven't already done so\n if (name := op.name) not in self.list_tables():\n quoted = self.compiler.quoted\n column_defs = [\n sg.exp.ColumnDef(\n this=sg.to_identifier(colname, quoted=quoted),\n kind=self.compiler.type_mapper.from_ibis(typ),\n constraints=(\n None\n if typ.nullable\n else [\n sg.exp.ColumnConstraint(\n kind=sg.exp.NotNullColumnConstraint()\n )\n ]\n ),\n )\n for colname, typ in schema.items()\n ]\n\n create_stmt = sg.exp.Create(\n kind=\"TABLE\",\n this=sg.exp.Schema(\n this=sg.to_identifier(name, quoted=quoted), expressions=column_defs\n ),\n )\n create_stmt_sql = create_stmt.sql(self.dialect)\n\n columns = schema.keys()\n df = op.data.to_frame()\n data = df.itertuples(index=False)\n cols = \", \".join(\n ident.sql(self.dialect)\n for ident in map(partial(sg.to_identifier, quoted=quoted), columns)\n )\n specs = \", \".join(repeat(\"%s\", len(columns)))\n table = sg.table(name, quoted=quoted)\n sql = f\"INSERT INTO {table.sql(self.dialect)} ({cols}) VALUES ({specs})\"\n with self.begin() as cur:\n cur.execute(create_stmt_sql)\n extras.execute_batch(cur, sql, data, 128)\n\n def list_databases(\n self, *, like: str | None = None, catalog: str | None = None\n ) -> list[str]:\n dbs = \"SHOW SCHEMAS\"\n\n with self._safe_raw_sql(dbs) as cur:\n databases = list(map(itemgetter(0), cur))\n\n return self._filter_with_like(databases, like)\n\n @experimental\n def create_materialized_view(\n self,\n name: str,\n obj: ir.Table,\n *,\n database: str | None = None,\n overwrite: bool = False,\n ) -> ir.Table:\n \"\"\"Create a materialized view. Materialized views can be accessed like a normal table.\n\n Parameters\n ----------\n name\n Materialized view name to Create.\n obj\n The select statement to materialize.\n database\n Name of the database where the view exists, if not the default\n overwrite\n Whether to overwrite the existing materialized view with the same name\n\n Returns\n -------\n Table\n Table expression\n \"\"\"\n if overwrite:\n temp_name = util.gen_name(f\"{self.name}_table\")\n else:\n temp_name = name\n\n table = sg.table(temp_name, db=database, quoted=self.compiler.quoted)\n\n create_stmt = sge.Create(\n this=table,\n kind=\"MATERIALIZED VIEW\",\n expression=self.compile(obj),\n )\n self._register_in_memory_tables(obj)\n\n with self._safe_raw_sql(create_stmt) as cur:\n if overwrite:\n target = sg.table(name, db=database).sql(self.dialect)\n\n self.drop_materialized_view(target, database=database, force=True)\n\n cur.execute(\n f\"ALTER MATERIALIZED VIEW {table.sql(self.dialect)} RENAME TO {target}\"\n )\n\n return self.table(name, database=database)\n\n def drop_materialized_view(\n self,\n name: str,\n *,\n database: str | None = None,\n force: bool = False,\n ) -> None:\n \"\"\"Drop a materialized view.\n\n Parameters\n ----------\n name\n Materialized view name to drop.\n database\n Name of the database where the view exists, if not the default.\n force\n If `False`, an exception is raised if the view does not exist.\n \"\"\"\n src = sge.Drop(\n this=sg.table(name, db=database, quoted=self.compiler.quoted),\n kind=\"MATERIALIZED VIEW\",\n exists=force,\n )\n with self._safe_raw_sql(src):\n pass\n\n def create_source(\n self,\n name: str,\n schema: ibis.Schema,\n *,\n database: str | None = None,\n connector_properties: dict,\n data_format: str,\n encode_format: str,\n encode_properties: dict | None = None,\n ) -> ir.Table:\n \"\"\"Creating a source.\n\n Parameters\n ----------\n name\n Source name to Create.\n schema\n The schema for the new Source.\n database\n Name of the database where the source exists, if not the default.\n connector_properties\n The properties of the source connector, providing the connector settings to access the upstream data source.\n Refer https://docs.risingwave.com/docs/current/data-ingestion/ for the required properties of different data source.\n data_format\n The data format for the new source, e.g., \"PLAIN\". data_format and encode_format must be specified at the same time.\n encode_format\n The encode format for the new source, e.g., \"JSON\". data_format and encode_format must be specified at the same time.\n encode_properties\n The properties of encode format, providing information like schema registry url. Refer https://docs.risingwave.com/docs/current/sql-create-source/ for more details.\n\n Returns\n -------\n Table\n Table expression\n \"\"\"\n column_defs = [\n sge.ColumnDef(\n this=sg.to_identifier(colname, quoted=self.compiler.quoted),\n kind=self.compiler.type_mapper.from_ibis(typ),\n constraints=(\n None\n if typ.nullable\n else [sge.ColumnConstraint(kind=sge.NotNullColumnConstraint())]\n ),\n )\n for colname, typ in schema.items()\n ]\n\n table = sg.table(name, db=database, quoted=self.compiler.quoted)\n target = sge.Schema(this=table, expressions=column_defs)\n\n create_stmt = sge.Create(\n kind=\"SOURCE\",\n this=target,\n properties=sge.Properties(\n expressions=sge.Properties.from_dict(connector_properties)\n ),\n )\n\n create_stmt = create_stmt.sql(self.dialect) + data_and_encode_format(\n data_format, encode_format, encode_properties\n )\n\n with self._safe_raw_sql(create_stmt):\n pass\n\n return self.table(name, database=database)\n\n def drop_source(\n self,\n name: str,\n *,\n database: str | None = None,\n force: bool = False,\n ) -> None:\n \"\"\"Drop a Source.\n\n Parameters\n ----------\n name\n Source name to drop.\n database\n Name of the database where the view exists, if not the default.\n force\n If `False`, an exception is raised if the source does not exist.\n \"\"\"\n src = sge.Drop(\n this=sg.table(name, db=database, quoted=self.compiler.quoted),\n kind=\"SOURCE\",\n exists=force,\n )\n with self._safe_raw_sql(src):\n pass\n\n def create_sink(\n self,\n name: str,\n sink_from: str | None = None,\n connector_properties: dict | None = None,\n *,\n obj: ir.Table | None = None,\n database: str | None = None,\n data_format: str | None = None,\n encode_format: str | None = None,\n encode_properties: dict | None = None,\n ) -> None:\n \"\"\"Creating a sink.\n\n Parameters\n ----------\n name\n Sink name to Create.\n sink_from\n The table or materialized view name to sink from. Only one of `sink_from` or `obj` can be\n provided.\n connector_properties\n The properties of the sink connector, providing the connector settings to push to the downstream data sink.\n Refer https://docs.risingwave.com/docs/current/data-delivery/ for the required properties of different data sink.\n obj\n An Ibis table expression that will be used to extract the schema and the data of the new table. Only one of `sink_from` or `obj` can be provided.\n database\n Name of the database where the source exists, if not the default.\n data_format\n The data format for the new source, e.g., \"PLAIN\". data_format and encode_format must be specified at the same time.\n encode_format\n The encode format for the new source, e.g., \"JSON\". data_format and encode_format must be specified at the same time.\n encode_properties\n The properties of encode format, providing information like schema registry url. Refer https://docs.risingwave.com/docs/current/sql-create-source/ for more details.\n \"\"\"\n table = sg.table(name, db=database, quoted=self.compiler.quoted)\n if sink_from is None and obj is None:\n raise ValueError(\"Either `sink_from` or `obj` must be specified\")\n if sink_from is not None and obj is not None:\n raise ValueError(\"Only one of `sink_from` or `obj` can be specified\")\n\n if (encode_format is None) != (data_format is None):\n raise com.UnsupportedArgumentError(\n \"When creating sinks, both encode_format and data_format must be provided, or neither should be\"\n )\n\n if sink_from is not None:\n create_stmt = f\"CREATE SINK {table.sql(self.dialect)} FROM {sink_from}\"\n else:\n create_stmt = sge.Create(\n this=table,\n kind=\"SINK\",\n expression=self.compile(obj),\n ).sql(self.dialect)\n create_stmt = (\n create_stmt\n + \" WITH \"\n + format_properties(connector_properties)\n + data_and_encode_format(data_format, encode_format, encode_properties)\n )\n with self._safe_raw_sql(create_stmt):\n pass\n\n def drop_sink(\n self,\n name: str,\n *,\n database: str | None = None,\n force: bool = False,\n ) -> None:\n \"\"\"Drop a Sink.\n\n Parameters\n ----------\n name\n Sink name to drop.\n database\n Name of the database where the view exists, if not the default.\n force\n If `False`, an exception is raised if the source does not exist.\n \"\"\"\n src = sge.Drop(\n this=sg.table(name, db=database, quoted=self.compiler.quoted),\n kind=\"SINK\",\n exists=force,\n )\n with self._safe_raw_sql(src):\n pass\n", "path": "ibis/backends/risingwave/__init__.py" } ]
diff --git a/ibis/backends/risingwave/__init__.py b/ibis/backends/risingwave/__init__.py index badce2233664..6f7d7af8e11b 100644 --- a/ibis/backends/risingwave/__init__.py +++ b/ibis/backends/risingwave/__init__.py @@ -119,6 +119,7 @@ def do_connect( with self.begin() as cur: cur.execute("SET TIMEZONE = UTC") + cur.execute("SET RW_IMPLICIT_FLUSH TO true;") def create_table( self,
pymodbus-dev__pymodbus-411
[ { "content": "#!/usr/bin/env python\n\"\"\"\nInstalls pymodbus using distutils\n\nRun:\n python setup.py install\nto install the package from the source archive.\n\nFor information about setuptools\nhttp://peak.telecommunity.com/DevCenter/setuptools#new-and-changed-setup-keywords\n\"\"\"\n\n# --------------------------------------------------------------------------- #\n# initialization\n# --------------------------------------------------------------------------- #\ntry: # if not installed, install and proceed\n from setuptools import setup, find_packages\nexcept ImportError:\n from ez_setup import use_setuptools\n use_setuptools()\n from setuptools import setup, find_packages\n\ntry:\n from setup_commands import command_classes\nexcept ImportError:\n command_classes={}\nfrom pymodbus import __version__, __author__, __maintainer__\n\nwith open('requirements.txt') as reqs:\n install_requires = [\n line for line in reqs.read().split('\\n')\n if (line and not line.startswith('--'))\n ]\n install_requires.append(\"pyserial >= 3.4\")\n# --------------------------------------------------------------------------- #\n# configuration\n# --------------------------------------------------------------------------- #\nsetup(\n name=\"pymodbus\",\n version=__version__,\n description=\"A fully featured modbus protocol stack in python\",\n long_description=\"\"\"\n Pymodbus aims to be a fully implemented modbus protocol stack \n implemented using twisted/asyncio/tornado. \n Its orignal goal was to allow simulation of thousands of modbus devices\n on a single machine for monitoring software testing.\n \"\"\",\n classifiers=[\n 'Development Status :: 4 - Beta',\n 'Environment :: Console',\n 'Environment :: X11 Applications :: GTK',\n 'Framework :: Twisted',\n 'Intended Audience :: Developers',\n 'License :: OSI Approved :: BSD License',\n 'Operating System :: POSIX :: Linux',\n 'Operating System :: Unix',\n 'Programming Language :: Python',\n 'Topic :: System :: Networking',\n 'Topic :: Utilities'\n ],\n keywords='modbus, twisted, scada',\n author=__author__,\n author_email='bashwork@gmail.com',\n maintainer=__maintainer__,\n maintainer_email='otlasanju@gmail.com',\n url='https://github.com/riptideio/pymodbus/',\n license='BSD',\n packages=find_packages(exclude=['examples', 'test']),\n exclude_package_data={'': ['examples', 'test', 'tools', 'doc']},\n py_modules=['ez_setup'],\n platforms=['Linux', 'Mac OS X', 'Win'],\n include_package_data=True,\n zip_safe=True,\n install_requires=install_requires,\n extras_require={\n 'quality': [\n 'coverage >= 3.5.3',\n 'nose >= 1.2.1',\n 'mock >= 1.0.0',\n 'pep8 >= 1.3.3'\n ],\n 'documents': ['sphinx >= 1.1.3',\n 'sphinx_rtd_theme',\n 'humanfriendly'],\n 'twisted': [\n 'twisted >= 12.2.0',\n 'pyasn1 >= 0.1.4',\n 'pycrypto >= 2.6'\n ],\n 'tornado': [\n 'tornado >= 4.5.3'\n ],\n 'repl': [\n 'click>=6.7',\n 'prompt-toolkit==2.0.4',\n 'pygments==2.2.0'\n ]\n },\n entry_points={\n 'console_scripts': ['pymodbus.console=pymodbus.repl.main:main'],\n },\n test_suite='nose.collector',\n cmdclass=command_classes,\n)\n\n", "path": "setup.py" } ]
[ { "content": "#!/usr/bin/env python\n\"\"\"\nInstalls pymodbus using distutils\n\nRun:\n python setup.py install\nto install the package from the source archive.\n\nFor information about setuptools\nhttp://peak.telecommunity.com/DevCenter/setuptools#new-and-changed-setup-keywords\n\"\"\"\n\n# --------------------------------------------------------------------------- #\n# initialization\n# --------------------------------------------------------------------------- #\ntry: # if not installed, install and proceed\n from setuptools import setup, find_packages\nexcept ImportError:\n from ez_setup import use_setuptools\n use_setuptools()\n from setuptools import setup, find_packages\n\ntry:\n from setup_commands import command_classes\nexcept ImportError:\n command_classes={}\nfrom pymodbus import __version__, __author__, __maintainer__\n\nwith open('requirements.txt') as reqs:\n install_requires = [\n line for line in reqs.read().split('\\n')\n if (line and not line.startswith('--'))\n ]\n install_requires.append(\"pyserial >= 3.4\")\n# --------------------------------------------------------------------------- #\n# configuration\n# --------------------------------------------------------------------------- #\nsetup(\n name=\"pymodbus\",\n version=__version__,\n description=\"A fully featured modbus protocol stack in python\",\n long_description=\"\"\"\n Pymodbus aims to be a fully implemented modbus protocol stack \n implemented using twisted/asyncio/tornado. \n Its orignal goal was to allow simulation of thousands of modbus devices\n on a single machine for monitoring software testing.\n \"\"\",\n classifiers=[\n 'Development Status :: 4 - Beta',\n 'Environment :: Console',\n 'Environment :: X11 Applications :: GTK',\n 'Framework :: Twisted',\n 'Intended Audience :: Developers',\n 'License :: OSI Approved :: BSD License',\n 'Operating System :: POSIX :: Linux',\n 'Operating System :: Unix',\n 'Programming Language :: Python',\n 'Topic :: System :: Networking',\n 'Topic :: Utilities'\n ],\n keywords='modbus, twisted, scada',\n author=__author__,\n author_email='bashwork@gmail.com',\n maintainer=__maintainer__,\n maintainer_email='otlasanju@gmail.com',\n url='https://github.com/riptideio/pymodbus/',\n license='BSD',\n packages=find_packages(exclude=['examples', 'test']),\n exclude_package_data={'': ['examples', 'test', 'tools', 'doc']},\n py_modules=['ez_setup'],\n platforms=['Linux', 'Mac OS X', 'Win'],\n include_package_data=True,\n zip_safe=True,\n install_requires=install_requires,\n extras_require={\n 'quality': [\n 'coverage >= 3.5.3',\n 'nose >= 1.2.1',\n 'mock >= 1.0.0',\n 'pep8 >= 1.3.3'\n ],\n 'documents': ['sphinx >= 1.1.3',\n 'sphinx_rtd_theme',\n 'humanfriendly'],\n 'twisted': [\n 'twisted >= 12.2.0',\n 'pyasn1 >= 0.1.4',\n ],\n 'tornado': [\n 'tornado >= 4.5.3'\n ],\n 'repl': [\n 'click>=6.7',\n 'prompt-toolkit==2.0.4',\n 'pygments==2.2.0'\n ]\n },\n entry_points={\n 'console_scripts': ['pymodbus.console=pymodbus.repl.main:main'],\n },\n test_suite='nose.collector',\n cmdclass=command_classes,\n)\n\n", "path": "setup.py" } ]
diff --git a/requirements-tests.txt b/requirements-tests.txt index 510306703..515eba29e 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -6,7 +6,6 @@ mock >= 1.0.1 pyserial-asyncio==0.4.0;python_version>="3.4" pep8>=1.7.0 pyasn1>=0.2.3 -pycrypto>=2.6.1 pyserial>=3.4 pytest-cov>=2.5.1 pytest>=3.5.0 diff --git a/requirements.txt b/requirements.txt index ae349e55c..7224f71b1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,7 +16,6 @@ six==1.11.0 #Twisted==17.1.0 #zope.interface==4.4.0 #pyasn1==0.2.3 -#pycrypto==2.6.1 #wsgiref==0.1.2 #cryptography==1.8.1 @@ -43,4 +42,4 @@ six==1.11.0 # if you want to use pymodbus REPL # ------------------------------------------------------------------- # click>=6.7 -# prompt-toolkit==2.0.4 \ No newline at end of file +# prompt-toolkit==2.0.4 diff --git a/setup.py b/setup.py index 9069eda16..35e05697b 100644 --- a/setup.py +++ b/setup.py @@ -85,7 +85,6 @@ 'twisted': [ 'twisted >= 12.2.0', 'pyasn1 >= 0.1.4', - 'pycrypto >= 2.6' ], 'tornado': [ 'tornado >= 4.5.3'
psychopy__psychopy-3812
[ { "content": "import ast\nimport re\n\nfrom numpy import array\nfrom esprima import parseScript\n\nfrom psychopy.tools import monitorunittools\nfrom psychopy.alerts._alerts import alert\nfrom psychopy.visual.textbox2.fontmanager import FontManager\n\nfontMGR = FontManager()\n\nclass TestWin(object):\n \"\"\"\n Creates a false window with necessary attributes for converting component\n Parameters to pixels.\n \"\"\"\n def __init__(self, exp):\n self.useRetina = True\n self.exp = exp\n self.monitor = self.exp.settings.monitor\n winSize = self.exp.settings.params['Window size (pixels)'].val\n\n if winSize and isinstance(winSize, str):\n self.size = ast.literal_eval(winSize)\n elif winSize and (isinstance(winSize, list) or isinstance(winSize, tuple)):\n self.size = winSize\n else:\n self.size = (1024, 768)\n\ndef validDuration(t, hz, toleranceFrames=0.01):\n \"\"\"Test whether this is a possible time duration given the frame rate\"\"\"\n # best not to use mod operator for floats. e.g. 0.5%0.01 gives 0.00999\n # (due to a float round error?)\n # nFrames = t*hz so test if round(nFrames)==nFrames but with a tolerance\n nFrames = float(t) * hz # t might not be float if given as \"0.5\"?\n return abs(nFrames - round(nFrames)) < toleranceFrames\n\n\ndef convertParamToPix(value, win, units):\n \"\"\"\n Convert value to numpy array\n Parameters\n ----------\n value : str, int, float, list, tuple\n Parameter value to be converted to pixels\n win : TestWin object\n A false window with necessary attributes for converting component\n parameters to pixels\n units : str\n Screen units\n\n Returns\n -------\n numpy array\n Parameter converted to pixels in numpy array\n \"\"\"\n if isinstance(value, str):\n value = array(ast.literal_eval(value))\n else:\n value = array(value)\n return monitorunittools.convertToPix(value, array([0, 0]), units=units, win=win) * 2\n\n\ndef testFloat(val):\n \"\"\"\n Test value for float.\n Used to detect use of variables, strings and none types, which cannot be checked.\n \"\"\"\n try:\n return type(float(val)) == float\n except Exception:\n return False\n\n\ndef testSize(component, win, units):\n \"\"\"\n Runs size testing for component\n\n Parameters\n ----------\n component: Component\n The component used for size testing\n win : TestWin object\n Used for testing component size in bounds\n units : str`\n Screen units\n \"\"\"\n if 'size' not in component.params:\n return\n\n try:\n size = convertParamToPix(component.params['size'].val, win, units)\n except Exception: # Use of variables fails check\n return\n\n # Test X\n if size[0] > win.size[0]:\n alert(2115, component, {'dimension': 'X'})\n # Test Y\n if size[1] > win.size[1]:\n alert(2115, component, {'dimension': 'Y'})\n\n # Test if smaller than 1 pixel (X dimension)\n if size[0] < 1:\n alert(2120, component, {'dimension': 'X'})\n # Test if smaller than 1 pixel (Y dimension)\n if size[1] < 1:\n alert(2120, component, {'dimension': 'Y'})\n\ndef testPos(component, win, units):\n \"\"\"\n Runs position testing for component\n\n Parameters\n ----------\n component: Component\n The component used for size testing\n win : TestWin object\n Used for testing component position in bounds\n units : str`\n Screen units\n \"\"\"\n if 'pos' not in component.params:\n return\n\n try:\n pos = convertParamToPix(component.params['pos'].val, win, units)\n except Exception: # Use of variables fails check\n return\n\n # Test X position\n if abs(pos[0]) > win.size[0]:\n alert(2155, component, {'dimension': 'X'})\n # Test Y position\n if abs(pos[1]) > win.size[1]:\n alert(2155, component, {'dimension': 'Y'})\n\ndef testStartEndTiming(component):\n \"\"\"\n Tests stimuli starts before end time.\n\n Parameters\n ----------\n component: Component\n The component used for size testing\n \"\"\"\n\n if \"startType\" not in component.params or \"stopType\" not in component.params :\n return\n\n if (component.params['startType'] not in [\"time (s)\", \"frame N\"]\n or component.params['stopType'] not in [\"time (s)\", \"frame N\"]):\n return\n\n start = {'type': component.params['startType'].val, 'val' : component.params['startVal'].val}\n stop = {'type': component.params['stopType'].val, 'val' : component.params['stopVal'].val}\n\n # Check for string / variable\n if not all([testFloat(start['val']), testFloat(stop['val'])]):\n return\n\n if [start['type'], stop['type']] == [\"time (s)\", \"time (s)\"]:\n if float(start['val']) > float(stop['val']):\n alert(4105, component, {'type': 'time'})\n if [start['type'], stop['type']] == [\"frame N\", \"frame N\"]:\n if int(float(start['val'])) > int(float(stop['val'].strip())):\n alert(4105, component, {'type': 'frame'})\n\ndef testAchievableVisualOnsetOffset(component):\n \"\"\"Test whether start and end times are less than 1 screen refresh.\n \"\"\"\n\n if component.type not in [\"Text\", \"Aperture\", \"Dots\", \"EnvGrating\", \"Form\",\n \"Grating\", \"Image\", \"Movie\", \"NoiseStim\", \"Polygon\"]:\n return\n\n if \"startType\" not in component.params or \"stopType\" not in component.params:\n return\n\n startVal = component.params['startVal'].val\n stopVal = component.params['stopVal'].val\n\n if testFloat(startVal):\n if component.params['startType'] == \"time (s)\":\n # Test times are greater than 1 screen refresh for 60Hz and 100Hz monitors\n if not float.is_integer(float(startVal)) and float(startVal) < 1.0 / 60:\n alert(3110, component, {'type': 'start', 'time': startVal, 'Hz': 60})\n if not float.is_integer(float(startVal)) and float(startVal) < 1.0 / 100:\n alert(3110, component, {'type': 'start', 'time': startVal, 'Hz': 100})\n\n if testFloat(stopVal):\n if component.params['stopType'] == \"duration (s)\":\n # Test times are greater than 1 screen refresh for 60Hz and 100Hz monitors\n if not float.is_integer(float(stopVal)) and float(stopVal) < 1.0 / 60:\n alert(3110, component, {'type': 'stop', 'time': stopVal, 'Hz': 60})\n if not float.is_integer(float(stopVal)) and float(stopVal) < 1.0 / 100:\n alert(3110, component, {'type': 'stop', 'time': stopVal, 'Hz': 100})\n\ndef testValidVisualStimTiming(component):\n \"\"\"Test whether visual stimuli presented accurately for times requested,\n relative to screen refresh rate of 60 and 100Hz monitors.\n \"\"\"\n if component.type not in [\"Text\", \"Aperture\", \"Dots\", \"EnvGrating\", \"Form\",\n \"Grating\", \"Image\", \"Movie\", \"NoiseStim\", \"Polygon\"]:\n return\n\n if \"startType\" not in component.params or \"stopType\" not in component.params:\n return\n\n # Check for string / variable\n startVal = component.params['startVal'].val\n stopVal = component.params['stopVal'].val\n\n if testFloat(startVal):\n if component.params['startType'] == \"time (s)\":\n # Test times are valid multiples of screen refresh for 60Hz and 100Hz monitors\n if not validDuration(startVal, 60):\n alert(3115, component, {'type': 'start', 'time': startVal, 'Hz': 60})\n\n if testFloat(stopVal):\n if component.params['stopType'] == \"duration (s)\":\n # Test times are valid multiples of screen refresh for 60Hz and 100Hz monitors\n if not validDuration(stopVal, 60):\n alert(3115, component, {'type': 'stop', 'time': stopVal, 'Hz': 60})\n\ndef testFramesAsInt(component):\n \"\"\"\n Test whole numbers are used for frames.\n \"\"\"\n\n if \"startType\" not in component.params or \"stopType\" not in component.params :\n return\n\n startVal = component.params['startVal'].val\n stopVal = component.params['stopVal'].val\n\n if testFloat(startVal):\n if component.params['startType'] in [\"frame N\", \"duration (frames)\"]:\n # Test frames are whole numbers\n if not float.is_integer(float(startVal)):\n alert(4115, component, {'type': 'start', 'frameType': component.params['startType']})\n\n if testFloat(stopVal):\n if component.params['stopType'] in [\"frame N\", \"duration (frames)\"]:\n # Test frames are whole numbers\n if not float.is_integer(float(stopVal)):\n alert(4115, component, {'type': 'stop', 'frameType': component.params['stopType']})\n\ndef testDisabled(component):\n \"\"\"\n Tests whether a component is enabled.\n\n Parameters\n ----------\n component: Component\n The component used for testing\n \"\"\"\n if \"disabled\" not in component.params:\n return\n\n if component.params['disabled'].val:\n alert(4305, component)\n\ndef testFont(component):\n \"\"\"\n Tests whether font is stored locally or whether it needs to be retrieved from Google Fonts\n\n Parameters\n ----------\n component: Component\n The component used for testing\n \"\"\"\n if 'font' in component.params:\n fontInfo = fontMGR.getFontsMatching(component.params['font'].val, fallback=False)\n if not fontInfo:\n alert(4320, strFields={'param': component.params['font']})\n\ndef testDollarSyntax(component):\n \"\"\"\n Tests that use of dollar signs in Builder components to denote literal interpretation are used correctly\n\n Parameters\n ----------\n component: Component\n The component used for testing\n \"\"\"\n valid = {}\n for (key, param) in component.params.items():\n if not param.dollarSyntax()[0]:\n alert(4315, strFields={'component': component, 'param': param})\n return valid\n\ndef checkPythonSyntax(component, tab):\n \"\"\"\n Checks each Python code component tabs for syntax errors.\n Note, catalogue message is formatted using a dict that contains:\n {\n 'codeTab': The code component tab as string,\n 'code': The code containing the error,\n 'lineNumber': The line number of error as string\n }\n\n Parameters\n ----------\n component: Component\n The code component being tested\n tab: str\n The name of the code component tab being tested\n \"\"\"\n try:\n compile(str(component.params[tab].val), \"path\", 'exec')\n except Exception as err:\n strFields = {'codeTab': tab, 'lineNumber': err.lineno, 'code': err.text}\n # Dont sent traceback because strFields gives better localisation of error\n alert(4205, component, strFields)\n\ndef checkJavaScriptSyntax(component, tab):\n \"\"\"\n Checks each JS code component tabs for syntax errors.\n Note, catalogue message is formatted using a dict that contains:\n {\n 'codeTab': The code component tab as string,\n 'lineNumber': The line number and error msg as string\n }\n\n Parameters\n ----------\n component: Component\n The code component being tested\n tab: str\n The name of the code component tab being tested\n \"\"\"\n try:\n parseScript(str(component.params[tab].val))\n except Exception as err:\n strFields = {'codeTab': tab, 'lineNumber': err.message}\n # Dont sent traceback because strFields gives better localisation of error\n alert(4210, component, strFields)\n", "path": "psychopy/alerts/alerttools.py" } ]
[ { "content": "import ast\nimport re\n\nfrom numpy import array\nfrom esprima import parseScript\n\nfrom psychopy.tools import monitorunittools\nfrom psychopy.alerts._alerts import alert\nfrom psychopy.visual.textbox2.fontmanager import FontManager\n\nfontMGR = FontManager()\n\nclass TestWin(object):\n \"\"\"\n Creates a false window with necessary attributes for converting component\n Parameters to pixels.\n \"\"\"\n def __init__(self, exp):\n self.useRetina = True\n self.exp = exp\n self.monitor = self.exp.settings.monitor\n winSize = self.exp.settings.params['Window size (pixels)'].val\n\n if winSize and isinstance(winSize, str):\n self.size = ast.literal_eval(winSize)\n elif winSize and (isinstance(winSize, list) or isinstance(winSize, tuple)):\n self.size = winSize\n else:\n self.size = (1024, 768)\n\ndef validDuration(t, hz, toleranceFrames=0.01):\n \"\"\"Test whether this is a possible time duration given the frame rate\"\"\"\n # best not to use mod operator for floats. e.g. 0.5%0.01 gives 0.00999\n # (due to a float round error?)\n # nFrames = t*hz so test if round(nFrames)==nFrames but with a tolerance\n nFrames = float(t) * hz # t might not be float if given as \"0.5\"?\n return abs(nFrames - round(nFrames)) < toleranceFrames\n\n\ndef convertParamToPix(value, win, units):\n \"\"\"\n Convert value to numpy array\n Parameters\n ----------\n value : str, int, float, list, tuple\n Parameter value to be converted to pixels\n win : TestWin object\n A false window with necessary attributes for converting component\n parameters to pixels\n units : str\n Screen units\n\n Returns\n -------\n numpy array\n Parameter converted to pixels in numpy array\n \"\"\"\n if isinstance(value, str):\n value = array(ast.literal_eval(value))\n else:\n value = array(value)\n return monitorunittools.convertToPix(value, array([0, 0]), units=units, win=win) * 2\n\n\ndef testFloat(val):\n \"\"\"\n Test value for float.\n Used to detect use of variables, strings and none types, which cannot be checked.\n \"\"\"\n try:\n return type(float(val)) == float\n except Exception:\n return False\n\n\ndef testSize(component, win, units):\n \"\"\"\n Runs size testing for component\n\n Parameters\n ----------\n component: Component\n The component used for size testing\n win : TestWin object\n Used for testing component size in bounds\n units : str`\n Screen units\n \"\"\"\n if 'size' not in component.params:\n return\n\n try:\n size = convertParamToPix(component.params['size'].val, win, units)\n except Exception: # Use of variables fails check\n return\n\n # Test X\n if size[0] > win.size[0]:\n alert(2115, component, {'dimension': 'X'})\n # Test Y\n if size[1] > win.size[1]:\n alert(2115, component, {'dimension': 'Y'})\n\n # Test if smaller than 1 pixel (X dimension)\n if size[0] < 1:\n alert(2120, component, {'dimension': 'X'})\n # Test if smaller than 1 pixel (Y dimension)\n if size[1] < 1:\n alert(2120, component, {'dimension': 'Y'})\n\ndef testPos(component, win, units):\n \"\"\"\n Runs position testing for component\n\n Parameters\n ----------\n component: Component\n The component used for size testing\n win : TestWin object\n Used for testing component position in bounds\n units : str`\n Screen units\n \"\"\"\n if 'pos' not in component.params:\n return\n\n try:\n pos = convertParamToPix(component.params['pos'].val, win, units)\n except Exception: # Use of variables fails check\n return\n\n # Test X position\n if abs(pos[0]) > win.size[0]:\n alert(2155, component, {'dimension': 'X'})\n # Test Y position\n if abs(pos[1]) > win.size[1]:\n alert(2155, component, {'dimension': 'Y'})\n\ndef testStartEndTiming(component):\n \"\"\"\n Tests stimuli starts before end time.\n\n Parameters\n ----------\n component: Component\n The component used for size testing\n \"\"\"\n\n if \"startType\" not in component.params or \"stopType\" not in component.params :\n return\n\n if (component.params['startType'] not in [\"time (s)\", \"frame N\"]\n or component.params['stopType'] not in [\"time (s)\", \"frame N\"]):\n return\n\n start = {'type': component.params['startType'].val, 'val' : component.params['startVal'].val}\n stop = {'type': component.params['stopType'].val, 'val' : component.params['stopVal'].val}\n\n # Check for string / variable\n if not all([testFloat(start['val']), testFloat(stop['val'])]):\n return\n\n if [start['type'], stop['type']] == [\"time (s)\", \"time (s)\"]:\n if float(start['val']) > float(stop['val']):\n alert(4105, component, {'type': 'time'})\n if [start['type'], stop['type']] == [\"frame N\", \"frame N\"]:\n if int(float(start['val'])) > int(float(stop['val'].strip())):\n alert(4105, component, {'type': 'frame'})\n\ndef testAchievableVisualOnsetOffset(component):\n \"\"\"Test whether start and end times are less than 1 screen refresh.\n \"\"\"\n\n if component.type not in [\"Text\", \"Aperture\", \"Dots\", \"EnvGrating\", \"Form\",\n \"Grating\", \"Image\", \"Movie\", \"NoiseStim\", \"Polygon\"]:\n return\n\n if \"startType\" not in component.params or \"stopType\" not in component.params:\n return\n\n startVal = component.params['startVal'].val\n stopVal = component.params['stopVal'].val\n\n if testFloat(startVal):\n if component.params['startType'] == \"time (s)\":\n # Test times are greater than 1 screen refresh for 60Hz and 100Hz monitors\n if not float.is_integer(float(startVal)) and float(startVal) < 1.0 / 60:\n alert(3110, component, {'type': 'start', 'time': startVal, 'Hz': 60})\n if not float.is_integer(float(startVal)) and float(startVal) < 1.0 / 100:\n alert(3110, component, {'type': 'start', 'time': startVal, 'Hz': 100})\n\n if testFloat(stopVal):\n if component.params['stopType'] == \"duration (s)\":\n # Test times are greater than 1 screen refresh for 60Hz and 100Hz monitors\n if not float.is_integer(float(stopVal)) and float(stopVal) < 1.0 / 60:\n alert(3110, component, {'type': 'stop', 'time': stopVal, 'Hz': 60})\n if not float.is_integer(float(stopVal)) and float(stopVal) < 1.0 / 100:\n alert(3110, component, {'type': 'stop', 'time': stopVal, 'Hz': 100})\n\ndef testValidVisualStimTiming(component):\n \"\"\"Test whether visual stimuli presented accurately for times requested,\n relative to screen refresh rate of 60 and 100Hz monitors.\n \"\"\"\n if component.type not in [\"Text\", \"Aperture\", \"Dots\", \"EnvGrating\", \"Form\",\n \"Grating\", \"Image\", \"Movie\", \"NoiseStim\", \"Polygon\"]:\n return\n\n if \"startType\" not in component.params or \"stopType\" not in component.params:\n return\n\n # Check for string / variable\n startVal = component.params['startVal'].val\n stopVal = component.params['stopVal'].val\n\n if testFloat(startVal):\n if component.params['startType'] == \"time (s)\":\n # Test times are valid multiples of screen refresh for 60Hz and 100Hz monitors\n if not validDuration(startVal, 60):\n alert(3115, component, {'type': 'start', 'time': startVal, 'Hz': 60})\n\n if testFloat(stopVal):\n if component.params['stopType'] == \"duration (s)\":\n # Test times are valid multiples of screen refresh for 60Hz and 100Hz monitors\n if not validDuration(stopVal, 60):\n alert(3115, component, {'type': 'stop', 'time': stopVal, 'Hz': 60})\n\ndef testFramesAsInt(component):\n \"\"\"\n Test whole numbers are used for frames.\n \"\"\"\n\n if \"startType\" not in component.params or \"stopType\" not in component.params :\n return\n\n startVal = component.params['startVal'].val\n stopVal = component.params['stopVal'].val\n\n if testFloat(startVal):\n if component.params['startType'] in [\"frame N\", \"duration (frames)\"]:\n # Test frames are whole numbers\n if not float.is_integer(float(startVal)):\n alert(4115, component, {'type': 'start', 'frameType': component.params['startType']})\n\n if testFloat(stopVal):\n if component.params['stopType'] in [\"frame N\", \"duration (frames)\"]:\n # Test frames are whole numbers\n if not float.is_integer(float(stopVal)):\n alert(4115, component, {'type': 'stop', 'frameType': component.params['stopType']})\n\ndef testDisabled(component):\n \"\"\"\n Tests whether a component is enabled.\n\n Parameters\n ----------\n component: Component\n The component used for testing\n \"\"\"\n if \"disabled\" not in component.params:\n return\n\n if component.params['disabled'].val:\n alert(4305, component, strFields={'name': component.params['name']})\n\ndef testFont(component):\n \"\"\"\n Tests whether font is stored locally or whether it needs to be retrieved from Google Fonts\n\n Parameters\n ----------\n component: Component\n The component used for testing\n \"\"\"\n if 'font' in component.params:\n fontInfo = fontMGR.getFontsMatching(component.params['font'].val, fallback=False)\n if not fontInfo:\n alert(4320, strFields={'param': component.params['font']})\n\ndef testDollarSyntax(component):\n \"\"\"\n Tests that use of dollar signs in Builder components to denote literal interpretation are used correctly\n\n Parameters\n ----------\n component: Component\n The component used for testing\n \"\"\"\n valid = {}\n for (key, param) in component.params.items():\n if not param.dollarSyntax()[0]:\n alert(4315, strFields={'component': component, 'param': param})\n return valid\n\ndef checkPythonSyntax(component, tab):\n \"\"\"\n Checks each Python code component tabs for syntax errors.\n Note, catalogue message is formatted using a dict that contains:\n {\n 'codeTab': The code component tab as string,\n 'code': The code containing the error,\n 'lineNumber': The line number of error as string\n }\n\n Parameters\n ----------\n component: Component\n The code component being tested\n tab: str\n The name of the code component tab being tested\n \"\"\"\n try:\n compile(str(component.params[tab].val), \"path\", 'exec')\n except Exception as err:\n strFields = {'codeTab': tab, 'lineNumber': err.lineno, 'code': err.text}\n # Dont sent traceback because strFields gives better localisation of error\n alert(4205, component, strFields)\n\ndef checkJavaScriptSyntax(component, tab):\n \"\"\"\n Checks each JS code component tabs for syntax errors.\n Note, catalogue message is formatted using a dict that contains:\n {\n 'codeTab': The code component tab as string,\n 'lineNumber': The line number and error msg as string\n }\n\n Parameters\n ----------\n component: Component\n The code component being tested\n tab: str\n The name of the code component tab being tested\n \"\"\"\n try:\n parseScript(str(component.params[tab].val))\n except Exception as err:\n strFields = {'codeTab': tab, 'lineNumber': err.message}\n # Dont sent traceback because strFields gives better localisation of error\n alert(4210, component, strFields)\n", "path": "psychopy/alerts/alerttools.py" } ]
diff --git a/psychopy/alerts/alertsCatalogue/4305.yaml b/psychopy/alerts/alertsCatalogue/4305.yaml index 0e0398dbab..35413c4a17 100644 --- a/psychopy/alerts/alertsCatalogue/4305.yaml +++ b/psychopy/alerts/alertsCatalogue/4305.yaml @@ -1,7 +1,7 @@ code: 4305 cat: Components -msg: Your component is currently disabled and will not be written to your experiment script. +msg: The component {name} is currently disabled and will not be written to your experiment script. # The following are typically used for online help pages, and support reStructured Text. label: Component is currently disabled in your experiment diff --git a/psychopy/alerts/alerttools.py b/psychopy/alerts/alerttools.py index 6d8a475472..cc513dd1b3 100644 --- a/psychopy/alerts/alerttools.py +++ b/psychopy/alerts/alerttools.py @@ -260,7 +260,7 @@ def testDisabled(component): return if component.params['disabled'].val: - alert(4305, component) + alert(4305, component, strFields={'name': component.params['name']}) def testFont(component): """ diff --git a/psychopy/tests/test_alerts/test_alerttools.py b/psychopy/tests/test_alerts/test_alerttools.py index eeafc6cc0e..5560650ff0 100644 --- a/psychopy/tests/test_alerts/test_alerttools.py +++ b/psychopy/tests/test_alerts/test_alerttools.py @@ -78,7 +78,7 @@ def test_timing(self): def test_disabled(self): self.polygonComp.params['disabled'].val = True alerttools.testDisabled(self.polygonComp) - assert ('Your component is currently disabled' in self.error.alerts[0].msg) + assert (f"The component {self.polygonComp.params['name']} is currently disabled" in self.error.alerts[0].msg) def test_achievable_visual_stim_onset(self): self.polygonComp.params['startVal'].val = .001
cython__cython-4942
[ { "content": "from cython.cimports import cqueue\n\n@cython.cclass\nclass Queue:\n _c_queue = cython.declare(cython.pointer(cqueue.Queue))\n\n def __cinit__(self):\n self._c_queue = cqueue.queue_new()\n", "path": "docs/examples/tutorial/clibraries/queue.py" } ]
[ { "content": "from cython.cimports import cqueue\n\n@cython.cclass\nclass Queue:\n _c_queue: cython.pointer(cqueue.Queue)\n\n def __cinit__(self):\n self._c_queue = cqueue.queue_new()\n", "path": "docs/examples/tutorial/clibraries/queue.py" } ]
diff --git a/docs/examples/tutorial/clibraries/queue.py b/docs/examples/tutorial/clibraries/queue.py index 45529fa9480..e99b9b32c32 100644 --- a/docs/examples/tutorial/clibraries/queue.py +++ b/docs/examples/tutorial/clibraries/queue.py @@ -2,7 +2,7 @@ @cython.cclass class Queue: - _c_queue = cython.declare(cython.pointer(cqueue.Queue)) + _c_queue: cython.pointer(cqueue.Queue) def __cinit__(self): self._c_queue = cqueue.queue_new() diff --git a/docs/src/tutorial/clibraries.rst b/docs/src/tutorial/clibraries.rst index ddc02f443b4..5b8c545b87c 100644 --- a/docs/src/tutorial/clibraries.rst +++ b/docs/src/tutorial/clibraries.rst @@ -125,9 +125,6 @@ Here is a first start for the Queue class: .. literalinclude:: ../../examples/tutorial/clibraries/queue.py :caption: queue.py - .. note:: Currently, Cython contains a bug not allowing using - annotations with types containing pointers (GitHub issue :issue:`4293`). - .. group-tab:: Cython .. literalinclude:: ../../examples/tutorial/clibraries/queue.pyx
kornia__kornia-1861
[ { "content": "import torch\n\nfrom kornia.testing import KORNIA_CHECK_IS_COLOR, KORNIA_CHECK_IS_TENSOR\n\n\ndef shift_rgb(image: torch.Tensor, r_shift: torch.Tensor, g_shift: torch.Tensor, b_shift: torch.Tensor) -> torch.Tensor:\n \"\"\"Shift rgb channels.\n\n Shift each image's channel by either r_shift for red, g_shift for green and b_shift for blue channels.\n \"\"\"\n\n KORNIA_CHECK_IS_TENSOR(image)\n KORNIA_CHECK_IS_COLOR(image, f\"with shape {image.shape}\")\n\n shifts = [r_shift, g_shift, b_shift]\n\n shifted = (image + torch.Tensor(shifts).view(1, 3, 1, 1).to(image)).clamp_(min=0, max=1)\n\n return shifted\n", "path": "kornia/enhance/shift_rgb.py" } ]
[ { "content": "import torch\n\nfrom kornia.testing import KORNIA_CHECK_IS_COLOR, KORNIA_CHECK_IS_TENSOR\n\n\ndef shift_rgb(image: torch.Tensor, r_shift: torch.Tensor, g_shift: torch.Tensor, b_shift: torch.Tensor) -> torch.Tensor:\n \"\"\"Shift rgb channels.\n\n Shift each image's channel by either r_shift for red, g_shift for green and b_shift for blue channels.\n \"\"\"\n\n KORNIA_CHECK_IS_TENSOR(image)\n KORNIA_CHECK_IS_COLOR(image, f\"with shape {image.shape}\")\n\n shifts = [r_shift, g_shift, b_shift]\n\n shifted = (image + torch.stack(shifts).view(-1, 3, 1, 1).to(image)).clamp_(min=0, max=1)\n\n return shifted\n", "path": "kornia/enhance/shift_rgb.py" } ]
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 12cf1c0ba5..faa9fe9e84 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -63,7 +63,7 @@ repos: - "B101,B311" - repo: https://github.com/myint/docformatter - rev: v1.5.0-rc1 + rev: v1.5.0 hooks: - id: docformatter args: [--in-place, --wrap-summaries=115, --wrap-descriptions=120] diff --git a/kornia/enhance/shift_rgb.py b/kornia/enhance/shift_rgb.py index 3599f96ed0..e68b84385c 100644 --- a/kornia/enhance/shift_rgb.py +++ b/kornia/enhance/shift_rgb.py @@ -14,6 +14,6 @@ def shift_rgb(image: torch.Tensor, r_shift: torch.Tensor, g_shift: torch.Tensor, shifts = [r_shift, g_shift, b_shift] - shifted = (image + torch.Tensor(shifts).view(1, 3, 1, 1).to(image)).clamp_(min=0, max=1) + shifted = (image + torch.stack(shifts).view(-1, 3, 1, 1).to(image)).clamp_(min=0, max=1) return shifted diff --git a/test/augmentation/test_augmentation.py b/test/augmentation/test_augmentation.py index ca23c739dd..194920c4bc 100644 --- a/test/augmentation/test_augmentation.py +++ b/test/augmentation/test_augmentation.py @@ -3339,7 +3339,50 @@ def test_module(self, device, dtype): class TestRandomRGBShift: def test_smoke(self, device, dtype): - img = torch.rand(1, 3, 4, 5, device=device, dtype=dtype) + img = torch.rand(2, 3, 4, 5, device=device, dtype=dtype) aug = RandomRGBShift(p=1.0).to(device) out = aug(img) - assert out.shape == (1, 3, 4, 5) + assert out.shape == (2, 3, 4, 5) + + def test_onnx_export(self, device, dtype): + img = torch.rand(1, 3, 4, 5, device=device, dtype=dtype) + aug = RandomRGBShift(p=1.0).to(device) + torch.onnx.export(aug, img, "temp.onnx", export_params=True) + + def test_random_rgb_shift(self, device, dtype): + torch.manual_seed(0) + input = torch.tensor( + [[[[0.2, 0.0]], [[0.3, 0.5]], [[0.4, 0.7]]], [[[0.2, 0.7]], [[0.0, 0.8]], [[0.2, 0.3]]]], + device=device, + dtype=dtype, + ) + + f = RandomRGBShift(p=1.0).to(device) + expected = torch.tensor( + [ + [[[0.19625, 0.00000]], [[0.56822, 0.76822]], [[0.00000, 0.28847]]], + [[[0.00000, 0.33203]], [[0.00000, 0.60742]], [[0.33407, 0.43407]]], + ], + device=device, + dtype=dtype, + ) + utils.assert_close(f(input), expected, rtol=1e-4, atol=1e-4) + + def test_random_rgb_shift_same_batch(self, device, dtype): + torch.manual_seed(0) + input = torch.tensor( + [[[[0.2, 0.0]], [[0.3, 0.5]], [[0.4, 0.7]]], [[[0.2, 0.7]], [[0.0, 0.8]], [[0.2, 0.3]]]], + device=device, + dtype=dtype, + ) + + f = RandomRGBShift(p=1.0, same_on_batch=True).to(device) + expected = torch.tensor( + [ + [[[0.19626, 0.00000]], [[0.29626, 0.49626]], [[0.66822, 0.96822]]], + [[[0.46822, 0.96822]], [[0.00000, 0.38848]], [[0.00000, 0.00000]]], + ], + device=device, + dtype=dtype, + ) + utils.assert_close(f(input), expected, rtol=1e-4, atol=1e-4) diff --git a/test/enhance/test_shift_rgb.py b/test/enhance/test_shift_rgb.py index 7a8dcc0d56..484675e034 100644 --- a/test/enhance/test_shift_rgb.py +++ b/test/enhance/test_shift_rgb.py @@ -8,7 +8,7 @@ class TestRGBShift: def test_rgb_shift_no_shift(self, device, dtype): - r_shift, g_shift, b_shift = 0, 0, 0 + r_shift, g_shift, b_shift = torch.Tensor([0]), torch.Tensor([0]), torch.Tensor([0]) image = torch.rand(2, 3, 5, 5, device=device, dtype=dtype) expected = image shifted = kornia.enhance.shift_rgb(image, r_shift, g_shift, b_shift) @@ -16,7 +16,7 @@ def test_rgb_shift_no_shift(self, device, dtype): utils.assert_close(shifted, expected) def test_rgb_shift_all_zeros(self, device, dtype): - r_shift, g_shift, b_shift = -0.1, -0.1, -0.1 + r_shift, g_shift, b_shift = torch.Tensor([-0.1]), torch.Tensor([-0.1]), torch.Tensor([-0.1]) image = torch.zeros(2, 3, 5, 5, device=device, dtype=dtype) expected = image shifted = kornia.enhance.shift_rgb(image, r_shift, g_shift, b_shift) @@ -24,7 +24,7 @@ def test_rgb_shift_all_zeros(self, device, dtype): utils.assert_close(shifted, expected) def test_rgb_shift_all_ones(self, device, dtype): - r_shift, g_shift, b_shift = 1, 1, 1 + r_shift, g_shift, b_shift = torch.Tensor([1]), torch.Tensor([1]), torch.Tensor([1]) image = torch.rand(2, 3, 5, 5, device=device, dtype=dtype) expected = torch.ones(2, 3, 5, 5, device=device, dtype=dtype) shifted = kornia.enhance.shift_rgb(image, r_shift, g_shift, b_shift) @@ -32,21 +32,29 @@ def test_rgb_shift_all_ones(self, device, dtype): utils.assert_close(shifted, expected) def test_rgb_shift_invalid_parameter_shape(self, device, dtype): - r_shift, g_shift, b_shift = 0.5, 0.5, 0.5 + r_shift, g_shift, b_shift = torch.Tensor([0.5]), torch.Tensor([0.5]), torch.Tensor([0.5]) image = torch.randn(3, 3, device=device, dtype=dtype) with pytest.raises(TypeError): kornia.enhance.shift_rgb(image, r_shift, g_shift, b_shift) def test_rgb_shift_gradcheck(self, device, dtype): - r_shift, g_shift, b_shift = 0.4, 0.5, 0.2 + r_shift, g_shift, b_shift = torch.Tensor([0.4]), torch.Tensor([0.5]), torch.Tensor([0.2]) image = torch.randn(2, 3, 5, 5, device=device, dtype=dtype) image = utils.tensor_to_gradcheck_var(image) # to var assert gradcheck(kornia.enhance.shift_rgb, (image, r_shift, g_shift, b_shift), raise_exception=True) def test_rgb_shift(self, device, dtype): - r_shift, g_shift, b_shift = 0.1, 0.2, -0.3 - image = torch.tensor([[[[0.2, 0.0]], [[0.3, 0.5]], [[0.4, 0.7]]]], device=device, dtype=dtype) + r_shift, g_shift, b_shift = torch.Tensor([0.1]), torch.Tensor([0.3]), torch.Tensor([-0.3]) + image = torch.tensor( + [[[[0.2, 0.0]], [[0.3, 0.5]], [[0.4, 0.7]]], [[[0.2, 0.7]], [[0.0, 0.8]], [[0.2, 0.3]]]], + device=device, + dtype=dtype, + ) shifted = kornia.enhance.shift_rgb(image, r_shift, g_shift, b_shift) - expected = torch.tensor([[[[0.3, 0.1]], [[0.5, 0.7]], [[0.1, 0.4]]]], device=device, dtype=dtype) + expected = torch.tensor( + [[[[0.3, 0.1]], [[0.6, 0.8]], [[0.1, 0.4]]], [[[0.3, 0.8]], [[0.3, 1.0]], [[0.0, 0.0]]]], + device=device, + dtype=dtype, + ) utils.assert_close(shifted, expected)
mkdocs__mkdocs-1329
[ { "content": "# coding: utf-8\n\n\"\"\"\nDeals with generating the per-page table of contents.\n\nFor the sake of simplicity we use an existing markdown extension to generate\nan HTML table of contents, and then parse that into the underlying data.\n\nThe steps we take to generate a table of contents are:\n\n* Pre-process the markdown, injecting a [TOC] marker.\n* Generate HTML from markdown.\n* Post-process the HTML, spliting the content and the table of contents.\n* Parse table of contents HTML into the underlying data structure.\n\"\"\"\n\nfrom __future__ import unicode_literals\n\ntry: # pragma: no cover\n from html.parser import HTMLParser # noqa\nexcept ImportError: # pragma: no cover\n from HTMLParser import HTMLParser # noqa\n\n\nclass TableOfContents(object):\n \"\"\"\n Represents the table of contents for a given page.\n \"\"\"\n def __init__(self, html):\n self.items = _parse_html_table_of_contents(html)\n\n def __iter__(self):\n return iter(self.items)\n\n def __str__(self):\n return ''.join([str(item) for item in self])\n\n\nclass AnchorLink(object):\n \"\"\"\n A single entry in the table of contents.\n \"\"\"\n def __init__(self, title, url):\n self.title, self.url = title, url\n self.children = []\n\n def __str__(self):\n return self.indent_print()\n\n def indent_print(self, depth=0):\n indent = ' ' * depth\n ret = '%s%s - %s\\n' % (indent, self.title, self.url)\n for item in self.children:\n ret += item.indent_print(depth + 1)\n return ret\n\n\nclass TOCParser(HTMLParser):\n\n def __init__(self):\n HTMLParser.__init__(self)\n self.links = []\n\n self.in_anchor = False\n self.attrs = None\n self.title = ''\n\n # Prior to Python3.4 no convert_charrefs keyword existed.\n # However, in Python3.5 the default was changed to True.\n # We need the False behavior in all versions but can only\n # set it if it exists.\n if hasattr(self, 'convert_charrefs'):\n self.convert_charrefs = False\n\n def handle_starttag(self, tag, attrs):\n\n if not self.in_anchor:\n if tag == 'a':\n self.in_anchor = True\n self.attrs = dict(attrs)\n\n def handle_endtag(self, tag):\n if tag == 'a':\n self.in_anchor = False\n\n def handle_data(self, data):\n\n if self.in_anchor:\n self.title += data\n\n def handle_charref(self, ref):\n self.handle_entityref(\"#\" + ref)\n\n def handle_entityref(self, ref):\n self.handle_data(\"&%s;\" % ref)\n\n\ndef _parse_html_table_of_contents(html):\n \"\"\"\n Given a table of contents string that has been automatically generated by\n the markdown library, parse it into a tree of AnchorLink instances.\n\n Returns a list of all the parent AnchorLink instances.\n \"\"\"\n lines = html.splitlines()[2:-2]\n parents = []\n ret = []\n for line in lines:\n parser = TOCParser()\n parser.feed(line)\n if parser.title:\n try:\n href = parser.attrs['href']\n except KeyError:\n continue\n title = parser.title\n nav = AnchorLink(title, href)\n # Add the item to its parent if required. If it is a topmost\n # item then instead append it to our return value.\n if parents:\n parents[-1].children.append(nav)\n else:\n ret.append(nav)\n # If this item has children, store it as the current parent\n if line.endswith('<ul>'):\n parents.append(nav)\n elif line.startswith('</ul>'):\n if parents:\n parents.pop()\n\n # For the table of contents, always mark the first element as active\n if ret:\n ret[0].active = True\n\n return ret\n", "path": "mkdocs/toc.py" } ]
[ { "content": "# coding: utf-8\n\n\"\"\"\nDeals with generating the per-page table of contents.\n\nFor the sake of simplicity we use an existing markdown extension to generate\nan HTML table of contents, and then parse that into the underlying data.\n\nThe steps we take to generate a table of contents are:\n\n* Pre-process the markdown, injecting a [TOC] marker.\n* Generate HTML from markdown.\n* Post-process the HTML, spliting the content and the table of contents.\n* Parse table of contents HTML into the underlying data structure.\n\"\"\"\n\nfrom __future__ import unicode_literals\n\ntry: # pragma: no cover\n from html.parser import HTMLParser # noqa\nexcept ImportError: # pragma: no cover\n from HTMLParser import HTMLParser # noqa\n\n\nclass TableOfContents(object):\n \"\"\"\n Represents the table of contents for a given page.\n \"\"\"\n def __init__(self, html):\n self.items = _parse_html_table_of_contents(html)\n\n def __iter__(self):\n return iter(self.items)\n\n def __len__(self):\n return len(self.items)\n\n def __str__(self):\n return ''.join([str(item) for item in self])\n\n\nclass AnchorLink(object):\n \"\"\"\n A single entry in the table of contents.\n \"\"\"\n def __init__(self, title, url):\n self.title, self.url = title, url\n self.children = []\n\n def __str__(self):\n return self.indent_print()\n\n def indent_print(self, depth=0):\n indent = ' ' * depth\n ret = '%s%s - %s\\n' % (indent, self.title, self.url)\n for item in self.children:\n ret += item.indent_print(depth + 1)\n return ret\n\n\nclass TOCParser(HTMLParser):\n\n def __init__(self):\n HTMLParser.__init__(self)\n self.links = []\n\n self.in_anchor = False\n self.attrs = None\n self.title = ''\n\n # Prior to Python3.4 no convert_charrefs keyword existed.\n # However, in Python3.5 the default was changed to True.\n # We need the False behavior in all versions but can only\n # set it if it exists.\n if hasattr(self, 'convert_charrefs'):\n self.convert_charrefs = False\n\n def handle_starttag(self, tag, attrs):\n\n if not self.in_anchor:\n if tag == 'a':\n self.in_anchor = True\n self.attrs = dict(attrs)\n\n def handle_endtag(self, tag):\n if tag == 'a':\n self.in_anchor = False\n\n def handle_data(self, data):\n\n if self.in_anchor:\n self.title += data\n\n def handle_charref(self, ref):\n self.handle_entityref(\"#\" + ref)\n\n def handle_entityref(self, ref):\n self.handle_data(\"&%s;\" % ref)\n\n\ndef _parse_html_table_of_contents(html):\n \"\"\"\n Given a table of contents string that has been automatically generated by\n the markdown library, parse it into a tree of AnchorLink instances.\n\n Returns a list of all the parent AnchorLink instances.\n \"\"\"\n lines = html.splitlines()[2:-2]\n parents = []\n ret = []\n for line in lines:\n parser = TOCParser()\n parser.feed(line)\n if parser.title:\n try:\n href = parser.attrs['href']\n except KeyError:\n continue\n title = parser.title\n nav = AnchorLink(title, href)\n # Add the item to its parent if required. If it is a topmost\n # item then instead append it to our return value.\n if parents:\n parents[-1].children.append(nav)\n else:\n ret.append(nav)\n # If this item has children, store it as the current parent\n if line.endswith('<ul>'):\n parents.append(nav)\n elif line.startswith('</ul>'):\n if parents:\n parents.pop()\n\n # For the table of contents, always mark the first element as active\n if ret:\n ret[0].active = True\n\n return ret\n", "path": "mkdocs/toc.py" } ]
diff --git a/docs/about/release-notes.md b/docs/about/release-notes.md index 504f0d1327..22e2d90054 100644 --- a/docs/about/release-notes.md +++ b/docs/about/release-notes.md @@ -23,6 +23,7 @@ The current and past members of the MkDocs team. ## Development Version +* Bugfix: Add length support to `mkdocs.toc.TableOfContext` (#1325). * Bugfix: Add some theme specific settings to the search plugin for third party themes (#1316). * Bugfix: Override `site_url` with `dev_addr` on local server (#1317). diff --git a/mkdocs/toc.py b/mkdocs/toc.py index b051201bfc..e101efe2f8 100644 --- a/mkdocs/toc.py +++ b/mkdocs/toc.py @@ -32,6 +32,9 @@ def __init__(self, html): def __iter__(self): return iter(self.items) + def __len__(self): + return len(self.items) + def __str__(self): return ''.join([str(item) for item in self])
ManimCommunity__manim-1296
[ { "content": "\"\"\"Utilities for processing LaTeX templates.\"\"\"\n\n__all__ = [\n \"TexTemplate\",\n \"TexTemplateFromFile\",\n]\n\nimport copy\nimport re\n\n\nclass TexTemplate:\n \"\"\"TeX templates are used for creating Tex() and MathTex() objects.\n\n Parameters\n ----------\n tex_compiler : Optional[:class:`str`], optional\n The TeX compiler to be used, e.g. ``latex``, ``pdflatex`` or ``lualatex``\n output_format : Optional[:class:`str`], optional\n The output format resulting from compilation, e.g. ``.dvi`` or ``.pdf``\n documentclass : Optional[:class:`str`], optional\n The command defining the documentclass, e.g. ``\\\\documentclass[preview]{standalone}``\n preamble : Optional[:class:`str`], optional\n The document's preamble, i.e. the part between ``\\\\documentclass`` and ``\\\\begin{document}``\n placeholder_text : Optional[:class:`str`], optional\n Text in the document that will be replaced by the expression to be rendered\n post_doc_commands : Optional[:class:`str`], optional\n Text (definitions, commands) to be inserted at right after ``\\\\begin{document}``, e.g. ``\\\\boldmath``\n\n Attributes\n ----------\n tex_compiler : :class:`str`\n The TeX compiler to be used, e.g. ``latex``, ``pdflatex`` or ``lualatex``\n output_format : :class:`str`\n The output format resulting from compilation, e.g. ``.dvi`` or ``.pdf``\n documentclass : :class:`str`\n The command defining the documentclass, e.g. ``\\\\documentclass[preview]{standalone}``\n preamble : :class:`str`\n The document's preample, i.e. the part between ``\\\\documentclass`` and ``\\\\begin{document}``\n placeholder_text : :class:`str`\n Text in the document that will be replaced by the expression to be rendered\n post_doc_commands : :class:`str`\n Text (definitions, commands) to be inserted at right after ``\\\\begin{document}``, e.g. ``\\\\boldmath``\n \"\"\"\n\n default_documentclass = r\"\\documentclass[preview]{standalone}\"\n default_preamble = r\"\"\"\n\\usepackage[english]{babel}\n\\usepackage[utf8]{inputenc}\n\\usepackage[T1]{fontenc}\n\\usepackage{amsmath}\n\\usepackage{amssymb}\n\\usepackage{dsfont}\n\\usepackage{setspace}\n\\usepackage{tipa}\n\\usepackage{relsize}\n\\usepackage{textcomp}\n\\usepackage{mathrsfs}\n\\usepackage{calligra}\n\\usepackage{wasysym}\n\\usepackage{ragged2e}\n\\usepackage{physics}\n\\usepackage{xcolor}\n\\usepackage{microtype}\n\\DisableLigatures{encoding = *, family = * }\n\\linespread{1}\n\"\"\"\n default_placeholder_text = \"YourTextHere\"\n default_tex_compiler = \"latex\"\n default_output_format = \".dvi\"\n default_post_doc_commands = \"\"\n\n def __init__(\n self,\n tex_compiler=None,\n output_format=None,\n documentclass=None,\n preamble=None,\n placeholder_text=None,\n post_doc_commands=None,\n **kwargs,\n ):\n self.tex_compiler = (\n tex_compiler\n if tex_compiler is not None\n else TexTemplate.default_tex_compiler\n )\n self.output_format = (\n output_format\n if output_format is not None\n else TexTemplate.default_output_format\n )\n self.documentclass = (\n documentclass\n if documentclass is not None\n else TexTemplate.default_documentclass\n )\n self.preamble = (\n preamble if preamble is not None else TexTemplate.default_preamble\n )\n self.placeholder_text = (\n placeholder_text\n if placeholder_text is not None\n else TexTemplate.default_placeholder_text\n )\n self.post_doc_commands = (\n post_doc_commands\n if post_doc_commands is not None\n else TexTemplate.default_post_doc_commands\n )\n self._rebuild()\n\n def _rebuild(self):\n \"\"\"Rebuilds the entire TeX template text from ``\\\\documentclass`` to ``\\\\end{document}`` according to all settings and choices.\"\"\"\n self.body = (\n self.documentclass\n + \"\\n\"\n + self.preamble\n + \"\\n\"\n + r\"\\begin{document}\"\n + \"\\n\"\n + self.post_doc_commands\n + \"\\n\"\n + self.placeholder_text\n + \"\\n\"\n + \"\\n\"\n + r\"\\end{document}\"\n + \"\\n\"\n )\n\n def add_to_preamble(self, txt, prepend=False):\n \"\"\"Adds stuff to the TeX template's preamble (e.g. definitions, packages). Text can be inserted at the beginning or at the end of the preamble.\n\n Parameters\n ----------\n txt : :class:`string`\n String containing the text to be added, e.g. ``\\\\usepackage{hyperref}``\n prepend : Optional[:class:`bool`], optional\n Whether the text should be added at the beginning of the preample, i.e. right after ``\\\\documentclass``. Default is to add it at the end of the preample, i.e. right before ``\\\\begin{document}``\n \"\"\"\n if prepend:\n self.preamble = txt + \"\\n\" + self.preamble\n else:\n self.preamble += \"\\n\" + txt\n self._rebuild()\n\n def add_to_document(self, txt):\n \"\"\"Adds txt to the TeX template just after \\\\begin{document}, e.g. ``\\\\boldmath``\n\n Parameters\n ----------\n txt : :class:`str`\n String containing the text to be added.\n \"\"\"\n self.post_doc_commands += \"\\n\" + txt + \"\\n\"\n self._rebuild()\n\n def get_texcode_for_expression(self, expression):\n \"\"\"Inserts expression verbatim into TeX template.\n\n Parameters\n ----------\n expression : :class:`str`\n The string containing the expression to be typeset, e.g. ``$\\\\sqrt{2}$``\n\n Returns\n -------\n :class:`str`\n LaTeX code based on current template, containing the given ``expression`` and ready for typesetting\n \"\"\"\n return self.body.replace(self.placeholder_text, expression)\n\n def _texcode_for_environment(self, environment):\n \"\"\"Processes the tex_environment string to return the correct ``\\\\begin{environment}[extra]{extra}`` and\n ``\\\\end{environment}`` strings\n\n Parameters\n ----------\n environment : :class:`str`\n The tex_environment as a string. Acceptable formats include:\n ``{align*}``, ``align*``, ``{tabular}[t]{cccl}``, ``tabular}{cccl``, ``\\\\begin{tabular}[t]{cccl}``.\n\n Returns\n -------\n Tuple[:class:`str`, :class:`str`]\n A pair of strings representing the opening and closing of the tex environment, e.g.\n ``\\\\begin{tabular}{cccl}`` and ``\\\\end{tabular}``\n \"\"\"\n\n # If the environment starts with \\begin, remove it\n if environment[0:6] == r\"\\begin\":\n environment = environment[6:]\n\n # If environment begins with { strip it\n if environment[0] == r\"{\":\n environment = environment[1:]\n\n # The \\begin command takes everything and closes with a brace\n begin = r\"\\begin{\" + environment\n if (\n begin[-1] != r\"}\" and begin[-1] != r\"]\"\n ): # If it doesn't end on } or ], assume missing }\n begin += r\"}\"\n\n # While the \\end command terminates at the first closing brace\n split_at_brace = re.split(r\"}\", environment, 1)\n end = r\"\\end{\" + split_at_brace[0] + r\"}\"\n\n return begin, end\n\n def get_texcode_for_expression_in_env(self, expression, environment):\n r\"\"\"Inserts expression into TeX template wrapped in \\begin{environemnt} and \\end{environment}\n\n Parameters\n ----------\n expression : :class:`str`\n The string containing the expression to be typeset, e.g. ``$\\\\sqrt{2}$``\n environment : :class:`str`\n The string containing the environment in which the expression should be typeset, e.g. ``align*``\n\n Returns\n -------\n :class:`str`\n LaTeX code based on template, containing the given expression inside its environment, ready for typesetting\n \"\"\"\n begin, end = self._texcode_for_environment(environment)\n return self.body.replace(self.placeholder_text, f\"{begin}\\n{expression}\\n{end}\")\n\n def copy(self) -> \"TexTemplate\":\n return copy.deepcopy(self)\n\n\nclass TexTemplateFromFile(TexTemplate):\n \"\"\"A TexTemplate object created from a template file (default: tex_template.tex)\n\n Parameters\n ----------\n tex_compiler : Optional[:class:`str`], optional\n The TeX compiler to be used, e.g. ``latex``, ``pdflatex`` or ``lualatex``\n output_format : Optional[:class:`str`], optional\n The output format resulting from compilation, e.g. ``.dvi`` or ``.pdf``\n documentclass : Optional[:class:`str`], optional\n The command defining the documentclass, e.g. ``\\\\documentclass[preview]{standalone}``\n preamble : Optional[:class:`str`], optional\n The document's preamble, i.e. the part between ``\\\\documentclass`` and ``\\\\begin{document}``\n placeholder_text : Optional[:class:`str`], optional\n Text in the document that will be replaced by the expression to be rendered\n post_doc_commands : Optional[:class:`str`], optional\n Text (definitions, commands) to be inserted at right after ``\\\\begin{document}``, e.g. ``\\\\boldmath``\n kwargs : :class:`str`\n The kwargs specified can only be strings.\n\n Other Parameters\n ----------------\n tex_filename : Optional[:class:`str`], optional\n Path to a valid TeX template file\n\n Attributes\n ----------\n template_file : :class:`str`\n Path to a valid TeX template file\n body : :class:`str`\n Content of the TeX template file\n tex_compiler : :class:`str`\n The TeX compiler to be used, e.g. ``latex``, ``pdflatex`` or ``lualatex``\n output_format : :class:`str`\n The output format resulting from compilation, e.g. ``.dvi`` or ``.pdf``\n \"\"\"\n\n def __init__(self, **kwargs):\n self.template_file = kwargs.pop(\"tex_filename\", \"tex_template.tex\")\n super().__init__(**kwargs)\n\n def _rebuild(self):\n with open(self.template_file, \"r\") as infile:\n self.body = infile.read()\n\n def file_not_mutable(self):\n raise Exception(\"Cannot modify TexTemplate when using a template file.\")\n\n def add_to_preamble(self, txt, prepend=False):\n self.file_not_mutable()\n\n def add_to_document(self, txt):\n self.file_not_mutable()\n", "path": "manim/utils/tex.py" } ]
[ { "content": "\"\"\"Utilities for processing LaTeX templates.\"\"\"\n\n__all__ = [\n \"TexTemplate\",\n \"TexTemplateFromFile\",\n]\n\nimport copy\nimport re\n\n\nclass TexTemplate:\n \"\"\"TeX templates are used for creating Tex() and MathTex() objects.\n\n Parameters\n ----------\n tex_compiler : Optional[:class:`str`], optional\n The TeX compiler to be used, e.g. ``latex``, ``pdflatex`` or ``lualatex``\n output_format : Optional[:class:`str`], optional\n The output format resulting from compilation, e.g. ``.dvi`` or ``.pdf``\n documentclass : Optional[:class:`str`], optional\n The command defining the documentclass, e.g. ``\\\\documentclass[preview]{standalone}``\n preamble : Optional[:class:`str`], optional\n The document's preamble, i.e. the part between ``\\\\documentclass`` and ``\\\\begin{document}``\n placeholder_text : Optional[:class:`str`], optional\n Text in the document that will be replaced by the expression to be rendered\n post_doc_commands : Optional[:class:`str`], optional\n Text (definitions, commands) to be inserted at right after ``\\\\begin{document}``, e.g. ``\\\\boldmath``\n\n Attributes\n ----------\n tex_compiler : :class:`str`\n The TeX compiler to be used, e.g. ``latex``, ``pdflatex`` or ``lualatex``\n output_format : :class:`str`\n The output format resulting from compilation, e.g. ``.dvi`` or ``.pdf``\n documentclass : :class:`str`\n The command defining the documentclass, e.g. ``\\\\documentclass[preview]{standalone}``\n preamble : :class:`str`\n The document's preample, i.e. the part between ``\\\\documentclass`` and ``\\\\begin{document}``\n placeholder_text : :class:`str`\n Text in the document that will be replaced by the expression to be rendered\n post_doc_commands : :class:`str`\n Text (definitions, commands) to be inserted at right after ``\\\\begin{document}``, e.g. ``\\\\boldmath``\n \"\"\"\n\n default_documentclass = r\"\\documentclass[preview]{standalone}\"\n default_preamble = r\"\"\"\n\\usepackage[english]{babel}\n\\usepackage[utf8]{inputenc}\n\\usepackage[T1]{fontenc}\n\\usepackage{lmodern}\n\\usepackage{amsmath}\n\\usepackage{amssymb}\n\\usepackage{dsfont}\n\\usepackage{setspace}\n\\usepackage{tipa}\n\\usepackage{relsize}\n\\usepackage{textcomp}\n\\usepackage{mathrsfs}\n\\usepackage{calligra}\n\\usepackage{wasysym}\n\\usepackage{ragged2e}\n\\usepackage{physics}\n\\usepackage{xcolor}\n\\usepackage{microtype}\n\\DisableLigatures{encoding = *, family = * }\n\\linespread{1}\n\"\"\"\n default_placeholder_text = \"YourTextHere\"\n default_tex_compiler = \"latex\"\n default_output_format = \".dvi\"\n default_post_doc_commands = \"\"\n\n def __init__(\n self,\n tex_compiler=None,\n output_format=None,\n documentclass=None,\n preamble=None,\n placeholder_text=None,\n post_doc_commands=None,\n **kwargs,\n ):\n self.tex_compiler = (\n tex_compiler\n if tex_compiler is not None\n else TexTemplate.default_tex_compiler\n )\n self.output_format = (\n output_format\n if output_format is not None\n else TexTemplate.default_output_format\n )\n self.documentclass = (\n documentclass\n if documentclass is not None\n else TexTemplate.default_documentclass\n )\n self.preamble = (\n preamble if preamble is not None else TexTemplate.default_preamble\n )\n self.placeholder_text = (\n placeholder_text\n if placeholder_text is not None\n else TexTemplate.default_placeholder_text\n )\n self.post_doc_commands = (\n post_doc_commands\n if post_doc_commands is not None\n else TexTemplate.default_post_doc_commands\n )\n self._rebuild()\n\n def _rebuild(self):\n \"\"\"Rebuilds the entire TeX template text from ``\\\\documentclass`` to ``\\\\end{document}`` according to all settings and choices.\"\"\"\n self.body = (\n self.documentclass\n + \"\\n\"\n + self.preamble\n + \"\\n\"\n + r\"\\begin{document}\"\n + \"\\n\"\n + self.post_doc_commands\n + \"\\n\"\n + self.placeholder_text\n + \"\\n\"\n + \"\\n\"\n + r\"\\end{document}\"\n + \"\\n\"\n )\n\n def add_to_preamble(self, txt, prepend=False):\n \"\"\"Adds stuff to the TeX template's preamble (e.g. definitions, packages). Text can be inserted at the beginning or at the end of the preamble.\n\n Parameters\n ----------\n txt : :class:`string`\n String containing the text to be added, e.g. ``\\\\usepackage{hyperref}``\n prepend : Optional[:class:`bool`], optional\n Whether the text should be added at the beginning of the preample, i.e. right after ``\\\\documentclass``. Default is to add it at the end of the preample, i.e. right before ``\\\\begin{document}``\n \"\"\"\n if prepend:\n self.preamble = txt + \"\\n\" + self.preamble\n else:\n self.preamble += \"\\n\" + txt\n self._rebuild()\n\n def add_to_document(self, txt):\n \"\"\"Adds txt to the TeX template just after \\\\begin{document}, e.g. ``\\\\boldmath``\n\n Parameters\n ----------\n txt : :class:`str`\n String containing the text to be added.\n \"\"\"\n self.post_doc_commands += \"\\n\" + txt + \"\\n\"\n self._rebuild()\n\n def get_texcode_for_expression(self, expression):\n \"\"\"Inserts expression verbatim into TeX template.\n\n Parameters\n ----------\n expression : :class:`str`\n The string containing the expression to be typeset, e.g. ``$\\\\sqrt{2}$``\n\n Returns\n -------\n :class:`str`\n LaTeX code based on current template, containing the given ``expression`` and ready for typesetting\n \"\"\"\n return self.body.replace(self.placeholder_text, expression)\n\n def _texcode_for_environment(self, environment):\n \"\"\"Processes the tex_environment string to return the correct ``\\\\begin{environment}[extra]{extra}`` and\n ``\\\\end{environment}`` strings\n\n Parameters\n ----------\n environment : :class:`str`\n The tex_environment as a string. Acceptable formats include:\n ``{align*}``, ``align*``, ``{tabular}[t]{cccl}``, ``tabular}{cccl``, ``\\\\begin{tabular}[t]{cccl}``.\n\n Returns\n -------\n Tuple[:class:`str`, :class:`str`]\n A pair of strings representing the opening and closing of the tex environment, e.g.\n ``\\\\begin{tabular}{cccl}`` and ``\\\\end{tabular}``\n \"\"\"\n\n # If the environment starts with \\begin, remove it\n if environment[0:6] == r\"\\begin\":\n environment = environment[6:]\n\n # If environment begins with { strip it\n if environment[0] == r\"{\":\n environment = environment[1:]\n\n # The \\begin command takes everything and closes with a brace\n begin = r\"\\begin{\" + environment\n if (\n begin[-1] != r\"}\" and begin[-1] != r\"]\"\n ): # If it doesn't end on } or ], assume missing }\n begin += r\"}\"\n\n # While the \\end command terminates at the first closing brace\n split_at_brace = re.split(r\"}\", environment, 1)\n end = r\"\\end{\" + split_at_brace[0] + r\"}\"\n\n return begin, end\n\n def get_texcode_for_expression_in_env(self, expression, environment):\n r\"\"\"Inserts expression into TeX template wrapped in \\begin{environemnt} and \\end{environment}\n\n Parameters\n ----------\n expression : :class:`str`\n The string containing the expression to be typeset, e.g. ``$\\\\sqrt{2}$``\n environment : :class:`str`\n The string containing the environment in which the expression should be typeset, e.g. ``align*``\n\n Returns\n -------\n :class:`str`\n LaTeX code based on template, containing the given expression inside its environment, ready for typesetting\n \"\"\"\n begin, end = self._texcode_for_environment(environment)\n return self.body.replace(self.placeholder_text, f\"{begin}\\n{expression}\\n{end}\")\n\n def copy(self) -> \"TexTemplate\":\n return copy.deepcopy(self)\n\n\nclass TexTemplateFromFile(TexTemplate):\n \"\"\"A TexTemplate object created from a template file (default: tex_template.tex)\n\n Parameters\n ----------\n tex_compiler : Optional[:class:`str`], optional\n The TeX compiler to be used, e.g. ``latex``, ``pdflatex`` or ``lualatex``\n output_format : Optional[:class:`str`], optional\n The output format resulting from compilation, e.g. ``.dvi`` or ``.pdf``\n documentclass : Optional[:class:`str`], optional\n The command defining the documentclass, e.g. ``\\\\documentclass[preview]{standalone}``\n preamble : Optional[:class:`str`], optional\n The document's preamble, i.e. the part between ``\\\\documentclass`` and ``\\\\begin{document}``\n placeholder_text : Optional[:class:`str`], optional\n Text in the document that will be replaced by the expression to be rendered\n post_doc_commands : Optional[:class:`str`], optional\n Text (definitions, commands) to be inserted at right after ``\\\\begin{document}``, e.g. ``\\\\boldmath``\n kwargs : :class:`str`\n The kwargs specified can only be strings.\n\n Other Parameters\n ----------------\n tex_filename : Optional[:class:`str`], optional\n Path to a valid TeX template file\n\n Attributes\n ----------\n template_file : :class:`str`\n Path to a valid TeX template file\n body : :class:`str`\n Content of the TeX template file\n tex_compiler : :class:`str`\n The TeX compiler to be used, e.g. ``latex``, ``pdflatex`` or ``lualatex``\n output_format : :class:`str`\n The output format resulting from compilation, e.g. ``.dvi`` or ``.pdf``\n \"\"\"\n\n def __init__(self, **kwargs):\n self.template_file = kwargs.pop(\"tex_filename\", \"tex_template.tex\")\n super().__init__(**kwargs)\n\n def _rebuild(self):\n with open(self.template_file, \"r\") as infile:\n self.body = infile.read()\n\n def file_not_mutable(self):\n raise Exception(\"Cannot modify TexTemplate when using a template file.\")\n\n def add_to_preamble(self, txt, prepend=False):\n self.file_not_mutable()\n\n def add_to_document(self, txt):\n self.file_not_mutable()\n", "path": "manim/utils/tex.py" } ]
diff --git a/manim/utils/tex.py b/manim/utils/tex.py index 8ab08a56a0..532d6af3b3 100644 --- a/manim/utils/tex.py +++ b/manim/utils/tex.py @@ -48,6 +48,7 @@ class TexTemplate: \usepackage[english]{babel} \usepackage[utf8]{inputenc} \usepackage[T1]{fontenc} +\usepackage{lmodern} \usepackage{amsmath} \usepackage{amssymb} \usepackage{dsfont} diff --git a/tests/control_data/graphical_units_data/coordinate_systems/NumberPlaneTest.npz b/tests/control_data/graphical_units_data/coordinate_systems/NumberPlaneTest.npz index 98ceac3e9a..949ab720f5 100644 Binary files a/tests/control_data/graphical_units_data/coordinate_systems/NumberPlaneTest.npz and b/tests/control_data/graphical_units_data/coordinate_systems/NumberPlaneTest.npz differ diff --git a/tests/control_data/graphical_units_data/plot/AxesTest.npz b/tests/control_data/graphical_units_data/plot/AxesTest.npz index 51d28b7d64..5cbf26cdee 100644 Binary files a/tests/control_data/graphical_units_data/plot/AxesTest.npz and b/tests/control_data/graphical_units_data/plot/AxesTest.npz differ diff --git a/tests/control_data/graphical_units_data/plot/PlotFunctions.npz b/tests/control_data/graphical_units_data/plot/PlotFunctions.npz index dfddd05f28..97814c3480 100644 Binary files a/tests/control_data/graphical_units_data/plot/PlotFunctions.npz and b/tests/control_data/graphical_units_data/plot/PlotFunctions.npz differ
holoviz__panel-4047
[ { "content": "#!/usr/bin/env python\nimport json\nimport os\nimport shutil\nimport sys\n\nimport pyct.build\n\nfrom setuptools import find_packages, setup\nfrom setuptools.command.develop import develop\nfrom setuptools.command.install import install\nfrom setuptools.command.sdist import sdist\n\nPANEL_LITE_BUILD = 'PANEL_LITE' in os.environ\n\n\ndef get_setup_version(reponame):\n \"\"\"\n Helper to get the current version from either git describe or the\n .version file (if available).\n \"\"\"\n basepath = os.path.split(__file__)[0]\n version_file_path = os.path.join(basepath, reponame, '.version')\n try:\n from param import version\n except Exception:\n version = None\n if version is not None:\n return version.Version.setup_version(basepath, reponame, archive_commit=\"$Format:%h$\")\n else:\n print(\"WARNING: param>=1.6.0 unavailable. If you are installing a package, \"\n \"this warning can safely be ignored. If you are creating a package or \"\n \"otherwise operating in a git repository, you should install param>=1.6.0.\")\n return json.load(open(version_file_path, 'r'))['version_string']\n\n\ndef _build_paneljs():\n from bokeh.ext import build\n\n from panel.compiler import bundle_resources\n print(\"Building custom models:\")\n panel_dir = os.path.join(os.path.dirname(__file__), \"panel\")\n build(panel_dir)\n print(\"Bundling custom model resources:\")\n bundle_resources()\n if sys.platform != \"win32\":\n # npm can cause non-blocking stdout; so reset it just in case\n import fcntl\n flags = fcntl.fcntl(sys.stdout, fcntl.F_GETFL)\n fcntl.fcntl(sys.stdout, fcntl.F_SETFL, flags&~os.O_NONBLOCK)\n\n\nclass CustomDevelopCommand(develop):\n \"\"\"Custom installation for development mode.\"\"\"\n\n def run(self):\n if not PANEL_LITE_BUILD:\n _build_paneljs()\n develop.run(self)\n\n\nclass CustomInstallCommand(install):\n \"\"\"Custom installation for install mode.\"\"\"\n\n def run(self):\n if not PANEL_LITE_BUILD:\n _build_paneljs()\n install.run(self)\n\n\nclass CustomSdistCommand(sdist):\n \"\"\"Custom installation for sdist mode.\"\"\"\n\n def run(self):\n if not PANEL_LITE_BUILD:\n _build_paneljs()\n sdist.run(self)\n\n\n_COMMANDS = {\n 'develop': CustomDevelopCommand,\n 'install': CustomInstallCommand,\n 'sdist': CustomSdistCommand,\n}\n\ntry:\n from wheel.bdist_wheel import bdist_wheel\n\n class CustomBdistWheelCommand(bdist_wheel):\n \"\"\"Custom bdist_wheel command to force cancelling qiskit-terra wheel\n creation.\"\"\"\n\n def run(self):\n \"\"\"Do nothing so the command intentionally fails.\"\"\"\n if not PANEL_LITE_BUILD:\n _build_paneljs()\n bdist_wheel.run(self)\n\n _COMMANDS['bdist_wheel'] = CustomBdistWheelCommand\nexcept Exception:\n pass\n\n########## dependencies ##########\n\ninstall_requires = [\n 'bokeh >=2.4.0,<2.5.0',\n 'param >=1.12.0',\n 'pyviz_comms >=0.7.4',\n 'markdown',\n 'requests',\n 'tqdm >=4.48.0',\n 'pyct >=0.4.4',\n 'bleach',\n 'setuptools >=42',\n 'typing_extensions',\n]\n\n_recommended = [\n 'jupyterlab',\n 'holoviews >1.14.1',\n 'matplotlib',\n 'pillow',\n 'plotly'\n]\n\n_tests = [\n # Test dependencies\n 'flake8',\n 'parameterized',\n 'pytest',\n 'nbval',\n 'flaky',\n 'pytest-xdist',\n 'pytest-cov',\n 'pre-commit',\n 'psutil',\n # Libraries tested in unit tests\n 'folium',\n 'ipympl',\n 'scipy',\n 'twine',\n 'pandas >=1.3',\n 'ipython >=7.0',\n 'holoviews',\n 'diskcache',\n 'markdown-it-py',\n 'ipyvuetify',\n 'reacton',\n # Added lxml temporarily as installing pyechars or idom on Python 3.11\n # via pip tries to build it and fails. To be removed.\n 'lxml',\n 'numpy <1.24', # Avoid VTK test fail\n]\n\n_ui = [\n 'playwright',\n 'pytest-playwright'\n]\n\nextras_require = {\n 'examples': [\n 'hvplot',\n 'plotly >=4.0',\n 'altair',\n 'streamz',\n 'vega_datasets',\n 'vtk ==9.0.1',\n 'scikit-learn',\n 'datashader',\n 'jupyter_bokeh >=3.0.2',\n 'django <4',\n 'channels',\n 'pyvista<0.33',\n 'ipywidgets',\n 'ipywidgets_bokeh',\n 'ipyvolume',\n 'ipyleaflet',\n 'ipympl',\n 'folium',\n 'xarray',\n 'pyinstrument >=4.0',\n 'aiohttp',\n 'croniter',\n 'graphviz',\n 'networkx >=2.5',\n 'pygraphviz',\n 'seaborn',\n 'pydeck',\n 'graphviz',\n 'lxml',\n 'python-graphviz',\n 'xgboost',\n 'ipyvuetify',\n 'reacton'\n ],\n 'tests': _tests,\n 'recommended': _recommended,\n 'doc': _recommended + [\n 'nbsite >=0.7.2rc2',\n 'pydata-sphinx-theme <=0.9.0',\n 'sphinx-copybutton',\n 'sphinx-design',\n ],\n 'ui': _ui\n}\n\nextras_require['all'] = sorted(set(sum(extras_require.values(), [])))\n\n# Superset of what's in pyproject.toml (includes non-python\n# dependencies). Also, pyproject.toml isn't supported by all tools\n# anyway (e.g. older versions of pip, or conda - which also supports\n# non-python dependencies). Note that setup_requires isn't used\n# because it doesn't work well with pip.\nextras_require['build'] = [\n 'param >=1.9.2',\n 'pyct >=0.4.4',\n 'setuptools >=42',\n 'bokeh >=2.4.3,<2.5.0',\n 'pyviz_comms >=0.7.4',\n 'requests',\n 'packaging',\n 'bleach',\n 'tqdm >=4.48.0',\n]\n\nsetup_args = dict(\n name='panel',\n version=get_setup_version(\"panel\"),\n description='A high level app and dashboarding solution for Python.',\n long_description=open('README.md').read() if os.path.isfile('README.md') else 'Consult README.md',\n long_description_content_type=\"text/markdown\",\n author=\"HoloViz\",\n author_email=\"developers@holoviz.org\",\n maintainer=\"HoloViz\",\n maintainer_email=\"developers@holoviz.org\",\n platforms=['Windows', 'Mac OS X', 'Linux'],\n license='BSD',\n url='http://panel.holoviz.org',\n project_urls={\n 'Source': 'https://github.com/holoviz/panel',\n },\n cmdclass=_COMMANDS,\n packages=find_packages(),\n include_package_data=True,\n data_files=[\n # like `jupyter serverextension enable --sys-prefix`\n (\n \"etc/jupyter/jupyter_notebook_config.d\",\n [\"jupyter-config/jupyter_notebook_config.d/panel-client-jupyter.json\"],\n ),\n # like `jupyter server extension enable --sys-prefix`\n (\n \"etc/jupyter/jupyter_server_config.d\",\n [\"jupyter-config/jupyter_server_config.d/panel-client-jupyter.json\"],\n ),\n ],\n classifiers=[\n \"License :: OSI Approved :: BSD License\",\n \"Development Status :: 5 - Production/Stable\",\n \"Programming Language :: Python :: 3\",\n \"Programming Language :: Python :: 3.7\",\n \"Programming Language :: Python :: 3.8\",\n \"Programming Language :: Python :: 3.9\",\n \"Programming Language :: Python :: 3.10\",\n \"Programming Language :: Python :: 3.11\",\n \"Operating System :: OS Independent\",\n \"Intended Audience :: Developers\",\n \"Intended Audience :: Science/Research\",\n \"Intended Audience :: Financial and Insurance Industry\",\n \"Intended Audience :: Healthcare Industry\",\n \"Intended Audience :: Information Technology\",\n \"Intended Audience :: Legal Industry\",\n \"Intended Audience :: Other Audience\",\n \"Intended Audience :: Science/Research\",\n \"Natural Language :: English\",\n \"Topic :: Scientific/Engineering\",\n \"Topic :: Scientific/Engineering :: Visualization\",\n \"Topic :: Scientific/Engineering :: Information Analysis\",\n \"Topic :: Office/Business\",\n \"Topic :: Office/Business :: Financial\",\n \"Topic :: Software Development :: Libraries\"],\n python_requires=\">=3.7\",\n entry_points={\n 'console_scripts': [\n 'panel = panel.command:main'\n ]\n },\n install_requires=install_requires,\n extras_require=extras_require,\n tests_require=extras_require['tests']\n)\n\ndef clean_js_version(version):\n version = version.replace('-', '')\n for dev in ('a', 'b', 'rc'):\n version = version.replace(dev+'.', dev)\n return version\n\nif __name__ == \"__main__\":\n example_path = os.path.join(os.path.dirname(os.path.abspath(__file__)),\n 'panel', 'examples')\n\n if 'develop' not in sys.argv and 'egg_info' not in sys.argv:\n pyct.build.examples(example_path, __file__, force=True)\n\n version = setup_args['version']\n if 'post' not in version:\n with open('./panel/package.json') as f:\n package_json = json.load(f)\n js_version = package_json['version']\n version = version.split('+')[0]\n if any(dev in version for dev in ('a', 'b', 'rc')) and not '-' in js_version:\n raise ValueError(f\"panel.js dev versions ({js_version}) must \"\n \"must separate dev suffix with a dash, e.g. \"\n \"v1.0.0rc1 should be v1.0.0-rc.1.\")\n if version != 'None' and version != clean_js_version(js_version):\n raise ValueError(f\"panel.js version ({js_version}) does not match \"\n f\"panel version ({version}). Cannot build release.\")\n\n setup(**setup_args)\n\n if os.path.isdir(example_path):\n shutil.rmtree(example_path)\n", "path": "setup.py" } ]
[ { "content": "#!/usr/bin/env python\nimport json\nimport os\nimport shutil\nimport sys\n\nimport pyct.build\n\nfrom setuptools import find_packages, setup\nfrom setuptools.command.develop import develop\nfrom setuptools.command.install import install\nfrom setuptools.command.sdist import sdist\n\nPANEL_LITE_BUILD = 'PANEL_LITE' in os.environ\n\n\ndef get_setup_version(reponame):\n \"\"\"\n Helper to get the current version from either git describe or the\n .version file (if available).\n \"\"\"\n basepath = os.path.split(__file__)[0]\n version_file_path = os.path.join(basepath, reponame, '.version')\n try:\n from param import version\n except Exception:\n version = None\n if version is not None:\n return version.Version.setup_version(basepath, reponame, archive_commit=\"$Format:%h$\")\n else:\n print(\"WARNING: param>=1.6.0 unavailable. If you are installing a package, \"\n \"this warning can safely be ignored. If you are creating a package or \"\n \"otherwise operating in a git repository, you should install param>=1.6.0.\")\n return json.load(open(version_file_path, 'r'))['version_string']\n\n\ndef _build_paneljs():\n from bokeh.ext import build\n\n from panel.compiler import bundle_resources\n print(\"Building custom models:\")\n panel_dir = os.path.join(os.path.dirname(__file__), \"panel\")\n build(panel_dir)\n print(\"Bundling custom model resources:\")\n bundle_resources()\n if sys.platform != \"win32\":\n # npm can cause non-blocking stdout; so reset it just in case\n import fcntl\n flags = fcntl.fcntl(sys.stdout, fcntl.F_GETFL)\n fcntl.fcntl(sys.stdout, fcntl.F_SETFL, flags&~os.O_NONBLOCK)\n\n\nclass CustomDevelopCommand(develop):\n \"\"\"Custom installation for development mode.\"\"\"\n\n def run(self):\n if not PANEL_LITE_BUILD:\n _build_paneljs()\n develop.run(self)\n\n\nclass CustomInstallCommand(install):\n \"\"\"Custom installation for install mode.\"\"\"\n\n def run(self):\n if not PANEL_LITE_BUILD:\n _build_paneljs()\n install.run(self)\n\n\nclass CustomSdistCommand(sdist):\n \"\"\"Custom installation for sdist mode.\"\"\"\n\n def run(self):\n if not PANEL_LITE_BUILD:\n _build_paneljs()\n sdist.run(self)\n\n\n_COMMANDS = {\n 'develop': CustomDevelopCommand,\n 'install': CustomInstallCommand,\n 'sdist': CustomSdistCommand,\n}\n\ntry:\n from wheel.bdist_wheel import bdist_wheel\n\n class CustomBdistWheelCommand(bdist_wheel):\n \"\"\"Custom bdist_wheel command to force cancelling qiskit-terra wheel\n creation.\"\"\"\n\n def run(self):\n \"\"\"Do nothing so the command intentionally fails.\"\"\"\n if not PANEL_LITE_BUILD:\n _build_paneljs()\n bdist_wheel.run(self)\n\n _COMMANDS['bdist_wheel'] = CustomBdistWheelCommand\nexcept Exception:\n pass\n\n########## dependencies ##########\n\ninstall_requires = [\n 'bokeh >=2.4.0,<2.5.0',\n 'param >=1.12.0',\n 'pyviz_comms >=0.7.4',\n 'markdown',\n 'requests',\n 'tqdm >=4.48.0',\n 'pyct >=0.4.4',\n 'bleach',\n 'setuptools >=42',\n 'typing_extensions',\n]\n\n_recommended = [\n 'jupyterlab',\n 'holoviews >1.14.1',\n 'matplotlib',\n 'pillow',\n 'plotly'\n]\n\n_tests = [\n # Test dependencies\n 'flake8',\n 'parameterized',\n 'pytest',\n 'nbval',\n 'flaky',\n 'pytest-xdist',\n 'pytest-cov',\n 'pre-commit',\n 'psutil',\n # Libraries tested in unit tests\n 'folium',\n 'ipympl',\n 'scipy',\n 'twine',\n 'pandas >=1.3',\n 'ipython >=7.0',\n 'holoviews',\n 'diskcache',\n 'markdown-it-py',\n 'ipyvuetify',\n 'reacton',\n # Added lxml temporarily as installing pyechars or idom on Python 3.11\n # via pip tries to build it and fails. To be removed.\n 'lxml',\n 'numpy <1.24', # Avoid VTK test fail\n]\n\n_ui = [\n 'playwright',\n 'pytest-playwright'\n]\n\nextras_require = {\n 'examples': [\n 'hvplot',\n 'plotly >=4.0',\n 'altair',\n 'streamz',\n 'vega_datasets',\n 'vtk ==9.0.1',\n 'scikit-learn',\n 'datashader',\n 'jupyter_bokeh >=3.0.2',\n 'django <4',\n 'channels',\n 'pyvista<0.33',\n 'ipywidgets',\n 'ipywidgets_bokeh',\n 'ipyvolume',\n 'ipyleaflet',\n 'ipympl',\n 'folium',\n 'xarray',\n 'pyinstrument >=4.0',\n 'aiohttp',\n 'croniter',\n 'graphviz',\n 'networkx >=2.5',\n 'pygraphviz',\n 'seaborn',\n 'pydeck',\n 'graphviz',\n 'lxml',\n 'python-graphviz',\n 'xgboost',\n 'ipyvuetify',\n 'reacton',\n 'scikit-image',\n ],\n 'tests': _tests,\n 'recommended': _recommended,\n 'doc': _recommended + [\n 'nbsite >=0.7.2rc2',\n 'pydata-sphinx-theme <=0.9.0',\n 'sphinx-copybutton',\n 'sphinx-design',\n ],\n 'ui': _ui\n}\n\nextras_require['all'] = sorted(set(sum(extras_require.values(), [])))\n\n# Superset of what's in pyproject.toml (includes non-python\n# dependencies). Also, pyproject.toml isn't supported by all tools\n# anyway (e.g. older versions of pip, or conda - which also supports\n# non-python dependencies). Note that setup_requires isn't used\n# because it doesn't work well with pip.\nextras_require['build'] = [\n 'param >=1.9.2',\n 'pyct >=0.4.4',\n 'setuptools >=42',\n 'bokeh >=2.4.3,<2.5.0',\n 'pyviz_comms >=0.7.4',\n 'requests',\n 'packaging',\n 'bleach',\n 'tqdm >=4.48.0',\n]\n\nsetup_args = dict(\n name='panel',\n version=get_setup_version(\"panel\"),\n description='A high level app and dashboarding solution for Python.',\n long_description=open('README.md').read() if os.path.isfile('README.md') else 'Consult README.md',\n long_description_content_type=\"text/markdown\",\n author=\"HoloViz\",\n author_email=\"developers@holoviz.org\",\n maintainer=\"HoloViz\",\n maintainer_email=\"developers@holoviz.org\",\n platforms=['Windows', 'Mac OS X', 'Linux'],\n license='BSD',\n url='http://panel.holoviz.org',\n project_urls={\n 'Source': 'https://github.com/holoviz/panel',\n },\n cmdclass=_COMMANDS,\n packages=find_packages(),\n include_package_data=True,\n data_files=[\n # like `jupyter serverextension enable --sys-prefix`\n (\n \"etc/jupyter/jupyter_notebook_config.d\",\n [\"jupyter-config/jupyter_notebook_config.d/panel-client-jupyter.json\"],\n ),\n # like `jupyter server extension enable --sys-prefix`\n (\n \"etc/jupyter/jupyter_server_config.d\",\n [\"jupyter-config/jupyter_server_config.d/panel-client-jupyter.json\"],\n ),\n ],\n classifiers=[\n \"License :: OSI Approved :: BSD License\",\n \"Development Status :: 5 - Production/Stable\",\n \"Programming Language :: Python :: 3\",\n \"Programming Language :: Python :: 3.7\",\n \"Programming Language :: Python :: 3.8\",\n \"Programming Language :: Python :: 3.9\",\n \"Programming Language :: Python :: 3.10\",\n \"Programming Language :: Python :: 3.11\",\n \"Operating System :: OS Independent\",\n \"Intended Audience :: Developers\",\n \"Intended Audience :: Science/Research\",\n \"Intended Audience :: Financial and Insurance Industry\",\n \"Intended Audience :: Healthcare Industry\",\n \"Intended Audience :: Information Technology\",\n \"Intended Audience :: Legal Industry\",\n \"Intended Audience :: Other Audience\",\n \"Intended Audience :: Science/Research\",\n \"Natural Language :: English\",\n \"Topic :: Scientific/Engineering\",\n \"Topic :: Scientific/Engineering :: Visualization\",\n \"Topic :: Scientific/Engineering :: Information Analysis\",\n \"Topic :: Office/Business\",\n \"Topic :: Office/Business :: Financial\",\n \"Topic :: Software Development :: Libraries\"],\n python_requires=\">=3.7\",\n entry_points={\n 'console_scripts': [\n 'panel = panel.command:main'\n ]\n },\n install_requires=install_requires,\n extras_require=extras_require,\n tests_require=extras_require['tests']\n)\n\ndef clean_js_version(version):\n version = version.replace('-', '')\n for dev in ('a', 'b', 'rc'):\n version = version.replace(dev+'.', dev)\n return version\n\nif __name__ == \"__main__\":\n example_path = os.path.join(os.path.dirname(os.path.abspath(__file__)),\n 'panel', 'examples')\n\n if 'develop' not in sys.argv and 'egg_info' not in sys.argv:\n pyct.build.examples(example_path, __file__, force=True)\n\n version = setup_args['version']\n if 'post' not in version:\n with open('./panel/package.json') as f:\n package_json = json.load(f)\n js_version = package_json['version']\n version = version.split('+')[0]\n if any(dev in version for dev in ('a', 'b', 'rc')) and not '-' in js_version:\n raise ValueError(f\"panel.js dev versions ({js_version}) must \"\n \"must separate dev suffix with a dash, e.g. \"\n \"v1.0.0rc1 should be v1.0.0-rc.1.\")\n if version != 'None' and version != clean_js_version(js_version):\n raise ValueError(f\"panel.js version ({js_version}) does not match \"\n f\"panel version ({version}). Cannot build release.\")\n\n setup(**setup_args)\n\n if os.path.isdir(example_path):\n shutil.rmtree(example_path)\n", "path": "setup.py" } ]
diff --git a/.gitignore b/.gitignore index 37794ba72f..d176cfd4f9 100644 --- a/.gitignore +++ b/.gitignore @@ -126,3 +126,8 @@ discover/ node_modules/* /tmp .devcontainer/* +pyodide/ +script.* +doc/_build/* +doc/gallery/* +doc/reference/* diff --git a/examples/assets/VideoStreamInterface.jpg b/examples/assets/VideoStreamInterface.jpg new file mode 100644 index 0000000000..d0216f4b16 Binary files /dev/null and b/examples/assets/VideoStreamInterface.jpg differ diff --git a/examples/assets/VideoStreamInterfaceFaceDetectionViewer.jpg b/examples/assets/VideoStreamInterfaceFaceDetectionViewer.jpg new file mode 100644 index 0000000000..9d1da7b707 Binary files /dev/null and b/examples/assets/VideoStreamInterfaceFaceDetectionViewer.jpg differ diff --git a/examples/assets/VideoStreamInterfaceSobel.jpg b/examples/assets/VideoStreamInterfaceSobel.jpg new file mode 100644 index 0000000000..bff72a4ddf Binary files /dev/null and b/examples/assets/VideoStreamInterfaceSobel.jpg differ diff --git a/examples/assets/VideoStreamInterfaceTimer.jpg b/examples/assets/VideoStreamInterfaceTimer.jpg new file mode 100644 index 0000000000..320529dec0 Binary files /dev/null and b/examples/assets/VideoStreamInterfaceTimer.jpg differ diff --git a/examples/gallery/streaming/streaming_videostream.ipynb b/examples/gallery/streaming/streaming_videostream.ipynb new file mode 100644 index 0000000000..f968e1e5bf --- /dev/null +++ b/examples/gallery/streaming/streaming_videostream.ipynb @@ -0,0 +1,736 @@ +{ + "cells": [ + { + "cell_type": "markdown", + "id": "b8e61c5c-4f3e-4980-be22-4010a247babd", + "metadata": {}, + "source": [ + "## Streaming Video: Live video streams made easy\n", + "\n", + "In this example we will demonstrate how to develop a general tool to transform live image streams from the users web cam. We will be using Panels\n", + "[`VideoStream`](https://panel.holoviz.org/reference/widgets/VideoStream.html) widget to record and stream the images.\n", + "\n", + "![VideoStreamInterfaceSobel](../../assets/VideoStreamInterfaceSobel.jpg)\n", + "\n", + "We will also show how to apply *blur*, *grayscale*, *sobel* and *face recognition* models to the video stream." + ] + }, + { + "cell_type": "markdown", + "id": "5a3760b6-f8a7-46ad-8831-620a131c1512", + "metadata": {}, + "source": [ + "## Imports and Settings\n", + "\n", + "Among other things we will be using [numpy](https://numpy.org/), [PIL](https://pillow.readthedocs.io/en/stable/) and [scikit-image](https://scikit-image.org/) to work with the images." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "02b862bc-f710-456b-9a34-f1b74a76df2c", + "metadata": {}, + "outputs": [], + "source": [ + "import base64\n", + "import io\n", + "import time\n", + "\n", + "import numpy as np\n", + "import param\n", + "import PIL\n", + "import skimage\n", + "\n", + "from PIL import Image, ImageFilter\n", + "from skimage import data, filters\n", + "from skimage.color.adapt_rgb import adapt_rgb, each_channel\n", + "from skimage.draw import rectangle\n", + "from skimage.exposure import rescale_intensity\n", + "from skimage.feature import Cascade\n", + "\n", + "import panel as pn\n", + "\n", + "pn.extension(sizing_mode=\"stretch_width\")" + ] + }, + { + "cell_type": "markdown", + "id": "43e68289-6c33-435f-b279-cf89327266ac", + "metadata": {}, + "source": [ + "We define the *height* and *width* of the images to transform. Smaller is faster.\n", + "We also define the *timeout*, i.e. how often the videostream takes and streams a new image." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "7b46542f-fa1a-4dde-a8c6-f023f3358a6c", + "metadata": {}, + "outputs": [], + "source": [ + "HEIGHT = 500 # pixels\n", + "WIDTH = 500 # pixels\n", + "TIMEOUT = 500 # miliseconds" + ] + }, + { + "cell_type": "markdown", + "id": "bb8b1066-c799-4d6a-94d0-361dd3cc6007", + "metadata": {}, + "source": [ + "## Base Image Models\n", + "\n", + "We will need to define some *base image models* components. The base models are custom Panel components that inherit from Panels [`Viewer`](https://panel.holoviz.org/user_guide/Custom_Components.html#viewer-components) class.\n", + "\n", + "The *base models* makes it easy to later turn *image to image* algorithms into interactive UIs like the `FaceDetectionModel` shown in the image just below.\n", + "\n", + "![VideoStreamInterfaceTimer](../../assets/VideoStreamInterfaceFaceDetectionViewer.jpg)\n", + "\n", + "Please note we restrict our selves to working with `.jpg` images. The `VideoStream` widget also support `.png` images. But `.png` images are much bigger and slower to work with." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "a507eb66-b242-441c-8d89-dba504ec79a3", + "metadata": {}, + "outputs": [], + "source": [ + "class ImageModel(pn.viewable.Viewer):\n", + " \"\"\"Base class for image models.\"\"\"\n", + "\n", + " def __init__(self, **params):\n", + " super().__init__(**params)\n", + "\n", + " with param.edit_constant(self):\n", + " self.name = self.__class__.name.replace(\"Model\", \"\")\n", + " self.view = self.create_view()\n", + "\n", + " def __panel__(self):\n", + " return self.view\n", + "\n", + " def apply(self, image: str, height: int = HEIGHT, width: int = WIDTH) -> str:\n", + " \"\"\"Transforms a base64 encoded jpg image to a base64 encoded jpg BytesIO object\"\"\"\n", + " raise NotImplementedError()\n", + "\n", + " def create_view(self):\n", + " \"\"\"Creates a view of the parameters of the transform to enable the user to configure them\"\"\"\n", + " return pn.Param(self, name=self.name)\n", + "\n", + " def transform(self, image):\n", + " \"\"\"Transforms the image\"\"\"\n", + " raise NotImplementedError()" + ] + }, + { + "cell_type": "markdown", + "id": "be8256eb-f2bb-4f24-84dc-8b6b47d64958", + "metadata": {}, + "source": [ + "Lets define a base model for working with **`PIL`** images" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "5ebf5560-29f6-4b3f-815e-a70010998ba1", + "metadata": {}, + "outputs": [], + "source": [ + "class PILImageModel(ImageModel):\n", + " \"\"\"Base class for PIL image models\"\"\"\n", + "\n", + " @staticmethod\n", + " def to_pil_img(value: str, height=HEIGHT, width=WIDTH):\n", + " \"\"\"Converts a base64 jpeg image string to a PIL.Image\"\"\"\n", + " encoded_data = value.split(\",\")[1]\n", + " base64_decoded = base64.b64decode(encoded_data)\n", + " image = Image.open(io.BytesIO(base64_decoded))\n", + " image.draft(\"RGB\", (height, width))\n", + " return image\n", + "\n", + " @staticmethod\n", + " def from_pil_img(image: Image):\n", + " \"\"\"Converts a PIL.Image to a base64 encoded JPG BytesIO object\"\"\"\n", + " buff = io.BytesIO()\n", + " image.save(buff, format=\"JPEG\")\n", + " return buff\n", + "\n", + " def apply(self, image: str, height: int = HEIGHT, width: int = WIDTH) -> io.BytesIO:\n", + " pil_img = self.to_pil_img(image, height=height, width=width)\n", + "\n", + " transformed_image = self.transform(pil_img)\n", + "\n", + " return self.from_pil_img(transformed_image)\n", + "\n", + " def transform(self, image: PIL.Image) -> PIL.Image:\n", + " \"\"\"Transforms the PIL.Image image\"\"\"\n", + " raise NotImplementedError()" + ] + }, + { + "cell_type": "markdown", + "id": "63cff6f1-f652-4413-b230-b4602e115560", + "metadata": {}, + "source": [ + "Lets define a base model for working with **`Numpy`** images." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "128c8e1e-8695-4710-a7c1-40476ced300a", + "metadata": {}, + "outputs": [], + "source": [ + "class NumpyImageModel(ImageModel):\n", + " \"\"\"Base class for np.ndarray image models\"\"\"\n", + "\n", + " @staticmethod\n", + " def to_np_ndarray(image: str, height=HEIGHT, width=WIDTH) -> np.ndarray:\n", + " \"\"\"Converts a base64 encoded jpeg string to a np.ndarray\"\"\"\n", + " pil_img = PILImageModel.to_pil_img(image, height=height, width=width)\n", + " return np.array(pil_img)\n", + "\n", + " @staticmethod\n", + " def from_np_ndarray(image: np.ndarray) -> io.BytesIO:\n", + " \"\"\"Converts np.ndarray jpeg image to a jpeg BytesIO instance\"\"\"\n", + " if image.dtype == np.dtype(\"float64\"):\n", + " image = (image * 255).astype(np.uint8)\n", + " pil_img = PIL.Image.fromarray(image)\n", + " return PILImageModel.from_pil_img(pil_img)\n", + "\n", + " def apply(self, image: str, height: int = HEIGHT, width: int = WIDTH) -> io.BytesIO:\n", + " np_array = self.to_np_ndarray(image, height=height, width=width)\n", + "\n", + " transformed_image = self.transform(np_array)\n", + "\n", + " return self.from_np_ndarray(transformed_image)\n", + "\n", + " def transform(self, image: np.ndarray) -> np.ndarray:\n", + " \"\"\"Transforms the np.array image\"\"\"\n", + " raise NotImplementedError()" + ] + }, + { + "cell_type": "markdown", + "id": "77bf1e99-701e-4dad-bd8a-faba4bdd446a", + "metadata": {}, + "source": [ + "## Timer\n", + "\n", + "Lets define a timer component to visualize the stats of the live videostream and the image transformations\n", + "\n", + "![VideoStreamInterfaceTimer](../../assets/VideoStreamInterfaceTimer.jpg)" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "92a4ec91-3a6d-43be-8337-690614bb10cb", + "metadata": {}, + "outputs": [], + "source": [ + "class Timer(pn.viewable.Viewer):\n", + " \"\"\"Helper Component used to show duration trends\"\"\"\n", + "\n", + " _trends = param.Dict()\n", + "\n", + " def __init__(self, **params):\n", + " super().__init__()\n", + "\n", + " self.last_updates = {}\n", + " self._trends = {}\n", + "\n", + " self._layout = pn.Row(**params)\n", + "\n", + " def time_it(self, name, func, *args, **kwargs):\n", + " \"\"\"Measures the duration of the execution of the func function and reports it under the\n", + " name specified\"\"\"\n", + " start = time.time()\n", + " result = func(*args, **kwargs)\n", + " end = time.time()\n", + " duration = round(end - start, 2)\n", + " self._report(name=name, duration=duration)\n", + " return result\n", + "\n", + " def inc_it(self, name):\n", + " \"\"\"Measures the duration since the last time `inc_it` was called and reports it under the\n", + " specified name\"\"\"\n", + " start = self.last_updates.get(name, time.time())\n", + " end = time.time()\n", + " duration = round(end - start, 2)\n", + " self._report(name=name, duration=duration)\n", + " self.last_updates[name] = end\n", + "\n", + " def _report(self, name, duration):\n", + " if not name in self._trends:\n", + " self._trends[name] = pn.indicators.Trend(\n", + " title=name,\n", + " data={\"x\": [1], \"y\": [duration]},\n", + " height=100,\n", + " width=150,\n", + " sizing_mode=\"fixed\",\n", + " )\n", + " self.param.trigger(\"_trends\")\n", + " else:\n", + " trend = self._trends[name]\n", + " next_x = max(trend.data[\"x\"]) + 1\n", + " trend.stream({\"x\": [next_x], \"y\": [duration]}, rollover=10)\n", + "\n", + " @pn.depends(\"_trends\")\n", + " def _panel(self):\n", + " self._layout[:] = list(self._trends.values())\n", + " return self._layout\n", + "\n", + " def __panel__(self):\n", + " return pn.panel(self._panel)" + ] + }, + { + "cell_type": "markdown", + "id": "44851482-f580-49a7-ac53-2132d3f29bc0", + "metadata": {}, + "source": [ + "## VideoStreamInterface\n", + "\n", + "The `VideoStreamInterface` will be putting things together in a nice UI.\n", + "\n", + "![VideoStreamInterfaceSobel](../../assets/VideoStreamInterfaceSobel.jpg)\n", + "\n", + "Lets define a helper function first" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "b4de82da-81e6-4799-a1d3-a54bf8e017b1", + "metadata": {}, + "outputs": [], + "source": [ + "def to_instance(value, **params):\n", + " \"\"\"Converts the value to an instance\n", + "\n", + " Args:\n", + " value: A param.Parameterized class or instance\n", + "\n", + " Returns:\n", + " An instance of the param.Parameterized class\n", + " \"\"\"\n", + " if isinstance(value, param.Parameterized):\n", + " value.param.update(**params)\n", + " return value\n", + " return value(**params)" + ] + }, + { + "cell_type": "markdown", + "id": "d74ba396-7972-4711-8ff5-b4d27b31120c", + "metadata": {}, + "source": [ + "The `VideoStreamInterface` will take a list of `ImageModel`s. The user can the select and apply the models to the images from the `VideoStream`." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "c6dc71b7-34b2-4171-8a72-46ab9edeba91", + "metadata": {}, + "outputs": [], + "source": [ + "class VideoStreamInterface(pn.viewable.Viewer):\n", + " \"\"\"An easy to use interface for a VideoStream and a set of transforms\"\"\"\n", + "\n", + " video_stream = param.ClassSelector(\n", + " class_=pn.widgets.VideoStream, constant=True, doc=\"The source VideoStream\"\n", + " )\n", + "\n", + " height = param.Integer(\n", + " HEIGHT,\n", + " bounds=(10, 2000),\n", + " step=10,\n", + " doc=\"\"\"The height of the image converted and shown\"\"\",\n", + " )\n", + " width = param.Integer(\n", + " WIDTH,\n", + " bounds=(10, 2000),\n", + " step=10,\n", + " doc=\"\"\"The width of the image converted and shown\"\"\",\n", + " )\n", + "\n", + " model = param.Selector(doc=\"The currently selected model\")\n", + "\n", + " def __init__(\n", + " self,\n", + " models,\n", + " timeout=TIMEOUT,\n", + " paused=False,\n", + " **params,\n", + " ):\n", + " super().__init__(\n", + " video_stream=pn.widgets.VideoStream(\n", + " name=\"Video Stream\",\n", + " timeout=timeout,\n", + " paused=paused,\n", + " height=0,\n", + " width=0,\n", + " visible=False,\n", + " format=\"jpeg\",\n", + " ),\n", + " **params,\n", + " )\n", + " self.image = pn.pane.JPG(\n", + " height=self.height, width=self.width, sizing_mode=\"fixed\"\n", + " )\n", + " self._updating = False\n", + " models = [to_instance(model) for model in models]\n", + " self.param.model.objects = models\n", + " self.model = models[0]\n", + " self.timer = Timer(sizing_mode=\"stretch_width\")\n", + " self.settings = self._create_settings()\n", + " self._panel = self._create_panel()\n", + "\n", + " def _create_settings(self):\n", + " return pn.Column(\n", + " pn.Param(\n", + " self.video_stream,\n", + " parameters=[\"timeout\", \"paused\"],\n", + " widgets={\n", + " \"timeout\": {\n", + " \"widget_type\": pn.widgets.IntSlider,\n", + " \"start\": 10,\n", + " \"end\": 2000,\n", + " \"step\": 10,\n", + " }\n", + " },\n", + " ),\n", + " self.timer,\n", + " pn.Param(self, parameters=[\"height\", \"width\"], name=\"Image\"),\n", + " pn.Param(\n", + " self,\n", + " parameters=[\"model\"],\n", + " expand_button=False,\n", + " expand=False,\n", + " widgets={\n", + " \"model\": {\n", + " \"widget_type\": pn.widgets.RadioButtonGroup,\n", + " \"orientation\": \"vertical\",\n", + " \"button_type\": \"success\",\n", + " }\n", + " },\n", + " name=\"Model\",\n", + " ),\n", + " self._get_transform,\n", + " )\n", + "\n", + " def _create_panel(self):\n", + " return pn.Row(\n", + " self.video_stream,\n", + " pn.layout.HSpacer(),\n", + " self.image,\n", + " pn.layout.HSpacer(),\n", + " sizing_mode=\"stretch_width\",\n", + " align=\"center\",\n", + " )\n", + "\n", + " @pn.depends(\"height\", \"width\", watch=True)\n", + " def _update_height_width(self):\n", + " self.image.height = self.height\n", + " self.image.width = self.width\n", + "\n", + " @pn.depends(\"model\")\n", + " def _get_transform(self):\n", + " # Hack: returning self.transform stops working after browsing the transforms for a while\n", + " return self.model.view\n", + "\n", + " def __panel__(self):\n", + " return self._panel\n", + "\n", + " @pn.depends(\"video_stream.value\", watch=True)\n", + " def _handle_stream(self):\n", + " if self._updating:\n", + " return\n", + "\n", + " self._updating = True\n", + " if self.model and self.video_stream.value:\n", + " value = self.video_stream.value\n", + " try:\n", + " image = self.timer.time_it(\n", + " name=\"Model\",\n", + " func=self.model.apply,\n", + " image=value,\n", + " height=self.height,\n", + " width=self.width,\n", + " )\n", + " self.image.object = image\n", + " except PIL.UnidentifiedImageError:\n", + " print(\"unidentified image\")\n", + "\n", + " self.timer.inc_it(\"Last Update\")\n", + " self._updating = False" + ] + }, + { + "cell_type": "markdown", + "id": "9afa4c9b-a541-4a77-bb38-68d85f0a82d4", + "metadata": {}, + "source": [ + "## Custom Image Models\n", + "\n", + "We will now make specific image to image algorithms interactive.\n", + "\n", + "Let us start with the [Gaussian Blur](https://pillow.readthedocs.io/en/stable/reference/ImageFilter.html#PIL.ImageFilter.GaussianBlur) algorithm." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "f389b022-28b0-4ce2-a629-0df728a235bb", + "metadata": {}, + "outputs": [], + "source": [ + "class GaussianBlurModel(PILImageModel):\n", + " \"\"\"Gaussian Blur Model\n", + "\n", + " https://pillow.readthedocs.io/en/stable/reference/ImageFilter.html#PIL.ImageFilter.GaussianBlur\n", + " \"\"\"\n", + "\n", + " radius = param.Integer(default=2, bounds=(0, 10))\n", + "\n", + " def transform(self, image: Image):\n", + " return image.filter(ImageFilter.GaussianBlur(radius=self.radius))" + ] + }, + { + "cell_type": "markdown", + "id": "42d93547-bfce-4deb-a7e5-387cab9fac8e", + "metadata": {}, + "source": [ + "Lets implement a [Grayscale](https://scikit-image.org/docs/0.15.x/auto_examples/color_exposure/plot_rgb_to_gray.html) algorithm." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "13f7f769-af74-4027-be8d-a22208e31800", + "metadata": {}, + "outputs": [], + "source": [ + "class GrayscaleModel(NumpyImageModel):\n", + " \"\"\"GrayScale Model\n", + "\n", + " https://scikit-image.org/docs/0.15.x/auto_examples/color_exposure/plot_rgb_to_gray.html\n", + " \"\"\"\n", + "\n", + " def transform(self, image: np.ndarray):\n", + " grayscale = skimage.color.rgb2gray(image[:, :, :3])\n", + " return skimage.color.gray2rgb(grayscale)" + ] + }, + { + "cell_type": "markdown", + "id": "b3461593-e63d-424a-b402-cbd6fcc75ffe", + "metadata": {}, + "source": [ + "Lets implement the [Sobel](https://scikit-image.org/docs/0.15.x/auto_examples/color_exposure/plot_adapt_rgb.html) algorithm." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "0991dd1c-0557-4dfa-b940-7918b0363d6c", + "metadata": {}, + "outputs": [], + "source": [ + "class SobelModel(NumpyImageModel):\n", + " \"\"\"Sobel Model\n", + "\n", + " https://scikit-image.org/docs/0.15.x/auto_examples/color_exposure/plot_adapt_rgb.html\n", + " \"\"\"\n", + " def transform(self, image):\n", + "\n", + "\n", + " @adapt_rgb(each_channel)\n", + " def sobel_each(image):\n", + " return filters.sobel(image)\n", + "\n", + " return rescale_intensity(1 - sobel_each(image))" + ] + }, + { + "cell_type": "markdown", + "id": "cadae0c9-0191-4ca4-a770-c3be0b0987b7", + "metadata": {}, + "source": [ + "Lets implement the [face detection model](https://scikit-image.org/docs/0.15.x/auto_examples/applications/plot_face_detection.html) of scikit-image." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "57423cdc-e23e-4236-ace8-452e8068970c", + "metadata": {}, + "outputs": [], + "source": [ + "@pn.cache()\n", + "def get_detector():\n", + " \"\"\"Returns the Cascade detector\"\"\"\n", + " trained_file = data.lbp_frontal_face_cascade_filename()\n", + " return Cascade(trained_file)" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "5baa7f38-6368-4ed1-883c-7a0247d1c08a", + "metadata": {}, + "outputs": [], + "source": [ + "class FaceDetectionModel(NumpyImageModel):\n", + " \"\"\"Face detection using a cascade classifier.\n", + "\n", + " https://scikit-image.org/docs/0.15.x/auto_examples/applications/plot_face_detection.html\n", + " \"\"\"\n", + "\n", + " scale_factor = param.Number(1.4, bounds=(1.0, 2.0), step=0.1)\n", + " step_ratio = param.Integer(1, bounds=(1, 10))\n", + " size_x = param.Range(default=(60, 322), bounds=(10, 500))\n", + " size_y = param.Range(default=(60, 322), bounds=(10, 500))\n", + "\n", + " def transform(self, image):\n", + " detector = get_detector()\n", + " detected = detector.detect_multi_scale(\n", + " img=image,\n", + " scale_factor=self.scale_factor,\n", + " step_ratio=self.step_ratio,\n", + " min_size=(self.size_x[0], self.size_y[0]),\n", + " max_size=(self.size_x[1], self.size_y[1]),\n", + " )\n", + "\n", + " for patch in detected:\n", + " rrr, ccc = rectangle(\n", + " start=(patch[\"r\"], patch[\"c\"]),\n", + " extent=(patch[\"height\"], patch[\"width\"]),\n", + " shape=image.shape[:2],\n", + " )\n", + " image[rrr, ccc, 0] = 200\n", + "\n", + " return image" + ] + }, + { + "cell_type": "markdown", + "id": "253e15c1-0097-456f-b979-fbf42de8d270", + "metadata": {}, + "source": [ + "Please note that these models are just examples. You can also implement your own models using Scikit-Image, Pytorch, Tensorflow etc and use the `VideoStreamInterface` to work interactively with them." + ] + }, + { + "cell_type": "markdown", + "id": "1e6ffe9c-7885-4cb8-9793-97c00862e8ba", + "metadata": {}, + "source": [ + "## Its alive!\n", + "\n", + "Lets define an instance of the `VideoStreamInterface`" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "47d8118f-77b0-4edf-a733-2b9ba877e25e", + "metadata": {}, + "outputs": [], + "source": [ + "component = VideoStreamInterface(\n", + " models=[\n", + " GaussianBlurModel,\n", + " GrayscaleModel,\n", + " SobelModel,\n", + " FaceDetectionModel,\n", + " ]\n", + ")\n", + "pn.Row(pn.Row(component.settings, max_width=400), component)" + ] + }, + { + "cell_type": "markdown", + "id": "651ea40a-4d91-4a17-8761-c8b5cc446197", + "metadata": {}, + "source": [ + "## Wrap it in a template\n", + "\n", + "What makes Panel unique is that our components work very well in both the notebook and as standalone data apps.\n", + "\n", + "We can wrap the component in the nicely styled [`FastListTemplate`](https://panel.holoviz.org/reference/templates/FastListTemplate.html) to make it *ready for production*." + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "dab6006d-001d-4217-ade7-ff2d0d77752f", + "metadata": {}, + "outputs": [], + "source": [ + "pn.template.FastListTemplate(\n", + " site=\"Panel\",\n", + " title=\"VideoStream Interface\",\n", + " sidebar=[component.settings],\n", + " main=[component],\n", + ").servable(); # We add ; to not show the template in the notebook as it does not display well." + ] + }, + { + "cell_type": "markdown", + "id": "9b00da3e-87fd-4e3e-bc81-e8bf827e2818", + "metadata": {}, + "source": [ + "## Serve it as a server side app" + ] + }, + { + "cell_type": "markdown", + "id": "7191262b-f610-494f-a797-9186a496c633", + "metadata": {}, + "source": [ + "It is now possible to serve the live app via the command `panel serve streaming_videostream.ipynb`. The app is the available at http://localhost:5006/streaming_videostream.\n", + "\n", + "<img style=\"max-height:500px\" src=\"../../assets/VideoStreamInterface.jpg\"></img>" + ] + }, + { + "cell_type": "markdown", + "id": "01fb5b28-6e49-4aaa-a0ca-2eaa301106c2", + "metadata": {}, + "source": [ + "## Serve it as a client side app\n", + "\n", + "You can also [`panel convert`](https://panel.holoviz.org/user_guide/Running_in_Webassembly.html) this app to web assembly for even better performance.\n", + "\n", + "First you will need to create a `requirements.txt` file with the following content\n", + "\n", + "```bash\n", + "panel\n", + "numpy\n", + "scikit-image\n", + "```\n", + "\n", + "Then you can\n", + "\n", + "- Run `panel convert streaming_videostream.ipynb --to pyodide-worker --out pyodide --requirements requirements.txt`\n", + "- Run `python3 -m http.server` to start a web server locally\n", + "- Open http://localhost:8000/pyodide/streaming_videostream.html to try out the app." + ] + } + ], + "metadata": { + "language_info": { + "name": "python", + "pygments_lexer": "ipython3" + } + }, + "nbformat": 4, + "nbformat_minor": 5 +} diff --git a/setup.py b/setup.py index d7d03a1e03..e08ddc12f5 100644 --- a/setup.py +++ b/setup.py @@ -191,7 +191,8 @@ def run(self): 'python-graphviz', 'xgboost', 'ipyvuetify', - 'reacton' + 'reacton', + 'scikit-image', ], 'tests': _tests, 'recommended': _recommended,
pydantic__pydantic-2170
[ { "content": "import re\nimport warnings\nfrom datetime import date, datetime, time, timedelta\nfrom decimal import Decimal\nfrom enum import Enum\nfrom ipaddress import IPv4Address, IPv4Interface, IPv4Network, IPv6Address, IPv6Interface, IPv6Network\nfrom pathlib import Path\nfrom typing import (\n TYPE_CHECKING,\n Any,\n Callable,\n Dict,\n FrozenSet,\n Iterable,\n List,\n Optional,\n Pattern,\n Sequence,\n Set,\n Tuple,\n Type,\n TypeVar,\n Union,\n cast,\n)\nfrom uuid import UUID\n\nfrom .fields import (\n SHAPE_FROZENSET,\n SHAPE_ITERABLE,\n SHAPE_LIST,\n SHAPE_MAPPING,\n SHAPE_SEQUENCE,\n SHAPE_SET,\n SHAPE_SINGLETON,\n SHAPE_TUPLE,\n SHAPE_TUPLE_ELLIPSIS,\n FieldInfo,\n ModelField,\n)\nfrom .json import pydantic_encoder\nfrom .networks import AnyUrl, EmailStr\nfrom .types import (\n ConstrainedDecimal,\n ConstrainedFloat,\n ConstrainedInt,\n ConstrainedList,\n ConstrainedSet,\n ConstrainedStr,\n SecretBytes,\n SecretStr,\n conbytes,\n condecimal,\n confloat,\n conint,\n conlist,\n conset,\n constr,\n)\nfrom .typing import (\n NONE_TYPES,\n ForwardRef,\n Literal,\n get_args,\n get_origin,\n is_callable_type,\n is_literal_type,\n literal_values,\n)\nfrom .utils import ROOT_KEY, get_model, lenient_issubclass, sequence_like\n\nif TYPE_CHECKING:\n from .dataclasses import Dataclass # noqa: F401\n from .main import BaseModel # noqa: F401\n\ndefault_prefix = '#/definitions/'\ndefault_ref_template = '#/definitions/{model}'\n\nTypeModelOrEnum = Union[Type['BaseModel'], Type[Enum]]\nTypeModelSet = Set[TypeModelOrEnum]\n\n\ndef schema(\n models: Sequence[Union[Type['BaseModel'], Type['Dataclass']]],\n *,\n by_alias: bool = True,\n title: Optional[str] = None,\n description: Optional[str] = None,\n ref_prefix: Optional[str] = None,\n ref_template: str = default_ref_template,\n) -> Dict[str, Any]:\n \"\"\"\n Process a list of models and generate a single JSON Schema with all of them defined in the ``definitions``\n top-level JSON key, including their sub-models.\n\n :param models: a list of models to include in the generated JSON Schema\n :param by_alias: generate the schemas using the aliases defined, if any\n :param title: title for the generated schema that includes the definitions\n :param description: description for the generated schema\n :param ref_prefix: the JSON Pointer prefix for schema references with ``$ref``, if None, will be set to the\n default of ``#/definitions/``. Update it if you want the schemas to reference the definitions somewhere\n else, e.g. for OpenAPI use ``#/components/schemas/``. The resulting generated schemas will still be at the\n top-level key ``definitions``, so you can extract them from there. But all the references will have the set\n prefix.\n :param ref_template: Use a ``string.format()`` template for ``$ref`` instead of a prefix. This can be useful\n for references that cannot be represented by ``ref_prefix`` such as a definition stored in another file. For\n a sibling json file in a ``/schemas`` directory use ``\"/schemas/${model}.json#\"``.\n :return: dict with the JSON Schema with a ``definitions`` top-level key including the schema definitions for\n the models and sub-models passed in ``models``.\n \"\"\"\n clean_models = [get_model(model) for model in models]\n flat_models = get_flat_models_from_models(clean_models)\n model_name_map = get_model_name_map(flat_models)\n definitions = {}\n output_schema: Dict[str, Any] = {}\n if title:\n output_schema['title'] = title\n if description:\n output_schema['description'] = description\n for model in clean_models:\n m_schema, m_definitions, m_nested_models = model_process_schema(\n model,\n by_alias=by_alias,\n model_name_map=model_name_map,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n )\n definitions.update(m_definitions)\n model_name = model_name_map[model]\n definitions[model_name] = m_schema\n if definitions:\n output_schema['definitions'] = definitions\n return output_schema\n\n\ndef model_schema(\n model: Union[Type['BaseModel'], Type['Dataclass']],\n by_alias: bool = True,\n ref_prefix: Optional[str] = None,\n ref_template: str = default_ref_template,\n) -> Dict[str, Any]:\n \"\"\"\n Generate a JSON Schema for one model. With all the sub-models defined in the ``definitions`` top-level\n JSON key.\n\n :param model: a Pydantic model (a class that inherits from BaseModel)\n :param by_alias: generate the schemas using the aliases defined, if any\n :param ref_prefix: the JSON Pointer prefix for schema references with ``$ref``, if None, will be set to the\n default of ``#/definitions/``. Update it if you want the schemas to reference the definitions somewhere\n else, e.g. for OpenAPI use ``#/components/schemas/``. The resulting generated schemas will still be at the\n top-level key ``definitions``, so you can extract them from there. But all the references will have the set\n prefix.\n :param ref_template: Use a ``string.format()`` template for ``$ref`` instead of a prefix. This can be useful for\n references that cannot be represented by ``ref_prefix`` such as a definition stored in another file. For a\n sibling json file in a ``/schemas`` directory use ``\"/schemas/${model}.json#\"``.\n :return: dict with the JSON Schema for the passed ``model``\n \"\"\"\n model = get_model(model)\n flat_models = get_flat_models_from_model(model)\n model_name_map = get_model_name_map(flat_models)\n model_name = model_name_map[model]\n m_schema, m_definitions, nested_models = model_process_schema(\n model, by_alias=by_alias, model_name_map=model_name_map, ref_prefix=ref_prefix, ref_template=ref_template\n )\n if model_name in nested_models:\n # model_name is in Nested models, it has circular references\n m_definitions[model_name] = m_schema\n m_schema = get_schema_ref(model_name, ref_prefix, ref_template, False)\n if m_definitions:\n m_schema.update({'definitions': m_definitions})\n return m_schema\n\n\ndef get_field_info_schema(field: ModelField) -> Tuple[Dict[str, Any], bool]:\n schema_overrides = False\n\n # If no title is explicitly set, we don't set title in the schema for enums.\n # The behaviour is the same as `BaseModel` reference, where the default title\n # is in the definitions part of the schema.\n schema: Dict[str, Any] = {}\n if field.field_info.title or not lenient_issubclass(field.type_, Enum):\n schema['title'] = field.field_info.title or field.alias.title().replace('_', ' ')\n\n if field.field_info.title:\n schema_overrides = True\n\n if field.field_info.description:\n schema['description'] = field.field_info.description\n schema_overrides = True\n\n if not field.required and not field.field_info.const and field.default is not None:\n schema['default'] = encode_default(field.default)\n schema_overrides = True\n\n return schema, schema_overrides\n\n\ndef field_schema(\n field: ModelField,\n *,\n by_alias: bool = True,\n model_name_map: Dict[TypeModelOrEnum, str],\n ref_prefix: Optional[str] = None,\n ref_template: str = default_ref_template,\n known_models: TypeModelSet = None,\n) -> Tuple[Dict[str, Any], Dict[str, Any], Set[str]]:\n \"\"\"\n Process a Pydantic field and return a tuple with a JSON Schema for it as the first item.\n Also return a dictionary of definitions with models as keys and their schemas as values. If the passed field\n is a model and has sub-models, and those sub-models don't have overrides (as ``title``, ``default``, etc), they\n will be included in the definitions and referenced in the schema instead of included recursively.\n\n :param field: a Pydantic ``ModelField``\n :param by_alias: use the defined alias (if any) in the returned schema\n :param model_name_map: used to generate the JSON Schema references to other models included in the definitions\n :param ref_prefix: the JSON Pointer prefix to use for references to other schemas, if None, the default of\n #/definitions/ will be used\n :param ref_template: Use a ``string.format()`` template for ``$ref`` instead of a prefix. This can be useful for\n references that cannot be represented by ``ref_prefix`` such as a definition stored in another file. For a\n sibling json file in a ``/schemas`` directory use ``\"/schemas/${model}.json#\"``.\n :param known_models: used to solve circular references\n :return: tuple of the schema for this field and additional definitions\n \"\"\"\n s, schema_overrides = get_field_info_schema(field)\n\n validation_schema = get_field_schema_validations(field)\n if validation_schema:\n s.update(validation_schema)\n schema_overrides = True\n\n f_schema, f_definitions, f_nested_models = field_type_schema(\n field,\n by_alias=by_alias,\n model_name_map=model_name_map,\n schema_overrides=schema_overrides,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models or set(),\n )\n # $ref will only be returned when there are no schema_overrides\n if '$ref' in f_schema:\n return f_schema, f_definitions, f_nested_models\n else:\n s.update(f_schema)\n return s, f_definitions, f_nested_models\n\n\nnumeric_types = (int, float, Decimal)\n_str_types_attrs: Tuple[Tuple[str, Union[type, Tuple[type, ...]], str], ...] = (\n ('max_length', numeric_types, 'maxLength'),\n ('min_length', numeric_types, 'minLength'),\n ('regex', str, 'pattern'),\n)\n\n_numeric_types_attrs: Tuple[Tuple[str, Union[type, Tuple[type, ...]], str], ...] = (\n ('gt', numeric_types, 'exclusiveMinimum'),\n ('lt', numeric_types, 'exclusiveMaximum'),\n ('ge', numeric_types, 'minimum'),\n ('le', numeric_types, 'maximum'),\n ('multiple_of', numeric_types, 'multipleOf'),\n)\n\n\ndef get_field_schema_validations(field: ModelField) -> Dict[str, Any]:\n \"\"\"\n Get the JSON Schema validation keywords for a ``field`` with an annotation of\n a Pydantic ``FieldInfo`` with validation arguments.\n \"\"\"\n f_schema: Dict[str, Any] = {}\n\n if lenient_issubclass(field.type_, Enum):\n # schema is already updated by `enum_process_schema`; just update with field extra\n if field.field_info.extra:\n f_schema.update(field.field_info.extra)\n return f_schema\n\n if lenient_issubclass(field.type_, (str, bytes)):\n for attr_name, t, keyword in _str_types_attrs:\n attr = getattr(field.field_info, attr_name, None)\n if isinstance(attr, t):\n f_schema[keyword] = attr\n if lenient_issubclass(field.type_, numeric_types) and not issubclass(field.type_, bool):\n for attr_name, t, keyword in _numeric_types_attrs:\n attr = getattr(field.field_info, attr_name, None)\n if isinstance(attr, t):\n f_schema[keyword] = attr\n if field.field_info is not None and field.field_info.const:\n f_schema['const'] = field.default\n if field.field_info.extra:\n f_schema.update(field.field_info.extra)\n modify_schema = getattr(field.outer_type_, '__modify_schema__', None)\n if modify_schema:\n modify_schema(f_schema)\n return f_schema\n\n\ndef get_model_name_map(unique_models: TypeModelSet) -> Dict[TypeModelOrEnum, str]:\n \"\"\"\n Process a set of models and generate unique names for them to be used as keys in the JSON Schema\n definitions. By default the names are the same as the class name. But if two models in different Python\n modules have the same name (e.g. \"users.Model\" and \"items.Model\"), the generated names will be\n based on the Python module path for those conflicting models to prevent name collisions.\n\n :param unique_models: a Python set of models\n :return: dict mapping models to names\n \"\"\"\n name_model_map = {}\n conflicting_names: Set[str] = set()\n for model in unique_models:\n model_name = normalize_name(model.__name__)\n if model_name in conflicting_names:\n model_name = get_long_model_name(model)\n name_model_map[model_name] = model\n elif model_name in name_model_map:\n conflicting_names.add(model_name)\n conflicting_model = name_model_map.pop(model_name)\n name_model_map[get_long_model_name(conflicting_model)] = conflicting_model\n name_model_map[get_long_model_name(model)] = model\n else:\n name_model_map[model_name] = model\n return {v: k for k, v in name_model_map.items()}\n\n\ndef get_flat_models_from_model(model: Type['BaseModel'], known_models: TypeModelSet = None) -> TypeModelSet:\n \"\"\"\n Take a single ``model`` and generate a set with itself and all the sub-models in the tree. I.e. if you pass\n model ``Foo`` (subclass of Pydantic ``BaseModel``) as ``model``, and it has a field of type ``Bar`` (also\n subclass of ``BaseModel``) and that model ``Bar`` has a field of type ``Baz`` (also subclass of ``BaseModel``),\n the return value will be ``set([Foo, Bar, Baz])``.\n\n :param model: a Pydantic ``BaseModel`` subclass\n :param known_models: used to solve circular references\n :return: a set with the initial model and all its sub-models\n \"\"\"\n known_models = known_models or set()\n flat_models: TypeModelSet = set()\n flat_models.add(model)\n known_models |= flat_models\n fields = cast(Sequence[ModelField], model.__fields__.values())\n flat_models |= get_flat_models_from_fields(fields, known_models=known_models)\n return flat_models\n\n\ndef get_flat_models_from_field(field: ModelField, known_models: TypeModelSet) -> TypeModelSet:\n \"\"\"\n Take a single Pydantic ``ModelField`` (from a model) that could have been declared as a sublcass of BaseModel\n (so, it could be a submodel), and generate a set with its model and all the sub-models in the tree.\n I.e. if you pass a field that was declared to be of type ``Foo`` (subclass of BaseModel) as ``field``, and that\n model ``Foo`` has a field of type ``Bar`` (also subclass of ``BaseModel``) and that model ``Bar`` has a field of\n type ``Baz`` (also subclass of ``BaseModel``), the return value will be ``set([Foo, Bar, Baz])``.\n\n :param field: a Pydantic ``ModelField``\n :param known_models: used to solve circular references\n :return: a set with the model used in the declaration for this field, if any, and all its sub-models\n \"\"\"\n from .dataclasses import dataclass, is_builtin_dataclass\n from .main import BaseModel # noqa: F811\n\n flat_models: TypeModelSet = set()\n\n # Handle dataclass-based models\n if is_builtin_dataclass(field.type_):\n field.type_ = dataclass(field.type_)\n field_type = field.type_\n if lenient_issubclass(getattr(field_type, '__pydantic_model__', None), BaseModel):\n field_type = field_type.__pydantic_model__\n if field.sub_fields:\n flat_models |= get_flat_models_from_fields(field.sub_fields, known_models=known_models)\n elif lenient_issubclass(field_type, BaseModel) and field_type not in known_models:\n flat_models |= get_flat_models_from_model(field_type, known_models=known_models)\n elif lenient_issubclass(field_type, Enum):\n flat_models.add(field_type)\n return flat_models\n\n\ndef get_flat_models_from_fields(fields: Sequence[ModelField], known_models: TypeModelSet) -> TypeModelSet:\n \"\"\"\n Take a list of Pydantic ``ModelField``s (from a model) that could have been declared as sublcasses of ``BaseModel``\n (so, any of them could be a submodel), and generate a set with their models and all the sub-models in the tree.\n I.e. if you pass a the fields of a model ``Foo`` (subclass of ``BaseModel``) as ``fields``, and on of them has a\n field of type ``Bar`` (also subclass of ``BaseModel``) and that model ``Bar`` has a field of type ``Baz`` (also\n subclass of ``BaseModel``), the return value will be ``set([Foo, Bar, Baz])``.\n\n :param fields: a list of Pydantic ``ModelField``s\n :param known_models: used to solve circular references\n :return: a set with any model declared in the fields, and all their sub-models\n \"\"\"\n flat_models: TypeModelSet = set()\n for field in fields:\n flat_models |= get_flat_models_from_field(field, known_models=known_models)\n return flat_models\n\n\ndef get_flat_models_from_models(models: Sequence[Type['BaseModel']]) -> TypeModelSet:\n \"\"\"\n Take a list of ``models`` and generate a set with them and all their sub-models in their trees. I.e. if you pass\n a list of two models, ``Foo`` and ``Bar``, both subclasses of Pydantic ``BaseModel`` as models, and ``Bar`` has\n a field of type ``Baz`` (also subclass of ``BaseModel``), the return value will be ``set([Foo, Bar, Baz])``.\n \"\"\"\n flat_models: TypeModelSet = set()\n for model in models:\n flat_models |= get_flat_models_from_model(model)\n return flat_models\n\n\ndef get_long_model_name(model: TypeModelOrEnum) -> str:\n return f'{model.__module__}__{model.__name__}'.replace('.', '__')\n\n\ndef field_type_schema(\n field: ModelField,\n *,\n by_alias: bool,\n model_name_map: Dict[TypeModelOrEnum, str],\n ref_template: str,\n schema_overrides: bool = False,\n ref_prefix: Optional[str] = None,\n known_models: TypeModelSet,\n) -> Tuple[Dict[str, Any], Dict[str, Any], Set[str]]:\n \"\"\"\n Used by ``field_schema()``, you probably should be using that function.\n\n Take a single ``field`` and generate the schema for its type only, not including additional\n information as title, etc. Also return additional schema definitions, from sub-models.\n \"\"\"\n definitions = {}\n nested_models: Set[str] = set()\n f_schema: Dict[str, Any]\n if field.shape in {SHAPE_LIST, SHAPE_TUPLE_ELLIPSIS, SHAPE_SEQUENCE, SHAPE_SET, SHAPE_FROZENSET, SHAPE_ITERABLE}:\n items_schema, f_definitions, f_nested_models = field_singleton_schema(\n field,\n by_alias=by_alias,\n model_name_map=model_name_map,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models,\n )\n definitions.update(f_definitions)\n nested_models.update(f_nested_models)\n f_schema = {'type': 'array', 'items': items_schema}\n if field.shape in {SHAPE_SET, SHAPE_FROZENSET}:\n f_schema['uniqueItems'] = True\n\n elif field.shape == SHAPE_MAPPING:\n f_schema = {'type': 'object'}\n key_field = cast(ModelField, field.key_field)\n regex = getattr(key_field.type_, 'regex', None)\n items_schema, f_definitions, f_nested_models = field_singleton_schema(\n field,\n by_alias=by_alias,\n model_name_map=model_name_map,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models,\n )\n definitions.update(f_definitions)\n nested_models.update(f_nested_models)\n if regex:\n # Dict keys have a regex pattern\n # items_schema might be a schema or empty dict, add it either way\n f_schema['patternProperties'] = {regex.pattern: items_schema}\n elif items_schema:\n # The dict values are not simply Any, so they need a schema\n f_schema['additionalProperties'] = items_schema\n elif field.shape == SHAPE_TUPLE:\n sub_schema = []\n sub_fields = cast(List[ModelField], field.sub_fields)\n for sf in sub_fields:\n sf_schema, sf_definitions, sf_nested_models = field_type_schema(\n sf,\n by_alias=by_alias,\n model_name_map=model_name_map,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models,\n )\n definitions.update(sf_definitions)\n nested_models.update(sf_nested_models)\n sub_schema.append(sf_schema)\n if len(sub_schema) == 1:\n sub_schema = sub_schema[0] # type: ignore\n f_schema = {'type': 'array', 'items': sub_schema}\n else:\n assert field.shape == SHAPE_SINGLETON, field.shape\n f_schema, f_definitions, f_nested_models = field_singleton_schema(\n field,\n by_alias=by_alias,\n model_name_map=model_name_map,\n schema_overrides=schema_overrides,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models,\n )\n definitions.update(f_definitions)\n nested_models.update(f_nested_models)\n\n # check field type to avoid repeated calls to the same __modify_schema__ method\n if field.type_ != field.outer_type_:\n modify_schema = getattr(field.outer_type_, '__modify_schema__', None)\n if modify_schema:\n modify_schema(f_schema)\n return f_schema, definitions, nested_models\n\n\ndef model_process_schema(\n model: TypeModelOrEnum,\n *,\n by_alias: bool = True,\n model_name_map: Dict[TypeModelOrEnum, str],\n ref_prefix: Optional[str] = None,\n ref_template: str = default_ref_template,\n known_models: TypeModelSet = None,\n) -> Tuple[Dict[str, Any], Dict[str, Any], Set[str]]:\n \"\"\"\n Used by ``model_schema()``, you probably should be using that function.\n\n Take a single ``model`` and generate its schema. Also return additional schema definitions, from sub-models. The\n sub-models of the returned schema will be referenced, but their definitions will not be included in the schema. All\n the definitions are returned as the second value.\n \"\"\"\n from inspect import getdoc, signature\n\n known_models = known_models or set()\n if lenient_issubclass(model, Enum):\n model = cast(Type[Enum], model)\n s = enum_process_schema(model)\n return s, {}, set()\n model = cast(Type['BaseModel'], model)\n s = {'title': model.__config__.title or model.__name__}\n doc = getdoc(model)\n if doc:\n s['description'] = doc\n known_models.add(model)\n m_schema, m_definitions, nested_models = model_type_schema(\n model,\n by_alias=by_alias,\n model_name_map=model_name_map,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models,\n )\n s.update(m_schema)\n schema_extra = model.__config__.schema_extra\n if callable(schema_extra):\n if len(signature(schema_extra).parameters) == 1:\n schema_extra(s)\n else:\n schema_extra(s, model)\n else:\n s.update(schema_extra)\n return s, m_definitions, nested_models\n\n\ndef model_type_schema(\n model: Type['BaseModel'],\n *,\n by_alias: bool,\n model_name_map: Dict[TypeModelOrEnum, str],\n ref_template: str,\n ref_prefix: Optional[str] = None,\n known_models: TypeModelSet,\n) -> Tuple[Dict[str, Any], Dict[str, Any], Set[str]]:\n \"\"\"\n You probably should be using ``model_schema()``, this function is indirectly used by that function.\n\n Take a single ``model`` and generate the schema for its type only, not including additional\n information as title, etc. Also return additional schema definitions, from sub-models.\n \"\"\"\n properties = {}\n required = []\n definitions: Dict[str, Any] = {}\n nested_models: Set[str] = set()\n for k, f in model.__fields__.items():\n try:\n f_schema, f_definitions, f_nested_models = field_schema(\n f,\n by_alias=by_alias,\n model_name_map=model_name_map,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models,\n )\n except SkipField as skip:\n warnings.warn(skip.message, UserWarning)\n continue\n definitions.update(f_definitions)\n nested_models.update(f_nested_models)\n if by_alias:\n properties[f.alias] = f_schema\n if f.required:\n required.append(f.alias)\n else:\n properties[k] = f_schema\n if f.required:\n required.append(k)\n if ROOT_KEY in properties:\n out_schema = properties[ROOT_KEY]\n out_schema['title'] = model.__config__.title or model.__name__\n else:\n out_schema = {'type': 'object', 'properties': properties}\n if required:\n out_schema['required'] = required\n if model.__config__.extra == 'forbid':\n out_schema['additionalProperties'] = False\n return out_schema, definitions, nested_models\n\n\ndef enum_process_schema(enum: Type[Enum]) -> Dict[str, Any]:\n \"\"\"\n Take a single `enum` and generate its schema.\n\n This is similar to the `model_process_schema` function, but applies to ``Enum`` objects.\n \"\"\"\n from inspect import getdoc\n\n schema: Dict[str, Any] = {\n 'title': enum.__name__,\n # Python assigns all enums a default docstring value of 'An enumeration', so\n # all enums will have a description field even if not explicitly provided.\n 'description': getdoc(enum),\n # Add enum values and the enum field type to the schema.\n 'enum': [item.value for item in cast(Iterable[Enum], enum)],\n }\n\n add_field_type_to_schema(enum, schema)\n\n modify_schema = getattr(enum, '__modify_schema__', None)\n if modify_schema:\n modify_schema(schema)\n\n return schema\n\n\ndef field_singleton_sub_fields_schema(\n sub_fields: Sequence[ModelField],\n *,\n by_alias: bool,\n model_name_map: Dict[TypeModelOrEnum, str],\n ref_template: str,\n schema_overrides: bool = False,\n ref_prefix: Optional[str] = None,\n known_models: TypeModelSet,\n) -> Tuple[Dict[str, Any], Dict[str, Any], Set[str]]:\n \"\"\"\n This function is indirectly used by ``field_schema()``, you probably should be using that function.\n\n Take a list of Pydantic ``ModelField`` from the declaration of a type with parameters, and generate their\n schema. I.e., fields used as \"type parameters\", like ``str`` and ``int`` in ``Tuple[str, int]``.\n \"\"\"\n definitions = {}\n nested_models: Set[str] = set()\n if len(sub_fields) == 1:\n return field_type_schema(\n sub_fields[0],\n by_alias=by_alias,\n model_name_map=model_name_map,\n schema_overrides=schema_overrides,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models,\n )\n else:\n sub_field_schemas = []\n for sf in sub_fields:\n sub_schema, sub_definitions, sub_nested_models = field_type_schema(\n sf,\n by_alias=by_alias,\n model_name_map=model_name_map,\n schema_overrides=schema_overrides,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models,\n )\n definitions.update(sub_definitions)\n if schema_overrides and 'allOf' in sub_schema:\n # if the sub_field is a referenced schema we only need the referenced\n # object. Otherwise we will end up with several allOf inside anyOf.\n # See https://github.com/samuelcolvin/pydantic/issues/1209\n sub_schema = sub_schema['allOf'][0]\n sub_field_schemas.append(sub_schema)\n nested_models.update(sub_nested_models)\n return {'anyOf': sub_field_schemas}, definitions, nested_models\n\n\n# Order is important, e.g. subclasses of str must go before str\n# this is used only for standard library types, custom types should use __modify_schema__ instead\nfield_class_to_schema: Tuple[Tuple[Any, Dict[str, Any]], ...] = (\n (Path, {'type': 'string', 'format': 'path'}),\n (datetime, {'type': 'string', 'format': 'date-time'}),\n (date, {'type': 'string', 'format': 'date'}),\n (time, {'type': 'string', 'format': 'time'}),\n (timedelta, {'type': 'number', 'format': 'time-delta'}),\n (IPv4Network, {'type': 'string', 'format': 'ipv4network'}),\n (IPv6Network, {'type': 'string', 'format': 'ipv6network'}),\n (IPv4Interface, {'type': 'string', 'format': 'ipv4interface'}),\n (IPv6Interface, {'type': 'string', 'format': 'ipv6interface'}),\n (IPv4Address, {'type': 'string', 'format': 'ipv4'}),\n (IPv6Address, {'type': 'string', 'format': 'ipv6'}),\n (Pattern, {'type': 'string', 'format': 'regex'}),\n (str, {'type': 'string'}),\n (bytes, {'type': 'string', 'format': 'binary'}),\n (bool, {'type': 'boolean'}),\n (int, {'type': 'integer'}),\n (float, {'type': 'number'}),\n (Decimal, {'type': 'number'}),\n (UUID, {'type': 'string', 'format': 'uuid'}),\n (dict, {'type': 'object'}),\n (list, {'type': 'array', 'items': {}}),\n (tuple, {'type': 'array', 'items': {}}),\n (set, {'type': 'array', 'items': {}, 'uniqueItems': True}),\n (frozenset, {'type': 'array', 'items': {}, 'uniqueItems': True}),\n)\n\njson_scheme = {'type': 'string', 'format': 'json-string'}\n\n\ndef add_field_type_to_schema(field_type: Any, schema: Dict[str, Any]) -> None:\n \"\"\"\n Update the given `schema` with the type-specific metadata for the given `field_type`.\n\n This function looks through `field_class_to_schema` for a class that matches the given `field_type`,\n and then modifies the given `schema` with the information from that type.\n \"\"\"\n for type_, t_schema in field_class_to_schema:\n # Fallback for `typing.Pattern` as it is not a valid class\n if lenient_issubclass(field_type, type_) or field_type is type_ is Pattern:\n schema.update(t_schema)\n break\n\n\ndef get_schema_ref(name: str, ref_prefix: Optional[str], ref_template: str, schema_overrides: bool) -> Dict[str, Any]:\n if ref_prefix:\n schema_ref = {'$ref': ref_prefix + name}\n else:\n schema_ref = {'$ref': ref_template.format(model=name)}\n return {'allOf': [schema_ref]} if schema_overrides else schema_ref\n\n\ndef field_singleton_schema( # noqa: C901 (ignore complexity)\n field: ModelField,\n *,\n by_alias: bool,\n model_name_map: Dict[TypeModelOrEnum, str],\n ref_template: str,\n schema_overrides: bool = False,\n ref_prefix: Optional[str] = None,\n known_models: TypeModelSet,\n) -> Tuple[Dict[str, Any], Dict[str, Any], Set[str]]:\n \"\"\"\n This function is indirectly used by ``field_schema()``, you should probably be using that function.\n\n Take a single Pydantic ``ModelField``, and return its schema and any additional definitions from sub-models.\n \"\"\"\n from .main import BaseModel # noqa: F811\n\n definitions: Dict[str, Any] = {}\n nested_models: Set[str] = set()\n if field.sub_fields:\n return field_singleton_sub_fields_schema(\n field.sub_fields,\n by_alias=by_alias,\n model_name_map=model_name_map,\n schema_overrides=schema_overrides,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models,\n )\n if field.type_ is Any or field.type_.__class__ == TypeVar:\n return {}, definitions, nested_models # no restrictions\n if field.type_ in NONE_TYPES:\n return {'type': 'null'}, definitions, nested_models\n if is_callable_type(field.type_):\n raise SkipField(f'Callable {field.name} was excluded from schema since JSON schema has no equivalent type.')\n f_schema: Dict[str, Any] = {}\n if field.field_info is not None and field.field_info.const:\n f_schema['const'] = field.default\n field_type = field.type_\n if is_literal_type(field_type):\n values = literal_values(field_type)\n if len(values) > 1:\n return field_schema(\n multivalue_literal_field_for_schema(values, field),\n by_alias=by_alias,\n model_name_map=model_name_map,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models,\n )\n literal_value = values[0]\n field_type = literal_value.__class__\n f_schema['const'] = literal_value\n\n if lenient_issubclass(field_type, Enum):\n enum_name = model_name_map[field_type]\n f_schema, schema_overrides = get_field_info_schema(field)\n f_schema.update(get_schema_ref(enum_name, ref_prefix, ref_template, schema_overrides))\n definitions[enum_name] = enum_process_schema(field_type)\n else:\n add_field_type_to_schema(field_type, f_schema)\n\n modify_schema = getattr(field_type, '__modify_schema__', None)\n if modify_schema:\n modify_schema(f_schema)\n\n if f_schema:\n return f_schema, definitions, nested_models\n\n # Handle dataclass-based models\n if lenient_issubclass(getattr(field_type, '__pydantic_model__', None), BaseModel):\n field_type = field_type.__pydantic_model__\n\n if issubclass(field_type, BaseModel):\n model_name = model_name_map[field_type]\n if field_type not in known_models:\n sub_schema, sub_definitions, sub_nested_models = model_process_schema(\n field_type,\n by_alias=by_alias,\n model_name_map=model_name_map,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models,\n )\n definitions.update(sub_definitions)\n definitions[model_name] = sub_schema\n nested_models.update(sub_nested_models)\n else:\n nested_models.add(model_name)\n schema_ref = get_schema_ref(model_name, ref_prefix, ref_template, schema_overrides)\n return schema_ref, definitions, nested_models\n\n raise ValueError(f'Value not declarable with JSON Schema, field: {field}')\n\n\ndef multivalue_literal_field_for_schema(values: Tuple[Any, ...], field: ModelField) -> ModelField:\n return ModelField(\n name=field.name,\n type_=Union[tuple(Literal[value] for value in values)], # type: ignore\n class_validators=field.class_validators,\n model_config=field.model_config,\n default=field.default,\n required=field.required,\n alias=field.alias,\n field_info=field.field_info,\n )\n\n\ndef encode_default(dft: Any) -> Any:\n if isinstance(dft, (int, float, str)):\n return dft\n elif sequence_like(dft):\n t = dft.__class__\n return t(encode_default(v) for v in dft)\n elif isinstance(dft, dict):\n return {encode_default(k): encode_default(v) for k, v in dft.items()}\n elif dft is None:\n return None\n else:\n return pydantic_encoder(dft)\n\n\n_map_types_constraint: Dict[Any, Callable[..., type]] = {int: conint, float: confloat, Decimal: condecimal}\n_field_constraints = {\n 'min_length',\n 'max_length',\n 'regex',\n 'gt',\n 'lt',\n 'ge',\n 'le',\n 'multiple_of',\n 'min_items',\n 'max_items',\n}\n\n\ndef get_annotation_from_field_info(annotation: Any, field_info: FieldInfo, field_name: str) -> Type[Any]: # noqa: C901\n \"\"\"\n Get an annotation with validation implemented for numbers and strings based on the field_info.\n\n :param annotation: an annotation from a field specification, as ``str``, ``ConstrainedStr``\n :param field_info: an instance of FieldInfo, possibly with declarations for validations and JSON Schema\n :param field_name: name of the field for use in error messages\n :return: the same ``annotation`` if unmodified or a new annotation with validation in place\n \"\"\"\n constraints = {f for f in _field_constraints if getattr(field_info, f) is not None}\n if not constraints:\n return annotation\n used_constraints: Set[str] = set()\n\n def go(type_: Any) -> Type[Any]:\n if (\n is_literal_type(annotation)\n or isinstance(type_, ForwardRef)\n or lenient_issubclass(type_, (ConstrainedList, ConstrainedSet))\n ):\n return type_\n origin = get_origin(type_)\n if origin is not None:\n args: Tuple[Any, ...] = get_args(type_)\n if any(isinstance(a, ForwardRef) for a in args):\n # forward refs cause infinite recursion below\n return type_\n\n if origin is Union:\n return Union[tuple(go(a) for a in args)] # type: ignore\n\n if issubclass(origin, List) and (field_info.min_items is not None or field_info.max_items is not None):\n used_constraints.update({'min_items', 'max_items'})\n return conlist(go(args[0]), min_items=field_info.min_items, max_items=field_info.max_items)\n\n if issubclass(origin, Set) and (field_info.min_items is not None or field_info.max_items is not None):\n used_constraints.update({'min_items', 'max_items'})\n return conset(go(args[0]), min_items=field_info.min_items, max_items=field_info.max_items)\n\n for t in (Tuple, List, Set, FrozenSet, Sequence):\n if issubclass(origin, t): # type: ignore\n return t[tuple(go(a) for a in args)] # type: ignore\n\n if issubclass(origin, Dict):\n return Dict[args[0], go(args[1])] # type: ignore\n\n attrs: Optional[Tuple[str, ...]] = None\n constraint_func: Optional[Callable[..., type]] = None\n if isinstance(type_, type):\n if issubclass(type_, (SecretStr, SecretBytes)):\n attrs = ('max_length', 'min_length')\n\n def constraint_func(**kwargs: Any) -> Type[Any]:\n return type(type_.__name__, (type_,), kwargs)\n\n elif issubclass(type_, str) and not issubclass(type_, (EmailStr, AnyUrl, ConstrainedStr)):\n attrs = ('max_length', 'min_length', 'regex')\n constraint_func = constr\n elif issubclass(type_, bytes):\n attrs = ('max_length', 'min_length', 'regex')\n constraint_func = conbytes\n elif issubclass(type_, numeric_types) and not issubclass(\n type_, (ConstrainedInt, ConstrainedFloat, ConstrainedDecimal, ConstrainedList, ConstrainedSet, bool)\n ):\n # Is numeric type\n attrs = ('gt', 'lt', 'ge', 'le', 'multiple_of')\n numeric_type = next(t for t in numeric_types if issubclass(type_, t)) # pragma: no branch\n constraint_func = _map_types_constraint[numeric_type]\n\n if attrs:\n used_constraints.update(set(attrs))\n kwargs = {\n attr_name: attr\n for attr_name, attr in ((attr_name, getattr(field_info, attr_name)) for attr_name in attrs)\n if attr is not None\n }\n if kwargs:\n constraint_func = cast(Callable[..., type], constraint_func)\n return constraint_func(**kwargs)\n return type_\n\n ans = go(annotation)\n\n unused_constraints = constraints - used_constraints\n if unused_constraints:\n raise ValueError(\n f'On field \"{field_name}\" the following field constraints are set but not enforced: '\n f'{\", \".join(unused_constraints)}. '\n f'\\nFor more details see https://pydantic-docs.helpmanual.io/usage/schema/#unenforced-field-constraints'\n )\n\n return ans\n\n\ndef normalize_name(name: str) -> str:\n \"\"\"\n Normalizes the given name. This can be applied to either a model *or* enum.\n \"\"\"\n return re.sub(r'[^a-zA-Z0-9.\\-_]', '_', name)\n\n\nclass SkipField(Exception):\n \"\"\"\n Utility exception used to exclude fields from schema.\n \"\"\"\n\n def __init__(self, message: str) -> None:\n self.message = message\n", "path": "pydantic/schema.py" } ]
[ { "content": "import re\nimport warnings\nfrom datetime import date, datetime, time, timedelta\nfrom decimal import Decimal\nfrom enum import Enum\nfrom ipaddress import IPv4Address, IPv4Interface, IPv4Network, IPv6Address, IPv6Interface, IPv6Network\nfrom pathlib import Path\nfrom typing import (\n TYPE_CHECKING,\n Any,\n Callable,\n Dict,\n FrozenSet,\n Iterable,\n List,\n Optional,\n Pattern,\n Sequence,\n Set,\n Tuple,\n Type,\n TypeVar,\n Union,\n cast,\n)\nfrom uuid import UUID\n\nfrom .fields import (\n SHAPE_FROZENSET,\n SHAPE_ITERABLE,\n SHAPE_LIST,\n SHAPE_MAPPING,\n SHAPE_SEQUENCE,\n SHAPE_SET,\n SHAPE_SINGLETON,\n SHAPE_TUPLE,\n SHAPE_TUPLE_ELLIPSIS,\n FieldInfo,\n ModelField,\n)\nfrom .json import pydantic_encoder\nfrom .networks import AnyUrl, EmailStr\nfrom .types import (\n ConstrainedDecimal,\n ConstrainedFloat,\n ConstrainedInt,\n ConstrainedList,\n ConstrainedSet,\n ConstrainedStr,\n SecretBytes,\n SecretStr,\n conbytes,\n condecimal,\n confloat,\n conint,\n conlist,\n conset,\n constr,\n)\nfrom .typing import (\n NONE_TYPES,\n ForwardRef,\n Literal,\n get_args,\n get_origin,\n is_callable_type,\n is_literal_type,\n literal_values,\n)\nfrom .utils import ROOT_KEY, get_model, lenient_issubclass, sequence_like\n\nif TYPE_CHECKING:\n from .dataclasses import Dataclass # noqa: F401\n from .main import BaseModel # noqa: F401\n\ndefault_prefix = '#/definitions/'\ndefault_ref_template = '#/definitions/{model}'\n\nTypeModelOrEnum = Union[Type['BaseModel'], Type[Enum]]\nTypeModelSet = Set[TypeModelOrEnum]\n\n\ndef schema(\n models: Sequence[Union[Type['BaseModel'], Type['Dataclass']]],\n *,\n by_alias: bool = True,\n title: Optional[str] = None,\n description: Optional[str] = None,\n ref_prefix: Optional[str] = None,\n ref_template: str = default_ref_template,\n) -> Dict[str, Any]:\n \"\"\"\n Process a list of models and generate a single JSON Schema with all of them defined in the ``definitions``\n top-level JSON key, including their sub-models.\n\n :param models: a list of models to include in the generated JSON Schema\n :param by_alias: generate the schemas using the aliases defined, if any\n :param title: title for the generated schema that includes the definitions\n :param description: description for the generated schema\n :param ref_prefix: the JSON Pointer prefix for schema references with ``$ref``, if None, will be set to the\n default of ``#/definitions/``. Update it if you want the schemas to reference the definitions somewhere\n else, e.g. for OpenAPI use ``#/components/schemas/``. The resulting generated schemas will still be at the\n top-level key ``definitions``, so you can extract them from there. But all the references will have the set\n prefix.\n :param ref_template: Use a ``string.format()`` template for ``$ref`` instead of a prefix. This can be useful\n for references that cannot be represented by ``ref_prefix`` such as a definition stored in another file. For\n a sibling json file in a ``/schemas`` directory use ``\"/schemas/${model}.json#\"``.\n :return: dict with the JSON Schema with a ``definitions`` top-level key including the schema definitions for\n the models and sub-models passed in ``models``.\n \"\"\"\n clean_models = [get_model(model) for model in models]\n flat_models = get_flat_models_from_models(clean_models)\n model_name_map = get_model_name_map(flat_models)\n definitions = {}\n output_schema: Dict[str, Any] = {}\n if title:\n output_schema['title'] = title\n if description:\n output_schema['description'] = description\n for model in clean_models:\n m_schema, m_definitions, m_nested_models = model_process_schema(\n model,\n by_alias=by_alias,\n model_name_map=model_name_map,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n )\n definitions.update(m_definitions)\n model_name = model_name_map[model]\n definitions[model_name] = m_schema\n if definitions:\n output_schema['definitions'] = definitions\n return output_schema\n\n\ndef model_schema(\n model: Union[Type['BaseModel'], Type['Dataclass']],\n by_alias: bool = True,\n ref_prefix: Optional[str] = None,\n ref_template: str = default_ref_template,\n) -> Dict[str, Any]:\n \"\"\"\n Generate a JSON Schema for one model. With all the sub-models defined in the ``definitions`` top-level\n JSON key.\n\n :param model: a Pydantic model (a class that inherits from BaseModel)\n :param by_alias: generate the schemas using the aliases defined, if any\n :param ref_prefix: the JSON Pointer prefix for schema references with ``$ref``, if None, will be set to the\n default of ``#/definitions/``. Update it if you want the schemas to reference the definitions somewhere\n else, e.g. for OpenAPI use ``#/components/schemas/``. The resulting generated schemas will still be at the\n top-level key ``definitions``, so you can extract them from there. But all the references will have the set\n prefix.\n :param ref_template: Use a ``string.format()`` template for ``$ref`` instead of a prefix. This can be useful for\n references that cannot be represented by ``ref_prefix`` such as a definition stored in another file. For a\n sibling json file in a ``/schemas`` directory use ``\"/schemas/${model}.json#\"``.\n :return: dict with the JSON Schema for the passed ``model``\n \"\"\"\n model = get_model(model)\n flat_models = get_flat_models_from_model(model)\n model_name_map = get_model_name_map(flat_models)\n model_name = model_name_map[model]\n m_schema, m_definitions, nested_models = model_process_schema(\n model, by_alias=by_alias, model_name_map=model_name_map, ref_prefix=ref_prefix, ref_template=ref_template\n )\n if model_name in nested_models:\n # model_name is in Nested models, it has circular references\n m_definitions[model_name] = m_schema\n m_schema = get_schema_ref(model_name, ref_prefix, ref_template, False)\n if m_definitions:\n m_schema.update({'definitions': m_definitions})\n return m_schema\n\n\ndef get_field_info_schema(field: ModelField) -> Tuple[Dict[str, Any], bool]:\n schema_overrides = False\n\n # If no title is explicitly set, we don't set title in the schema for enums.\n # The behaviour is the same as `BaseModel` reference, where the default title\n # is in the definitions part of the schema.\n schema: Dict[str, Any] = {}\n if field.field_info.title or not lenient_issubclass(field.type_, Enum):\n schema['title'] = field.field_info.title or field.alias.title().replace('_', ' ')\n\n if field.field_info.title:\n schema_overrides = True\n\n if field.field_info.description:\n schema['description'] = field.field_info.description\n schema_overrides = True\n\n if not field.required and not field.field_info.const and field.default is not None:\n schema['default'] = encode_default(field.default)\n schema_overrides = True\n\n return schema, schema_overrides\n\n\ndef field_schema(\n field: ModelField,\n *,\n by_alias: bool = True,\n model_name_map: Dict[TypeModelOrEnum, str],\n ref_prefix: Optional[str] = None,\n ref_template: str = default_ref_template,\n known_models: TypeModelSet = None,\n) -> Tuple[Dict[str, Any], Dict[str, Any], Set[str]]:\n \"\"\"\n Process a Pydantic field and return a tuple with a JSON Schema for it as the first item.\n Also return a dictionary of definitions with models as keys and their schemas as values. If the passed field\n is a model and has sub-models, and those sub-models don't have overrides (as ``title``, ``default``, etc), they\n will be included in the definitions and referenced in the schema instead of included recursively.\n\n :param field: a Pydantic ``ModelField``\n :param by_alias: use the defined alias (if any) in the returned schema\n :param model_name_map: used to generate the JSON Schema references to other models included in the definitions\n :param ref_prefix: the JSON Pointer prefix to use for references to other schemas, if None, the default of\n #/definitions/ will be used\n :param ref_template: Use a ``string.format()`` template for ``$ref`` instead of a prefix. This can be useful for\n references that cannot be represented by ``ref_prefix`` such as a definition stored in another file. For a\n sibling json file in a ``/schemas`` directory use ``\"/schemas/${model}.json#\"``.\n :param known_models: used to solve circular references\n :return: tuple of the schema for this field and additional definitions\n \"\"\"\n s, schema_overrides = get_field_info_schema(field)\n\n validation_schema = get_field_schema_validations(field)\n if validation_schema:\n s.update(validation_schema)\n schema_overrides = True\n\n f_schema, f_definitions, f_nested_models = field_type_schema(\n field,\n by_alias=by_alias,\n model_name_map=model_name_map,\n schema_overrides=schema_overrides,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models or set(),\n )\n # $ref will only be returned when there are no schema_overrides\n if '$ref' in f_schema:\n return f_schema, f_definitions, f_nested_models\n else:\n s.update(f_schema)\n return s, f_definitions, f_nested_models\n\n\nnumeric_types = (int, float, Decimal)\n_str_types_attrs: Tuple[Tuple[str, Union[type, Tuple[type, ...]], str], ...] = (\n ('max_length', numeric_types, 'maxLength'),\n ('min_length', numeric_types, 'minLength'),\n ('regex', str, 'pattern'),\n)\n\n_numeric_types_attrs: Tuple[Tuple[str, Union[type, Tuple[type, ...]], str], ...] = (\n ('gt', numeric_types, 'exclusiveMinimum'),\n ('lt', numeric_types, 'exclusiveMaximum'),\n ('ge', numeric_types, 'minimum'),\n ('le', numeric_types, 'maximum'),\n ('multiple_of', numeric_types, 'multipleOf'),\n)\n\n\ndef get_field_schema_validations(field: ModelField) -> Dict[str, Any]:\n \"\"\"\n Get the JSON Schema validation keywords for a ``field`` with an annotation of\n a Pydantic ``FieldInfo`` with validation arguments.\n \"\"\"\n f_schema: Dict[str, Any] = {}\n\n if lenient_issubclass(field.type_, Enum):\n # schema is already updated by `enum_process_schema`; just update with field extra\n if field.field_info.extra:\n f_schema.update(field.field_info.extra)\n return f_schema\n\n if lenient_issubclass(field.type_, (str, bytes)):\n for attr_name, t, keyword in _str_types_attrs:\n attr = getattr(field.field_info, attr_name, None)\n if isinstance(attr, t):\n f_schema[keyword] = attr\n if lenient_issubclass(field.type_, numeric_types) and not issubclass(field.type_, bool):\n for attr_name, t, keyword in _numeric_types_attrs:\n attr = getattr(field.field_info, attr_name, None)\n if isinstance(attr, t):\n f_schema[keyword] = attr\n if field.field_info is not None and field.field_info.const:\n f_schema['const'] = field.default\n if field.field_info.extra:\n f_schema.update(field.field_info.extra)\n modify_schema = getattr(field.outer_type_, '__modify_schema__', None)\n if modify_schema:\n modify_schema(f_schema)\n return f_schema\n\n\ndef get_model_name_map(unique_models: TypeModelSet) -> Dict[TypeModelOrEnum, str]:\n \"\"\"\n Process a set of models and generate unique names for them to be used as keys in the JSON Schema\n definitions. By default the names are the same as the class name. But if two models in different Python\n modules have the same name (e.g. \"users.Model\" and \"items.Model\"), the generated names will be\n based on the Python module path for those conflicting models to prevent name collisions.\n\n :param unique_models: a Python set of models\n :return: dict mapping models to names\n \"\"\"\n name_model_map = {}\n conflicting_names: Set[str] = set()\n for model in unique_models:\n model_name = normalize_name(model.__name__)\n if model_name in conflicting_names:\n model_name = get_long_model_name(model)\n name_model_map[model_name] = model\n elif model_name in name_model_map:\n conflicting_names.add(model_name)\n conflicting_model = name_model_map.pop(model_name)\n name_model_map[get_long_model_name(conflicting_model)] = conflicting_model\n name_model_map[get_long_model_name(model)] = model\n else:\n name_model_map[model_name] = model\n return {v: k for k, v in name_model_map.items()}\n\n\ndef get_flat_models_from_model(model: Type['BaseModel'], known_models: TypeModelSet = None) -> TypeModelSet:\n \"\"\"\n Take a single ``model`` and generate a set with itself and all the sub-models in the tree. I.e. if you pass\n model ``Foo`` (subclass of Pydantic ``BaseModel``) as ``model``, and it has a field of type ``Bar`` (also\n subclass of ``BaseModel``) and that model ``Bar`` has a field of type ``Baz`` (also subclass of ``BaseModel``),\n the return value will be ``set([Foo, Bar, Baz])``.\n\n :param model: a Pydantic ``BaseModel`` subclass\n :param known_models: used to solve circular references\n :return: a set with the initial model and all its sub-models\n \"\"\"\n known_models = known_models or set()\n flat_models: TypeModelSet = set()\n flat_models.add(model)\n known_models |= flat_models\n fields = cast(Sequence[ModelField], model.__fields__.values())\n flat_models |= get_flat_models_from_fields(fields, known_models=known_models)\n return flat_models\n\n\ndef get_flat_models_from_field(field: ModelField, known_models: TypeModelSet) -> TypeModelSet:\n \"\"\"\n Take a single Pydantic ``ModelField`` (from a model) that could have been declared as a sublcass of BaseModel\n (so, it could be a submodel), and generate a set with its model and all the sub-models in the tree.\n I.e. if you pass a field that was declared to be of type ``Foo`` (subclass of BaseModel) as ``field``, and that\n model ``Foo`` has a field of type ``Bar`` (also subclass of ``BaseModel``) and that model ``Bar`` has a field of\n type ``Baz`` (also subclass of ``BaseModel``), the return value will be ``set([Foo, Bar, Baz])``.\n\n :param field: a Pydantic ``ModelField``\n :param known_models: used to solve circular references\n :return: a set with the model used in the declaration for this field, if any, and all its sub-models\n \"\"\"\n from .dataclasses import dataclass, is_builtin_dataclass\n from .main import BaseModel # noqa: F811\n\n flat_models: TypeModelSet = set()\n\n # Handle dataclass-based models\n if is_builtin_dataclass(field.type_):\n field.type_ = dataclass(field.type_)\n field_type = field.type_\n if lenient_issubclass(getattr(field_type, '__pydantic_model__', None), BaseModel):\n field_type = field_type.__pydantic_model__\n if field.sub_fields:\n flat_models |= get_flat_models_from_fields(field.sub_fields, known_models=known_models)\n elif lenient_issubclass(field_type, BaseModel) and field_type not in known_models:\n flat_models |= get_flat_models_from_model(field_type, known_models=known_models)\n elif lenient_issubclass(field_type, Enum):\n flat_models.add(field_type)\n return flat_models\n\n\ndef get_flat_models_from_fields(fields: Sequence[ModelField], known_models: TypeModelSet) -> TypeModelSet:\n \"\"\"\n Take a list of Pydantic ``ModelField``s (from a model) that could have been declared as sublcasses of ``BaseModel``\n (so, any of them could be a submodel), and generate a set with their models and all the sub-models in the tree.\n I.e. if you pass a the fields of a model ``Foo`` (subclass of ``BaseModel``) as ``fields``, and on of them has a\n field of type ``Bar`` (also subclass of ``BaseModel``) and that model ``Bar`` has a field of type ``Baz`` (also\n subclass of ``BaseModel``), the return value will be ``set([Foo, Bar, Baz])``.\n\n :param fields: a list of Pydantic ``ModelField``s\n :param known_models: used to solve circular references\n :return: a set with any model declared in the fields, and all their sub-models\n \"\"\"\n flat_models: TypeModelSet = set()\n for field in fields:\n flat_models |= get_flat_models_from_field(field, known_models=known_models)\n return flat_models\n\n\ndef get_flat_models_from_models(models: Sequence[Type['BaseModel']]) -> TypeModelSet:\n \"\"\"\n Take a list of ``models`` and generate a set with them and all their sub-models in their trees. I.e. if you pass\n a list of two models, ``Foo`` and ``Bar``, both subclasses of Pydantic ``BaseModel`` as models, and ``Bar`` has\n a field of type ``Baz`` (also subclass of ``BaseModel``), the return value will be ``set([Foo, Bar, Baz])``.\n \"\"\"\n flat_models: TypeModelSet = set()\n for model in models:\n flat_models |= get_flat_models_from_model(model)\n return flat_models\n\n\ndef get_long_model_name(model: TypeModelOrEnum) -> str:\n return f'{model.__module__}__{model.__qualname__}'.replace('.', '__')\n\n\ndef field_type_schema(\n field: ModelField,\n *,\n by_alias: bool,\n model_name_map: Dict[TypeModelOrEnum, str],\n ref_template: str,\n schema_overrides: bool = False,\n ref_prefix: Optional[str] = None,\n known_models: TypeModelSet,\n) -> Tuple[Dict[str, Any], Dict[str, Any], Set[str]]:\n \"\"\"\n Used by ``field_schema()``, you probably should be using that function.\n\n Take a single ``field`` and generate the schema for its type only, not including additional\n information as title, etc. Also return additional schema definitions, from sub-models.\n \"\"\"\n definitions = {}\n nested_models: Set[str] = set()\n f_schema: Dict[str, Any]\n if field.shape in {SHAPE_LIST, SHAPE_TUPLE_ELLIPSIS, SHAPE_SEQUENCE, SHAPE_SET, SHAPE_FROZENSET, SHAPE_ITERABLE}:\n items_schema, f_definitions, f_nested_models = field_singleton_schema(\n field,\n by_alias=by_alias,\n model_name_map=model_name_map,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models,\n )\n definitions.update(f_definitions)\n nested_models.update(f_nested_models)\n f_schema = {'type': 'array', 'items': items_schema}\n if field.shape in {SHAPE_SET, SHAPE_FROZENSET}:\n f_schema['uniqueItems'] = True\n\n elif field.shape == SHAPE_MAPPING:\n f_schema = {'type': 'object'}\n key_field = cast(ModelField, field.key_field)\n regex = getattr(key_field.type_, 'regex', None)\n items_schema, f_definitions, f_nested_models = field_singleton_schema(\n field,\n by_alias=by_alias,\n model_name_map=model_name_map,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models,\n )\n definitions.update(f_definitions)\n nested_models.update(f_nested_models)\n if regex:\n # Dict keys have a regex pattern\n # items_schema might be a schema or empty dict, add it either way\n f_schema['patternProperties'] = {regex.pattern: items_schema}\n elif items_schema:\n # The dict values are not simply Any, so they need a schema\n f_schema['additionalProperties'] = items_schema\n elif field.shape == SHAPE_TUPLE:\n sub_schema = []\n sub_fields = cast(List[ModelField], field.sub_fields)\n for sf in sub_fields:\n sf_schema, sf_definitions, sf_nested_models = field_type_schema(\n sf,\n by_alias=by_alias,\n model_name_map=model_name_map,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models,\n )\n definitions.update(sf_definitions)\n nested_models.update(sf_nested_models)\n sub_schema.append(sf_schema)\n if len(sub_schema) == 1:\n sub_schema = sub_schema[0] # type: ignore\n f_schema = {'type': 'array', 'items': sub_schema}\n else:\n assert field.shape == SHAPE_SINGLETON, field.shape\n f_schema, f_definitions, f_nested_models = field_singleton_schema(\n field,\n by_alias=by_alias,\n model_name_map=model_name_map,\n schema_overrides=schema_overrides,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models,\n )\n definitions.update(f_definitions)\n nested_models.update(f_nested_models)\n\n # check field type to avoid repeated calls to the same __modify_schema__ method\n if field.type_ != field.outer_type_:\n modify_schema = getattr(field.outer_type_, '__modify_schema__', None)\n if modify_schema:\n modify_schema(f_schema)\n return f_schema, definitions, nested_models\n\n\ndef model_process_schema(\n model: TypeModelOrEnum,\n *,\n by_alias: bool = True,\n model_name_map: Dict[TypeModelOrEnum, str],\n ref_prefix: Optional[str] = None,\n ref_template: str = default_ref_template,\n known_models: TypeModelSet = None,\n) -> Tuple[Dict[str, Any], Dict[str, Any], Set[str]]:\n \"\"\"\n Used by ``model_schema()``, you probably should be using that function.\n\n Take a single ``model`` and generate its schema. Also return additional schema definitions, from sub-models. The\n sub-models of the returned schema will be referenced, but their definitions will not be included in the schema. All\n the definitions are returned as the second value.\n \"\"\"\n from inspect import getdoc, signature\n\n known_models = known_models or set()\n if lenient_issubclass(model, Enum):\n model = cast(Type[Enum], model)\n s = enum_process_schema(model)\n return s, {}, set()\n model = cast(Type['BaseModel'], model)\n s = {'title': model.__config__.title or model.__name__}\n doc = getdoc(model)\n if doc:\n s['description'] = doc\n known_models.add(model)\n m_schema, m_definitions, nested_models = model_type_schema(\n model,\n by_alias=by_alias,\n model_name_map=model_name_map,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models,\n )\n s.update(m_schema)\n schema_extra = model.__config__.schema_extra\n if callable(schema_extra):\n if len(signature(schema_extra).parameters) == 1:\n schema_extra(s)\n else:\n schema_extra(s, model)\n else:\n s.update(schema_extra)\n return s, m_definitions, nested_models\n\n\ndef model_type_schema(\n model: Type['BaseModel'],\n *,\n by_alias: bool,\n model_name_map: Dict[TypeModelOrEnum, str],\n ref_template: str,\n ref_prefix: Optional[str] = None,\n known_models: TypeModelSet,\n) -> Tuple[Dict[str, Any], Dict[str, Any], Set[str]]:\n \"\"\"\n You probably should be using ``model_schema()``, this function is indirectly used by that function.\n\n Take a single ``model`` and generate the schema for its type only, not including additional\n information as title, etc. Also return additional schema definitions, from sub-models.\n \"\"\"\n properties = {}\n required = []\n definitions: Dict[str, Any] = {}\n nested_models: Set[str] = set()\n for k, f in model.__fields__.items():\n try:\n f_schema, f_definitions, f_nested_models = field_schema(\n f,\n by_alias=by_alias,\n model_name_map=model_name_map,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models,\n )\n except SkipField as skip:\n warnings.warn(skip.message, UserWarning)\n continue\n definitions.update(f_definitions)\n nested_models.update(f_nested_models)\n if by_alias:\n properties[f.alias] = f_schema\n if f.required:\n required.append(f.alias)\n else:\n properties[k] = f_schema\n if f.required:\n required.append(k)\n if ROOT_KEY in properties:\n out_schema = properties[ROOT_KEY]\n out_schema['title'] = model.__config__.title or model.__name__\n else:\n out_schema = {'type': 'object', 'properties': properties}\n if required:\n out_schema['required'] = required\n if model.__config__.extra == 'forbid':\n out_schema['additionalProperties'] = False\n return out_schema, definitions, nested_models\n\n\ndef enum_process_schema(enum: Type[Enum]) -> Dict[str, Any]:\n \"\"\"\n Take a single `enum` and generate its schema.\n\n This is similar to the `model_process_schema` function, but applies to ``Enum`` objects.\n \"\"\"\n from inspect import getdoc\n\n schema: Dict[str, Any] = {\n 'title': enum.__name__,\n # Python assigns all enums a default docstring value of 'An enumeration', so\n # all enums will have a description field even if not explicitly provided.\n 'description': getdoc(enum),\n # Add enum values and the enum field type to the schema.\n 'enum': [item.value for item in cast(Iterable[Enum], enum)],\n }\n\n add_field_type_to_schema(enum, schema)\n\n modify_schema = getattr(enum, '__modify_schema__', None)\n if modify_schema:\n modify_schema(schema)\n\n return schema\n\n\ndef field_singleton_sub_fields_schema(\n sub_fields: Sequence[ModelField],\n *,\n by_alias: bool,\n model_name_map: Dict[TypeModelOrEnum, str],\n ref_template: str,\n schema_overrides: bool = False,\n ref_prefix: Optional[str] = None,\n known_models: TypeModelSet,\n) -> Tuple[Dict[str, Any], Dict[str, Any], Set[str]]:\n \"\"\"\n This function is indirectly used by ``field_schema()``, you probably should be using that function.\n\n Take a list of Pydantic ``ModelField`` from the declaration of a type with parameters, and generate their\n schema. I.e., fields used as \"type parameters\", like ``str`` and ``int`` in ``Tuple[str, int]``.\n \"\"\"\n definitions = {}\n nested_models: Set[str] = set()\n if len(sub_fields) == 1:\n return field_type_schema(\n sub_fields[0],\n by_alias=by_alias,\n model_name_map=model_name_map,\n schema_overrides=schema_overrides,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models,\n )\n else:\n sub_field_schemas = []\n for sf in sub_fields:\n sub_schema, sub_definitions, sub_nested_models = field_type_schema(\n sf,\n by_alias=by_alias,\n model_name_map=model_name_map,\n schema_overrides=schema_overrides,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models,\n )\n definitions.update(sub_definitions)\n if schema_overrides and 'allOf' in sub_schema:\n # if the sub_field is a referenced schema we only need the referenced\n # object. Otherwise we will end up with several allOf inside anyOf.\n # See https://github.com/samuelcolvin/pydantic/issues/1209\n sub_schema = sub_schema['allOf'][0]\n sub_field_schemas.append(sub_schema)\n nested_models.update(sub_nested_models)\n return {'anyOf': sub_field_schemas}, definitions, nested_models\n\n\n# Order is important, e.g. subclasses of str must go before str\n# this is used only for standard library types, custom types should use __modify_schema__ instead\nfield_class_to_schema: Tuple[Tuple[Any, Dict[str, Any]], ...] = (\n (Path, {'type': 'string', 'format': 'path'}),\n (datetime, {'type': 'string', 'format': 'date-time'}),\n (date, {'type': 'string', 'format': 'date'}),\n (time, {'type': 'string', 'format': 'time'}),\n (timedelta, {'type': 'number', 'format': 'time-delta'}),\n (IPv4Network, {'type': 'string', 'format': 'ipv4network'}),\n (IPv6Network, {'type': 'string', 'format': 'ipv6network'}),\n (IPv4Interface, {'type': 'string', 'format': 'ipv4interface'}),\n (IPv6Interface, {'type': 'string', 'format': 'ipv6interface'}),\n (IPv4Address, {'type': 'string', 'format': 'ipv4'}),\n (IPv6Address, {'type': 'string', 'format': 'ipv6'}),\n (Pattern, {'type': 'string', 'format': 'regex'}),\n (str, {'type': 'string'}),\n (bytes, {'type': 'string', 'format': 'binary'}),\n (bool, {'type': 'boolean'}),\n (int, {'type': 'integer'}),\n (float, {'type': 'number'}),\n (Decimal, {'type': 'number'}),\n (UUID, {'type': 'string', 'format': 'uuid'}),\n (dict, {'type': 'object'}),\n (list, {'type': 'array', 'items': {}}),\n (tuple, {'type': 'array', 'items': {}}),\n (set, {'type': 'array', 'items': {}, 'uniqueItems': True}),\n (frozenset, {'type': 'array', 'items': {}, 'uniqueItems': True}),\n)\n\njson_scheme = {'type': 'string', 'format': 'json-string'}\n\n\ndef add_field_type_to_schema(field_type: Any, schema: Dict[str, Any]) -> None:\n \"\"\"\n Update the given `schema` with the type-specific metadata for the given `field_type`.\n\n This function looks through `field_class_to_schema` for a class that matches the given `field_type`,\n and then modifies the given `schema` with the information from that type.\n \"\"\"\n for type_, t_schema in field_class_to_schema:\n # Fallback for `typing.Pattern` as it is not a valid class\n if lenient_issubclass(field_type, type_) or field_type is type_ is Pattern:\n schema.update(t_schema)\n break\n\n\ndef get_schema_ref(name: str, ref_prefix: Optional[str], ref_template: str, schema_overrides: bool) -> Dict[str, Any]:\n if ref_prefix:\n schema_ref = {'$ref': ref_prefix + name}\n else:\n schema_ref = {'$ref': ref_template.format(model=name)}\n return {'allOf': [schema_ref]} if schema_overrides else schema_ref\n\n\ndef field_singleton_schema( # noqa: C901 (ignore complexity)\n field: ModelField,\n *,\n by_alias: bool,\n model_name_map: Dict[TypeModelOrEnum, str],\n ref_template: str,\n schema_overrides: bool = False,\n ref_prefix: Optional[str] = None,\n known_models: TypeModelSet,\n) -> Tuple[Dict[str, Any], Dict[str, Any], Set[str]]:\n \"\"\"\n This function is indirectly used by ``field_schema()``, you should probably be using that function.\n\n Take a single Pydantic ``ModelField``, and return its schema and any additional definitions from sub-models.\n \"\"\"\n from .main import BaseModel # noqa: F811\n\n definitions: Dict[str, Any] = {}\n nested_models: Set[str] = set()\n if field.sub_fields:\n return field_singleton_sub_fields_schema(\n field.sub_fields,\n by_alias=by_alias,\n model_name_map=model_name_map,\n schema_overrides=schema_overrides,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models,\n )\n if field.type_ is Any or field.type_.__class__ == TypeVar:\n return {}, definitions, nested_models # no restrictions\n if field.type_ in NONE_TYPES:\n return {'type': 'null'}, definitions, nested_models\n if is_callable_type(field.type_):\n raise SkipField(f'Callable {field.name} was excluded from schema since JSON schema has no equivalent type.')\n f_schema: Dict[str, Any] = {}\n if field.field_info is not None and field.field_info.const:\n f_schema['const'] = field.default\n field_type = field.type_\n if is_literal_type(field_type):\n values = literal_values(field_type)\n if len(values) > 1:\n return field_schema(\n multivalue_literal_field_for_schema(values, field),\n by_alias=by_alias,\n model_name_map=model_name_map,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models,\n )\n literal_value = values[0]\n field_type = literal_value.__class__\n f_schema['const'] = literal_value\n\n if lenient_issubclass(field_type, Enum):\n enum_name = model_name_map[field_type]\n f_schema, schema_overrides = get_field_info_schema(field)\n f_schema.update(get_schema_ref(enum_name, ref_prefix, ref_template, schema_overrides))\n definitions[enum_name] = enum_process_schema(field_type)\n else:\n add_field_type_to_schema(field_type, f_schema)\n\n modify_schema = getattr(field_type, '__modify_schema__', None)\n if modify_schema:\n modify_schema(f_schema)\n\n if f_schema:\n return f_schema, definitions, nested_models\n\n # Handle dataclass-based models\n if lenient_issubclass(getattr(field_type, '__pydantic_model__', None), BaseModel):\n field_type = field_type.__pydantic_model__\n\n if issubclass(field_type, BaseModel):\n model_name = model_name_map[field_type]\n if field_type not in known_models:\n sub_schema, sub_definitions, sub_nested_models = model_process_schema(\n field_type,\n by_alias=by_alias,\n model_name_map=model_name_map,\n ref_prefix=ref_prefix,\n ref_template=ref_template,\n known_models=known_models,\n )\n definitions.update(sub_definitions)\n definitions[model_name] = sub_schema\n nested_models.update(sub_nested_models)\n else:\n nested_models.add(model_name)\n schema_ref = get_schema_ref(model_name, ref_prefix, ref_template, schema_overrides)\n return schema_ref, definitions, nested_models\n\n raise ValueError(f'Value not declarable with JSON Schema, field: {field}')\n\n\ndef multivalue_literal_field_for_schema(values: Tuple[Any, ...], field: ModelField) -> ModelField:\n return ModelField(\n name=field.name,\n type_=Union[tuple(Literal[value] for value in values)], # type: ignore\n class_validators=field.class_validators,\n model_config=field.model_config,\n default=field.default,\n required=field.required,\n alias=field.alias,\n field_info=field.field_info,\n )\n\n\ndef encode_default(dft: Any) -> Any:\n if isinstance(dft, (int, float, str)):\n return dft\n elif sequence_like(dft):\n t = dft.__class__\n return t(encode_default(v) for v in dft)\n elif isinstance(dft, dict):\n return {encode_default(k): encode_default(v) for k, v in dft.items()}\n elif dft is None:\n return None\n else:\n return pydantic_encoder(dft)\n\n\n_map_types_constraint: Dict[Any, Callable[..., type]] = {int: conint, float: confloat, Decimal: condecimal}\n_field_constraints = {\n 'min_length',\n 'max_length',\n 'regex',\n 'gt',\n 'lt',\n 'ge',\n 'le',\n 'multiple_of',\n 'min_items',\n 'max_items',\n}\n\n\ndef get_annotation_from_field_info(annotation: Any, field_info: FieldInfo, field_name: str) -> Type[Any]: # noqa: C901\n \"\"\"\n Get an annotation with validation implemented for numbers and strings based on the field_info.\n\n :param annotation: an annotation from a field specification, as ``str``, ``ConstrainedStr``\n :param field_info: an instance of FieldInfo, possibly with declarations for validations and JSON Schema\n :param field_name: name of the field for use in error messages\n :return: the same ``annotation`` if unmodified or a new annotation with validation in place\n \"\"\"\n constraints = {f for f in _field_constraints if getattr(field_info, f) is not None}\n if not constraints:\n return annotation\n used_constraints: Set[str] = set()\n\n def go(type_: Any) -> Type[Any]:\n if (\n is_literal_type(annotation)\n or isinstance(type_, ForwardRef)\n or lenient_issubclass(type_, (ConstrainedList, ConstrainedSet))\n ):\n return type_\n origin = get_origin(type_)\n if origin is not None:\n args: Tuple[Any, ...] = get_args(type_)\n if any(isinstance(a, ForwardRef) for a in args):\n # forward refs cause infinite recursion below\n return type_\n\n if origin is Union:\n return Union[tuple(go(a) for a in args)] # type: ignore\n\n if issubclass(origin, List) and (field_info.min_items is not None or field_info.max_items is not None):\n used_constraints.update({'min_items', 'max_items'})\n return conlist(go(args[0]), min_items=field_info.min_items, max_items=field_info.max_items)\n\n if issubclass(origin, Set) and (field_info.min_items is not None or field_info.max_items is not None):\n used_constraints.update({'min_items', 'max_items'})\n return conset(go(args[0]), min_items=field_info.min_items, max_items=field_info.max_items)\n\n for t in (Tuple, List, Set, FrozenSet, Sequence):\n if issubclass(origin, t): # type: ignore\n return t[tuple(go(a) for a in args)] # type: ignore\n\n if issubclass(origin, Dict):\n return Dict[args[0], go(args[1])] # type: ignore\n\n attrs: Optional[Tuple[str, ...]] = None\n constraint_func: Optional[Callable[..., type]] = None\n if isinstance(type_, type):\n if issubclass(type_, (SecretStr, SecretBytes)):\n attrs = ('max_length', 'min_length')\n\n def constraint_func(**kwargs: Any) -> Type[Any]:\n return type(type_.__name__, (type_,), kwargs)\n\n elif issubclass(type_, str) and not issubclass(type_, (EmailStr, AnyUrl, ConstrainedStr)):\n attrs = ('max_length', 'min_length', 'regex')\n constraint_func = constr\n elif issubclass(type_, bytes):\n attrs = ('max_length', 'min_length', 'regex')\n constraint_func = conbytes\n elif issubclass(type_, numeric_types) and not issubclass(\n type_, (ConstrainedInt, ConstrainedFloat, ConstrainedDecimal, ConstrainedList, ConstrainedSet, bool)\n ):\n # Is numeric type\n attrs = ('gt', 'lt', 'ge', 'le', 'multiple_of')\n numeric_type = next(t for t in numeric_types if issubclass(type_, t)) # pragma: no branch\n constraint_func = _map_types_constraint[numeric_type]\n\n if attrs:\n used_constraints.update(set(attrs))\n kwargs = {\n attr_name: attr\n for attr_name, attr in ((attr_name, getattr(field_info, attr_name)) for attr_name in attrs)\n if attr is not None\n }\n if kwargs:\n constraint_func = cast(Callable[..., type], constraint_func)\n return constraint_func(**kwargs)\n return type_\n\n ans = go(annotation)\n\n unused_constraints = constraints - used_constraints\n if unused_constraints:\n raise ValueError(\n f'On field \"{field_name}\" the following field constraints are set but not enforced: '\n f'{\", \".join(unused_constraints)}. '\n f'\\nFor more details see https://pydantic-docs.helpmanual.io/usage/schema/#unenforced-field-constraints'\n )\n\n return ans\n\n\ndef normalize_name(name: str) -> str:\n \"\"\"\n Normalizes the given name. This can be applied to either a model *or* enum.\n \"\"\"\n return re.sub(r'[^a-zA-Z0-9.\\-_]', '_', name)\n\n\nclass SkipField(Exception):\n \"\"\"\n Utility exception used to exclude fields from schema.\n \"\"\"\n\n def __init__(self, message: str) -> None:\n self.message = message\n", "path": "pydantic/schema.py" } ]
diff --git a/changes/1912-JSextonn.md b/changes/1912-JSextonn.md new file mode 100644 index 00000000000..5225db4ba25 --- /dev/null +++ b/changes/1912-JSextonn.md @@ -0,0 +1 @@ +Fixed issue causing KeyError to be raised when building schema from multiple `BaseModel` with the same names declared in separate classes. \ No newline at end of file diff --git a/pydantic/schema.py b/pydantic/schema.py index cf4dc4c7b88..a83e87c5bee 100644 --- a/pydantic/schema.py +++ b/pydantic/schema.py @@ -404,7 +404,7 @@ def get_flat_models_from_models(models: Sequence[Type['BaseModel']]) -> TypeMode def get_long_model_name(model: TypeModelOrEnum) -> str: - return f'{model.__module__}__{model.__name__}'.replace('.', '__') + return f'{model.__module__}__{model.__qualname__}'.replace('.', '__') def field_type_schema( diff --git a/tests/test_schema.py b/tests/test_schema.py index 3566716233e..4635429e0e6 100644 --- a/tests/test_schema.py +++ b/tests/test_schema.py @@ -2099,6 +2099,44 @@ class Model(BaseModel): } +def test_multiple_models_with_same_name(create_module): + module = create_module( + # language=Python + """ +from pydantic import BaseModel + + +class ModelOne(BaseModel): + class NestedModel(BaseModel): + a: float + + nested: NestedModel + + +class ModelTwo(BaseModel): + class NestedModel(BaseModel): + b: float + + nested: NestedModel + + +class NestedModel(BaseModel): + c: float + """ + ) + + models = [module.ModelOne, module.ModelTwo, module.NestedModel] + model_names = set(schema(models)['definitions'].keys()) + expected_model_names = { + 'ModelOne', + 'ModelTwo', + f'{module.__name__}__ModelOne__NestedModel', + f'{module.__name__}__ModelTwo__NestedModel', + f'{module.__name__}__NestedModel', + } + assert model_names == expected_model_names + + def test_multiple_enums_with_same_name(create_module): module_1 = create_module( # language=Python
talonhub__community-978
[ { "content": "from talon import Context, Module, actions, app\n\ndefault_alphabet = \"air bat cap drum each fine gust harp sit jury crunch look made near odd pit quench red sun trap urge vest whale plex yank zip\".split(\n \" \"\n)\nletters_string = \"abcdefghijklmnopqrstuvwxyz\"\n\ndefault_digits = \"zero one two three four five six seven eight nine\".split(\" \")\nnumbers = [str(i) for i in range(10)]\ndefault_f_digits = (\n \"one two three four five six seven eight nine ten eleven twelve\".split(\" \")\n)\n\nmod = Module()\nmod.list(\"letter\", desc=\"The spoken phonetic alphabet\")\nmod.list(\"symbol_key\", desc=\"All symbols from the keyboard\")\nmod.list(\"arrow_key\", desc=\"All arrow keys\")\nmod.list(\"number_key\", desc=\"All number keys\")\nmod.list(\"modifier_key\", desc=\"All modifier keys\")\nmod.list(\"function_key\", desc=\"All function keys\")\nmod.list(\"special_key\", desc=\"All special keys\")\nmod.list(\"punctuation\", desc=\"words for inserting punctuation into text\")\n\n\n@mod.capture(rule=\"{self.modifier_key}+\")\ndef modifiers(m) -> str:\n \"One or more modifier keys\"\n return \"-\".join(m.modifier_key_list)\n\n\n@mod.capture(rule=\"{self.arrow_key}\")\ndef arrow_key(m) -> str:\n \"One directional arrow key\"\n return m.arrow_key\n\n\n@mod.capture(rule=\"<self.arrow_key>+\")\ndef arrow_keys(m) -> str:\n \"One or more arrow keys separated by a space\"\n return str(m)\n\n\n@mod.capture(rule=\"{self.number_key}\")\ndef number_key(m) -> str:\n \"One number key\"\n return m.number_key\n\n\n@mod.capture(rule=\"{self.letter}\")\ndef letter(m) -> str:\n \"One letter key\"\n return m.letter\n\n\n@mod.capture(rule=\"{self.special_key}\")\ndef special_key(m) -> str:\n \"One special key\"\n return m.special_key\n\n\n@mod.capture(rule=\"{self.symbol_key}\")\ndef symbol_key(m) -> str:\n \"One symbol key\"\n return m.symbol_key\n\n\n@mod.capture(rule=\"{self.function_key}\")\ndef function_key(m) -> str:\n \"One function key\"\n return m.function_key\n\n\n@mod.capture(rule=\"( <self.letter> | <self.number_key> | <self.symbol_key> )\")\ndef any_alphanumeric_key(m) -> str:\n \"any alphanumeric key\"\n return str(m)\n\n\n@mod.capture(\n rule=\"( <self.letter> | <self.number_key> | <self.symbol_key> \"\n \"| <self.arrow_key> | <self.function_key> | <self.special_key> )\"\n)\ndef unmodified_key(m) -> str:\n \"A single key with no modifiers\"\n return str(m)\n\n\n@mod.capture(rule=\"{self.modifier_key}* <self.unmodified_key>\")\ndef key(m) -> str:\n \"A single key with optional modifiers\"\n try:\n mods = m.modifier_key_list\n except AttributeError:\n mods = []\n return \"-\".join(mods + [m.unmodified_key])\n\n\n@mod.capture(rule=\"<self.key>+\")\ndef keys(m) -> str:\n \"A sequence of one or more keys with optional modifiers\"\n return \" \".join(m.key_list)\n\n\n@mod.capture(rule=\"{self.letter}+\")\ndef letters(m) -> str:\n \"Multiple letter keys\"\n return \"\".join(m.letter_list)\n\n\nctx = Context()\nmodifier_keys = {\n # If you find 'alt' is often misrecognized, try using 'alter'.\n \"alt\": \"alt\", #'alter': 'alt',\n \"control\": \"ctrl\", #'troll': 'ctrl',\n \"shift\": \"shift\", #'sky': 'shift',\n \"super\": \"super\",\n}\nif app.platform == \"mac\":\n modifier_keys[\"command\"] = \"cmd\"\n modifier_keys[\"option\"] = \"alt\"\nctx.lists[\"self.modifier_key\"] = modifier_keys\nalphabet = dict(zip(default_alphabet, letters_string))\nctx.lists[\"self.letter\"] = alphabet\n\n# `punctuation_words` is for words you want available BOTH in dictation and as key names in command mode.\n# `symbol_key_words` is for key names that should be available in command mode, but NOT during dictation.\npunctuation_words = {\n # TODO: I'm not sure why we need these, I think it has something to do with\n # Dragon. Possibly it has been fixed by later improvements to talon? -rntz\n \"`\": \"`\",\n \",\": \",\", # <== these things\n \"back tick\": \"`\",\n \"grave\": \"`\",\n \"comma\": \",\",\n \"period\": \".\",\n \"full stop\": \".\",\n \"semicolon\": \";\",\n \"colon\": \":\",\n \"forward slash\": \"/\",\n \"question mark\": \"?\",\n \"exclamation mark\": \"!\",\n \"exclamation point\": \"!\",\n \"asterisk\": \"*\",\n \"hash sign\": \"#\",\n \"number sign\": \"#\",\n \"percent sign\": \"%\",\n \"at sign\": \"@\",\n \"and sign\": \"&\",\n \"ampersand\": \"&\",\n # Currencies\n \"dollar sign\": \"$\",\n \"pound sign\": \"£\",\n}\nsymbol_key_words = {\n \"dot\": \".\",\n \"point\": \".\",\n \"quote\": \"'\",\n \"question\": \"?\",\n \"apostrophe\": \"'\",\n \"L square\": \"[\",\n \"left square\": \"[\",\n \"square\": \"[\",\n \"R square\": \"]\",\n \"right square\": \"]\",\n \"slash\": \"/\",\n \"backslash\": \"\\\\\",\n \"minus\": \"-\",\n \"dash\": \"-\",\n \"equals\": \"=\",\n \"plus\": \"+\",\n \"tilde\": \"~\",\n \"bang\": \"!\",\n \"down score\": \"_\",\n \"underscore\": \"_\",\n \"paren\": \"(\",\n \"L paren\": \"(\",\n \"left paren\": \"(\",\n \"R paren\": \")\",\n \"right paren\": \")\",\n \"brace\": \"{\",\n \"left brace\": \"{\",\n \"brack\": \"{\",\n \"bracket\": \"{\",\n \"left bracket\": \"{\",\n \"r brace\": \"}\",\n \"right brace\": \"}\",\n \"r brack\": \"}\",\n \"r bracket\": \"}\",\n \"right bracket\": \"}\",\n \"angle\": \"<\",\n \"left angle\": \"<\",\n \"less than\": \"<\",\n \"rangle\": \">\",\n \"R angle\": \">\",\n \"right angle\": \">\",\n \"greater than\": \">\",\n \"star\": \"*\",\n \"hash\": \"#\",\n \"percent\": \"%\",\n \"caret\": \"^\",\n \"amper\": \"&\",\n \"pipe\": \"|\",\n \"dubquote\": '\"',\n \"double quote\": '\"',\n # Currencies\n \"dollar\": \"$\",\n \"pound\": \"£\",\n}\n\n# make punctuation words also included in {user.symbol_keys}\nsymbol_key_words.update(punctuation_words)\nctx.lists[\"self.punctuation\"] = punctuation_words\nctx.lists[\"self.symbol_key\"] = symbol_key_words\nctx.lists[\"self.number_key\"] = dict(zip(default_digits, numbers))\nctx.lists[\"self.arrow_key\"] = {\n \"down\": \"down\",\n \"left\": \"left\",\n \"right\": \"right\",\n \"up\": \"up\",\n}\n\nsimple_keys = [\n \"end\",\n \"enter\",\n \"escape\",\n \"home\",\n \"insert\",\n \"pagedown\",\n \"pageup\",\n \"space\",\n \"tab\",\n]\n\nalternate_keys = {\n \"wipe\": \"backspace\",\n \"delete\": \"backspace\",\n #'junk': 'backspace',\n \"forward delete\": \"delete\",\n \"page up\": \"pageup\",\n \"page down\": \"pagedown\",\n}\n# mac apparently doesn't have the menu key.\nif app.platform in (\"windows\", \"linux\"):\n alternate_keys[\"menu key\"] = \"menu\"\n alternate_keys[\"print screen\"] = \"printscr\"\n\nspecial_keys = {k: k for k in simple_keys}\nspecial_keys.update(alternate_keys)\nctx.lists[\"self.special_key\"] = special_keys\nctx.lists[\"self.function_key\"] = {\n f\"F {default_f_digits[i]}\": f\"f{i + 1}\" for i in range(12)\n}\n\n\n@mod.action_class\nclass Actions:\n def move_cursor(s: str):\n \"\"\"Given a sequence of directions, eg. 'left left up', moves the cursor accordingly using edit.{left,right,up,down}.\"\"\"\n for d in s.split():\n if d in (\"left\", \"right\", \"up\", \"down\"):\n getattr(actions.edit, d)()\n else:\n raise RuntimeError(f\"invalid arrow key: {d}\")\n", "path": "code/keys.py" } ]
[ { "content": "from talon import Context, Module, actions, app\n\ndefault_alphabet = \"air bat cap drum each fine gust harp sit jury crunch look made near odd pit quench red sun trap urge vest whale plex yank zip\".split(\n \" \"\n)\nletters_string = \"abcdefghijklmnopqrstuvwxyz\"\n\ndefault_digits = \"zero one two three four five six seven eight nine\".split(\" \")\nnumbers = [str(i) for i in range(10)]\ndefault_f_digits = (\n \"one two three four five six seven eight nine ten eleven twelve\".split(\" \")\n)\n\nmod = Module()\nmod.list(\"letter\", desc=\"The spoken phonetic alphabet\")\nmod.list(\"symbol_key\", desc=\"All symbols from the keyboard\")\nmod.list(\"arrow_key\", desc=\"All arrow keys\")\nmod.list(\"number_key\", desc=\"All number keys\")\nmod.list(\"modifier_key\", desc=\"All modifier keys\")\nmod.list(\"function_key\", desc=\"All function keys\")\nmod.list(\"special_key\", desc=\"All special keys\")\nmod.list(\"punctuation\", desc=\"words for inserting punctuation into text\")\n\n\n@mod.capture(rule=\"{self.modifier_key}+\")\ndef modifiers(m) -> str:\n \"One or more modifier keys\"\n return \"-\".join(m.modifier_key_list)\n\n\n@mod.capture(rule=\"{self.arrow_key}\")\ndef arrow_key(m) -> str:\n \"One directional arrow key\"\n return m.arrow_key\n\n\n@mod.capture(rule=\"<self.arrow_key>+\")\ndef arrow_keys(m) -> str:\n \"One or more arrow keys separated by a space\"\n return str(m)\n\n\n@mod.capture(rule=\"{self.number_key}\")\ndef number_key(m) -> str:\n \"One number key\"\n return m.number_key\n\n\n@mod.capture(rule=\"{self.letter}\")\ndef letter(m) -> str:\n \"One letter key\"\n return m.letter\n\n\n@mod.capture(rule=\"{self.special_key}\")\ndef special_key(m) -> str:\n \"One special key\"\n return m.special_key\n\n\n@mod.capture(rule=\"{self.symbol_key}\")\ndef symbol_key(m) -> str:\n \"One symbol key\"\n return m.symbol_key\n\n\n@mod.capture(rule=\"{self.function_key}\")\ndef function_key(m) -> str:\n \"One function key\"\n return m.function_key\n\n\n@mod.capture(rule=\"( <self.letter> | <self.number_key> | <self.symbol_key> )\")\ndef any_alphanumeric_key(m) -> str:\n \"any alphanumeric key\"\n return str(m)\n\n\n@mod.capture(\n rule=\"( <self.letter> | <self.number_key> | <self.symbol_key> \"\n \"| <self.arrow_key> | <self.function_key> | <self.special_key> )\"\n)\ndef unmodified_key(m) -> str:\n \"A single key with no modifiers\"\n return str(m)\n\n\n@mod.capture(rule=\"{self.modifier_key}* <self.unmodified_key>\")\ndef key(m) -> str:\n \"A single key with optional modifiers\"\n try:\n mods = m.modifier_key_list\n except AttributeError:\n mods = []\n return \"-\".join(mods + [m.unmodified_key])\n\n\n@mod.capture(rule=\"<self.key>+\")\ndef keys(m) -> str:\n \"A sequence of one or more keys with optional modifiers\"\n return \" \".join(m.key_list)\n\n\n@mod.capture(rule=\"{self.letter}+\")\ndef letters(m) -> str:\n \"Multiple letter keys\"\n return \"\".join(m.letter_list)\n\n\nctx = Context()\nmodifier_keys = {\n # If you find 'alt' is often misrecognized, try using 'alter'.\n \"alt\": \"alt\", #'alter': 'alt',\n \"control\": \"ctrl\", #'troll': 'ctrl',\n \"shift\": \"shift\", #'sky': 'shift',\n \"super\": \"super\",\n}\nif app.platform == \"mac\":\n modifier_keys[\"command\"] = \"cmd\"\n modifier_keys[\"option\"] = \"alt\"\nctx.lists[\"self.modifier_key\"] = modifier_keys\nalphabet = dict(zip(default_alphabet, letters_string))\nctx.lists[\"self.letter\"] = alphabet\n\n# `punctuation_words` is for words you want available BOTH in dictation and as key names in command mode.\n# `symbol_key_words` is for key names that should be available in command mode, but NOT during dictation.\npunctuation_words = {\n # TODO: I'm not sure why we need these, I think it has something to do with\n # Dragon. Possibly it has been fixed by later improvements to talon? -rntz\n \"`\": \"`\",\n \",\": \",\", # <== these things\n \"back tick\": \"`\",\n \"grave\": \"`\",\n \"comma\": \",\",\n # Workaround for issue with conformer b-series; see #946\n \"coma\": \",\",\n \"period\": \".\",\n \"full stop\": \".\",\n \"semicolon\": \";\",\n \"colon\": \":\",\n \"forward slash\": \"/\",\n \"question mark\": \"?\",\n \"exclamation mark\": \"!\",\n \"exclamation point\": \"!\",\n \"asterisk\": \"*\",\n \"hash sign\": \"#\",\n \"number sign\": \"#\",\n \"percent sign\": \"%\",\n \"at sign\": \"@\",\n \"and sign\": \"&\",\n \"ampersand\": \"&\",\n # Currencies\n \"dollar sign\": \"$\",\n \"pound sign\": \"£\",\n}\nsymbol_key_words = {\n \"dot\": \".\",\n \"point\": \".\",\n \"quote\": \"'\",\n \"question\": \"?\",\n \"apostrophe\": \"'\",\n \"L square\": \"[\",\n \"left square\": \"[\",\n \"square\": \"[\",\n \"R square\": \"]\",\n \"right square\": \"]\",\n \"slash\": \"/\",\n \"backslash\": \"\\\\\",\n \"minus\": \"-\",\n \"dash\": \"-\",\n \"equals\": \"=\",\n \"plus\": \"+\",\n \"tilde\": \"~\",\n \"bang\": \"!\",\n \"down score\": \"_\",\n \"underscore\": \"_\",\n \"paren\": \"(\",\n \"L paren\": \"(\",\n \"left paren\": \"(\",\n \"R paren\": \")\",\n \"right paren\": \")\",\n \"brace\": \"{\",\n \"left brace\": \"{\",\n \"brack\": \"{\",\n \"bracket\": \"{\",\n \"left bracket\": \"{\",\n \"r brace\": \"}\",\n \"right brace\": \"}\",\n \"r brack\": \"}\",\n \"r bracket\": \"}\",\n \"right bracket\": \"}\",\n \"angle\": \"<\",\n \"left angle\": \"<\",\n \"less than\": \"<\",\n \"rangle\": \">\",\n \"R angle\": \">\",\n \"right angle\": \">\",\n \"greater than\": \">\",\n \"star\": \"*\",\n \"hash\": \"#\",\n \"percent\": \"%\",\n \"caret\": \"^\",\n \"amper\": \"&\",\n \"pipe\": \"|\",\n \"dubquote\": '\"',\n \"double quote\": '\"',\n # Currencies\n \"dollar\": \"$\",\n \"pound\": \"£\",\n}\n\n# make punctuation words also included in {user.symbol_keys}\nsymbol_key_words.update(punctuation_words)\nctx.lists[\"self.punctuation\"] = punctuation_words\nctx.lists[\"self.symbol_key\"] = symbol_key_words\nctx.lists[\"self.number_key\"] = dict(zip(default_digits, numbers))\nctx.lists[\"self.arrow_key\"] = {\n \"down\": \"down\",\n \"left\": \"left\",\n \"right\": \"right\",\n \"up\": \"up\",\n}\n\nsimple_keys = [\n \"end\",\n \"enter\",\n \"escape\",\n \"home\",\n \"insert\",\n \"pagedown\",\n \"pageup\",\n \"space\",\n \"tab\",\n]\n\nalternate_keys = {\n \"wipe\": \"backspace\",\n \"delete\": \"backspace\",\n #'junk': 'backspace',\n \"forward delete\": \"delete\",\n \"page up\": \"pageup\",\n \"page down\": \"pagedown\",\n}\n# mac apparently doesn't have the menu key.\nif app.platform in (\"windows\", \"linux\"):\n alternate_keys[\"menu key\"] = \"menu\"\n alternate_keys[\"print screen\"] = \"printscr\"\n\nspecial_keys = {k: k for k in simple_keys}\nspecial_keys.update(alternate_keys)\nctx.lists[\"self.special_key\"] = special_keys\nctx.lists[\"self.function_key\"] = {\n f\"F {default_f_digits[i]}\": f\"f{i + 1}\" for i in range(12)\n}\n\n\n@mod.action_class\nclass Actions:\n def move_cursor(s: str):\n \"\"\"Given a sequence of directions, eg. 'left left up', moves the cursor accordingly using edit.{left,right,up,down}.\"\"\"\n for d in s.split():\n if d in (\"left\", \"right\", \"up\", \"down\"):\n getattr(actions.edit, d)()\n else:\n raise RuntimeError(f\"invalid arrow key: {d}\")\n", "path": "code/keys.py" } ]
diff --git a/code/keys.py b/code/keys.py index 5be25dd4e3..00654a2f2c 100644 --- a/code/keys.py +++ b/code/keys.py @@ -132,6 +132,8 @@ def letters(m) -> str: "back tick": "`", "grave": "`", "comma": ",", + # Workaround for issue with conformer b-series; see #946 + "coma": ",", "period": ".", "full stop": ".", "semicolon": ";",
PaddlePaddle__models-2832
[ { "content": "\"\"\"Trainer for ICNet model.\"\"\"\nfrom __future__ import absolute_import\nfrom __future__ import division\nfrom __future__ import print_function\nfrom icnet import icnet\nimport cityscape\nimport argparse\nimport functools\nimport sys\nimport os\nimport time\nimport paddle.fluid as fluid\nimport numpy as np\nfrom utils import add_arguments, print_arguments, get_feeder_data, check_gpu\nfrom paddle.fluid.layers.learning_rate_scheduler import _decay_step_counter\nfrom paddle.fluid.initializer import init_on_cpu\n\nif 'ce_mode' in os.environ:\n np.random.seed(10)\n fluid.default_startup_program().random_seed = 90\n\nparser = argparse.ArgumentParser(description=__doc__)\nadd_arg = functools.partial(add_arguments, argparser=parser)\n# yapf: disable\nadd_arg('batch_size', int, 16, \"Minibatch size.\")\nadd_arg('checkpoint_path', str, None, \"Checkpoint svae path.\")\nadd_arg('init_model', str, None, \"Pretrain model path.\")\nadd_arg('use_gpu', bool, True, \"Whether use GPU to train.\")\nadd_arg('random_mirror', bool, True, \"Whether prepare by random mirror.\")\nadd_arg('random_scaling', bool, True, \"Whether prepare by random scaling.\")\n# yapf: enable\n\nLAMBDA1 = 0.16\nLAMBDA2 = 0.4\nLAMBDA3 = 1.0\nLEARNING_RATE = 0.003\nPOWER = 0.9\nLOG_PERIOD = 100\nCHECKPOINT_PERIOD = 100\nTOTAL_STEP = 100\n\nno_grad_set = []\n\n\ndef create_loss(predict, label, mask, num_classes):\n predict = fluid.layers.transpose(predict, perm=[0, 2, 3, 1])\n predict = fluid.layers.reshape(predict, shape=[-1, num_classes])\n label = fluid.layers.reshape(label, shape=[-1, 1])\n predict = fluid.layers.gather(predict, mask)\n label = fluid.layers.gather(label, mask)\n label = fluid.layers.cast(label, dtype=\"int64\")\n loss = fluid.layers.softmax_with_cross_entropy(predict, label)\n no_grad_set.append(label.name)\n return fluid.layers.reduce_mean(loss)\n\n\ndef poly_decay():\n global_step = _decay_step_counter()\n with init_on_cpu():\n decayed_lr = LEARNING_RATE * (fluid.layers.pow(\n (1 - global_step / TOTAL_STEP), POWER))\n return decayed_lr\n\n\ndef train(args):\n data_shape = cityscape.train_data_shape()\n num_classes = cityscape.num_classes()\n # define network\n images = fluid.layers.data(name='image', shape=data_shape, dtype='float32')\n label_sub1 = fluid.layers.data(name='label_sub1', shape=[1], dtype='int32')\n label_sub2 = fluid.layers.data(name='label_sub2', shape=[1], dtype='int32')\n label_sub4 = fluid.layers.data(name='label_sub4', shape=[1], dtype='int32')\n mask_sub1 = fluid.layers.data(name='mask_sub1', shape=[-1], dtype='int32')\n mask_sub2 = fluid.layers.data(name='mask_sub2', shape=[-1], dtype='int32')\n mask_sub4 = fluid.layers.data(name='mask_sub4', shape=[-1], dtype='int32')\n\n sub4_out, sub24_out, sub124_out = icnet(\n images, num_classes, np.array(data_shape[1:]).astype(\"float32\"))\n loss_sub4 = create_loss(sub4_out, label_sub4, mask_sub4, num_classes)\n loss_sub24 = create_loss(sub24_out, label_sub2, mask_sub2, num_classes)\n loss_sub124 = create_loss(sub124_out, label_sub1, mask_sub1, num_classes)\n reduced_loss = LAMBDA1 * loss_sub4 + LAMBDA2 * loss_sub24 + LAMBDA3 * loss_sub124\n\n regularizer = fluid.regularizer.L2Decay(0.0001)\n optimizer = fluid.optimizer.Momentum(\n learning_rate=poly_decay(), momentum=0.9, regularization=regularizer)\n _, params_grads = optimizer.minimize(reduced_loss, no_grad_set=no_grad_set)\n\n # prepare environment\n place = fluid.CPUPlace()\n if args.use_gpu:\n place = fluid.CUDAPlace(0)\n exe = fluid.Executor(place)\n\n exe.run(fluid.default_startup_program())\n\n if args.init_model is not None:\n print(\"load model from: %s\" % args.init_model)\n\n def if_exist(var):\n return os.path.exists(os.path.join(args.init_model, var.name))\n\n fluid.io.load_vars(exe, args.init_model, predicate=if_exist)\n\n iter_id = 0\n t_loss = 0.\n sub4_loss = 0.\n sub24_loss = 0.\n sub124_loss = 0.\n train_reader = cityscape.train(\n args.batch_size, flip=args.random_mirror, scaling=args.random_scaling)\n start_time = time.time()\n while True:\n # train a pass\n for data in train_reader():\n if iter_id > TOTAL_STEP:\n end_time = time.time()\n print(\"kpis\ttrain_duration\t%f\" % (end_time - start_time))\n return\n iter_id += 1\n results = exe.run(\n feed=get_feeder_data(data, place),\n fetch_list=[reduced_loss, loss_sub4, loss_sub24, loss_sub124])\n t_loss += results[0]\n sub4_loss += results[1]\n sub24_loss += results[2]\n sub124_loss += results[3]\n # training log\n if iter_id % LOG_PERIOD == 0:\n print(\n \"Iter[%d]; train loss: %.3f; sub4_loss: %.3f; sub24_loss: %.3f; sub124_loss: %.3f\"\n % (iter_id, t_loss / LOG_PERIOD, sub4_loss / LOG_PERIOD,\n sub24_loss / LOG_PERIOD, sub124_loss / LOG_PERIOD))\n print(\"kpis\ttrain_cost\t%f\" % (t_loss / LOG_PERIOD))\n\n t_loss = 0.\n sub4_loss = 0.\n sub24_loss = 0.\n sub124_loss = 0.\n sys.stdout.flush()\n\n if iter_id % CHECKPOINT_PERIOD == 0 and args.checkpoint_path is not None:\n dir_name = args.checkpoint_path + \"/\" + str(iter_id)\n fluid.io.save_persistables(exe, dirname=dir_name)\n print(\"Saved checkpoint: %s\" % (dir_name))\n\n\ndef main():\n args = parser.parse_args()\n print_arguments(args)\n check_gpu(args.use_gpu)\n train(args)\n\n\nif __name__ == \"__main__\":\n main()\n", "path": "PaddleCV/icnet/train.py" } ]
[ { "content": "\"\"\"Trainer for ICNet model.\"\"\"\nfrom __future__ import absolute_import\nfrom __future__ import division\nfrom __future__ import print_function\nfrom icnet import icnet\nimport cityscape\nimport argparse\nimport functools\nimport sys\nimport os\nimport time\nimport paddle.fluid as fluid\nimport numpy as np\nfrom utils import add_arguments, print_arguments, get_feeder_data, check_gpu\nfrom paddle.fluid.layers.learning_rate_scheduler import _decay_step_counter\nfrom paddle.fluid.initializer import init_on_cpu\n\nif 'ce_mode' in os.environ:\n np.random.seed(10)\n fluid.default_startup_program().random_seed = 90\n\nparser = argparse.ArgumentParser(description=__doc__)\nadd_arg = functools.partial(add_arguments, argparser=parser)\n# yapf: disable\nadd_arg('batch_size', int, 16, \"Minibatch size.\")\nadd_arg('checkpoint_path', str, None, \"Checkpoint svae path.\")\nadd_arg('init_model', str, None, \"Pretrain model path.\")\nadd_arg('use_gpu', bool, True, \"Whether use GPU to train.\")\nadd_arg('random_mirror', bool, True, \"Whether prepare by random mirror.\")\nadd_arg('random_scaling', bool, True, \"Whether prepare by random scaling.\")\n# yapf: enable\n\nLAMBDA1 = 0.16\nLAMBDA2 = 0.4\nLAMBDA3 = 1.0\nLEARNING_RATE = 0.003\nPOWER = 0.9\nLOG_PERIOD = 1\nCHECKPOINT_PERIOD = 1000\nTOTAL_STEP = 60000\nif 'ce_mode' in os.environ:\n TOTAL_STEP = 100\n\nno_grad_set = []\n\n\ndef create_loss(predict, label, mask, num_classes):\n predict = fluid.layers.transpose(predict, perm=[0, 2, 3, 1])\n predict = fluid.layers.reshape(predict, shape=[-1, num_classes])\n label = fluid.layers.reshape(label, shape=[-1, 1])\n predict = fluid.layers.gather(predict, mask)\n label = fluid.layers.gather(label, mask)\n label = fluid.layers.cast(label, dtype=\"int64\")\n loss = fluid.layers.softmax_with_cross_entropy(predict, label)\n no_grad_set.append(label.name)\n return fluid.layers.reduce_mean(loss)\n\n\ndef poly_decay():\n global_step = _decay_step_counter()\n with init_on_cpu():\n decayed_lr = LEARNING_RATE * (fluid.layers.pow(\n (1 - global_step / TOTAL_STEP), POWER))\n return decayed_lr\n\n\ndef train(args):\n data_shape = cityscape.train_data_shape()\n num_classes = cityscape.num_classes()\n # define network\n images = fluid.layers.data(name='image', shape=data_shape, dtype='float32')\n label_sub1 = fluid.layers.data(name='label_sub1', shape=[1], dtype='int32')\n label_sub2 = fluid.layers.data(name='label_sub2', shape=[1], dtype='int32')\n label_sub4 = fluid.layers.data(name='label_sub4', shape=[1], dtype='int32')\n mask_sub1 = fluid.layers.data(name='mask_sub1', shape=[-1], dtype='int32')\n mask_sub2 = fluid.layers.data(name='mask_sub2', shape=[-1], dtype='int32')\n mask_sub4 = fluid.layers.data(name='mask_sub4', shape=[-1], dtype='int32')\n\n sub4_out, sub24_out, sub124_out = icnet(\n images, num_classes, np.array(data_shape[1:]).astype(\"float32\"))\n loss_sub4 = create_loss(sub4_out, label_sub4, mask_sub4, num_classes)\n loss_sub24 = create_loss(sub24_out, label_sub2, mask_sub2, num_classes)\n loss_sub124 = create_loss(sub124_out, label_sub1, mask_sub1, num_classes)\n reduced_loss = LAMBDA1 * loss_sub4 + LAMBDA2 * loss_sub24 + LAMBDA3 * loss_sub124\n\n regularizer = fluid.regularizer.L2Decay(0.0001)\n optimizer = fluid.optimizer.Momentum(\n learning_rate=poly_decay(), momentum=0.9, regularization=regularizer)\n _, params_grads = optimizer.minimize(reduced_loss, no_grad_set=no_grad_set)\n\n # prepare environment\n place = fluid.CPUPlace()\n if args.use_gpu:\n place = fluid.CUDAPlace(0)\n exe = fluid.Executor(place)\n\n exe.run(fluid.default_startup_program())\n\n if args.init_model is not None:\n print(\"load model from: %s\" % args.init_model)\n\n def if_exist(var):\n return os.path.exists(os.path.join(args.init_model, var.name))\n\n fluid.io.load_vars(exe, args.init_model, predicate=if_exist)\n\n iter_id = 0\n t_loss = 0.\n sub4_loss = 0.\n sub24_loss = 0.\n sub124_loss = 0.\n train_reader = cityscape.train(\n args.batch_size, flip=args.random_mirror, scaling=args.random_scaling)\n start_time = time.time()\n while True:\n # train a pass\n for data in train_reader():\n if iter_id > TOTAL_STEP:\n end_time = time.time()\n print(\"kpis\ttrain_duration\t%f\" % (end_time - start_time))\n return\n iter_id += 1\n results = exe.run(\n feed=get_feeder_data(data, place),\n fetch_list=[reduced_loss, loss_sub4, loss_sub24, loss_sub124])\n t_loss += results[0]\n sub4_loss += results[1]\n sub24_loss += results[2]\n sub124_loss += results[3]\n # training log\n if iter_id % LOG_PERIOD == 0:\n print(\n \"Iter[%d]; train loss: %.3f; sub4_loss: %.3f; sub24_loss: %.3f; sub124_loss: %.3f\"\n % (iter_id, t_loss / LOG_PERIOD, sub4_loss / LOG_PERIOD,\n sub24_loss / LOG_PERIOD, sub124_loss / LOG_PERIOD))\n print(\"kpis\ttrain_cost\t%f\" % (t_loss / LOG_PERIOD))\n\n t_loss = 0.\n sub4_loss = 0.\n sub24_loss = 0.\n sub124_loss = 0.\n sys.stdout.flush()\n\n if iter_id % CHECKPOINT_PERIOD == 0 and args.checkpoint_path is not None:\n dir_name = args.checkpoint_path + \"/\" + str(iter_id)\n fluid.io.save_persistables(exe, dirname=dir_name)\n print(\"Saved checkpoint: %s\" % (dir_name))\n\n\ndef main():\n args = parser.parse_args()\n print_arguments(args)\n check_gpu(args.use_gpu)\n train(args)\n\n\nif __name__ == \"__main__\":\n main()\n", "path": "PaddleCV/icnet/train.py" } ]
diff --git a/PaddleCV/icnet/README.md b/PaddleCV/icnet/README.md index 4698a41c89..4858cae779 100644 --- a/PaddleCV/icnet/README.md +++ b/PaddleCV/icnet/README.md @@ -66,7 +66,7 @@ Iter[0]; train loss: 2.338; sub4_loss: 3.367; sub24_loss: 4.120; sub124_loss: 0. ### 测试 执行以下命令在`Cityscape`测试数据集上进行测试： ``` -python eval.py --model_path="./cnkpnt/100" --use_gpu=True +python eval.py --model_path="./chkpnt/100" --use_gpu=True ``` 需要通过选项`--model_path`指定模型文件。 测试脚本的输出的评估指标为[mean IoU]()。 @@ -75,7 +75,7 @@ python eval.py --model_path="./cnkpnt/100" --use_gpu=True 执行以下命令对指定的数据进行预测： ``` python infer.py \ ---model_path="./cnkpnt/100" \ +--model_path="./chkpnt/100" \ --images_path="./data/cityscape/" \ --images_list="./data/cityscape/infer.list" ``` diff --git a/PaddleCV/icnet/train.py b/PaddleCV/icnet/train.py index cdb8e96c17..3c8514792e 100644 --- a/PaddleCV/icnet/train.py +++ b/PaddleCV/icnet/train.py @@ -35,9 +35,11 @@ LAMBDA3 = 1.0 LEARNING_RATE = 0.003 POWER = 0.9 -LOG_PERIOD = 100 -CHECKPOINT_PERIOD = 100 -TOTAL_STEP = 100 +LOG_PERIOD = 1 +CHECKPOINT_PERIOD = 1000 +TOTAL_STEP = 60000 +if 'ce_mode' in os.environ: + TOTAL_STEP = 100 no_grad_set = []
googleapis__google-cloud-python-3745
[ { "content": "# Copyright 2016 Google Inc.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nimport os\n\nfrom setuptools import find_packages\nfrom setuptools import setup\n\n\nPACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__))\n\nwith open(os.path.join(PACKAGE_ROOT, 'README.rst')) as file_obj:\n README = file_obj.read()\n\n# NOTE: This is duplicated throughout and we should try to\n# consolidate.\nSETUP_BASE = {\n 'author': 'Google Cloud Platform',\n 'author_email': 'googleapis-publisher@google.com',\n 'scripts': [],\n 'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python',\n 'license': 'Apache 2.0',\n 'platforms': 'Posix; MacOS X; Windows',\n 'include_package_data': True,\n 'zip_safe': False,\n 'classifiers': [\n 'Development Status :: 4 - Beta',\n 'Intended Audience :: Developers',\n 'License :: OSI Approved :: Apache Software License',\n 'Operating System :: OS Independent',\n 'Programming Language :: Python :: 2',\n 'Programming Language :: Python :: 2.7',\n 'Programming Language :: Python :: 3',\n 'Programming Language :: Python :: 3.4',\n 'Programming Language :: Python :: 3.5',\n 'Programming Language :: Python :: 3.6',\n 'Topic :: Internet',\n ],\n}\n\n\nREQUIREMENTS = [\n 'googleapis-common-protos >= 1.3.4',\n 'protobuf >= 3.0.0',\n 'google-auth >= 0.4.0, < 2.0.0dev',\n 'requests >= 2.4.0, < 3.0.0dev',\n 'six',\n 'tenacity >= 4.0.0, <5.0.0dev'\n]\n\nsetup(\n name='google-cloud-core',\n version='0.26.0',\n description='API Client library for Google Cloud: Core Helpers',\n long_description=README,\n namespace_packages=[\n 'google',\n 'google.cloud',\n 'google.api',\n ],\n packages=find_packages(exclude=('tests*',)),\n install_requires=REQUIREMENTS,\n **SETUP_BASE\n)\n", "path": "core/setup.py" } ]
[ { "content": "# Copyright 2016 Google Inc.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nimport os\n\nfrom setuptools import find_packages\nfrom setuptools import setup\n\n\nPACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__))\n\nwith open(os.path.join(PACKAGE_ROOT, 'README.rst')) as file_obj:\n README = file_obj.read()\n\n# NOTE: This is duplicated throughout and we should try to\n# consolidate.\nSETUP_BASE = {\n 'author': 'Google Cloud Platform',\n 'author_email': 'googleapis-publisher@google.com',\n 'scripts': [],\n 'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python',\n 'license': 'Apache 2.0',\n 'platforms': 'Posix; MacOS X; Windows',\n 'include_package_data': True,\n 'zip_safe': False,\n 'classifiers': [\n 'Development Status :: 4 - Beta',\n 'Intended Audience :: Developers',\n 'License :: OSI Approved :: Apache Software License',\n 'Operating System :: OS Independent',\n 'Programming Language :: Python :: 2',\n 'Programming Language :: Python :: 2.7',\n 'Programming Language :: Python :: 3',\n 'Programming Language :: Python :: 3.4',\n 'Programming Language :: Python :: 3.5',\n 'Programming Language :: Python :: 3.6',\n 'Topic :: Internet',\n ],\n}\n\n\nREQUIREMENTS = [\n 'googleapis-common-protos >= 1.3.4',\n 'protobuf >= 3.0.0',\n 'google-auth >= 0.4.0, < 2.0.0dev',\n 'requests >= 2.4.0, < 3.0.0dev',\n 'setuptools >= 34.0.0',\n 'six',\n 'tenacity >= 4.0.0, <5.0.0dev'\n]\n\nsetup(\n name='google-cloud-core',\n version='0.26.0',\n description='API Client library for Google Cloud: Core Helpers',\n long_description=README,\n namespace_packages=[\n 'google',\n 'google.cloud',\n 'google.api',\n ],\n packages=find_packages(exclude=('tests*',)),\n install_requires=REQUIREMENTS,\n **SETUP_BASE\n)\n", "path": "core/setup.py" } ]
diff --git a/core/setup.py b/core/setup.py index 5cc4a9c8141b..f697e385494b 100644 --- a/core/setup.py +++ b/core/setup.py @@ -55,6 +55,7 @@ 'protobuf >= 3.0.0', 'google-auth >= 0.4.0, < 2.0.0dev', 'requests >= 2.4.0, < 3.0.0dev', + 'setuptools >= 34.0.0', 'six', 'tenacity >= 4.0.0, <5.0.0dev' ]
dotkom__onlineweb4-1699
[ { "content": "# -*- coding: utf-8 -*-\n\nfrom collections import OrderedDict\nfrom datetime import datetime, timedelta\nfrom functools import reduce\n\nfrom django.conf import settings\nfrom django.contrib.auth.models import Group\nfrom django.contrib.contenttypes.models import ContentType\nfrom django.core import validators\nfrom django.db import models\nfrom django.db.models import Case, Q, Value, When\nfrom django.template.defaultfilters import slugify\nfrom django.utils import timezone\nfrom django.utils.translation import ugettext as _\nfrom filebrowser.fields import FileBrowseField\nfrom unidecode import unidecode\n\nfrom apps.authentication.models import FIELD_OF_STUDY_CHOICES\nfrom apps.companyprofile.models import Company\nfrom apps.marks.models import get_expiration_date\n\nUser = settings.AUTH_USER_MODEL\n\nTYPE_CHOICES = (\n (1, 'Sosialt'),\n (2, 'Bedriftspresentasjon'),\n (3, 'Kurs'),\n (4, 'Utflukt'),\n (5, 'Ekskursjon'),\n (6, 'Internt'),\n (7, 'Annet')\n)\n\n\n# Managers\n\nclass EventOrderedByRegistration(models.Manager):\n \"\"\"\n Order events by registration start if registration start is within 7 days of today.\n \"\"\"\n def get_queryset(self):\n now = timezone.now()\n DELTA_FUTURE_SETTING = settings.OW4_SETTINGS.get('events').get('FEATURED_DAYS_FUTURE')\n DELTA_PAST_SETTING = settings.OW4_SETTINGS.get('events').get('FEATURED_DAYS_PAST')\n DAYS_BACK_DELTA = timezone.now() - timedelta(days=DELTA_PAST_SETTING)\n DAYS_FORWARD_DELTA = timezone.now() + timedelta(days=DELTA_FUTURE_SETTING)\n\n return super(EventOrderedByRegistration, self).get_queryset().\\\n annotate(registration_filtered=Case(\n When(Q(event_end__gte=now) &\n Q(attendance_event__registration_start__gte=DAYS_BACK_DELTA) &\n Q(attendance_event__registration_start__lte=DAYS_FORWARD_DELTA),\n then='attendance_event__registration_start'),\n default='event_end',\n output_field=models.DateTimeField()\n )\n ).annotate(is_today=Case(\n When(event_end__date=now.date(),\n then=Value(1)),\n default=Value(0),\n output_field=models.IntegerField()\n )\n ).order_by('-is_today', 'registration_filtered')\n\n\nclass Event(models.Model):\n \"\"\"\n Base class for Event-objects.\n \"\"\"\n\n IMAGE_FOLDER = \"images/events\"\n IMAGE_EXTENSIONS = ['.jpg', '.jpeg', '.gif', '.png', '.tif', '.tiff']\n\n # Managers\n objects = models.Manager()\n by_registration = EventOrderedByRegistration()\n\n author = models.ForeignKey(User, related_name='oppretter')\n title = models.CharField(_('tittel'), max_length=60)\n event_start = models.DateTimeField(_('start-dato'))\n event_end = models.DateTimeField(_('slutt-dato'))\n location = models.CharField(_('lokasjon'), max_length=100)\n ingress_short = models.CharField(_(\"kort ingress\"), max_length=150,\n validators=[validators.MinLengthValidator(25)])\n ingress = models.TextField(_('ingress'), validators=[validators.MinLengthValidator(25)])\n description = models.TextField(_('beskrivelse'), validators=[validators.MinLengthValidator(45)])\n image = FileBrowseField(_(\"bilde\"), max_length=200,\n directory=IMAGE_FOLDER, extensions=IMAGE_EXTENSIONS, null=True, blank=True)\n event_type = models.SmallIntegerField(_('type'), choices=TYPE_CHOICES, null=False)\n\n def is_attendance_event(self):\n \"\"\" Returns true if the event is an attendance event \"\"\"\n try:\n return True if self.attendance_event else False\n except AttendanceEvent.DoesNotExist:\n return False\n\n def images(self):\n if not self.image:\n return []\n from apps.events.utils import find_image_versions\n return find_image_versions(self)\n\n # TODO move payment and feedback stuff to attendance event when dasboard is done\n\n def feedback_users(self):\n if self.is_attendance_event:\n return [a.user for a in self.attendance_event.attendees.filter(attended=True)]\n return []\n\n def feedback_date(self):\n return self.event_end\n\n def feedback_title(self):\n return self.title\n\n def feedback_info(self):\n info = OrderedDict()\n if self.is_attendance_event():\n info[_('Påmeldte')] = self.attendance_event.number_of_attendees\n info[_('Oppmøtte')] = self.attendance_event.number_of_attendees - len(self.attendance_event.not_attended())\n info[_('Venteliste')] = self.attendance_event.number_on_waitlist\n\n return info\n\n @property\n def company_event(self):\n try:\n return CompanyEvent.objects.filter(event=self)\n except CompanyEvent.DoesNotExist:\n return None\n\n def feedback_mail(self):\n if self.event_type == 1 or self.event_type == 4: # Sosialt & Utflukt\n return settings.EMAIL_ARRKOM\n elif self.event_type == 2: # Bedpres\n return settings.EMAIL_BEDKOM\n elif self.event_type == 3: # Kurs\n return settings.EMAIL_FAGKOM\n elif self.event_type == 5: # Ekskursjon\n return settings.EMAIL_EKSKOM\n else:\n return settings.DEFAULT_FROM_EMAIL\n\n def can_display(self, user):\n restriction = GroupRestriction.objects.filter(event=self)\n\n if not restriction:\n return True\n\n if not user:\n return False\n\n groups = restriction[0].groups\n\n # returns True if any of the users groups are in one of the accepted groups\n return any(group in user.groups.all() for group in groups.all())\n\n @property\n def slug(self):\n return slugify(unidecode(self.title))\n\n @models.permalink\n def get_absolute_url(self):\n return 'events_details', None, {'event_id': self.id, 'event_slug': self.slug}\n\n def __str__(self):\n return self.title\n\n class Meta:\n verbose_name = _('arrangement')\n verbose_name_plural = _('arrangement')\n permissions = (\n ('view_event', 'View Event'),\n )\n\n\n\"\"\"\n BEGIN ACCESS RESTRICTION --------------------------------------------------------------------------\n\"\"\"\n\n\nclass Rule(models.Model):\n \"\"\"\n Super class for a rule object\n \"\"\"\n offset = models.PositiveSmallIntegerField(_('utsettelse'), help_text=_('utsettelse oppgis i timer'), default=0)\n\n def get_offset_time(self, time):\n if type(time) is not datetime:\n raise TypeError('time must be a datetime, not %s' % type(time))\n else:\n return time + timedelta(hours=self.offset)\n\n def satisfied(self, user):\n \"\"\" Checks if a user satisfies the rules \"\"\"\n return True\n\n def __str__(self):\n return 'Rule'\n\n class Meta:\n permissions = (\n ('view_rule', 'View Rule'),\n )\n\n\nclass FieldOfStudyRule(Rule):\n field_of_study = models.SmallIntegerField(_('studieretning'), choices=FIELD_OF_STUDY_CHOICES)\n\n def satisfied(self, user, registration_start):\n \"\"\" Override method \"\"\"\n\n # If the user has the same FOS as this rule\n if self.field_of_study == user.field_of_study:\n offset_datetime = self.get_offset_time(registration_start)\n # If the offset is in the past, it means you can attend even with the offset\n if offset_datetime < timezone.now():\n return {\"status\": True, \"message\": None, \"status_code\": 210}\n # If there is no offset, the signup just hasn't started yet\n elif self.offset == 0:\n return {\"status\": False, \"message\": _(\"Påmeldingen er ikke åpnet enda.\"), \"status_code\": 402}\n # In the last case there is a delayed signup\n else:\n return {\"status\": False, \"message\": _(\"Din studieretning har utsatt påmelding.\"),\n \"offset\": offset_datetime, \"status_code\": 420}\n return {\n \"status\": False, \"message\":\n _(\"Din studieretning er en annen enn de som har tilgang til dette arrangementet.\"), \"status_code\": 410}\n\n def __str__(self):\n if self.offset > 0:\n time_unit = _('timer') if self.offset > 1 else _('time')\n return _(\"%s etter %d %s\") % (str(self.get_field_of_study_display()), self.offset, time_unit)\n return str(self.get_field_of_study_display())\n\n class Meta:\n permissions = (\n ('view_fieldofstudyrule', 'View FieldOfStudyRule'),\n )\n\n\nclass GradeRule(Rule):\n grade = models.SmallIntegerField(_('klassetrinn'), null=False)\n\n def satisfied(self, user, registration_start):\n \"\"\" Override method \"\"\"\n\n # If the user has the same FOS as this rule\n if self.grade == user.year:\n offset_datetime = self.get_offset_time(registration_start)\n # If the offset is in the past, it means you can attend even with the offset\n if offset_datetime < timezone.now():\n return {\"status\": True, \"message\": None, \"status_code\": 211}\n # If there is no offset, the signup just hasn't started yet\n elif self.offset == 0:\n return {\"status\": False, \"message\": _(\"Påmeldingen er ikke åpnet enda.\"), \"status_code\": 402}\n # In the last case there is a delayed signup\n else:\n return {\n \"status\": False, \"message\":\n _(\"Ditt klassetrinn har utsatt påmelding.\"), \"offset\": offset_datetime, \"status_code\": 421}\n return {\n \"status\": False, \"message\":\n _(\"Du er ikke i et klassetrinn som har tilgang til dette arrangementet.\"), \"status_code\": 411}\n\n def __str__(self):\n if self.offset > 0:\n time_unit = _('timer') if self.offset > 1 else _('time')\n return _(\"%s. klasse etter %d %s\") % (self.grade, self.offset, time_unit)\n return _(\"%s. klasse\") % self.grade\n\n class Meta:\n permissions = (\n ('view_graderule', 'View GradeRule'),\n )\n\n\nclass UserGroupRule(Rule):\n group = models.ForeignKey(Group, blank=False, null=False)\n\n def satisfied(self, user, registration_start):\n \"\"\" Override method \"\"\"\n if self.group in user.groups.all():\n offset_datetime = self.get_offset_time(registration_start)\n # If the offset is in the past, it means you can attend even with the offset\n if offset_datetime < timezone.now():\n return {\"status\": True, \"message\": None, \"status_code\": 212}\n # If there is no offset, the signup just hasn't started yet\n elif self.offset == 0:\n return {\"status\": False, \"message\": _(\"Påmeldingen er ikke åpnet enda.\"), \"status_code\": 402}\n # In the last case there is a delayed signup\n else:\n return {\"status\": False, \"message\": _(\"%s har utsatt påmelding.\") % self.group,\n \"offset\": offset_datetime, \"status_code\": 422}\n return {\n \"status\": False, \"message\":\n _(\"Du er ikke i en brukergruppe som har tilgang til dette arrangmentet.\"), \"status_code\": 412}\n\n def __str__(self):\n if self.offset > 0:\n time_unit = _('timer') if self.offset > 1 else _('time')\n return _(\"%s etter %d %s\") % (str(self.group), self.offset, time_unit)\n return str(self.group)\n\n class Meta:\n permissions = (\n ('view_usergrouprule', 'View UserGroupRule'),\n )\n\n\nclass RuleBundle(models.Model):\n \"\"\"\n Access restriction rule object\n \"\"\"\n description = models.CharField(_('beskrivelse'), max_length=100, blank=True, null=True)\n field_of_study_rules = models.ManyToManyField(FieldOfStudyRule, blank=True)\n grade_rules = models.ManyToManyField(GradeRule, blank=True)\n user_group_rules = models.ManyToManyField(UserGroupRule, blank=True)\n\n def get_all_rules(self):\n rules = []\n rules.extend(self.field_of_study_rules.all())\n rules.extend(self.grade_rules.all())\n rules.extend(self.user_group_rules.all())\n return rules\n\n def get_rule_strings(self):\n return [str(rule) for rule in self.get_all_rules()]\n\n def satisfied(self, user, registration_start):\n\n errors = []\n\n for rule in self.get_all_rules():\n response = rule.satisfied(user, registration_start)\n if response['status']:\n return [response]\n else:\n errors.append(response)\n\n return errors\n\n def __str__(self):\n if self.description:\n return self.description\n elif self.get_rule_strings():\n return \", \".join(self.get_rule_strings())\n else:\n return _(\"Tom rule bundle.\")\n\n class Meta:\n permissions = (\n ('view_rulebundle', 'View RuleBundle'),\n )\n\n\n\"\"\"\n END ACCESS RESTRICTION --------------------------------------------------------------------------\n\"\"\"\n\n\nclass Extras(models.Model):\n \"\"\"\n Choices for events\n \"\"\"\n\n choice = models.CharField('valg', max_length=69)\n note = models.CharField('notat', max_length=200, blank=True, null=True)\n\n def __str__(self):\n return self.choice\n\n class Meta:\n verbose_name = _(\"ekstra valg\")\n verbose_name_plural = _(\"ekstra valg\")\n ordering = ['choice']\n\n\nclass AttendanceEvent(models.Model):\n \"\"\"\n Events that require special considerations regarding attendance.\n \"\"\"\n event = models.OneToOneField(\n Event,\n primary_key=True,\n related_name='attendance_event')\n\n max_capacity = models.PositiveIntegerField(_('maks-kapasitet'), null=False, blank=False)\n waitlist = models.BooleanField(_('venteliste'), default=False)\n guest_attendance = models.BooleanField(_('gjestepåmelding'), null=False, blank=False, default=False)\n registration_start = models.DateTimeField(_('registrerings-start'), null=False, blank=False)\n unattend_deadline = models.DateTimeField(_('avmeldings-frist'), null=False, blank=False)\n registration_end = models.DateTimeField(_('registrerings-slutt'), null=False, blank=False)\n\n # Automatic mark setting for not attending\n automatically_set_marks = models.BooleanField(_('automatisk prikk'), default=False,\n help_text=_('Påmeldte som ikke har møtt vil automatisk få prikk'))\n marks_has_been_set = models.BooleanField(default=False)\n\n # Access rules\n rule_bundles = models.ManyToManyField(RuleBundle, blank=True)\n\n # Extra choices\n extras = models.ManyToManyField(Extras, blank=True)\n\n @property\n def has_reservation(self):\n \"\"\" Returns whether this event has an attached reservation \"\"\"\n try:\n return True if self.reserved_seats else False\n except Reservation.DoesNotExist:\n return False\n\n @property\n def has_extras(self):\n return bool(self.extras.exists())\n\n @property\n def attendees_qs(self):\n \"\"\" Queryset with all attendees not on waiting list \"\"\"\n return self.attendees.all()[:self.max_capacity - self.number_of_reserved_seats]\n\n def not_attended(self):\n \"\"\" Queryset with all attendees not attended \"\"\"\n # .filter does apperantly not work on sliced querysets\n # return self.attendees_qs.filter(attended=False)\n\n not_attended = []\n\n for attendee in self.attendees_qs:\n if not attendee.attended:\n not_attended.append(attendee.user)\n\n return not_attended\n\n @property\n def waitlist_qs(self):\n \"\"\" Queryset with all attendees in waiting list \"\"\"\n return self.attendees.all()[self.max_capacity - self.number_of_reserved_seats:]\n\n @property\n def reservees_qs(self):\n \"\"\" Queryset with all reserved seats which have been filled \"\"\"\n if self.has_reservation:\n return self.reserved_seats.reservees.all()\n return []\n\n @property\n def attendees_not_paid(self):\n return [a for a in self.attendees_qs if a.paid]\n\n @property\n def number_of_attendees(self):\n \"\"\" Count of all attendees not in waiting list \"\"\"\n # We need to use len() instead of .count() here, because of the prefetched event archive\n return len(self.attendees_qs)\n\n @property\n def number_on_waitlist(self):\n \"\"\" Count of all attendees on waiting list \"\"\"\n # We need to use len() instead of .count() here, because of the prefetched event archive\n return len(self.waitlist_qs)\n\n @property\n def number_of_reserved_seats(self):\n \"\"\"\n Total number of seats for this event that are reserved\n \"\"\"\n return self.reserved_seats.seats if self.has_reservation else 0\n\n @property\n def number_of_reserved_seats_taken(self):\n \"\"\"\n Returns number of reserved seats which have been filled\n \"\"\"\n return self.reserved_seats.number_of_seats_taken if self.has_reservation else 0\n\n @property\n def number_of_seats_taken(self):\n \"\"\"\n Returns the total amount of taken seats for an attendance_event.\n \"\"\"\n # This includes all attendees + reserved seats for the event, if any.\n # Always use the total number of reserved seats here, because they are not\n # available for regular users to claim.\n return self.number_of_attendees + self.number_of_reserved_seats\n\n @property\n def free_seats(self):\n \"\"\"\n Integer representing the number of free seats for an event\n \"\"\"\n return 0 if self.number_of_seats_taken == self.max_capacity else self.max_capacity - self.number_of_seats_taken\n\n @property\n def room_on_event(self):\n \"\"\"\n Returns True if there are free seats or an open waiting list\n \"\"\"\n return True if self.free_seats > 0 or self.waitlist else False\n\n @property\n def registration_open(self):\n return timezone.now() < self.registration_start\n\n def has_delayed_signup(self, user):\n pass\n\n def is_marked(self, user):\n expiry_date = get_expiration_date(user)\n return expiry_date and expiry_date > timezone.now().date()\n\n def has_postponed_registration(self, user):\n if not self.is_marked(user):\n return False\n expiry_date = get_expiration_date(user)\n mark_offset = timedelta(days=1)\n postponed_registration_start = self.registration_start + mark_offset\n\n before_expiry = self.registration_start.date() < expiry_date\n\n if postponed_registration_start > timezone.now() and before_expiry:\n return postponed_registration_start\n\n def is_suspended(self, user):\n for suspension in user.get_active_suspensions():\n if not suspension.expiration_date or suspension.expiration_date > timezone.now().date():\n return True\n\n return False\n\n @property\n def will_i_be_on_wait_list(self):\n return True if self.free_seats == 0 and self.waitlist else False\n\n @property\n def waitlist_enabled(self):\n return self.waitlist\n\n def payment(self):\n # Importing here to awoid circular dependency error\n from apps.payment.models import Payment\n try:\n payment = Payment.objects.get(content_type=ContentType.objects.get_for_model(AttendanceEvent),\n object_id=self.event.id)\n except Payment.DoesNotExist:\n payment = None\n\n return payment\n\n def notify_waiting_list(self, host, unattended_user=None, extra_capacity=1):\n from apps.events.utils import handle_waitlist_bump # Imported here to avoid circular import\n # Notify next user on waiting list\n wait_list = self.waitlist_qs\n if wait_list:\n # Checking if user is on the wait list\n on_wait_list = False\n if unattended_user:\n for waiting_user in wait_list:\n if waiting_user.user == unattended_user:\n on_wait_list = True\n break\n if not on_wait_list:\n # Send mail to first user on waiting list\n attendees = wait_list[:extra_capacity]\n\n handle_waitlist_bump(self.event, host, attendees, self.payment())\n\n def is_eligible_for_signup(self, user):\n \"\"\"\n Checks if a user can attend a specific event\n This method checks for:\n Waitlist\n Room on event\n Rules\n Marks\n Suspension\n @param User object\n The returned dict contains a key called 'status_code'. These codes follow the HTTP\n standard in terms of overlying scheme.\n 2XX = successful\n 4XX = client error (user related)\n 5XX = server error (event related)\n These codes are meant as a debugging tool only. The eligibility checking is quite\n extensive, and tracking where it's going wrong is much needed.\n TODO:\n Exception handling\n \"\"\"\n\n response = {'status': False, 'message': '', 'status_code': None}\n\n # Registration closed\n if timezone.now() > self.registration_end:\n response['message'] = _('Påmeldingen er ikke lenger åpen.')\n response['status_code'] = 502\n return response\n\n # Room for me on the event?\n if not self.room_on_event:\n response['message'] = _(\"Det er ikke mer plass på dette arrangementet.\")\n response['status_code'] = 503\n return response\n\n #\n # Offset calculations.\n #\n\n # Are there any rules preventing me from attending?\n # This should be checked last of the offsets, because it can completely deny you access.\n response = self.rules_satisfied(user)\n if not response['status']:\n if 'offset' not in response:\n return response\n\n # Do I have any marks that postpone my registration date?\n response = self._check_marks(response, user)\n\n # Return response if offset was set.\n if 'offset' in response and response['offset'] > timezone.now():\n return response\n\n #\n # Offset calculations end\n #\n\n # Registration not open\n if timezone.now() < self.registration_start:\n response['status'] = False\n response['message'] = _('Påmeldingen har ikke åpnet enda.')\n response['status_code'] = 501\n return response\n\n # Is suspended\n if self.is_suspended(user):\n response['status'] = False\n response['message'] = _(\"Du er suspandert og kan ikke melde deg på.\")\n response['status_code'] = 402\n\n return response\n\n # Checks if the event is group restricted and if the user is in the right group\n if not self.event.can_display(user):\n response['status'] = False\n response['message'] = _(\"Du har ikke tilgang til å melde deg på dette arrangementet.\")\n response['status_code'] = 403\n\n return response\n\n # No objections, set eligible.\n response['status'] = True\n return response\n\n def _check_marks(self, response, user):\n expiry_date = get_expiration_date(user)\n if expiry_date and expiry_date > timezone.now().date():\n # Offset is currently 1 day if you have marks, regardless of amount.\n mark_offset = timedelta(days=1)\n postponed_registration_start = self.registration_start + mark_offset\n\n before_expiry = self.registration_start.date() < expiry_date\n\n if postponed_registration_start > timezone.now() and before_expiry:\n if 'offset' in response and response['offset'] < postponed_registration_start \\\n or 'offset' not in response:\n response['status'] = False\n response['status_code'] = 401\n response['message'] = _(\"Din påmelding er utsatt grunnet prikker.\")\n response['offset'] = postponed_registration_start\n return response\n\n def _process_rulebundle_satisfaction_responses(self, responses):\n # Put the smallest offset faaar into the future.\n smallest_offset = timezone.now() + timedelta(days=365)\n offset_response = {}\n future_response = {}\n errors = []\n\n for response in responses:\n if response['status']:\n return response\n elif 'offset' in response:\n if response['offset'] < smallest_offset:\n smallest_offset = response['offset']\n offset_response = response\n elif response['status_code'] == 402:\n future_response = response\n else:\n errors.append(response)\n\n if future_response:\n return future_response\n if smallest_offset > timezone.now() and offset_response:\n return offset_response\n if errors:\n return errors[0]\n\n def rules_satisfied(self, user):\n \"\"\"\n Checks a user against rules applied to an attendance event\n \"\"\"\n # If the event has guest attendance, allow absolutely anyone\n if self.guest_attendance:\n return {'status': True, 'status_code': 201}\n\n # If the user is not a member, return False right away\n # TODO check for guest list\n if not user.is_member:\n return {\n 'status': False, 'message':\n _(\"Dette arrangementet er kun åpent for medlemmer.\"), 'status_code': 400}\n\n # If there are no rule_bundles on this object, all members of Online are allowed.\n if not self.rule_bundles.exists() and user.is_member:\n return {'status': True, 'status_code': 200}\n\n # Check all rule bundles\n responses = []\n\n # If one satisfies, return true, else append to the error list\n for rule_bundle in self.rule_bundles.all():\n responses.extend(rule_bundle.satisfied(user, self.registration_start))\n\n return self._process_rulebundle_satisfaction_responses(responses)\n\n def is_attendee(self, user):\n return self.attendees.filter(user=user)\n\n def is_on_waitlist(self, user):\n return reduce(lambda x, y: x or y.user == user, self.waitlist_qs, False)\n\n def what_place_is_user_on_wait_list(self, user):\n if self.waitlist:\n waitlist = self.waitlist_qs\n if waitlist:\n for attendee_object in waitlist:\n if attendee_object.user == user:\n return list(waitlist).index(attendee_object) + 1\n return 0\n\n def __str__(self):\n return self.event.title\n\n class Meta:\n verbose_name = _('påmelding')\n verbose_name_plural = _('påmeldinger')\n permissions = (\n ('view_attendanceevent', 'View AttendanceEvent'),\n )\n\n\nclass CompanyEvent(models.Model):\n \"\"\"\n Company relation to AttendanceEvent\n \"\"\"\n company = models.ForeignKey(Company, verbose_name=_('bedrifter'))\n event = models.ForeignKey(Event, verbose_name=_('arrangement'), related_name='companies')\n\n class Meta:\n verbose_name = _('bedrift')\n verbose_name_plural = _('bedrifter')\n permissions = (\n ('view_companyevent', 'View CompanyEvent'),\n )\n\n\nclass Attendee(models.Model):\n \"\"\"\n User relation to AttendanceEvent.\n \"\"\"\n event = models.ForeignKey(AttendanceEvent, related_name=\"attendees\")\n user = models.ForeignKey(User)\n\n timestamp = models.DateTimeField(auto_now_add=True, editable=False)\n attended = models.BooleanField(_('var tilstede'), default=False)\n paid = models.BooleanField(_('har betalt'), default=False)\n note = models.CharField(_('notat'), max_length=100, blank=True, default='')\n extras = models.ForeignKey(Extras, blank=True, null=True)\n\n def __str__(self):\n return self.user.get_full_name()\n\n def delete(self):\n # Importing here to prevent circular dependencies\n from apps.payment.models import PaymentDelay\n try:\n PaymentDelay.objects.filter(user=self.user, payment=self.event.payment()).delete()\n except PaymentDelay.DoesNotExist:\n # Do nothing\n False\n\n super(Attendee, self).delete()\n\n class Meta:\n ordering = ['timestamp']\n unique_together = (('event', 'user'),)\n permissions = (\n ('view_attendee', 'View Attendee'),\n )\n\n\nclass Reservation(models.Model):\n attendance_event = models.OneToOneField(AttendanceEvent, related_name=\"reserved_seats\")\n seats = models.PositiveIntegerField(\"reserverte plasser\", blank=False, null=False)\n\n @property\n def number_of_seats_taken(self):\n return self.reservees.count()\n\n def __str__(self):\n return \"Reservasjoner for %s\" % self.attendance_event.event.title\n\n class Meta:\n verbose_name = _(\"reservasjon\")\n verbose_name_plural = _(\"reservasjoner\")\n permissions = (\n ('view_reservation', 'View Reservation'),\n )\n\n\nclass Reservee(models.Model):\n \"\"\"\n Reservation entry\n \"\"\"\n reservation = models.ForeignKey(Reservation, related_name='reservees')\n # I 2014 var norges lengste navn på 69 tegn;\n # julius andreas gimli arn macgyver chewbacka highlander elessar-jankov\n name = models.CharField('navn', max_length=69)\n note = models.CharField('notat', max_length=100)\n allergies = models.CharField('allergier', max_length=200, blank=True, null=True)\n\n def __str__(self):\n return self.name\n\n class Meta:\n verbose_name = _(\"reservasjon\")\n verbose_name_plural = _(\"reservasjoner\")\n ordering = ['id']\n permissions = (\n ('view_reservee', 'View Reservee'),\n )\n\n\nclass GroupRestriction(models.Model):\n event = models.OneToOneField(\n Event,\n primary_key=True,\n related_name='group_restriction')\n\n groups = models.ManyToManyField(Group, blank=True,\n help_text=_('Legg til de gruppene som skal ha tilgang til arrangementet'))\n\n class Meta:\n verbose_name = _(\"restriksjon\")\n verbose_name_plural = _(\"restriksjoner\")\n permissions = (\n ('view_restriction', 'View Restriction'),\n )\n", "path": "apps/events/models.py" } ]
[ { "content": "# -*- coding: utf-8 -*-\n\nfrom collections import OrderedDict\nfrom datetime import datetime, timedelta\nfrom functools import reduce\n\nfrom django.conf import settings\nfrom django.contrib.auth.models import Group\nfrom django.contrib.contenttypes.models import ContentType\nfrom django.core import validators\nfrom django.db import models\nfrom django.db.models import Case, Q, Value, When\nfrom django.template.defaultfilters import slugify\nfrom django.utils import timezone\nfrom django.utils.translation import ugettext as _\nfrom filebrowser.fields import FileBrowseField\nfrom unidecode import unidecode\n\nfrom apps.authentication.models import FIELD_OF_STUDY_CHOICES\nfrom apps.companyprofile.models import Company\nfrom apps.marks.models import get_expiration_date\n\nUser = settings.AUTH_USER_MODEL\n\nTYPE_CHOICES = (\n (1, 'Sosialt'),\n (2, 'Bedriftspresentasjon'),\n (3, 'Kurs'),\n (4, 'Utflukt'),\n (5, 'Ekskursjon'),\n (6, 'Internt'),\n (7, 'Annet')\n)\n\n\n# Managers\n\nclass EventOrderedByRegistration(models.Manager):\n \"\"\"\n Order events by registration start if registration start is within 7 days of today.\n \"\"\"\n def get_queryset(self):\n now = timezone.now()\n DELTA_FUTURE_SETTING = settings.OW4_SETTINGS.get('events').get('FEATURED_DAYS_FUTURE')\n DELTA_PAST_SETTING = settings.OW4_SETTINGS.get('events').get('FEATURED_DAYS_PAST')\n DAYS_BACK_DELTA = timezone.now() - timedelta(days=DELTA_PAST_SETTING)\n DAYS_FORWARD_DELTA = timezone.now() + timedelta(days=DELTA_FUTURE_SETTING)\n\n return super(EventOrderedByRegistration, self).get_queryset().\\\n annotate(registration_filtered=Case(\n When(Q(event_end__gte=now) &\n Q(attendance_event__registration_start__gte=DAYS_BACK_DELTA) &\n Q(attendance_event__registration_start__lte=DAYS_FORWARD_DELTA),\n then='attendance_event__registration_start'),\n default='event_end',\n output_field=models.DateTimeField()\n )\n ).annotate(is_today=Case(\n When(event_end__date=now.date(),\n then=Value(1)),\n default=Value(0),\n output_field=models.IntegerField()\n )\n ).order_by('-is_today', 'registration_filtered')\n\n\nclass Event(models.Model):\n \"\"\"\n Base class for Event-objects.\n \"\"\"\n\n IMAGE_FOLDER = \"images/events\"\n IMAGE_EXTENSIONS = ['.jpg', '.jpeg', '.gif', '.png', '.tif', '.tiff']\n\n # Managers\n objects = models.Manager()\n by_registration = EventOrderedByRegistration()\n\n author = models.ForeignKey(User, related_name='oppretter')\n title = models.CharField(_('tittel'), max_length=60)\n event_start = models.DateTimeField(_('start-dato'))\n event_end = models.DateTimeField(_('slutt-dato'))\n location = models.CharField(_('lokasjon'), max_length=100)\n ingress_short = models.CharField(_(\"kort ingress\"), max_length=150,\n validators=[validators.MinLengthValidator(25)])\n ingress = models.TextField(_('ingress'), validators=[validators.MinLengthValidator(25)])\n description = models.TextField(_('beskrivelse'), validators=[validators.MinLengthValidator(45)])\n image = FileBrowseField(_(\"bilde\"), max_length=200,\n directory=IMAGE_FOLDER, extensions=IMAGE_EXTENSIONS, null=True, blank=True)\n event_type = models.SmallIntegerField(_('type'), choices=TYPE_CHOICES, null=False)\n\n def is_attendance_event(self):\n \"\"\" Returns true if the event is an attendance event \"\"\"\n try:\n return True if self.attendance_event else False\n except AttendanceEvent.DoesNotExist:\n return False\n\n def images(self):\n if not self.image:\n return []\n from apps.events.utils import find_image_versions\n return find_image_versions(self)\n\n # TODO move payment and feedback stuff to attendance event when dasboard is done\n\n def feedback_users(self):\n if self.is_attendance_event:\n return [a.user for a in self.attendance_event.attendees.filter(attended=True)]\n return []\n\n def feedback_date(self):\n return self.event_end\n\n def feedback_title(self):\n return self.title\n\n def feedback_info(self):\n info = OrderedDict()\n if self.is_attendance_event():\n info[_('Påmeldte')] = self.attendance_event.number_of_attendees\n info[_('Oppmøtte')] = self.attendance_event.number_of_attendees - len(self.attendance_event.not_attended())\n info[_('Venteliste')] = self.attendance_event.number_on_waitlist\n\n return info\n\n @property\n def company_event(self):\n try:\n return CompanyEvent.objects.filter(event=self)\n except CompanyEvent.DoesNotExist:\n return None\n\n def feedback_mail(self):\n if self.event_type == 1 or self.event_type == 4: # Sosialt & Utflukt\n return settings.EMAIL_ARRKOM\n elif self.event_type == 2: # Bedpres\n return settings.EMAIL_BEDKOM\n elif self.event_type == 3: # Kurs\n return settings.EMAIL_FAGKOM\n elif self.event_type == 5: # Ekskursjon\n return settings.EMAIL_EKSKOM\n else:\n return settings.DEFAULT_FROM_EMAIL\n\n def can_display(self, user):\n restriction = GroupRestriction.objects.filter(event=self)\n\n if not restriction:\n return True\n\n if not user:\n return False\n\n groups = restriction[0].groups\n\n # returns True if any of the users groups are in one of the accepted groups\n return any(group in user.groups.all() for group in groups.all())\n\n @property\n def slug(self):\n return slugify(unidecode(self.title))\n\n @models.permalink\n def get_absolute_url(self):\n return 'events_details', None, {'event_id': self.id, 'event_slug': self.slug}\n\n def __str__(self):\n return self.title\n\n class Meta:\n verbose_name = _('arrangement')\n verbose_name_plural = _('arrangement')\n permissions = (\n ('view_event', 'View Event'),\n )\n\n\n\"\"\"\n BEGIN ACCESS RESTRICTION --------------------------------------------------------------------------\n\"\"\"\n\n\nclass Rule(models.Model):\n \"\"\"\n Super class for a rule object\n \"\"\"\n offset = models.PositiveSmallIntegerField(_('utsettelse'), help_text=_('utsettelse oppgis i timer'), default=0)\n\n def get_offset_time(self, time):\n if type(time) is not datetime:\n raise TypeError('time must be a datetime, not %s' % type(time))\n else:\n return time + timedelta(hours=self.offset)\n\n def satisfied(self, user):\n \"\"\" Checks if a user satisfies the rules \"\"\"\n return True\n\n def __str__(self):\n return 'Rule'\n\n class Meta:\n permissions = (\n ('view_rule', 'View Rule'),\n )\n\n\nclass FieldOfStudyRule(Rule):\n field_of_study = models.SmallIntegerField(_('studieretning'), choices=FIELD_OF_STUDY_CHOICES)\n\n def satisfied(self, user, registration_start):\n \"\"\" Override method \"\"\"\n\n # If the user has the same FOS as this rule\n if self.field_of_study == user.field_of_study:\n offset_datetime = self.get_offset_time(registration_start)\n # If the offset is in the past, it means you can attend even with the offset\n if offset_datetime < timezone.now():\n return {\"status\": True, \"message\": None, \"status_code\": 210}\n # If there is no offset, the signup just hasn't started yet\n elif self.offset == 0:\n return {\"status\": False, \"message\": _(\"Påmeldingen er ikke åpnet enda.\"), \"status_code\": 402}\n # In the last case there is a delayed signup\n else:\n return {\"status\": False, \"message\": _(\"Din studieretning har utsatt påmelding.\"),\n \"offset\": offset_datetime, \"status_code\": 420}\n return {\n \"status\": False, \"message\":\n _(\"Din studieretning er en annen enn de som har tilgang til dette arrangementet.\"), \"status_code\": 410}\n\n def __str__(self):\n if self.offset > 0:\n time_unit = _('timer') if self.offset > 1 else _('time')\n return _(\"%s etter %d %s\") % (str(self.get_field_of_study_display()), self.offset, time_unit)\n return str(self.get_field_of_study_display())\n\n class Meta:\n permissions = (\n ('view_fieldofstudyrule', 'View FieldOfStudyRule'),\n )\n\n\nclass GradeRule(Rule):\n grade = models.SmallIntegerField(_('klassetrinn'), null=False)\n\n def satisfied(self, user, registration_start):\n \"\"\" Override method \"\"\"\n\n # If the user has the same FOS as this rule\n if self.grade == user.year:\n offset_datetime = self.get_offset_time(registration_start)\n # If the offset is in the past, it means you can attend even with the offset\n if offset_datetime < timezone.now():\n return {\"status\": True, \"message\": None, \"status_code\": 211}\n # If there is no offset, the signup just hasn't started yet\n elif self.offset == 0:\n return {\"status\": False, \"message\": _(\"Påmeldingen er ikke åpnet enda.\"), \"status_code\": 402}\n # In the last case there is a delayed signup\n else:\n return {\n \"status\": False, \"message\":\n _(\"Ditt klassetrinn har utsatt påmelding.\"), \"offset\": offset_datetime, \"status_code\": 421}\n return {\n \"status\": False, \"message\":\n _(\"Du er ikke i et klassetrinn som har tilgang til dette arrangementet.\"), \"status_code\": 411}\n\n def __str__(self):\n if self.offset > 0:\n time_unit = _('timer') if self.offset > 1 else _('time')\n return _(\"%s. klasse etter %d %s\") % (self.grade, self.offset, time_unit)\n return _(\"%s. klasse\") % self.grade\n\n class Meta:\n permissions = (\n ('view_graderule', 'View GradeRule'),\n )\n\n\nclass UserGroupRule(Rule):\n group = models.ForeignKey(Group, blank=False, null=False)\n\n def satisfied(self, user, registration_start):\n \"\"\" Override method \"\"\"\n if self.group in user.groups.all():\n offset_datetime = self.get_offset_time(registration_start)\n # If the offset is in the past, it means you can attend even with the offset\n if offset_datetime < timezone.now():\n return {\"status\": True, \"message\": None, \"status_code\": 212}\n # If there is no offset, the signup just hasn't started yet\n elif self.offset == 0:\n return {\"status\": False, \"message\": _(\"Påmeldingen er ikke åpnet enda.\"), \"status_code\": 402}\n # In the last case there is a delayed signup\n else:\n return {\"status\": False, \"message\": _(\"%s har utsatt påmelding.\") % self.group,\n \"offset\": offset_datetime, \"status_code\": 422}\n return {\n \"status\": False, \"message\":\n _(\"Du er ikke i en brukergruppe som har tilgang til dette arrangmentet.\"), \"status_code\": 412}\n\n def __str__(self):\n if self.offset > 0:\n time_unit = _('timer') if self.offset > 1 else _('time')\n return _(\"%s etter %d %s\") % (str(self.group), self.offset, time_unit)\n return str(self.group)\n\n class Meta:\n permissions = (\n ('view_usergrouprule', 'View UserGroupRule'),\n )\n\n\nclass RuleBundle(models.Model):\n \"\"\"\n Access restriction rule object\n \"\"\"\n description = models.CharField(_('beskrivelse'), max_length=100, blank=True, null=True)\n field_of_study_rules = models.ManyToManyField(FieldOfStudyRule, blank=True)\n grade_rules = models.ManyToManyField(GradeRule, blank=True)\n user_group_rules = models.ManyToManyField(UserGroupRule, blank=True)\n\n def get_all_rules(self):\n rules = []\n rules.extend(self.field_of_study_rules.all())\n rules.extend(self.grade_rules.all())\n rules.extend(self.user_group_rules.all())\n return rules\n\n def get_rule_strings(self):\n return [str(rule) for rule in self.get_all_rules()]\n\n def satisfied(self, user, registration_start):\n\n errors = []\n\n for rule in self.get_all_rules():\n response = rule.satisfied(user, registration_start)\n if response['status']:\n return [response]\n else:\n errors.append(response)\n\n return errors\n\n def __str__(self):\n if self.description:\n return self.description\n elif self.get_rule_strings():\n return \", \".join(self.get_rule_strings())\n else:\n return _(\"Tom rule bundle.\")\n\n class Meta:\n permissions = (\n ('view_rulebundle', 'View RuleBundle'),\n )\n\n\n\"\"\"\n END ACCESS RESTRICTION --------------------------------------------------------------------------\n\"\"\"\n\n\nclass Extras(models.Model):\n \"\"\"\n Choices for events\n \"\"\"\n\n choice = models.CharField('valg', max_length=69)\n note = models.CharField('notat', max_length=200, blank=True, null=True)\n\n def __str__(self):\n return self.choice\n\n class Meta:\n verbose_name = _(\"ekstra valg\")\n verbose_name_plural = _(\"ekstra valg\")\n ordering = ['choice']\n\n\nclass AttendanceEvent(models.Model):\n \"\"\"\n Events that require special considerations regarding attendance.\n \"\"\"\n event = models.OneToOneField(\n Event,\n primary_key=True,\n related_name='attendance_event')\n\n max_capacity = models.PositiveIntegerField(_('maks-kapasitet'), null=False, blank=False)\n waitlist = models.BooleanField(_('venteliste'), default=False)\n guest_attendance = models.BooleanField(_('gjestepåmelding'), null=False, blank=False, default=False)\n registration_start = models.DateTimeField(_('registrerings-start'), null=False, blank=False)\n unattend_deadline = models.DateTimeField(_('avmeldings-frist'), null=False, blank=False)\n registration_end = models.DateTimeField(_('registrerings-slutt'), null=False, blank=False)\n\n # Automatic mark setting for not attending\n automatically_set_marks = models.BooleanField(_('automatisk prikk'), default=False,\n help_text=_('Påmeldte som ikke har møtt vil automatisk få prikk'))\n marks_has_been_set = models.BooleanField(default=False)\n\n # Access rules\n rule_bundles = models.ManyToManyField(RuleBundle, blank=True)\n\n # Extra choices\n extras = models.ManyToManyField(Extras, blank=True)\n\n @property\n def has_reservation(self):\n \"\"\" Returns whether this event has an attached reservation \"\"\"\n try:\n return True if self.reserved_seats else False\n except Reservation.DoesNotExist:\n return False\n\n @property\n def has_extras(self):\n return bool(self.extras.exists())\n\n @property\n def attendees_qs(self):\n \"\"\" Queryset with all attendees not on waiting list \"\"\"\n return self.attendees.all()[:self.max_capacity - self.number_of_reserved_seats]\n\n def not_attended(self):\n \"\"\" Queryset with all attendees not attended \"\"\"\n # .filter does apperantly not work on sliced querysets\n # return self.attendees_qs.filter(attended=False)\n\n not_attended = []\n\n for attendee in self.attendees_qs:\n if not attendee.attended:\n not_attended.append(attendee.user)\n\n return not_attended\n\n @property\n def waitlist_qs(self):\n \"\"\" Queryset with all attendees in waiting list \"\"\"\n return self.attendees.all()[self.max_capacity - self.number_of_reserved_seats:]\n\n @property\n def reservees_qs(self):\n \"\"\" Queryset with all reserved seats which have been filled \"\"\"\n if self.has_reservation:\n return self.reserved_seats.reservees.all()\n return []\n\n @property\n def attendees_not_paid(self):\n return list(self.attendees.filter(paid=False))\n\n @property\n def number_of_attendees(self):\n \"\"\" Count of all attendees not in waiting list \"\"\"\n # We need to use len() instead of .count() here, because of the prefetched event archive\n return len(self.attendees_qs)\n\n @property\n def number_on_waitlist(self):\n \"\"\" Count of all attendees on waiting list \"\"\"\n # We need to use len() instead of .count() here, because of the prefetched event archive\n return len(self.waitlist_qs)\n\n @property\n def number_of_reserved_seats(self):\n \"\"\"\n Total number of seats for this event that are reserved\n \"\"\"\n return self.reserved_seats.seats if self.has_reservation else 0\n\n @property\n def number_of_reserved_seats_taken(self):\n \"\"\"\n Returns number of reserved seats which have been filled\n \"\"\"\n return self.reserved_seats.number_of_seats_taken if self.has_reservation else 0\n\n @property\n def number_of_seats_taken(self):\n \"\"\"\n Returns the total amount of taken seats for an attendance_event.\n \"\"\"\n # This includes all attendees + reserved seats for the event, if any.\n # Always use the total number of reserved seats here, because they are not\n # available for regular users to claim.\n return self.number_of_attendees + self.number_of_reserved_seats\n\n @property\n def free_seats(self):\n \"\"\"\n Integer representing the number of free seats for an event\n \"\"\"\n return 0 if self.number_of_seats_taken == self.max_capacity else self.max_capacity - self.number_of_seats_taken\n\n @property\n def room_on_event(self):\n \"\"\"\n Returns True if there are free seats or an open waiting list\n \"\"\"\n return True if self.free_seats > 0 or self.waitlist else False\n\n @property\n def registration_open(self):\n return timezone.now() < self.registration_start\n\n def has_delayed_signup(self, user):\n pass\n\n def is_marked(self, user):\n expiry_date = get_expiration_date(user)\n return expiry_date and expiry_date > timezone.now().date()\n\n def has_postponed_registration(self, user):\n if not self.is_marked(user):\n return False\n expiry_date = get_expiration_date(user)\n mark_offset = timedelta(days=1)\n postponed_registration_start = self.registration_start + mark_offset\n\n before_expiry = self.registration_start.date() < expiry_date\n\n if postponed_registration_start > timezone.now() and before_expiry:\n return postponed_registration_start\n\n def is_suspended(self, user):\n for suspension in user.get_active_suspensions():\n if not suspension.expiration_date or suspension.expiration_date > timezone.now().date():\n return True\n\n return False\n\n @property\n def will_i_be_on_wait_list(self):\n return True if self.free_seats == 0 and self.waitlist else False\n\n @property\n def waitlist_enabled(self):\n return self.waitlist\n\n def payment(self):\n # Importing here to awoid circular dependency error\n from apps.payment.models import Payment\n try:\n payment = Payment.objects.get(content_type=ContentType.objects.get_for_model(AttendanceEvent),\n object_id=self.event.id)\n except Payment.DoesNotExist:\n payment = None\n\n return payment\n\n def notify_waiting_list(self, host, unattended_user=None, extra_capacity=1):\n from apps.events.utils import handle_waitlist_bump # Imported here to avoid circular import\n # Notify next user on waiting list\n wait_list = self.waitlist_qs\n if wait_list:\n # Checking if user is on the wait list\n on_wait_list = False\n if unattended_user:\n for waiting_user in wait_list:\n if waiting_user.user == unattended_user:\n on_wait_list = True\n break\n if not on_wait_list:\n # Send mail to first user on waiting list\n attendees = wait_list[:extra_capacity]\n\n handle_waitlist_bump(self.event, host, attendees, self.payment())\n\n def is_eligible_for_signup(self, user):\n \"\"\"\n Checks if a user can attend a specific event\n This method checks for:\n Waitlist\n Room on event\n Rules\n Marks\n Suspension\n @param User object\n The returned dict contains a key called 'status_code'. These codes follow the HTTP\n standard in terms of overlying scheme.\n 2XX = successful\n 4XX = client error (user related)\n 5XX = server error (event related)\n These codes are meant as a debugging tool only. The eligibility checking is quite\n extensive, and tracking where it's going wrong is much needed.\n TODO:\n Exception handling\n \"\"\"\n\n response = {'status': False, 'message': '', 'status_code': None}\n\n # Registration closed\n if timezone.now() > self.registration_end:\n response['message'] = _('Påmeldingen er ikke lenger åpen.')\n response['status_code'] = 502\n return response\n\n # Room for me on the event?\n if not self.room_on_event:\n response['message'] = _(\"Det er ikke mer plass på dette arrangementet.\")\n response['status_code'] = 503\n return response\n\n #\n # Offset calculations.\n #\n\n # Are there any rules preventing me from attending?\n # This should be checked last of the offsets, because it can completely deny you access.\n response = self.rules_satisfied(user)\n if not response['status']:\n if 'offset' not in response:\n return response\n\n # Do I have any marks that postpone my registration date?\n response = self._check_marks(response, user)\n\n # Return response if offset was set.\n if 'offset' in response and response['offset'] > timezone.now():\n return response\n\n #\n # Offset calculations end\n #\n\n # Registration not open\n if timezone.now() < self.registration_start:\n response['status'] = False\n response['message'] = _('Påmeldingen har ikke åpnet enda.')\n response['status_code'] = 501\n return response\n\n # Is suspended\n if self.is_suspended(user):\n response['status'] = False\n response['message'] = _(\"Du er suspandert og kan ikke melde deg på.\")\n response['status_code'] = 402\n\n return response\n\n # Checks if the event is group restricted and if the user is in the right group\n if not self.event.can_display(user):\n response['status'] = False\n response['message'] = _(\"Du har ikke tilgang til å melde deg på dette arrangementet.\")\n response['status_code'] = 403\n\n return response\n\n # No objections, set eligible.\n response['status'] = True\n return response\n\n def _check_marks(self, response, user):\n expiry_date = get_expiration_date(user)\n if expiry_date and expiry_date > timezone.now().date():\n # Offset is currently 1 day if you have marks, regardless of amount.\n mark_offset = timedelta(days=1)\n postponed_registration_start = self.registration_start + mark_offset\n\n before_expiry = self.registration_start.date() < expiry_date\n\n if postponed_registration_start > timezone.now() and before_expiry:\n if 'offset' in response and response['offset'] < postponed_registration_start \\\n or 'offset' not in response:\n response['status'] = False\n response['status_code'] = 401\n response['message'] = _(\"Din påmelding er utsatt grunnet prikker.\")\n response['offset'] = postponed_registration_start\n return response\n\n def _process_rulebundle_satisfaction_responses(self, responses):\n # Put the smallest offset faaar into the future.\n smallest_offset = timezone.now() + timedelta(days=365)\n offset_response = {}\n future_response = {}\n errors = []\n\n for response in responses:\n if response['status']:\n return response\n elif 'offset' in response:\n if response['offset'] < smallest_offset:\n smallest_offset = response['offset']\n offset_response = response\n elif response['status_code'] == 402:\n future_response = response\n else:\n errors.append(response)\n\n if future_response:\n return future_response\n if smallest_offset > timezone.now() and offset_response:\n return offset_response\n if errors:\n return errors[0]\n\n def rules_satisfied(self, user):\n \"\"\"\n Checks a user against rules applied to an attendance event\n \"\"\"\n # If the event has guest attendance, allow absolutely anyone\n if self.guest_attendance:\n return {'status': True, 'status_code': 201}\n\n # If the user is not a member, return False right away\n # TODO check for guest list\n if not user.is_member:\n return {\n 'status': False, 'message':\n _(\"Dette arrangementet er kun åpent for medlemmer.\"), 'status_code': 400}\n\n # If there are no rule_bundles on this object, all members of Online are allowed.\n if not self.rule_bundles.exists() and user.is_member:\n return {'status': True, 'status_code': 200}\n\n # Check all rule bundles\n responses = []\n\n # If one satisfies, return true, else append to the error list\n for rule_bundle in self.rule_bundles.all():\n responses.extend(rule_bundle.satisfied(user, self.registration_start))\n\n return self._process_rulebundle_satisfaction_responses(responses)\n\n def is_attendee(self, user):\n return self.attendees.filter(user=user)\n\n def is_on_waitlist(self, user):\n return reduce(lambda x, y: x or y.user == user, self.waitlist_qs, False)\n\n def what_place_is_user_on_wait_list(self, user):\n if self.waitlist:\n waitlist = self.waitlist_qs\n if waitlist:\n for attendee_object in waitlist:\n if attendee_object.user == user:\n return list(waitlist).index(attendee_object) + 1\n return 0\n\n def __str__(self):\n return self.event.title\n\n class Meta:\n verbose_name = _('påmelding')\n verbose_name_plural = _('påmeldinger')\n permissions = (\n ('view_attendanceevent', 'View AttendanceEvent'),\n )\n\n\nclass CompanyEvent(models.Model):\n \"\"\"\n Company relation to AttendanceEvent\n \"\"\"\n company = models.ForeignKey(Company, verbose_name=_('bedrifter'))\n event = models.ForeignKey(Event, verbose_name=_('arrangement'), related_name='companies')\n\n class Meta:\n verbose_name = _('bedrift')\n verbose_name_plural = _('bedrifter')\n permissions = (\n ('view_companyevent', 'View CompanyEvent'),\n )\n\n\nclass Attendee(models.Model):\n \"\"\"\n User relation to AttendanceEvent.\n \"\"\"\n event = models.ForeignKey(AttendanceEvent, related_name=\"attendees\")\n user = models.ForeignKey(User)\n\n timestamp = models.DateTimeField(auto_now_add=True, editable=False)\n attended = models.BooleanField(_('var tilstede'), default=False)\n paid = models.BooleanField(_('har betalt'), default=False)\n note = models.CharField(_('notat'), max_length=100, blank=True, default='')\n extras = models.ForeignKey(Extras, blank=True, null=True)\n\n def __str__(self):\n return self.user.get_full_name()\n\n def delete(self):\n # Importing here to prevent circular dependencies\n from apps.payment.models import PaymentDelay\n try:\n PaymentDelay.objects.filter(user=self.user, payment=self.event.payment()).delete()\n except PaymentDelay.DoesNotExist:\n # Do nothing\n False\n\n super(Attendee, self).delete()\n\n class Meta:\n ordering = ['timestamp']\n unique_together = (('event', 'user'),)\n permissions = (\n ('view_attendee', 'View Attendee'),\n )\n\n\nclass Reservation(models.Model):\n attendance_event = models.OneToOneField(AttendanceEvent, related_name=\"reserved_seats\")\n seats = models.PositiveIntegerField(\"reserverte plasser\", blank=False, null=False)\n\n @property\n def number_of_seats_taken(self):\n return self.reservees.count()\n\n def __str__(self):\n return \"Reservasjoner for %s\" % self.attendance_event.event.title\n\n class Meta:\n verbose_name = _(\"reservasjon\")\n verbose_name_plural = _(\"reservasjoner\")\n permissions = (\n ('view_reservation', 'View Reservation'),\n )\n\n\nclass Reservee(models.Model):\n \"\"\"\n Reservation entry\n \"\"\"\n reservation = models.ForeignKey(Reservation, related_name='reservees')\n # I 2014 var norges lengste navn på 69 tegn;\n # julius andreas gimli arn macgyver chewbacka highlander elessar-jankov\n name = models.CharField('navn', max_length=69)\n note = models.CharField('notat', max_length=100)\n allergies = models.CharField('allergier', max_length=200, blank=True, null=True)\n\n def __str__(self):\n return self.name\n\n class Meta:\n verbose_name = _(\"reservasjon\")\n verbose_name_plural = _(\"reservasjoner\")\n ordering = ['id']\n permissions = (\n ('view_reservee', 'View Reservee'),\n )\n\n\nclass GroupRestriction(models.Model):\n event = models.OneToOneField(\n Event,\n primary_key=True,\n related_name='group_restriction')\n\n groups = models.ManyToManyField(Group, blank=True,\n help_text=_('Legg til de gruppene som skal ha tilgang til arrangementet'))\n\n class Meta:\n verbose_name = _(\"restriksjon\")\n verbose_name_plural = _(\"restriksjoner\")\n permissions = (\n ('view_restriction', 'View Restriction'),\n )\n", "path": "apps/events/models.py" } ]
diff --git a/apps/events/models.py b/apps/events/models.py index 70df70339..45e0b1c47 100644 --- a/apps/events/models.py +++ b/apps/events/models.py @@ -449,7 +449,7 @@ def reservees_qs(self): @property def attendees_not_paid(self): - return [a for a in self.attendees_qs if a.paid] + return list(self.attendees.filter(paid=False)) @property def number_of_attendees(self):
sonic-net__sonic-utilities-1117
[ { "content": "#!/usr/bin/env python\n#\n# lib.py\n#\n# Helper code for CLI for interacting with switches via console device\n#\n\ntry:\n import click\n import re\n import subprocess\n import sys\nexcept ImportError as e:\n raise ImportError(\"%s - required module not found\" % str(e))\n\nDEVICE_PREFIX = \"/dev/ttyUSB\"\n\nERR_CMD = 1\nERR_DEV = 2\n\nCONSOLE_PORT_TABLE = \"CONSOLE_PORT\"\nBAUD_KEY = \"baud_rate\"\nDEVICE_KEY = \"remote_device\"\nFLOW_KEY = \"flow_control\"\nDEFAULT_BAUD = \"9600\"\n\n# QUIET == True => picocom will not output any messages, and pexpect will wait for console\n# switch login or command line to let user interact with shell\n# Downside: if console switch output ever does not match DEV_READY_MSG, program will think connection failed\n# QUIET == False => picocom will output messages - welcome message is caught by pexpect, so successful\n# connection will always lead to user interacting with shell\n# Downside: at end of session, picocom will print exit message, exposing picocom to user\nQUIET = False\nDEV_READY_MSG = r\"([Ll]ogin:|[Pp]assword:|[$>#])\" # login prompt or command line prompt\nTIMEOUT_SEC = 0.2\n\n# runs command, exit if stderr is written to, returns stdout otherwise\n# input: cmd (str), output: output of cmd (str)\ndef run_command(cmd):\n proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)\n output = proc.stdout.read()\n error = proc.stderr.read()\n if error != \"\":\n click.echo(\"Command resulted in error: {}\".format(error))\n sys.exit(ERR_CMD)\n return output\n\n# returns a sorted list of all devices (whose name matches DEVICE_PREFIX)\ndef getAllDevices():\n cmd = \"ls \" + DEVICE_PREFIX + \"*\"\n output = run_command(cmd)\n\n devices = output.split('\\n')\n devices = list(filter(lambda dev: re.match(DEVICE_PREFIX + r\"\\d+\", dev) != None, devices))\n devices.sort(key=lambda dev: int(dev[len(DEVICE_PREFIX):]))\n\n return devices\n\n# exits if inputted line number does not correspond to a device\n# input: linenum\ndef checkDevice(linenum):\n devices = getAllDevices()\n if DEVICE_PREFIX + str(linenum) not in devices:\n click.echo(\"Line number {} does not exist\".format(linenum))\n sys.exit(ERR_DEV)\n\n# returns a dictionary of busy devices and their info\n# maps line number to (pid, process start time)\ndef getBusyDevices():\n cmd = 'ps -eo pid,lstart,cmd | grep -E \"(mini|pico)com\"'\n output = run_command(cmd)\n processes = output.split('\\n')\n\n # matches any number of spaces then any number of digits\n regexPid = r\" *(\\d+)\"\n # matches anything of form: Xxx Xxx ( 0)or(00) 00:00:00 0000\n regexDate = r\"([A-Z][a-z]{2} [A-Z][a-z]{2} [\\d ]\\d \\d{2}:\\d{2}:\\d{2} \\d{4})\"\n # matches any non-whitespace characters ending in minicom or picocom,\n # then a space and any chars followed by /dev/ttyUSB<any digits>,\n # then a space and any chars\n regexCmd = r\"\\S*(?:(?:mini)|(?:pico))com .*\" + DEVICE_PREFIX + r\"(\\d+)(?: .*)?\"\n regexProcess = re.compile(r\"^\"+regexPid+r\" \"+regexDate+r\" \"+regexCmd+r\"$\")\n\n busyDevices = {}\n for process in processes:\n match = regexProcess.match(process)\n if match != None:\n pid = match.group(1)\n date = match.group(2)\n linenum_key = match.group(3)\n busyDevices[linenum_key] = (pid, date)\n return busyDevices\n\n# returns actual baud rate, configured baud rate,\n# and flow control settings of device corresponding to line number\n# input: linenum (str), output: (actual baud (str), configured baud (str), flow control (bool))\ndef getConnectionInfo(linenum):\n config_db = ConfigDBConnector()\n config_db.connect()\n entry = config_db.get_entry(CONSOLE_PORT_TABLE, str(linenum))\n\n conf_baud = \"-\" if BAUD_KEY not in entry else entry[BAUD_KEY]\n act_baud = DEFAULT_BAUD if conf_baud == \"-\" else conf_baud\n flow_control = False\n if FLOW_KEY in entry and entry[FLOW_KEY] == \"1\":\n flow_control = True\n\n return (act_baud, conf_baud, flow_control)\n\n# returns the line number corresponding to target, or exits if line number cannot be found\n# if deviceBool, interprets target as device name\n# otherwise interprets target as line number\n# input: target (str), deviceBool (bool), output: linenum (str)\ndef getLineNumber(target, deviceBool):\n if not deviceBool:\n return target\n\n config_db = ConfigDBConnector()\n config_db.connect()\n\n devices = getAllDevices()\n linenums = list(map(lambda dev: dev[len(DEVICE_PREFIX):], devices))\n\n for linenum in linenums:\n entry = config_db.get_entry(CONSOLE_PORT_TABLE, linenum)\n if DEVICE_KEY in entry and entry[DEVICE_KEY] == target:\n return linenum\n\n click.echo(\"Device {} does not exist\".format(target))\n sys.exit(ERR_DEV)\n return \"\"\n", "path": "consutil/lib.py" } ]
[ { "content": "#!/usr/bin/env python\n#\n# lib.py\n#\n# Helper code for CLI for interacting with switches via console device\n#\n\ntry:\n import click\n import re\n import subprocess\n import sys\n from swsssdk import ConfigDBConnector\nexcept ImportError as e:\n raise ImportError(\"%s - required module not found\" % str(e))\n\nDEVICE_PREFIX = \"/dev/ttyUSB\"\n\nERR_CMD = 1\nERR_DEV = 2\n\nCONSOLE_PORT_TABLE = \"CONSOLE_PORT\"\nBAUD_KEY = \"baud_rate\"\nDEVICE_KEY = \"remote_device\"\nFLOW_KEY = \"flow_control\"\nDEFAULT_BAUD = \"9600\"\n\n# QUIET == True => picocom will not output any messages, and pexpect will wait for console\n# switch login or command line to let user interact with shell\n# Downside: if console switch output ever does not match DEV_READY_MSG, program will think connection failed\n# QUIET == False => picocom will output messages - welcome message is caught by pexpect, so successful\n# connection will always lead to user interacting with shell\n# Downside: at end of session, picocom will print exit message, exposing picocom to user\nQUIET = False\nDEV_READY_MSG = r\"([Ll]ogin:|[Pp]assword:|[$>#])\" # login prompt or command line prompt\nTIMEOUT_SEC = 0.2\n\n# runs command, exit if stderr is written to, returns stdout otherwise\n# input: cmd (str), output: output of cmd (str)\ndef run_command(cmd):\n proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)\n output = proc.stdout.read()\n error = proc.stderr.read()\n if error != \"\":\n click.echo(\"Command resulted in error: {}\".format(error))\n sys.exit(ERR_CMD)\n return output\n\n# returns a sorted list of all devices (whose name matches DEVICE_PREFIX)\ndef getAllDevices():\n cmd = \"ls \" + DEVICE_PREFIX + \"*\"\n output = run_command(cmd)\n\n devices = output.split('\\n')\n devices = list(filter(lambda dev: re.match(DEVICE_PREFIX + r\"\\d+\", dev) != None, devices))\n devices.sort(key=lambda dev: int(dev[len(DEVICE_PREFIX):]))\n\n return devices\n\n# exits if inputted line number does not correspond to a device\n# input: linenum\ndef checkDevice(linenum):\n devices = getAllDevices()\n if DEVICE_PREFIX + str(linenum) not in devices:\n click.echo(\"Line number {} does not exist\".format(linenum))\n sys.exit(ERR_DEV)\n\n# returns a dictionary of busy devices and their info\n# maps line number to (pid, process start time)\ndef getBusyDevices():\n cmd = 'ps -eo pid,lstart,cmd | grep -E \"(mini|pico)com\"'\n output = run_command(cmd)\n processes = output.split('\\n')\n\n # matches any number of spaces then any number of digits\n regexPid = r\" *(\\d+)\"\n # matches anything of form: Xxx Xxx ( 0)or(00) 00:00:00 0000\n regexDate = r\"([A-Z][a-z]{2} [A-Z][a-z]{2} [\\d ]\\d \\d{2}:\\d{2}:\\d{2} \\d{4})\"\n # matches any non-whitespace characters ending in minicom or picocom,\n # then a space and any chars followed by /dev/ttyUSB<any digits>,\n # then a space and any chars\n regexCmd = r\"\\S*(?:(?:mini)|(?:pico))com .*\" + DEVICE_PREFIX + r\"(\\d+)(?: .*)?\"\n regexProcess = re.compile(r\"^\"+regexPid+r\" \"+regexDate+r\" \"+regexCmd+r\"$\")\n\n busyDevices = {}\n for process in processes:\n match = regexProcess.match(process)\n if match != None:\n pid = match.group(1)\n date = match.group(2)\n linenum_key = match.group(3)\n busyDevices[linenum_key] = (pid, date)\n return busyDevices\n\n# returns actual baud rate, configured baud rate,\n# and flow control settings of device corresponding to line number\n# input: linenum (str), output: (actual baud (str), configured baud (str), flow control (bool))\ndef getConnectionInfo(linenum):\n config_db = ConfigDBConnector()\n config_db.connect()\n entry = config_db.get_entry(CONSOLE_PORT_TABLE, str(linenum))\n\n conf_baud = \"-\" if BAUD_KEY not in entry else entry[BAUD_KEY]\n act_baud = DEFAULT_BAUD if conf_baud == \"-\" else conf_baud\n flow_control = False\n if FLOW_KEY in entry and entry[FLOW_KEY] == \"1\":\n flow_control = True\n\n return (act_baud, conf_baud, flow_control)\n\n# returns the line number corresponding to target, or exits if line number cannot be found\n# if deviceBool, interprets target as device name\n# otherwise interprets target as line number\n# input: target (str), deviceBool (bool), output: linenum (str)\ndef getLineNumber(target, deviceBool):\n if not deviceBool:\n return target\n\n config_db = ConfigDBConnector()\n config_db.connect()\n\n devices = getAllDevices()\n linenums = list(map(lambda dev: dev[len(DEVICE_PREFIX):], devices))\n\n for linenum in linenums:\n entry = config_db.get_entry(CONSOLE_PORT_TABLE, linenum)\n if DEVICE_KEY in entry and entry[DEVICE_KEY] == target:\n return linenum\n\n click.echo(\"Device {} does not exist\".format(target))\n sys.exit(ERR_DEV)\n return \"\"\n", "path": "consutil/lib.py" } ]
diff --git a/consutil/lib.py b/consutil/lib.py index 0ffa88691d..6dbef913b8 100644 --- a/consutil/lib.py +++ b/consutil/lib.py @@ -10,6 +10,7 @@ import re import subprocess import sys + from swsssdk import ConfigDBConnector except ImportError as e: raise ImportError("%s - required module not found" % str(e))
pypa__cibuildwheel-1065
[ { "content": "from setuptools import setup\n\nextras = {\n \"docs\": [\n \"mkdocs-include-markdown-plugin==2.8.0\",\n \"mkdocs==1.0.4\",\n \"pymdown-extensions\",\n \"mkdocs-macros-plugin\",\n ],\n \"test\": [\n \"jinja2\",\n \"pytest>=6\",\n \"pytest-timeout\",\n \"pytest-xdist\",\n ],\n \"bin\": [\n \"click\",\n \"ghapi\",\n \"pip-tools\",\n \"pygithub\",\n \"pyyaml\",\n \"requests\",\n \"rich>=9.6\",\n \"packaging>=21.0\",\n ],\n \"mypy\": [\n \"mypy>=0.901\",\n \"types-jinja2\",\n \"types-certifi\",\n \"types-toml\",\n \"types-jinja2\",\n \"types-pyyaml\",\n \"types-click\",\n \"types-requests\",\n ],\n}\n\nextras[\"dev\"] = [\n *extras[\"mypy\"],\n *extras[\"test\"],\n *extras[\"bin\"],\n]\n\nextras[\"all\"] = sum(extras.values(), [])\n\nsetup(extras_require=extras)\n", "path": "setup.py" } ]
[ { "content": "from setuptools import setup\n\nextras = {\n \"docs\": [\n \"mkdocs-include-markdown-plugin==2.8.0\",\n \"mkdocs==1.0.4\",\n \"jinja2==3.0.3\",\n \"pymdown-extensions\",\n \"mkdocs-macros-plugin\",\n ],\n \"test\": [\n \"jinja2\",\n \"pytest>=6\",\n \"pytest-timeout\",\n \"pytest-xdist\",\n ],\n \"bin\": [\n \"click\",\n \"ghapi\",\n \"pip-tools\",\n \"pygithub\",\n \"pyyaml\",\n \"requests\",\n \"rich>=9.6\",\n \"packaging>=21.0\",\n ],\n \"mypy\": [\n \"mypy>=0.901\",\n \"types-jinja2\",\n \"types-certifi\",\n \"types-toml\",\n \"types-jinja2\",\n \"types-pyyaml\",\n \"types-click\",\n \"types-requests\",\n ],\n}\n\nextras[\"dev\"] = [\n *extras[\"mypy\"],\n *extras[\"test\"],\n *extras[\"bin\"],\n]\n\nextras[\"all\"] = sum(extras.values(), [])\n\nsetup(extras_require=extras)\n", "path": "setup.py" } ]
diff --git a/docs/options.md b/docs/options.md index 45f67873a..c9d7b7425 100644 --- a/docs/options.md +++ b/docs/options.md @@ -402,7 +402,7 @@ This option can also be set using the [command-line option](#command-line) > Manually set the Python compatibility of your project By default, cibuildwheel reads your package's Python compatibility from -`pyproject.toml` following [PEP621](https://www.python.org/dev/peps/pep-0621/) +`pyproject.toml` following the [project metadata specification](https://packaging.python.org/en/latest/specifications/declaring-project-metadata/) or from `setup.cfg`; finally it will try to inspect the AST of `setup.py` for a simple keyword assignment in a top level function call. If you need to override this behaviour for some reason, you can use this option. @@ -416,42 +416,29 @@ Default: reads your package's Python compatibility from `pyproject.toml` `setup.py` `setup(python_requires="...")`. If not found, cibuildwheel assumes the package is compatible with all versions of Python that it can build. - !!! note - Rather than using this option, it's recommended you set - `project.requires-python` in `pyproject.toml` instead: - Example `pyproject.toml`: + Rather than using this environment variable, it's recommended you set this value + statically in a way that your build backend can use it, too. This ensures + that your package's metadata is correct when published on PyPI. This + cibuildwheel-specific option is provided as an override, and therefore is only + available in environment variable form. + + - If you have a `pyproject.toml` containing a `[project]` table, you can + specify `requires-python` there. + ```toml [project] + ... requires-python = ">=3.6" + ``` - # Aside - in pyproject.toml you should always specify minimal build - # system options, like this: - - [build-system] - requires = ["setuptools>=42", "wheel"] - build-backend = "setuptools.build_meta" - - - Currently, setuptools has not yet added support for reading this value from - pyproject.toml yet, and so does not copy it to Requires-Python in the wheel - metadata. This mechanism is used by pip to scan through older versions of - your package until it finds a release compatible with the current version - of Python compatible when installing, so it is an important value to set if - you plan to drop support for a version of Python in the future. - - If you don't want to list this value twice, you can also use the setuptools - specific location in `setup.cfg` and cibuildwheel will detect it from - there. Example `setup.cfg`: - - [options] - python_requires = ">=3.6" - + Note that not all build backends fully support using a `[project]` table yet; + specifically setuptools just added experimental support in version 61. + Adding `[project]` to `pyproject.toml` requires all the other supported + values to be specified there, or to be listed in `dynamic`. -This option is not available in `pyproject.toml` under -`tool.cibuildwheel.project-requires-python`, since it should be set with the -[PEP621](https://www.python.org/dev/peps/pep-0621/) location instead, -`project.requires-python`. + - If you're using setuptools, [you can set this value in `setup.cfg` (preferred) or `setup.py`](https://setuptools.pypa.io/en/latest/userguide/dependency_management.html#python-requirement) + and cibuildwheel will read it from there. #### Examples diff --git a/setup.py b/setup.py index 621ccf273..96b4d10c9 100644 --- a/setup.py +++ b/setup.py @@ -4,6 +4,7 @@ "docs": [ "mkdocs-include-markdown-plugin==2.8.0", "mkdocs==1.0.4", + "jinja2==3.0.3", "pymdown-extensions", "mkdocs-macros-plugin", ],
cupy__cupy-6208
[ { "content": "import numpy\n\nimport cupy\nfrom cupy._core.internal import _get_strides_for_order_K, _update_order_char\n\n\ndef empty(shape, dtype=float, order='C'):\n \"\"\"Returns an array without initializing the elements.\n\n Args:\n shape (int or tuple of ints): Dimensionalities of the array.\n dtype: Data type specifier.\n order ({'C', 'F'}): Row-major (C-style) or column-major\n (Fortran-style) order.\n\n Returns:\n cupy.ndarray: A new array with elements not initialized.\n\n .. seealso:: :func:`numpy.empty`\n\n \"\"\"\n return cupy.ndarray(shape, dtype, order=order)\n\n\ndef _new_like_order_and_strides(\n a, dtype, order, shape=None, *, get_memptr=True):\n \"\"\"\n Determine order and strides as in NumPy's PyArray_NewLikeArray.\n\n (see: numpy/core/src/multiarray/ctors.c)\n \"\"\"\n order = order.upper()\n if order not in ['C', 'F', 'K', 'A']:\n raise ValueError('order not understood: {}'.format(order))\n\n if numpy.isscalar(shape):\n shape = (shape,)\n\n # Fallback to c_contiguous if keep order and number of dimensions\n # of new shape mismatch\n if order == 'K' and shape is not None and len(shape) != a.ndim:\n return 'C', None, None\n\n order = chr(_update_order_char(\n a.flags.c_contiguous, a.flags.f_contiguous, ord(order)))\n\n if order == 'K':\n strides = _get_strides_for_order_K(a, numpy.dtype(dtype), shape)\n order = 'C'\n memptr = cupy.empty(a.size, dtype=dtype).data if get_memptr else None\n return order, strides, memptr\n else:\n return order, None, None\n\n\ndef empty_like(a, dtype=None, order='K', subok=None, shape=None):\n \"\"\"Returns a new array with same shape and dtype of a given array.\n\n This function currently does not support ``subok`` option.\n\n Args:\n a (cupy.ndarray): Base array.\n dtype: Data type specifier. The data type of ``a`` is used by default.\n order ({'C', 'F', 'A', or 'K'}): Overrides the memory layout of the\n result. ``'C'`` means C-order, ``'F'`` means F-order, ``'A'`` means\n ``'F'`` if ``a`` is Fortran contiguous, ``'C'`` otherwise.\n ``'K'`` means match the layout of ``a`` as closely as possible.\n subok: Not supported yet, must be None.\n shape (int or tuple of ints): Overrides the shape of the result. If\n ``order='K'`` and the number of dimensions is unchanged, will try\n to keep order, otherwise, ``order='C'`` is implied.\n\n Returns:\n cupy.ndarray: A new array with same shape and dtype of ``a`` with\n elements not initialized.\n\n .. seealso:: :func:`numpy.empty_like`\n\n \"\"\"\n if subok is not None:\n raise TypeError('subok is not supported yet')\n if dtype is None:\n dtype = a.dtype\n\n order, strides, memptr = _new_like_order_and_strides(a, dtype, order,\n shape)\n shape = shape if shape else a.shape\n return cupy.ndarray(shape, dtype, memptr, strides, order)\n\n\ndef eye(N, M=None, k=0, dtype=float, order='C'):\n \"\"\"Returns a 2-D array with ones on the diagonals and zeros elsewhere.\n\n Args:\n N (int): Number of rows.\n M (int): Number of columns. ``M == N`` by default.\n k (int): Index of the diagonal. Zero indicates the main diagonal,\n a positive index an upper diagonal, and a negative index a lower\n diagonal.\n dtype: Data type specifier.\n order ({'C', 'F'}): Row-major (C-style) or column-major\n (Fortran-style) order.\n\n Returns:\n cupy.ndarray: A 2-D array with given diagonals filled with ones and\n zeros elsewhere.\n\n .. seealso:: :func:`numpy.eye`\n\n \"\"\"\n if M is None:\n M = N\n ret = zeros((N, M), dtype, order=order)\n ret.diagonal(k)[:] = 1\n return ret\n\n\ndef identity(n, dtype=float):\n \"\"\"Returns a 2-D identity array.\n\n It is equivalent to ``eye(n, n, dtype)``.\n\n Args:\n n (int): Number of rows and columns.\n dtype: Data type specifier.\n\n Returns:\n cupy.ndarray: A 2-D identity array.\n\n .. seealso:: :func:`numpy.identity`\n\n \"\"\"\n return eye(n, dtype=dtype)\n\n\ndef ones(shape, dtype=float, order='C'):\n \"\"\"Returns a new array of given shape and dtype, filled with ones.\n\n This function currently does not support ``order`` option.\n\n Args:\n shape (int or tuple of ints): Dimensionalities of the array.\n dtype: Data type specifier.\n order ({'C', 'F'}): Row-major (C-style) or column-major\n (Fortran-style) order.\n\n Returns:\n cupy.ndarray: An array filled with ones.\n\n .. seealso:: :func:`numpy.ones`\n\n \"\"\"\n a = cupy.ndarray(shape, dtype, order=order)\n a.fill(1)\n return a\n\n\ndef ones_like(a, dtype=None, order='K', subok=None, shape=None):\n \"\"\"Returns an array of ones with same shape and dtype as a given array.\n\n This function currently does not support ``subok`` option.\n\n Args:\n a (cupy.ndarray): Base array.\n dtype: Data type specifier. The dtype of ``a`` is used by default.\n order ({'C', 'F', 'A', or 'K'}): Overrides the memory layout of the\n result. ``'C'`` means C-order, ``'F'`` means F-order, ``'A'`` means\n ``'F'`` if ``a`` is Fortran contiguous, ``'C'`` otherwise.\n ``'K'`` means match the layout of ``a`` as closely as possible.\n subok: Not supported yet, must be None.\n shape (int or tuple of ints): Overrides the shape of the result. If\n ``order='K'`` and the number of dimensions is unchanged, will try\n to keep order, otherwise, ``order='C'`` is implied.\n\n Returns:\n cupy.ndarray: An array filled with ones.\n\n .. seealso:: :func:`numpy.ones_like`\n\n \"\"\"\n if subok is not None:\n raise TypeError('subok is not supported yet')\n if dtype is None:\n dtype = a.dtype\n\n order, strides, memptr = _new_like_order_and_strides(a, dtype, order,\n shape)\n shape = shape if shape else a.shape\n a = cupy.ndarray(shape, dtype, memptr, strides, order)\n a.fill(1)\n return a\n\n\ndef zeros(shape, dtype=float, order='C'):\n \"\"\"Returns a new array of given shape and dtype, filled with zeros.\n\n Args:\n shape (int or tuple of ints): Dimensionalities of the array.\n dtype: Data type specifier.\n order ({'C', 'F'}): Row-major (C-style) or column-major\n (Fortran-style) order.\n\n Returns:\n cupy.ndarray: An array filled with zeros.\n\n .. seealso:: :func:`numpy.zeros`\n\n \"\"\"\n a = cupy.ndarray(shape, dtype, order=order)\n a.data.memset_async(0, a.nbytes)\n return a\n\n\ndef zeros_like(a, dtype=None, order='K', subok=None, shape=None):\n \"\"\"Returns an array of zeros with same shape and dtype as a given array.\n\n This function currently does not support ``subok`` option.\n\n Args:\n a (cupy.ndarray): Base array.\n dtype: Data type specifier. The dtype of ``a`` is used by default.\n order ({'C', 'F', 'A', or 'K'}): Overrides the memory layout of the\n result. ``'C'`` means C-order, ``'F'`` means F-order, ``'A'`` means\n ``'F'`` if ``a`` is Fortran contiguous, ``'C'`` otherwise.\n ``'K'`` means match the layout of ``a`` as closely as possible.\n subok: Not supported yet, must be None.\n shape (int or tuple of ints): Overrides the shape of the result. If\n ``order='K'`` and the number of dimensions is unchanged, will try\n to keep order, otherwise, ``order='C'`` is implied.\n\n Returns:\n cupy.ndarray: An array filled with zeros.\n\n .. seealso:: :func:`numpy.zeros_like`\n\n \"\"\"\n if subok is not None:\n raise TypeError('subok is not supported yet')\n if dtype is None:\n dtype = a.dtype\n\n order, strides, memptr = _new_like_order_and_strides(a, dtype, order,\n shape)\n shape = shape if shape else a.shape\n a = cupy.ndarray(shape, dtype, memptr, strides, order)\n a.data.memset_async(0, a.nbytes)\n return a\n\n\ndef full(shape, fill_value, dtype=None, order='C'):\n \"\"\"Returns a new array of given shape and dtype, filled with a given value.\n\n This function currently does not support ``order`` option.\n\n Args:\n shape (int or tuple of ints): Dimensionalities of the array.\n fill_value: A scalar value to fill a new array.\n dtype: Data type specifier.\n order ({'C', 'F'}): Row-major (C-style) or column-major\n (Fortran-style) order.\n\n Returns:\n cupy.ndarray: An array filled with ``fill_value``.\n\n .. seealso:: :func:`numpy.full`\n\n \"\"\"\n if dtype is None:\n if isinstance(fill_value, cupy.ndarray):\n dtype = fill_value.dtype\n else:\n dtype = numpy.array(fill_value).dtype\n a = cupy.ndarray(shape, dtype, order=order)\n a.fill(fill_value)\n return a\n\n\ndef full_like(a, fill_value, dtype=None, order='K', subok=None, shape=None):\n \"\"\"Returns a full array with same shape and dtype as a given array.\n\n This function currently does not support ``subok`` option.\n\n Args:\n a (cupy.ndarray): Base array.\n fill_value: A scalar value to fill a new array.\n dtype: Data type specifier. The dtype of ``a`` is used by default.\n order ({'C', 'F', 'A', or 'K'}): Overrides the memory layout of the\n result. ``'C'`` means C-order, ``'F'`` means F-order, ``'A'`` means\n ``'F'`` if ``a`` is Fortran contiguous, ``'C'`` otherwise.\n ``'K'`` means match the layout of ``a`` as closely as possible.\n subok: Not supported yet, must be None.\n shape (int or tuple of ints): Overrides the shape of the result. If\n ``order='K'`` and the number of dimensions is unchanged, will try\n to keep order, otherwise, ``order='C'`` is implied.\n\n Returns:\n cupy.ndarray: An array filled with ``fill_value``.\n\n .. seealso:: :func:`numpy.full_like`\n\n \"\"\"\n if subok is not None:\n raise TypeError('subok is not supported yet')\n if dtype is None:\n dtype = a.dtype\n\n order, strides, memptr = _new_like_order_and_strides(a, dtype, order,\n shape)\n shape = shape if shape else a.shape\n a = cupy.ndarray(shape, dtype, memptr, strides, order)\n a.fill(fill_value)\n return a\n", "path": "cupy/_creation/basic.py" } ]
[ { "content": "import numpy\n\nimport cupy\nfrom cupy._core.internal import _get_strides_for_order_K, _update_order_char\n\n\ndef empty(shape, dtype=float, order='C'):\n \"\"\"Returns an array without initializing the elements.\n\n Args:\n shape (int or tuple of ints): Dimensionalities of the array.\n dtype: Data type specifier.\n order ({'C', 'F'}): Row-major (C-style) or column-major\n (Fortran-style) order.\n\n Returns:\n cupy.ndarray: A new array with elements not initialized.\n\n .. seealso:: :func:`numpy.empty`\n\n \"\"\"\n return cupy.ndarray(shape, dtype, order=order)\n\n\ndef _new_like_order_and_strides(\n a, dtype, order, shape=None, *, get_memptr=True):\n \"\"\"\n Determine order and strides as in NumPy's PyArray_NewLikeArray.\n\n (see: numpy/core/src/multiarray/ctors.c)\n \"\"\"\n order = order.upper()\n if order not in ['C', 'F', 'K', 'A']:\n raise ValueError('order not understood: {}'.format(order))\n\n if numpy.isscalar(shape):\n shape = (shape,)\n\n # Fallback to c_contiguous if keep order and number of dimensions\n # of new shape mismatch\n if order == 'K' and shape is not None and len(shape) != a.ndim:\n return 'C', None, None\n\n order = chr(_update_order_char(\n a.flags.c_contiguous, a.flags.f_contiguous, ord(order)))\n\n if order == 'K':\n strides = _get_strides_for_order_K(a, numpy.dtype(dtype), shape)\n order = 'C'\n memptr = cupy.empty(a.size, dtype=dtype).data if get_memptr else None\n return order, strides, memptr\n else:\n return order, None, None\n\n\ndef empty_like(a, dtype=None, order='K', subok=None, shape=None):\n \"\"\"Returns a new array with same shape and dtype of a given array.\n\n This function currently does not support ``subok`` option.\n\n Args:\n a (cupy.ndarray): Base array.\n dtype: Data type specifier. The data type of ``a`` is used by default.\n order ({'C', 'F', 'A', or 'K'}): Overrides the memory layout of the\n result. ``'C'`` means C-order, ``'F'`` means F-order, ``'A'`` means\n ``'F'`` if ``a`` is Fortran contiguous, ``'C'`` otherwise.\n ``'K'`` means match the layout of ``a`` as closely as possible.\n subok: Not supported yet, must be None.\n shape (int or tuple of ints): Overrides the shape of the result. If\n ``order='K'`` and the number of dimensions is unchanged, will try\n to keep order, otherwise, ``order='C'`` is implied.\n\n Returns:\n cupy.ndarray: A new array with same shape and dtype of ``a`` with\n elements not initialized.\n\n .. seealso:: :func:`numpy.empty_like`\n\n \"\"\"\n if subok is not None:\n raise TypeError('subok is not supported yet')\n if dtype is None:\n dtype = a.dtype\n\n order, strides, memptr = _new_like_order_and_strides(a, dtype, order,\n shape)\n shape = shape if shape else a.shape\n return cupy.ndarray(shape, dtype, memptr, strides, order)\n\n\ndef eye(N, M=None, k=0, dtype=float, order='C'):\n \"\"\"Returns a 2-D array with ones on the diagonals and zeros elsewhere.\n\n Args:\n N (int): Number of rows.\n M (int): Number of columns. ``M == N`` by default.\n k (int): Index of the diagonal. Zero indicates the main diagonal,\n a positive index an upper diagonal, and a negative index a lower\n diagonal.\n dtype: Data type specifier.\n order ({'C', 'F'}): Row-major (C-style) or column-major\n (Fortran-style) order.\n\n Returns:\n cupy.ndarray: A 2-D array with given diagonals filled with ones and\n zeros elsewhere.\n\n .. seealso:: :func:`numpy.eye`\n\n \"\"\"\n if M is None:\n M = N\n ret = zeros((N, M), dtype=dtype, order=order)\n if k <= -N or k >= M:\n return ret\n ret.diagonal(k)[:] = 1\n return ret\n\n\ndef identity(n, dtype=float):\n \"\"\"Returns a 2-D identity array.\n\n It is equivalent to ``eye(n, n, dtype)``.\n\n Args:\n n (int): Number of rows and columns.\n dtype: Data type specifier.\n\n Returns:\n cupy.ndarray: A 2-D identity array.\n\n .. seealso:: :func:`numpy.identity`\n\n \"\"\"\n return eye(n, dtype=dtype)\n\n\ndef ones(shape, dtype=float, order='C'):\n \"\"\"Returns a new array of given shape and dtype, filled with ones.\n\n This function currently does not support ``order`` option.\n\n Args:\n shape (int or tuple of ints): Dimensionalities of the array.\n dtype: Data type specifier.\n order ({'C', 'F'}): Row-major (C-style) or column-major\n (Fortran-style) order.\n\n Returns:\n cupy.ndarray: An array filled with ones.\n\n .. seealso:: :func:`numpy.ones`\n\n \"\"\"\n a = cupy.ndarray(shape, dtype, order=order)\n a.fill(1)\n return a\n\n\ndef ones_like(a, dtype=None, order='K', subok=None, shape=None):\n \"\"\"Returns an array of ones with same shape and dtype as a given array.\n\n This function currently does not support ``subok`` option.\n\n Args:\n a (cupy.ndarray): Base array.\n dtype: Data type specifier. The dtype of ``a`` is used by default.\n order ({'C', 'F', 'A', or 'K'}): Overrides the memory layout of the\n result. ``'C'`` means C-order, ``'F'`` means F-order, ``'A'`` means\n ``'F'`` if ``a`` is Fortran contiguous, ``'C'`` otherwise.\n ``'K'`` means match the layout of ``a`` as closely as possible.\n subok: Not supported yet, must be None.\n shape (int or tuple of ints): Overrides the shape of the result. If\n ``order='K'`` and the number of dimensions is unchanged, will try\n to keep order, otherwise, ``order='C'`` is implied.\n\n Returns:\n cupy.ndarray: An array filled with ones.\n\n .. seealso:: :func:`numpy.ones_like`\n\n \"\"\"\n if subok is not None:\n raise TypeError('subok is not supported yet')\n if dtype is None:\n dtype = a.dtype\n\n order, strides, memptr = _new_like_order_and_strides(a, dtype, order,\n shape)\n shape = shape if shape else a.shape\n a = cupy.ndarray(shape, dtype, memptr, strides, order)\n a.fill(1)\n return a\n\n\ndef zeros(shape, dtype=float, order='C'):\n \"\"\"Returns a new array of given shape and dtype, filled with zeros.\n\n Args:\n shape (int or tuple of ints): Dimensionalities of the array.\n dtype: Data type specifier.\n order ({'C', 'F'}): Row-major (C-style) or column-major\n (Fortran-style) order.\n\n Returns:\n cupy.ndarray: An array filled with zeros.\n\n .. seealso:: :func:`numpy.zeros`\n\n \"\"\"\n a = cupy.ndarray(shape, dtype, order=order)\n a.data.memset_async(0, a.nbytes)\n return a\n\n\ndef zeros_like(a, dtype=None, order='K', subok=None, shape=None):\n \"\"\"Returns an array of zeros with same shape and dtype as a given array.\n\n This function currently does not support ``subok`` option.\n\n Args:\n a (cupy.ndarray): Base array.\n dtype: Data type specifier. The dtype of ``a`` is used by default.\n order ({'C', 'F', 'A', or 'K'}): Overrides the memory layout of the\n result. ``'C'`` means C-order, ``'F'`` means F-order, ``'A'`` means\n ``'F'`` if ``a`` is Fortran contiguous, ``'C'`` otherwise.\n ``'K'`` means match the layout of ``a`` as closely as possible.\n subok: Not supported yet, must be None.\n shape (int or tuple of ints): Overrides the shape of the result. If\n ``order='K'`` and the number of dimensions is unchanged, will try\n to keep order, otherwise, ``order='C'`` is implied.\n\n Returns:\n cupy.ndarray: An array filled with zeros.\n\n .. seealso:: :func:`numpy.zeros_like`\n\n \"\"\"\n if subok is not None:\n raise TypeError('subok is not supported yet')\n if dtype is None:\n dtype = a.dtype\n\n order, strides, memptr = _new_like_order_and_strides(a, dtype, order,\n shape)\n shape = shape if shape else a.shape\n a = cupy.ndarray(shape, dtype, memptr, strides, order)\n a.data.memset_async(0, a.nbytes)\n return a\n\n\ndef full(shape, fill_value, dtype=None, order='C'):\n \"\"\"Returns a new array of given shape and dtype, filled with a given value.\n\n This function currently does not support ``order`` option.\n\n Args:\n shape (int or tuple of ints): Dimensionalities of the array.\n fill_value: A scalar value to fill a new array.\n dtype: Data type specifier.\n order ({'C', 'F'}): Row-major (C-style) or column-major\n (Fortran-style) order.\n\n Returns:\n cupy.ndarray: An array filled with ``fill_value``.\n\n .. seealso:: :func:`numpy.full`\n\n \"\"\"\n if dtype is None:\n if isinstance(fill_value, cupy.ndarray):\n dtype = fill_value.dtype\n else:\n dtype = numpy.array(fill_value).dtype\n a = cupy.ndarray(shape, dtype, order=order)\n a.fill(fill_value)\n return a\n\n\ndef full_like(a, fill_value, dtype=None, order='K', subok=None, shape=None):\n \"\"\"Returns a full array with same shape and dtype as a given array.\n\n This function currently does not support ``subok`` option.\n\n Args:\n a (cupy.ndarray): Base array.\n fill_value: A scalar value to fill a new array.\n dtype: Data type specifier. The dtype of ``a`` is used by default.\n order ({'C', 'F', 'A', or 'K'}): Overrides the memory layout of the\n result. ``'C'`` means C-order, ``'F'`` means F-order, ``'A'`` means\n ``'F'`` if ``a`` is Fortran contiguous, ``'C'`` otherwise.\n ``'K'`` means match the layout of ``a`` as closely as possible.\n subok: Not supported yet, must be None.\n shape (int or tuple of ints): Overrides the shape of the result. If\n ``order='K'`` and the number of dimensions is unchanged, will try\n to keep order, otherwise, ``order='C'`` is implied.\n\n Returns:\n cupy.ndarray: An array filled with ``fill_value``.\n\n .. seealso:: :func:`numpy.full_like`\n\n \"\"\"\n if subok is not None:\n raise TypeError('subok is not supported yet')\n if dtype is None:\n dtype = a.dtype\n\n order, strides, memptr = _new_like_order_and_strides(a, dtype, order,\n shape)\n shape = shape if shape else a.shape\n a = cupy.ndarray(shape, dtype, memptr, strides, order)\n a.fill(fill_value)\n return a\n", "path": "cupy/_creation/basic.py" } ]
diff --git a/cupy/_creation/basic.py b/cupy/_creation/basic.py index e8095b2fa15..a5ad91cff22 100644 --- a/cupy/_creation/basic.py +++ b/cupy/_creation/basic.py @@ -110,7 +110,9 @@ def eye(N, M=None, k=0, dtype=float, order='C'): """ if M is None: M = N - ret = zeros((N, M), dtype, order=order) + ret = zeros((N, M), dtype=dtype, order=order) + if k <= -N or k >= M: + return ret ret.diagonal(k)[:] = 1 return ret diff --git a/tests/cupy_tests/creation_tests/test_basic.py b/tests/cupy_tests/creation_tests/test_basic.py index 3a97a59ca9b..46d83955706 100644 --- a/tests/cupy_tests/creation_tests/test_basic.py +++ b/tests/cupy_tests/creation_tests/test_basic.py @@ -1,5 +1,3 @@ -import unittest - import numpy import pytest @@ -7,8 +5,7 @@ from cupy import testing -@testing.gpu -class TestBasic(unittest.TestCase): +class TestBasic: @testing.for_CF_orders() @testing.for_all_dtypes() @testing.numpy_cupy_array_equal() @@ -172,11 +169,12 @@ def test_empty_zero_sized_array_strides(self, order): b = cupy.empty((1, 0, 2), dtype='d', order=order) assert b.strides == a.strides + @pytest.mark.parametrize('offset', [1, -1, 1 << 63, -(1 << 63)]) @testing.for_CF_orders() @testing.for_all_dtypes() @testing.numpy_cupy_array_equal() - def test_eye(self, xp, dtype, order): - return xp.eye(5, 4, 1, dtype, order=order) + def test_eye(self, xp, dtype, order, offset): + return xp.eye(5, 4, offset, dtype, order=order) @testing.for_all_dtypes() @testing.numpy_cupy_array_equal() @@ -280,8 +278,7 @@ def test_full_like_subok(self): 'shape': [4, (4, ), (4, 2), (4, 2, 3), (5, 4, 2, 3)], }) ) -@testing.gpu -class TestBasicReshape(unittest.TestCase): +class TestBasicReshape: @testing.with_requires('numpy>=1.17.0') @testing.for_orders('CFAK')
inventree__InvenTree-1544
[ { "content": "# -*- coding: utf-8 -*-\n\nfrom shutil import copyfile\nimport os\nimport json\nimport sys\n\ntry:\n from invoke import ctask as task\nexcept:\n from invoke import task\n\n\ndef apps():\n \"\"\"\n Returns a list of installed apps\n \"\"\"\n\n return [\n 'barcode',\n 'build',\n 'common',\n 'company',\n 'label',\n 'order',\n 'part',\n 'report',\n 'stock',\n 'InvenTree',\n 'users',\n ]\n\n\ndef localDir():\n \"\"\"\n Returns the directory of *THIS* file.\n Used to ensure that the various scripts always run\n in the correct directory.\n \"\"\"\n return os.path.dirname(os.path.abspath(__file__))\n\n\ndef managePyDir():\n \"\"\"\n Returns the directory of the manage.py file\n \"\"\"\n\n return os.path.join(localDir(), 'InvenTree')\n\n\ndef managePyPath():\n \"\"\"\n Return the path of the manage.py file\n \"\"\"\n\n return os.path.join(managePyDir(), 'manage.py')\n\n\ndef manage(c, cmd, pty=False):\n \"\"\"\n Runs a given command against django's \"manage.py\" script.\n\n Args:\n c - Command line context\n cmd - django command to run\n \"\"\"\n\n c.run('cd {path} && python3 manage.py {cmd}'.format(\n path=managePyDir(),\n cmd=cmd\n ), pty=pty)\n\n\n@task\ndef install(c):\n \"\"\"\n Installs required python packages\n \"\"\"\n\n # Install required Python packages with PIP\n c.run('pip3 install -U -r requirements.txt')\n\n # If a config.yaml file does not exist, copy from the template!\n CONFIG_FILE = os.path.join(localDir(), 'InvenTree', 'config.yaml')\n CONFIG_TEMPLATE_FILE = os.path.join(localDir(), 'InvenTree', 'config_template.yaml')\n\n if not os.path.exists(CONFIG_FILE):\n print(\"Config file 'config.yaml' does not exist - copying from template.\")\n copyfile(CONFIG_TEMPLATE_FILE, CONFIG_FILE)\n\n\n@task\ndef shell(c):\n \"\"\"\n Open a python shell with access to the InvenTree database models.\n \"\"\"\n\n manage(c, 'shell', pty=True)\n\n@task\ndef worker(c):\n \"\"\"\n Run the InvenTree background worker process\n \"\"\"\n\n manage(c, 'qcluster', pty=True)\n\n@task\ndef superuser(c):\n \"\"\"\n Create a superuser (admin) account for the database.\n \"\"\"\n\n manage(c, 'createsuperuser', pty=True)\n\n@task\ndef check(c):\n \"\"\"\n Check validity of django codebase\n \"\"\"\n\n manage(c, \"check\")\n\n@task\ndef wait(c):\n \"\"\"\n Wait until the database connection is ready\n \"\"\"\n\n manage(c, \"wait_for_db\")\n\n@task\ndef migrate(c):\n \"\"\"\n Performs database migrations.\n This is a critical step if the database schema have been altered!\n \"\"\"\n\n print(\"Running InvenTree database migrations...\")\n print(\"========================================\")\n\n manage(c, \"makemigrations\")\n manage(c, \"migrate\")\n manage(c, \"migrate --run-syncdb\")\n manage(c, \"check\")\n\n print(\"========================================\")\n print(\"InvenTree database migrations completed!\")\n\n\n@task\ndef static(c):\n \"\"\"\n Copies required static files to the STATIC_ROOT directory,\n as per Django requirements.\n \"\"\"\n\n manage(c, \"prerender\")\n manage(c, \"collectstatic --no-input\")\n\n\n@task(pre=[install, migrate, static])\ndef update(c):\n \"\"\"\n Update InvenTree installation.\n\n This command should be invoked after source code has been updated,\n e.g. downloading new code from GitHub.\n\n The following tasks are performed, in order:\n\n - install\n - migrate\n - static\n \"\"\"\n pass\n\n@task(post=[static])\ndef translate(c):\n \"\"\"\n Regenerate translation files.\n\n Run this command after added new translatable strings,\n or after adding translations for existing strings.\n \"\"\"\n\n # Translate applicable .py / .html / .js files\n manage(c, \"makemessages --all -e py,html,js\")\n manage(c, \"compilemessages\")\n\n path = os.path.join('InvenTree', 'script', 'translation_stats.py')\n\n c.run(f'python {path}')\n\n@task\ndef style(c):\n \"\"\"\n Run PEP style checks against InvenTree sourcecode\n \"\"\"\n\n print(\"Running PEP style checks...\")\n c.run('flake8 InvenTree')\n\n@task\ndef test(c, database=None):\n \"\"\"\n Run unit-tests for InvenTree codebase.\n \"\"\"\n # Run sanity check on the django install\n manage(c, 'check')\n\n # Run coverage tests\n manage(c, 'test', pty=True)\n\n@task\ndef coverage(c):\n \"\"\"\n Run code-coverage of the InvenTree codebase,\n using the 'coverage' code-analysis tools.\n\n Generates a code coverage report (available in the htmlcov directory)\n \"\"\"\n\n # Run sanity check on the django install\n manage(c, 'check')\n\n # Run coverage tests\n c.run('coverage run {manage} test {apps}'.format(\n manage=managePyPath(),\n apps=' '.join(apps())\n ))\n\n # Generate coverage report\n c.run('coverage html')\n\n\ndef content_excludes():\n \"\"\"\n Returns a list of content types to exclude from import/export\n \"\"\"\n\n excludes = [\n \"contenttypes\",\n \"sessions.session\",\n \"auth.permission\",\n \"error_report.error\",\n \"admin.logentry\",\n \"django_q.schedule\",\n \"django_q.task\",\n \"django_q.ormq\",\n \"users.owner\",\n ]\n\n output = \"\"\n\n for e in excludes:\n output += f\"--exclude {e} \"\n\n return output\n\n\n@task(help={'filename': \"Output filename (default = 'data.json')\"})\ndef export_records(c, filename='data.json'):\n \"\"\"\n Export all database records to a file\n \"\"\"\n\n # Get an absolute path to the file\n if not os.path.isabs(filename):\n filename = os.path.join(localDir(), filename)\n filename = os.path.abspath(filename) \n\n print(f\"Exporting database records to file '{filename}'\")\n\n if os.path.exists(filename):\n response = input(\"Warning: file already exists. Do you want to overwrite? [y/N]: \")\n response = str(response).strip().lower()\n\n if response not in ['y', 'yes']:\n print(\"Cancelled export operation\")\n sys.exit(1)\n\n tmpfile = f\"{filename}.tmp\"\n\n cmd = f\"dumpdata --indent 2 --output {tmpfile} {content_excludes()}\"\n\n # Dump data to temporary file\n manage(c, cmd, pty=True)\n\n print(\"Running data post-processing step...\")\n\n # Post-process the file, to remove any \"permissions\" specified for a user or group\n with open(tmpfile, \"r\") as f_in:\n data = json.loads(f_in.read())\n\n for entry in data:\n if \"model\" in entry:\n \n # Clear out any permissions specified for a group\n if entry[\"model\"] == \"auth.group\":\n entry[\"fields\"][\"permissions\"] = []\n\n # Clear out any permissions specified for a user\n if entry[\"model\"] == \"auth.user\":\n entry[\"fields\"][\"user_permissions\"] = []\n\n # Write the processed data to file\n with open(filename, \"w\") as f_out:\n f_out.write(json.dumps(data, indent=2))\n\n print(\"Data export completed\")\n\n\n@task(help={'filename': 'Input filename'})\ndef import_records(c, filename='data.json'):\n \"\"\"\n Import database records from a file\n \"\"\"\n\n # Get an absolute path to the supplied filename\n if not os.path.isabs(filename):\n filename = os.path.join(localDir(), filename)\n\n if not os.path.exists(filename):\n print(f\"Error: File '{filename}' does not exist\")\n sys.exit(1)\n\n print(f\"Importing database records from '{filename}'\")\n\n # Pre-process the data, to remove any \"permissions\" specified for a user or group\n tmpfile = f\"{filename}.tmp.json\"\n\n with open(filename, \"r\") as f_in:\n data = json.loads(f_in.read())\n\n for entry in data:\n if \"model\" in entry:\n \n # Clear out any permissions specified for a group\n if entry[\"model\"] == \"auth.group\":\n entry[\"fields\"][\"permissions\"] = []\n\n # Clear out any permissions specified for a user\n if entry[\"model\"] == \"auth.user\":\n entry[\"fields\"][\"user_permissions\"] = []\n\n # Write the processed data to the tmp file\n with open(tmpfile, \"w\") as f_out:\n f_out.write(json.dumps(data, indent=2))\n\n cmd = f\"loaddata {tmpfile} -i {content_excludes()}\"\n\n manage(c, cmd, pty=True)\n\n print(\"Data import completed\")\n\n@task\ndef import_fixtures(c):\n \"\"\"\n Import fixture data into the database.\n\n This command imports all existing test fixture data into the database.\n\n Warning:\n - Intended for testing / development only!\n - Running this command may overwrite existing database data!!\n - Don't say you were not warned...\n \"\"\"\n\n fixtures = [\n # Build model\n 'build',\n \n # Common models\n 'settings',\n\n # Company model\n 'company',\n 'price_breaks',\n 'supplier_part',\n\n # Order model\n 'order',\n\n # Part model\n 'bom',\n 'category',\n 'params',\n 'part',\n 'test_templates',\n\n # Stock model\n 'location',\n 'stock_tests',\n 'stock',\n\n # Users\n 'users'\n ]\n\n command = 'loaddata ' + ' '.join(fixtures)\n\n manage(c, command, pty=True)\n\n\n@task(help={'address': 'Server address:port (default=127.0.0.1:8000)'})\ndef server(c, address=\"127.0.0.1:8000\"):\n \"\"\"\n Launch a (deveopment) server using Django's in-built webserver.\n\n Note: This is *not* sufficient for a production installation.\n \"\"\"\n\n manage(c, \"runserver {address}\".format(address=address), pty=True)\n", "path": "tasks.py" } ]
[ { "content": "# -*- coding: utf-8 -*-\n\nfrom shutil import copyfile\nimport os\nimport json\nimport sys\n\ntry:\n from invoke import ctask as task\nexcept:\n from invoke import task\n\n\ndef apps():\n \"\"\"\n Returns a list of installed apps\n \"\"\"\n\n return [\n 'barcode',\n 'build',\n 'common',\n 'company',\n 'label',\n 'order',\n 'part',\n 'report',\n 'stock',\n 'InvenTree',\n 'users',\n ]\n\n\ndef localDir():\n \"\"\"\n Returns the directory of *THIS* file.\n Used to ensure that the various scripts always run\n in the correct directory.\n \"\"\"\n return os.path.dirname(os.path.abspath(__file__))\n\n\ndef managePyDir():\n \"\"\"\n Returns the directory of the manage.py file\n \"\"\"\n\n return os.path.join(localDir(), 'InvenTree')\n\n\ndef managePyPath():\n \"\"\"\n Return the path of the manage.py file\n \"\"\"\n\n return os.path.join(managePyDir(), 'manage.py')\n\n\ndef manage(c, cmd, pty=False):\n \"\"\"\n Runs a given command against django's \"manage.py\" script.\n\n Args:\n c - Command line context\n cmd - django command to run\n \"\"\"\n\n c.run('cd \"{path}\" && python3 manage.py {cmd}'.format(\n path=managePyDir(),\n cmd=cmd\n ), pty=pty)\n\n\n@task\ndef install(c):\n \"\"\"\n Installs required python packages\n \"\"\"\n\n # Install required Python packages with PIP\n c.run('pip3 install -U -r requirements.txt')\n\n # If a config.yaml file does not exist, copy from the template!\n CONFIG_FILE = os.path.join(localDir(), 'InvenTree', 'config.yaml')\n CONFIG_TEMPLATE_FILE = os.path.join(localDir(), 'InvenTree', 'config_template.yaml')\n\n if not os.path.exists(CONFIG_FILE):\n print(\"Config file 'config.yaml' does not exist - copying from template.\")\n copyfile(CONFIG_TEMPLATE_FILE, CONFIG_FILE)\n\n\n@task\ndef shell(c):\n \"\"\"\n Open a python shell with access to the InvenTree database models.\n \"\"\"\n\n manage(c, 'shell', pty=True)\n\n@task\ndef worker(c):\n \"\"\"\n Run the InvenTree background worker process\n \"\"\"\n\n manage(c, 'qcluster', pty=True)\n\n@task\ndef superuser(c):\n \"\"\"\n Create a superuser (admin) account for the database.\n \"\"\"\n\n manage(c, 'createsuperuser', pty=True)\n\n@task\ndef check(c):\n \"\"\"\n Check validity of django codebase\n \"\"\"\n\n manage(c, \"check\")\n\n@task\ndef wait(c):\n \"\"\"\n Wait until the database connection is ready\n \"\"\"\n\n manage(c, \"wait_for_db\")\n\n@task\ndef migrate(c):\n \"\"\"\n Performs database migrations.\n This is a critical step if the database schema have been altered!\n \"\"\"\n\n print(\"Running InvenTree database migrations...\")\n print(\"========================================\")\n\n manage(c, \"makemigrations\")\n manage(c, \"migrate\")\n manage(c, \"migrate --run-syncdb\")\n manage(c, \"check\")\n\n print(\"========================================\")\n print(\"InvenTree database migrations completed!\")\n\n\n@task\ndef static(c):\n \"\"\"\n Copies required static files to the STATIC_ROOT directory,\n as per Django requirements.\n \"\"\"\n\n manage(c, \"prerender\")\n manage(c, \"collectstatic --no-input\")\n\n\n@task(pre=[install, migrate, static])\ndef update(c):\n \"\"\"\n Update InvenTree installation.\n\n This command should be invoked after source code has been updated,\n e.g. downloading new code from GitHub.\n\n The following tasks are performed, in order:\n\n - install\n - migrate\n - static\n \"\"\"\n pass\n\n@task(post=[static])\ndef translate(c):\n \"\"\"\n Regenerate translation files.\n\n Run this command after added new translatable strings,\n or after adding translations for existing strings.\n \"\"\"\n\n # Translate applicable .py / .html / .js files\n manage(c, \"makemessages --all -e py,html,js\")\n manage(c, \"compilemessages\")\n\n path = os.path.join('InvenTree', 'script', 'translation_stats.py')\n\n c.run(f'python {path}')\n\n@task\ndef style(c):\n \"\"\"\n Run PEP style checks against InvenTree sourcecode\n \"\"\"\n\n print(\"Running PEP style checks...\")\n c.run('flake8 InvenTree')\n\n@task\ndef test(c, database=None):\n \"\"\"\n Run unit-tests for InvenTree codebase.\n \"\"\"\n # Run sanity check on the django install\n manage(c, 'check')\n\n # Run coverage tests\n manage(c, 'test', pty=True)\n\n@task\ndef coverage(c):\n \"\"\"\n Run code-coverage of the InvenTree codebase,\n using the 'coverage' code-analysis tools.\n\n Generates a code coverage report (available in the htmlcov directory)\n \"\"\"\n\n # Run sanity check on the django install\n manage(c, 'check')\n\n # Run coverage tests\n c.run('coverage run {manage} test {apps}'.format(\n manage=managePyPath(),\n apps=' '.join(apps())\n ))\n\n # Generate coverage report\n c.run('coverage html')\n\n\ndef content_excludes():\n \"\"\"\n Returns a list of content types to exclude from import/export\n \"\"\"\n\n excludes = [\n \"contenttypes\",\n \"sessions.session\",\n \"auth.permission\",\n \"error_report.error\",\n \"admin.logentry\",\n \"django_q.schedule\",\n \"django_q.task\",\n \"django_q.ormq\",\n \"users.owner\",\n ]\n\n output = \"\"\n\n for e in excludes:\n output += f\"--exclude {e} \"\n\n return output\n\n\n@task(help={'filename': \"Output filename (default = 'data.json')\"})\ndef export_records(c, filename='data.json'):\n \"\"\"\n Export all database records to a file\n \"\"\"\n\n # Get an absolute path to the file\n if not os.path.isabs(filename):\n filename = os.path.join(localDir(), filename)\n filename = os.path.abspath(filename) \n\n print(f\"Exporting database records to file '{filename}'\")\n\n if os.path.exists(filename):\n response = input(\"Warning: file already exists. Do you want to overwrite? [y/N]: \")\n response = str(response).strip().lower()\n\n if response not in ['y', 'yes']:\n print(\"Cancelled export operation\")\n sys.exit(1)\n\n tmpfile = f\"{filename}.tmp\"\n\n cmd = f\"dumpdata --indent 2 --output {tmpfile} {content_excludes()}\"\n\n # Dump data to temporary file\n manage(c, cmd, pty=True)\n\n print(\"Running data post-processing step...\")\n\n # Post-process the file, to remove any \"permissions\" specified for a user or group\n with open(tmpfile, \"r\") as f_in:\n data = json.loads(f_in.read())\n\n for entry in data:\n if \"model\" in entry:\n \n # Clear out any permissions specified for a group\n if entry[\"model\"] == \"auth.group\":\n entry[\"fields\"][\"permissions\"] = []\n\n # Clear out any permissions specified for a user\n if entry[\"model\"] == \"auth.user\":\n entry[\"fields\"][\"user_permissions\"] = []\n\n # Write the processed data to file\n with open(filename, \"w\") as f_out:\n f_out.write(json.dumps(data, indent=2))\n\n print(\"Data export completed\")\n\n\n@task(help={'filename': 'Input filename'})\ndef import_records(c, filename='data.json'):\n \"\"\"\n Import database records from a file\n \"\"\"\n\n # Get an absolute path to the supplied filename\n if not os.path.isabs(filename):\n filename = os.path.join(localDir(), filename)\n\n if not os.path.exists(filename):\n print(f\"Error: File '{filename}' does not exist\")\n sys.exit(1)\n\n print(f\"Importing database records from '{filename}'\")\n\n # Pre-process the data, to remove any \"permissions\" specified for a user or group\n tmpfile = f\"{filename}.tmp.json\"\n\n with open(filename, \"r\") as f_in:\n data = json.loads(f_in.read())\n\n for entry in data:\n if \"model\" in entry:\n \n # Clear out any permissions specified for a group\n if entry[\"model\"] == \"auth.group\":\n entry[\"fields\"][\"permissions\"] = []\n\n # Clear out any permissions specified for a user\n if entry[\"model\"] == \"auth.user\":\n entry[\"fields\"][\"user_permissions\"] = []\n\n # Write the processed data to the tmp file\n with open(tmpfile, \"w\") as f_out:\n f_out.write(json.dumps(data, indent=2))\n\n cmd = f\"loaddata {tmpfile} -i {content_excludes()}\"\n\n manage(c, cmd, pty=True)\n\n print(\"Data import completed\")\n\n@task\ndef import_fixtures(c):\n \"\"\"\n Import fixture data into the database.\n\n This command imports all existing test fixture data into the database.\n\n Warning:\n - Intended for testing / development only!\n - Running this command may overwrite existing database data!!\n - Don't say you were not warned...\n \"\"\"\n\n fixtures = [\n # Build model\n 'build',\n \n # Common models\n 'settings',\n\n # Company model\n 'company',\n 'price_breaks',\n 'supplier_part',\n\n # Order model\n 'order',\n\n # Part model\n 'bom',\n 'category',\n 'params',\n 'part',\n 'test_templates',\n\n # Stock model\n 'location',\n 'stock_tests',\n 'stock',\n\n # Users\n 'users'\n ]\n\n command = 'loaddata ' + ' '.join(fixtures)\n\n manage(c, command, pty=True)\n\n\n@task(help={'address': 'Server address:port (default=127.0.0.1:8000)'})\ndef server(c, address=\"127.0.0.1:8000\"):\n \"\"\"\n Launch a (deveopment) server using Django's in-built webserver.\n\n Note: This is *not* sufficient for a production installation.\n \"\"\"\n\n manage(c, \"runserver {address}\".format(address=address), pty=True)\n", "path": "tasks.py" } ]
diff --git a/tasks.py b/tasks.py index 3065d9724375..6eed4c488ed6 100644 --- a/tasks.py +++ b/tasks.py @@ -65,7 +65,7 @@ def manage(c, cmd, pty=False): cmd - django command to run """ - c.run('cd {path} && python3 manage.py {cmd}'.format( + c.run('cd "{path}" && python3 manage.py {cmd}'.format( path=managePyDir(), cmd=cmd ), pty=pty)
Pycord-Development__pycord-1381
[ { "content": "\"\"\"\nThe MIT License (MIT)\n\nCopyright (c) 2021-present Pycord Development\n\nPermission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the \"Software\"),\nto deal in the Software without restriction, including without limitation\nthe rights to use, copy, modify, merge, publish, distribute, sublicense,\nand/or sell copies of the Software, and to permit persons to whom the\nSoftware is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\nFROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER\nDEALINGS IN THE SOFTWARE.\n\"\"\"\n\nfrom __future__ import annotations\n\nimport datetime\nfrom typing import TYPE_CHECKING, Any, Dict, Optional, Union\n\nfrom . import utils\nfrom .asset import Asset\nfrom .enums import (\n ScheduledEventLocationType,\n ScheduledEventPrivacyLevel,\n ScheduledEventStatus,\n try_enum,\n)\nfrom .errors import ValidationError\nfrom .iterators import ScheduledEventSubscribersIterator\nfrom .mixins import Hashable\nfrom .object import Object\n\n__all__ = (\n \"ScheduledEvent\",\n \"ScheduledEventLocation\",\n)\n\nif TYPE_CHECKING:\n from .abc import Snowflake\n from .guild import Guild\n from .iterators import AsyncIterator\n from .member import Member\n from .state import ConnectionState\n from .types.channel import StageChannel, VoiceChannel\n from .types.scheduled_events import ScheduledEvent as ScheduledEventPayload\n\nMISSING = utils.MISSING\n\n\nclass ScheduledEventLocation:\n \"\"\"Represents a scheduled event's location.\n\n Setting the ``value`` to its corresponding type will set the location type automatically:\n\n +------------------------+---------------------------------------------------+\n | Type of Input | Location Type |\n +========================+===================================================+\n | :class:`StageChannel`: | :attr:`ScheduledEventLocationType.stage_instance` |\n | :class:`VoiceChannel`: | :attr:`ScheduledEventLocationType.voice` |\n | :class:`str`: | :attr:`ScheduledEventLocationType.external` |\n +------------------------+---------------------------------------------------+\n\n .. versionadded:: 2.0\n\n Attributes\n ----------\n value: Union[:class:`str`, :class:`StageChannel`, :class:`VoiceChannel`, :class:`Object`]\n The actual location of the scheduled event.\n type: :class:`ScheduledEventLocationType`\n The type of location.\n \"\"\"\n\n __slots__ = (\n \"_state\",\n \"value\",\n )\n\n def __init__(\n self,\n *,\n state: ConnectionState,\n value: Union[str, int, StageChannel, VoiceChannel],\n ):\n self._state = state\n self.value: Union[str, StageChannel, VoiceChannel, Object]\n if isinstance(value, int):\n self.value = self._state.get_channel(id=int(value)) or Object(id=int(value))\n else:\n self.value = value\n\n def __repr__(self) -> str:\n return f\"<ScheduledEventLocation value={self.value!r} type={self.type}>\"\n\n def __str__(self) -> str:\n return str(self.value)\n\n @property\n def type(self) -> ScheduledEventLocationType:\n if isinstance(self.value, str):\n return ScheduledEventLocationType.external\n elif self.value.__class__.__name__ == \"StageChannel\":\n return ScheduledEventLocationType.stage_instance\n elif self.value.__class__.__name__ == \"VoiceChannel\":\n return ScheduledEventLocationType.voice\n\n\nclass ScheduledEvent(Hashable):\n \"\"\"Represents a Discord Guild Scheduled Event.\n\n .. container:: operations\n\n .. describe:: x == y\n\n Checks if two scheduled events are equal.\n\n .. describe:: x != y\n\n Checks if two scheduled events are not equal.\n\n .. describe:: hash(x)\n\n Returns the scheduled event's hash.\n\n .. describe:: str(x)\n\n Returns the scheduled event's name.\n\n .. versionadded:: 2.0\n\n Attributes\n ----------\n guild: :class:`Guild`\n The guild where the scheduled event is happening.\n name: :class:`str`\n The name of the scheduled event.\n description: Optional[:class:`str`]\n The description of the scheduled event.\n start_time: :class:`datetime.datetime`\n The time when the event will start\n end_time: Optional[:class:`datetime.datetime`]\n The time when the event is supposed to end.\n status: :class:`ScheduledEventStatus`\n The status of the scheduled event.\n location: :class:`ScheduledEventLocation`\n The location of the event.\n See :class:`ScheduledEventLocation` for more information.\n subscriber_count: Optional[:class:`int`]\n The number of users that have marked themselves as interested for the event.\n creator_id: Optional[:class:`int`]\n The ID of the user who created the event.\n It may be ``None`` because events created before October 25th, 2021, haven't\n had their creators tracked.\n creator: Optional[:class:`User`]\n The resolved user object of who created the event.\n privacy_level: :class:`ScheduledEventPrivacyLevel`\n The privacy level of the event. Currently, the only possible value\n is :attr:`ScheduledEventPrivacyLevel.guild_only`, which is default,\n so there is no need to use this attribute.\n \"\"\"\n\n __slots__ = (\n \"id\",\n \"name\",\n \"description\",\n \"start_time\",\n \"end_time\",\n \"status\",\n \"creator_id\",\n \"creator\",\n \"location\",\n \"guild\",\n \"_state\",\n \"_cover\",\n \"subscriber_count\",\n )\n\n def __init__(\n self,\n *,\n state: ConnectionState,\n guild: Guild,\n creator: Optional[Member],\n data: ScheduledEventPayload,\n ):\n self._state: ConnectionState = state\n\n self.id: int = int(data.get(\"id\"))\n self.guild: Guild = guild\n self.name: str = data.get(\"name\")\n self.description: Optional[str] = data.get(\"description\", None)\n self._cover: Optional[str] = data.get(\"image\", None)\n self.start_time: datetime.datetime = datetime.datetime.fromisoformat(data.get(\"scheduled_start_time\"))\n end_time = data.get(\"scheduled_end_time\", None)\n if end_time != None:\n end_time = datetime.datetime.fromisoformat(end_time)\n self.end_time: Optional[datetime.datetime] = end_time\n self.status: ScheduledEventStatus = try_enum(ScheduledEventStatus, data.get(\"status\"))\n self.subscriber_count: Optional[int] = data.get(\"user_count\", None)\n self.creator_id = data.get(\"creator_id\", None)\n self.creator: Optional[Member] = creator\n\n entity_metadata = data.get(\"entity_metadata\")\n channel_id = data.get(\"channel_id\", None)\n if channel_id is None:\n self.location = ScheduledEventLocation(state=state, value=entity_metadata[\"location\"])\n else:\n self.location = ScheduledEventLocation(state=state, value=int(channel_id))\n\n def __str__(self) -> str:\n return self.name\n\n def __repr__(self) -> str:\n return (\n f\"<ScheduledEvent id={self.id} \"\n f\"name={self.name} \"\n f\"description={self.description} \"\n f\"start_time={self.start_time} \"\n f\"end_time={self.end_time} \"\n f\"location={self.location!r} \"\n f\"status={self.status.name} \"\n f\"subscriber_count={self.subscriber_count} \"\n f\"creator_id={self.creator_id}>\"\n )\n\n @property\n def created_at(self) -> datetime.datetime:\n \"\"\":class:`datetime.datetime`: Returns the scheduled event's creation time in UTC.\"\"\"\n return utils.snowflake_time(self.id)\n\n @property\n def interested(self) -> Optional[int]:\n \"\"\"An alias to :attr:`.subscriber_count`\"\"\"\n return self.subscriber_count\n\n @property\n def url(self) -> str:\n \"\"\":class:`str`: The url to reference the scheduled event.\"\"\"\n return f\"https://discord.com/events/{self.guild.id}/{self.id}\"\n\n @property\n def cover(self) -> Optional[Asset]:\n \"\"\"Optional[:class:`Asset`]: Returns the scheduled event cover image asset, if available.\"\"\"\n if self._cover is None:\n return None\n return Asset._from_scheduled_event_cover(\n self._state,\n self.id,\n self._image,\n )\n\n async def edit(\n self,\n *,\n reason: Optional[str] = None,\n name: str = MISSING,\n description: str = MISSING,\n status: Union[int, ScheduledEventStatus] = MISSING,\n location: Union[str, int, VoiceChannel, StageChannel, ScheduledEventLocation] = MISSING,\n start_time: datetime.datetime = MISSING,\n end_time: datetime.datetime = MISSING,\n cover: Optional[bytes] = MISSING,\n privacy_level: ScheduledEventPrivacyLevel = ScheduledEventPrivacyLevel.guild_only,\n ) -> Optional[ScheduledEvent]:\n \"\"\"|coro|\n\n Edits the Scheduled Event's data\n\n All parameters are optional unless ``location.type`` is\n :attr:`ScheduledEventLocationType.external`, then ``end_time``\n is required.\n\n Will return a new :class:`.ScheduledEvent` object if applicable.\n\n Parameters\n -----------\n name: :class:`str`\n The new name of the event.\n description: :class:`str`\n The new description of the event.\n location: :class:`.ScheduledEventLocation`\n The location of the event.\n status: :class:`ScheduledEventStatus`\n The status of the event. It is recommended, however,\n to use :meth:`.start`, :meth:`.complete`, and\n :meth:`cancel` to edit statuses instead.\n start_time: :class:`datetime.datetime`\n The new starting time for the event.\n end_time: :class:`datetime.datetime`\n The new ending time of the event.\n privacy_level: :class:`ScheduledEventPrivacyLevel`\n The privacy level of the event. Currently, the only possible value\n is :attr:`ScheduledEventPrivacyLevel.guild_only`, which is default,\n so there is no need to change this parameter.\n reason: Optional[:class:`str`]\n The reason to show in the audit log.\n cover: Optional[:class:`Asset`]\n The cover image of the scheduled event.\n\n Raises\n -------\n Forbidden\n You do not have the Manage Events permission.\n HTTPException\n The operation failed.\n\n Returns\n --------\n Optional[:class:`.ScheduledEvent`]\n The newly updated scheduled event object. This is only returned when certain\n fields are updated.\n \"\"\"\n payload: Dict[str, Any] = {}\n\n if name is not MISSING:\n payload[\"name\"] = name\n\n if description is not MISSING:\n payload[\"description\"] = description\n\n if status is not MISSING:\n payload[\"status\"] = int(status)\n\n if privacy_level is not MISSING:\n payload[\"privacy_level\"] = int(privacy_level)\n\n if cover is not MISSING:\n if cover is None:\n payload[\"image\"]\n else:\n payload[\"image\"] = utils._bytes_to_base64_data(cover)\n\n if location is not MISSING:\n if not isinstance(location, (ScheduledEventLocation, utils._MissingSentinel)):\n location = ScheduledEventLocation(state=self._state, value=location)\n\n if location.type is ScheduledEventLocationType.external:\n payload[\"channel_id\"] = None\n payload[\"entity_metadata\"] = {\"location\": str(location.value)}\n else:\n payload[\"channel_id\"] = location.value.id\n payload[\"entity_metadata\"] = None\n\n location = location if location is not MISSING else self.location\n if end_time is MISSING and location.type is ScheduledEventLocationType.external:\n end_time = self.end_time\n if end_time is None:\n raise ValidationError(\"end_time needs to be passed if location type is external.\")\n\n if start_time is not MISSING:\n payload[\"scheduled_start_time\"] = start_time.isoformat()\n\n if end_time is not MISSING:\n payload[\"scheduled_end_time\"] = end_time.isoformat()\n\n if payload != {}:\n data = await self._state.http.edit_scheduled_event(self.guild.id, self.id, **payload, reason=reason)\n return ScheduledEvent(data=data, guild=self.guild, creator=self.creator, state=self._state)\n\n async def delete(self) -> None:\n \"\"\"|coro|\n\n Deletes the scheduled event.\n\n Raises\n -------\n Forbidden\n You do not have the Manage Events permission.\n HTTPException\n The operation failed.\n \"\"\"\n await self._state.http.delete_scheduled_event(self.guild.id, self.id)\n\n async def start(self, *, reason: Optional[str] = None) -> None:\n \"\"\"|coro|\n\n Starts the scheduled event. Shortcut from :meth:`.edit`.\n\n .. note::\n\n This method can only be used if :attr:`.status` is :attr:`ScheduledEventStatus.scheduled`.\n\n Parameters\n -----------\n reason: Optional[:class:`str`]\n The reason to show in the audit log.\n\n Raises\n -------\n Forbidden\n You do not have the Manage Events permission.\n HTTPException\n The operation failed.\n\n Returns\n --------\n Optional[:class:`.ScheduledEvent`]\n The newly updated scheduled event object.\n \"\"\"\n return await self.edit(status=ScheduledEventStatus.active, reason=reason)\n\n async def complete(self, *, reason: Optional[str] = None) -> None:\n \"\"\"|coro|\n\n Ends/completes the scheduled event. Shortcut from :meth:`.edit`.\n\n .. note::\n\n This method can only be used if :attr:`.status` is :attr:`ScheduledEventStatus.active`.\n\n Parameters\n -----------\n reason: Optional[:class:`str`]\n The reason to show in the audit log.\n\n Raises\n -------\n Forbidden\n You do not have the Manage Events permission.\n HTTPException\n The operation failed.\n\n Returns\n --------\n Optional[:class:`.ScheduledEvent`]\n The newly updated scheduled event object.\n \"\"\"\n return await self.edit(status=ScheduledEventStatus.completed, reason=reason)\n\n async def cancel(self, *, reason: Optional[str] = None) -> None:\n \"\"\"|coro|\n\n Cancels the scheduled event. Shortcut from :meth:`.edit`.\n\n .. note::\n\n This method can only be used if :attr:`.status` is :attr:`ScheduledEventStatus.scheduled`.\n\n Parameters\n -----------\n reason: Optional[:class:`str`]\n The reason to show in the audit log.\n\n Raises\n -------\n Forbidden\n You do not have the Manage Events permission.\n HTTPException\n The operation failed.\n\n Returns\n --------\n Optional[:class:`.ScheduledEvent`]\n The newly updated scheduled event object.\n \"\"\"\n return await self.edit(status=ScheduledEventStatus.canceled, reason=reason)\n\n def subscribers(\n self,\n *,\n limit: int = 100,\n as_member: bool = False,\n before: Optional[Union[Snowflake, datetime.datetime]] = None,\n after: Optional[Union[Snowflake, datetime.datetime]] = None,\n ) -> AsyncIterator:\n \"\"\"Returns an :class:`AsyncIterator` representing the users or members subscribed to the event.\n\n The ``after`` and ``before`` parameters must represent member\n or user objects and meet the :class:`abc.Snowflake` abc.\n\n .. note::\n\n Even is ``as_member`` is set to ``True``, if the user\n is outside the guild, it will be a :class:`User` object.\n\n Examples\n ---------\n\n Usage ::\n\n async for user in event.subscribers(limit=100):\n print(user.name)\n\n Flattening into a list: ::\n\n users = await event.subscribers(limit=100).flatten()\n # users is now a list of User...\n\n Getting members instead of user objects: ::\n\n async for member in event.subscribers(limit=100, as_member=True):\n print(member.display_name)\n\n Parameters\n -----------\n limit: Optional[:class:`int`]\n The maximum number of results to return.\n as_member: Optional[:class:`bool`]\n Whether to fetch :class:`Member` objects instead of user objects.\n There may still be :class:`User` objects if the user is outside\n the guild.\n before: Optional[Union[:class:`abc.Snowflake`, :class:`datetime.datetime`]]\n Retrieves users before this date or object. If a datetime is provided,\n it is recommended to use a UTC aware datetime. If the datetime is naive,\n it is assumed to be local time.\n after: Optional[Union[:class:`abc.Snowflake`, :class:`datetime.datetime`]]\n Retrieves users after this date or object. If a datetime is provided,\n it is recommended to use a UTC aware datetime. If the datetime is naive,\n it is assumed to be local time.\n\n Raises\n -------\n HTTPException\n Fetching the subscribed users failed.\n\n Yields\n -------\n Union[:class:`User`, :class:`Member`]\n The subscribed :class:`Member`. If ``as_member`` is set to\n ``False`` or the user is outside the guild, it will be a\n :class:`User` object.\n \"\"\"\n return ScheduledEventSubscribersIterator(\n event=self, limit=limit, with_member=as_member, before=before, after=after\n )\n", "path": "discord/scheduled_events.py" } ]
[ { "content": "\"\"\"\nThe MIT License (MIT)\n\nCopyright (c) 2021-present Pycord Development\n\nPermission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the \"Software\"),\nto deal in the Software without restriction, including without limitation\nthe rights to use, copy, modify, merge, publish, distribute, sublicense,\nand/or sell copies of the Software, and to permit persons to whom the\nSoftware is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\nFROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER\nDEALINGS IN THE SOFTWARE.\n\"\"\"\n\nfrom __future__ import annotations\n\nimport datetime\nfrom typing import TYPE_CHECKING, Any, Dict, Optional, Union\n\nfrom . import utils\nfrom .asset import Asset\nfrom .enums import (\n ScheduledEventLocationType,\n ScheduledEventPrivacyLevel,\n ScheduledEventStatus,\n try_enum,\n)\nfrom .errors import ValidationError\nfrom .iterators import ScheduledEventSubscribersIterator\nfrom .mixins import Hashable\nfrom .object import Object\n\n__all__ = (\n \"ScheduledEvent\",\n \"ScheduledEventLocation\",\n)\n\nif TYPE_CHECKING:\n from .abc import Snowflake\n from .guild import Guild\n from .iterators import AsyncIterator\n from .member import Member\n from .state import ConnectionState\n from .types.channel import StageChannel, VoiceChannel\n from .types.scheduled_events import ScheduledEvent as ScheduledEventPayload\n\nMISSING = utils.MISSING\n\n\nclass ScheduledEventLocation:\n \"\"\"Represents a scheduled event's location.\n\n Setting the ``value`` to its corresponding type will set the location type automatically:\n\n +------------------------+---------------------------------------------------+\n | Type of Input | Location Type |\n +========================+===================================================+\n | :class:`StageChannel`: | :attr:`ScheduledEventLocationType.stage_instance` |\n | :class:`VoiceChannel`: | :attr:`ScheduledEventLocationType.voice` |\n | :class:`str`: | :attr:`ScheduledEventLocationType.external` |\n +------------------------+---------------------------------------------------+\n\n .. versionadded:: 2.0\n\n Attributes\n ----------\n value: Union[:class:`str`, :class:`StageChannel`, :class:`VoiceChannel`, :class:`Object`]\n The actual location of the scheduled event.\n type: :class:`ScheduledEventLocationType`\n The type of location.\n \"\"\"\n\n __slots__ = (\n \"_state\",\n \"value\",\n )\n\n def __init__(\n self,\n *,\n state: ConnectionState,\n value: Union[str, int, StageChannel, VoiceChannel],\n ):\n self._state = state\n self.value: Union[str, StageChannel, VoiceChannel, Object]\n if isinstance(value, int):\n self.value = self._state.get_channel(id=int(value)) or Object(id=int(value))\n else:\n self.value = value\n\n def __repr__(self) -> str:\n return f\"<ScheduledEventLocation value={self.value!r} type={self.type}>\"\n\n def __str__(self) -> str:\n return str(self.value)\n\n @property\n def type(self) -> ScheduledEventLocationType:\n if isinstance(self.value, str):\n return ScheduledEventLocationType.external\n elif self.value.__class__.__name__ == \"StageChannel\":\n return ScheduledEventLocationType.stage_instance\n elif self.value.__class__.__name__ == \"VoiceChannel\":\n return ScheduledEventLocationType.voice\n\n\nclass ScheduledEvent(Hashable):\n \"\"\"Represents a Discord Guild Scheduled Event.\n\n .. container:: operations\n\n .. describe:: x == y\n\n Checks if two scheduled events are equal.\n\n .. describe:: x != y\n\n Checks if two scheduled events are not equal.\n\n .. describe:: hash(x)\n\n Returns the scheduled event's hash.\n\n .. describe:: str(x)\n\n Returns the scheduled event's name.\n\n .. versionadded:: 2.0\n\n Attributes\n ----------\n guild: :class:`Guild`\n The guild where the scheduled event is happening.\n name: :class:`str`\n The name of the scheduled event.\n description: Optional[:class:`str`]\n The description of the scheduled event.\n start_time: :class:`datetime.datetime`\n The time when the event will start\n end_time: Optional[:class:`datetime.datetime`]\n The time when the event is supposed to end.\n status: :class:`ScheduledEventStatus`\n The status of the scheduled event.\n location: :class:`ScheduledEventLocation`\n The location of the event.\n See :class:`ScheduledEventLocation` for more information.\n subscriber_count: Optional[:class:`int`]\n The number of users that have marked themselves as interested for the event.\n creator_id: Optional[:class:`int`]\n The ID of the user who created the event.\n It may be ``None`` because events created before October 25th, 2021, haven't\n had their creators tracked.\n creator: Optional[:class:`User`]\n The resolved user object of who created the event.\n privacy_level: :class:`ScheduledEventPrivacyLevel`\n The privacy level of the event. Currently, the only possible value\n is :attr:`ScheduledEventPrivacyLevel.guild_only`, which is default,\n so there is no need to use this attribute.\n \"\"\"\n\n __slots__ = (\n \"id\",\n \"name\",\n \"description\",\n \"start_time\",\n \"end_time\",\n \"status\",\n \"creator_id\",\n \"creator\",\n \"location\",\n \"guild\",\n \"_state\",\n \"_cover\",\n \"subscriber_count\",\n )\n\n def __init__(\n self,\n *,\n state: ConnectionState,\n guild: Guild,\n creator: Optional[Member],\n data: ScheduledEventPayload,\n ):\n self._state: ConnectionState = state\n\n self.id: int = int(data.get(\"id\"))\n self.guild: Guild = guild\n self.name: str = data.get(\"name\")\n self.description: Optional[str] = data.get(\"description\", None)\n self._cover: Optional[str] = data.get(\"image\", None)\n self.start_time: datetime.datetime = datetime.datetime.fromisoformat(data.get(\"scheduled_start_time\"))\n end_time = data.get(\"scheduled_end_time\", None)\n if end_time != None:\n end_time = datetime.datetime.fromisoformat(end_time)\n self.end_time: Optional[datetime.datetime] = end_time\n self.status: ScheduledEventStatus = try_enum(ScheduledEventStatus, data.get(\"status\"))\n self.subscriber_count: Optional[int] = data.get(\"user_count\", None)\n self.creator_id = data.get(\"creator_id\", None)\n self.creator: Optional[Member] = creator\n\n entity_metadata = data.get(\"entity_metadata\")\n channel_id = data.get(\"channel_id\", None)\n if channel_id is None:\n self.location = ScheduledEventLocation(state=state, value=entity_metadata[\"location\"])\n else:\n self.location = ScheduledEventLocation(state=state, value=int(channel_id))\n\n def __str__(self) -> str:\n return self.name\n\n def __repr__(self) -> str:\n return (\n f\"<ScheduledEvent id={self.id} \"\n f\"name={self.name} \"\n f\"description={self.description} \"\n f\"start_time={self.start_time} \"\n f\"end_time={self.end_time} \"\n f\"location={self.location!r} \"\n f\"status={self.status.name} \"\n f\"subscriber_count={self.subscriber_count} \"\n f\"creator_id={self.creator_id}>\"\n )\n\n @property\n def created_at(self) -> datetime.datetime:\n \"\"\":class:`datetime.datetime`: Returns the scheduled event's creation time in UTC.\"\"\"\n return utils.snowflake_time(self.id)\n\n @property\n def interested(self) -> Optional[int]:\n \"\"\"An alias to :attr:`.subscriber_count`\"\"\"\n return self.subscriber_count\n\n @property\n def url(self) -> str:\n \"\"\":class:`str`: The url to reference the scheduled event.\"\"\"\n return f\"https://discord.com/events/{self.guild.id}/{self.id}\"\n\n @property\n def cover(self) -> Optional[Asset]:\n \"\"\"Optional[:class:`Asset`]: Returns the scheduled event cover image asset, if available.\"\"\"\n if self._cover is None:\n return None\n return Asset._from_scheduled_event_cover(\n self._state,\n self.id,\n self._cover,\n )\n\n async def edit(\n self,\n *,\n reason: Optional[str] = None,\n name: str = MISSING,\n description: str = MISSING,\n status: Union[int, ScheduledEventStatus] = MISSING,\n location: Union[str, int, VoiceChannel, StageChannel, ScheduledEventLocation] = MISSING,\n start_time: datetime.datetime = MISSING,\n end_time: datetime.datetime = MISSING,\n cover: Optional[bytes] = MISSING,\n privacy_level: ScheduledEventPrivacyLevel = ScheduledEventPrivacyLevel.guild_only,\n ) -> Optional[ScheduledEvent]:\n \"\"\"|coro|\n\n Edits the Scheduled Event's data\n\n All parameters are optional unless ``location.type`` is\n :attr:`ScheduledEventLocationType.external`, then ``end_time``\n is required.\n\n Will return a new :class:`.ScheduledEvent` object if applicable.\n\n Parameters\n -----------\n name: :class:`str`\n The new name of the event.\n description: :class:`str`\n The new description of the event.\n location: :class:`.ScheduledEventLocation`\n The location of the event.\n status: :class:`ScheduledEventStatus`\n The status of the event. It is recommended, however,\n to use :meth:`.start`, :meth:`.complete`, and\n :meth:`cancel` to edit statuses instead.\n start_time: :class:`datetime.datetime`\n The new starting time for the event.\n end_time: :class:`datetime.datetime`\n The new ending time of the event.\n privacy_level: :class:`ScheduledEventPrivacyLevel`\n The privacy level of the event. Currently, the only possible value\n is :attr:`ScheduledEventPrivacyLevel.guild_only`, which is default,\n so there is no need to change this parameter.\n reason: Optional[:class:`str`]\n The reason to show in the audit log.\n cover: Optional[:class:`Asset`]\n The cover image of the scheduled event.\n\n Raises\n -------\n Forbidden\n You do not have the Manage Events permission.\n HTTPException\n The operation failed.\n\n Returns\n --------\n Optional[:class:`.ScheduledEvent`]\n The newly updated scheduled event object. This is only returned when certain\n fields are updated.\n \"\"\"\n payload: Dict[str, Any] = {}\n\n if name is not MISSING:\n payload[\"name\"] = name\n\n if description is not MISSING:\n payload[\"description\"] = description\n\n if status is not MISSING:\n payload[\"status\"] = int(status)\n\n if privacy_level is not MISSING:\n payload[\"privacy_level\"] = int(privacy_level)\n\n if cover is not MISSING:\n if cover is None:\n payload[\"image\"]\n else:\n payload[\"image\"] = utils._bytes_to_base64_data(cover)\n\n if location is not MISSING:\n if not isinstance(location, (ScheduledEventLocation, utils._MissingSentinel)):\n location = ScheduledEventLocation(state=self._state, value=location)\n\n if location.type is ScheduledEventLocationType.external:\n payload[\"channel_id\"] = None\n payload[\"entity_metadata\"] = {\"location\": str(location.value)}\n else:\n payload[\"channel_id\"] = location.value.id\n payload[\"entity_metadata\"] = None\n\n location = location if location is not MISSING else self.location\n if end_time is MISSING and location.type is ScheduledEventLocationType.external:\n end_time = self.end_time\n if end_time is None:\n raise ValidationError(\"end_time needs to be passed if location type is external.\")\n\n if start_time is not MISSING:\n payload[\"scheduled_start_time\"] = start_time.isoformat()\n\n if end_time is not MISSING:\n payload[\"scheduled_end_time\"] = end_time.isoformat()\n\n if payload != {}:\n data = await self._state.http.edit_scheduled_event(self.guild.id, self.id, **payload, reason=reason)\n return ScheduledEvent(data=data, guild=self.guild, creator=self.creator, state=self._state)\n\n async def delete(self) -> None:\n \"\"\"|coro|\n\n Deletes the scheduled event.\n\n Raises\n -------\n Forbidden\n You do not have the Manage Events permission.\n HTTPException\n The operation failed.\n \"\"\"\n await self._state.http.delete_scheduled_event(self.guild.id, self.id)\n\n async def start(self, *, reason: Optional[str] = None) -> None:\n \"\"\"|coro|\n\n Starts the scheduled event. Shortcut from :meth:`.edit`.\n\n .. note::\n\n This method can only be used if :attr:`.status` is :attr:`ScheduledEventStatus.scheduled`.\n\n Parameters\n -----------\n reason: Optional[:class:`str`]\n The reason to show in the audit log.\n\n Raises\n -------\n Forbidden\n You do not have the Manage Events permission.\n HTTPException\n The operation failed.\n\n Returns\n --------\n Optional[:class:`.ScheduledEvent`]\n The newly updated scheduled event object.\n \"\"\"\n return await self.edit(status=ScheduledEventStatus.active, reason=reason)\n\n async def complete(self, *, reason: Optional[str] = None) -> None:\n \"\"\"|coro|\n\n Ends/completes the scheduled event. Shortcut from :meth:`.edit`.\n\n .. note::\n\n This method can only be used if :attr:`.status` is :attr:`ScheduledEventStatus.active`.\n\n Parameters\n -----------\n reason: Optional[:class:`str`]\n The reason to show in the audit log.\n\n Raises\n -------\n Forbidden\n You do not have the Manage Events permission.\n HTTPException\n The operation failed.\n\n Returns\n --------\n Optional[:class:`.ScheduledEvent`]\n The newly updated scheduled event object.\n \"\"\"\n return await self.edit(status=ScheduledEventStatus.completed, reason=reason)\n\n async def cancel(self, *, reason: Optional[str] = None) -> None:\n \"\"\"|coro|\n\n Cancels the scheduled event. Shortcut from :meth:`.edit`.\n\n .. note::\n\n This method can only be used if :attr:`.status` is :attr:`ScheduledEventStatus.scheduled`.\n\n Parameters\n -----------\n reason: Optional[:class:`str`]\n The reason to show in the audit log.\n\n Raises\n -------\n Forbidden\n You do not have the Manage Events permission.\n HTTPException\n The operation failed.\n\n Returns\n --------\n Optional[:class:`.ScheduledEvent`]\n The newly updated scheduled event object.\n \"\"\"\n return await self.edit(status=ScheduledEventStatus.canceled, reason=reason)\n\n def subscribers(\n self,\n *,\n limit: int = 100,\n as_member: bool = False,\n before: Optional[Union[Snowflake, datetime.datetime]] = None,\n after: Optional[Union[Snowflake, datetime.datetime]] = None,\n ) -> AsyncIterator:\n \"\"\"Returns an :class:`AsyncIterator` representing the users or members subscribed to the event.\n\n The ``after`` and ``before`` parameters must represent member\n or user objects and meet the :class:`abc.Snowflake` abc.\n\n .. note::\n\n Even is ``as_member`` is set to ``True``, if the user\n is outside the guild, it will be a :class:`User` object.\n\n Examples\n ---------\n\n Usage ::\n\n async for user in event.subscribers(limit=100):\n print(user.name)\n\n Flattening into a list: ::\n\n users = await event.subscribers(limit=100).flatten()\n # users is now a list of User...\n\n Getting members instead of user objects: ::\n\n async for member in event.subscribers(limit=100, as_member=True):\n print(member.display_name)\n\n Parameters\n -----------\n limit: Optional[:class:`int`]\n The maximum number of results to return.\n as_member: Optional[:class:`bool`]\n Whether to fetch :class:`Member` objects instead of user objects.\n There may still be :class:`User` objects if the user is outside\n the guild.\n before: Optional[Union[:class:`abc.Snowflake`, :class:`datetime.datetime`]]\n Retrieves users before this date or object. If a datetime is provided,\n it is recommended to use a UTC aware datetime. If the datetime is naive,\n it is assumed to be local time.\n after: Optional[Union[:class:`abc.Snowflake`, :class:`datetime.datetime`]]\n Retrieves users after this date or object. If a datetime is provided,\n it is recommended to use a UTC aware datetime. If the datetime is naive,\n it is assumed to be local time.\n\n Raises\n -------\n HTTPException\n Fetching the subscribed users failed.\n\n Yields\n -------\n Union[:class:`User`, :class:`Member`]\n The subscribed :class:`Member`. If ``as_member`` is set to\n ``False`` or the user is outside the guild, it will be a\n :class:`User` object.\n \"\"\"\n return ScheduledEventSubscribersIterator(\n event=self, limit=limit, with_member=as_member, before=before, after=after\n )\n", "path": "discord/scheduled_events.py" } ]
diff --git a/discord/scheduled_events.py b/discord/scheduled_events.py index 52e168741d..95d2d75cc8 100644 --- a/discord/scheduled_events.py +++ b/discord/scheduled_events.py @@ -255,7 +255,7 @@ def cover(self) -> Optional[Asset]: return Asset._from_scheduled_event_cover( self._state, self.id, - self._image, + self._cover, ) async def edit(
flask-admin__flask-admin-1408
[ { "content": "# Create dummy secrey key so we can use sessions\nSECRET_KEY = '123456790'\n\n# database connection\nSQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://flask_admin_geo:flask_admin_geo@localhost/flask_admin_geo'\nSQLALCHEMY_ECHO = True\n\n# credentials for loading map tiles from mapbox\nMAPBOX_MAP_ID = '...'\nMAPBOX_ACCESS_TOKEN = '...'", "path": "examples/geo_alchemy/config.py" } ]
[ { "content": "# Create dummy secrey key so we can use sessions\nSECRET_KEY = '123456790'\n\n# database connection\nSQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://flask_admin_geo:flask_admin_geo@localhost/flask_admin_geo'\nSQLALCHEMY_ECHO = True\n\n# credentials for loading map tiles from mapbox\nMAPBOX_MAP_ID = '...'\nMAPBOX_ACCESS_TOKEN = '...'\n\n# when the creating new shapes, use this default map center\nDEFAULT_CENTER_LAT = -33.918861\nDEFAULT_CENTER_LONG = 18.423300\n", "path": "examples/geo_alchemy/config.py" } ]
diff --git a/README.rst b/README.rst index 447efe502..41bfc33aa 100644 --- a/README.rst +++ b/README.rst @@ -91,7 +91,11 @@ You should see output similar to:: For all the tests to pass successfully, you'll need Postgres & MongoDB to be running locally. For Postgres:: + > psql postgres CREATE DATABASE flask_admin_test; + \q + + > psql flask_admin_test CREATE EXTENSION postgis; CREATE EXTENSION hstore; diff --git a/examples/geo_alchemy/config.py b/examples/geo_alchemy/config.py index eef21043c..fa0516330 100644 --- a/examples/geo_alchemy/config.py +++ b/examples/geo_alchemy/config.py @@ -7,4 +7,8 @@ # credentials for loading map tiles from mapbox MAPBOX_MAP_ID = '...' -MAPBOX_ACCESS_TOKEN = '...' \ No newline at end of file +MAPBOX_ACCESS_TOKEN = '...' + +# when the creating new shapes, use this default map center +DEFAULT_CENTER_LAT = -33.918861 +DEFAULT_CENTER_LONG = 18.423300 diff --git a/flask_admin/static/admin/js/form.js b/flask_admin/static/admin/js/form.js index 242391a36..beec70e5b 100644 --- a/flask_admin/static/admin/js/form.js +++ b/flask_admin/static/admin/js/form.js @@ -77,6 +77,10 @@ console.error("You must set MAPBOX_MAP_ID in your Flask settings to use the map widget"); return false; } + if (!window.DEFAULT_CENTER_LAT || !window.DEFAULT_CENTER_LONG) { + console.error("You must set DEFAULT_CENTER_LAT and DEFAULT_CENTER_LONG in your Flask settings to use the map widget"); + return false; + } var geometryType = $el.data("geometry-type") if (geometryType) { @@ -148,12 +152,8 @@ map.fitBounds(bounds); } } else { - // look up user's location by IP address - $.getJSON("//ip-api.com/json/?callback=?", function(data) { - map.setView([data["lat"], data["lon"]], 12); - }).fail(function() { - map.setView([0, 0], 1) - }); + // use the default map center + map.setView([window.DEFAULT_CENTER_LAT, window.DEFAULT_CENTER_LONG], 12); } // set up tiles @@ -182,7 +182,8 @@ var drawOptions = { draw: { // circles are not geometries in geojson - circle: false + circle: false, + circlemarker: false }, edit: { featureGroup: editableLayers diff --git a/flask_admin/static/vendor/leaflet/images/layers-2x.png b/flask_admin/static/vendor/leaflet/images/layers-2x.png old mode 100644 new mode 100755 diff --git a/flask_admin/static/vendor/leaflet/images/layers.png b/flask_admin/static/vendor/leaflet/images/layers.png old mode 100644 new mode 100755 diff --git a/flask_admin/static/vendor/leaflet/images/marker-icon-2x.png b/flask_admin/static/vendor/leaflet/images/marker-icon-2x.png old mode 100644 new mode 100755 diff --git a/flask_admin/static/vendor/leaflet/images/marker-icon.png b/flask_admin/static/vendor/leaflet/images/marker-icon.png old mode 100644 new mode 100755 diff --git a/flask_admin/static/vendor/leaflet/images/marker-shadow.png b/flask_admin/static/vendor/leaflet/images/marker-shadow.png old mode 100644 new mode 100755 diff --git a/flask_admin/static/vendor/leaflet/images/spritesheet-2x.png b/flask_admin/static/vendor/leaflet/images/spritesheet-2x.png old mode 100644 new mode 100755 index 1525c9f69..c45231aff Binary files a/flask_admin/static/vendor/leaflet/images/spritesheet-2x.png and b/flask_admin/static/vendor/leaflet/images/spritesheet-2x.png differ diff --git a/flask_admin/static/vendor/leaflet/images/spritesheet.png b/flask_admin/static/vendor/leaflet/images/spritesheet.png old mode 100644 new mode 100755 index f7035a1cb..97d71c680 Binary files a/flask_admin/static/vendor/leaflet/images/spritesheet.png and b/flask_admin/static/vendor/leaflet/images/spritesheet.png differ diff --git a/flask_admin/static/vendor/leaflet/images/spritesheet.svg b/flask_admin/static/vendor/leaflet/images/spritesheet.svg old mode 100644 new mode 100755 index 542379322..3c00f3031 --- a/flask_admin/static/vendor/leaflet/images/spritesheet.svg +++ b/flask_admin/static/vendor/leaflet/images/spritesheet.svg @@ -1,27 +1,156 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 540 60" height="60" width="540"> - <g id="enabled" fill="#464646"> - <g id="polyline"> - <path d="M18 36v6h6v-6h-6zm4 4h-2v-2h2v2z"/> - <path d="M36 18v6h6v-6h-6zm4 4h-2v-2h2v2z"/> - <path d="M23.142 39.145l-2.285-2.29 16-15.998 2.285 2.285z"/> - </g> - <path id="polygon" d="M100 24.565l-2.096 14.83L83.07 42 76 28.773 86.463 18z"/> - <path id="rectangle" d="M140 20h20v20h-20z"/> - <path id="circle" d="M221 30c0 6.078-4.926 11-11 11s-11-4.922-11-11c0-6.074 4.926-11 11-11s11 4.926 11 11z"/> - <path id="marker" d="M270,19c-4.971,0-9,4.029-9,9c0,4.971,5.001,12,9,14c4.001-2,9-9.029,9-14C279,23.029,274.971,19,270,19z M270,31.5c-2.484,0-4.5-2.014-4.5-4.5c0-2.484,2.016-4.5,4.5-4.5c2.485,0,4.5,2.016,4.5,4.5C274.5,29.486,272.485,31.5,270,31.5z"/> - <g id="edit"> - <path d="M337,30.156v0.407v5.604c0,1.658-1.344,3-3,3h-10c-1.655,0-3-1.342-3-3v-10c0-1.657,1.345-3,3-3h6.345 l3.19-3.17H324c-3.313,0-6,2.687-6,6v10c0,3.313,2.687,6,6,6h10c3.314,0,6-2.687,6-6v-8.809L337,30.156"/> - <path d="M338.72 24.637l-8.892 8.892H327V30.7l8.89-8.89z"/> - <path d="M338.697 17.826h4v4h-4z" transform="rotate(-134.99 340.703 19.817)"/> - </g> - <g id="remove"> - <path d="M381 42h18V24h-18v18zm14-16h2v14h-2V26zm-4 0h2v14h-2V26zm-4 0h2v14h-2V26zm-4 0h2v14h-2V26z"/> - <path d="M395 20v-4h-10v4h-6v2h22v-2h-6zm-2 0h-6v-2h6v2z"/> - </g> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + viewBox="0 0 600 60" + height="60" + width="600" + id="svg4225" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="spritesheet.svg" + inkscape:export-filename="/home/fpuga/development/upstream/icarto.Leaflet.draw/src/images/spritesheet-2x.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <metadata + id="metadata4258"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs4256" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1056" + id="namedview4254" + showgrid="false" + inkscape:zoom="1.3101852" + inkscape:cx="237.56928" + inkscape:cy="7.2419621" + inkscape:window-x="1920" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:current-layer="svg4225" /> + <g + id="enabled" + style="fill:#464646;fill-opacity:1"> + <g + id="polyline" + style="fill:#464646;fill-opacity:1"> + <path + d="m 18,36 0,6 6,0 0,-6 -6,0 z m 4,4 -2,0 0,-2 2,0 0,2 z" + id="path4229" + inkscape:connector-curvature="0" + style="fill:#464646;fill-opacity:1" /> + <path + d="m 36,18 0,6 6,0 0,-6 -6,0 z m 4,4 -2,0 0,-2 2,0 0,2 z" + id="path4231" + inkscape:connector-curvature="0" + style="fill:#464646;fill-opacity:1" /> + <path + d="m 23.142,39.145 -2.285,-2.29 16,-15.998 2.285,2.285 z" + id="path4233" + inkscape:connector-curvature="0" + style="fill:#464646;fill-opacity:1" /> </g> - <g id="disabled" fill="#bbb" transform="translate(120)"> - <use xlink:href="#edit" id="edit-disabled"/> - <use xlink:href="#remove" id="remove-disabled"/> + <path + id="polygon" + d="M 100,24.565 97.904,39.395 83.07,42 76,28.773 86.463,18 Z" + inkscape:connector-curvature="0" + style="fill:#464646;fill-opacity:1" /> + <path + id="rectangle" + d="m 140,20 20,0 0,20 -20,0 z" + inkscape:connector-curvature="0" + style="fill:#464646;fill-opacity:1" /> + <path + id="circle" + d="m 221,30 c 0,6.078 -4.926,11 -11,11 -6.074,0 -11,-4.922 -11,-11 0,-6.074 4.926,-11 11,-11 6.074,0 11,4.926 11,11 z" + inkscape:connector-curvature="0" + style="fill:#464646;fill-opacity:1" /> + <path + id="marker" + d="m 270,19 c -4.971,0 -9,4.029 -9,9 0,4.971 5.001,12 9,14 4.001,-2 9,-9.029 9,-14 0,-4.971 -4.029,-9 -9,-9 z m 0,12.5 c -2.484,0 -4.5,-2.014 -4.5,-4.5 0,-2.484 2.016,-4.5 4.5,-4.5 2.485,0 4.5,2.016 4.5,4.5 0,2.486 -2.015,4.5 -4.5,4.5 z" + inkscape:connector-curvature="0" + style="fill:#464646;fill-opacity:1" /> + <g + id="edit" + style="fill:#464646;fill-opacity:1"> + <path + d="m 337,30.156 0,0.407 0,5.604 c 0,1.658 -1.344,3 -3,3 l -10,0 c -1.655,0 -3,-1.342 -3,-3 l 0,-10 c 0,-1.657 1.345,-3 3,-3 l 6.345,0 3.19,-3.17 -9.535,0 c -3.313,0 -6,2.687 -6,6 l 0,10 c 0,3.313 2.687,6 6,6 l 10,0 c 3.314,0 6,-2.687 6,-6 l 0,-8.809 -3,2.968" + id="path4240" + inkscape:connector-curvature="0" + style="fill:#464646;fill-opacity:1" /> + <path + d="m 338.72,24.637 -8.892,8.892 -2.828,0 0,-2.829 8.89,-8.89 z" + id="path4242" + inkscape:connector-curvature="0" + style="fill:#464646;fill-opacity:1" /> + <path + d="m 338.697,17.826 4,0 0,4 -4,0 z" + transform="matrix(-0.70698336,-0.70723018,0.70723018,-0.70698336,567.55917,274.78273)" + id="path4244" + inkscape:connector-curvature="0" + style="fill:#464646;fill-opacity:1" /> </g> + <g + id="remove" + style="fill:#464646;fill-opacity:1"> + <path + d="m 381,42 18,0 0,-18 -18,0 0,18 z m 14,-16 2,0 0,14 -2,0 0,-14 z m -4,0 2,0 0,14 -2,0 0,-14 z m -4,0 2,0 0,14 -2,0 0,-14 z m -4,0 2,0 0,14 -2,0 0,-14 z" + id="path4247" + inkscape:connector-curvature="0" + style="fill:#464646;fill-opacity:1" /> + <path + d="m 395,20 0,-4 -10,0 0,4 -6,0 0,2 22,0 0,-2 -6,0 z m -2,0 -6,0 0,-2 6,0 0,2 z" + id="path4249" + inkscape:connector-curvature="0" + style="fill:#464646;fill-opacity:1" /> + </g> + </g> + <g + id="disabled" + transform="translate(120,0)" + style="fill:#bbbbbb"> + <use + xlink:href="#edit" + id="edit-disabled" + x="0" + y="0" + width="100%" + height="100%" /> + <use + xlink:href="#remove" + id="remove-disabled" + x="0" + y="0" + width="100%" + height="100%" /> + </g> + <path + style="fill:none;stroke:#464646;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="circle-3" + d="m 581.65725,30 c 0,6.078 -4.926,11 -11,11 -6.074,0 -11,-4.922 -11,-11 0,-6.074 4.926,-11 11,-11 6.074,0 11,4.926 11,11 z" + inkscape:connector-curvature="0" /> </svg> diff --git a/flask_admin/static/vendor/leaflet/leaflet.css b/flask_admin/static/vendor/leaflet/leaflet.css index ac0cd174d..a0932d57a 100644 --- a/flask_admin/static/vendor/leaflet/leaflet.css +++ b/flask_admin/static/vendor/leaflet/leaflet.css @@ -1,16 +1,12 @@ /* required styles */ -.leaflet-map-pane, +.leaflet-pane, .leaflet-tile, .leaflet-marker-icon, .leaflet-marker-shadow, -.leaflet-tile-pane, .leaflet-tile-container, -.leaflet-overlay-pane, -.leaflet-shadow-pane, -.leaflet-marker-pane, -.leaflet-popup-pane, -.leaflet-overlay-pane svg, +.leaflet-pane > svg, +.leaflet-pane > canvas, .leaflet-zoom-box, .leaflet-image-layer, .leaflet-layer { @@ -20,7 +16,6 @@ } .leaflet-container { overflow: hidden; - -ms-touch-action: none; } .leaflet-tile, .leaflet-marker-icon, @@ -28,20 +23,54 @@ -webkit-user-select: none; -moz-user-select: none; user-select: none; - -webkit-user-drag: none; + -webkit-user-drag: none; + } +/* Safari renders non-retina tile on retina better with this, but Chrome is worse */ +.leaflet-safari .leaflet-tile { + image-rendering: -webkit-optimize-contrast; + } +/* hack that prevents hw layers "stretching" when loading new tiles */ +.leaflet-safari .leaflet-tile-container { + width: 1600px; + height: 1600px; + -webkit-transform-origin: 0 0; } .leaflet-marker-icon, .leaflet-marker-shadow { display: block; } -/* map is broken in FF if you have max-width: 100% on tiles */ -.leaflet-container img { +/* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */ +/* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */ +.leaflet-container .leaflet-overlay-pane svg, +.leaflet-container .leaflet-marker-pane img, +.leaflet-container .leaflet-shadow-pane img, +.leaflet-container .leaflet-tile-pane img, +.leaflet-container img.leaflet-image-layer, +.leaflet-container .leaflet-tile { max-width: none !important; + max-height: none !important; } -/* stupid Android 2 doesn't understand "max-width: none" properly */ -.leaflet-container img.leaflet-image-layer { - max-width: 15000px !important; + +.leaflet-container.leaflet-touch-zoom { + -ms-touch-action: pan-x pan-y; + touch-action: pan-x pan-y; } +.leaflet-container.leaflet-touch-drag { + -ms-touch-action: pinch-zoom; + /* Fallback for FF which doesn't support pinch-zoom */ + touch-action: none; + touch-action: pinch-zoom; +} +.leaflet-container.leaflet-touch-drag.leaflet-touch-zoom { + -ms-touch-action: none; + touch-action: none; +} +.leaflet-container { + -webkit-tap-highlight-color: transparent; +} +.leaflet-container a { + -webkit-tap-highlight-color: rgba(51, 181, 229, 0.4); +} .leaflet-tile { filter: inherit; visibility: hidden; @@ -52,18 +81,26 @@ .leaflet-zoom-box { width: 0; height: 0; + -moz-box-sizing: border-box; + box-sizing: border-box; + z-index: 800; } /* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */ .leaflet-overlay-pane svg { -moz-user-select: none; } -.leaflet-tile-pane { z-index: 2; } -.leaflet-objects-pane { z-index: 3; } -.leaflet-overlay-pane { z-index: 4; } -.leaflet-shadow-pane { z-index: 5; } -.leaflet-marker-pane { z-index: 6; } -.leaflet-popup-pane { z-index: 7; } +.leaflet-pane { z-index: 400; } + +.leaflet-tile-pane { z-index: 200; } +.leaflet-overlay-pane { z-index: 400; } +.leaflet-shadow-pane { z-index: 500; } +.leaflet-marker-pane { z-index: 600; } +.leaflet-tooltip-pane { z-index: 650; } +.leaflet-popup-pane { z-index: 700; } + +.leaflet-map-pane canvas { z-index: 100; } +.leaflet-map-pane svg { z-index: 200; } .leaflet-vml-shape { width: 1px; @@ -80,7 +117,8 @@ .leaflet-control { position: relative; - z-index: 7; + z-index: 800; + pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */ pointer-events: auto; } .leaflet-top, @@ -124,31 +162,35 @@ /* zoom and fade animations */ -.leaflet-fade-anim .leaflet-tile, +.leaflet-fade-anim .leaflet-tile { + will-change: opacity; + } .leaflet-fade-anim .leaflet-popup { opacity: 0; -webkit-transition: opacity 0.2s linear; -moz-transition: opacity 0.2s linear; - -o-transition: opacity 0.2s linear; transition: opacity 0.2s linear; } -.leaflet-fade-anim .leaflet-tile-loaded, .leaflet-fade-anim .leaflet-map-pane .leaflet-popup { opacity: 1; } - +.leaflet-zoom-animated { + -webkit-transform-origin: 0 0; + -ms-transform-origin: 0 0; + transform-origin: 0 0; + } +.leaflet-zoom-anim .leaflet-zoom-animated { + will-change: transform; + } .leaflet-zoom-anim .leaflet-zoom-animated { -webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1); -moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1); - -o-transition: -o-transform 0.25s cubic-bezier(0,0,0.25,1); transition: transform 0.25s cubic-bezier(0,0,0.25,1); } .leaflet-zoom-anim .leaflet-tile, -.leaflet-pan-anim .leaflet-tile, -.leaflet-touching .leaflet-zoom-animated { +.leaflet-pan-anim .leaflet-tile { -webkit-transition: none; -moz-transition: none; - -o-transition: none; transition: none; } @@ -159,24 +201,46 @@ /* cursors */ -.leaflet-clickable { +.leaflet-interactive { cursor: pointer; } -.leaflet-container { +.leaflet-grab { cursor: -webkit-grab; cursor: -moz-grab; + cursor: grab; + } +.leaflet-crosshair, +.leaflet-crosshair .leaflet-interactive { + cursor: crosshair; } .leaflet-popup-pane, .leaflet-control { cursor: auto; } -.leaflet-dragging .leaflet-container, -.leaflet-dragging .leaflet-clickable { +.leaflet-dragging .leaflet-grab, +.leaflet-dragging .leaflet-grab .leaflet-interactive, +.leaflet-dragging .leaflet-marker-draggable { cursor: move; cursor: -webkit-grabbing; cursor: -moz-grabbing; + cursor: grabbing; } +/* marker & overlays interactivity */ +.leaflet-marker-icon, +.leaflet-marker-shadow, +.leaflet-image-layer, +.leaflet-pane > svg path, +.leaflet-tile-container { + pointer-events: none; + } + +.leaflet-marker-icon.leaflet-interactive, +.leaflet-image-layer.leaflet-interactive, +.leaflet-pane > svg path.leaflet-interactive { + pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */ + pointer-events: auto; + } /* visual tweaks */ @@ -249,7 +313,14 @@ height: 30px; line-height: 30px; } - +.leaflet-touch .leaflet-bar a:first-child { + border-top-left-radius: 2px; + border-top-right-radius: 2px; + } +.leaflet-touch .leaflet-bar a:last-child { + border-bottom-left-radius: 2px; + border-bottom-right-radius: 2px; + } /* zoom control */ @@ -258,16 +329,10 @@ font: bold 18px 'Lucida Console', Monaco, monospace; text-indent: 1px; } -.leaflet-control-zoom-out { - font-size: 20px; - } -.leaflet-touch .leaflet-control-zoom-in { +.leaflet-touch .leaflet-control-zoom-in, .leaflet-touch .leaflet-control-zoom-out { font-size: 22px; } -.leaflet-touch .leaflet-control-zoom-out { - font-size: 24px; - } /* layers control */ @@ -303,6 +368,11 @@ color: #333; background: #fff; } +.leaflet-control-layers-scrollbar { + overflow-y: scroll; + overflow-x: hidden; + padding-right: 5px; + } .leaflet-control-layers-selector { margin-top: 2px; position: relative; @@ -317,6 +387,11 @@ margin: 5px -10px 5px -6px; } +/* Default icon URLs */ +.leaflet-default-icon-path { + background-image: url(images/marker-icon.png); + } + /* attribution and scale controls */ @@ -354,8 +429,8 @@ font-size: 11px; white-space: nowrap; overflow: hidden; - -moz-box-sizing: content-box; - box-sizing: content-box; + -moz-box-sizing: border-box; + box-sizing: border-box; background: #fff; background: rgba(255, 255, 255, 0.5); @@ -386,6 +461,7 @@ .leaflet-popup { position: absolute; text-align: center; + margin-bottom: 20px; } .leaflet-popup-content-wrapper { padding: 1px; @@ -400,11 +476,13 @@ margin: 18px 0; } .leaflet-popup-tip-container { - margin: 0 auto; width: 40px; height: 20px; - position: relative; + position: absolute; + left: 50%; + margin-left: -20px; overflow: hidden; + pointer-events: none; } .leaflet-popup-tip { width: 17px; @@ -416,13 +494,12 @@ -webkit-transform: rotate(45deg); -moz-transform: rotate(45deg); -ms-transform: rotate(45deg); - -o-transform: rotate(45deg); transform: rotate(45deg); } .leaflet-popup-content-wrapper, .leaflet-popup-tip { background: white; - + color: #333; box-shadow: 0 3px 14px rgba(0,0,0,0.4); } .leaflet-container a.leaflet-popup-close-button { @@ -430,6 +507,7 @@ top: 0; right: 0; padding: 4px 4px 0 0; + border: none; text-align: center; width: 18px; height: 14px; @@ -476,3 +554,82 @@ background: #fff; border: 1px solid #666; } + + +/* Tooltip */ +/* Base styles for the element that has a tooltip */ +.leaflet-tooltip { + position: absolute; + padding: 6px; + background-color: #fff; + border: 1px solid #fff; + border-radius: 3px; + color: #222; + white-space: nowrap; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + pointer-events: none; + box-shadow: 0 1px 3px rgba(0,0,0,0.4); + } +.leaflet-tooltip.leaflet-clickable { + cursor: pointer; + pointer-events: auto; + } +.leaflet-tooltip-top:before, +.leaflet-tooltip-bottom:before, +.leaflet-tooltip-left:before, +.leaflet-tooltip-right:before { + position: absolute; + pointer-events: none; + border: 6px solid transparent; + background: transparent; + content: ""; + } + +/* Directions */ + +.leaflet-tooltip-bottom { + margin-top: 6px; +} +.leaflet-tooltip-top { + margin-top: -6px; +} +.leaflet-tooltip-bottom:before, +.leaflet-tooltip-top:before { + left: 50%; + margin-left: -6px; + } +.leaflet-tooltip-top:before { + bottom: 0; + margin-bottom: -12px; + border-top-color: #fff; + } +.leaflet-tooltip-bottom:before { + top: 0; + margin-top: -12px; + margin-left: -6px; + border-bottom-color: #fff; + } +.leaflet-tooltip-left { + margin-left: -6px; +} +.leaflet-tooltip-right { + margin-left: 6px; +} +.leaflet-tooltip-left:before, +.leaflet-tooltip-right:before { + top: 50%; + margin-top: -6px; + } +.leaflet-tooltip-left:before { + right: 0; + margin-right: -12px; + border-left-color: #fff; + } +.leaflet-tooltip-right:before { + left: 0; + margin-left: -12px; + border-right-color: #fff; + } diff --git a/flask_admin/static/vendor/leaflet/leaflet.draw.css b/flask_admin/static/vendor/leaflet/leaflet.draw.css old mode 100644 new mode 100755 index cb879cfa6..a01941060 --- a/flask_admin/static/vendor/leaflet/leaflet.draw.css +++ b/flask_admin/static/vendor/leaflet/leaflet.draw.css @@ -1,295 +1,10 @@ -/* ================================================================== */ -/* Toolbars -/* ================================================================== */ - -.leaflet-draw-section { - position: relative; -} - -.leaflet-draw-toolbar { - margin-top: 12px; -} - -.leaflet-draw-toolbar-top { - margin-top: 0; -} - -.leaflet-draw-toolbar-notop a:first-child { - border-top-right-radius: 0; -} - -.leaflet-draw-toolbar-nobottom a:last-child { - border-bottom-right-radius: 0; -} - -.leaflet-draw-toolbar a { - background-image: url('images/spritesheet.png'); - background-repeat: no-repeat; -} - -.leaflet-retina .leaflet-draw-toolbar a { - background-image: url('images/spritesheet-2x.png'); - background-size: 270px 30px; -} - -.leaflet-draw a { - display: block; - text-align: center; - text-decoration: none; -} - -/* ================================================================== */ -/* Toolbar actions menu -/* ================================================================== */ - -.leaflet-draw-actions { - display: none; - list-style: none; - margin: 0; - padding: 0; - position: absolute; - left: 26px; /* leaflet-draw-toolbar.left + leaflet-draw-toolbar.width */ - top: 0; - white-space: nowrap; -} - -.leaflet-right .leaflet-draw-actions { - right:26px; - left:auto; -} - -.leaflet-draw-actions li { - display: inline-block; -} - -.leaflet-draw-actions li:first-child a { - border-left: none; -} - -.leaflet-draw-actions li:last-child a { - -webkit-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.leaflet-right .leaflet-draw-actions li:last-child a { - -webkit-border-radius: 0; - border-radius: 0; -} - -.leaflet-right .leaflet-draw-actions li:first-child a { - -webkit-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.leaflet-draw-actions a { - background-color: #919187; - border-left: 1px solid #AAA; - color: #FFF; - font: 11px/19px "Helvetica Neue", Arial, Helvetica, sans-serif; - line-height: 28px; - text-decoration: none; - padding-left: 10px; - padding-right: 10px; - height: 28px; -} - -.leaflet-draw-actions-bottom { - margin-top: 0; -} - -.leaflet-draw-actions-top { - margin-top: 1px; -} - -.leaflet-draw-actions-top a, -.leaflet-draw-actions-bottom a { - height: 27px; - line-height: 27px; -} - -.leaflet-draw-actions a:hover { - background-color: #A0A098; -} - -.leaflet-draw-actions-top.leaflet-draw-actions-bottom a { - height: 26px; - line-height: 26px; -} - -/* ================================================================== */ -/* Draw toolbar -/* ================================================================== */ - -.leaflet-draw-toolbar .leaflet-draw-draw-polyline { - background-position: -2px -2px; -} - -.leaflet-draw-toolbar .leaflet-draw-draw-polygon { - background-position: -31px -2px; -} - -.leaflet-draw-toolbar .leaflet-draw-draw-rectangle { - background-position: -62px -2px; -} - -.leaflet-draw-toolbar .leaflet-draw-draw-circle { - background-position: -92px -2px; -} - -.leaflet-draw-toolbar .leaflet-draw-draw-marker { - background-position: -122px -2px; -} - -/* ================================================================== */ -/* Edit toolbar -/* ================================================================== */ - -.leaflet-draw-toolbar .leaflet-draw-edit-edit { - background-position: -152px -2px; -} - -.leaflet-draw-toolbar .leaflet-draw-edit-remove { - background-position: -182px -2px; -} - -.leaflet-draw-toolbar .leaflet-draw-edit-edit.leaflet-disabled { - background-position: -212px -2px; -} - -.leaflet-draw-toolbar .leaflet-draw-edit-remove.leaflet-disabled { - background-position: -242px -2px; -} - -/* ================================================================== */ -/* Drawing styles -/* ================================================================== */ - -.leaflet-mouse-marker { - background-color: #fff; - cursor: crosshair; -} - -.leaflet-draw-tooltip { - background: rgb(54, 54, 54); - background: rgba(0, 0, 0, 0.5); - border: 1px solid transparent; - -webkit-border-radius: 4px; - border-radius: 4px; - color: #fff; - font: 12px/18px "Helvetica Neue", Arial, Helvetica, sans-serif; - margin-left: 20px; - margin-top: -21px; - padding: 4px 8px; - position: absolute; - visibility: hidden; - white-space: nowrap; - z-index: 6; -} - -.leaflet-draw-tooltip:before { - border-right: 6px solid black; - border-right-color: rgba(0, 0, 0, 0.5); - border-top: 6px solid transparent; - border-bottom: 6px solid transparent; - content: ""; - position: absolute; - top: 7px; - left: -7px; -} - -.leaflet-error-draw-tooltip { - background-color: #F2DEDE; - border: 1px solid #E6B6BD; - color: #B94A48; -} - -.leaflet-error-draw-tooltip:before { - border-right-color: #E6B6BD; -} - -.leaflet-draw-tooltip-single { - margin-top: -12px -} - -.leaflet-draw-tooltip-subtext { - color: #f8d5e4; -} - -.leaflet-draw-guide-dash { - font-size: 1%; - opacity: 0.6; - position: absolute; - width: 5px; - height: 5px; -} - -/* ================================================================== */ -/* Edit styles -/* ================================================================== */ - -.leaflet-edit-marker-selected { - background: rgba(254, 87, 161, 0.1); - border: 4px dashed rgba(254, 87, 161, 0.6); - -webkit-border-radius: 4px; - border-radius: 4px; -} - -.leaflet-edit-move { - cursor: move; -} - -.leaflet-edit-resize { - cursor: pointer; -} - -/* ================================================================== */ -/* Old IE styles -/* ================================================================== */ - -.leaflet-oldie .leaflet-draw-toolbar { - border: 3px solid #999; -} - -.leaflet-oldie .leaflet-draw-toolbar a { - background-color: #eee; -} - -.leaflet-oldie .leaflet-draw-toolbar a:hover { - background-color: #fff; -} - -.leaflet-oldie .leaflet-draw-actions { - left: 32px; - margin-top: 3px; -} - -.leaflet-oldie .leaflet-draw-actions li { - display: inline; - zoom: 1; -} - -.leaflet-oldie .leaflet-edit-marker-selected { - border: 4px dashed #fe93c2; -} - -.leaflet-oldie .leaflet-draw-actions a { - background-color: #999; -} - -.leaflet-oldie .leaflet-draw-actions a:hover { - background-color: #a5a5a5; -} - -.leaflet-oldie .leaflet-draw-actions-top a { - margin-top: 1px; -} - -.leaflet-oldie .leaflet-draw-actions-bottom a { - height: 28px; - line-height: 28px; -} - -.leaflet-oldie .leaflet-draw-actions-top.leaflet-draw-actions-bottom a { - height: 27px; - line-height: 27px; -} +.leaflet-draw-section{position:relative}.leaflet-draw-toolbar{margin-top:12px}.leaflet-draw-toolbar-top{margin-top:0}.leaflet-draw-toolbar-notop a:first-child{border-top-right-radius:0}.leaflet-draw-toolbar-nobottom a:last-child{border-bottom-right-radius:0}.leaflet-draw-toolbar a{background-image:url('images/spritesheet.png');background-image:linear-gradient(transparent,transparent),url('images/spritesheet.svg');background-repeat:no-repeat;background-size:300px 30px;background-clip:padding-box}.leaflet-retina .leaflet-draw-toolbar a{background-image:url('images/spritesheet-2x.png');background-image:linear-gradient(transparent,transparent),url('images/spritesheet.svg')} +.leaflet-draw a{display:block;text-align:center;text-decoration:none}.leaflet-draw a .sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.leaflet-draw-actions{display:none;list-style:none;margin:0;padding:0;position:absolute;left:26px;top:0;white-space:nowrap}.leaflet-touch .leaflet-draw-actions{left:32px}.leaflet-right .leaflet-draw-actions{right:26px;left:auto}.leaflet-touch .leaflet-right .leaflet-draw-actions{right:32px;left:auto}.leaflet-draw-actions li{display:inline-block} +.leaflet-draw-actions li:first-child a{border-left:0}.leaflet-draw-actions li:last-child a{-webkit-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.leaflet-right .leaflet-draw-actions li:last-child a{-webkit-border-radius:0;border-radius:0}.leaflet-right .leaflet-draw-actions li:first-child a{-webkit-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.leaflet-draw-actions a{background-color:#919187;border-left:1px solid #AAA;color:#FFF;font:11px/19px "Helvetica Neue",Arial,Helvetica,sans-serif;line-height:28px;text-decoration:none;padding-left:10px;padding-right:10px;height:28px} +.leaflet-touch .leaflet-draw-actions a{font-size:12px;line-height:30px;height:30px}.leaflet-draw-actions-bottom{margin-top:0}.leaflet-draw-actions-top{margin-top:1px}.leaflet-draw-actions-top a,.leaflet-draw-actions-bottom a{height:27px;line-height:27px}.leaflet-draw-actions a:hover{background-color:#a0a098}.leaflet-draw-actions-top.leaflet-draw-actions-bottom a{height:26px;line-height:26px}.leaflet-draw-toolbar .leaflet-draw-draw-polyline{background-position:-2px -2px}.leaflet-touch .leaflet-draw-toolbar .leaflet-draw-draw-polyline{background-position:0 -1px} +.leaflet-draw-toolbar .leaflet-draw-draw-polygon{background-position:-31px -2px}.leaflet-touch .leaflet-draw-toolbar .leaflet-draw-draw-polygon{background-position:-29px -1px}.leaflet-draw-toolbar .leaflet-draw-draw-rectangle{background-position:-62px -2px}.leaflet-touch .leaflet-draw-toolbar .leaflet-draw-draw-rectangle{background-position:-60px -1px}.leaflet-draw-toolbar .leaflet-draw-draw-circle{background-position:-92px -2px}.leaflet-touch .leaflet-draw-toolbar .leaflet-draw-draw-circle{background-position:-90px -1px} +.leaflet-draw-toolbar .leaflet-draw-draw-marker{background-position:-122px -2px}.leaflet-touch .leaflet-draw-toolbar .leaflet-draw-draw-marker{background-position:-120px -1px}.leaflet-draw-toolbar .leaflet-draw-draw-circlemarker{background-position:-273px -2px}.leaflet-touch .leaflet-draw-toolbar .leaflet-draw-draw-circlemarker{background-position:-271px -1px}.leaflet-draw-toolbar .leaflet-draw-edit-edit{background-position:-152px -2px}.leaflet-touch .leaflet-draw-toolbar .leaflet-draw-edit-edit{background-position:-150px -1px} +.leaflet-draw-toolbar .leaflet-draw-edit-remove{background-position:-182px -2px}.leaflet-touch .leaflet-draw-toolbar .leaflet-draw-edit-remove{background-position:-180px -1px}.leaflet-draw-toolbar .leaflet-draw-edit-edit.leaflet-disabled{background-position:-212px -2px}.leaflet-touch .leaflet-draw-toolbar .leaflet-draw-edit-edit.leaflet-disabled{background-position:-210px -1px}.leaflet-draw-toolbar .leaflet-draw-edit-remove.leaflet-disabled{background-position:-242px -2px}.leaflet-touch .leaflet-draw-toolbar .leaflet-draw-edit-remove.leaflet-disabled{background-position:-240px -2px} +.leaflet-mouse-marker{background-color:#fff;cursor:crosshair}.leaflet-draw-tooltip{background:#363636;background:rgba(0,0,0,0.5);border:1px solid transparent;-webkit-border-radius:4px;border-radius:4px;color:#fff;font:12px/18px "Helvetica Neue",Arial,Helvetica,sans-serif;margin-left:20px;margin-top:-21px;padding:4px 8px;position:absolute;visibility:hidden;white-space:nowrap;z-index:6}.leaflet-draw-tooltip:before{border-right:6px solid black;border-right-color:rgba(0,0,0,0.5);border-top:6px solid transparent;border-bottom:6px solid transparent;content:"";position:absolute;top:7px;left:-7px} +.leaflet-error-draw-tooltip{background-color:#f2dede;border:1px solid #e6b6bd;color:#b94a48}.leaflet-error-draw-tooltip:before{border-right-color:#e6b6bd}.leaflet-draw-tooltip-single{margin-top:-12px}.leaflet-draw-tooltip-subtext{color:#f8d5e4}.leaflet-draw-guide-dash{font-size:1%;opacity:.6;position:absolute;width:5px;height:5px}.leaflet-edit-marker-selected{background-color:rgba(254,87,161,0.1);border:4px dashed rgba(254,87,161,0.6);-webkit-border-radius:4px;border-radius:4px;box-sizing:content-box} +.leaflet-edit-move{cursor:move}.leaflet-edit-resize{cursor:pointer}.leaflet-oldie .leaflet-draw-toolbar{border:1px solid #999} \ No newline at end of file diff --git a/flask_admin/static/vendor/leaflet/leaflet.draw.js b/flask_admin/static/vendor/leaflet/leaflet.draw.js old mode 100644 new mode 100755 index 9ad4341e1..28f9338ab --- a/flask_admin/static/vendor/leaflet/leaflet.draw.js +++ b/flask_admin/static/vendor/leaflet/leaflet.draw.js @@ -1,10 +1,10 @@ /* - Leaflet.draw, a plugin that adds drawing and editing tools to Leaflet powered maps. - (c) 2012-2013, Jacob Toye, Smartrak + Leaflet.draw 0.4.14, a plugin that adds drawing and editing tools to Leaflet powered maps. + (c) 2012-2017, Jacob Toye, Jon West, Smartrak, Leaflet - https://github.com/Leaflet/Leaflet.draw - http://leafletjs.com - https://github.com/jacobtoye -*/ -!function(t,e){L.drawVersion="0.2.3",L.drawLocal={draw:{toolbar:{actions:{title:"Cancel drawing",text:"Cancel"},undo:{title:"Delete last point drawn",text:"Delete last point"},buttons:{polyline:"Draw a polyline",polygon:"Draw a polygon",rectangle:"Draw a rectangle",circle:"Draw a circle",marker:"Draw a marker"}},handlers:{circle:{tooltip:{start:"Click and drag to draw circle."}},marker:{tooltip:{start:"Click map to place marker."}},polygon:{tooltip:{start:"Click to start drawing shape.",cont:"Click to continue drawing shape.",end:"Click first point to close this shape."}},polyline:{error:"<strong>Error:</strong> shape edges cannot cross!",tooltip:{start:"Click to start drawing line.",cont:"Click to continue drawing line.",end:"Click last point to finish line."}},rectangle:{tooltip:{start:"Click and drag to draw rectangle."}},simpleshape:{tooltip:{end:"Release mouse to finish drawing."}}}},edit:{toolbar:{actions:{save:{title:"Save changes.",text:"Save"},cancel:{title:"Cancel editing, discards all changes.",text:"Cancel"}},buttons:{edit:"Edit layers.",editDisabled:"No layers to edit.",remove:"Delete layers.",removeDisabled:"No layers to delete."}},handlers:{edit:{tooltip:{text:"Drag handles, or marker to edit feature.",subtext:"Click cancel to undo changes."}},remove:{tooltip:{text:"Click on a feature to remove"}}}}},L.Draw={},L.Draw.Feature=L.Handler.extend({includes:L.Mixin.Events,initialize:function(t,e){this._map=t,this._container=t._container,this._overlayPane=t._panes.overlayPane,this._popupPane=t._panes.popupPane,e&&e.shapeOptions&&(e.shapeOptions=L.Util.extend({},this.options.shapeOptions,e.shapeOptions)),L.setOptions(this,e)},enable:function(){this._enabled||(this.fire("enabled",{handler:this.type}),this._map.fire("draw:drawstart",{layerType:this.type}),L.Handler.prototype.enable.call(this))},disable:function(){this._enabled&&(L.Handler.prototype.disable.call(this),this._map.fire("draw:drawstop",{layerType:this.type}),this.fire("disabled",{handler:this.type}))},addHooks:function(){var t=this._map;t&&(L.DomUtil.disableTextSelection(),t.getContainer().focus(),this._tooltip=new L.Tooltip(this._map),L.DomEvent.on(this._container,"keyup",this._cancelDrawing,this))},removeHooks:function(){this._map&&(L.DomUtil.enableTextSelection(),this._tooltip.dispose(),this._tooltip=null,L.DomEvent.off(this._container,"keyup",this._cancelDrawing,this))},setOptions:function(t){L.setOptions(this,t)},_fireCreatedEvent:function(t){this._map.fire("draw:created",{layer:t,layerType:this.type})},_cancelDrawing:function(t){27===t.keyCode&&this.disable()}}),L.Draw.Polyline=L.Draw.Feature.extend({statics:{TYPE:"polyline"},Poly:L.Polyline,options:{allowIntersection:!0,repeatMode:!1,drawError:{color:"#b00b00",timeout:2500},icon:new L.DivIcon({iconSize:new L.Point(8,8),className:"leaflet-div-icon leaflet-editing-icon"}),guidelineDistance:20,maxGuideLineLength:4e3,shapeOptions:{stroke:!0,color:"#f06eaa",weight:4,opacity:.5,fill:!1,clickable:!0},metric:!0,showLength:!0,zIndexOffset:2e3},initialize:function(t,e){this.options.drawError.message=L.drawLocal.draw.handlers.polyline.error,e&&e.drawError&&(e.drawError=L.Util.extend({},this.options.drawError,e.drawError)),this.type=L.Draw.Polyline.TYPE,L.Draw.Feature.prototype.initialize.call(this,t,e)},addHooks:function(){L.Draw.Feature.prototype.addHooks.call(this),this._map&&(this._markers=[],this._markerGroup=new L.LayerGroup,this._map.addLayer(this._markerGroup),this._poly=new L.Polyline([],this.options.shapeOptions),this._tooltip.updateContent(this._getTooltipText()),this._mouseMarker||(this._mouseMarker=L.marker(this._map.getCenter(),{icon:L.divIcon({className:"leaflet-mouse-marker",iconAnchor:[20,20],iconSize:[40,40]}),opacity:0,zIndexOffset:this.options.zIndexOffset})),this._mouseMarker.on("mousedown",this._onMouseDown,this).addTo(this._map),this._map.on("mousemove",this._onMouseMove,this).on("mouseup",this._onMouseUp,this).on("zoomend",this._onZoomEnd,this))},removeHooks:function(){L.Draw.Feature.prototype.removeHooks.call(this),this._clearHideErrorTimeout(),this._cleanUpShape(),this._map.removeLayer(this._markerGroup),delete this._markerGroup,delete this._markers,this._map.removeLayer(this._poly),delete this._poly,this._mouseMarker.off("mousedown",this._onMouseDown,this).off("mouseup",this._onMouseUp,this),this._map.removeLayer(this._mouseMarker),delete this._mouseMarker,this._clearGuides(),this._map.off("mousemove",this._onMouseMove,this).off("zoomend",this._onZoomEnd,this)},deleteLastVertex:function(){if(!(this._markers.length<=1)){var t=this._markers.pop(),e=this._poly,i=this._poly.spliceLatLngs(e.getLatLngs().length-1,1)[0];this._markerGroup.removeLayer(t),e.getLatLngs().length<2&&this._map.removeLayer(e),this._vertexChanged(i,!1)}},addVertex:function(t){var e=this._markers.length;return e>0&&!this.options.allowIntersection&&this._poly.newLatLngIntersects(t)?(this._showErrorTooltip(),void 0):(this._errorShown&&this._hideErrorTooltip(),this._markers.push(this._createMarker(t)),this._poly.addLatLng(t),2===this._poly.getLatLngs().length&&this._map.addLayer(this._poly),this._vertexChanged(t,!0),void 0)},_finishShape:function(){var t=this._poly.newLatLngIntersects(this._poly.getLatLngs()[0],!0);return!this.options.allowIntersection&&t||!this._shapeIsValid()?(this._showErrorTooltip(),void 0):(this._fireCreatedEvent(),this.disable(),this.options.repeatMode&&this.enable(),void 0)},_shapeIsValid:function(){return!0},_onZoomEnd:function(){this._updateGuide()},_onMouseMove:function(t){var e=t.layerPoint,i=t.latlng;this._currentLatLng=i,this._updateTooltip(i),this._updateGuide(e),this._mouseMarker.setLatLng(i),L.DomEvent.preventDefault(t.originalEvent)},_vertexChanged:function(t,e){this._updateFinishHandler(),this._updateRunningMeasure(t,e),this._clearGuides(),this._updateTooltip()},_onMouseDown:function(t){var e=t.originalEvent;this._mouseDownOrigin=L.point(e.clientX,e.clientY)},_onMouseUp:function(e){if(this._mouseDownOrigin){var i=L.point(e.originalEvent.clientX,e.originalEvent.clientY).distanceTo(this._mouseDownOrigin);Math.abs(i)<9*(t.devicePixelRatio||1)&&this.addVertex(e.latlng)}this._mouseDownOrigin=null},_updateFinishHandler:function(){var t=this._markers.length;t>1&&this._markers[t-1].on("click",this._finishShape,this),t>2&&this._markers[t-2].off("click",this._finishShape,this)},_createMarker:function(t){var e=new L.Marker(t,{icon:this.options.icon,zIndexOffset:2*this.options.zIndexOffset});return this._markerGroup.addLayer(e),e},_updateGuide:function(t){var e=this._markers.length;e>0&&(t=t||this._map.latLngToLayerPoint(this._currentLatLng),this._clearGuides(),this._drawGuide(this._map.latLngToLayerPoint(this._markers[e-1].getLatLng()),t))},_updateTooltip:function(t){var e=this._getTooltipText();t&&this._tooltip.updatePosition(t),this._errorShown||this._tooltip.updateContent(e)},_drawGuide:function(t,e){var i,o,a,s=Math.floor(Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))),r=this.options.guidelineDistance,n=this.options.maxGuideLineLength,l=s>n?s-n:r;for(this._guidesContainer||(this._guidesContainer=L.DomUtil.create("div","leaflet-draw-guides",this._overlayPane));s>l;l+=this.options.guidelineDistance)i=l/s,o={x:Math.floor(t.x*(1-i)+i*e.x),y:Math.floor(t.y*(1-i)+i*e.y)},a=L.DomUtil.create("div","leaflet-draw-guide-dash",this._guidesContainer),a.style.backgroundColor=this._errorShown?this.options.drawError.color:this.options.shapeOptions.color,L.DomUtil.setPosition(a,o)},_updateGuideColor:function(t){if(this._guidesContainer)for(var e=0,i=this._guidesContainer.childNodes.length;i>e;e++)this._guidesContainer.childNodes[e].style.backgroundColor=t},_clearGuides:function(){if(this._guidesContainer)for(;this._guidesContainer.firstChild;)this._guidesContainer.removeChild(this._guidesContainer.firstChild)},_getTooltipText:function(){var t,e,i=this.options.showLength;return 0===this._markers.length?t={text:L.drawLocal.draw.handlers.polyline.tooltip.start}:(e=i?this._getMeasurementString():"",t=1===this._markers.length?{text:L.drawLocal.draw.handlers.polyline.tooltip.cont,subtext:e}:{text:L.drawLocal.draw.handlers.polyline.tooltip.end,subtext:e}),t},_updateRunningMeasure:function(t,e){var i,o,a=this._markers.length;1===this._markers.length?this._measurementRunningTotal=0:(i=a-(e?2:1),o=t.distanceTo(this._markers[i].getLatLng()),this._measurementRunningTotal+=o*(e?1:-1))},_getMeasurementString:function(){var t,e=this._currentLatLng,i=this._markers[this._markers.length-1].getLatLng();return t=this._measurementRunningTotal+e.distanceTo(i),L.GeometryUtil.readableDistance(t,this.options.metric)},_showErrorTooltip:function(){this._errorShown=!0,this._tooltip.showAsError().updateContent({text:this.options.drawError.message}),this._updateGuideColor(this.options.drawError.color),this._poly.setStyle({color:this.options.drawError.color}),this._clearHideErrorTimeout(),this._hideErrorTimeout=setTimeout(L.Util.bind(this._hideErrorTooltip,this),this.options.drawError.timeout)},_hideErrorTooltip:function(){this._errorShown=!1,this._clearHideErrorTimeout(),this._tooltip.removeError().updateContent(this._getTooltipText()),this._updateGuideColor(this.options.shapeOptions.color),this._poly.setStyle({color:this.options.shapeOptions.color})},_clearHideErrorTimeout:function(){this._hideErrorTimeout&&(clearTimeout(this._hideErrorTimeout),this._hideErrorTimeout=null)},_cleanUpShape:function(){this._markers.length>1&&this._markers[this._markers.length-1].off("click",this._finishShape,this)},_fireCreatedEvent:function(){var t=new this.Poly(this._poly.getLatLngs(),this.options.shapeOptions);L.Draw.Feature.prototype._fireCreatedEvent.call(this,t)}}),L.Draw.Polygon=L.Draw.Polyline.extend({statics:{TYPE:"polygon"},Poly:L.Polygon,options:{showArea:!1,shapeOptions:{stroke:!0,color:"#f06eaa",weight:4,opacity:.5,fill:!0,fillColor:null,fillOpacity:.2,clickable:!0}},initialize:function(t,e){L.Draw.Polyline.prototype.initialize.call(this,t,e),this.type=L.Draw.Polygon.TYPE},_updateFinishHandler:function(){var t=this._markers.length;1===t&&this._markers[0].on("click",this._finishShape,this),t>2&&(this._markers[t-1].on("dblclick",this._finishShape,this),t>3&&this._markers[t-2].off("dblclick",this._finishShape,this))},_getTooltipText:function(){var t,e;return 0===this._markers.length?t=L.drawLocal.draw.handlers.polygon.tooltip.start:this._markers.length<3?t=L.drawLocal.draw.handlers.polygon.tooltip.cont:(t=L.drawLocal.draw.handlers.polygon.tooltip.end,e=this._getMeasurementString()),{text:t,subtext:e}},_getMeasurementString:function(){var t=this._area;return t?L.GeometryUtil.readableArea(t,this.options.metric):null},_shapeIsValid:function(){return this._markers.length>=3},_vertexAdded:function(){if(!this.options.allowIntersection&&this.options.showArea){var t=this._poly.getLatLngs();this._area=L.GeometryUtil.geodesicArea(t)}},_cleanUpShape:function(){var t=this._markers.length;t>0&&(this._markers[0].off("click",this._finishShape,this),t>2&&this._markers[t-1].off("dblclick",this._finishShape,this))}}),L.SimpleShape={},L.Draw.SimpleShape=L.Draw.Feature.extend({options:{repeatMode:!1},initialize:function(t,e){this._endLabelText=L.drawLocal.draw.handlers.simpleshape.tooltip.end,L.Draw.Feature.prototype.initialize.call(this,t,e)},addHooks:function(){L.Draw.Feature.prototype.addHooks.call(this),this._map&&(this._mapDraggable=this._map.dragging.enabled(),this._mapDraggable&&this._map.dragging.disable(),this._container.style.cursor="crosshair",this._tooltip.updateContent({text:this._initialLabelText}),this._map.on("mousedown",this._onMouseDown,this).on("mousemove",this._onMouseMove,this))},removeHooks:function(){L.Draw.Feature.prototype.removeHooks.call(this),this._map&&(this._mapDraggable&&this._map.dragging.enable(),this._container.style.cursor="",this._map.off("mousedown",this._onMouseDown,this).off("mousemove",this._onMouseMove,this),L.DomEvent.off(e,"mouseup",this._onMouseUp,this),this._shape&&(this._map.removeLayer(this._shape),delete this._shape)),this._isDrawing=!1},_onMouseDown:function(t){this._isDrawing=!0,this._startLatLng=t.latlng,L.DomEvent.on(e,"mouseup",this._onMouseUp,this).preventDefault(t.originalEvent)},_onMouseMove:function(t){var e=t.latlng;this._tooltip.updatePosition(e),this._isDrawing&&(this._tooltip.updateContent({text:this._endLabelText}),this._drawShape(e))},_onMouseUp:function(){this._shape&&this._fireCreatedEvent(),this.disable(),this.options.repeatMode&&this.enable()}}),L.Draw.Rectangle=L.Draw.SimpleShape.extend({statics:{TYPE:"rectangle"},options:{shapeOptions:{stroke:!0,color:"#f06eaa",weight:4,opacity:.5,fill:!0,fillColor:null,fillOpacity:.2,clickable:!0}},initialize:function(t,e){this.type=L.Draw.Rectangle.TYPE,this._initialLabelText=L.drawLocal.draw.handlers.rectangle.tooltip.start,L.Draw.SimpleShape.prototype.initialize.call(this,t,e)},_drawShape:function(t){this._shape?this._shape.setBounds(new L.LatLngBounds(this._startLatLng,t)):(this._shape=new L.Rectangle(new L.LatLngBounds(this._startLatLng,t),this.options.shapeOptions),this._map.addLayer(this._shape))},_fireCreatedEvent:function(){var t=new L.Rectangle(this._shape.getBounds(),this.options.shapeOptions);L.Draw.SimpleShape.prototype._fireCreatedEvent.call(this,t)}}),L.Draw.Circle=L.Draw.SimpleShape.extend({statics:{TYPE:"circle"},options:{shapeOptions:{stroke:!0,color:"#f06eaa",weight:4,opacity:.5,fill:!0,fillColor:null,fillOpacity:.2,clickable:!0},showRadius:!0,metric:!0},initialize:function(t,e){this.type=L.Draw.Circle.TYPE,this._initialLabelText=L.drawLocal.draw.handlers.circle.tooltip.start,L.Draw.SimpleShape.prototype.initialize.call(this,t,e)},_drawShape:function(t){this._shape?this._shape.setRadius(this._startLatLng.distanceTo(t)):(this._shape=new L.Circle(this._startLatLng,this._startLatLng.distanceTo(t),this.options.shapeOptions),this._map.addLayer(this._shape))},_fireCreatedEvent:function(){var t=new L.Circle(this._startLatLng,this._shape.getRadius(),this.options.shapeOptions);L.Draw.SimpleShape.prototype._fireCreatedEvent.call(this,t)},_onMouseMove:function(t){var e,i=t.latlng,o=this.options.showRadius,a=this.options.metric;this._tooltip.updatePosition(i),this._isDrawing&&(this._drawShape(i),e=this._shape.getRadius().toFixed(1),this._tooltip.updateContent({text:this._endLabelText,subtext:o?"Radius: "+L.GeometryUtil.readableDistance(e,a):""}))}}),L.Draw.Marker=L.Draw.Feature.extend({statics:{TYPE:"marker"},options:{icon:new L.Icon.Default,repeatMode:!1,zIndexOffset:2e3},initialize:function(t,e){this.type=L.Draw.Marker.TYPE,L.Draw.Feature.prototype.initialize.call(this,t,e)},addHooks:function(){L.Draw.Feature.prototype.addHooks.call(this),this._map&&(this._tooltip.updateContent({text:L.drawLocal.draw.handlers.marker.tooltip.start}),this._mouseMarker||(this._mouseMarker=L.marker(this._map.getCenter(),{icon:L.divIcon({className:"leaflet-mouse-marker",iconAnchor:[20,20],iconSize:[40,40]}),opacity:0,zIndexOffset:this.options.zIndexOffset})),this._mouseMarker.on("click",this._onClick,this).addTo(this._map),this._map.on("mousemove",this._onMouseMove,this))},removeHooks:function(){L.Draw.Feature.prototype.removeHooks.call(this),this._map&&(this._marker&&(this._marker.off("click",this._onClick,this),this._map.off("click",this._onClick,this).removeLayer(this._marker),delete this._marker),this._mouseMarker.off("click",this._onClick,this),this._map.removeLayer(this._mouseMarker),delete this._mouseMarker,this._map.off("mousemove",this._onMouseMove,this))},_onMouseMove:function(t){var e=t.latlng;this._tooltip.updatePosition(e),this._mouseMarker.setLatLng(e),this._marker?(e=this._mouseMarker.getLatLng(),this._marker.setLatLng(e)):(this._marker=new L.Marker(e,{icon:this.options.icon,zIndexOffset:this.options.zIndexOffset}),this._marker.on("click",this._onClick,this),this._map.on("click",this._onClick,this).addLayer(this._marker))},_onClick:function(){this._fireCreatedEvent(),this.disable(),this.options.repeatMode&&this.enable()},_fireCreatedEvent:function(){var t=new L.Marker(this._marker.getLatLng(),{icon:this.options.icon});L.Draw.Feature.prototype._fireCreatedEvent.call(this,t)}}),L.Edit=L.Edit||{},L.Edit.Poly=L.Handler.extend({options:{icon:new L.DivIcon({iconSize:new L.Point(8,8),className:"leaflet-div-icon leaflet-editing-icon"})},initialize:function(t,e){this._poly=t,L.setOptions(this,e)},addHooks:function(){this._poly._map&&(this._markerGroup||this._initMarkers(),this._poly._map.addLayer(this._markerGroup))},removeHooks:function(){this._poly._map&&(this._poly._map.removeLayer(this._markerGroup),delete this._markerGroup,delete this._markers)},updateMarkers:function(){this._markerGroup.clearLayers(),this._initMarkers()},_initMarkers:function(){this._markerGroup||(this._markerGroup=new L.LayerGroup),this._markers=[];var t,e,i,o,a=this._poly._latlngs;for(t=0,i=a.length;i>t;t++)o=this._createMarker(a[t],t),o.on("click",this._onMarkerClick,this),this._markers.push(o);var s,r;for(t=0,e=i-1;i>t;e=t++)(0!==t||L.Polygon&&this._poly instanceof L.Polygon)&&(s=this._markers[e],r=this._markers[t],this._createMiddleMarker(s,r),this._updatePrevNext(s,r))},_createMarker:function(t,e){var i=new L.Marker(t,{draggable:!0,icon:this.options.icon});return i._origLatLng=t,i._index=e,i.on("drag",this._onMarkerDrag,this),i.on("dragend",this._fireEdit,this),this._markerGroup.addLayer(i),i},_removeMarker:function(t){var e=t._index;this._markerGroup.removeLayer(t),this._markers.splice(e,1),this._poly.spliceLatLngs(e,1),this._updateIndexes(e,-1),t.off("drag",this._onMarkerDrag,this).off("dragend",this._fireEdit,this).off("click",this._onMarkerClick,this)},_fireEdit:function(){this._poly.edited=!0,this._poly.fire("edit")},_onMarkerDrag:function(t){var e=t.target;L.extend(e._origLatLng,e._latlng),e._middleLeft&&e._middleLeft.setLatLng(this._getMiddleLatLng(e._prev,e)),e._middleRight&&e._middleRight.setLatLng(this._getMiddleLatLng(e,e._next)),this._poly.redraw()},_onMarkerClick:function(t){var e=L.Polygon&&this._poly instanceof L.Polygon?4:3,i=t.target;this._poly._latlngs.length<e||(this._removeMarker(i),this._updatePrevNext(i._prev,i._next),i._middleLeft&&this._markerGroup.removeLayer(i._middleLeft),i._middleRight&&this._markerGroup.removeLayer(i._middleRight),i._prev&&i._next?this._createMiddleMarker(i._prev,i._next):i._prev?i._next||(i._prev._middleRight=null):i._next._middleLeft=null,this._fireEdit())},_updateIndexes:function(t,e){this._markerGroup.eachLayer(function(i){i._index>t&&(i._index+=e)})},_createMiddleMarker:function(t,e){var i,o,a,s=this._getMiddleLatLng(t,e),r=this._createMarker(s);r.setOpacity(.6),t._middleRight=e._middleLeft=r,o=function(){var o=e._index;r._index=o,r.off("click",i,this).on("click",this._onMarkerClick,this),s.lat=r.getLatLng().lat,s.lng=r.getLatLng().lng,this._poly.spliceLatLngs(o,0,s),this._markers.splice(o,0,r),r.setOpacity(1),this._updateIndexes(o,1),e._index++,this._updatePrevNext(t,r),this._updatePrevNext(r,e),this._poly.fire("editstart")},a=function(){r.off("dragstart",o,this),r.off("dragend",a,this),this._createMiddleMarker(t,r),this._createMiddleMarker(r,e)},i=function(){o.call(this),a.call(this),this._fireEdit()},r.on("click",i,this).on("dragstart",o,this).on("dragend",a,this),this._markerGroup.addLayer(r)},_updatePrevNext:function(t,e){t&&(t._next=e),e&&(e._prev=t)},_getMiddleLatLng:function(t,e){var i=this._poly._map,o=i.project(t.getLatLng()),a=i.project(e.getLatLng());return i.unproject(o._add(a)._divideBy(2))}}),L.Polyline.addInitHook(function(){this.editing||(L.Edit.Poly&&(this.editing=new L.Edit.Poly(this),this.options.editable&&this.editing.enable()),this.on("add",function(){this.editing&&this.editing.enabled()&&this.editing.addHooks()}),this.on("remove",function(){this.editing&&this.editing.enabled()&&this.editing.removeHooks()}))}),L.Edit=L.Edit||{},L.Edit.SimpleShape=L.Handler.extend({options:{moveIcon:new L.DivIcon({iconSize:new L.Point(8,8),className:"leaflet-div-icon leaflet-editing-icon leaflet-edit-move"}),resizeIcon:new L.DivIcon({iconSize:new L.Point(8,8),className:"leaflet-div-icon leaflet-editing-icon leaflet-edit-resize"})},initialize:function(t,e){this._shape=t,L.Util.setOptions(this,e)},addHooks:function(){this._shape._map&&(this._map=this._shape._map,this._markerGroup||this._initMarkers(),this._map.addLayer(this._markerGroup))},removeHooks:function(){if(this._shape._map){this._unbindMarker(this._moveMarker);for(var t=0,e=this._resizeMarkers.length;e>t;t++)this._unbindMarker(this._resizeMarkers[t]);this._resizeMarkers=null,this._map.removeLayer(this._markerGroup),delete this._markerGroup}this._map=null},updateMarkers:function(){this._markerGroup.clearLayers(),this._initMarkers()},_initMarkers:function(){this._markerGroup||(this._markerGroup=new L.LayerGroup),this._createMoveMarker(),this._createResizeMarker()},_createMoveMarker:function(){},_createResizeMarker:function(){},_createMarker:function(t,e){var i=new L.Marker(t,{draggable:!0,icon:e,zIndexOffset:10});return this._bindMarker(i),this._markerGroup.addLayer(i),i},_bindMarker:function(t){t.on("dragstart",this._onMarkerDragStart,this).on("drag",this._onMarkerDrag,this).on("dragend",this._onMarkerDragEnd,this)},_unbindMarker:function(t){t.off("dragstart",this._onMarkerDragStart,this).off("drag",this._onMarkerDrag,this).off("dragend",this._onMarkerDragEnd,this)},_onMarkerDragStart:function(t){var e=t.target;e.setOpacity(0),this._shape.fire("editstart")},_fireEdit:function(){this._shape.edited=!0,this._shape.fire("edit")},_onMarkerDrag:function(t){var e=t.target,i=e.getLatLng();e===this._moveMarker?this._move(i):this._resize(i),this._shape.redraw()},_onMarkerDragEnd:function(t){var e=t.target;e.setOpacity(1),this._fireEdit()},_move:function(){},_resize:function(){}}),L.Edit=L.Edit||{},L.Edit.Rectangle=L.Edit.SimpleShape.extend({_createMoveMarker:function(){var t=this._shape.getBounds(),e=t.getCenter();this._moveMarker=this._createMarker(e,this.options.moveIcon)},_createResizeMarker:function(){var t=this._getCorners();this._resizeMarkers=[];for(var e=0,i=t.length;i>e;e++)this._resizeMarkers.push(this._createMarker(t[e],this.options.resizeIcon)),this._resizeMarkers[e]._cornerIndex=e},_onMarkerDragStart:function(t){L.Edit.SimpleShape.prototype._onMarkerDragStart.call(this,t);var e=this._getCorners(),i=t.target,o=i._cornerIndex;this._oppositeCorner=e[(o+2)%4],this._toggleCornerMarkers(0,o)},_onMarkerDragEnd:function(t){var e,i,o=t.target;o===this._moveMarker&&(e=this._shape.getBounds(),i=e.getCenter(),o.setLatLng(i)),this._toggleCornerMarkers(1),this._repositionCornerMarkers(),L.Edit.SimpleShape.prototype._onMarkerDragEnd.call(this,t)},_move:function(t){for(var e,i=this._shape.getLatLngs(),o=this._shape.getBounds(),a=o.getCenter(),s=[],r=0,n=i.length;n>r;r++)e=[i[r].lat-a.lat,i[r].lng-a.lng],s.push([t.lat+e[0],t.lng+e[1]]);this._shape.setLatLngs(s),this._repositionCornerMarkers()},_resize:function(t){var e;this._shape.setBounds(L.latLngBounds(t,this._oppositeCorner)),e=this._shape.getBounds(),this._moveMarker.setLatLng(e.getCenter())},_getCorners:function(){var t=this._shape.getBounds(),e=t.getNorthWest(),i=t.getNorthEast(),o=t.getSouthEast(),a=t.getSouthWest();return[e,i,o,a]},_toggleCornerMarkers:function(t){for(var e=0,i=this._resizeMarkers.length;i>e;e++)this._resizeMarkers[e].setOpacity(t)},_repositionCornerMarkers:function(){for(var t=this._getCorners(),e=0,i=this._resizeMarkers.length;i>e;e++)this._resizeMarkers[e].setLatLng(t[e])}}),L.Rectangle.addInitHook(function(){L.Edit.Rectangle&&(this.editing=new L.Edit.Rectangle(this),this.options.editable&&this.editing.enable())}),L.Edit=L.Edit||{},L.Edit.Circle=L.Edit.SimpleShape.extend({_createMoveMarker:function(){var t=this._shape.getLatLng();this._moveMarker=this._createMarker(t,this.options.moveIcon)},_createResizeMarker:function(){var t=this._shape.getLatLng(),e=this._getResizeMarkerPoint(t);this._resizeMarkers=[],this._resizeMarkers.push(this._createMarker(e,this.options.resizeIcon))},_getResizeMarkerPoint:function(t){var e=this._shape._radius*Math.cos(Math.PI/4),i=this._map.project(t);return this._map.unproject([i.x+e,i.y-e])},_move:function(t){var e=this._getResizeMarkerPoint(t);this._resizeMarkers[0].setLatLng(e),this._shape.setLatLng(t)},_resize:function(t){var e=this._moveMarker.getLatLng(),i=e.distanceTo(t);this._shape.setRadius(i)}}),L.Circle.addInitHook(function(){L.Edit.Circle&&(this.editing=new L.Edit.Circle(this),this.options.editable&&this.editing.enable()),this.on("add",function(){this.editing&&this.editing.enabled()&&this.editing.addHooks()}),this.on("remove",function(){this.editing&&this.editing.enabled()&&this.editing.removeHooks()})}),L.LatLngUtil={cloneLatLngs:function(t){for(var e=[],i=0,o=t.length;o>i;i++)e.push(this.cloneLatLng(t[i]));return e},cloneLatLng:function(t){return L.latLng(t.lat,t.lng)}},L.GeometryUtil=L.extend(L.GeometryUtil||{},{geodesicArea:function(t){var e,i,o=t.length,a=0,s=L.LatLng.DEG_TO_RAD;if(o>2){for(var r=0;o>r;r++)e=t[r],i=t[(r+1)%o],a+=(i.lng-e.lng)*s*(2+Math.sin(e.lat*s)+Math.sin(i.lat*s));a=6378137*a*6378137/2}return Math.abs(a)},readableArea:function(t,e){var i;return e?i=t>=1e4?(1e-4*t).toFixed(2)+" ha":t.toFixed(2)+" m&sup2;":(t*=.836127,i=t>=3097600?(t/3097600).toFixed(2)+" mi&sup2;":t>=4840?(t/4840).toFixed(2)+" acres":Math.ceil(t)+" yd&sup2;"),i},readableDistance:function(t,e){var i;return e?i=t>1e3?(t/1e3).toFixed(2)+" km":Math.ceil(t)+" m":(t*=1.09361,i=t>1760?(t/1760).toFixed(2)+" miles":Math.ceil(t)+" yd"),i}}),L.Util.extend(L.LineUtil,{segmentsIntersect:function(t,e,i,o){return this._checkCounterclockwise(t,i,o)!==this._checkCounterclockwise(e,i,o)&&this._checkCounterclockwise(t,e,i)!==this._checkCounterclockwise(t,e,o)},_checkCounterclockwise:function(t,e,i){return(i.y-t.y)*(e.x-t.x)>(e.y-t.y)*(i.x-t.x)}}),L.Polyline.include({intersects:function(){var t,e,i,o=this._originalPoints,a=o?o.length:0;if(this._tooFewPointsForIntersection())return!1;for(t=a-1;t>=3;t--)if(e=o[t-1],i=o[t],this._lineSegmentsIntersectsRange(e,i,t-2))return!0;return!1},newLatLngIntersects:function(t,e){return this._map?this.newPointIntersects(this._map.latLngToLayerPoint(t),e):!1},newPointIntersects:function(t,e){var i=this._originalPoints,o=i?i.length:0,a=i?i[o-1]:null,s=o-2;return this._tooFewPointsForIntersection(1)?!1:this._lineSegmentsIntersectsRange(a,t,s,e?1:0)},_tooFewPointsForIntersection:function(t){var e=this._originalPoints,i=e?e.length:0;return i+=t||0,!this._originalPoints||3>=i},_lineSegmentsIntersectsRange:function(t,e,i,o){var a,s,r=this._originalPoints;o=o||0;for(var n=i;n>o;n--)if(a=r[n-1],s=r[n],L.LineUtil.segmentsIntersect(t,e,a,s))return!0;return!1}}),L.Polygon.include({intersects:function(){var t,e,i,o,a,s=this._originalPoints;return this._tooFewPointsForIntersection()?!1:(t=L.Polyline.prototype.intersects.call(this))?!0:(e=s.length,i=s[0],o=s[e-1],a=e-2,this._lineSegmentsIntersectsRange(o,i,a,1))}}),L.Control.Draw=L.Control.extend({options:{position:"topleft",draw:{},edit:!1},initialize:function(t){if(L.version<"0.7")throw new Error("Leaflet.draw 0.2.3+ requires Leaflet 0.7.0+. Download latest from https://github.com/Leaflet/Leaflet/");L.Control.prototype.initialize.call(this,t);var e,i;this._toolbars={},L.DrawToolbar&&this.options.draw&&(i=new L.DrawToolbar(this.options.draw),e=L.stamp(i),this._toolbars[e]=i,this._toolbars[e].on("enable",this._toolbarEnabled,this)),L.EditToolbar&&this.options.edit&&(i=new L.EditToolbar(this.options.edit),e=L.stamp(i),this._toolbars[e]=i,this._toolbars[e].on("enable",this._toolbarEnabled,this))},onAdd:function(t){var e,i=L.DomUtil.create("div","leaflet-draw"),o=!1,a="leaflet-draw-toolbar-top";for(var s in this._toolbars)this._toolbars.hasOwnProperty(s)&&(e=this._toolbars[s].addToolbar(t),e&&(o||(L.DomUtil.hasClass(e,a)||L.DomUtil.addClass(e.childNodes[0],a),o=!0),i.appendChild(e)));return i},onRemove:function(){for(var t in this._toolbars)this._toolbars.hasOwnProperty(t)&&this._toolbars[t].removeToolbar()},setDrawingOptions:function(t){for(var e in this._toolbars)this._toolbars[e]instanceof L.DrawToolbar&&this._toolbars[e].setOptions(t)},_toolbarEnabled:function(t){var e=""+L.stamp(t.target);for(var i in this._toolbars)this._toolbars.hasOwnProperty(i)&&i!==e&&this._toolbars[i].disable()}}),L.Map.mergeOptions({drawControlTooltips:!0,drawControl:!1}),L.Map.addInitHook(function(){this.options.drawControl&&(this.drawControl=new L.Control.Draw,this.addControl(this.drawControl))}),L.Toolbar=L.Class.extend({includes:[L.Mixin.Events],initialize:function(t){L.setOptions(this,t),this._modes={},this._actionButtons=[],this._activeMode=null},enabled:function(){return null!==this._activeMode},disable:function(){this.enabled()&&this._activeMode.handler.disable()},addToolbar:function(t){var e,i=L.DomUtil.create("div","leaflet-draw-section"),o=0,a=this._toolbarClass||"",s=this.getModeHandlers(t);for(this._toolbarContainer=L.DomUtil.create("div","leaflet-draw-toolbar leaflet-bar"),this._map=t,e=0;e<s.length;e++)s[e].enabled&&this._initModeHandler(s[e].handler,this._toolbarContainer,o++,a,s[e].title);return o?(this._lastButtonIndex=--o,this._actionsContainer=L.DomUtil.create("ul","leaflet-draw-actions"),i.appendChild(this._toolbarContainer),i.appendChild(this._actionsContainer),i):void 0},removeToolbar:function(){for(var t in this._modes)this._modes.hasOwnProperty(t)&&(this._disposeButton(this._modes[t].button,this._modes[t].handler.enable,this._modes[t].handler),this._modes[t].handler.disable(),this._modes[t].handler.off("enabled",this._handlerActivated,this).off("disabled",this._handlerDeactivated,this));this._modes={};for(var e=0,i=this._actionButtons.length;i>e;e++)this._disposeButton(this._actionButtons[e].button,this._actionButtons[e].callback,this);this._actionButtons=[],this._actionsContainer=null},_initModeHandler:function(t,e,i,o,a){var s=t.type;this._modes[s]={},this._modes[s].handler=t,this._modes[s].button=this._createButton({title:a,className:o+"-"+s,container:e,callback:this._modes[s].handler.enable,context:this._modes[s].handler}),this._modes[s].buttonIndex=i,this._modes[s].handler.on("enabled",this._handlerActivated,this).on("disabled",this._handlerDeactivated,this)},_createButton:function(t){var e=L.DomUtil.create("a",t.className||"",t.container);return e.href="#",t.text&&(e.innerHTML=t.text),t.title&&(e.title=t.title),L.DomEvent.on(e,"click",L.DomEvent.stopPropagation).on(e,"mousedown",L.DomEvent.stopPropagation).on(e,"dblclick",L.DomEvent.stopPropagation).on(e,"click",L.DomEvent.preventDefault).on(e,"click",t.callback,t.context),e},_disposeButton:function(t,e){L.DomEvent.off(t,"click",L.DomEvent.stopPropagation).off(t,"mousedown",L.DomEvent.stopPropagation).off(t,"dblclick",L.DomEvent.stopPropagation).off(t,"click",L.DomEvent.preventDefault).off(t,"click",e)},_handlerActivated:function(t){this.disable(),this._activeMode=this._modes[t.handler],L.DomUtil.addClass(this._activeMode.button,"leaflet-draw-toolbar-button-enabled"),this._showActionsToolbar(),this.fire("enable")},_handlerDeactivated:function(){this._hideActionsToolbar(),L.DomUtil.removeClass(this._activeMode.button,"leaflet-draw-toolbar-button-enabled"),this._activeMode=null,this.fire("disable")},_createActions:function(t){var e,i,o,a,s=this._actionsContainer,r=this.getActions(t),n=r.length;for(i=0,o=this._actionButtons.length;o>i;i++)this._disposeButton(this._actionButtons[i].button,this._actionButtons[i].callback);for(this._actionButtons=[];s.firstChild;)s.removeChild(s.firstChild);for(var l=0;n>l;l++)"enabled"in r[l]&&!r[l].enabled||(e=L.DomUtil.create("li","",s),a=this._createButton({title:r[l].title,text:r[l].text,container:e,callback:r[l].callback,context:r[l].context}),this._actionButtons.push({button:a,callback:r[l].callback}))},_showActionsToolbar:function(){var t=this._activeMode.buttonIndex,e=this._lastButtonIndex,i=this._activeMode.button.offsetTop-1;this._createActions(this._activeMode.handler),this._actionsContainer.style.top=i+"px",0===t&&(L.DomUtil.addClass(this._toolbarContainer,"leaflet-draw-toolbar-notop"),L.DomUtil.addClass(this._actionsContainer,"leaflet-draw-actions-top")),t===e&&(L.DomUtil.addClass(this._toolbarContainer,"leaflet-draw-toolbar-nobottom"),L.DomUtil.addClass(this._actionsContainer,"leaflet-draw-actions-bottom")),this._actionsContainer.style.display="block" -},_hideActionsToolbar:function(){this._actionsContainer.style.display="none",L.DomUtil.removeClass(this._toolbarContainer,"leaflet-draw-toolbar-notop"),L.DomUtil.removeClass(this._toolbarContainer,"leaflet-draw-toolbar-nobottom"),L.DomUtil.removeClass(this._actionsContainer,"leaflet-draw-actions-top"),L.DomUtil.removeClass(this._actionsContainer,"leaflet-draw-actions-bottom")}}),L.Tooltip=L.Class.extend({initialize:function(t){this._map=t,this._popupPane=t._panes.popupPane,this._container=t.options.drawControlTooltips?L.DomUtil.create("div","leaflet-draw-tooltip",this._popupPane):null,this._singleLineLabel=!1},dispose:function(){this._container&&(this._popupPane.removeChild(this._container),this._container=null)},updateContent:function(t){return this._container?(t.subtext=t.subtext||"",0!==t.subtext.length||this._singleLineLabel?t.subtext.length>0&&this._singleLineLabel&&(L.DomUtil.removeClass(this._container,"leaflet-draw-tooltip-single"),this._singleLineLabel=!1):(L.DomUtil.addClass(this._container,"leaflet-draw-tooltip-single"),this._singleLineLabel=!0),this._container.innerHTML=(t.subtext.length>0?'<span class="leaflet-draw-tooltip-subtext">'+t.subtext+"</span><br />":"")+"<span>"+t.text+"</span>",this):this},updatePosition:function(t){var e=this._map.latLngToLayerPoint(t),i=this._container;return this._container&&(i.style.visibility="inherit",L.DomUtil.setPosition(i,e)),this},showAsError:function(){return this._container&&L.DomUtil.addClass(this._container,"leaflet-error-draw-tooltip"),this},removeError:function(){return this._container&&L.DomUtil.removeClass(this._container,"leaflet-error-draw-tooltip"),this}}),L.DrawToolbar=L.Toolbar.extend({options:{polyline:{},polygon:{},rectangle:{},circle:{},marker:{}},initialize:function(t){for(var e in this.options)this.options.hasOwnProperty(e)&&t[e]&&(t[e]=L.extend({},this.options[e],t[e]));this._toolbarClass="leaflet-draw-draw",L.Toolbar.prototype.initialize.call(this,t)},getModeHandlers:function(t){return[{enabled:this.options.polyline,handler:new L.Draw.Polyline(t,this.options.polyline),title:L.drawLocal.draw.toolbar.buttons.polyline},{enabled:this.options.polygon,handler:new L.Draw.Polygon(t,this.options.polygon),title:L.drawLocal.draw.toolbar.buttons.polygon},{enabled:this.options.rectangle,handler:new L.Draw.Rectangle(t,this.options.rectangle),title:L.drawLocal.draw.toolbar.buttons.rectangle},{enabled:this.options.circle,handler:new L.Draw.Circle(t,this.options.circle),title:L.drawLocal.draw.toolbar.buttons.circle},{enabled:this.options.marker,handler:new L.Draw.Marker(t,this.options.marker),title:L.drawLocal.draw.toolbar.buttons.marker}]},getActions:function(t){return[{enabled:t.deleteLastVertex,title:L.drawLocal.draw.toolbar.undo.title,text:L.drawLocal.draw.toolbar.undo.text,callback:t.deleteLastVertex,context:t},{title:L.drawLocal.draw.toolbar.actions.title,text:L.drawLocal.draw.toolbar.actions.text,callback:this.disable,context:this}]},setOptions:function(t){L.setOptions(this,t);for(var e in this._modes)this._modes.hasOwnProperty(e)&&t.hasOwnProperty(e)&&this._modes[e].handler.setOptions(t[e])}}),L.EditToolbar=L.Toolbar.extend({options:{edit:{selectedPathOptions:{color:"#fe57a1",opacity:.6,dashArray:"10, 10",fill:!0,fillColor:"#fe57a1",fillOpacity:.1}},remove:{},featureGroup:null},initialize:function(t){t.edit&&("undefined"==typeof t.edit.selectedPathOptions&&(t.edit.selectedPathOptions=this.options.edit.selectedPathOptions),t.edit=L.extend({},this.options.edit,t.edit)),t.remove&&(t.remove=L.extend({},this.options.remove,t.remove)),this._toolbarClass="leaflet-draw-edit",L.Toolbar.prototype.initialize.call(this,t),this._selectedFeatureCount=0},getModeHandlers:function(t){var e=this.options.featureGroup;return[{enabled:this.options.edit,handler:new L.EditToolbar.Edit(t,{featureGroup:e,selectedPathOptions:this.options.edit.selectedPathOptions}),title:L.drawLocal.edit.toolbar.buttons.edit},{enabled:this.options.remove,handler:new L.EditToolbar.Delete(t,{featureGroup:e}),title:L.drawLocal.edit.toolbar.buttons.remove}]},getActions:function(){return[{title:L.drawLocal.edit.toolbar.actions.save.title,text:L.drawLocal.edit.toolbar.actions.save.text,callback:this._save,context:this},{title:L.drawLocal.edit.toolbar.actions.cancel.title,text:L.drawLocal.edit.toolbar.actions.cancel.text,callback:this.disable,context:this}]},addToolbar:function(t){var e=L.Toolbar.prototype.addToolbar.call(this,t);return this._checkDisabled(),this.options.featureGroup.on("layeradd layerremove",this._checkDisabled,this),e},removeToolbar:function(){this.options.featureGroup.off("layeradd layerremove",this._checkDisabled,this),L.Toolbar.prototype.removeToolbar.call(this)},disable:function(){this.enabled()&&(this._activeMode.handler.revertLayers(),L.Toolbar.prototype.disable.call(this))},_save:function(){this._activeMode.handler.save(),this._activeMode.handler.disable()},_checkDisabled:function(){var t,e=this.options.featureGroup,i=0!==e.getLayers().length;this.options.edit&&(t=this._modes[L.EditToolbar.Edit.TYPE].button,i?L.DomUtil.removeClass(t,"leaflet-disabled"):L.DomUtil.addClass(t,"leaflet-disabled"),t.setAttribute("title",i?L.drawLocal.edit.toolbar.buttons.edit:L.drawLocal.edit.toolbar.buttons.editDisabled)),this.options.remove&&(t=this._modes[L.EditToolbar.Delete.TYPE].button,i?L.DomUtil.removeClass(t,"leaflet-disabled"):L.DomUtil.addClass(t,"leaflet-disabled"),t.setAttribute("title",i?L.drawLocal.edit.toolbar.buttons.remove:L.drawLocal.edit.toolbar.buttons.removeDisabled))}}),L.EditToolbar.Edit=L.Handler.extend({statics:{TYPE:"edit"},includes:L.Mixin.Events,initialize:function(t,e){if(L.Handler.prototype.initialize.call(this,t),this._selectedPathOptions=e.selectedPathOptions,this._featureGroup=e.featureGroup,!(this._featureGroup instanceof L.FeatureGroup))throw new Error("options.featureGroup must be a L.FeatureGroup");this._uneditedLayerProps={},this.type=L.EditToolbar.Edit.TYPE},enable:function(){!this._enabled&&this._hasAvailableLayers()&&(this.fire("enabled",{handler:this.type}),this._map.fire("draw:editstart",{handler:this.type}),L.Handler.prototype.enable.call(this),this._featureGroup.on("layeradd",this._enableLayerEdit,this).on("layerremove",this._disableLayerEdit,this))},disable:function(){this._enabled&&(this._featureGroup.off("layeradd",this._enableLayerEdit,this).off("layerremove",this._disableLayerEdit,this),L.Handler.prototype.disable.call(this),this._map.fire("draw:editstop",{handler:this.type}),this.fire("disabled",{handler:this.type}))},addHooks:function(){var t=this._map;t&&(t.getContainer().focus(),this._featureGroup.eachLayer(this._enableLayerEdit,this),this._tooltip=new L.Tooltip(this._map),this._tooltip.updateContent({text:L.drawLocal.edit.handlers.edit.tooltip.text,subtext:L.drawLocal.edit.handlers.edit.tooltip.subtext}),this._map.on("mousemove",this._onMouseMove,this))},removeHooks:function(){this._map&&(this._featureGroup.eachLayer(this._disableLayerEdit,this),this._uneditedLayerProps={},this._tooltip.dispose(),this._tooltip=null,this._map.off("mousemove",this._onMouseMove,this))},revertLayers:function(){this._featureGroup.eachLayer(function(t){this._revertLayer(t)},this)},save:function(){var t=new L.LayerGroup;this._featureGroup.eachLayer(function(e){e.edited&&(t.addLayer(e),e.edited=!1)}),this._map.fire("draw:edited",{layers:t})},_backupLayer:function(t){var e=L.Util.stamp(t);this._uneditedLayerProps[e]||(t instanceof L.Polyline||t instanceof L.Polygon||t instanceof L.Rectangle?this._uneditedLayerProps[e]={latlngs:L.LatLngUtil.cloneLatLngs(t.getLatLngs())}:t instanceof L.Circle?this._uneditedLayerProps[e]={latlng:L.LatLngUtil.cloneLatLng(t.getLatLng()),radius:t.getRadius()}:t instanceof L.Marker&&(this._uneditedLayerProps[e]={latlng:L.LatLngUtil.cloneLatLng(t.getLatLng())}))},_revertLayer:function(t){var e=L.Util.stamp(t);t.edited=!1,this._uneditedLayerProps.hasOwnProperty(e)&&(t instanceof L.Polyline||t instanceof L.Polygon||t instanceof L.Rectangle?t.setLatLngs(this._uneditedLayerProps[e].latlngs):t instanceof L.Circle?(t.setLatLng(this._uneditedLayerProps[e].latlng),t.setRadius(this._uneditedLayerProps[e].radius)):t instanceof L.Marker&&t.setLatLng(this._uneditedLayerProps[e].latlng))},_toggleMarkerHighlight:function(t){if(t._icon){var e=t._icon;e.style.display="none",L.DomUtil.hasClass(e,"leaflet-edit-marker-selected")?(L.DomUtil.removeClass(e,"leaflet-edit-marker-selected"),this._offsetMarker(e,-4)):(L.DomUtil.addClass(e,"leaflet-edit-marker-selected"),this._offsetMarker(e,4)),e.style.display=""}},_offsetMarker:function(t,e){var i=parseInt(t.style.marginTop,10)-e,o=parseInt(t.style.marginLeft,10)-e;t.style.marginTop=i+"px",t.style.marginLeft=o+"px"},_enableLayerEdit:function(t){var e,i=t.layer||t.target||t,o=i instanceof L.Marker;(!o||i._icon)&&(this._backupLayer(i),this._selectedPathOptions&&(e=L.Util.extend({},this._selectedPathOptions),o?this._toggleMarkerHighlight(i):(i.options.previousOptions=L.Util.extend({dashArray:null},i.options),i instanceof L.Circle||i instanceof L.Polygon||i instanceof L.Rectangle||(e.fill=!1),i.setStyle(e))),o?(i.dragging.enable(),i.on("dragend",this._onMarkerDragEnd)):i.editing.enable())},_disableLayerEdit:function(t){var e=t.layer||t.target||t;e.edited=!1,this._selectedPathOptions&&(e instanceof L.Marker?this._toggleMarkerHighlight(e):(e.setStyle(e.options.previousOptions),delete e.options.previousOptions)),e instanceof L.Marker?(e.dragging.disable(),e.off("dragend",this._onMarkerDragEnd,this)):e.editing.disable()},_onMarkerDragEnd:function(t){var e=t.target;e.edited=!0},_onMouseMove:function(t){this._tooltip.updatePosition(t.latlng)},_hasAvailableLayers:function(){return 0!==this._featureGroup.getLayers().length}}),L.EditToolbar.Delete=L.Handler.extend({statics:{TYPE:"remove"},includes:L.Mixin.Events,initialize:function(t,e){if(L.Handler.prototype.initialize.call(this,t),L.Util.setOptions(this,e),this._deletableLayers=this.options.featureGroup,!(this._deletableLayers instanceof L.FeatureGroup))throw new Error("options.featureGroup must be a L.FeatureGroup");this.type=L.EditToolbar.Delete.TYPE},enable:function(){!this._enabled&&this._hasAvailableLayers()&&(this.fire("enabled",{handler:this.type}),this._map.fire("draw:deletestart",{handler:this.type}),L.Handler.prototype.enable.call(this),this._deletableLayers.on("layeradd",this._enableLayerDelete,this).on("layerremove",this._disableLayerDelete,this))},disable:function(){this._enabled&&(this._deletableLayers.off("layeradd",this._enableLayerDelete,this).off("layerremove",this._disableLayerDelete,this),L.Handler.prototype.disable.call(this),this._map.fire("draw:deletestop",{handler:this.type}),this.fire("disabled",{handler:this.type}))},addHooks:function(){var t=this._map;t&&(t.getContainer().focus(),this._deletableLayers.eachLayer(this._enableLayerDelete,this),this._deletedLayers=new L.layerGroup,this._tooltip=new L.Tooltip(this._map),this._tooltip.updateContent({text:L.drawLocal.edit.handlers.remove.tooltip.text}),this._map.on("mousemove",this._onMouseMove,this))},removeHooks:function(){this._map&&(this._deletableLayers.eachLayer(this._disableLayerDelete,this),this._deletedLayers=null,this._tooltip.dispose(),this._tooltip=null,this._map.off("mousemove",this._onMouseMove,this))},revertLayers:function(){this._deletedLayers.eachLayer(function(t){this._deletableLayers.addLayer(t)},this)},save:function(){this._map.fire("draw:deleted",{layers:this._deletedLayers})},_enableLayerDelete:function(t){var e=t.layer||t.target||t;e.on("click",this._removeLayer,this)},_disableLayerDelete:function(t){var e=t.layer||t.target||t;e.off("click",this._removeLayer,this),this._deletedLayers.removeLayer(e)},_removeLayer:function(t){var e=t.layer||t.target||t;this._deletableLayers.removeLayer(e),this._deletedLayers.addLayer(e)},_onMouseMove:function(t){this._tooltip.updatePosition(t.latlng)},_hasAvailableLayers:function(){return 0!==this._deletableLayers.getLayers().length}})}(window,document); \ No newline at end of file + https://github.com/Leaflet/Leaflet.draw + http://leafletjs.com + */ +!function(t,e,i){function o(t,e){for(;(t=t.parentElement)&&!t.classList.contains(e););return t}L.drawVersion="0.4.14",L.Draw={},L.drawLocal={draw:{toolbar:{actions:{title:"Cancel drawing",text:"Cancel"},finish:{title:"Finish drawing",text:"Finish"},undo:{title:"Delete last point drawn",text:"Delete last point"},buttons:{polyline:"Draw a polyline",polygon:"Draw a polygon",rectangle:"Draw a rectangle",circle:"Draw a circle",marker:"Draw a marker",circlemarker:"Draw a circlemarker"}},handlers:{circle:{tooltip:{start:"Click and drag to draw circle."},radius:"Radius"},circlemarker:{tooltip:{start:"Click map to place circle marker."}},marker:{tooltip:{start:"Click map to place marker."}},polygon:{tooltip:{start:"Click to start drawing shape.",cont:"Click to continue drawing shape.",end:"Click first point to close this shape."}},polyline:{error:"<strong>Error:</strong> shape edges cannot cross!",tooltip:{start:"Click to start drawing line.",cont:"Click to continue drawing line.",end:"Click last point to finish line."}},rectangle:{tooltip:{start:"Click and drag to draw rectangle."}},simpleshape:{tooltip:{end:"Release mouse to finish drawing."}}}},edit:{toolbar:{actions:{save:{title:"Save changes",text:"Save"},cancel:{title:"Cancel editing, discards all changes",text:"Cancel"},clearAll:{title:"Clear all layers",text:"Clear All"}},buttons:{edit:"Edit layers",editDisabled:"No layers to edit",remove:"Delete layers",removeDisabled:"No layers to delete"}},handlers:{edit:{tooltip:{text:"Drag handles or markers to edit features.",subtext:"Click cancel to undo changes."}},remove:{tooltip:{text:"Click on a feature to remove."}}}}},L.Draw.Event={},L.Draw.Event.CREATED="draw:created",L.Draw.Event.EDITED="draw:edited",L.Draw.Event.DELETED="draw:deleted",L.Draw.Event.DRAWSTART="draw:drawstart",L.Draw.Event.DRAWSTOP="draw:drawstop",L.Draw.Event.DRAWVERTEX="draw:drawvertex",L.Draw.Event.EDITSTART="draw:editstart",L.Draw.Event.EDITMOVE="draw:editmove",L.Draw.Event.EDITRESIZE="draw:editresize",L.Draw.Event.EDITVERTEX="draw:editvertex",L.Draw.Event.EDITSTOP="draw:editstop",L.Draw.Event.DELETESTART="draw:deletestart",L.Draw.Event.DELETESTOP="draw:deletestop",L.Draw.Event.TOOLBAROPENED="draw:toolbaropened",L.Draw.Event.TOOLBARCLOSED="draw:toolbarclosed",L.Draw.Event.MARKERCONTEXT="draw:markercontext",L.Draw=L.Draw||{},L.Draw.Feature=L.Handler.extend({initialize:function(t,e){this._map=t,this._container=t._container,this._overlayPane=t._panes.overlayPane,this._popupPane=t._panes.popupPane,e&&e.shapeOptions&&(e.shapeOptions=L.Util.extend({},this.options.shapeOptions,e.shapeOptions)),L.setOptions(this,e);var i=L.version.split(".");1===parseInt(i[0],10)&&parseInt(i[1],10)>=2?L.Draw.Feature.include(L.Evented.prototype):L.Draw.Feature.include(L.Mixin.Events)},enable:function(){this._enabled||(L.Handler.prototype.enable.call(this),this.fire("enabled",{handler:this.type}),this._map.fire(L.Draw.Event.DRAWSTART,{layerType:this.type}))},disable:function(){this._enabled&&(L.Handler.prototype.disable.call(this),this._map.fire(L.Draw.Event.DRAWSTOP,{layerType:this.type}),this.fire("disabled",{handler:this.type}))},addHooks:function(){var t=this._map;t&&(L.DomUtil.disableTextSelection(),t.getContainer().focus(),this._tooltip=new L.Draw.Tooltip(this._map),L.DomEvent.on(this._container,"keyup",this._cancelDrawing,this))},removeHooks:function(){this._map&&(L.DomUtil.enableTextSelection(),this._tooltip.dispose(),this._tooltip=null,L.DomEvent.off(this._container,"keyup",this._cancelDrawing,this))},setOptions:function(t){L.setOptions(this,t)},_fireCreatedEvent:function(t){this._map.fire(L.Draw.Event.CREATED,{layer:t,layerType:this.type})},_cancelDrawing:function(t){27===t.keyCode&&(this._map.fire("draw:canceled",{layerType:this.type}),this.disable())}}),L.Draw.Polyline=L.Draw.Feature.extend({statics:{TYPE:"polyline"},Poly:L.Polyline,options:{allowIntersection:!0,repeatMode:!1,drawError:{color:"#b00b00",timeout:2500},icon:new L.DivIcon({iconSize:new L.Point(8,8),className:"leaflet-div-icon leaflet-editing-icon"}),touchIcon:new L.DivIcon({iconSize:new L.Point(20,20),className:"leaflet-div-icon leaflet-editing-icon leaflet-touch-icon"}),guidelineDistance:20,maxGuideLineLength:4e3,shapeOptions:{stroke:!0,color:"#3388ff",weight:4,opacity:.5,fill:!1,clickable:!0},metric:!0,feet:!0,nautic:!1,showLength:!0,zIndexOffset:2e3,factor:1,maxPoints:0},initialize:function(t,e){L.Browser.touch&&(this.options.icon=this.options.touchIcon),this.options.drawError.message=L.drawLocal.draw.handlers.polyline.error,e&&e.drawError&&(e.drawError=L.Util.extend({},this.options.drawError,e.drawError)),this.type=L.Draw.Polyline.TYPE,L.Draw.Feature.prototype.initialize.call(this,t,e)},addHooks:function(){L.Draw.Feature.prototype.addHooks.call(this),this._map&&(this._markers=[],this._markerGroup=new L.LayerGroup,this._map.addLayer(this._markerGroup),this._poly=new L.Polyline([],this.options.shapeOptions),this._tooltip.updateContent(this._getTooltipText()),this._mouseMarker||(this._mouseMarker=L.marker(this._map.getCenter(),{icon:L.divIcon({className:"leaflet-mouse-marker",iconAnchor:[20,20],iconSize:[40,40]}),opacity:0,zIndexOffset:this.options.zIndexOffset})),this._mouseMarker.on("mouseout",this._onMouseOut,this).on("mousemove",this._onMouseMove,this).on("mousedown",this._onMouseDown,this).on("mouseup",this._onMouseUp,this).addTo(this._map),this._map.on("mouseup",this._onMouseUp,this).on("mousemove",this._onMouseMove,this).on("zoomlevelschange",this._onZoomEnd,this).on("touchstart",this._onTouch,this).on("zoomend",this._onZoomEnd,this))},removeHooks:function(){L.Draw.Feature.prototype.removeHooks.call(this),this._clearHideErrorTimeout(),this._cleanUpShape(),this._map.removeLayer(this._markerGroup),delete this._markerGroup,delete this._markers,this._map.removeLayer(this._poly),delete this._poly,this._mouseMarker.off("mousedown",this._onMouseDown,this).off("mouseout",this._onMouseOut,this).off("mouseup",this._onMouseUp,this).off("mousemove",this._onMouseMove,this),this._map.removeLayer(this._mouseMarker),delete this._mouseMarker,this._clearGuides(),this._map.off("mouseup",this._onMouseUp,this).off("mousemove",this._onMouseMove,this).off("zoomlevelschange",this._onZoomEnd,this).off("zoomend",this._onZoomEnd,this).off("touchstart",this._onTouch,this).off("click",this._onTouch,this)},deleteLastVertex:function(){if(!(this._markers.length<=1)){var t=this._markers.pop(),e=this._poly,i=e.getLatLngs(),o=i.splice(-1,1)[0];this._poly.setLatLngs(i),this._markerGroup.removeLayer(t),e.getLatLngs().length<2&&this._map.removeLayer(e),this._vertexChanged(o,!1)}},addVertex:function(t){if(this._markers.length>=2&&!this.options.allowIntersection&&this._poly.newLatLngIntersects(t))return void this._showErrorTooltip();this._errorShown&&this._hideErrorTooltip(),this._markers.push(this._createMarker(t)),this._poly.addLatLng(t),2===this._poly.getLatLngs().length&&this._map.addLayer(this._poly),this._vertexChanged(t,!0)},completeShape:function(){this._markers.length<=1||(this._fireCreatedEvent(),this.disable(),this.options.repeatMode&&this.enable())},_finishShape:function(){var t=this._poly._defaultShape?this._poly._defaultShape():this._poly.getLatLngs(),e=this._poly.newLatLngIntersects(t[t.length-1]);if(!this.options.allowIntersection&&e||!this._shapeIsValid())return void this._showErrorTooltip();this._fireCreatedEvent(),this.disable(),this.options.repeatMode&&this.enable()},_shapeIsValid:function(){return!0},_onZoomEnd:function(){null!==this._markers&&this._updateGuide()},_onMouseMove:function(t){var e=this._map.mouseEventToLayerPoint(t.originalEvent),i=this._map.layerPointToLatLng(e);this._currentLatLng=i,this._updateTooltip(i),this._updateGuide(e),this._mouseMarker.setLatLng(i),L.DomEvent.preventDefault(t.originalEvent)},_vertexChanged:function(t,e){this._map.fire(L.Draw.Event.DRAWVERTEX,{layers:this._markerGroup}),this._updateFinishHandler(),this._updateRunningMeasure(t,e),this._clearGuides(),this._updateTooltip()},_onMouseDown:function(t){if(!this._clickHandled&&!this._touchHandled&&!this._disableMarkers){this._onMouseMove(t),this._clickHandled=!0,this._disableNewMarkers();var e=t.originalEvent,i=e.clientX,o=e.clientY;this._startPoint.call(this,i,o)}},_startPoint:function(t,e){this._mouseDownOrigin=L.point(t,e)},_onMouseUp:function(t){var e=t.originalEvent,i=e.clientX,o=e.clientY;this._endPoint.call(this,i,o,t),this._clickHandled=null},_endPoint:function(e,i,o){if(this._mouseDownOrigin){var n=L.point(e,i).distanceTo(this._mouseDownOrigin),a=this._calculateFinishDistance(o.latlng);this.options.maxPoints>1&&this.options.maxPoints==this._markers.length+1?(this.addVertex(o.latlng),this._finishShape()):a<10&&L.Browser.touch?this._finishShape():Math.abs(n)<9*(t.devicePixelRatio||1)&&this.addVertex(o.latlng),this._enableNewMarkers()}this._mouseDownOrigin=null},_onTouch:function(t){var e,i,o=t.originalEvent;!o.touches||!o.touches[0]||this._clickHandled||this._touchHandled||this._disableMarkers||(e=o.touches[0].clientX,i=o.touches[0].clientY,this._disableNewMarkers(),this._touchHandled=!0,this._startPoint.call(this,e,i),this._endPoint.call(this,e,i,t),this._touchHandled=null),this._clickHandled=null},_onMouseOut:function(){this._tooltip&&this._tooltip._onMouseOut.call(this._tooltip)},_calculateFinishDistance:function(t){var e;if(this._markers.length>0){var i;if(this.type===L.Draw.Polyline.TYPE)i=this._markers[this._markers.length-1];else{if(this.type!==L.Draw.Polygon.TYPE)return 1/0;i=this._markers[0]}var o=this._map.latLngToContainerPoint(i.getLatLng()),n=new L.Marker(t,{icon:this.options.icon,zIndexOffset:2*this.options.zIndexOffset}),a=this._map.latLngToContainerPoint(n.getLatLng());e=o.distanceTo(a)}else e=1/0;return e},_updateFinishHandler:function(){var t=this._markers.length;t>1&&this._markers[t-1].on("click",this._finishShape,this),t>2&&this._markers[t-2].off("click",this._finishShape,this)},_createMarker:function(t){var e=new L.Marker(t,{icon:this.options.icon,zIndexOffset:2*this.options.zIndexOffset});return this._markerGroup.addLayer(e),e},_updateGuide:function(t){var e=this._markers?this._markers.length:0;e>0&&(t=t||this._map.latLngToLayerPoint(this._currentLatLng),this._clearGuides(),this._drawGuide(this._map.latLngToLayerPoint(this._markers[e-1].getLatLng()),t))},_updateTooltip:function(t){var e=this._getTooltipText();t&&this._tooltip.updatePosition(t),this._errorShown||this._tooltip.updateContent(e)},_drawGuide:function(t,e){var i,o,n,a=Math.floor(Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))),s=this.options.guidelineDistance,r=this.options.maxGuideLineLength,l=a>r?a-r:s;for(this._guidesContainer||(this._guidesContainer=L.DomUtil.create("div","leaflet-draw-guides",this._overlayPane));l<a;l+=this.options.guidelineDistance)i=l/a,o={x:Math.floor(t.x*(1-i)+i*e.x),y:Math.floor(t.y*(1-i)+i*e.y)},n=L.DomUtil.create("div","leaflet-draw-guide-dash",this._guidesContainer),n.style.backgroundColor=this._errorShown?this.options.drawError.color:this.options.shapeOptions.color,L.DomUtil.setPosition(n,o)},_updateGuideColor:function(t){if(this._guidesContainer)for(var e=0,i=this._guidesContainer.childNodes.length;e<i;e++)this._guidesContainer.childNodes[e].style.backgroundColor=t},_clearGuides:function(){if(this._guidesContainer)for(;this._guidesContainer.firstChild;)this._guidesContainer.removeChild(this._guidesContainer.firstChild)},_getTooltipText:function(){var t,e,i=this.options.showLength;return 0===this._markers.length?t={text:L.drawLocal.draw.handlers.polyline.tooltip.start}:(e=i?this._getMeasurementString():"",t=1===this._markers.length?{text:L.drawLocal.draw.handlers.polyline.tooltip.cont,subtext:e}:{text:L.drawLocal.draw.handlers.polyline.tooltip.end,subtext:e}),t},_updateRunningMeasure:function(t,e){var i,o,n=this._markers.length;1===this._markers.length?this._measurementRunningTotal=0:(i=n-(e?2:1),o=L.GeometryUtil.isVersion07x()?t.distanceTo(this._markers[i].getLatLng())*(this.options.factor||1):this._map.distance(t,this._markers[i].getLatLng())*(this.options.factor||1),this._measurementRunningTotal+=o*(e?1:-1))},_getMeasurementString:function(){var t,e=this._currentLatLng,i=this._markers[this._markers.length-1].getLatLng();return t=L.GeometryUtil.isVersion07x()?i&&e&&e.distanceTo?this._measurementRunningTotal+e.distanceTo(i)*(this.options.factor||1):this._measurementRunningTotal||0:i&&e?this._measurementRunningTotal+this._map.distance(e,i)*(this.options.factor||1):this._measurementRunningTotal||0,L.GeometryUtil.readableDistance(t,this.options.metric,this.options.feet,this.options.nautic,this.options.precision)},_showErrorTooltip:function(){this._errorShown=!0,this._tooltip.showAsError().updateContent({text:this.options.drawError.message}),this._updateGuideColor(this.options.drawError.color),this._poly.setStyle({color:this.options.drawError.color}),this._clearHideErrorTimeout(),this._hideErrorTimeout=setTimeout(L.Util.bind(this._hideErrorTooltip,this),this.options.drawError.timeout)},_hideErrorTooltip:function(){this._errorShown=!1,this._clearHideErrorTimeout(),this._tooltip.removeError().updateContent(this._getTooltipText()),this._updateGuideColor(this.options.shapeOptions.color),this._poly.setStyle({color:this.options.shapeOptions.color})},_clearHideErrorTimeout:function(){this._hideErrorTimeout&&(clearTimeout(this._hideErrorTimeout),this._hideErrorTimeout=null)},_disableNewMarkers:function(){this._disableMarkers=!0},_enableNewMarkers:function(){setTimeout(function(){this._disableMarkers=!1}.bind(this),50)},_cleanUpShape:function(){this._markers.length>1&&this._markers[this._markers.length-1].off("click",this._finishShape,this)},_fireCreatedEvent:function(){var t=new this.Poly(this._poly.getLatLngs(),this.options.shapeOptions);L.Draw.Feature.prototype._fireCreatedEvent.call(this,t)}}),L.Draw.Polygon=L.Draw.Polyline.extend({statics:{TYPE:"polygon"},Poly:L.Polygon,options:{showArea:!1,showLength:!1,shapeOptions:{stroke:!0,color:"#3388ff",weight:4,opacity:.5,fill:!0,fillColor:null,fillOpacity:.2,clickable:!0},metric:!0,feet:!0,nautic:!1,precision:{}},initialize:function(t,e){L.Draw.Polyline.prototype.initialize.call(this,t,e),this.type=L.Draw.Polygon.TYPE},_updateFinishHandler:function(){var t=this._markers.length;1===t&&this._markers[0].on("click",this._finishShape,this),t>2&&(this._markers[t-1].on("dblclick",this._finishShape,this),t>3&&this._markers[t-2].off("dblclick",this._finishShape,this))},_getTooltipText:function(){var t,e;return 0===this._markers.length?t=L.drawLocal.draw.handlers.polygon.tooltip.start:this._markers.length<3?(t=L.drawLocal.draw.handlers.polygon.tooltip.cont,e=this._getMeasurementString()):(t=L.drawLocal.draw.handlers.polygon.tooltip.end,e=this._getMeasurementString()),{text:t,subtext:e}},_getMeasurementString:function(){var t=this._area,e="";return t||this.options.showLength?(this.options.showLength&&(e=L.Draw.Polyline.prototype._getMeasurementString.call(this)),t&&(e+="<br>"+L.GeometryUtil.readableArea(t,this.options.metric,this.options.precision)),e):null},_shapeIsValid:function(){return this._markers.length>=3},_vertexChanged:function(t,e){var i;!this.options.allowIntersection&&this.options.showArea&&(i=this._poly.getLatLngs(),this._area=L.GeometryUtil.geodesicArea(i)),L.Draw.Polyline.prototype._vertexChanged.call(this,t,e)},_cleanUpShape:function(){var t=this._markers.length;t>0&&(this._markers[0].off("click",this._finishShape,this),t>2&&this._markers[t-1].off("dblclick",this._finishShape,this))}}),L.SimpleShape={},L.Draw.SimpleShape=L.Draw.Feature.extend({options:{repeatMode:!1},initialize:function(t,e){this._endLabelText=L.drawLocal.draw.handlers.simpleshape.tooltip.end,L.Draw.Feature.prototype.initialize.call(this,t,e)},addHooks:function(){L.Draw.Feature.prototype.addHooks.call(this),this._map&&(this._mapDraggable=this._map.dragging.enabled(),this._mapDraggable&&this._map.dragging.disable(),this._container.style.cursor="crosshair",this._tooltip.updateContent({text:this._initialLabelText}),this._map.on("mousedown",this._onMouseDown,this).on("mousemove",this._onMouseMove,this).on("touchstart",this._onMouseDown,this).on("touchmove",this._onMouseMove,this),e.addEventListener("touchstart",L.DomEvent.preventDefault,{passive:!1}))},removeHooks:function(){L.Draw.Feature.prototype.removeHooks.call(this),this._map&&(this._mapDraggable&&this._map.dragging.enable(),this._container.style.cursor="",this._map.off("mousedown",this._onMouseDown,this).off("mousemove",this._onMouseMove,this).off("touchstart",this._onMouseDown,this).off("touchmove",this._onMouseMove,this),L.DomEvent.off(e,"mouseup",this._onMouseUp,this),L.DomEvent.off(e,"touchend",this._onMouseUp,this),e.removeEventListener("touchstart",L.DomEvent.preventDefault),this._shape&&(this._map.removeLayer(this._shape),delete this._shape)),this._isDrawing=!1},_getTooltipText:function(){return{text:this._endLabelText}},_onMouseDown:function(t){this._isDrawing=!0,this._startLatLng=t.latlng,L.DomEvent.on(e,"mouseup",this._onMouseUp,this).on(e,"touchend",this._onMouseUp,this).preventDefault(t.originalEvent)},_onMouseMove:function(t){var e=t.latlng;this._tooltip.updatePosition(e),this._isDrawing&&(this._tooltip.updateContent(this._getTooltipText()),this._drawShape(e))},_onMouseUp:function(){this._shape&&this._fireCreatedEvent(),this.disable(),this.options.repeatMode&&this.enable()}}),L.Draw.Rectangle=L.Draw.SimpleShape.extend({statics:{TYPE:"rectangle"},options:{shapeOptions:{stroke:!0,color:"#3388ff",weight:4,opacity:.5,fill:!0,fillColor:null,fillOpacity:.2,showArea:!0,clickable:!0},metric:!0},initialize:function(t,e){this.type=L.Draw.Rectangle.TYPE,this._initialLabelText=L.drawLocal.draw.handlers.rectangle.tooltip.start,L.Draw.SimpleShape.prototype.initialize.call(this,t,e)},disable:function(){this._enabled&&(this._isCurrentlyTwoClickDrawing=!1,L.Draw.SimpleShape.prototype.disable.call(this))},_onMouseUp:function(t){if(!this._shape&&!this._isCurrentlyTwoClickDrawing)return void(this._isCurrentlyTwoClickDrawing=!0);this._isCurrentlyTwoClickDrawing&&!o(t.target,"leaflet-pane")||L.Draw.SimpleShape.prototype._onMouseUp.call(this)},_drawShape:function(t){this._shape?this._shape.setBounds(new L.LatLngBounds(this._startLatLng,t)):(this._shape=new L.Rectangle(new L.LatLngBounds(this._startLatLng,t),this.options.shapeOptions),this._map.addLayer(this._shape))},_fireCreatedEvent:function(){var t=new L.Rectangle(this._shape.getBounds(),this.options.shapeOptions);L.Draw.SimpleShape.prototype._fireCreatedEvent.call(this,t)},_getTooltipText:function(){var t,e,i,o=L.Draw.SimpleShape.prototype._getTooltipText.call(this),n=this._shape,a=this.options.showArea;return n&&(t=this._shape._defaultShape?this._shape._defaultShape():this._shape.getLatLngs(),e=L.GeometryUtil.geodesicArea(t),i=a?L.GeometryUtil.readableArea(e,this.options.metric):""),{text:o.text,subtext:i}}}),L.Draw.Marker=L.Draw.Feature.extend({statics:{TYPE:"marker"},options:{icon:new L.Icon.Default,repeatMode:!1,zIndexOffset:2e3},initialize:function(t,e){this.type=L.Draw.Marker.TYPE,this._initialLabelText=L.drawLocal.draw.handlers.marker.tooltip.start,L.Draw.Feature.prototype.initialize.call(this,t,e)},addHooks:function(){L.Draw.Feature.prototype.addHooks.call(this),this._map&&(this._tooltip.updateContent({text:this._initialLabelText}),this._mouseMarker||(this._mouseMarker=L.marker(this._map.getCenter(),{icon:L.divIcon({className:"leaflet-mouse-marker",iconAnchor:[20,20],iconSize:[40,40]}),opacity:0,zIndexOffset:this.options.zIndexOffset})),this._mouseMarker.on("click",this._onClick,this).addTo(this._map),this._map.on("mousemove",this._onMouseMove,this),this._map.on("click",this._onTouch,this))},removeHooks:function(){L.Draw.Feature.prototype.removeHooks.call(this),this._map&&(this._map.off("click",this._onClick,this).off("click",this._onTouch,this),this._marker&&(this._marker.off("click",this._onClick,this),this._map.removeLayer(this._marker),delete this._marker),this._mouseMarker.off("click",this._onClick,this),this._map.removeLayer(this._mouseMarker),delete this._mouseMarker,this._map.off("mousemove",this._onMouseMove,this))},_onMouseMove:function(t){var e=t.latlng;this._tooltip.updatePosition(e),this._mouseMarker.setLatLng(e),this._marker?(e=this._mouseMarker.getLatLng(),this._marker.setLatLng(e)):(this._marker=this._createMarker(e),this._marker.on("click",this._onClick,this),this._map.on("click",this._onClick,this).addLayer(this._marker))},_createMarker:function(t){return new L.Marker(t,{icon:this.options.icon,zIndexOffset:this.options.zIndexOffset})},_onClick:function(){this._fireCreatedEvent(),this.disable(),this.options.repeatMode&&this.enable()},_onTouch:function(t){this._onMouseMove(t),this._onClick()},_fireCreatedEvent:function(){var t=new L.Marker.Touch(this._marker.getLatLng(),{icon:this.options.icon});L.Draw.Feature.prototype._fireCreatedEvent.call(this,t)}}),L.Draw.CircleMarker=L.Draw.Marker.extend({statics:{TYPE:"circlemarker"},options:{stroke:!0,color:"#3388ff",weight:4,opacity:.5,fill:!0,fillColor:null,fillOpacity:.2,clickable:!0,zIndexOffset:2e3},initialize:function(t,e){this.type=L.Draw.CircleMarker.TYPE,this._initialLabelText=L.drawLocal.draw.handlers.circlemarker.tooltip.start,L.Draw.Feature.prototype.initialize.call(this,t,e)},_fireCreatedEvent:function(){var t=new L.CircleMarker(this._marker.getLatLng(),this.options);L.Draw.Feature.prototype._fireCreatedEvent.call(this,t)},_createMarker:function(t){return new L.CircleMarker(t,this.options)}}),L.Draw.Circle=L.Draw.SimpleShape.extend({statics:{TYPE:"circle"},options:{shapeOptions:{stroke:!0,color:"#3388ff",weight:4,opacity:.5,fill:!0,fillColor:null,fillOpacity:.2,clickable:!0},showRadius:!0,metric:!0,feet:!0,nautic:!1},initialize:function(t,e){this.type=L.Draw.Circle.TYPE,this._initialLabelText=L.drawLocal.draw.handlers.circle.tooltip.start,L.Draw.SimpleShape.prototype.initialize.call(this,t,e)},_drawShape:function(t){if(L.GeometryUtil.isVersion07x())var e=this._startLatLng.distanceTo(t);else var e=this._map.distance(this._startLatLng,t);this._shape?this._shape.setRadius(e):(this._shape=new L.Circle(this._startLatLng,e,this.options.shapeOptions),this._map.addLayer(this._shape))},_fireCreatedEvent:function(){var t=new L.Circle(this._startLatLng,this._shape.getRadius(),this.options.shapeOptions);L.Draw.SimpleShape.prototype._fireCreatedEvent.call(this,t)},_onMouseMove:function(t){var e,i=t.latlng,o=this.options.showRadius,n=this.options.metric;if(this._tooltip.updatePosition(i),this._isDrawing){this._drawShape(i),e=this._shape.getRadius().toFixed(1);var a="";o&&(a=L.drawLocal.draw.handlers.circle.radius+": "+L.GeometryUtil.readableDistance(e,n,this.options.feet,this.options.nautic)),this._tooltip.updateContent({text:this._endLabelText,subtext:a})}}}),L.Edit=L.Edit||{},L.Edit.Marker=L.Handler.extend({initialize:function(t,e){this._marker=t,L.setOptions(this,e)},addHooks:function(){var t=this._marker;t.dragging.enable(),t.on("dragend",this._onDragEnd,t),this._toggleMarkerHighlight()},removeHooks:function(){var t=this._marker;t.dragging.disable(),t.off("dragend",this._onDragEnd,t),this._toggleMarkerHighlight()},_onDragEnd:function(t){var e=t.target;e.edited=!0,this._map.fire(L.Draw.Event.EDITMOVE,{layer:e})},_toggleMarkerHighlight:function(){var t=this._marker._icon;t&&(t.style.display="none",L.DomUtil.hasClass(t,"leaflet-edit-marker-selected")?(L.DomUtil.removeClass(t,"leaflet-edit-marker-selected"),this._offsetMarker(t,-4)):(L.DomUtil.addClass(t,"leaflet-edit-marker-selected"),this._offsetMarker(t,4)),t.style.display="")},_offsetMarker:function(t,e){var i=parseInt(t.style.marginTop,10)-e,o=parseInt(t.style.marginLeft,10)-e;t.style.marginTop=i+"px",t.style.marginLeft=o+"px"}}),L.Marker.addInitHook(function(){L.Edit.Marker&&(this.editing=new L.Edit.Marker(this),this.options.editable&&this.editing.enable())}),L.Edit=L.Edit||{},L.Edit.Poly=L.Handler.extend({initialize:function(t){this.latlngs=[t._latlngs],t._holes&&(this.latlngs=this.latlngs.concat(t._holes)),this._poly=t,this._poly.on("revert-edited",this._updateLatLngs,this)},_defaultShape:function(){return L.Polyline._flat?L.Polyline._flat(this._poly._latlngs)?this._poly._latlngs:this._poly._latlngs[0]:this._poly._latlngs},_eachVertexHandler:function(t){for(var e=0;e<this._verticesHandlers.length;e++)t(this._verticesHandlers[e])},addHooks:function(){this._initHandlers(),this._eachVertexHandler(function(t){t.addHooks()})},removeHooks:function(){this._eachVertexHandler(function(t){t.removeHooks()})},updateMarkers:function(){this._eachVertexHandler(function(t){t.updateMarkers()})},_initHandlers:function(){this._verticesHandlers=[];for(var t=0;t<this.latlngs.length;t++)this._verticesHandlers.push(new L.Edit.PolyVerticesEdit(this._poly,this.latlngs[t],this._poly.options.poly))},_updateLatLngs:function(t){this.latlngs=[t.layer._latlngs],t.layer._holes&&(this.latlngs=this.latlngs.concat(t.layer._holes))}}),L.Edit.PolyVerticesEdit=L.Handler.extend({options:{icon:new L.DivIcon({iconSize:new L.Point(8,8),className:"leaflet-div-icon leaflet-editing-icon"}),touchIcon:new L.DivIcon({iconSize:new L.Point(20,20),className:"leaflet-div-icon leaflet-editing-icon leaflet-touch-icon"}),drawError:{color:"#b00b00",timeout:1e3}},initialize:function(t,e,i){L.Browser.touch&&(this.options.icon=this.options.touchIcon),this._poly=t,i&&i.drawError&&(i.drawError=L.Util.extend({},this.options.drawError,i.drawError)),this._latlngs=e,L.setOptions(this,i)},_defaultShape:function(){return L.Polyline._flat?L.Polyline._flat(this._latlngs)?this._latlngs:this._latlngs[0]:this._latlngs},addHooks:function(){var t=this._poly,e=t._path;t instanceof L.Polygon||(t.options.fill=!1,t.options.editing&&(t.options.editing.fill=!1)),e&&t.options.editing.className&&(t.options.original.className&&t.options.original.className.split(" ").forEach(function(t){L.DomUtil.removeClass(e,t)}),t.options.editing.className.split(" ").forEach(function(t){L.DomUtil.addClass(e,t)})),t.setStyle(t.options.editing),this._poly._map&&(this._map=this._poly._map,this._markerGroup||this._initMarkers(),this._poly._map.addLayer(this._markerGroup))},removeHooks:function(){var t=this._poly,e=t._path;e&&t.options.editing.className&&(t.options.editing.className.split(" ").forEach(function(t){L.DomUtil.removeClass(e,t)}),t.options.original.className&&t.options.original.className.split(" ").forEach(function(t){L.DomUtil.addClass(e,t)})),t.setStyle(t.options.original),t._map&&(t._map.removeLayer(this._markerGroup),delete this._markerGroup,delete this._markers)},updateMarkers:function(){this._markerGroup.clearLayers(),this._initMarkers()},_initMarkers:function(){this._markerGroup||(this._markerGroup=new L.LayerGroup),this._markers=[];var t,e,i,o,n=this._defaultShape();for(t=0,i=n.length;t<i;t++)o=this._createMarker(n[t],t),o.on("click",this._onMarkerClick,this),o.on("contextmenu",this._onContextMenu,this),this._markers.push(o);var a,s;for(t=0,e=i-1;t<i;e=t++)(0!==t||L.Polygon&&this._poly instanceof L.Polygon)&&(a=this._markers[e],s=this._markers[t],this._createMiddleMarker(a,s),this._updatePrevNext(a,s))},_createMarker:function(t,e){var i=new L.Marker.Touch(t,{draggable:!0,icon:this.options.icon});return i._origLatLng=t,i._index=e,i.on("dragstart",this._onMarkerDragStart,this).on("drag",this._onMarkerDrag,this).on("dragend",this._fireEdit,this).on("touchmove",this._onTouchMove,this).on("touchend",this._fireEdit,this).on("MSPointerMove",this._onTouchMove,this).on("MSPointerUp",this._fireEdit,this),this._markerGroup.addLayer(i),i},_onMarkerDragStart:function(){this._poly.fire("editstart")},_spliceLatLngs:function(){var t=this._defaultShape(),e=[].splice.apply(t,arguments);return this._poly._convertLatLngs(t,!0),this._poly.redraw(),e},_removeMarker:function(t){var e=t._index;this._markerGroup.removeLayer(t),this._markers.splice(e,1),this._spliceLatLngs(e,1),this._updateIndexes(e,-1),t.off("dragstart",this._onMarkerDragStart,this).off("drag",this._onMarkerDrag,this).off("dragend",this._fireEdit,this).off("touchmove",this._onMarkerDrag,this).off("touchend",this._fireEdit,this).off("click",this._onMarkerClick,this).off("MSPointerMove",this._onTouchMove,this).off("MSPointerUp",this._fireEdit,this)},_fireEdit:function(){this._poly.edited=!0,this._poly.fire("edit"),this._poly._map.fire(L.Draw.Event.EDITVERTEX,{layers:this._markerGroup,poly:this._poly})},_onMarkerDrag:function(t){var e=t.target,i=this._poly;if(L.extend(e._origLatLng,e._latlng),e._middleLeft&&e._middleLeft.setLatLng(this._getMiddleLatLng(e._prev,e)),e._middleRight&&e._middleRight.setLatLng(this._getMiddleLatLng(e,e._next)),i.options.poly){var o=i._map._editTooltip;if(!i.options.poly.allowIntersection&&i.intersects()){var n=i.options.color;i.setStyle({color:this.options.drawError.color}),0!==L.version.indexOf("0.7")&&e.dragging._draggable._onUp(t),this._onMarkerClick(t),o&&o.updateContent({text:L.drawLocal.draw.handlers.polyline.error}),setTimeout(function(){i.setStyle({color:n}),o&&o.updateContent({text:L.drawLocal.edit.handlers.edit.tooltip.text,subtext:L.drawLocal.edit.handlers.edit.tooltip.subtext})},1e3)}}this._poly._bounds._southWest=L.latLng(1/0,1/0),this._poly._bounds._northEast=L.latLng(-1/0,-1/0);var a=this._poly.getLatLngs();this._poly._convertLatLngs(a,!0),this._poly.redraw(),this._poly.fire("editdrag")},_onMarkerClick:function(t){var e=L.Polygon&&this._poly instanceof L.Polygon?4:3,i=t.target;this._defaultShape().length<e||(this._removeMarker(i),this._updatePrevNext(i._prev,i._next),i._middleLeft&&this._markerGroup.removeLayer(i._middleLeft),i._middleRight&&this._markerGroup.removeLayer(i._middleRight),i._prev&&i._next?this._createMiddleMarker(i._prev,i._next):i._prev?i._next||(i._prev._middleRight=null):i._next._middleLeft=null,this._fireEdit())},_onContextMenu:function(t){var e=t.target;this._poly;this._poly._map.fire(L.Draw.Event.MARKERCONTEXT,{marker:e,layers:this._markerGroup,poly:this._poly}),L.DomEvent.stopPropagation},_onTouchMove:function(t){var e=this._map.mouseEventToLayerPoint(t.originalEvent.touches[0]),i=this._map.layerPointToLatLng(e),o=t.target;L.extend(o._origLatLng,i),o._middleLeft&&o._middleLeft.setLatLng(this._getMiddleLatLng(o._prev,o)),o._middleRight&&o._middleRight.setLatLng(this._getMiddleLatLng(o,o._next)),this._poly.redraw(),this.updateMarkers()},_updateIndexes:function(t,e){this._markerGroup.eachLayer(function(i){i._index>t&&(i._index+=e)})},_createMiddleMarker:function(t,e){var i,o,n,a=this._getMiddleLatLng(t,e),s=this._createMarker(a);s.setOpacity(.6),t._middleRight=e._middleLeft=s,o=function(){s.off("touchmove",o,this);var n=e._index;s._index=n,s.off("click",i,this).on("click",this._onMarkerClick,this),a.lat=s.getLatLng().lat,a.lng=s.getLatLng().lng,this._spliceLatLngs(n,0,a),this._markers.splice(n,0,s),s.setOpacity(1),this._updateIndexes(n,1),e._index++,this._updatePrevNext(t,s),this._updatePrevNext(s,e),this._poly.fire("editstart")},n=function(){s.off("dragstart",o,this),s.off("dragend",n,this),s.off("touchmove",o,this),this._createMiddleMarker(t,s),this._createMiddleMarker(s,e)},i=function(){o.call(this),n.call(this),this._fireEdit()},s.on("click",i,this).on("dragstart",o,this).on("dragend",n,this).on("touchmove",o,this),this._markerGroup.addLayer(s)},_updatePrevNext:function(t,e){t&&(t._next=e),e&&(e._prev=t)},_getMiddleLatLng:function(t,e){var i=this._poly._map,o=i.project(t.getLatLng()),n=i.project(e.getLatLng());return i.unproject(o._add(n)._divideBy(2))}}),L.Polyline.addInitHook(function(){this.editing||(L.Edit.Poly&&(this.editing=new L.Edit.Poly(this),this.options.editable&&this.editing.enable()),this.on("add",function(){this.editing&&this.editing.enabled()&&this.editing.addHooks()}),this.on("remove",function(){this.editing&&this.editing.enabled()&&this.editing.removeHooks()}))}),L.Edit=L.Edit||{},L.Edit.SimpleShape=L.Handler.extend({options:{moveIcon:new L.DivIcon({iconSize:new L.Point(8,8),className:"leaflet-div-icon leaflet-editing-icon leaflet-edit-move"}),resizeIcon:new L.DivIcon({iconSize:new L.Point(8,8),className:"leaflet-div-icon leaflet-editing-icon leaflet-edit-resize"}),touchMoveIcon:new L.DivIcon({ +iconSize:new L.Point(20,20),className:"leaflet-div-icon leaflet-editing-icon leaflet-edit-move leaflet-touch-icon"}),touchResizeIcon:new L.DivIcon({iconSize:new L.Point(20,20),className:"leaflet-div-icon leaflet-editing-icon leaflet-edit-resize leaflet-touch-icon"})},initialize:function(t,e){L.Browser.touch&&(this.options.moveIcon=this.options.touchMoveIcon,this.options.resizeIcon=this.options.touchResizeIcon),this._shape=t,L.Util.setOptions(this,e)},addHooks:function(){var t=this._shape;this._shape._map&&(this._map=this._shape._map,t.setStyle(t.options.editing),t._map&&(this._map=t._map,this._markerGroup||this._initMarkers(),this._map.addLayer(this._markerGroup)))},removeHooks:function(){var t=this._shape;if(t.setStyle(t.options.original),t._map){this._unbindMarker(this._moveMarker);for(var e=0,i=this._resizeMarkers.length;e<i;e++)this._unbindMarker(this._resizeMarkers[e]);this._resizeMarkers=null,this._map.removeLayer(this._markerGroup),delete this._markerGroup}this._map=null},updateMarkers:function(){this._markerGroup.clearLayers(),this._initMarkers()},_initMarkers:function(){this._markerGroup||(this._markerGroup=new L.LayerGroup),this._createMoveMarker(),this._createResizeMarker()},_createMoveMarker:function(){},_createResizeMarker:function(){},_createMarker:function(t,e){var i=new L.Marker.Touch(t,{draggable:!0,icon:e,zIndexOffset:10});return this._bindMarker(i),this._markerGroup.addLayer(i),i},_bindMarker:function(t){t.on("dragstart",this._onMarkerDragStart,this).on("drag",this._onMarkerDrag,this).on("dragend",this._onMarkerDragEnd,this).on("touchstart",this._onTouchStart,this).on("touchmove",this._onTouchMove,this).on("MSPointerMove",this._onTouchMove,this).on("touchend",this._onTouchEnd,this).on("MSPointerUp",this._onTouchEnd,this)},_unbindMarker:function(t){t.off("dragstart",this._onMarkerDragStart,this).off("drag",this._onMarkerDrag,this).off("dragend",this._onMarkerDragEnd,this).off("touchstart",this._onTouchStart,this).off("touchmove",this._onTouchMove,this).off("MSPointerMove",this._onTouchMove,this).off("touchend",this._onTouchEnd,this).off("MSPointerUp",this._onTouchEnd,this)},_onMarkerDragStart:function(t){t.target.setOpacity(0),this._shape.fire("editstart")},_fireEdit:function(){this._shape.edited=!0,this._shape.fire("edit")},_onMarkerDrag:function(t){var e=t.target,i=e.getLatLng();e===this._moveMarker?this._move(i):this._resize(i),this._shape.redraw(),this._shape.fire("editdrag")},_onMarkerDragEnd:function(t){t.target.setOpacity(1),this._fireEdit()},_onTouchStart:function(t){if(L.Edit.SimpleShape.prototype._onMarkerDragStart.call(this,t),"function"==typeof this._getCorners){var e=this._getCorners(),i=t.target,o=i._cornerIndex;i.setOpacity(0),this._oppositeCorner=e[(o+2)%4],this._toggleCornerMarkers(0,o)}this._shape.fire("editstart")},_onTouchMove:function(t){var e=this._map.mouseEventToLayerPoint(t.originalEvent.touches[0]),i=this._map.layerPointToLatLng(e);return t.target===this._moveMarker?this._move(i):this._resize(i),this._shape.redraw(),!1},_onTouchEnd:function(t){t.target.setOpacity(1),this.updateMarkers(),this._fireEdit()},_move:function(){},_resize:function(){}}),L.Edit=L.Edit||{},L.Edit.Rectangle=L.Edit.SimpleShape.extend({_createMoveMarker:function(){var t=this._shape.getBounds(),e=t.getCenter();this._moveMarker=this._createMarker(e,this.options.moveIcon)},_createResizeMarker:function(){var t=this._getCorners();this._resizeMarkers=[];for(var e=0,i=t.length;e<i;e++)this._resizeMarkers.push(this._createMarker(t[e],this.options.resizeIcon)),this._resizeMarkers[e]._cornerIndex=e},_onMarkerDragStart:function(t){L.Edit.SimpleShape.prototype._onMarkerDragStart.call(this,t);var e=this._getCorners(),i=t.target,o=i._cornerIndex;this._oppositeCorner=e[(o+2)%4],this._toggleCornerMarkers(0,o)},_onMarkerDragEnd:function(t){var e,i,o=t.target;o===this._moveMarker&&(e=this._shape.getBounds(),i=e.getCenter(),o.setLatLng(i)),this._toggleCornerMarkers(1),this._repositionCornerMarkers(),L.Edit.SimpleShape.prototype._onMarkerDragEnd.call(this,t)},_move:function(t){for(var e,i=this._shape._defaultShape?this._shape._defaultShape():this._shape.getLatLngs(),o=this._shape.getBounds(),n=o.getCenter(),a=[],s=0,r=i.length;s<r;s++)e=[i[s].lat-n.lat,i[s].lng-n.lng],a.push([t.lat+e[0],t.lng+e[1]]);this._shape.setLatLngs(a),this._repositionCornerMarkers(),this._map.fire(L.Draw.Event.EDITMOVE,{layer:this._shape})},_resize:function(t){var e;this._shape.setBounds(L.latLngBounds(t,this._oppositeCorner)),e=this._shape.getBounds(),this._moveMarker.setLatLng(e.getCenter()),this._map.fire(L.Draw.Event.EDITRESIZE,{layer:this._shape})},_getCorners:function(){var t=this._shape.getBounds();return[t.getNorthWest(),t.getNorthEast(),t.getSouthEast(),t.getSouthWest()]},_toggleCornerMarkers:function(t){for(var e=0,i=this._resizeMarkers.length;e<i;e++)this._resizeMarkers[e].setOpacity(t)},_repositionCornerMarkers:function(){for(var t=this._getCorners(),e=0,i=this._resizeMarkers.length;e<i;e++)this._resizeMarkers[e].setLatLng(t[e])}}),L.Rectangle.addInitHook(function(){L.Edit.Rectangle&&(this.editing=new L.Edit.Rectangle(this),this.options.editable&&this.editing.enable())}),L.Edit=L.Edit||{},L.Edit.CircleMarker=L.Edit.SimpleShape.extend({_createMoveMarker:function(){var t=this._shape.getLatLng();this._moveMarker=this._createMarker(t,this.options.moveIcon)},_createResizeMarker:function(){this._resizeMarkers=[]},_move:function(t){if(this._resizeMarkers.length){var e=this._getResizeMarkerPoint(t);this._resizeMarkers[0].setLatLng(e)}this._shape.setLatLng(t),this._map.fire(L.Draw.Event.EDITMOVE,{layer:this._shape})}}),L.CircleMarker.addInitHook(function(){L.Edit.CircleMarker&&(this.editing=new L.Edit.CircleMarker(this),this.options.editable&&this.editing.enable()),this.on("add",function(){this.editing&&this.editing.enabled()&&this.editing.addHooks()}),this.on("remove",function(){this.editing&&this.editing.enabled()&&this.editing.removeHooks()})}),L.Edit=L.Edit||{},L.Edit.Circle=L.Edit.CircleMarker.extend({_createResizeMarker:function(){var t=this._shape.getLatLng(),e=this._getResizeMarkerPoint(t);this._resizeMarkers=[],this._resizeMarkers.push(this._createMarker(e,this.options.resizeIcon))},_getResizeMarkerPoint:function(t){var e=this._shape._radius*Math.cos(Math.PI/4),i=this._map.project(t);return this._map.unproject([i.x+e,i.y-e])},_resize:function(t){var e=this._moveMarker.getLatLng();L.GeometryUtil.isVersion07x()?radius=e.distanceTo(t):radius=this._map.distance(e,t),this._shape.setRadius(radius),this._map._editTooltip.updateContent({text:L.drawLocal.edit.handlers.edit.tooltip.subtext+"<br />"+L.drawLocal.edit.handlers.edit.tooltip.text,subtext:L.drawLocal.draw.handlers.circle.radius+": "+L.GeometryUtil.readableDistance(radius,!0,this.options.feet,this.options.nautic)}),this._shape.setRadius(radius),this._map.fire(L.Draw.Event.EDITRESIZE,{layer:this._shape})}}),L.Circle.addInitHook(function(){L.Edit.Circle&&(this.editing=new L.Edit.Circle(this),this.options.editable&&this.editing.enable()),this.on("add",function(){this.editing&&this.editing.enabled()&&this.editing.addHooks()}),this.on("remove",function(){this.editing&&this.editing.enabled()&&this.editing.removeHooks()})}),L.Map.mergeOptions({touchExtend:!0}),L.Map.TouchExtend=L.Handler.extend({initialize:function(t){this._map=t,this._container=t._container,this._pane=t._panes.overlayPane},addHooks:function(){L.DomEvent.on(this._container,"touchstart",this._onTouchStart,this),L.DomEvent.on(this._container,"touchend",this._onTouchEnd,this),L.DomEvent.on(this._container,"touchmove",this._onTouchMove,this),this._detectIE()?(L.DomEvent.on(this._container,"MSPointerDown",this._onTouchStart,this),L.DomEvent.on(this._container,"MSPointerUp",this._onTouchEnd,this),L.DomEvent.on(this._container,"MSPointerMove",this._onTouchMove,this),L.DomEvent.on(this._container,"MSPointerCancel",this._onTouchCancel,this)):(L.DomEvent.on(this._container,"touchcancel",this._onTouchCancel,this),L.DomEvent.on(this._container,"touchleave",this._onTouchLeave,this))},removeHooks:function(){L.DomEvent.off(this._container,"touchstart",this._onTouchStart),L.DomEvent.off(this._container,"touchend",this._onTouchEnd),L.DomEvent.off(this._container,"touchmove",this._onTouchMove),this._detectIE()?(L.DomEvent.off(this._container,"MSPointerDowm",this._onTouchStart),L.DomEvent.off(this._container,"MSPointerUp",this._onTouchEnd),L.DomEvent.off(this._container,"MSPointerMove",this._onTouchMove),L.DomEvent.off(this._container,"MSPointerCancel",this._onTouchCancel)):(L.DomEvent.off(this._container,"touchcancel",this._onTouchCancel),L.DomEvent.off(this._container,"touchleave",this._onTouchLeave))},_touchEvent:function(t,e){var i={};if(void 0!==t.touches){if(!t.touches.length)return;i=t.touches[0]}else{if("touch"!==t.pointerType)return;if(i=t,!this._filterClick(t))return}var o=this._map.mouseEventToContainerPoint(i),n=this._map.mouseEventToLayerPoint(i),a=this._map.layerPointToLatLng(n);this._map.fire(e,{latlng:a,layerPoint:n,containerPoint:o,pageX:i.pageX,pageY:i.pageY,originalEvent:t})},_filterClick:function(t){var e=t.timeStamp||t.originalEvent.timeStamp,i=L.DomEvent._lastClick&&e-L.DomEvent._lastClick;return i&&i>100&&i<500||t.target._simulatedClick&&!t._simulated?(L.DomEvent.stop(t),!1):(L.DomEvent._lastClick=e,!0)},_onTouchStart:function(t){if(this._map._loaded){this._touchEvent(t,"touchstart")}},_onTouchEnd:function(t){if(this._map._loaded){this._touchEvent(t,"touchend")}},_onTouchCancel:function(t){if(this._map._loaded){var e="touchcancel";this._detectIE()&&(e="pointercancel"),this._touchEvent(t,e)}},_onTouchLeave:function(t){if(this._map._loaded){this._touchEvent(t,"touchleave")}},_onTouchMove:function(t){if(this._map._loaded){this._touchEvent(t,"touchmove")}},_detectIE:function(){var e=t.navigator.userAgent,i=e.indexOf("MSIE ");if(i>0)return parseInt(e.substring(i+5,e.indexOf(".",i)),10);if(e.indexOf("Trident/")>0){var o=e.indexOf("rv:");return parseInt(e.substring(o+3,e.indexOf(".",o)),10)}var n=e.indexOf("Edge/");return n>0&&parseInt(e.substring(n+5,e.indexOf(".",n)),10)}}),L.Map.addInitHook("addHandler","touchExtend",L.Map.TouchExtend),L.Marker.Touch=L.Marker.extend({_initInteraction:function(){return this.addInteractiveTarget?L.Marker.prototype._initInteraction.apply(this):this._initInteractionLegacy()},_initInteractionLegacy:function(){if(this.options.clickable){var t=this._icon,e=["dblclick","mousedown","mouseover","mouseout","contextmenu","touchstart","touchend","touchmove"];this._detectIE?e.concat(["MSPointerDown","MSPointerUp","MSPointerMove","MSPointerCancel"]):e.concat(["touchcancel"]),L.DomUtil.addClass(t,"leaflet-clickable"),L.DomEvent.on(t,"click",this._onMouseClick,this),L.DomEvent.on(t,"keypress",this._onKeyPress,this);for(var i=0;i<e.length;i++)L.DomEvent.on(t,e[i],this._fireMouseEvent,this);L.Handler.MarkerDrag&&(this.dragging=new L.Handler.MarkerDrag(this),this.options.draggable&&this.dragging.enable())}},_detectIE:function(){var e=t.navigator.userAgent,i=e.indexOf("MSIE ");if(i>0)return parseInt(e.substring(i+5,e.indexOf(".",i)),10);if(e.indexOf("Trident/")>0){var o=e.indexOf("rv:");return parseInt(e.substring(o+3,e.indexOf(".",o)),10)}var n=e.indexOf("Edge/");return n>0&&parseInt(e.substring(n+5,e.indexOf(".",n)),10)}}),L.LatLngUtil={cloneLatLngs:function(t){for(var e=[],i=0,o=t.length;i<o;i++)Array.isArray(t[i])?e.push(L.LatLngUtil.cloneLatLngs(t[i])):e.push(this.cloneLatLng(t[i]));return e},cloneLatLng:function(t){return L.latLng(t.lat,t.lng)}},function(){var t={km:2,ha:2,m:0,mi:2,ac:2,yd:0,ft:0,nm:2};L.GeometryUtil=L.extend(L.GeometryUtil||{},{geodesicArea:function(t){var e,i,o=t.length,n=0,a=Math.PI/180;if(o>2){for(var s=0;s<o;s++)e=t[s],i=t[(s+1)%o],n+=(i.lng-e.lng)*a*(2+Math.sin(e.lat*a)+Math.sin(i.lat*a));n=6378137*n*6378137/2}return Math.abs(n)},formattedNumber:function(t,e){var i=parseFloat(t).toFixed(e),o=L.drawLocal.format&&L.drawLocal.format.numeric,n=o&&o.delimiters,a=n&&n.thousands,s=n&&n.decimal;if(a||s){var r=i.split(".");i=a?r[0].replace(/(\d)(?=(\d{3})+(?!\d))/g,"$1"+a):r[0],s=s||".",r.length>1&&(i=i+s+r[1])}return i},readableArea:function(e,i,o){var n,a,o=L.Util.extend({},t,o);return i?(a=["ha","m"],type=typeof i,"string"===type?a=[i]:"boolean"!==type&&(a=i),n=e>=1e6&&-1!==a.indexOf("km")?L.GeometryUtil.formattedNumber(1e-6*e,o.km)+" km²":e>=1e4&&-1!==a.indexOf("ha")?L.GeometryUtil.formattedNumber(1e-4*e,o.ha)+" ha":L.GeometryUtil.formattedNumber(e,o.m)+" m²"):(e/=.836127,n=e>=3097600?L.GeometryUtil.formattedNumber(e/3097600,o.mi)+" mi²":e>=4840?L.GeometryUtil.formattedNumber(e/4840,o.ac)+" acres":L.GeometryUtil.formattedNumber(e,o.yd)+" yd²"),n},readableDistance:function(e,i,o,n,a){var s,a=L.Util.extend({},t,a);switch(i?"string"==typeof i?i:"metric":o?"feet":n?"nauticalMile":"yards"){case"metric":s=e>1e3?L.GeometryUtil.formattedNumber(e/1e3,a.km)+" km":L.GeometryUtil.formattedNumber(e,a.m)+" m";break;case"feet":e*=3.28083,s=L.GeometryUtil.formattedNumber(e,a.ft)+" ft";break;case"nauticalMile":e*=.53996,s=L.GeometryUtil.formattedNumber(e/1e3,a.nm)+" nm";break;case"yards":default:e*=1.09361,s=e>1760?L.GeometryUtil.formattedNumber(e/1760,a.mi)+" miles":L.GeometryUtil.formattedNumber(e,a.yd)+" yd"}return s},isVersion07x:function(){var t=L.version.split(".");return 0===parseInt(t[0],10)&&7===parseInt(t[1],10)}})}(),L.Util.extend(L.LineUtil,{segmentsIntersect:function(t,e,i,o){return this._checkCounterclockwise(t,i,o)!==this._checkCounterclockwise(e,i,o)&&this._checkCounterclockwise(t,e,i)!==this._checkCounterclockwise(t,e,o)},_checkCounterclockwise:function(t,e,i){return(i.y-t.y)*(e.x-t.x)>(e.y-t.y)*(i.x-t.x)}}),L.Polyline.include({intersects:function(){var t,e,i,o=this._getProjectedPoints(),n=o?o.length:0;if(this._tooFewPointsForIntersection())return!1;for(t=n-1;t>=3;t--)if(e=o[t-1],i=o[t],this._lineSegmentsIntersectsRange(e,i,t-2))return!0;return!1},newLatLngIntersects:function(t,e){return!!this._map&&this.newPointIntersects(this._map.latLngToLayerPoint(t),e)},newPointIntersects:function(t,e){var i=this._getProjectedPoints(),o=i?i.length:0,n=i?i[o-1]:null,a=o-2;return!this._tooFewPointsForIntersection(1)&&this._lineSegmentsIntersectsRange(n,t,a,e?1:0)},_tooFewPointsForIntersection:function(t){var e=this._getProjectedPoints(),i=e?e.length:0;return i+=t||0,!e||i<=3},_lineSegmentsIntersectsRange:function(t,e,i,o){var n,a,s=this._getProjectedPoints();o=o||0;for(var r=i;r>o;r--)if(n=s[r-1],a=s[r],L.LineUtil.segmentsIntersect(t,e,n,a))return!0;return!1},_getProjectedPoints:function(){if(!this._defaultShape)return this._originalPoints;for(var t=[],e=this._defaultShape(),i=0;i<e.length;i++)t.push(this._map.latLngToLayerPoint(e[i]));return t}}),L.Polygon.include({intersects:function(){var t,e,i,o,n=this._getProjectedPoints();return!this._tooFewPointsForIntersection()&&(!!L.Polyline.prototype.intersects.call(this)||(t=n.length,e=n[0],i=n[t-1],o=t-2,this._lineSegmentsIntersectsRange(i,e,o,1)))}}),L.Control.Draw=L.Control.extend({options:{position:"topleft",draw:{},edit:!1},initialize:function(t){if(L.version<"0.7")throw new Error("Leaflet.draw 0.2.3+ requires Leaflet 0.7.0+. Download latest from https://github.com/Leaflet/Leaflet/");L.Control.prototype.initialize.call(this,t);var e;this._toolbars={},L.DrawToolbar&&this.options.draw&&(e=new L.DrawToolbar(this.options.draw),this._toolbars[L.DrawToolbar.TYPE]=e,this._toolbars[L.DrawToolbar.TYPE].on("enable",this._toolbarEnabled,this)),L.EditToolbar&&this.options.edit&&(e=new L.EditToolbar(this.options.edit),this._toolbars[L.EditToolbar.TYPE]=e,this._toolbars[L.EditToolbar.TYPE].on("enable",this._toolbarEnabled,this)),L.toolbar=this},onAdd:function(t){var e,i=L.DomUtil.create("div","leaflet-draw"),o=!1;for(var n in this._toolbars)this._toolbars.hasOwnProperty(n)&&(e=this._toolbars[n].addToolbar(t))&&(o||(L.DomUtil.hasClass(e,"leaflet-draw-toolbar-top")||L.DomUtil.addClass(e.childNodes[0],"leaflet-draw-toolbar-top"),o=!0),i.appendChild(e));return i},onRemove:function(){for(var t in this._toolbars)this._toolbars.hasOwnProperty(t)&&this._toolbars[t].removeToolbar()},setDrawingOptions:function(t){for(var e in this._toolbars)this._toolbars[e]instanceof L.DrawToolbar&&this._toolbars[e].setOptions(t)},_toolbarEnabled:function(t){var e=t.target;for(var i in this._toolbars)this._toolbars[i]!==e&&this._toolbars[i].disable()}}),L.Map.mergeOptions({drawControlTooltips:!0,drawControl:!1}),L.Map.addInitHook(function(){this.options.drawControl&&(this.drawControl=new L.Control.Draw,this.addControl(this.drawControl))}),L.Toolbar=L.Class.extend({initialize:function(t){L.setOptions(this,t),this._modes={},this._actionButtons=[],this._activeMode=null;var e=L.version.split(".");1===parseInt(e[0],10)&&parseInt(e[1],10)>=2?L.Toolbar.include(L.Evented.prototype):L.Toolbar.include(L.Mixin.Events)},enabled:function(){return null!==this._activeMode},disable:function(){this.enabled()&&this._activeMode.handler.disable()},addToolbar:function(t){var e,i=L.DomUtil.create("div","leaflet-draw-section"),o=0,n=this._toolbarClass||"",a=this.getModeHandlers(t);for(this._toolbarContainer=L.DomUtil.create("div","leaflet-draw-toolbar leaflet-bar"),this._map=t,e=0;e<a.length;e++)a[e].enabled&&this._initModeHandler(a[e].handler,this._toolbarContainer,o++,n,a[e].title);if(o)return this._lastButtonIndex=--o,this._actionsContainer=L.DomUtil.create("ul","leaflet-draw-actions"),i.appendChild(this._toolbarContainer),i.appendChild(this._actionsContainer),i},removeToolbar:function(){for(var t in this._modes)this._modes.hasOwnProperty(t)&&(this._disposeButton(this._modes[t].button,this._modes[t].handler.enable,this._modes[t].handler),this._modes[t].handler.disable(),this._modes[t].handler.off("enabled",this._handlerActivated,this).off("disabled",this._handlerDeactivated,this));this._modes={};for(var e=0,i=this._actionButtons.length;e<i;e++)this._disposeButton(this._actionButtons[e].button,this._actionButtons[e].callback,this);this._actionButtons=[],this._actionsContainer=null},_initModeHandler:function(t,e,i,o,n){var a=t.type;this._modes[a]={},this._modes[a].handler=t,this._modes[a].button=this._createButton({type:a,title:n,className:o+"-"+a,container:e,callback:this._modes[a].handler.enable,context:this._modes[a].handler}),this._modes[a].buttonIndex=i,this._modes[a].handler.on("enabled",this._handlerActivated,this).on("disabled",this._handlerDeactivated,this)},_detectIOS:function(){return/iPad|iPhone|iPod/.test(navigator.userAgent)&&!t.MSStream},_createButton:function(t){var e=L.DomUtil.create("a",t.className||"",t.container),i=L.DomUtil.create("span","sr-only",t.container);e.href="#",e.appendChild(i),t.title&&(e.title=t.title,i.innerHTML=t.title),t.text&&(e.innerHTML=t.text,i.innerHTML=t.text);var o=this._detectIOS()?"touchstart":"click";return L.DomEvent.on(e,"click",L.DomEvent.stopPropagation).on(e,"mousedown",L.DomEvent.stopPropagation).on(e,"dblclick",L.DomEvent.stopPropagation).on(e,"touchstart",L.DomEvent.stopPropagation).on(e,"click",L.DomEvent.preventDefault).on(e,o,t.callback,t.context),e},_disposeButton:function(t,e){var i=this._detectIOS()?"touchstart":"click";L.DomEvent.off(t,"click",L.DomEvent.stopPropagation).off(t,"mousedown",L.DomEvent.stopPropagation).off(t,"dblclick",L.DomEvent.stopPropagation).off(t,"touchstart",L.DomEvent.stopPropagation).off(t,"click",L.DomEvent.preventDefault).off(t,i,e)},_handlerActivated:function(t){this.disable(),this._activeMode=this._modes[t.handler],L.DomUtil.addClass(this._activeMode.button,"leaflet-draw-toolbar-button-enabled"),this._showActionsToolbar(),this.fire("enable")},_handlerDeactivated:function(){this._hideActionsToolbar(),L.DomUtil.removeClass(this._activeMode.button,"leaflet-draw-toolbar-button-enabled"),this._activeMode=null,this.fire("disable")},_createActions:function(t){var e,i,o,n,a=this._actionsContainer,s=this.getActions(t),r=s.length;for(i=0,o=this._actionButtons.length;i<o;i++)this._disposeButton(this._actionButtons[i].button,this._actionButtons[i].callback);for(this._actionButtons=[];a.firstChild;)a.removeChild(a.firstChild);for(var l=0;l<r;l++)"enabled"in s[l]&&!s[l].enabled||(e=L.DomUtil.create("li","",a),n=this._createButton({title:s[l].title,text:s[l].text,container:e,callback:s[l].callback,context:s[l].context}),this._actionButtons.push({button:n,callback:s[l].callback}))},_showActionsToolbar:function(){var t=this._activeMode.buttonIndex,e=this._lastButtonIndex,i=this._activeMode.button.offsetTop-1;this._createActions(this._activeMode.handler),this._actionsContainer.style.top=i+"px",0===t&&(L.DomUtil.addClass(this._toolbarContainer,"leaflet-draw-toolbar-notop"),L.DomUtil.addClass(this._actionsContainer,"leaflet-draw-actions-top")),t===e&&(L.DomUtil.addClass(this._toolbarContainer,"leaflet-draw-toolbar-nobottom"),L.DomUtil.addClass(this._actionsContainer,"leaflet-draw-actions-bottom")),this._actionsContainer.style.display="block",this._map.fire(L.Draw.Event.TOOLBAROPENED)},_hideActionsToolbar:function(){this._actionsContainer.style.display="none",L.DomUtil.removeClass(this._toolbarContainer,"leaflet-draw-toolbar-notop"),L.DomUtil.removeClass(this._toolbarContainer,"leaflet-draw-toolbar-nobottom"),L.DomUtil.removeClass(this._actionsContainer,"leaflet-draw-actions-top"),L.DomUtil.removeClass(this._actionsContainer,"leaflet-draw-actions-bottom"),this._map.fire(L.Draw.Event.TOOLBARCLOSED)}}),L.Draw=L.Draw||{},L.Draw.Tooltip=L.Class.extend({initialize:function(t){this._map=t,this._popupPane=t._panes.popupPane,this._visible=!1,this._container=t.options.drawControlTooltips?L.DomUtil.create("div","leaflet-draw-tooltip",this._popupPane):null,this._singleLineLabel=!1,this._map.on("mouseout",this._onMouseOut,this)},dispose:function(){this._map.off("mouseout",this._onMouseOut,this),this._container&&(this._popupPane.removeChild(this._container),this._container=null)},updateContent:function(t){return this._container?(t.subtext=t.subtext||"",0!==t.subtext.length||this._singleLineLabel?t.subtext.length>0&&this._singleLineLabel&&(L.DomUtil.removeClass(this._container,"leaflet-draw-tooltip-single"),this._singleLineLabel=!1):(L.DomUtil.addClass(this._container,"leaflet-draw-tooltip-single"),this._singleLineLabel=!0),this._container.innerHTML=(t.subtext.length>0?'<span class="leaflet-draw-tooltip-subtext">'+t.subtext+"</span><br />":"")+"<span>"+t.text+"</span>",t.text||t.subtext?(this._visible=!0,this._container.style.visibility="inherit"):(this._visible=!1,this._container.style.visibility="hidden"),this):this},updatePosition:function(t){var e=this._map.latLngToLayerPoint(t),i=this._container;return this._container&&(this._visible&&(i.style.visibility="inherit"),L.DomUtil.setPosition(i,e)),this},showAsError:function(){return this._container&&L.DomUtil.addClass(this._container,"leaflet-error-draw-tooltip"),this},removeError:function(){return this._container&&L.DomUtil.removeClass(this._container,"leaflet-error-draw-tooltip"),this},_onMouseOut:function(){this._container&&(this._container.style.visibility="hidden")}}),L.DrawToolbar=L.Toolbar.extend({statics:{TYPE:"draw"},options:{polyline:{},polygon:{},rectangle:{},circle:{},marker:{},circlemarker:{}},initialize:function(t){for(var e in this.options)this.options.hasOwnProperty(e)&&t[e]&&(t[e]=L.extend({},this.options[e],t[e]));this._toolbarClass="leaflet-draw-draw",L.Toolbar.prototype.initialize.call(this,t)},getModeHandlers:function(t){return[{enabled:this.options.polyline,handler:new L.Draw.Polyline(t,this.options.polyline),title:L.drawLocal.draw.toolbar.buttons.polyline},{enabled:this.options.polygon,handler:new L.Draw.Polygon(t,this.options.polygon),title:L.drawLocal.draw.toolbar.buttons.polygon},{enabled:this.options.rectangle,handler:new L.Draw.Rectangle(t,this.options.rectangle),title:L.drawLocal.draw.toolbar.buttons.rectangle},{enabled:this.options.circle,handler:new L.Draw.Circle(t,this.options.circle),title:L.drawLocal.draw.toolbar.buttons.circle},{enabled:this.options.marker,handler:new L.Draw.Marker(t,this.options.marker),title:L.drawLocal.draw.toolbar.buttons.marker},{enabled:this.options.circlemarker,handler:new L.Draw.CircleMarker(t,this.options.circlemarker),title:L.drawLocal.draw.toolbar.buttons.circlemarker}]},getActions:function(t){return[{enabled:t.completeShape,title:L.drawLocal.draw.toolbar.finish.title,text:L.drawLocal.draw.toolbar.finish.text,callback:t.completeShape,context:t},{enabled:t.deleteLastVertex,title:L.drawLocal.draw.toolbar.undo.title,text:L.drawLocal.draw.toolbar.undo.text,callback:t.deleteLastVertex,context:t},{title:L.drawLocal.draw.toolbar.actions.title,text:L.drawLocal.draw.toolbar.actions.text,callback:this.disable,context:this}]},setOptions:function(t){L.setOptions(this,t);for(var e in this._modes)this._modes.hasOwnProperty(e)&&t.hasOwnProperty(e)&&this._modes[e].handler.setOptions(t[e])}}),L.EditToolbar=L.Toolbar.extend({statics:{TYPE:"edit"},options:{edit:{selectedPathOptions:{dashArray:"10, 10",fill:!0,fillColor:"#fe57a1",fillOpacity:.1,maintainColor:!1}},remove:{},poly:null,featureGroup:null},initialize:function(t){t.edit&&(void 0===t.edit.selectedPathOptions&&(t.edit.selectedPathOptions=this.options.edit.selectedPathOptions),t.edit.selectedPathOptions=L.extend({},this.options.edit.selectedPathOptions,t.edit.selectedPathOptions)),t.remove&&(t.remove=L.extend({},this.options.remove,t.remove)),t.poly&&(t.poly=L.extend({},this.options.poly,t.poly)),this._toolbarClass="leaflet-draw-edit",L.Toolbar.prototype.initialize.call(this,t),this._selectedFeatureCount=0},getModeHandlers:function(t){var e=this.options.featureGroup;return[{enabled:this.options.edit,handler:new L.EditToolbar.Edit(t,{featureGroup:e,selectedPathOptions:this.options.edit.selectedPathOptions,poly:this.options.poly}),title:L.drawLocal.edit.toolbar.buttons.edit},{enabled:this.options.remove,handler:new L.EditToolbar.Delete(t,{featureGroup:e}),title:L.drawLocal.edit.toolbar.buttons.remove}]},getActions:function(t){var e=[{title:L.drawLocal.edit.toolbar.actions.save.title,text:L.drawLocal.edit.toolbar.actions.save.text,callback:this._save,context:this},{title:L.drawLocal.edit.toolbar.actions.cancel.title,text:L.drawLocal.edit.toolbar.actions.cancel.text,callback:this.disable,context:this}];return t.removeAllLayers&&e.push({title:L.drawLocal.edit.toolbar.actions.clearAll.title,text:L.drawLocal.edit.toolbar.actions.clearAll.text,callback:this._clearAllLayers,context:this}),e},addToolbar:function(t){var e=L.Toolbar.prototype.addToolbar.call(this,t);return this._checkDisabled(),this.options.featureGroup.on("layeradd layerremove",this._checkDisabled,this),e},removeToolbar:function(){this.options.featureGroup.off("layeradd layerremove",this._checkDisabled,this),L.Toolbar.prototype.removeToolbar.call(this)},disable:function(){this.enabled()&&(this._activeMode.handler.revertLayers(),L.Toolbar.prototype.disable.call(this))},_save:function(){this._activeMode.handler.save(),this._activeMode&&this._activeMode.handler.disable()},_clearAllLayers:function(){this._activeMode.handler.removeAllLayers(),this._activeMode&&this._activeMode.handler.disable()},_checkDisabled:function(){var t,e=this.options.featureGroup,i=0!==e.getLayers().length;this.options.edit&&(t=this._modes[L.EditToolbar.Edit.TYPE].button,i?L.DomUtil.removeClass(t,"leaflet-disabled"):L.DomUtil.addClass(t,"leaflet-disabled"),t.setAttribute("title",i?L.drawLocal.edit.toolbar.buttons.edit:L.drawLocal.edit.toolbar.buttons.editDisabled)),this.options.remove&&(t=this._modes[L.EditToolbar.Delete.TYPE].button,i?L.DomUtil.removeClass(t,"leaflet-disabled"):L.DomUtil.addClass(t,"leaflet-disabled"),t.setAttribute("title",i?L.drawLocal.edit.toolbar.buttons.remove:L.drawLocal.edit.toolbar.buttons.removeDisabled))}}),L.EditToolbar.Edit=L.Handler.extend({statics:{TYPE:"edit"},initialize:function(t,e){if(L.Handler.prototype.initialize.call(this,t),L.setOptions(this,e),this._featureGroup=e.featureGroup,!(this._featureGroup instanceof L.FeatureGroup))throw new Error("options.featureGroup must be a L.FeatureGroup");this._uneditedLayerProps={},this.type=L.EditToolbar.Edit.TYPE;var i=L.version.split(".");1===parseInt(i[0],10)&&parseInt(i[1],10)>=2?L.EditToolbar.Edit.include(L.Evented.prototype):L.EditToolbar.Edit.include(L.Mixin.Events)},enable:function(){!this._enabled&&this._hasAvailableLayers()&&(this.fire("enabled",{handler:this.type}),this._map.fire(L.Draw.Event.EDITSTART,{handler:this.type}),L.Handler.prototype.enable.call(this),this._featureGroup.on("layeradd",this._enableLayerEdit,this).on("layerremove",this._disableLayerEdit,this))},disable:function(){this._enabled&&(this._featureGroup.off("layeradd",this._enableLayerEdit,this).off("layerremove",this._disableLayerEdit,this),L.Handler.prototype.disable.call(this),this._map.fire(L.Draw.Event.EDITSTOP,{handler:this.type}),this.fire("disabled",{handler:this.type}))},addHooks:function(){var t=this._map;t&&(t.getContainer().focus(),this._featureGroup.eachLayer(this._enableLayerEdit,this),this._tooltip=new L.Draw.Tooltip(this._map),this._tooltip.updateContent({text:L.drawLocal.edit.handlers.edit.tooltip.text,subtext:L.drawLocal.edit.handlers.edit.tooltip.subtext}),t._editTooltip=this._tooltip,this._updateTooltip(),this._map.on("mousemove",this._onMouseMove,this).on("touchmove",this._onMouseMove,this).on("MSPointerMove",this._onMouseMove,this).on(L.Draw.Event.EDITVERTEX,this._updateTooltip,this))},removeHooks:function(){this._map&&(this._featureGroup.eachLayer(this._disableLayerEdit,this),this._uneditedLayerProps={},this._tooltip.dispose(),this._tooltip=null,this._map.off("mousemove",this._onMouseMove,this).off("touchmove",this._onMouseMove,this).off("MSPointerMove",this._onMouseMove,this).off(L.Draw.Event.EDITVERTEX,this._updateTooltip,this))},revertLayers:function(){this._featureGroup.eachLayer(function(t){this._revertLayer(t)},this)},save:function(){var t=new L.LayerGroup;this._featureGroup.eachLayer(function(e){e.edited&&(t.addLayer(e),e.edited=!1)}),this._map.fire(L.Draw.Event.EDITED,{layers:t})},_backupLayer:function(t){var e=L.Util.stamp(t);this._uneditedLayerProps[e]||(t instanceof L.Polyline||t instanceof L.Polygon||t instanceof L.Rectangle?this._uneditedLayerProps[e]={latlngs:L.LatLngUtil.cloneLatLngs(t.getLatLngs())}:t instanceof L.Circle?this._uneditedLayerProps[e]={latlng:L.LatLngUtil.cloneLatLng(t.getLatLng()),radius:t.getRadius()}:(t instanceof L.Marker||t instanceof L.CircleMarker)&&(this._uneditedLayerProps[e]={latlng:L.LatLngUtil.cloneLatLng(t.getLatLng())}))},_getTooltipText:function(){return{text:L.drawLocal.edit.handlers.edit.tooltip.text,subtext:L.drawLocal.edit.handlers.edit.tooltip.subtext}},_updateTooltip:function(){this._tooltip.updateContent(this._getTooltipText())},_revertLayer:function(t){var e=L.Util.stamp(t);t.edited=!1,this._uneditedLayerProps.hasOwnProperty(e)&&(t instanceof L.Polyline||t instanceof L.Polygon||t instanceof L.Rectangle?t.setLatLngs(this._uneditedLayerProps[e].latlngs):t instanceof L.Circle?(t.setLatLng(this._uneditedLayerProps[e].latlng),t.setRadius(this._uneditedLayerProps[e].radius)):(t instanceof L.Marker||t instanceof L.CircleMarker)&&t.setLatLng(this._uneditedLayerProps[e].latlng),t.fire("revert-edited",{layer:t}))},_enableLayerEdit:function(t){var e,i,o=t.layer||t.target||t;this._backupLayer(o),this.options.poly&&(i=L.Util.extend({},this.options.poly),o.options.poly=i),this.options.selectedPathOptions&&(e=L.Util.extend({},this.options.selectedPathOptions),e.maintainColor&&(e.color=o.options.color,e.fillColor=o.options.fillColor),o.options.original=L.extend({},o.options),o.options.editing=e),o instanceof L.Marker?(o.editing&&o.editing.enable(),o.dragging.enable(),o.on("dragend",this._onMarkerDragEnd).on("touchmove",this._onTouchMove,this).on("MSPointerMove",this._onTouchMove,this).on("touchend",this._onMarkerDragEnd,this).on("MSPointerUp",this._onMarkerDragEnd,this)):o.editing.enable()},_disableLayerEdit:function(t){var e=t.layer||t.target||t;e.edited=!1,e.editing&&e.editing.disable(),delete e.options.editing,delete e.options.original, +this._selectedPathOptions&&(e instanceof L.Marker?this._toggleMarkerHighlight(e):(e.setStyle(e.options.previousOptions),delete e.options.previousOptions)),e instanceof L.Marker?(e.dragging.disable(),e.off("dragend",this._onMarkerDragEnd,this).off("touchmove",this._onTouchMove,this).off("MSPointerMove",this._onTouchMove,this).off("touchend",this._onMarkerDragEnd,this).off("MSPointerUp",this._onMarkerDragEnd,this)):e.editing.disable()},_onMouseMove:function(t){this._tooltip.updatePosition(t.latlng)},_onMarkerDragEnd:function(t){var e=t.target;e.edited=!0,this._map.fire(L.Draw.Event.EDITMOVE,{layer:e})},_onTouchMove:function(t){var e=t.originalEvent.changedTouches[0],i=this._map.mouseEventToLayerPoint(e),o=this._map.layerPointToLatLng(i);t.target.setLatLng(o)},_hasAvailableLayers:function(){return 0!==this._featureGroup.getLayers().length}}),L.EditToolbar.Delete=L.Handler.extend({statics:{TYPE:"remove"},initialize:function(t,e){if(L.Handler.prototype.initialize.call(this,t),L.Util.setOptions(this,e),this._deletableLayers=this.options.featureGroup,!(this._deletableLayers instanceof L.FeatureGroup))throw new Error("options.featureGroup must be a L.FeatureGroup");this.type=L.EditToolbar.Delete.TYPE;var i=L.version.split(".");1===parseInt(i[0],10)&&parseInt(i[1],10)>=2?L.EditToolbar.Delete.include(L.Evented.prototype):L.EditToolbar.Delete.include(L.Mixin.Events)},enable:function(){!this._enabled&&this._hasAvailableLayers()&&(this.fire("enabled",{handler:this.type}),this._map.fire(L.Draw.Event.DELETESTART,{handler:this.type}),L.Handler.prototype.enable.call(this),this._deletableLayers.on("layeradd",this._enableLayerDelete,this).on("layerremove",this._disableLayerDelete,this))},disable:function(){this._enabled&&(this._deletableLayers.off("layeradd",this._enableLayerDelete,this).off("layerremove",this._disableLayerDelete,this),L.Handler.prototype.disable.call(this),this._map.fire(L.Draw.Event.DELETESTOP,{handler:this.type}),this.fire("disabled",{handler:this.type}))},addHooks:function(){var t=this._map;t&&(t.getContainer().focus(),this._deletableLayers.eachLayer(this._enableLayerDelete,this),this._deletedLayers=new L.LayerGroup,this._tooltip=new L.Draw.Tooltip(this._map),this._tooltip.updateContent({text:L.drawLocal.edit.handlers.remove.tooltip.text}),this._map.on("mousemove",this._onMouseMove,this))},removeHooks:function(){this._map&&(this._deletableLayers.eachLayer(this._disableLayerDelete,this),this._deletedLayers=null,this._tooltip.dispose(),this._tooltip=null,this._map.off("mousemove",this._onMouseMove,this))},revertLayers:function(){this._deletedLayers.eachLayer(function(t){this._deletableLayers.addLayer(t),t.fire("revert-deleted",{layer:t})},this)},save:function(){this._map.fire(L.Draw.Event.DELETED,{layers:this._deletedLayers})},removeAllLayers:function(){this._deletableLayers.eachLayer(function(t){this._removeLayer({layer:t})},this),this.save()},_enableLayerDelete:function(t){(t.layer||t.target||t).on("click",this._removeLayer,this)},_disableLayerDelete:function(t){var e=t.layer||t.target||t;e.off("click",this._removeLayer,this),this._deletedLayers.removeLayer(e)},_removeLayer:function(t){var e=t.layer||t.target||t;this._deletableLayers.removeLayer(e),this._deletedLayers.addLayer(e),e.fire("deleted")},_onMouseMove:function(t){this._tooltip.updatePosition(t.latlng)},_hasAvailableLayers:function(){return 0!==this._deletableLayers.getLayers().length}})}(window,document); \ No newline at end of file diff --git a/flask_admin/static/vendor/leaflet/leaflet.js b/flask_admin/static/vendor/leaflet/leaflet.js index 03434b77d..3b628abac 100644 --- a/flask_admin/static/vendor/leaflet/leaflet.js +++ b/flask_admin/static/vendor/leaflet/leaflet.js @@ -1,9 +1,5 @@ -/* - Leaflet, a JavaScript library for mobile-friendly interactive maps. http://leafletjs.com - (c) 2010-2013, Vladimir Agafonkin - (c) 2010-2011, CloudMade -*/ -!function(t,e,i){var n=t.L,o={};o.version="0.7.3","object"==typeof module&&"object"==typeof module.exports?module.exports=o:"function"==typeof define&&define.amd&&define(o),o.noConflict=function(){return t.L=n,this},t.L=o,o.Util={extend:function(t){var e,i,n,o,s=Array.prototype.slice.call(arguments,1);for(i=0,n=s.length;n>i;i++){o=s[i]||{};for(e in o)o.hasOwnProperty(e)&&(t[e]=o[e])}return t},bind:function(t,e){var i=arguments.length>2?Array.prototype.slice.call(arguments,2):null;return function(){return t.apply(e,i||arguments)}},stamp:function(){var t=0,e="_leaflet_id";return function(i){return i[e]=i[e]||++t,i[e]}}(),invokeEach:function(t,e,i){var n,o;if("object"==typeof t){o=Array.prototype.slice.call(arguments,3);for(n in t)e.apply(i,[n,t[n]].concat(o));return!0}return!1},limitExecByInterval:function(t,e,i){var n,o;return function s(){var a=arguments;return n?void(o=!0):(n=!0,setTimeout(function(){n=!1,o&&(s.apply(i,a),o=!1)},e),void t.apply(i,a))}},falseFn:function(){return!1},formatNum:function(t,e){var i=Math.pow(10,e||5);return Math.round(t*i)/i},trim:function(t){return t.trim?t.trim():t.replace(/^\s+|\s+$/g,"")},splitWords:function(t){return o.Util.trim(t).split(/\s+/)},setOptions:function(t,e){return t.options=o.extend({},t.options,e),t.options},getParamString:function(t,e,i){var n=[];for(var o in t)n.push(encodeURIComponent(i?o.toUpperCase():o)+"="+encodeURIComponent(t[o]));return(e&&-1!==e.indexOf("?")?"&":"?")+n.join("&")},template:function(t,e){return t.replace(/\{ *([\w_]+) *\}/g,function(t,n){var o=e[n];if(o===i)throw new Error("No value provided for variable "+t);return"function"==typeof o&&(o=o(e)),o})},isArray:Array.isArray||function(t){return"[object Array]"===Object.prototype.toString.call(t)},emptyImageUrl:"data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs="},function(){function e(e){var i,n,o=["webkit","moz","o","ms"];for(i=0;i<o.length&&!n;i++)n=t[o[i]+e];return n}function i(e){var i=+new Date,o=Math.max(0,16-(i-n));return n=i+o,t.setTimeout(e,o)}var n=0,s=t.requestAnimationFrame||e("RequestAnimationFrame")||i,a=t.cancelAnimationFrame||e("CancelAnimationFrame")||e("CancelRequestAnimationFrame")||function(e){t.clearTimeout(e)};o.Util.requestAnimFrame=function(e,n,a,r){return e=o.bind(e,n),a&&s===i?void e():s.call(t,e,r)},o.Util.cancelAnimFrame=function(e){e&&a.call(t,e)}}(),o.extend=o.Util.extend,o.bind=o.Util.bind,o.stamp=o.Util.stamp,o.setOptions=o.Util.setOptions,o.Class=function(){},o.Class.extend=function(t){var e=function(){this.initialize&&this.initialize.apply(this,arguments),this._initHooks&&this.callInitHooks()},i=function(){};i.prototype=this.prototype;var n=new i;n.constructor=e,e.prototype=n;for(var s in this)this.hasOwnProperty(s)&&"prototype"!==s&&(e[s]=this[s]);t.statics&&(o.extend(e,t.statics),delete t.statics),t.includes&&(o.Util.extend.apply(null,[n].concat(t.includes)),delete t.includes),t.options&&n.options&&(t.options=o.extend({},n.options,t.options)),o.extend(n,t),n._initHooks=[];var a=this;return e.__super__=a.prototype,n.callInitHooks=function(){if(!this._initHooksCalled){a.prototype.callInitHooks&&a.prototype.callInitHooks.call(this),this._initHooksCalled=!0;for(var t=0,e=n._initHooks.length;e>t;t++)n._initHooks[t].call(this)}},e},o.Class.include=function(t){o.extend(this.prototype,t)},o.Class.mergeOptions=function(t){o.extend(this.prototype.options,t)},o.Class.addInitHook=function(t){var e=Array.prototype.slice.call(arguments,1),i="function"==typeof t?t:function(){this[t].apply(this,e)};this.prototype._initHooks=this.prototype._initHooks||[],this.prototype._initHooks.push(i)};var s="_leaflet_events";o.Mixin={},o.Mixin.Events={addEventListener:function(t,e,i){if(o.Util.invokeEach(t,this.addEventListener,this,e,i))return this;var n,a,r,h,l,u,c,d=this[s]=this[s]||{},p=i&&i!==this&&o.stamp(i);for(t=o.Util.splitWords(t),n=0,a=t.length;a>n;n++)r={action:e,context:i||this},h=t[n],p?(l=h+"_idx",u=l+"_len",c=d[l]=d[l]||{},c[p]||(c[p]=[],d[u]=(d[u]||0)+1),c[p].push(r)):(d[h]=d[h]||[],d[h].push(r));return this},hasEventListeners:function(t){var e=this[s];return!!e&&(t in e&&e[t].length>0||t+"_idx"in e&&e[t+"_idx_len"]>0)},removeEventListener:function(t,e,i){if(!this[s])return this;if(!t)return this.clearAllEventListeners();if(o.Util.invokeEach(t,this.removeEventListener,this,e,i))return this;var n,a,r,h,l,u,c,d,p,_=this[s],m=i&&i!==this&&o.stamp(i);for(t=o.Util.splitWords(t),n=0,a=t.length;a>n;n++)if(r=t[n],u=r+"_idx",c=u+"_len",d=_[u],e){if(h=m&&d?d[m]:_[r]){for(l=h.length-1;l>=0;l--)h[l].action!==e||i&&h[l].context!==i||(p=h.splice(l,1),p[0].action=o.Util.falseFn);i&&d&&0===h.length&&(delete d[m],_[c]--)}}else delete _[r],delete _[u],delete _[c];return this},clearAllEventListeners:function(){return delete this[s],this},fireEvent:function(t,e){if(!this.hasEventListeners(t))return this;var i,n,a,r,h,l=o.Util.extend({},e,{type:t,target:this}),u=this[s];if(u[t])for(i=u[t].slice(),n=0,a=i.length;a>n;n++)i[n].action.call(i[n].context,l);r=u[t+"_idx"];for(h in r)if(i=r[h].slice())for(n=0,a=i.length;a>n;n++)i[n].action.call(i[n].context,l);return this},addOneTimeEventListener:function(t,e,i){if(o.Util.invokeEach(t,this.addOneTimeEventListener,this,e,i))return this;var n=o.bind(function(){this.removeEventListener(t,e,i).removeEventListener(t,n,i)},this);return this.addEventListener(t,e,i).addEventListener(t,n,i)}},o.Mixin.Events.on=o.Mixin.Events.addEventListener,o.Mixin.Events.off=o.Mixin.Events.removeEventListener,o.Mixin.Events.once=o.Mixin.Events.addOneTimeEventListener,o.Mixin.Events.fire=o.Mixin.Events.fireEvent,function(){var n="ActiveXObject"in t,s=n&&!e.addEventListener,a=navigator.userAgent.toLowerCase(),r=-1!==a.indexOf("webkit"),h=-1!==a.indexOf("chrome"),l=-1!==a.indexOf("phantom"),u=-1!==a.indexOf("android"),c=-1!==a.search("android [23]"),d=-1!==a.indexOf("gecko"),p=typeof orientation!=i+"",_=t.navigator&&t.navigator.msPointerEnabled&&t.navigator.msMaxTouchPoints&&!t.PointerEvent,m=t.PointerEvent&&t.navigator.pointerEnabled&&t.navigator.maxTouchPoints||_,f="devicePixelRatio"in t&&t.devicePixelRatio>1||"matchMedia"in t&&t.matchMedia("(min-resolution:144dpi)")&&t.matchMedia("(min-resolution:144dpi)").matches,g=e.documentElement,v=n&&"transition"in g.style,y="WebKitCSSMatrix"in t&&"m11"in new t.WebKitCSSMatrix&&!c,P="MozPerspective"in g.style,L="OTransition"in g.style,x=!t.L_DISABLE_3D&&(v||y||P||L)&&!l,w=!t.L_NO_TOUCH&&!l&&function(){var t="ontouchstart";if(m||t in g)return!0;var i=e.createElement("div"),n=!1;return i.setAttribute?(i.setAttribute(t,"return;"),"function"==typeof i[t]&&(n=!0),i.removeAttribute(t),i=null,n):!1}();o.Browser={ie:n,ielt9:s,webkit:r,gecko:d&&!r&&!t.opera&&!n,android:u,android23:c,chrome:h,ie3d:v,webkit3d:y,gecko3d:P,opera3d:L,any3d:x,mobile:p,mobileWebkit:p&&r,mobileWebkit3d:p&&y,mobileOpera:p&&t.opera,touch:w,msPointer:_,pointer:m,retina:f}}(),o.Point=function(t,e,i){this.x=i?Math.round(t):t,this.y=i?Math.round(e):e},o.Point.prototype={clone:function(){return new o.Point(this.x,this.y)},add:function(t){return this.clone()._add(o.point(t))},_add:function(t){return this.x+=t.x,this.y+=t.y,this},subtract:function(t){return this.clone()._subtract(o.point(t))},_subtract:function(t){return this.x-=t.x,this.y-=t.y,this},divideBy:function(t){return this.clone()._divideBy(t)},_divideBy:function(t){return this.x/=t,this.y/=t,this},multiplyBy:function(t){return this.clone()._multiplyBy(t)},_multiplyBy:function(t){return this.x*=t,this.y*=t,this},round:function(){return this.clone()._round()},_round:function(){return this.x=Math.round(this.x),this.y=Math.round(this.y),this},floor:function(){return this.clone()._floor()},_floor:function(){return this.x=Math.floor(this.x),this.y=Math.floor(this.y),this},distanceTo:function(t){t=o.point(t);var e=t.x-this.x,i=t.y-this.y;return Math.sqrt(e*e+i*i)},equals:function(t){return t=o.point(t),t.x===this.x&&t.y===this.y},contains:function(t){return t=o.point(t),Math.abs(t.x)<=Math.abs(this.x)&&Math.abs(t.y)<=Math.abs(this.y)},toString:function(){return"Point("+o.Util.formatNum(this.x)+", "+o.Util.formatNum(this.y)+")"}},o.point=function(t,e,n){return t instanceof o.Point?t:o.Util.isArray(t)?new o.Point(t[0],t[1]):t===i||null===t?t:new o.Point(t,e,n)},o.Bounds=function(t,e){if(t)for(var i=e?[t,e]:t,n=0,o=i.length;o>n;n++)this.extend(i[n])},o.Bounds.prototype={extend:function(t){return t=o.point(t),this.min||this.max?(this.min.x=Math.min(t.x,this.min.x),this.max.x=Math.max(t.x,this.max.x),this.min.y=Math.min(t.y,this.min.y),this.max.y=Math.max(t.y,this.max.y)):(this.min=t.clone(),this.max=t.clone()),this},getCenter:function(t){return new o.Point((this.min.x+this.max.x)/2,(this.min.y+this.max.y)/2,t)},getBottomLeft:function(){return new o.Point(this.min.x,this.max.y)},getTopRight:function(){return new o.Point(this.max.x,this.min.y)},getSize:function(){return this.max.subtract(this.min)},contains:function(t){var e,i;return t="number"==typeof t[0]||t instanceof o.Point?o.point(t):o.bounds(t),t instanceof o.Bounds?(e=t.min,i=t.max):e=i=t,e.x>=this.min.x&&i.x<=this.max.x&&e.y>=this.min.y&&i.y<=this.max.y},intersects:function(t){t=o.bounds(t);var e=this.min,i=this.max,n=t.min,s=t.max,a=s.x>=e.x&&n.x<=i.x,r=s.y>=e.y&&n.y<=i.y;return a&&r},isValid:function(){return!(!this.min||!this.max)}},o.bounds=function(t,e){return!t||t instanceof o.Bounds?t:new o.Bounds(t,e)},o.Transformation=function(t,e,i,n){this._a=t,this._b=e,this._c=i,this._d=n},o.Transformation.prototype={transform:function(t,e){return this._transform(t.clone(),e)},_transform:function(t,e){return e=e||1,t.x=e*(this._a*t.x+this._b),t.y=e*(this._c*t.y+this._d),t},untransform:function(t,e){return e=e||1,new o.Point((t.x/e-this._b)/this._a,(t.y/e-this._d)/this._c)}},o.DomUtil={get:function(t){return"string"==typeof t?e.getElementById(t):t},getStyle:function(t,i){var n=t.style[i];if(!n&&t.currentStyle&&(n=t.currentStyle[i]),(!n||"auto"===n)&&e.defaultView){var o=e.defaultView.getComputedStyle(t,null);n=o?o[i]:null}return"auto"===n?null:n},getViewportOffset:function(t){var i,n=0,s=0,a=t,r=e.body,h=e.documentElement;do{if(n+=a.offsetTop||0,s+=a.offsetLeft||0,n+=parseInt(o.DomUtil.getStyle(a,"borderTopWidth"),10)||0,s+=parseInt(o.DomUtil.getStyle(a,"borderLeftWidth"),10)||0,i=o.DomUtil.getStyle(a,"position"),a.offsetParent===r&&"absolute"===i)break;if("fixed"===i){n+=r.scrollTop||h.scrollTop||0,s+=r.scrollLeft||h.scrollLeft||0;break}if("relative"===i&&!a.offsetLeft){var l=o.DomUtil.getStyle(a,"width"),u=o.DomUtil.getStyle(a,"max-width"),c=a.getBoundingClientRect();("none"!==l||"none"!==u)&&(s+=c.left+a.clientLeft),n+=c.top+(r.scrollTop||h.scrollTop||0);break}a=a.offsetParent}while(a);a=t;do{if(a===r)break;n-=a.scrollTop||0,s-=a.scrollLeft||0,a=a.parentNode}while(a);return new o.Point(s,n)},documentIsLtr:function(){return o.DomUtil._docIsLtrCached||(o.DomUtil._docIsLtrCached=!0,o.DomUtil._docIsLtr="ltr"===o.DomUtil.getStyle(e.body,"direction")),o.DomUtil._docIsLtr},create:function(t,i,n){var o=e.createElement(t);return o.className=i,n&&n.appendChild(o),o},hasClass:function(t,e){if(t.classList!==i)return t.classList.contains(e);var n=o.DomUtil._getClass(t);return n.length>0&&new RegExp("(^|\\s)"+e+"(\\s|$)").test(n)},addClass:function(t,e){if(t.classList!==i)for(var n=o.Util.splitWords(e),s=0,a=n.length;a>s;s++)t.classList.add(n[s]);else if(!o.DomUtil.hasClass(t,e)){var r=o.DomUtil._getClass(t);o.DomUtil._setClass(t,(r?r+" ":"")+e)}},removeClass:function(t,e){t.classList!==i?t.classList.remove(e):o.DomUtil._setClass(t,o.Util.trim((" "+o.DomUtil._getClass(t)+" ").replace(" "+e+" "," ")))},_setClass:function(t,e){t.className.baseVal===i?t.className=e:t.className.baseVal=e},_getClass:function(t){return t.className.baseVal===i?t.className:t.className.baseVal},setOpacity:function(t,e){if("opacity"in t.style)t.style.opacity=e;else if("filter"in t.style){var i=!1,n="DXImageTransform.Microsoft.Alpha";try{i=t.filters.item(n)}catch(o){if(1===e)return}e=Math.round(100*e),i?(i.Enabled=100!==e,i.Opacity=e):t.style.filter+=" progid:"+n+"(opacity="+e+")"}},testProp:function(t){for(var i=e.documentElement.style,n=0;n<t.length;n++)if(t[n]in i)return t[n];return!1},getTranslateString:function(t){var e=o.Browser.webkit3d,i="translate"+(e?"3d":"")+"(",n=(e?",0":"")+")";return i+t.x+"px,"+t.y+"px"+n},getScaleString:function(t,e){var i=o.DomUtil.getTranslateString(e.add(e.multiplyBy(-1*t))),n=" scale("+t+") ";return i+n},setPosition:function(t,e,i){t._leaflet_pos=e,!i&&o.Browser.any3d?t.style[o.DomUtil.TRANSFORM]=o.DomUtil.getTranslateString(e):(t.style.left=e.x+"px",t.style.top=e.y+"px")},getPosition:function(t){return t._leaflet_pos}},o.DomUtil.TRANSFORM=o.DomUtil.testProp(["transform","WebkitTransform","OTransform","MozTransform","msTransform"]),o.DomUtil.TRANSITION=o.DomUtil.testProp(["webkitTransition","transition","OTransition","MozTransition","msTransition"]),o.DomUtil.TRANSITION_END="webkitTransition"===o.DomUtil.TRANSITION||"OTransition"===o.DomUtil.TRANSITION?o.DomUtil.TRANSITION+"End":"transitionend",function(){if("onselectstart"in e)o.extend(o.DomUtil,{disableTextSelection:function(){o.DomEvent.on(t,"selectstart",o.DomEvent.preventDefault)},enableTextSelection:function(){o.DomEvent.off(t,"selectstart",o.DomEvent.preventDefault)}});else{var i=o.DomUtil.testProp(["userSelect","WebkitUserSelect","OUserSelect","MozUserSelect","msUserSelect"]);o.extend(o.DomUtil,{disableTextSelection:function(){if(i){var t=e.documentElement.style;this._userSelect=t[i],t[i]="none"}},enableTextSelection:function(){i&&(e.documentElement.style[i]=this._userSelect,delete this._userSelect)}})}o.extend(o.DomUtil,{disableImageDrag:function(){o.DomEvent.on(t,"dragstart",o.DomEvent.preventDefault)},enableImageDrag:function(){o.DomEvent.off(t,"dragstart",o.DomEvent.preventDefault)}})}(),o.LatLng=function(t,e,n){if(t=parseFloat(t),e=parseFloat(e),isNaN(t)||isNaN(e))throw new Error("Invalid LatLng object: ("+t+", "+e+")");this.lat=t,this.lng=e,n!==i&&(this.alt=parseFloat(n))},o.extend(o.LatLng,{DEG_TO_RAD:Math.PI/180,RAD_TO_DEG:180/Math.PI,MAX_MARGIN:1e-9}),o.LatLng.prototype={equals:function(t){if(!t)return!1;t=o.latLng(t);var e=Math.max(Math.abs(this.lat-t.lat),Math.abs(this.lng-t.lng));return e<=o.LatLng.MAX_MARGIN},toString:function(t){return"LatLng("+o.Util.formatNum(this.lat,t)+", "+o.Util.formatNum(this.lng,t)+")"},distanceTo:function(t){t=o.latLng(t);var e=6378137,i=o.LatLng.DEG_TO_RAD,n=(t.lat-this.lat)*i,s=(t.lng-this.lng)*i,a=this.lat*i,r=t.lat*i,h=Math.sin(n/2),l=Math.sin(s/2),u=h*h+l*l*Math.cos(a)*Math.cos(r);return 2*e*Math.atan2(Math.sqrt(u),Math.sqrt(1-u))},wrap:function(t,e){var i=this.lng;return t=t||-180,e=e||180,i=(i+e)%(e-t)+(t>i||i===e?e:t),new o.LatLng(this.lat,i)}},o.latLng=function(t,e){return t instanceof o.LatLng?t:o.Util.isArray(t)?"number"==typeof t[0]||"string"==typeof t[0]?new o.LatLng(t[0],t[1],t[2]):null:t===i||null===t?t:"object"==typeof t&&"lat"in t?new o.LatLng(t.lat,"lng"in t?t.lng:t.lon):e===i?null:new o.LatLng(t,e)},o.LatLngBounds=function(t,e){if(t)for(var i=e?[t,e]:t,n=0,o=i.length;o>n;n++)this.extend(i[n])},o.LatLngBounds.prototype={extend:function(t){if(!t)return this;var e=o.latLng(t);return t=null!==e?e:o.latLngBounds(t),t instanceof o.LatLng?this._southWest||this._northEast?(this._southWest.lat=Math.min(t.lat,this._southWest.lat),this._southWest.lng=Math.min(t.lng,this._southWest.lng),this._northEast.lat=Math.max(t.lat,this._northEast.lat),this._northEast.lng=Math.max(t.lng,this._northEast.lng)):(this._southWest=new o.LatLng(t.lat,t.lng),this._northEast=new o.LatLng(t.lat,t.lng)):t instanceof o.LatLngBounds&&(this.extend(t._southWest),this.extend(t._northEast)),this},pad:function(t){var e=this._southWest,i=this._northEast,n=Math.abs(e.lat-i.lat)*t,s=Math.abs(e.lng-i.lng)*t;return new o.LatLngBounds(new o.LatLng(e.lat-n,e.lng-s),new o.LatLng(i.lat+n,i.lng+s))},getCenter:function(){return new o.LatLng((this._southWest.lat+this._northEast.lat)/2,(this._southWest.lng+this._northEast.lng)/2)},getSouthWest:function(){return this._southWest},getNorthEast:function(){return this._northEast},getNorthWest:function(){return new o.LatLng(this.getNorth(),this.getWest())},getSouthEast:function(){return new o.LatLng(this.getSouth(),this.getEast())},getWest:function(){return this._southWest.lng},getSouth:function(){return this._southWest.lat},getEast:function(){return this._northEast.lng},getNorth:function(){return this._northEast.lat},contains:function(t){t="number"==typeof t[0]||t instanceof o.LatLng?o.latLng(t):o.latLngBounds(t);var e,i,n=this._southWest,s=this._northEast;return t instanceof o.LatLngBounds?(e=t.getSouthWest(),i=t.getNorthEast()):e=i=t,e.lat>=n.lat&&i.lat<=s.lat&&e.lng>=n.lng&&i.lng<=s.lng},intersects:function(t){t=o.latLngBounds(t);var e=this._southWest,i=this._northEast,n=t.getSouthWest(),s=t.getNorthEast(),a=s.lat>=e.lat&&n.lat<=i.lat,r=s.lng>=e.lng&&n.lng<=i.lng;return a&&r},toBBoxString:function(){return[this.getWest(),this.getSouth(),this.getEast(),this.getNorth()].join(",")},equals:function(t){return t?(t=o.latLngBounds(t),this._southWest.equals(t.getSouthWest())&&this._northEast.equals(t.getNorthEast())):!1},isValid:function(){return!(!this._southWest||!this._northEast)}},o.latLngBounds=function(t,e){return!t||t instanceof o.LatLngBounds?t:new o.LatLngBounds(t,e)},o.Projection={},o.Projection.SphericalMercator={MAX_LATITUDE:85.0511287798,project:function(t){var e=o.LatLng.DEG_TO_RAD,i=this.MAX_LATITUDE,n=Math.max(Math.min(i,t.lat),-i),s=t.lng*e,a=n*e;return a=Math.log(Math.tan(Math.PI/4+a/2)),new o.Point(s,a)},unproject:function(t){var e=o.LatLng.RAD_TO_DEG,i=t.x*e,n=(2*Math.atan(Math.exp(t.y))-Math.PI/2)*e;return new o.LatLng(n,i)}},o.Projection.LonLat={project:function(t){return new o.Point(t.lng,t.lat)},unproject:function(t){return new o.LatLng(t.y,t.x)}},o.CRS={latLngToPoint:function(t,e){var i=this.projection.project(t),n=this.scale(e);return this.transformation._transform(i,n)},pointToLatLng:function(t,e){var i=this.scale(e),n=this.transformation.untransform(t,i);return this.projection.unproject(n)},project:function(t){return this.projection.project(t)},scale:function(t){return 256*Math.pow(2,t)},getSize:function(t){var e=this.scale(t);return o.point(e,e)}},o.CRS.Simple=o.extend({},o.CRS,{projection:o.Projection.LonLat,transformation:new o.Transformation(1,0,-1,0),scale:function(t){return Math.pow(2,t)}}),o.CRS.EPSG3857=o.extend({},o.CRS,{code:"EPSG:3857",projection:o.Projection.SphericalMercator,transformation:new o.Transformation(.5/Math.PI,.5,-.5/Math.PI,.5),project:function(t){var e=this.projection.project(t),i=6378137;return e.multiplyBy(i)}}),o.CRS.EPSG900913=o.extend({},o.CRS.EPSG3857,{code:"EPSG:900913"}),o.CRS.EPSG4326=o.extend({},o.CRS,{code:"EPSG:4326",projection:o.Projection.LonLat,transformation:new o.Transformation(1/360,.5,-1/360,.5)}),o.Map=o.Class.extend({includes:o.Mixin.Events,options:{crs:o.CRS.EPSG3857,fadeAnimation:o.DomUtil.TRANSITION&&!o.Browser.android23,trackResize:!0,markerZoomAnimation:o.DomUtil.TRANSITION&&o.Browser.any3d},initialize:function(t,e){e=o.setOptions(this,e),this._initContainer(t),this._initLayout(),this._onResize=o.bind(this._onResize,this),this._initEvents(),e.maxBounds&&this.setMaxBounds(e.maxBounds),e.center&&e.zoom!==i&&this.setView(o.latLng(e.center),e.zoom,{reset:!0}),this._handlers=[],this._layers={},this._zoomBoundLayers={},this._tileLayersNum=0,this.callInitHooks(),this._addLayers(e.layers)},setView:function(t,e){return e=e===i?this.getZoom():e,this._resetView(o.latLng(t),this._limitZoom(e)),this},setZoom:function(t,e){return this._loaded?this.setView(this.getCenter(),t,{zoom:e}):(this._zoom=this._limitZoom(t),this)},zoomIn:function(t,e){return this.setZoom(this._zoom+(t||1),e)},zoomOut:function(t,e){return this.setZoom(this._zoom-(t||1),e)},setZoomAround:function(t,e,i){var n=this.getZoomScale(e),s=this.getSize().divideBy(2),a=t instanceof o.Point?t:this.latLngToContainerPoint(t),r=a.subtract(s).multiplyBy(1-1/n),h=this.containerPointToLatLng(s.add(r));return this.setView(h,e,{zoom:i})},fitBounds:function(t,e){e=e||{},t=t.getBounds?t.getBounds():o.latLngBounds(t);var i=o.point(e.paddingTopLeft||e.padding||[0,0]),n=o.point(e.paddingBottomRight||e.padding||[0,0]),s=this.getBoundsZoom(t,!1,i.add(n)),a=n.subtract(i).divideBy(2),r=this.project(t.getSouthWest(),s),h=this.project(t.getNorthEast(),s),l=this.unproject(r.add(h).divideBy(2).add(a),s);return s=e&&e.maxZoom?Math.min(e.maxZoom,s):s,this.setView(l,s,e)},fitWorld:function(t){return this.fitBounds([[-90,-180],[90,180]],t)},panTo:function(t,e){return this.setView(t,this._zoom,{pan:e})},panBy:function(t){return this.fire("movestart"),this._rawPanBy(o.point(t)),this.fire("move"),this.fire("moveend")},setMaxBounds:function(t){return t=o.latLngBounds(t),this.options.maxBounds=t,t?(this._loaded&&this._panInsideMaxBounds(),this.on("moveend",this._panInsideMaxBounds,this)):this.off("moveend",this._panInsideMaxBounds,this)},panInsideBounds:function(t,e){var i=this.getCenter(),n=this._limitCenter(i,this._zoom,t);return i.equals(n)?this:this.panTo(n,e)},addLayer:function(t){var e=o.stamp(t);return this._layers[e]?this:(this._layers[e]=t,!t.options||isNaN(t.options.maxZoom)&&isNaN(t.options.minZoom)||(this._zoomBoundLayers[e]=t,this._updateZoomLevels()),this.options.zoomAnimation&&o.TileLayer&&t instanceof o.TileLayer&&(this._tileLayersNum++,this._tileLayersToLoad++,t.on("load",this._onTileLayerLoad,this)),this._loaded&&this._layerAdd(t),this)},removeLayer:function(t){var e=o.stamp(t);return this._layers[e]?(this._loaded&&t.onRemove(this),delete this._layers[e],this._loaded&&this.fire("layerremove",{layer:t}),this._zoomBoundLayers[e]&&(delete this._zoomBoundLayers[e],this._updateZoomLevels()),this.options.zoomAnimation&&o.TileLayer&&t instanceof o.TileLayer&&(this._tileLayersNum--,this._tileLayersToLoad--,t.off("load",this._onTileLayerLoad,this)),this):this},hasLayer:function(t){return t?o.stamp(t)in this._layers:!1},eachLayer:function(t,e){for(var i in this._layers)t.call(e,this._layers[i]);return this},invalidateSize:function(t){if(!this._loaded)return this;t=o.extend({animate:!1,pan:!0},t===!0?{animate:!0}:t);var e=this.getSize();this._sizeChanged=!0,this._initialCenter=null;var i=this.getSize(),n=e.divideBy(2).round(),s=i.divideBy(2).round(),a=n.subtract(s);return a.x||a.y?(t.animate&&t.pan?this.panBy(a):(t.pan&&this._rawPanBy(a),this.fire("move"),t.debounceMoveend?(clearTimeout(this._sizeTimer),this._sizeTimer=setTimeout(o.bind(this.fire,this,"moveend"),200)):this.fire("moveend")),this.fire("resize",{oldSize:e,newSize:i})):this},addHandler:function(t,e){if(!e)return this;var i=this[t]=new e(this);return this._handlers.push(i),this.options[t]&&i.enable(),this},remove:function(){this._loaded&&this.fire("unload"),this._initEvents("off");try{delete this._container._leaflet}catch(t){this._container._leaflet=i}return this._clearPanes(),this._clearControlPos&&this._clearControlPos(),this._clearHandlers(),this},getCenter:function(){return this._checkIfLoaded(),this._initialCenter&&!this._moved()?this._initialCenter:this.layerPointToLatLng(this._getCenterLayerPoint())},getZoom:function(){return this._zoom},getBounds:function(){var t=this.getPixelBounds(),e=this.unproject(t.getBottomLeft()),i=this.unproject(t.getTopRight());return new o.LatLngBounds(e,i)},getMinZoom:function(){return this.options.minZoom===i?this._layersMinZoom===i?0:this._layersMinZoom:this.options.minZoom},getMaxZoom:function(){return this.options.maxZoom===i?this._layersMaxZoom===i?1/0:this._layersMaxZoom:this.options.maxZoom},getBoundsZoom:function(t,e,i){t=o.latLngBounds(t);var n,s=this.getMinZoom()-(e?1:0),a=this.getMaxZoom(),r=this.getSize(),h=t.getNorthWest(),l=t.getSouthEast(),u=!0;i=o.point(i||[0,0]);do s++,n=this.project(l,s).subtract(this.project(h,s)).add(i),u=e?n.x<r.x||n.y<r.y:r.contains(n);while(u&&a>=s);return u&&e?null:e?s:s-1},getSize:function(){return(!this._size||this._sizeChanged)&&(this._size=new o.Point(this._container.clientWidth,this._container.clientHeight),this._sizeChanged=!1),this._size.clone()},getPixelBounds:function(){var t=this._getTopLeftPoint();return new o.Bounds(t,t.add(this.getSize()))},getPixelOrigin:function(){return this._checkIfLoaded(),this._initialTopLeftPoint},getPanes:function(){return this._panes},getContainer:function(){return this._container},getZoomScale:function(t){var e=this.options.crs;return e.scale(t)/e.scale(this._zoom)},getScaleZoom:function(t){return this._zoom+Math.log(t)/Math.LN2},project:function(t,e){return e=e===i?this._zoom:e,this.options.crs.latLngToPoint(o.latLng(t),e)},unproject:function(t,e){return e=e===i?this._zoom:e,this.options.crs.pointToLatLng(o.point(t),e)},layerPointToLatLng:function(t){var e=o.point(t).add(this.getPixelOrigin());return this.unproject(e)},latLngToLayerPoint:function(t){var e=this.project(o.latLng(t))._round();return e._subtract(this.getPixelOrigin())},containerPointToLayerPoint:function(t){return o.point(t).subtract(this._getMapPanePos())},layerPointToContainerPoint:function(t){return o.point(t).add(this._getMapPanePos())},containerPointToLatLng:function(t){var e=this.containerPointToLayerPoint(o.point(t));return this.layerPointToLatLng(e)},latLngToContainerPoint:function(t){return this.layerPointToContainerPoint(this.latLngToLayerPoint(o.latLng(t)))},mouseEventToContainerPoint:function(t){return o.DomEvent.getMousePosition(t,this._container)},mouseEventToLayerPoint:function(t){return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(t))},mouseEventToLatLng:function(t){return this.layerPointToLatLng(this.mouseEventToLayerPoint(t))},_initContainer:function(t){var e=this._container=o.DomUtil.get(t);if(!e)throw new Error("Map container not found.");if(e._leaflet)throw new Error("Map container is already initialized.");e._leaflet=!0},_initLayout:function(){var t=this._container;o.DomUtil.addClass(t,"leaflet-container"+(o.Browser.touch?" leaflet-touch":"")+(o.Browser.retina?" leaflet-retina":"")+(o.Browser.ielt9?" leaflet-oldie":"")+(this.options.fadeAnimation?" leaflet-fade-anim":""));var e=o.DomUtil.getStyle(t,"position");"absolute"!==e&&"relative"!==e&&"fixed"!==e&&(t.style.position="relative"),this._initPanes(),this._initControlPos&&this._initControlPos()},_initPanes:function(){var t=this._panes={};this._mapPane=t.mapPane=this._createPane("leaflet-map-pane",this._container),this._tilePane=t.tilePane=this._createPane("leaflet-tile-pane",this._mapPane),t.objectsPane=this._createPane("leaflet-objects-pane",this._mapPane),t.shadowPane=this._createPane("leaflet-shadow-pane"),t.overlayPane=this._createPane("leaflet-overlay-pane"),t.markerPane=this._createPane("leaflet-marker-pane"),t.popupPane=this._createPane("leaflet-popup-pane");var e=" leaflet-zoom-hide";this.options.markerZoomAnimation||(o.DomUtil.addClass(t.markerPane,e),o.DomUtil.addClass(t.shadowPane,e),o.DomUtil.addClass(t.popupPane,e))},_createPane:function(t,e){return o.DomUtil.create("div",t,e||this._panes.objectsPane)},_clearPanes:function(){this._container.removeChild(this._mapPane)},_addLayers:function(t){t=t?o.Util.isArray(t)?t:[t]:[];for(var e=0,i=t.length;i>e;e++)this.addLayer(t[e])},_resetView:function(t,e,i,n){var s=this._zoom!==e;n||(this.fire("movestart"),s&&this.fire("zoomstart")),this._zoom=e,this._initialCenter=t,this._initialTopLeftPoint=this._getNewTopLeftPoint(t),i?this._initialTopLeftPoint._add(this._getMapPanePos()):o.DomUtil.setPosition(this._mapPane,new o.Point(0,0)),this._tileLayersToLoad=this._tileLayersNum;var a=!this._loaded;this._loaded=!0,this.fire("viewreset",{hard:!i}),a&&(this.fire("load"),this.eachLayer(this._layerAdd,this)),this.fire("move"),(s||n)&&this.fire("zoomend"),this.fire("moveend",{hard:!i})},_rawPanBy:function(t){o.DomUtil.setPosition(this._mapPane,this._getMapPanePos().subtract(t))},_getZoomSpan:function(){return this.getMaxZoom()-this.getMinZoom()},_updateZoomLevels:function(){var t,e=1/0,n=-1/0,o=this._getZoomSpan();for(t in this._zoomBoundLayers){var s=this._zoomBoundLayers[t];isNaN(s.options.minZoom)||(e=Math.min(e,s.options.minZoom)),isNaN(s.options.maxZoom)||(n=Math.max(n,s.options.maxZoom))}t===i?this._layersMaxZoom=this._layersMinZoom=i:(this._layersMaxZoom=n,this._layersMinZoom=e),o!==this._getZoomSpan()&&this.fire("zoomlevelschange")},_panInsideMaxBounds:function(){this.panInsideBounds(this.options.maxBounds)},_checkIfLoaded:function(){if(!this._loaded)throw new Error("Set map center and zoom first.")},_initEvents:function(e){if(o.DomEvent){e=e||"on",o.DomEvent[e](this._container,"click",this._onMouseClick,this);var i,n,s=["dblclick","mousedown","mouseup","mouseenter","mouseleave","mousemove","contextmenu"];for(i=0,n=s.length;n>i;i++)o.DomEvent[e](this._container,s[i],this._fireMouseEvent,this);this.options.trackResize&&o.DomEvent[e](t,"resize",this._onResize,this)}},_onResize:function(){o.Util.cancelAnimFrame(this._resizeRequest),this._resizeRequest=o.Util.requestAnimFrame(function(){this.invalidateSize({debounceMoveend:!0})},this,!1,this._container)},_onMouseClick:function(t){!this._loaded||!t._simulated&&(this.dragging&&this.dragging.moved()||this.boxZoom&&this.boxZoom.moved())||o.DomEvent._skipped(t)||(this.fire("preclick"),this._fireMouseEvent(t))},_fireMouseEvent:function(t){if(this._loaded&&!o.DomEvent._skipped(t)){var e=t.type;if(e="mouseenter"===e?"mouseover":"mouseleave"===e?"mouseout":e,this.hasEventListeners(e)){"contextmenu"===e&&o.DomEvent.preventDefault(t);var i=this.mouseEventToContainerPoint(t),n=this.containerPointToLayerPoint(i),s=this.layerPointToLatLng(n);this.fire(e,{latlng:s,layerPoint:n,containerPoint:i,originalEvent:t})}}},_onTileLayerLoad:function(){this._tileLayersToLoad--,this._tileLayersNum&&!this._tileLayersToLoad&&this.fire("tilelayersload")},_clearHandlers:function(){for(var t=0,e=this._handlers.length;e>t;t++)this._handlers[t].disable()},whenReady:function(t,e){return this._loaded?t.call(e||this,this):this.on("load",t,e),this},_layerAdd:function(t){t.onAdd(this),this.fire("layeradd",{layer:t})},_getMapPanePos:function(){return o.DomUtil.getPosition(this._mapPane)},_moved:function(){var t=this._getMapPanePos();return t&&!t.equals([0,0])},_getTopLeftPoint:function(){return this.getPixelOrigin().subtract(this._getMapPanePos())},_getNewTopLeftPoint:function(t,e){var i=this.getSize()._divideBy(2);return this.project(t,e)._subtract(i)._round()},_latLngToNewLayerPoint:function(t,e,i){var n=this._getNewTopLeftPoint(i,e).add(this._getMapPanePos());return this.project(t,e)._subtract(n)},_getCenterLayerPoint:function(){return this.containerPointToLayerPoint(this.getSize()._divideBy(2))},_getCenterOffset:function(t){return this.latLngToLayerPoint(t).subtract(this._getCenterLayerPoint())},_limitCenter:function(t,e,i){if(!i)return t;var n=this.project(t,e),s=this.getSize().divideBy(2),a=new o.Bounds(n.subtract(s),n.add(s)),r=this._getBoundsOffset(a,i,e);return this.unproject(n.add(r),e)},_limitOffset:function(t,e){if(!e)return t;var i=this.getPixelBounds(),n=new o.Bounds(i.min.add(t),i.max.add(t));return t.add(this._getBoundsOffset(n,e))},_getBoundsOffset:function(t,e,i){var n=this.project(e.getNorthWest(),i).subtract(t.min),s=this.project(e.getSouthEast(),i).subtract(t.max),a=this._rebound(n.x,-s.x),r=this._rebound(n.y,-s.y);return new o.Point(a,r)},_rebound:function(t,e){return t+e>0?Math.round(t-e)/2:Math.max(0,Math.ceil(t))-Math.max(0,Math.floor(e))},_limitZoom:function(t){var e=this.getMinZoom(),i=this.getMaxZoom();return Math.max(e,Math.min(i,t))}}),o.map=function(t,e){return new o.Map(t,e)},o.Projection.Mercator={MAX_LATITUDE:85.0840591556,R_MINOR:6356752.314245179,R_MAJOR:6378137,project:function(t){var e=o.LatLng.DEG_TO_RAD,i=this.MAX_LATITUDE,n=Math.max(Math.min(i,t.lat),-i),s=this.R_MAJOR,a=this.R_MINOR,r=t.lng*e*s,h=n*e,l=a/s,u=Math.sqrt(1-l*l),c=u*Math.sin(h);c=Math.pow((1-c)/(1+c),.5*u);var d=Math.tan(.5*(.5*Math.PI-h))/c;return h=-s*Math.log(d),new o.Point(r,h)},unproject:function(t){for(var e,i=o.LatLng.RAD_TO_DEG,n=this.R_MAJOR,s=this.R_MINOR,a=t.x*i/n,r=s/n,h=Math.sqrt(1-r*r),l=Math.exp(-t.y/n),u=Math.PI/2-2*Math.atan(l),c=15,d=1e-7,p=c,_=.1;Math.abs(_)>d&&--p>0;)e=h*Math.sin(u),_=Math.PI/2-2*Math.atan(l*Math.pow((1-e)/(1+e),.5*h))-u,u+=_; -return new o.LatLng(u*i,a)}},o.CRS.EPSG3395=o.extend({},o.CRS,{code:"EPSG:3395",projection:o.Projection.Mercator,transformation:function(){var t=o.Projection.Mercator,e=t.R_MAJOR,i=.5/(Math.PI*e);return new o.Transformation(i,.5,-i,.5)}()}),o.TileLayer=o.Class.extend({includes:o.Mixin.Events,options:{minZoom:0,maxZoom:18,tileSize:256,subdomains:"abc",errorTileUrl:"",attribution:"",zoomOffset:0,opacity:1,unloadInvisibleTiles:o.Browser.mobile,updateWhenIdle:o.Browser.mobile},initialize:function(t,e){e=o.setOptions(this,e),e.detectRetina&&o.Browser.retina&&e.maxZoom>0&&(e.tileSize=Math.floor(e.tileSize/2),e.zoomOffset++,e.minZoom>0&&e.minZoom--,this.options.maxZoom--),e.bounds&&(e.bounds=o.latLngBounds(e.bounds)),this._url=t;var i=this.options.subdomains;"string"==typeof i&&(this.options.subdomains=i.split(""))},onAdd:function(t){this._map=t,this._animated=t._zoomAnimated,this._initContainer(),t.on({viewreset:this._reset,moveend:this._update},this),this._animated&&t.on({zoomanim:this._animateZoom,zoomend:this._endZoomAnim},this),this.options.updateWhenIdle||(this._limitedUpdate=o.Util.limitExecByInterval(this._update,150,this),t.on("move",this._limitedUpdate,this)),this._reset(),this._update()},addTo:function(t){return t.addLayer(this),this},onRemove:function(t){this._container.parentNode.removeChild(this._container),t.off({viewreset:this._reset,moveend:this._update},this),this._animated&&t.off({zoomanim:this._animateZoom,zoomend:this._endZoomAnim},this),this.options.updateWhenIdle||t.off("move",this._limitedUpdate,this),this._container=null,this._map=null},bringToFront:function(){var t=this._map._panes.tilePane;return this._container&&(t.appendChild(this._container),this._setAutoZIndex(t,Math.max)),this},bringToBack:function(){var t=this._map._panes.tilePane;return this._container&&(t.insertBefore(this._container,t.firstChild),this._setAutoZIndex(t,Math.min)),this},getAttribution:function(){return this.options.attribution},getContainer:function(){return this._container},setOpacity:function(t){return this.options.opacity=t,this._map&&this._updateOpacity(),this},setZIndex:function(t){return this.options.zIndex=t,this._updateZIndex(),this},setUrl:function(t,e){return this._url=t,e||this.redraw(),this},redraw:function(){return this._map&&(this._reset({hard:!0}),this._update()),this},_updateZIndex:function(){this._container&&this.options.zIndex!==i&&(this._container.style.zIndex=this.options.zIndex)},_setAutoZIndex:function(t,e){var i,n,o,s=t.children,a=-e(1/0,-1/0);for(n=0,o=s.length;o>n;n++)s[n]!==this._container&&(i=parseInt(s[n].style.zIndex,10),isNaN(i)||(a=e(a,i)));this.options.zIndex=this._container.style.zIndex=(isFinite(a)?a:0)+e(1,-1)},_updateOpacity:function(){var t,e=this._tiles;if(o.Browser.ielt9)for(t in e)o.DomUtil.setOpacity(e[t],this.options.opacity);else o.DomUtil.setOpacity(this._container,this.options.opacity)},_initContainer:function(){var t=this._map._panes.tilePane;if(!this._container){if(this._container=o.DomUtil.create("div","leaflet-layer"),this._updateZIndex(),this._animated){var e="leaflet-tile-container";this._bgBuffer=o.DomUtil.create("div",e,this._container),this._tileContainer=o.DomUtil.create("div",e,this._container)}else this._tileContainer=this._container;t.appendChild(this._container),this.options.opacity<1&&this._updateOpacity()}},_reset:function(t){for(var e in this._tiles)this.fire("tileunload",{tile:this._tiles[e]});this._tiles={},this._tilesToLoad=0,this.options.reuseTiles&&(this._unusedTiles=[]),this._tileContainer.innerHTML="",this._animated&&t&&t.hard&&this._clearBgBuffer(),this._initContainer()},_getTileSize:function(){var t=this._map,e=t.getZoom()+this.options.zoomOffset,i=this.options.maxNativeZoom,n=this.options.tileSize;return i&&e>i&&(n=Math.round(t.getZoomScale(e)/t.getZoomScale(i)*n)),n},_update:function(){if(this._map){var t=this._map,e=t.getPixelBounds(),i=t.getZoom(),n=this._getTileSize();if(!(i>this.options.maxZoom||i<this.options.minZoom)){var s=o.bounds(e.min.divideBy(n)._floor(),e.max.divideBy(n)._floor());this._addTilesFromCenterOut(s),(this.options.unloadInvisibleTiles||this.options.reuseTiles)&&this._removeOtherTiles(s)}}},_addTilesFromCenterOut:function(t){var i,n,s,a=[],r=t.getCenter();for(i=t.min.y;i<=t.max.y;i++)for(n=t.min.x;n<=t.max.x;n++)s=new o.Point(n,i),this._tileShouldBeLoaded(s)&&a.push(s);var h=a.length;if(0!==h){a.sort(function(t,e){return t.distanceTo(r)-e.distanceTo(r)});var l=e.createDocumentFragment();for(this._tilesToLoad||this.fire("loading"),this._tilesToLoad+=h,n=0;h>n;n++)this._addTile(a[n],l);this._tileContainer.appendChild(l)}},_tileShouldBeLoaded:function(t){if(t.x+":"+t.y in this._tiles)return!1;var e=this.options;if(!e.continuousWorld){var i=this._getWrapTileNum();if(e.noWrap&&(t.x<0||t.x>=i.x)||t.y<0||t.y>=i.y)return!1}if(e.bounds){var n=e.tileSize,o=t.multiplyBy(n),s=o.add([n,n]),a=this._map.unproject(o),r=this._map.unproject(s);if(e.continuousWorld||e.noWrap||(a=a.wrap(),r=r.wrap()),!e.bounds.intersects([a,r]))return!1}return!0},_removeOtherTiles:function(t){var e,i,n,o;for(o in this._tiles)e=o.split(":"),i=parseInt(e[0],10),n=parseInt(e[1],10),(i<t.min.x||i>t.max.x||n<t.min.y||n>t.max.y)&&this._removeTile(o)},_removeTile:function(t){var e=this._tiles[t];this.fire("tileunload",{tile:e,url:e.src}),this.options.reuseTiles?(o.DomUtil.removeClass(e,"leaflet-tile-loaded"),this._unusedTiles.push(e)):e.parentNode===this._tileContainer&&this._tileContainer.removeChild(e),o.Browser.android||(e.onload=null,e.src=o.Util.emptyImageUrl),delete this._tiles[t]},_addTile:function(t,e){var i=this._getTilePos(t),n=this._getTile();o.DomUtil.setPosition(n,i,o.Browser.chrome),this._tiles[t.x+":"+t.y]=n,this._loadTile(n,t),n.parentNode!==this._tileContainer&&e.appendChild(n)},_getZoomForUrl:function(){var t=this.options,e=this._map.getZoom();return t.zoomReverse&&(e=t.maxZoom-e),e+=t.zoomOffset,t.maxNativeZoom?Math.min(e,t.maxNativeZoom):e},_getTilePos:function(t){var e=this._map.getPixelOrigin(),i=this._getTileSize();return t.multiplyBy(i).subtract(e)},getTileUrl:function(t){return o.Util.template(this._url,o.extend({s:this._getSubdomain(t),z:t.z,x:t.x,y:t.y},this.options))},_getWrapTileNum:function(){var t=this._map.options.crs,e=t.getSize(this._map.getZoom());return e.divideBy(this._getTileSize())._floor()},_adjustTilePoint:function(t){var e=this._getWrapTileNum();this.options.continuousWorld||this.options.noWrap||(t.x=(t.x%e.x+e.x)%e.x),this.options.tms&&(t.y=e.y-t.y-1),t.z=this._getZoomForUrl()},_getSubdomain:function(t){var e=Math.abs(t.x+t.y)%this.options.subdomains.length;return this.options.subdomains[e]},_getTile:function(){if(this.options.reuseTiles&&this._unusedTiles.length>0){var t=this._unusedTiles.pop();return this._resetTile(t),t}return this._createTile()},_resetTile:function(){},_createTile:function(){var t=o.DomUtil.create("img","leaflet-tile");return t.style.width=t.style.height=this._getTileSize()+"px",t.galleryimg="no",t.onselectstart=t.onmousemove=o.Util.falseFn,o.Browser.ielt9&&this.options.opacity!==i&&o.DomUtil.setOpacity(t,this.options.opacity),o.Browser.mobileWebkit3d&&(t.style.WebkitBackfaceVisibility="hidden"),t},_loadTile:function(t,e){t._layer=this,t.onload=this._tileOnLoad,t.onerror=this._tileOnError,this._adjustTilePoint(e),t.src=this.getTileUrl(e),this.fire("tileloadstart",{tile:t,url:t.src})},_tileLoaded:function(){this._tilesToLoad--,this._animated&&o.DomUtil.addClass(this._tileContainer,"leaflet-zoom-animated"),this._tilesToLoad||(this.fire("load"),this._animated&&(clearTimeout(this._clearBgBufferTimer),this._clearBgBufferTimer=setTimeout(o.bind(this._clearBgBuffer,this),500)))},_tileOnLoad:function(){var t=this._layer;this.src!==o.Util.emptyImageUrl&&(o.DomUtil.addClass(this,"leaflet-tile-loaded"),t.fire("tileload",{tile:this,url:this.src})),t._tileLoaded()},_tileOnError:function(){var t=this._layer;t.fire("tileerror",{tile:this,url:this.src});var e=t.options.errorTileUrl;e&&(this.src=e),t._tileLoaded()}}),o.tileLayer=function(t,e){return new o.TileLayer(t,e)},o.TileLayer.WMS=o.TileLayer.extend({defaultWmsParams:{service:"WMS",request:"GetMap",version:"1.1.1",layers:"",styles:"",format:"image/jpeg",transparent:!1},initialize:function(t,e){this._url=t;var i=o.extend({},this.defaultWmsParams),n=e.tileSize||this.options.tileSize;i.width=i.height=e.detectRetina&&o.Browser.retina?2*n:n;for(var s in e)this.options.hasOwnProperty(s)||"crs"===s||(i[s]=e[s]);this.wmsParams=i,o.setOptions(this,e)},onAdd:function(t){this._crs=this.options.crs||t.options.crs,this._wmsVersion=parseFloat(this.wmsParams.version);var e=this._wmsVersion>=1.3?"crs":"srs";this.wmsParams[e]=this._crs.code,o.TileLayer.prototype.onAdd.call(this,t)},getTileUrl:function(t){var e=this._map,i=this.options.tileSize,n=t.multiplyBy(i),s=n.add([i,i]),a=this._crs.project(e.unproject(n,t.z)),r=this._crs.project(e.unproject(s,t.z)),h=this._wmsVersion>=1.3&&this._crs===o.CRS.EPSG4326?[r.y,a.x,a.y,r.x].join(","):[a.x,r.y,r.x,a.y].join(","),l=o.Util.template(this._url,{s:this._getSubdomain(t)});return l+o.Util.getParamString(this.wmsParams,l,!0)+"&BBOX="+h},setParams:function(t,e){return o.extend(this.wmsParams,t),e||this.redraw(),this}}),o.tileLayer.wms=function(t,e){return new o.TileLayer.WMS(t,e)},o.TileLayer.Canvas=o.TileLayer.extend({options:{async:!1},initialize:function(t){o.setOptions(this,t)},redraw:function(){this._map&&(this._reset({hard:!0}),this._update());for(var t in this._tiles)this._redrawTile(this._tiles[t]);return this},_redrawTile:function(t){this.drawTile(t,t._tilePoint,this._map._zoom)},_createTile:function(){var t=o.DomUtil.create("canvas","leaflet-tile");return t.width=t.height=this.options.tileSize,t.onselectstart=t.onmousemove=o.Util.falseFn,t},_loadTile:function(t,e){t._layer=this,t._tilePoint=e,this._redrawTile(t),this.options.async||this.tileDrawn(t)},drawTile:function(){},tileDrawn:function(t){this._tileOnLoad.call(t)}}),o.tileLayer.canvas=function(t){return new o.TileLayer.Canvas(t)},o.ImageOverlay=o.Class.extend({includes:o.Mixin.Events,options:{opacity:1},initialize:function(t,e,i){this._url=t,this._bounds=o.latLngBounds(e),o.setOptions(this,i)},onAdd:function(t){this._map=t,this._image||this._initImage(),t._panes.overlayPane.appendChild(this._image),t.on("viewreset",this._reset,this),t.options.zoomAnimation&&o.Browser.any3d&&t.on("zoomanim",this._animateZoom,this),this._reset()},onRemove:function(t){t.getPanes().overlayPane.removeChild(this._image),t.off("viewreset",this._reset,this),t.options.zoomAnimation&&t.off("zoomanim",this._animateZoom,this)},addTo:function(t){return t.addLayer(this),this},setOpacity:function(t){return this.options.opacity=t,this._updateOpacity(),this},bringToFront:function(){return this._image&&this._map._panes.overlayPane.appendChild(this._image),this},bringToBack:function(){var t=this._map._panes.overlayPane;return this._image&&t.insertBefore(this._image,t.firstChild),this},setUrl:function(t){this._url=t,this._image.src=this._url},getAttribution:function(){return this.options.attribution},_initImage:function(){this._image=o.DomUtil.create("img","leaflet-image-layer"),this._map.options.zoomAnimation&&o.Browser.any3d?o.DomUtil.addClass(this._image,"leaflet-zoom-animated"):o.DomUtil.addClass(this._image,"leaflet-zoom-hide"),this._updateOpacity(),o.extend(this._image,{galleryimg:"no",onselectstart:o.Util.falseFn,onmousemove:o.Util.falseFn,onload:o.bind(this._onImageLoad,this),src:this._url})},_animateZoom:function(t){var e=this._map,i=this._image,n=e.getZoomScale(t.zoom),s=this._bounds.getNorthWest(),a=this._bounds.getSouthEast(),r=e._latLngToNewLayerPoint(s,t.zoom,t.center),h=e._latLngToNewLayerPoint(a,t.zoom,t.center)._subtract(r),l=r._add(h._multiplyBy(.5*(1-1/n)));i.style[o.DomUtil.TRANSFORM]=o.DomUtil.getTranslateString(l)+" scale("+n+") "},_reset:function(){var t=this._image,e=this._map.latLngToLayerPoint(this._bounds.getNorthWest()),i=this._map.latLngToLayerPoint(this._bounds.getSouthEast())._subtract(e);o.DomUtil.setPosition(t,e),t.style.width=i.x+"px",t.style.height=i.y+"px"},_onImageLoad:function(){this.fire("load")},_updateOpacity:function(){o.DomUtil.setOpacity(this._image,this.options.opacity)}}),o.imageOverlay=function(t,e,i){return new o.ImageOverlay(t,e,i)},o.Icon=o.Class.extend({options:{className:""},initialize:function(t){o.setOptions(this,t)},createIcon:function(t){return this._createIcon("icon",t)},createShadow:function(t){return this._createIcon("shadow",t)},_createIcon:function(t,e){var i=this._getIconUrl(t);if(!i){if("icon"===t)throw new Error("iconUrl not set in Icon options (see the docs).");return null}var n;return n=e&&"IMG"===e.tagName?this._createImg(i,e):this._createImg(i),this._setIconStyles(n,t),n},_setIconStyles:function(t,e){var i,n=this.options,s=o.point(n[e+"Size"]);i=o.point("shadow"===e?n.shadowAnchor||n.iconAnchor:n.iconAnchor),!i&&s&&(i=s.divideBy(2,!0)),t.className="leaflet-marker-"+e+" "+n.className,i&&(t.style.marginLeft=-i.x+"px",t.style.marginTop=-i.y+"px"),s&&(t.style.width=s.x+"px",t.style.height=s.y+"px")},_createImg:function(t,i){return i=i||e.createElement("img"),i.src=t,i},_getIconUrl:function(t){return o.Browser.retina&&this.options[t+"RetinaUrl"]?this.options[t+"RetinaUrl"]:this.options[t+"Url"]}}),o.icon=function(t){return new o.Icon(t)},o.Icon.Default=o.Icon.extend({options:{iconSize:[25,41],iconAnchor:[12,41],popupAnchor:[1,-34],shadowSize:[41,41]},_getIconUrl:function(t){var e=t+"Url";if(this.options[e])return this.options[e];o.Browser.retina&&"icon"===t&&(t+="-2x");var i=o.Icon.Default.imagePath;if(!i)throw new Error("Couldn't autodetect L.Icon.Default.imagePath, set it manually.");return i+"/marker-"+t+".png"}}),o.Icon.Default.imagePath=function(){var t,i,n,o,s,a=e.getElementsByTagName("script"),r=/[\/^]leaflet[\-\._]?([\w\-\._]*)\.js\??/;for(t=0,i=a.length;i>t;t++)if(n=a[t].src,o=n.match(r))return s=n.split(r)[0],(s?s+"/":"")+"images"}(),o.Marker=o.Class.extend({includes:o.Mixin.Events,options:{icon:new o.Icon.Default,title:"",alt:"",clickable:!0,draggable:!1,keyboard:!0,zIndexOffset:0,opacity:1,riseOnHover:!1,riseOffset:250},initialize:function(t,e){o.setOptions(this,e),this._latlng=o.latLng(t)},onAdd:function(t){this._map=t,t.on("viewreset",this.update,this),this._initIcon(),this.update(),this.fire("add"),t.options.zoomAnimation&&t.options.markerZoomAnimation&&t.on("zoomanim",this._animateZoom,this)},addTo:function(t){return t.addLayer(this),this},onRemove:function(t){this.dragging&&this.dragging.disable(),this._removeIcon(),this._removeShadow(),this.fire("remove"),t.off({viewreset:this.update,zoomanim:this._animateZoom},this),this._map=null},getLatLng:function(){return this._latlng},setLatLng:function(t){return this._latlng=o.latLng(t),this.update(),this.fire("move",{latlng:this._latlng})},setZIndexOffset:function(t){return this.options.zIndexOffset=t,this.update(),this},setIcon:function(t){return this.options.icon=t,this._map&&(this._initIcon(),this.update()),this._popup&&this.bindPopup(this._popup),this},update:function(){if(this._icon){var t=this._map.latLngToLayerPoint(this._latlng).round();this._setPos(t)}return this},_initIcon:function(){var t=this.options,e=this._map,i=e.options.zoomAnimation&&e.options.markerZoomAnimation,n=i?"leaflet-zoom-animated":"leaflet-zoom-hide",s=t.icon.createIcon(this._icon),a=!1;s!==this._icon&&(this._icon&&this._removeIcon(),a=!0,t.title&&(s.title=t.title),t.alt&&(s.alt=t.alt)),o.DomUtil.addClass(s,n),t.keyboard&&(s.tabIndex="0"),this._icon=s,this._initInteraction(),t.riseOnHover&&o.DomEvent.on(s,"mouseover",this._bringToFront,this).on(s,"mouseout",this._resetZIndex,this);var r=t.icon.createShadow(this._shadow),h=!1;r!==this._shadow&&(this._removeShadow(),h=!0),r&&o.DomUtil.addClass(r,n),this._shadow=r,t.opacity<1&&this._updateOpacity();var l=this._map._panes;a&&l.markerPane.appendChild(this._icon),r&&h&&l.shadowPane.appendChild(this._shadow)},_removeIcon:function(){this.options.riseOnHover&&o.DomEvent.off(this._icon,"mouseover",this._bringToFront).off(this._icon,"mouseout",this._resetZIndex),this._map._panes.markerPane.removeChild(this._icon),this._icon=null},_removeShadow:function(){this._shadow&&this._map._panes.shadowPane.removeChild(this._shadow),this._shadow=null},_setPos:function(t){o.DomUtil.setPosition(this._icon,t),this._shadow&&o.DomUtil.setPosition(this._shadow,t),this._zIndex=t.y+this.options.zIndexOffset,this._resetZIndex()},_updateZIndex:function(t){this._icon.style.zIndex=this._zIndex+t},_animateZoom:function(t){var e=this._map._latLngToNewLayerPoint(this._latlng,t.zoom,t.center).round();this._setPos(e)},_initInteraction:function(){if(this.options.clickable){var t=this._icon,e=["dblclick","mousedown","mouseover","mouseout","contextmenu"];o.DomUtil.addClass(t,"leaflet-clickable"),o.DomEvent.on(t,"click",this._onMouseClick,this),o.DomEvent.on(t,"keypress",this._onKeyPress,this);for(var i=0;i<e.length;i++)o.DomEvent.on(t,e[i],this._fireMouseEvent,this);o.Handler.MarkerDrag&&(this.dragging=new o.Handler.MarkerDrag(this),this.options.draggable&&this.dragging.enable())}},_onMouseClick:function(t){var e=this.dragging&&this.dragging.moved();(this.hasEventListeners(t.type)||e)&&o.DomEvent.stopPropagation(t),e||(this.dragging&&this.dragging._enabled||!this._map.dragging||!this._map.dragging.moved())&&this.fire(t.type,{originalEvent:t,latlng:this._latlng})},_onKeyPress:function(t){13===t.keyCode&&this.fire("click",{originalEvent:t,latlng:this._latlng})},_fireMouseEvent:function(t){this.fire(t.type,{originalEvent:t,latlng:this._latlng}),"contextmenu"===t.type&&this.hasEventListeners(t.type)&&o.DomEvent.preventDefault(t),"mousedown"!==t.type?o.DomEvent.stopPropagation(t):o.DomEvent.preventDefault(t)},setOpacity:function(t){return this.options.opacity=t,this._map&&this._updateOpacity(),this},_updateOpacity:function(){o.DomUtil.setOpacity(this._icon,this.options.opacity),this._shadow&&o.DomUtil.setOpacity(this._shadow,this.options.opacity)},_bringToFront:function(){this._updateZIndex(this.options.riseOffset)},_resetZIndex:function(){this._updateZIndex(0)}}),o.marker=function(t,e){return new o.Marker(t,e)},o.DivIcon=o.Icon.extend({options:{iconSize:[12,12],className:"leaflet-div-icon",html:!1},createIcon:function(t){var i=t&&"DIV"===t.tagName?t:e.createElement("div"),n=this.options;return i.innerHTML=n.html!==!1?n.html:"",n.bgPos&&(i.style.backgroundPosition=-n.bgPos.x+"px "+-n.bgPos.y+"px"),this._setIconStyles(i,"icon"),i},createShadow:function(){return null}}),o.divIcon=function(t){return new o.DivIcon(t)},o.Map.mergeOptions({closePopupOnClick:!0}),o.Popup=o.Class.extend({includes:o.Mixin.Events,options:{minWidth:50,maxWidth:300,autoPan:!0,closeButton:!0,offset:[0,7],autoPanPadding:[5,5],keepInView:!1,className:"",zoomAnimation:!0},initialize:function(t,e){o.setOptions(this,t),this._source=e,this._animated=o.Browser.any3d&&this.options.zoomAnimation,this._isOpen=!1},onAdd:function(t){this._map=t,this._container||this._initLayout();var e=t.options.fadeAnimation;e&&o.DomUtil.setOpacity(this._container,0),t._panes.popupPane.appendChild(this._container),t.on(this._getEvents(),this),this.update(),e&&o.DomUtil.setOpacity(this._container,1),this.fire("open"),t.fire("popupopen",{popup:this}),this._source&&this._source.fire("popupopen",{popup:this})},addTo:function(t){return t.addLayer(this),this},openOn:function(t){return t.openPopup(this),this},onRemove:function(t){t._panes.popupPane.removeChild(this._container),o.Util.falseFn(this._container.offsetWidth),t.off(this._getEvents(),this),t.options.fadeAnimation&&o.DomUtil.setOpacity(this._container,0),this._map=null,this.fire("close"),t.fire("popupclose",{popup:this}),this._source&&this._source.fire("popupclose",{popup:this})},getLatLng:function(){return this._latlng},setLatLng:function(t){return this._latlng=o.latLng(t),this._map&&(this._updatePosition(),this._adjustPan()),this},getContent:function(){return this._content},setContent:function(t){return this._content=t,this.update(),this},update:function(){this._map&&(this._container.style.visibility="hidden",this._updateContent(),this._updateLayout(),this._updatePosition(),this._container.style.visibility="",this._adjustPan())},_getEvents:function(){var t={viewreset:this._updatePosition};return this._animated&&(t.zoomanim=this._zoomAnimation),("closeOnClick"in this.options?this.options.closeOnClick:this._map.options.closePopupOnClick)&&(t.preclick=this._close),this.options.keepInView&&(t.moveend=this._adjustPan),t},_close:function(){this._map&&this._map.closePopup(this)},_initLayout:function(){var t,e="leaflet-popup",i=e+" "+this.options.className+" leaflet-zoom-"+(this._animated?"animated":"hide"),n=this._container=o.DomUtil.create("div",i);this.options.closeButton&&(t=this._closeButton=o.DomUtil.create("a",e+"-close-button",n),t.href="#close",t.innerHTML="&#215;",o.DomEvent.disableClickPropagation(t),o.DomEvent.on(t,"click",this._onCloseButtonClick,this));var s=this._wrapper=o.DomUtil.create("div",e+"-content-wrapper",n);o.DomEvent.disableClickPropagation(s),this._contentNode=o.DomUtil.create("div",e+"-content",s),o.DomEvent.disableScrollPropagation(this._contentNode),o.DomEvent.on(s,"contextmenu",o.DomEvent.stopPropagation),this._tipContainer=o.DomUtil.create("div",e+"-tip-container",n),this._tip=o.DomUtil.create("div",e+"-tip",this._tipContainer)},_updateContent:function(){if(this._content){if("string"==typeof this._content)this._contentNode.innerHTML=this._content;else{for(;this._contentNode.hasChildNodes();)this._contentNode.removeChild(this._contentNode.firstChild);this._contentNode.appendChild(this._content)}this.fire("contentupdate")}},_updateLayout:function(){var t=this._contentNode,e=t.style;e.width="",e.whiteSpace="nowrap";var i=t.offsetWidth;i=Math.min(i,this.options.maxWidth),i=Math.max(i,this.options.minWidth),e.width=i+1+"px",e.whiteSpace="",e.height="";var n=t.offsetHeight,s=this.options.maxHeight,a="leaflet-popup-scrolled";s&&n>s?(e.height=s+"px",o.DomUtil.addClass(t,a)):o.DomUtil.removeClass(t,a),this._containerWidth=this._container.offsetWidth},_updatePosition:function(){if(this._map){var t=this._map.latLngToLayerPoint(this._latlng),e=this._animated,i=o.point(this.options.offset);e&&o.DomUtil.setPosition(this._container,t),this._containerBottom=-i.y-(e?0:t.y),this._containerLeft=-Math.round(this._containerWidth/2)+i.x+(e?0:t.x),this._container.style.bottom=this._containerBottom+"px",this._container.style.left=this._containerLeft+"px"}},_zoomAnimation:function(t){var e=this._map._latLngToNewLayerPoint(this._latlng,t.zoom,t.center);o.DomUtil.setPosition(this._container,e)},_adjustPan:function(){if(this.options.autoPan){var t=this._map,e=this._container.offsetHeight,i=this._containerWidth,n=new o.Point(this._containerLeft,-e-this._containerBottom);this._animated&&n._add(o.DomUtil.getPosition(this._container));var s=t.layerPointToContainerPoint(n),a=o.point(this.options.autoPanPadding),r=o.point(this.options.autoPanPaddingTopLeft||a),h=o.point(this.options.autoPanPaddingBottomRight||a),l=t.getSize(),u=0,c=0;s.x+i+h.x>l.x&&(u=s.x+i-l.x+h.x),s.x-u-r.x<0&&(u=s.x-r.x),s.y+e+h.y>l.y&&(c=s.y+e-l.y+h.y),s.y-c-r.y<0&&(c=s.y-r.y),(u||c)&&t.fire("autopanstart").panBy([u,c])}},_onCloseButtonClick:function(t){this._close(),o.DomEvent.stop(t)}}),o.popup=function(t,e){return new o.Popup(t,e)},o.Map.include({openPopup:function(t,e,i){if(this.closePopup(),!(t instanceof o.Popup)){var n=t;t=new o.Popup(i).setLatLng(e).setContent(n)}return t._isOpen=!0,this._popup=t,this.addLayer(t)},closePopup:function(t){return t&&t!==this._popup||(t=this._popup,this._popup=null),t&&(this.removeLayer(t),t._isOpen=!1),this}}),o.Marker.include({openPopup:function(){return this._popup&&this._map&&!this._map.hasLayer(this._popup)&&(this._popup.setLatLng(this._latlng),this._map.openPopup(this._popup)),this},closePopup:function(){return this._popup&&this._popup._close(),this},togglePopup:function(){return this._popup&&(this._popup._isOpen?this.closePopup():this.openPopup()),this},bindPopup:function(t,e){var i=o.point(this.options.icon.options.popupAnchor||[0,0]);return i=i.add(o.Popup.prototype.options.offset),e&&e.offset&&(i=i.add(e.offset)),e=o.extend({offset:i},e),this._popupHandlersAdded||(this.on("click",this.togglePopup,this).on("remove",this.closePopup,this).on("move",this._movePopup,this),this._popupHandlersAdded=!0),t instanceof o.Popup?(o.setOptions(t,e),this._popup=t):this._popup=new o.Popup(e,this).setContent(t),this},setPopupContent:function(t){return this._popup&&this._popup.setContent(t),this},unbindPopup:function(){return this._popup&&(this._popup=null,this.off("click",this.togglePopup,this).off("remove",this.closePopup,this).off("move",this._movePopup,this),this._popupHandlersAdded=!1),this},getPopup:function(){return this._popup},_movePopup:function(t){this._popup.setLatLng(t.latlng)}}),o.LayerGroup=o.Class.extend({initialize:function(t){this._layers={};var e,i;if(t)for(e=0,i=t.length;i>e;e++)this.addLayer(t[e])},addLayer:function(t){var e=this.getLayerId(t);return this._layers[e]=t,this._map&&this._map.addLayer(t),this},removeLayer:function(t){var e=t in this._layers?t:this.getLayerId(t);return this._map&&this._layers[e]&&this._map.removeLayer(this._layers[e]),delete this._layers[e],this},hasLayer:function(t){return t?t in this._layers||this.getLayerId(t)in this._layers:!1},clearLayers:function(){return this.eachLayer(this.removeLayer,this),this},invoke:function(t){var e,i,n=Array.prototype.slice.call(arguments,1);for(e in this._layers)i=this._layers[e],i[t]&&i[t].apply(i,n);return this},onAdd:function(t){this._map=t,this.eachLayer(t.addLayer,t)},onRemove:function(t){this.eachLayer(t.removeLayer,t),this._map=null},addTo:function(t){return t.addLayer(this),this},eachLayer:function(t,e){for(var i in this._layers)t.call(e,this._layers[i]);return this},getLayer:function(t){return this._layers[t]},getLayers:function(){var t=[];for(var e in this._layers)t.push(this._layers[e]);return t},setZIndex:function(t){return this.invoke("setZIndex",t)},getLayerId:function(t){return o.stamp(t)}}),o.layerGroup=function(t){return new o.LayerGroup(t)},o.FeatureGroup=o.LayerGroup.extend({includes:o.Mixin.Events,statics:{EVENTS:"click dblclick mouseover mouseout mousemove contextmenu popupopen popupclose"},addLayer:function(t){return this.hasLayer(t)?this:("on"in t&&t.on(o.FeatureGroup.EVENTS,this._propagateEvent,this),o.LayerGroup.prototype.addLayer.call(this,t),this._popupContent&&t.bindPopup&&t.bindPopup(this._popupContent,this._popupOptions),this.fire("layeradd",{layer:t}))},removeLayer:function(t){return this.hasLayer(t)?(t in this._layers&&(t=this._layers[t]),t.off(o.FeatureGroup.EVENTS,this._propagateEvent,this),o.LayerGroup.prototype.removeLayer.call(this,t),this._popupContent&&this.invoke("unbindPopup"),this.fire("layerremove",{layer:t})):this},bindPopup:function(t,e){return this._popupContent=t,this._popupOptions=e,this.invoke("bindPopup",t,e)},openPopup:function(t){for(var e in this._layers){this._layers[e].openPopup(t);break}return this},setStyle:function(t){return this.invoke("setStyle",t)},bringToFront:function(){return this.invoke("bringToFront")},bringToBack:function(){return this.invoke("bringToBack")},getBounds:function(){var t=new o.LatLngBounds;return this.eachLayer(function(e){t.extend(e instanceof o.Marker?e.getLatLng():e.getBounds())}),t},_propagateEvent:function(t){t=o.extend({layer:t.target,target:this},t),this.fire(t.type,t)}}),o.featureGroup=function(t){return new o.FeatureGroup(t)},o.Path=o.Class.extend({includes:[o.Mixin.Events],statics:{CLIP_PADDING:function(){var e=o.Browser.mobile?1280:2e3,i=(e/Math.max(t.outerWidth,t.outerHeight)-1)/2;return Math.max(0,Math.min(.5,i))}()},options:{stroke:!0,color:"#0033ff",dashArray:null,lineCap:null,lineJoin:null,weight:5,opacity:.5,fill:!1,fillColor:null,fillOpacity:.2,clickable:!0},initialize:function(t){o.setOptions(this,t)},onAdd:function(t){this._map=t,this._container||(this._initElements(),this._initEvents()),this.projectLatlngs(),this._updatePath(),this._container&&this._map._pathRoot.appendChild(this._container),this.fire("add"),t.on({viewreset:this.projectLatlngs,moveend:this._updatePath},this)},addTo:function(t){return t.addLayer(this),this},onRemove:function(t){t._pathRoot.removeChild(this._container),this.fire("remove"),this._map=null,o.Browser.vml&&(this._container=null,this._stroke=null,this._fill=null),t.off({viewreset:this.projectLatlngs,moveend:this._updatePath},this)},projectLatlngs:function(){},setStyle:function(t){return o.setOptions(this,t),this._container&&this._updateStyle(),this},redraw:function(){return this._map&&(this.projectLatlngs(),this._updatePath()),this}}),o.Map.include({_updatePathViewport:function(){var t=o.Path.CLIP_PADDING,e=this.getSize(),i=o.DomUtil.getPosition(this._mapPane),n=i.multiplyBy(-1)._subtract(e.multiplyBy(t)._round()),s=n.add(e.multiplyBy(1+2*t)._round());this._pathViewport=new o.Bounds(n,s)}}),o.Path.SVG_NS="http://www.w3.org/2000/svg",o.Browser.svg=!(!e.createElementNS||!e.createElementNS(o.Path.SVG_NS,"svg").createSVGRect),o.Path=o.Path.extend({statics:{SVG:o.Browser.svg},bringToFront:function(){var t=this._map._pathRoot,e=this._container;return e&&t.lastChild!==e&&t.appendChild(e),this},bringToBack:function(){var t=this._map._pathRoot,e=this._container,i=t.firstChild;return e&&i!==e&&t.insertBefore(e,i),this},getPathString:function(){},_createElement:function(t){return e.createElementNS(o.Path.SVG_NS,t)},_initElements:function(){this._map._initPathRoot(),this._initPath(),this._initStyle()},_initPath:function(){this._container=this._createElement("g"),this._path=this._createElement("path"),this.options.className&&o.DomUtil.addClass(this._path,this.options.className),this._container.appendChild(this._path)},_initStyle:function(){this.options.stroke&&(this._path.setAttribute("stroke-linejoin","round"),this._path.setAttribute("stroke-linecap","round")),this.options.fill&&this._path.setAttribute("fill-rule","evenodd"),this.options.pointerEvents&&this._path.setAttribute("pointer-events",this.options.pointerEvents),this.options.clickable||this.options.pointerEvents||this._path.setAttribute("pointer-events","none"),this._updateStyle()},_updateStyle:function(){this.options.stroke?(this._path.setAttribute("stroke",this.options.color),this._path.setAttribute("stroke-opacity",this.options.opacity),this._path.setAttribute("stroke-width",this.options.weight),this.options.dashArray?this._path.setAttribute("stroke-dasharray",this.options.dashArray):this._path.removeAttribute("stroke-dasharray"),this.options.lineCap&&this._path.setAttribute("stroke-linecap",this.options.lineCap),this.options.lineJoin&&this._path.setAttribute("stroke-linejoin",this.options.lineJoin)):this._path.setAttribute("stroke","none"),this.options.fill?(this._path.setAttribute("fill",this.options.fillColor||this.options.color),this._path.setAttribute("fill-opacity",this.options.fillOpacity)):this._path.setAttribute("fill","none")},_updatePath:function(){var t=this.getPathString();t||(t="M0 0"),this._path.setAttribute("d",t)},_initEvents:function(){if(this.options.clickable){(o.Browser.svg||!o.Browser.vml)&&o.DomUtil.addClass(this._path,"leaflet-clickable"),o.DomEvent.on(this._container,"click",this._onMouseClick,this);for(var t=["dblclick","mousedown","mouseover","mouseout","mousemove","contextmenu"],e=0;e<t.length;e++)o.DomEvent.on(this._container,t[e],this._fireMouseEvent,this)}},_onMouseClick:function(t){this._map.dragging&&this._map.dragging.moved()||this._fireMouseEvent(t)},_fireMouseEvent:function(t){if(this.hasEventListeners(t.type)){var e=this._map,i=e.mouseEventToContainerPoint(t),n=e.containerPointToLayerPoint(i),s=e.layerPointToLatLng(n);this.fire(t.type,{latlng:s,layerPoint:n,containerPoint:i,originalEvent:t}),"contextmenu"===t.type&&o.DomEvent.preventDefault(t),"mousemove"!==t.type&&o.DomEvent.stopPropagation(t)}}}),o.Map.include({_initPathRoot:function(){this._pathRoot||(this._pathRoot=o.Path.prototype._createElement("svg"),this._panes.overlayPane.appendChild(this._pathRoot),this.options.zoomAnimation&&o.Browser.any3d?(o.DomUtil.addClass(this._pathRoot,"leaflet-zoom-animated"),this.on({zoomanim:this._animatePathZoom,zoomend:this._endPathZoom})):o.DomUtil.addClass(this._pathRoot,"leaflet-zoom-hide"),this.on("moveend",this._updateSvgViewport),this._updateSvgViewport()) -},_animatePathZoom:function(t){var e=this.getZoomScale(t.zoom),i=this._getCenterOffset(t.center)._multiplyBy(-e)._add(this._pathViewport.min);this._pathRoot.style[o.DomUtil.TRANSFORM]=o.DomUtil.getTranslateString(i)+" scale("+e+") ",this._pathZooming=!0},_endPathZoom:function(){this._pathZooming=!1},_updateSvgViewport:function(){if(!this._pathZooming){this._updatePathViewport();var t=this._pathViewport,e=t.min,i=t.max,n=i.x-e.x,s=i.y-e.y,a=this._pathRoot,r=this._panes.overlayPane;o.Browser.mobileWebkit&&r.removeChild(a),o.DomUtil.setPosition(a,e),a.setAttribute("width",n),a.setAttribute("height",s),a.setAttribute("viewBox",[e.x,e.y,n,s].join(" ")),o.Browser.mobileWebkit&&r.appendChild(a)}}}),o.Path.include({bindPopup:function(t,e){return t instanceof o.Popup?this._popup=t:((!this._popup||e)&&(this._popup=new o.Popup(e,this)),this._popup.setContent(t)),this._popupHandlersAdded||(this.on("click",this._openPopup,this).on("remove",this.closePopup,this),this._popupHandlersAdded=!0),this},unbindPopup:function(){return this._popup&&(this._popup=null,this.off("click",this._openPopup).off("remove",this.closePopup),this._popupHandlersAdded=!1),this},openPopup:function(t){return this._popup&&(t=t||this._latlng||this._latlngs[Math.floor(this._latlngs.length/2)],this._openPopup({latlng:t})),this},closePopup:function(){return this._popup&&this._popup._close(),this},_openPopup:function(t){this._popup.setLatLng(t.latlng),this._map.openPopup(this._popup)}}),o.Browser.vml=!o.Browser.svg&&function(){try{var t=e.createElement("div");t.innerHTML='<v:shape adj="1"/>';var i=t.firstChild;return i.style.behavior="url(#default#VML)",i&&"object"==typeof i.adj}catch(n){return!1}}(),o.Path=o.Browser.svg||!o.Browser.vml?o.Path:o.Path.extend({statics:{VML:!0,CLIP_PADDING:.02},_createElement:function(){try{return e.namespaces.add("lvml","urn:schemas-microsoft-com:vml"),function(t){return e.createElement("<lvml:"+t+' class="lvml">')}}catch(t){return function(t){return e.createElement("<"+t+' xmlns="urn:schemas-microsoft.com:vml" class="lvml">')}}}(),_initPath:function(){var t=this._container=this._createElement("shape");o.DomUtil.addClass(t,"leaflet-vml-shape"+(this.options.className?" "+this.options.className:"")),this.options.clickable&&o.DomUtil.addClass(t,"leaflet-clickable"),t.coordsize="1 1",this._path=this._createElement("path"),t.appendChild(this._path),this._map._pathRoot.appendChild(t)},_initStyle:function(){this._updateStyle()},_updateStyle:function(){var t=this._stroke,e=this._fill,i=this.options,n=this._container;n.stroked=i.stroke,n.filled=i.fill,i.stroke?(t||(t=this._stroke=this._createElement("stroke"),t.endcap="round",n.appendChild(t)),t.weight=i.weight+"px",t.color=i.color,t.opacity=i.opacity,t.dashStyle=i.dashArray?o.Util.isArray(i.dashArray)?i.dashArray.join(" "):i.dashArray.replace(/( *, *)/g," "):"",i.lineCap&&(t.endcap=i.lineCap.replace("butt","flat")),i.lineJoin&&(t.joinstyle=i.lineJoin)):t&&(n.removeChild(t),this._stroke=null),i.fill?(e||(e=this._fill=this._createElement("fill"),n.appendChild(e)),e.color=i.fillColor||i.color,e.opacity=i.fillOpacity):e&&(n.removeChild(e),this._fill=null)},_updatePath:function(){var t=this._container.style;t.display="none",this._path.v=this.getPathString()+" ",t.display=""}}),o.Map.include(o.Browser.svg||!o.Browser.vml?{}:{_initPathRoot:function(){if(!this._pathRoot){var t=this._pathRoot=e.createElement("div");t.className="leaflet-vml-container",this._panes.overlayPane.appendChild(t),this.on("moveend",this._updatePathViewport),this._updatePathViewport()}}}),o.Browser.canvas=function(){return!!e.createElement("canvas").getContext}(),o.Path=o.Path.SVG&&!t.L_PREFER_CANVAS||!o.Browser.canvas?o.Path:o.Path.extend({statics:{CANVAS:!0,SVG:!1},redraw:function(){return this._map&&(this.projectLatlngs(),this._requestUpdate()),this},setStyle:function(t){return o.setOptions(this,t),this._map&&(this._updateStyle(),this._requestUpdate()),this},onRemove:function(t){t.off("viewreset",this.projectLatlngs,this).off("moveend",this._updatePath,this),this.options.clickable&&(this._map.off("click",this._onClick,this),this._map.off("mousemove",this._onMouseMove,this)),this._requestUpdate(),this.fire("remove"),this._map=null},_requestUpdate:function(){this._map&&!o.Path._updateRequest&&(o.Path._updateRequest=o.Util.requestAnimFrame(this._fireMapMoveEnd,this._map))},_fireMapMoveEnd:function(){o.Path._updateRequest=null,this.fire("moveend")},_initElements:function(){this._map._initPathRoot(),this._ctx=this._map._canvasCtx},_updateStyle:function(){var t=this.options;t.stroke&&(this._ctx.lineWidth=t.weight,this._ctx.strokeStyle=t.color),t.fill&&(this._ctx.fillStyle=t.fillColor||t.color)},_drawPath:function(){var t,e,i,n,s,a;for(this._ctx.beginPath(),t=0,i=this._parts.length;i>t;t++){for(e=0,n=this._parts[t].length;n>e;e++)s=this._parts[t][e],a=(0===e?"move":"line")+"To",this._ctx[a](s.x,s.y);this instanceof o.Polygon&&this._ctx.closePath()}},_checkIfEmpty:function(){return!this._parts.length},_updatePath:function(){if(!this._checkIfEmpty()){var t=this._ctx,e=this.options;this._drawPath(),t.save(),this._updateStyle(),e.fill&&(t.globalAlpha=e.fillOpacity,t.fill()),e.stroke&&(t.globalAlpha=e.opacity,t.stroke()),t.restore()}},_initEvents:function(){this.options.clickable&&(this._map.on("mousemove",this._onMouseMove,this),this._map.on("click",this._onClick,this))},_onClick:function(t){this._containsPoint(t.layerPoint)&&this.fire("click",t)},_onMouseMove:function(t){this._map&&!this._map._animatingZoom&&(this._containsPoint(t.layerPoint)?(this._ctx.canvas.style.cursor="pointer",this._mouseInside=!0,this.fire("mouseover",t)):this._mouseInside&&(this._ctx.canvas.style.cursor="",this._mouseInside=!1,this.fire("mouseout",t)))}}),o.Map.include(o.Path.SVG&&!t.L_PREFER_CANVAS||!o.Browser.canvas?{}:{_initPathRoot:function(){var t,i=this._pathRoot;i||(i=this._pathRoot=e.createElement("canvas"),i.style.position="absolute",t=this._canvasCtx=i.getContext("2d"),t.lineCap="round",t.lineJoin="round",this._panes.overlayPane.appendChild(i),this.options.zoomAnimation&&(this._pathRoot.className="leaflet-zoom-animated",this.on("zoomanim",this._animatePathZoom),this.on("zoomend",this._endPathZoom)),this.on("moveend",this._updateCanvasViewport),this._updateCanvasViewport())},_updateCanvasViewport:function(){if(!this._pathZooming){this._updatePathViewport();var t=this._pathViewport,e=t.min,i=t.max.subtract(e),n=this._pathRoot;o.DomUtil.setPosition(n,e),n.width=i.x,n.height=i.y,n.getContext("2d").translate(-e.x,-e.y)}}}),o.LineUtil={simplify:function(t,e){if(!e||!t.length)return t.slice();var i=e*e;return t=this._reducePoints(t,i),t=this._simplifyDP(t,i)},pointToSegmentDistance:function(t,e,i){return Math.sqrt(this._sqClosestPointOnSegment(t,e,i,!0))},closestPointOnSegment:function(t,e,i){return this._sqClosestPointOnSegment(t,e,i)},_simplifyDP:function(t,e){var n=t.length,o=typeof Uint8Array!=i+""?Uint8Array:Array,s=new o(n);s[0]=s[n-1]=1,this._simplifyDPStep(t,s,e,0,n-1);var a,r=[];for(a=0;n>a;a++)s[a]&&r.push(t[a]);return r},_simplifyDPStep:function(t,e,i,n,o){var s,a,r,h=0;for(a=n+1;o-1>=a;a++)r=this._sqClosestPointOnSegment(t[a],t[n],t[o],!0),r>h&&(s=a,h=r);h>i&&(e[s]=1,this._simplifyDPStep(t,e,i,n,s),this._simplifyDPStep(t,e,i,s,o))},_reducePoints:function(t,e){for(var i=[t[0]],n=1,o=0,s=t.length;s>n;n++)this._sqDist(t[n],t[o])>e&&(i.push(t[n]),o=n);return s-1>o&&i.push(t[s-1]),i},clipSegment:function(t,e,i,n){var o,s,a,r=n?this._lastCode:this._getBitCode(t,i),h=this._getBitCode(e,i);for(this._lastCode=h;;){if(!(r|h))return[t,e];if(r&h)return!1;o=r||h,s=this._getEdgeIntersection(t,e,o,i),a=this._getBitCode(s,i),o===r?(t=s,r=a):(e=s,h=a)}},_getEdgeIntersection:function(t,e,i,n){var s=e.x-t.x,a=e.y-t.y,r=n.min,h=n.max;return 8&i?new o.Point(t.x+s*(h.y-t.y)/a,h.y):4&i?new o.Point(t.x+s*(r.y-t.y)/a,r.y):2&i?new o.Point(h.x,t.y+a*(h.x-t.x)/s):1&i?new o.Point(r.x,t.y+a*(r.x-t.x)/s):void 0},_getBitCode:function(t,e){var i=0;return t.x<e.min.x?i|=1:t.x>e.max.x&&(i|=2),t.y<e.min.y?i|=4:t.y>e.max.y&&(i|=8),i},_sqDist:function(t,e){var i=e.x-t.x,n=e.y-t.y;return i*i+n*n},_sqClosestPointOnSegment:function(t,e,i,n){var s,a=e.x,r=e.y,h=i.x-a,l=i.y-r,u=h*h+l*l;return u>0&&(s=((t.x-a)*h+(t.y-r)*l)/u,s>1?(a=i.x,r=i.y):s>0&&(a+=h*s,r+=l*s)),h=t.x-a,l=t.y-r,n?h*h+l*l:new o.Point(a,r)}},o.Polyline=o.Path.extend({initialize:function(t,e){o.Path.prototype.initialize.call(this,e),this._latlngs=this._convertLatLngs(t)},options:{smoothFactor:1,noClip:!1},projectLatlngs:function(){this._originalPoints=[];for(var t=0,e=this._latlngs.length;e>t;t++)this._originalPoints[t]=this._map.latLngToLayerPoint(this._latlngs[t])},getPathString:function(){for(var t=0,e=this._parts.length,i="";e>t;t++)i+=this._getPathPartStr(this._parts[t]);return i},getLatLngs:function(){return this._latlngs},setLatLngs:function(t){return this._latlngs=this._convertLatLngs(t),this.redraw()},addLatLng:function(t){return this._latlngs.push(o.latLng(t)),this.redraw()},spliceLatLngs:function(){var t=[].splice.apply(this._latlngs,arguments);return this._convertLatLngs(this._latlngs,!0),this.redraw(),t},closestLayerPoint:function(t){for(var e,i,n=1/0,s=this._parts,a=null,r=0,h=s.length;h>r;r++)for(var l=s[r],u=1,c=l.length;c>u;u++){e=l[u-1],i=l[u];var d=o.LineUtil._sqClosestPointOnSegment(t,e,i,!0);n>d&&(n=d,a=o.LineUtil._sqClosestPointOnSegment(t,e,i))}return a&&(a.distance=Math.sqrt(n)),a},getBounds:function(){return new o.LatLngBounds(this.getLatLngs())},_convertLatLngs:function(t,e){var i,n,s=e?t:[];for(i=0,n=t.length;n>i;i++){if(o.Util.isArray(t[i])&&"number"!=typeof t[i][0])return;s[i]=o.latLng(t[i])}return s},_initEvents:function(){o.Path.prototype._initEvents.call(this)},_getPathPartStr:function(t){for(var e,i=o.Path.VML,n=0,s=t.length,a="";s>n;n++)e=t[n],i&&e._round(),a+=(n?"L":"M")+e.x+" "+e.y;return a},_clipPoints:function(){var t,e,i,n=this._originalPoints,s=n.length;if(this.options.noClip)return void(this._parts=[n]);this._parts=[];var a=this._parts,r=this._map._pathViewport,h=o.LineUtil;for(t=0,e=0;s-1>t;t++)i=h.clipSegment(n[t],n[t+1],r,t),i&&(a[e]=a[e]||[],a[e].push(i[0]),(i[1]!==n[t+1]||t===s-2)&&(a[e].push(i[1]),e++))},_simplifyPoints:function(){for(var t=this._parts,e=o.LineUtil,i=0,n=t.length;n>i;i++)t[i]=e.simplify(t[i],this.options.smoothFactor)},_updatePath:function(){this._map&&(this._clipPoints(),this._simplifyPoints(),o.Path.prototype._updatePath.call(this))}}),o.polyline=function(t,e){return new o.Polyline(t,e)},o.PolyUtil={},o.PolyUtil.clipPolygon=function(t,e){var i,n,s,a,r,h,l,u,c,d=[1,4,2,8],p=o.LineUtil;for(n=0,l=t.length;l>n;n++)t[n]._code=p._getBitCode(t[n],e);for(a=0;4>a;a++){for(u=d[a],i=[],n=0,l=t.length,s=l-1;l>n;s=n++)r=t[n],h=t[s],r._code&u?h._code&u||(c=p._getEdgeIntersection(h,r,u,e),c._code=p._getBitCode(c,e),i.push(c)):(h._code&u&&(c=p._getEdgeIntersection(h,r,u,e),c._code=p._getBitCode(c,e),i.push(c)),i.push(r));t=i}return t},o.Polygon=o.Polyline.extend({options:{fill:!0},initialize:function(t,e){o.Polyline.prototype.initialize.call(this,t,e),this._initWithHoles(t)},_initWithHoles:function(t){var e,i,n;if(t&&o.Util.isArray(t[0])&&"number"!=typeof t[0][0])for(this._latlngs=this._convertLatLngs(t[0]),this._holes=t.slice(1),e=0,i=this._holes.length;i>e;e++)n=this._holes[e]=this._convertLatLngs(this._holes[e]),n[0].equals(n[n.length-1])&&n.pop();t=this._latlngs,t.length>=2&&t[0].equals(t[t.length-1])&&t.pop()},projectLatlngs:function(){if(o.Polyline.prototype.projectLatlngs.call(this),this._holePoints=[],this._holes){var t,e,i,n;for(t=0,i=this._holes.length;i>t;t++)for(this._holePoints[t]=[],e=0,n=this._holes[t].length;n>e;e++)this._holePoints[t][e]=this._map.latLngToLayerPoint(this._holes[t][e])}},setLatLngs:function(t){return t&&o.Util.isArray(t[0])&&"number"!=typeof t[0][0]?(this._initWithHoles(t),this.redraw()):o.Polyline.prototype.setLatLngs.call(this,t)},_clipPoints:function(){var t=this._originalPoints,e=[];if(this._parts=[t].concat(this._holePoints),!this.options.noClip){for(var i=0,n=this._parts.length;n>i;i++){var s=o.PolyUtil.clipPolygon(this._parts[i],this._map._pathViewport);s.length&&e.push(s)}this._parts=e}},_getPathPartStr:function(t){var e=o.Polyline.prototype._getPathPartStr.call(this,t);return e+(o.Browser.svg?"z":"x")}}),o.polygon=function(t,e){return new o.Polygon(t,e)},function(){function t(t){return o.FeatureGroup.extend({initialize:function(t,e){this._layers={},this._options=e,this.setLatLngs(t)},setLatLngs:function(e){var i=0,n=e.length;for(this.eachLayer(function(t){n>i?t.setLatLngs(e[i++]):this.removeLayer(t)},this);n>i;)this.addLayer(new t(e[i++],this._options));return this},getLatLngs:function(){var t=[];return this.eachLayer(function(e){t.push(e.getLatLngs())}),t}})}o.MultiPolyline=t(o.Polyline),o.MultiPolygon=t(o.Polygon),o.multiPolyline=function(t,e){return new o.MultiPolyline(t,e)},o.multiPolygon=function(t,e){return new o.MultiPolygon(t,e)}}(),o.Rectangle=o.Polygon.extend({initialize:function(t,e){o.Polygon.prototype.initialize.call(this,this._boundsToLatLngs(t),e)},setBounds:function(t){this.setLatLngs(this._boundsToLatLngs(t))},_boundsToLatLngs:function(t){return t=o.latLngBounds(t),[t.getSouthWest(),t.getNorthWest(),t.getNorthEast(),t.getSouthEast()]}}),o.rectangle=function(t,e){return new o.Rectangle(t,e)},o.Circle=o.Path.extend({initialize:function(t,e,i){o.Path.prototype.initialize.call(this,i),this._latlng=o.latLng(t),this._mRadius=e},options:{fill:!0},setLatLng:function(t){return this._latlng=o.latLng(t),this.redraw()},setRadius:function(t){return this._mRadius=t,this.redraw()},projectLatlngs:function(){var t=this._getLngRadius(),e=this._latlng,i=this._map.latLngToLayerPoint([e.lat,e.lng-t]);this._point=this._map.latLngToLayerPoint(e),this._radius=Math.max(this._point.x-i.x,1)},getBounds:function(){var t=this._getLngRadius(),e=this._mRadius/40075017*360,i=this._latlng;return new o.LatLngBounds([i.lat-e,i.lng-t],[i.lat+e,i.lng+t])},getLatLng:function(){return this._latlng},getPathString:function(){var t=this._point,e=this._radius;return this._checkIfEmpty()?"":o.Browser.svg?"M"+t.x+","+(t.y-e)+"A"+e+","+e+",0,1,1,"+(t.x-.1)+","+(t.y-e)+" z":(t._round(),e=Math.round(e),"AL "+t.x+","+t.y+" "+e+","+e+" 0,23592600")},getRadius:function(){return this._mRadius},_getLatRadius:function(){return this._mRadius/40075017*360},_getLngRadius:function(){return this._getLatRadius()/Math.cos(o.LatLng.DEG_TO_RAD*this._latlng.lat)},_checkIfEmpty:function(){if(!this._map)return!1;var t=this._map._pathViewport,e=this._radius,i=this._point;return i.x-e>t.max.x||i.y-e>t.max.y||i.x+e<t.min.x||i.y+e<t.min.y}}),o.circle=function(t,e,i){return new o.Circle(t,e,i)},o.CircleMarker=o.Circle.extend({options:{radius:10,weight:2},initialize:function(t,e){o.Circle.prototype.initialize.call(this,t,null,e),this._radius=this.options.radius},projectLatlngs:function(){this._point=this._map.latLngToLayerPoint(this._latlng)},_updateStyle:function(){o.Circle.prototype._updateStyle.call(this),this.setRadius(this.options.radius)},setLatLng:function(t){return o.Circle.prototype.setLatLng.call(this,t),this._popup&&this._popup._isOpen&&this._popup.setLatLng(t),this},setRadius:function(t){return this.options.radius=this._radius=t,this.redraw()},getRadius:function(){return this._radius}}),o.circleMarker=function(t,e){return new o.CircleMarker(t,e)},o.Polyline.include(o.Path.CANVAS?{_containsPoint:function(t,e){var i,n,s,a,r,h,l,u=this.options.weight/2;for(o.Browser.touch&&(u+=10),i=0,a=this._parts.length;a>i;i++)for(l=this._parts[i],n=0,r=l.length,s=r-1;r>n;s=n++)if((e||0!==n)&&(h=o.LineUtil.pointToSegmentDistance(t,l[s],l[n]),u>=h))return!0;return!1}}:{}),o.Polygon.include(o.Path.CANVAS?{_containsPoint:function(t){var e,i,n,s,a,r,h,l,u=!1;if(o.Polyline.prototype._containsPoint.call(this,t,!0))return!0;for(s=0,h=this._parts.length;h>s;s++)for(e=this._parts[s],a=0,l=e.length,r=l-1;l>a;r=a++)i=e[a],n=e[r],i.y>t.y!=n.y>t.y&&t.x<(n.x-i.x)*(t.y-i.y)/(n.y-i.y)+i.x&&(u=!u);return u}}:{}),o.Circle.include(o.Path.CANVAS?{_drawPath:function(){var t=this._point;this._ctx.beginPath(),this._ctx.arc(t.x,t.y,this._radius,0,2*Math.PI,!1)},_containsPoint:function(t){var e=this._point,i=this.options.stroke?this.options.weight/2:0;return t.distanceTo(e)<=this._radius+i}}:{}),o.CircleMarker.include(o.Path.CANVAS?{_updateStyle:function(){o.Path.prototype._updateStyle.call(this)}}:{}),o.GeoJSON=o.FeatureGroup.extend({initialize:function(t,e){o.setOptions(this,e),this._layers={},t&&this.addData(t)},addData:function(t){var e,i,n,s=o.Util.isArray(t)?t:t.features;if(s){for(e=0,i=s.length;i>e;e++)n=s[e],(n.geometries||n.geometry||n.features||n.coordinates)&&this.addData(s[e]);return this}var a=this.options;if(!a.filter||a.filter(t)){var r=o.GeoJSON.geometryToLayer(t,a.pointToLayer,a.coordsToLatLng,a);return r.feature=o.GeoJSON.asFeature(t),r.defaultOptions=r.options,this.resetStyle(r),a.onEachFeature&&a.onEachFeature(t,r),this.addLayer(r)}},resetStyle:function(t){var e=this.options.style;e&&(o.Util.extend(t.options,t.defaultOptions),this._setLayerStyle(t,e))},setStyle:function(t){this.eachLayer(function(e){this._setLayerStyle(e,t)},this)},_setLayerStyle:function(t,e){"function"==typeof e&&(e=e(t.feature)),t.setStyle&&t.setStyle(e)}}),o.extend(o.GeoJSON,{geometryToLayer:function(t,e,i,n){var s,a,r,h,l="Feature"===t.type?t.geometry:t,u=l.coordinates,c=[];switch(i=i||this.coordsToLatLng,l.type){case"Point":return s=i(u),e?e(t,s):new o.Marker(s);case"MultiPoint":for(r=0,h=u.length;h>r;r++)s=i(u[r]),c.push(e?e(t,s):new o.Marker(s));return new o.FeatureGroup(c);case"LineString":return a=this.coordsToLatLngs(u,0,i),new o.Polyline(a,n);case"Polygon":if(2===u.length&&!u[1].length)throw new Error("Invalid GeoJSON object.");return a=this.coordsToLatLngs(u,1,i),new o.Polygon(a,n);case"MultiLineString":return a=this.coordsToLatLngs(u,1,i),new o.MultiPolyline(a,n);case"MultiPolygon":return a=this.coordsToLatLngs(u,2,i),new o.MultiPolygon(a,n);case"GeometryCollection":for(r=0,h=l.geometries.length;h>r;r++)c.push(this.geometryToLayer({geometry:l.geometries[r],type:"Feature",properties:t.properties},e,i,n));return new o.FeatureGroup(c);default:throw new Error("Invalid GeoJSON object.")}},coordsToLatLng:function(t){return new o.LatLng(t[1],t[0],t[2])},coordsToLatLngs:function(t,e,i){var n,o,s,a=[];for(o=0,s=t.length;s>o;o++)n=e?this.coordsToLatLngs(t[o],e-1,i):(i||this.coordsToLatLng)(t[o]),a.push(n);return a},latLngToCoords:function(t){var e=[t.lng,t.lat];return t.alt!==i&&e.push(t.alt),e},latLngsToCoords:function(t){for(var e=[],i=0,n=t.length;n>i;i++)e.push(o.GeoJSON.latLngToCoords(t[i]));return e},getFeature:function(t,e){return t.feature?o.extend({},t.feature,{geometry:e}):o.GeoJSON.asFeature(e)},asFeature:function(t){return"Feature"===t.type?t:{type:"Feature",properties:{},geometry:t}}});var a={toGeoJSON:function(){return o.GeoJSON.getFeature(this,{type:"Point",coordinates:o.GeoJSON.latLngToCoords(this.getLatLng())})}};o.Marker.include(a),o.Circle.include(a),o.CircleMarker.include(a),o.Polyline.include({toGeoJSON:function(){return o.GeoJSON.getFeature(this,{type:"LineString",coordinates:o.GeoJSON.latLngsToCoords(this.getLatLngs())})}}),o.Polygon.include({toGeoJSON:function(){var t,e,i,n=[o.GeoJSON.latLngsToCoords(this.getLatLngs())];if(n[0].push(n[0][0]),this._holes)for(t=0,e=this._holes.length;e>t;t++)i=o.GeoJSON.latLngsToCoords(this._holes[t]),i.push(i[0]),n.push(i);return o.GeoJSON.getFeature(this,{type:"Polygon",coordinates:n})}}),function(){function t(t){return function(){var e=[];return this.eachLayer(function(t){e.push(t.toGeoJSON().geometry.coordinates)}),o.GeoJSON.getFeature(this,{type:t,coordinates:e})}}o.MultiPolyline.include({toGeoJSON:t("MultiLineString")}),o.MultiPolygon.include({toGeoJSON:t("MultiPolygon")}),o.LayerGroup.include({toGeoJSON:function(){var e,i=this.feature&&this.feature.geometry,n=[];if(i&&"MultiPoint"===i.type)return t("MultiPoint").call(this);var s=i&&"GeometryCollection"===i.type;return this.eachLayer(function(t){t.toGeoJSON&&(e=t.toGeoJSON(),n.push(s?e.geometry:o.GeoJSON.asFeature(e)))}),s?o.GeoJSON.getFeature(this,{geometries:n,type:"GeometryCollection"}):{type:"FeatureCollection",features:n}}})}(),o.geoJson=function(t,e){return new o.GeoJSON(t,e)},o.DomEvent={addListener:function(t,e,i,n){var s,a,r,h=o.stamp(i),l="_leaflet_"+e+h;return t[l]?this:(s=function(e){return i.call(n||t,e||o.DomEvent._getEvent())},o.Browser.pointer&&0===e.indexOf("touch")?this.addPointerListener(t,e,s,h):(o.Browser.touch&&"dblclick"===e&&this.addDoubleTapListener&&this.addDoubleTapListener(t,s,h),"addEventListener"in t?"mousewheel"===e?(t.addEventListener("DOMMouseScroll",s,!1),t.addEventListener(e,s,!1)):"mouseenter"===e||"mouseleave"===e?(a=s,r="mouseenter"===e?"mouseover":"mouseout",s=function(e){return o.DomEvent._checkMouse(t,e)?a(e):void 0},t.addEventListener(r,s,!1)):"click"===e&&o.Browser.android?(a=s,s=function(t){return o.DomEvent._filterClick(t,a)},t.addEventListener(e,s,!1)):t.addEventListener(e,s,!1):"attachEvent"in t&&t.attachEvent("on"+e,s),t[l]=s,this))},removeListener:function(t,e,i){var n=o.stamp(i),s="_leaflet_"+e+n,a=t[s];return a?(o.Browser.pointer&&0===e.indexOf("touch")?this.removePointerListener(t,e,n):o.Browser.touch&&"dblclick"===e&&this.removeDoubleTapListener?this.removeDoubleTapListener(t,n):"removeEventListener"in t?"mousewheel"===e?(t.removeEventListener("DOMMouseScroll",a,!1),t.removeEventListener(e,a,!1)):"mouseenter"===e||"mouseleave"===e?t.removeEventListener("mouseenter"===e?"mouseover":"mouseout",a,!1):t.removeEventListener(e,a,!1):"detachEvent"in t&&t.detachEvent("on"+e,a),t[s]=null,this):this},stopPropagation:function(t){return t.stopPropagation?t.stopPropagation():t.cancelBubble=!0,o.DomEvent._skipped(t),this},disableScrollPropagation:function(t){var e=o.DomEvent.stopPropagation;return o.DomEvent.on(t,"mousewheel",e).on(t,"MozMousePixelScroll",e)},disableClickPropagation:function(t){for(var e=o.DomEvent.stopPropagation,i=o.Draggable.START.length-1;i>=0;i--)o.DomEvent.on(t,o.Draggable.START[i],e);return o.DomEvent.on(t,"click",o.DomEvent._fakeStop).on(t,"dblclick",e)},preventDefault:function(t){return t.preventDefault?t.preventDefault():t.returnValue=!1,this},stop:function(t){return o.DomEvent.preventDefault(t).stopPropagation(t)},getMousePosition:function(t,e){if(!e)return new o.Point(t.clientX,t.clientY);var i=e.getBoundingClientRect();return new o.Point(t.clientX-i.left-e.clientLeft,t.clientY-i.top-e.clientTop)},getWheelDelta:function(t){var e=0;return t.wheelDelta&&(e=t.wheelDelta/120),t.detail&&(e=-t.detail/3),e},_skipEvents:{},_fakeStop:function(t){o.DomEvent._skipEvents[t.type]=!0},_skipped:function(t){var e=this._skipEvents[t.type];return this._skipEvents[t.type]=!1,e},_checkMouse:function(t,e){var i=e.relatedTarget;if(!i)return!0;try{for(;i&&i!==t;)i=i.parentNode}catch(n){return!1}return i!==t},_getEvent:function(){var e=t.event;if(!e)for(var i=arguments.callee.caller;i&&(e=i.arguments[0],!e||t.Event!==e.constructor);)i=i.caller;return e},_filterClick:function(t,e){var i=t.timeStamp||t.originalEvent.timeStamp,n=o.DomEvent._lastClick&&i-o.DomEvent._lastClick;return n&&n>100&&500>n||t.target._simulatedClick&&!t._simulated?void o.DomEvent.stop(t):(o.DomEvent._lastClick=i,e(t))}},o.DomEvent.on=o.DomEvent.addListener,o.DomEvent.off=o.DomEvent.removeListener,o.Draggable=o.Class.extend({includes:o.Mixin.Events,statics:{START:o.Browser.touch?["touchstart","mousedown"]:["mousedown"],END:{mousedown:"mouseup",touchstart:"touchend",pointerdown:"touchend",MSPointerDown:"touchend"},MOVE:{mousedown:"mousemove",touchstart:"touchmove",pointerdown:"touchmove",MSPointerDown:"touchmove"}},initialize:function(t,e){this._element=t,this._dragStartTarget=e||t},enable:function(){if(!this._enabled){for(var t=o.Draggable.START.length-1;t>=0;t--)o.DomEvent.on(this._dragStartTarget,o.Draggable.START[t],this._onDown,this);this._enabled=!0}},disable:function(){if(this._enabled){for(var t=o.Draggable.START.length-1;t>=0;t--)o.DomEvent.off(this._dragStartTarget,o.Draggable.START[t],this._onDown,this);this._enabled=!1,this._moved=!1}},_onDown:function(t){if(this._moved=!1,!(t.shiftKey||1!==t.which&&1!==t.button&&!t.touches||(o.DomEvent.stopPropagation(t),o.Draggable._disabled||(o.DomUtil.disableImageDrag(),o.DomUtil.disableTextSelection(),this._moving)))){var i=t.touches?t.touches[0]:t;this._startPoint=new o.Point(i.clientX,i.clientY),this._startPos=this._newPos=o.DomUtil.getPosition(this._element),o.DomEvent.on(e,o.Draggable.MOVE[t.type],this._onMove,this).on(e,o.Draggable.END[t.type],this._onUp,this)}},_onMove:function(t){if(t.touches&&t.touches.length>1)return void(this._moved=!0);var i=t.touches&&1===t.touches.length?t.touches[0]:t,n=new o.Point(i.clientX,i.clientY),s=n.subtract(this._startPoint);(s.x||s.y)&&(o.Browser.touch&&Math.abs(s.x)+Math.abs(s.y)<3||(o.DomEvent.preventDefault(t),this._moved||(this.fire("dragstart"),this._moved=!0,this._startPos=o.DomUtil.getPosition(this._element).subtract(s),o.DomUtil.addClass(e.body,"leaflet-dragging"),this._lastTarget=t.target||t.srcElement,o.DomUtil.addClass(this._lastTarget,"leaflet-drag-target")),this._newPos=this._startPos.add(s),this._moving=!0,o.Util.cancelAnimFrame(this._animRequest),this._animRequest=o.Util.requestAnimFrame(this._updatePosition,this,!0,this._dragStartTarget)))},_updatePosition:function(){this.fire("predrag"),o.DomUtil.setPosition(this._element,this._newPos),this.fire("drag")},_onUp:function(){o.DomUtil.removeClass(e.body,"leaflet-dragging"),this._lastTarget&&(o.DomUtil.removeClass(this._lastTarget,"leaflet-drag-target"),this._lastTarget=null);for(var t in o.Draggable.MOVE)o.DomEvent.off(e,o.Draggable.MOVE[t],this._onMove).off(e,o.Draggable.END[t],this._onUp);o.DomUtil.enableImageDrag(),o.DomUtil.enableTextSelection(),this._moved&&this._moving&&(o.Util.cancelAnimFrame(this._animRequest),this.fire("dragend",{distance:this._newPos.distanceTo(this._startPos)})),this._moving=!1}}),o.Handler=o.Class.extend({initialize:function(t){this._map=t},enable:function(){this._enabled||(this._enabled=!0,this.addHooks())},disable:function(){this._enabled&&(this._enabled=!1,this.removeHooks())},enabled:function(){return!!this._enabled}}),o.Map.mergeOptions({dragging:!0,inertia:!o.Browser.android23,inertiaDeceleration:3400,inertiaMaxSpeed:1/0,inertiaThreshold:o.Browser.touch?32:18,easeLinearity:.25,worldCopyJump:!1}),o.Map.Drag=o.Handler.extend({addHooks:function(){if(!this._draggable){var t=this._map;this._draggable=new o.Draggable(t._mapPane,t._container),this._draggable.on({dragstart:this._onDragStart,drag:this._onDrag,dragend:this._onDragEnd},this),t.options.worldCopyJump&&(this._draggable.on("predrag",this._onPreDrag,this),t.on("viewreset",this._onViewReset,this),t.whenReady(this._onViewReset,this))}this._draggable.enable()},removeHooks:function(){this._draggable.disable()},moved:function(){return this._draggable&&this._draggable._moved},_onDragStart:function(){var t=this._map;t._panAnim&&t._panAnim.stop(),t.fire("movestart").fire("dragstart"),t.options.inertia&&(this._positions=[],this._times=[])},_onDrag:function(){if(this._map.options.inertia){var t=this._lastTime=+new Date,e=this._lastPos=this._draggable._newPos;this._positions.push(e),this._times.push(t),t-this._times[0]>200&&(this._positions.shift(),this._times.shift())}this._map.fire("move").fire("drag")},_onViewReset:function(){var t=this._map.getSize()._divideBy(2),e=this._map.latLngToLayerPoint([0,0]);this._initialWorldOffset=e.subtract(t).x,this._worldWidth=this._map.project([0,180]).x},_onPreDrag:function(){var t=this._worldWidth,e=Math.round(t/2),i=this._initialWorldOffset,n=this._draggable._newPos.x,o=(n-e+i)%t+e-i,s=(n+e+i)%t-e-i,a=Math.abs(o+i)<Math.abs(s+i)?o:s;this._draggable._newPos.x=a},_onDragEnd:function(t){var e=this._map,i=e.options,n=+new Date-this._lastTime,s=!i.inertia||n>i.inertiaThreshold||!this._positions[0];if(e.fire("dragend",t),s)e.fire("moveend");else{var a=this._lastPos.subtract(this._positions[0]),r=(this._lastTime+n-this._times[0])/1e3,h=i.easeLinearity,l=a.multiplyBy(h/r),u=l.distanceTo([0,0]),c=Math.min(i.inertiaMaxSpeed,u),d=l.multiplyBy(c/u),p=c/(i.inertiaDeceleration*h),_=d.multiplyBy(-p/2).round();_.x&&_.y?(_=e._limitOffset(_,e.options.maxBounds),o.Util.requestAnimFrame(function(){e.panBy(_,{duration:p,easeLinearity:h,noMoveStart:!0})})):e.fire("moveend")}}}),o.Map.addInitHook("addHandler","dragging",o.Map.Drag),o.Map.mergeOptions({doubleClickZoom:!0}),o.Map.DoubleClickZoom=o.Handler.extend({addHooks:function(){this._map.on("dblclick",this._onDoubleClick,this)},removeHooks:function(){this._map.off("dblclick",this._onDoubleClick,this)},_onDoubleClick:function(t){var e=this._map,i=e.getZoom()+(t.originalEvent.shiftKey?-1:1);"center"===e.options.doubleClickZoom?e.setZoom(i):e.setZoomAround(t.containerPoint,i)}}),o.Map.addInitHook("addHandler","doubleClickZoom",o.Map.DoubleClickZoom),o.Map.mergeOptions({scrollWheelZoom:!0}),o.Map.ScrollWheelZoom=o.Handler.extend({addHooks:function(){o.DomEvent.on(this._map._container,"mousewheel",this._onWheelScroll,this),o.DomEvent.on(this._map._container,"MozMousePixelScroll",o.DomEvent.preventDefault),this._delta=0},removeHooks:function(){o.DomEvent.off(this._map._container,"mousewheel",this._onWheelScroll),o.DomEvent.off(this._map._container,"MozMousePixelScroll",o.DomEvent.preventDefault)},_onWheelScroll:function(t){var e=o.DomEvent.getWheelDelta(t);this._delta+=e,this._lastMousePos=this._map.mouseEventToContainerPoint(t),this._startTime||(this._startTime=+new Date);var i=Math.max(40-(+new Date-this._startTime),0);clearTimeout(this._timer),this._timer=setTimeout(o.bind(this._performZoom,this),i),o.DomEvent.preventDefault(t),o.DomEvent.stopPropagation(t)},_performZoom:function(){var t=this._map,e=this._delta,i=t.getZoom();e=e>0?Math.ceil(e):Math.floor(e),e=Math.max(Math.min(e,4),-4),e=t._limitZoom(i+e)-i,this._delta=0,this._startTime=null,e&&("center"===t.options.scrollWheelZoom?t.setZoom(i+e):t.setZoomAround(this._lastMousePos,i+e))}}),o.Map.addInitHook("addHandler","scrollWheelZoom",o.Map.ScrollWheelZoom),o.extend(o.DomEvent,{_touchstart:o.Browser.msPointer?"MSPointerDown":o.Browser.pointer?"pointerdown":"touchstart",_touchend:o.Browser.msPointer?"MSPointerUp":o.Browser.pointer?"pointerup":"touchend",addDoubleTapListener:function(t,i,n){function s(t){var e;if(o.Browser.pointer?(_.push(t.pointerId),e=_.length):e=t.touches.length,!(e>1)){var i=Date.now(),n=i-(r||i);h=t.touches?t.touches[0]:t,l=n>0&&u>=n,r=i}}function a(t){if(o.Browser.pointer){var e=_.indexOf(t.pointerId);if(-1===e)return;_.splice(e,1)}if(l){if(o.Browser.pointer){var n,s={};for(var a in h)n=h[a],s[a]="function"==typeof n?n.bind(h):n;h=s}h.type="dblclick",i(h),r=null}}var r,h,l=!1,u=250,c="_leaflet_",d=this._touchstart,p=this._touchend,_=[];t[c+d+n]=s,t[c+p+n]=a;var m=o.Browser.pointer?e.documentElement:t;return t.addEventListener(d,s,!1),m.addEventListener(p,a,!1),o.Browser.pointer&&m.addEventListener(o.DomEvent.POINTER_CANCEL,a,!1),this},removeDoubleTapListener:function(t,i){var n="_leaflet_";return t.removeEventListener(this._touchstart,t[n+this._touchstart+i],!1),(o.Browser.pointer?e.documentElement:t).removeEventListener(this._touchend,t[n+this._touchend+i],!1),o.Browser.pointer&&e.documentElement.removeEventListener(o.DomEvent.POINTER_CANCEL,t[n+this._touchend+i],!1),this}}),o.extend(o.DomEvent,{POINTER_DOWN:o.Browser.msPointer?"MSPointerDown":"pointerdown",POINTER_MOVE:o.Browser.msPointer?"MSPointerMove":"pointermove",POINTER_UP:o.Browser.msPointer?"MSPointerUp":"pointerup",POINTER_CANCEL:o.Browser.msPointer?"MSPointerCancel":"pointercancel",_pointers:[],_pointerDocumentListener:!1,addPointerListener:function(t,e,i,n){switch(e){case"touchstart":return this.addPointerListenerStart(t,e,i,n);case"touchend":return this.addPointerListenerEnd(t,e,i,n);case"touchmove":return this.addPointerListenerMove(t,e,i,n);default:throw"Unknown touch event type"}},addPointerListenerStart:function(t,i,n,s){var a="_leaflet_",r=this._pointers,h=function(t){o.DomEvent.preventDefault(t);for(var e=!1,i=0;i<r.length;i++)if(r[i].pointerId===t.pointerId){e=!0; -break}e||r.push(t),t.touches=r.slice(),t.changedTouches=[t],n(t)};if(t[a+"touchstart"+s]=h,t.addEventListener(this.POINTER_DOWN,h,!1),!this._pointerDocumentListener){var l=function(t){for(var e=0;e<r.length;e++)if(r[e].pointerId===t.pointerId){r.splice(e,1);break}};e.documentElement.addEventListener(this.POINTER_UP,l,!1),e.documentElement.addEventListener(this.POINTER_CANCEL,l,!1),this._pointerDocumentListener=!0}return this},addPointerListenerMove:function(t,e,i,n){function o(t){if(t.pointerType!==t.MSPOINTER_TYPE_MOUSE&&"mouse"!==t.pointerType||0!==t.buttons){for(var e=0;e<a.length;e++)if(a[e].pointerId===t.pointerId){a[e]=t;break}t.touches=a.slice(),t.changedTouches=[t],i(t)}}var s="_leaflet_",a=this._pointers;return t[s+"touchmove"+n]=o,t.addEventListener(this.POINTER_MOVE,o,!1),this},addPointerListenerEnd:function(t,e,i,n){var o="_leaflet_",s=this._pointers,a=function(t){for(var e=0;e<s.length;e++)if(s[e].pointerId===t.pointerId){s.splice(e,1);break}t.touches=s.slice(),t.changedTouches=[t],i(t)};return t[o+"touchend"+n]=a,t.addEventListener(this.POINTER_UP,a,!1),t.addEventListener(this.POINTER_CANCEL,a,!1),this},removePointerListener:function(t,e,i){var n="_leaflet_",o=t[n+e+i];switch(e){case"touchstart":t.removeEventListener(this.POINTER_DOWN,o,!1);break;case"touchmove":t.removeEventListener(this.POINTER_MOVE,o,!1);break;case"touchend":t.removeEventListener(this.POINTER_UP,o,!1),t.removeEventListener(this.POINTER_CANCEL,o,!1)}return this}}),o.Map.mergeOptions({touchZoom:o.Browser.touch&&!o.Browser.android23,bounceAtZoomLimits:!0}),o.Map.TouchZoom=o.Handler.extend({addHooks:function(){o.DomEvent.on(this._map._container,"touchstart",this._onTouchStart,this)},removeHooks:function(){o.DomEvent.off(this._map._container,"touchstart",this._onTouchStart,this)},_onTouchStart:function(t){var i=this._map;if(t.touches&&2===t.touches.length&&!i._animatingZoom&&!this._zooming){var n=i.mouseEventToLayerPoint(t.touches[0]),s=i.mouseEventToLayerPoint(t.touches[1]),a=i._getCenterLayerPoint();this._startCenter=n.add(s)._divideBy(2),this._startDist=n.distanceTo(s),this._moved=!1,this._zooming=!0,this._centerOffset=a.subtract(this._startCenter),i._panAnim&&i._panAnim.stop(),o.DomEvent.on(e,"touchmove",this._onTouchMove,this).on(e,"touchend",this._onTouchEnd,this),o.DomEvent.preventDefault(t)}},_onTouchMove:function(t){var e=this._map;if(t.touches&&2===t.touches.length&&this._zooming){var i=e.mouseEventToLayerPoint(t.touches[0]),n=e.mouseEventToLayerPoint(t.touches[1]);this._scale=i.distanceTo(n)/this._startDist,this._delta=i._add(n)._divideBy(2)._subtract(this._startCenter),1!==this._scale&&(e.options.bounceAtZoomLimits||!(e.getZoom()===e.getMinZoom()&&this._scale<1||e.getZoom()===e.getMaxZoom()&&this._scale>1))&&(this._moved||(o.DomUtil.addClass(e._mapPane,"leaflet-touching"),e.fire("movestart").fire("zoomstart"),this._moved=!0),o.Util.cancelAnimFrame(this._animRequest),this._animRequest=o.Util.requestAnimFrame(this._updateOnMove,this,!0,this._map._container),o.DomEvent.preventDefault(t))}},_updateOnMove:function(){var t=this._map,e=this._getScaleOrigin(),i=t.layerPointToLatLng(e),n=t.getScaleZoom(this._scale);t._animateZoom(i,n,this._startCenter,this._scale,this._delta,!1,!0)},_onTouchEnd:function(){if(!this._moved||!this._zooming)return void(this._zooming=!1);var t=this._map;this._zooming=!1,o.DomUtil.removeClass(t._mapPane,"leaflet-touching"),o.Util.cancelAnimFrame(this._animRequest),o.DomEvent.off(e,"touchmove",this._onTouchMove).off(e,"touchend",this._onTouchEnd);var i=this._getScaleOrigin(),n=t.layerPointToLatLng(i),s=t.getZoom(),a=t.getScaleZoom(this._scale)-s,r=a>0?Math.ceil(a):Math.floor(a),h=t._limitZoom(s+r),l=t.getZoomScale(h)/this._scale;t._animateZoom(n,h,i,l)},_getScaleOrigin:function(){var t=this._centerOffset.subtract(this._delta).divideBy(this._scale);return this._startCenter.add(t)}}),o.Map.addInitHook("addHandler","touchZoom",o.Map.TouchZoom),o.Map.mergeOptions({tap:!0,tapTolerance:15}),o.Map.Tap=o.Handler.extend({addHooks:function(){o.DomEvent.on(this._map._container,"touchstart",this._onDown,this)},removeHooks:function(){o.DomEvent.off(this._map._container,"touchstart",this._onDown,this)},_onDown:function(t){if(t.touches){if(o.DomEvent.preventDefault(t),this._fireClick=!0,t.touches.length>1)return this._fireClick=!1,void clearTimeout(this._holdTimeout);var i=t.touches[0],n=i.target;this._startPos=this._newPos=new o.Point(i.clientX,i.clientY),n.tagName&&"a"===n.tagName.toLowerCase()&&o.DomUtil.addClass(n,"leaflet-active"),this._holdTimeout=setTimeout(o.bind(function(){this._isTapValid()&&(this._fireClick=!1,this._onUp(),this._simulateEvent("contextmenu",i))},this),1e3),o.DomEvent.on(e,"touchmove",this._onMove,this).on(e,"touchend",this._onUp,this)}},_onUp:function(t){if(clearTimeout(this._holdTimeout),o.DomEvent.off(e,"touchmove",this._onMove,this).off(e,"touchend",this._onUp,this),this._fireClick&&t&&t.changedTouches){var i=t.changedTouches[0],n=i.target;n&&n.tagName&&"a"===n.tagName.toLowerCase()&&o.DomUtil.removeClass(n,"leaflet-active"),this._isTapValid()&&this._simulateEvent("click",i)}},_isTapValid:function(){return this._newPos.distanceTo(this._startPos)<=this._map.options.tapTolerance},_onMove:function(t){var e=t.touches[0];this._newPos=new o.Point(e.clientX,e.clientY)},_simulateEvent:function(i,n){var o=e.createEvent("MouseEvents");o._simulated=!0,n.target._simulatedClick=!0,o.initMouseEvent(i,!0,!0,t,1,n.screenX,n.screenY,n.clientX,n.clientY,!1,!1,!1,!1,0,null),n.target.dispatchEvent(o)}}),o.Browser.touch&&!o.Browser.pointer&&o.Map.addInitHook("addHandler","tap",o.Map.Tap),o.Map.mergeOptions({boxZoom:!0}),o.Map.BoxZoom=o.Handler.extend({initialize:function(t){this._map=t,this._container=t._container,this._pane=t._panes.overlayPane,this._moved=!1},addHooks:function(){o.DomEvent.on(this._container,"mousedown",this._onMouseDown,this)},removeHooks:function(){o.DomEvent.off(this._container,"mousedown",this._onMouseDown),this._moved=!1},moved:function(){return this._moved},_onMouseDown:function(t){return this._moved=!1,!t.shiftKey||1!==t.which&&1!==t.button?!1:(o.DomUtil.disableTextSelection(),o.DomUtil.disableImageDrag(),this._startLayerPoint=this._map.mouseEventToLayerPoint(t),void o.DomEvent.on(e,"mousemove",this._onMouseMove,this).on(e,"mouseup",this._onMouseUp,this).on(e,"keydown",this._onKeyDown,this))},_onMouseMove:function(t){this._moved||(this._box=o.DomUtil.create("div","leaflet-zoom-box",this._pane),o.DomUtil.setPosition(this._box,this._startLayerPoint),this._container.style.cursor="crosshair",this._map.fire("boxzoomstart"));var e=this._startLayerPoint,i=this._box,n=this._map.mouseEventToLayerPoint(t),s=n.subtract(e),a=new o.Point(Math.min(n.x,e.x),Math.min(n.y,e.y));o.DomUtil.setPosition(i,a),this._moved=!0,i.style.width=Math.max(0,Math.abs(s.x)-4)+"px",i.style.height=Math.max(0,Math.abs(s.y)-4)+"px"},_finish:function(){this._moved&&(this._pane.removeChild(this._box),this._container.style.cursor=""),o.DomUtil.enableTextSelection(),o.DomUtil.enableImageDrag(),o.DomEvent.off(e,"mousemove",this._onMouseMove).off(e,"mouseup",this._onMouseUp).off(e,"keydown",this._onKeyDown)},_onMouseUp:function(t){this._finish();var e=this._map,i=e.mouseEventToLayerPoint(t);if(!this._startLayerPoint.equals(i)){var n=new o.LatLngBounds(e.layerPointToLatLng(this._startLayerPoint),e.layerPointToLatLng(i));e.fitBounds(n),e.fire("boxzoomend",{boxZoomBounds:n})}},_onKeyDown:function(t){27===t.keyCode&&this._finish()}}),o.Map.addInitHook("addHandler","boxZoom",o.Map.BoxZoom),o.Map.mergeOptions({keyboard:!0,keyboardPanOffset:80,keyboardZoomOffset:1}),o.Map.Keyboard=o.Handler.extend({keyCodes:{left:[37],right:[39],down:[40],up:[38],zoomIn:[187,107,61,171],zoomOut:[189,109,173]},initialize:function(t){this._map=t,this._setPanOffset(t.options.keyboardPanOffset),this._setZoomOffset(t.options.keyboardZoomOffset)},addHooks:function(){var t=this._map._container;-1===t.tabIndex&&(t.tabIndex="0"),o.DomEvent.on(t,"focus",this._onFocus,this).on(t,"blur",this._onBlur,this).on(t,"mousedown",this._onMouseDown,this),this._map.on("focus",this._addHooks,this).on("blur",this._removeHooks,this)},removeHooks:function(){this._removeHooks();var t=this._map._container;o.DomEvent.off(t,"focus",this._onFocus,this).off(t,"blur",this._onBlur,this).off(t,"mousedown",this._onMouseDown,this),this._map.off("focus",this._addHooks,this).off("blur",this._removeHooks,this)},_onMouseDown:function(){if(!this._focused){var i=e.body,n=e.documentElement,o=i.scrollTop||n.scrollTop,s=i.scrollLeft||n.scrollLeft;this._map._container.focus(),t.scrollTo(s,o)}},_onFocus:function(){this._focused=!0,this._map.fire("focus")},_onBlur:function(){this._focused=!1,this._map.fire("blur")},_setPanOffset:function(t){var e,i,n=this._panKeys={},o=this.keyCodes;for(e=0,i=o.left.length;i>e;e++)n[o.left[e]]=[-1*t,0];for(e=0,i=o.right.length;i>e;e++)n[o.right[e]]=[t,0];for(e=0,i=o.down.length;i>e;e++)n[o.down[e]]=[0,t];for(e=0,i=o.up.length;i>e;e++)n[o.up[e]]=[0,-1*t]},_setZoomOffset:function(t){var e,i,n=this._zoomKeys={},o=this.keyCodes;for(e=0,i=o.zoomIn.length;i>e;e++)n[o.zoomIn[e]]=t;for(e=0,i=o.zoomOut.length;i>e;e++)n[o.zoomOut[e]]=-t},_addHooks:function(){o.DomEvent.on(e,"keydown",this._onKeyDown,this)},_removeHooks:function(){o.DomEvent.off(e,"keydown",this._onKeyDown,this)},_onKeyDown:function(t){var e=t.keyCode,i=this._map;if(e in this._panKeys){if(i._panAnim&&i._panAnim._inProgress)return;i.panBy(this._panKeys[e]),i.options.maxBounds&&i.panInsideBounds(i.options.maxBounds)}else{if(!(e in this._zoomKeys))return;i.setZoom(i.getZoom()+this._zoomKeys[e])}o.DomEvent.stop(t)}}),o.Map.addInitHook("addHandler","keyboard",o.Map.Keyboard),o.Handler.MarkerDrag=o.Handler.extend({initialize:function(t){this._marker=t},addHooks:function(){var t=this._marker._icon;this._draggable||(this._draggable=new o.Draggable(t,t)),this._draggable.on("dragstart",this._onDragStart,this).on("drag",this._onDrag,this).on("dragend",this._onDragEnd,this),this._draggable.enable(),o.DomUtil.addClass(this._marker._icon,"leaflet-marker-draggable")},removeHooks:function(){this._draggable.off("dragstart",this._onDragStart,this).off("drag",this._onDrag,this).off("dragend",this._onDragEnd,this),this._draggable.disable(),o.DomUtil.removeClass(this._marker._icon,"leaflet-marker-draggable")},moved:function(){return this._draggable&&this._draggable._moved},_onDragStart:function(){this._marker.closePopup().fire("movestart").fire("dragstart")},_onDrag:function(){var t=this._marker,e=t._shadow,i=o.DomUtil.getPosition(t._icon),n=t._map.layerPointToLatLng(i);e&&o.DomUtil.setPosition(e,i),t._latlng=n,t.fire("move",{latlng:n}).fire("drag")},_onDragEnd:function(t){this._marker.fire("moveend").fire("dragend",t)}}),o.Control=o.Class.extend({options:{position:"topright"},initialize:function(t){o.setOptions(this,t)},getPosition:function(){return this.options.position},setPosition:function(t){var e=this._map;return e&&e.removeControl(this),this.options.position=t,e&&e.addControl(this),this},getContainer:function(){return this._container},addTo:function(t){this._map=t;var e=this._container=this.onAdd(t),i=this.getPosition(),n=t._controlCorners[i];return o.DomUtil.addClass(e,"leaflet-control"),-1!==i.indexOf("bottom")?n.insertBefore(e,n.firstChild):n.appendChild(e),this},removeFrom:function(t){var e=this.getPosition(),i=t._controlCorners[e];return i.removeChild(this._container),this._map=null,this.onRemove&&this.onRemove(t),this},_refocusOnMap:function(){this._map&&this._map.getContainer().focus()}}),o.control=function(t){return new o.Control(t)},o.Map.include({addControl:function(t){return t.addTo(this),this},removeControl:function(t){return t.removeFrom(this),this},_initControlPos:function(){function t(t,s){var a=i+t+" "+i+s;e[t+s]=o.DomUtil.create("div",a,n)}var e=this._controlCorners={},i="leaflet-",n=this._controlContainer=o.DomUtil.create("div",i+"control-container",this._container);t("top","left"),t("top","right"),t("bottom","left"),t("bottom","right")},_clearControlPos:function(){this._container.removeChild(this._controlContainer)}}),o.Control.Zoom=o.Control.extend({options:{position:"topleft",zoomInText:"+",zoomInTitle:"Zoom in",zoomOutText:"-",zoomOutTitle:"Zoom out"},onAdd:function(t){var e="leaflet-control-zoom",i=o.DomUtil.create("div",e+" leaflet-bar");return this._map=t,this._zoomInButton=this._createButton(this.options.zoomInText,this.options.zoomInTitle,e+"-in",i,this._zoomIn,this),this._zoomOutButton=this._createButton(this.options.zoomOutText,this.options.zoomOutTitle,e+"-out",i,this._zoomOut,this),this._updateDisabled(),t.on("zoomend zoomlevelschange",this._updateDisabled,this),i},onRemove:function(t){t.off("zoomend zoomlevelschange",this._updateDisabled,this)},_zoomIn:function(t){this._map.zoomIn(t.shiftKey?3:1)},_zoomOut:function(t){this._map.zoomOut(t.shiftKey?3:1)},_createButton:function(t,e,i,n,s,a){var r=o.DomUtil.create("a",i,n);r.innerHTML=t,r.href="#",r.title=e;var h=o.DomEvent.stopPropagation;return o.DomEvent.on(r,"click",h).on(r,"mousedown",h).on(r,"dblclick",h).on(r,"click",o.DomEvent.preventDefault).on(r,"click",s,a).on(r,"click",this._refocusOnMap,a),r},_updateDisabled:function(){var t=this._map,e="leaflet-disabled";o.DomUtil.removeClass(this._zoomInButton,e),o.DomUtil.removeClass(this._zoomOutButton,e),t._zoom===t.getMinZoom()&&o.DomUtil.addClass(this._zoomOutButton,e),t._zoom===t.getMaxZoom()&&o.DomUtil.addClass(this._zoomInButton,e)}}),o.Map.mergeOptions({zoomControl:!0}),o.Map.addInitHook(function(){this.options.zoomControl&&(this.zoomControl=new o.Control.Zoom,this.addControl(this.zoomControl))}),o.control.zoom=function(t){return new o.Control.Zoom(t)},o.Control.Attribution=o.Control.extend({options:{position:"bottomright",prefix:'<a href="http://leafletjs.com" title="A JS library for interactive maps">Leaflet</a>'},initialize:function(t){o.setOptions(this,t),this._attributions={}},onAdd:function(t){this._container=o.DomUtil.create("div","leaflet-control-attribution"),o.DomEvent.disableClickPropagation(this._container);for(var e in t._layers)t._layers[e].getAttribution&&this.addAttribution(t._layers[e].getAttribution());return t.on("layeradd",this._onLayerAdd,this).on("layerremove",this._onLayerRemove,this),this._update(),this._container},onRemove:function(t){t.off("layeradd",this._onLayerAdd).off("layerremove",this._onLayerRemove)},setPrefix:function(t){return this.options.prefix=t,this._update(),this},addAttribution:function(t){return t?(this._attributions[t]||(this._attributions[t]=0),this._attributions[t]++,this._update(),this):void 0},removeAttribution:function(t){return t?(this._attributions[t]&&(this._attributions[t]--,this._update()),this):void 0},_update:function(){if(this._map){var t=[];for(var e in this._attributions)this._attributions[e]&&t.push(e);var i=[];this.options.prefix&&i.push(this.options.prefix),t.length&&i.push(t.join(", ")),this._container.innerHTML=i.join(" | ")}},_onLayerAdd:function(t){t.layer.getAttribution&&this.addAttribution(t.layer.getAttribution())},_onLayerRemove:function(t){t.layer.getAttribution&&this.removeAttribution(t.layer.getAttribution())}}),o.Map.mergeOptions({attributionControl:!0}),o.Map.addInitHook(function(){this.options.attributionControl&&(this.attributionControl=(new o.Control.Attribution).addTo(this))}),o.control.attribution=function(t){return new o.Control.Attribution(t)},o.Control.Scale=o.Control.extend({options:{position:"bottomleft",maxWidth:100,metric:!0,imperial:!0,updateWhenIdle:!1},onAdd:function(t){this._map=t;var e="leaflet-control-scale",i=o.DomUtil.create("div",e),n=this.options;return this._addScales(n,e,i),t.on(n.updateWhenIdle?"moveend":"move",this._update,this),t.whenReady(this._update,this),i},onRemove:function(t){t.off(this.options.updateWhenIdle?"moveend":"move",this._update,this)},_addScales:function(t,e,i){t.metric&&(this._mScale=o.DomUtil.create("div",e+"-line",i)),t.imperial&&(this._iScale=o.DomUtil.create("div",e+"-line",i))},_update:function(){var t=this._map.getBounds(),e=t.getCenter().lat,i=6378137*Math.PI*Math.cos(e*Math.PI/180),n=i*(t.getNorthEast().lng-t.getSouthWest().lng)/180,o=this._map.getSize(),s=this.options,a=0;o.x>0&&(a=n*(s.maxWidth/o.x)),this._updateScales(s,a)},_updateScales:function(t,e){t.metric&&e&&this._updateMetric(e),t.imperial&&e&&this._updateImperial(e)},_updateMetric:function(t){var e=this._getRoundNum(t);this._mScale.style.width=this._getScaleWidth(e/t)+"px",this._mScale.innerHTML=1e3>e?e+" m":e/1e3+" km"},_updateImperial:function(t){var e,i,n,o=3.2808399*t,s=this._iScale;o>5280?(e=o/5280,i=this._getRoundNum(e),s.style.width=this._getScaleWidth(i/e)+"px",s.innerHTML=i+" mi"):(n=this._getRoundNum(o),s.style.width=this._getScaleWidth(n/o)+"px",s.innerHTML=n+" ft")},_getScaleWidth:function(t){return Math.round(this.options.maxWidth*t)-10},_getRoundNum:function(t){var e=Math.pow(10,(Math.floor(t)+"").length-1),i=t/e;return i=i>=10?10:i>=5?5:i>=3?3:i>=2?2:1,e*i}}),o.control.scale=function(t){return new o.Control.Scale(t)},o.Control.Layers=o.Control.extend({options:{collapsed:!0,position:"topright",autoZIndex:!0},initialize:function(t,e,i){o.setOptions(this,i),this._layers={},this._lastZIndex=0,this._handlingClick=!1;for(var n in t)this._addLayer(t[n],n);for(n in e)this._addLayer(e[n],n,!0)},onAdd:function(t){return this._initLayout(),this._update(),t.on("layeradd",this._onLayerChange,this).on("layerremove",this._onLayerChange,this),this._container},onRemove:function(t){t.off("layeradd",this._onLayerChange,this).off("layerremove",this._onLayerChange,this)},addBaseLayer:function(t,e){return this._addLayer(t,e),this._update(),this},addOverlay:function(t,e){return this._addLayer(t,e,!0),this._update(),this},removeLayer:function(t){var e=o.stamp(t);return delete this._layers[e],this._update(),this},_initLayout:function(){var t="leaflet-control-layers",e=this._container=o.DomUtil.create("div",t);e.setAttribute("aria-haspopup",!0),o.Browser.touch?o.DomEvent.on(e,"click",o.DomEvent.stopPropagation):o.DomEvent.disableClickPropagation(e).disableScrollPropagation(e);var i=this._form=o.DomUtil.create("form",t+"-list");if(this.options.collapsed){o.Browser.android||o.DomEvent.on(e,"mouseover",this._expand,this).on(e,"mouseout",this._collapse,this);var n=this._layersLink=o.DomUtil.create("a",t+"-toggle",e);n.href="#",n.title="Layers",o.Browser.touch?o.DomEvent.on(n,"click",o.DomEvent.stop).on(n,"click",this._expand,this):o.DomEvent.on(n,"focus",this._expand,this),o.DomEvent.on(i,"click",function(){setTimeout(o.bind(this._onInputClick,this),0)},this),this._map.on("click",this._collapse,this)}else this._expand();this._baseLayersList=o.DomUtil.create("div",t+"-base",i),this._separator=o.DomUtil.create("div",t+"-separator",i),this._overlaysList=o.DomUtil.create("div",t+"-overlays",i),e.appendChild(i)},_addLayer:function(t,e,i){var n=o.stamp(t);this._layers[n]={layer:t,name:e,overlay:i},this.options.autoZIndex&&t.setZIndex&&(this._lastZIndex++,t.setZIndex(this._lastZIndex))},_update:function(){if(this._container){this._baseLayersList.innerHTML="",this._overlaysList.innerHTML="";var t,e,i=!1,n=!1;for(t in this._layers)e=this._layers[t],this._addItem(e),n=n||e.overlay,i=i||!e.overlay;this._separator.style.display=n&&i?"":"none"}},_onLayerChange:function(t){var e=this._layers[o.stamp(t.layer)];if(e){this._handlingClick||this._update();var i=e.overlay?"layeradd"===t.type?"overlayadd":"overlayremove":"layeradd"===t.type?"baselayerchange":null;i&&this._map.fire(i,e)}},_createRadioElement:function(t,i){var n='<input type="radio" class="leaflet-control-layers-selector" name="'+t+'"';i&&(n+=' checked="checked"'),n+="/>";var o=e.createElement("div");return o.innerHTML=n,o.firstChild},_addItem:function(t){var i,n=e.createElement("label"),s=this._map.hasLayer(t.layer);t.overlay?(i=e.createElement("input"),i.type="checkbox",i.className="leaflet-control-layers-selector",i.defaultChecked=s):i=this._createRadioElement("leaflet-base-layers",s),i.layerId=o.stamp(t.layer),o.DomEvent.on(i,"click",this._onInputClick,this);var a=e.createElement("span");a.innerHTML=" "+t.name,n.appendChild(i),n.appendChild(a);var r=t.overlay?this._overlaysList:this._baseLayersList;return r.appendChild(n),n},_onInputClick:function(){var t,e,i,n=this._form.getElementsByTagName("input"),o=n.length;for(this._handlingClick=!0,t=0;o>t;t++)e=n[t],i=this._layers[e.layerId],e.checked&&!this._map.hasLayer(i.layer)?this._map.addLayer(i.layer):!e.checked&&this._map.hasLayer(i.layer)&&this._map.removeLayer(i.layer);this._handlingClick=!1,this._refocusOnMap()},_expand:function(){o.DomUtil.addClass(this._container,"leaflet-control-layers-expanded")},_collapse:function(){this._container.className=this._container.className.replace(" leaflet-control-layers-expanded","")}}),o.control.layers=function(t,e,i){return new o.Control.Layers(t,e,i)},o.PosAnimation=o.Class.extend({includes:o.Mixin.Events,run:function(t,e,i,n){this.stop(),this._el=t,this._inProgress=!0,this._newPos=e,this.fire("start"),t.style[o.DomUtil.TRANSITION]="all "+(i||.25)+"s cubic-bezier(0,0,"+(n||.5)+",1)",o.DomEvent.on(t,o.DomUtil.TRANSITION_END,this._onTransitionEnd,this),o.DomUtil.setPosition(t,e),o.Util.falseFn(t.offsetWidth),this._stepTimer=setInterval(o.bind(this._onStep,this),50)},stop:function(){this._inProgress&&(o.DomUtil.setPosition(this._el,this._getPos()),this._onTransitionEnd(),o.Util.falseFn(this._el.offsetWidth))},_onStep:function(){var t=this._getPos();return t?(this._el._leaflet_pos=t,void this.fire("step")):void this._onTransitionEnd()},_transformRe:/([-+]?(?:\d*\.)?\d+)\D*, ([-+]?(?:\d*\.)?\d+)\D*\)/,_getPos:function(){var e,i,n,s=this._el,a=t.getComputedStyle(s);if(o.Browser.any3d){if(n=a[o.DomUtil.TRANSFORM].match(this._transformRe),!n)return;e=parseFloat(n[1]),i=parseFloat(n[2])}else e=parseFloat(a.left),i=parseFloat(a.top);return new o.Point(e,i,!0)},_onTransitionEnd:function(){o.DomEvent.off(this._el,o.DomUtil.TRANSITION_END,this._onTransitionEnd,this),this._inProgress&&(this._inProgress=!1,this._el.style[o.DomUtil.TRANSITION]="",this._el._leaflet_pos=this._newPos,clearInterval(this._stepTimer),this.fire("step").fire("end"))}}),o.Map.include({setView:function(t,e,n){if(e=e===i?this._zoom:this._limitZoom(e),t=this._limitCenter(o.latLng(t),e,this.options.maxBounds),n=n||{},this._panAnim&&this._panAnim.stop(),this._loaded&&!n.reset&&n!==!0){n.animate!==i&&(n.zoom=o.extend({animate:n.animate},n.zoom),n.pan=o.extend({animate:n.animate},n.pan));var s=this._zoom!==e?this._tryAnimatedZoom&&this._tryAnimatedZoom(t,e,n.zoom):this._tryAnimatedPan(t,n.pan);if(s)return clearTimeout(this._sizeTimer),this}return this._resetView(t,e),this},panBy:function(t,e){if(t=o.point(t).round(),e=e||{},!t.x&&!t.y)return this;if(this._panAnim||(this._panAnim=new o.PosAnimation,this._panAnim.on({step:this._onPanTransitionStep,end:this._onPanTransitionEnd},this)),e.noMoveStart||this.fire("movestart"),e.animate!==!1){o.DomUtil.addClass(this._mapPane,"leaflet-pan-anim");var i=this._getMapPanePos().subtract(t);this._panAnim.run(this._mapPane,i,e.duration||.25,e.easeLinearity)}else this._rawPanBy(t),this.fire("move").fire("moveend");return this},_onPanTransitionStep:function(){this.fire("move")},_onPanTransitionEnd:function(){o.DomUtil.removeClass(this._mapPane,"leaflet-pan-anim"),this.fire("moveend")},_tryAnimatedPan:function(t,e){var i=this._getCenterOffset(t)._floor();return(e&&e.animate)===!0||this.getSize().contains(i)?(this.panBy(i,e),!0):!1}}),o.PosAnimation=o.DomUtil.TRANSITION?o.PosAnimation:o.PosAnimation.extend({run:function(t,e,i,n){this.stop(),this._el=t,this._inProgress=!0,this._duration=i||.25,this._easeOutPower=1/Math.max(n||.5,.2),this._startPos=o.DomUtil.getPosition(t),this._offset=e.subtract(this._startPos),this._startTime=+new Date,this.fire("start"),this._animate()},stop:function(){this._inProgress&&(this._step(),this._complete())},_animate:function(){this._animId=o.Util.requestAnimFrame(this._animate,this),this._step()},_step:function(){var t=+new Date-this._startTime,e=1e3*this._duration;e>t?this._runFrame(this._easeOut(t/e)):(this._runFrame(1),this._complete())},_runFrame:function(t){var e=this._startPos.add(this._offset.multiplyBy(t));o.DomUtil.setPosition(this._el,e),this.fire("step")},_complete:function(){o.Util.cancelAnimFrame(this._animId),this._inProgress=!1,this.fire("end")},_easeOut:function(t){return 1-Math.pow(1-t,this._easeOutPower)}}),o.Map.mergeOptions({zoomAnimation:!0,zoomAnimationThreshold:4}),o.DomUtil.TRANSITION&&o.Map.addInitHook(function(){this._zoomAnimated=this.options.zoomAnimation&&o.DomUtil.TRANSITION&&o.Browser.any3d&&!o.Browser.android23&&!o.Browser.mobileOpera,this._zoomAnimated&&o.DomEvent.on(this._mapPane,o.DomUtil.TRANSITION_END,this._catchTransitionEnd,this)}),o.Map.include(o.DomUtil.TRANSITION?{_catchTransitionEnd:function(t){this._animatingZoom&&t.propertyName.indexOf("transform")>=0&&this._onZoomTransitionEnd()},_nothingToAnimate:function(){return!this._container.getElementsByClassName("leaflet-zoom-animated").length},_tryAnimatedZoom:function(t,e,i){if(this._animatingZoom)return!0;if(i=i||{},!this._zoomAnimated||i.animate===!1||this._nothingToAnimate()||Math.abs(e-this._zoom)>this.options.zoomAnimationThreshold)return!1;var n=this.getZoomScale(e),o=this._getCenterOffset(t)._divideBy(1-1/n),s=this._getCenterLayerPoint()._add(o);return i.animate===!0||this.getSize().contains(o)?(this.fire("movestart").fire("zoomstart"),this._animateZoom(t,e,s,n,null,!0),!0):!1},_animateZoom:function(t,e,i,n,s,a,r){r||(this._animatingZoom=!0),o.DomUtil.addClass(this._mapPane,"leaflet-zoom-anim"),this._animateToCenter=t,this._animateToZoom=e,o.Draggable&&(o.Draggable._disabled=!0),o.Util.requestAnimFrame(function(){this.fire("zoomanim",{center:t,zoom:e,origin:i,scale:n,delta:s,backwards:a})},this)},_onZoomTransitionEnd:function(){this._animatingZoom=!1,o.DomUtil.removeClass(this._mapPane,"leaflet-zoom-anim"),this._resetView(this._animateToCenter,this._animateToZoom,!0,!0),o.Draggable&&(o.Draggable._disabled=!1)}}:{}),o.TileLayer.include({_animateZoom:function(t){this._animating||(this._animating=!0,this._prepareBgBuffer());var e=this._bgBuffer,i=o.DomUtil.TRANSFORM,n=t.delta?o.DomUtil.getTranslateString(t.delta):e.style[i],s=o.DomUtil.getScaleString(t.scale,t.origin);e.style[i]=t.backwards?s+" "+n:n+" "+s},_endZoomAnim:function(){var t=this._tileContainer,e=this._bgBuffer;t.style.visibility="",t.parentNode.appendChild(t),o.Util.falseFn(e.offsetWidth),this._animating=!1},_clearBgBuffer:function(){var t=this._map;!t||t._animatingZoom||t.touchZoom._zooming||(this._bgBuffer.innerHTML="",this._bgBuffer.style[o.DomUtil.TRANSFORM]="")},_prepareBgBuffer:function(){var t=this._tileContainer,e=this._bgBuffer,i=this._getLoadedTilesPercentage(e),n=this._getLoadedTilesPercentage(t);return e&&i>.5&&.5>n?(t.style.visibility="hidden",void this._stopLoadingImages(t)):(e.style.visibility="hidden",e.style[o.DomUtil.TRANSFORM]="",this._tileContainer=e,e=this._bgBuffer=t,this._stopLoadingImages(e),void clearTimeout(this._clearBgBufferTimer))},_getLoadedTilesPercentage:function(t){var e,i,n=t.getElementsByTagName("img"),o=0;for(e=0,i=n.length;i>e;e++)n[e].complete&&o++;return o/i},_stopLoadingImages:function(t){var e,i,n,s=Array.prototype.slice.call(t.getElementsByTagName("img"));for(e=0,i=s.length;i>e;e++)n=s[e],n.complete||(n.onload=o.Util.falseFn,n.onerror=o.Util.falseFn,n.src=o.Util.emptyImageUrl,n.parentNode.removeChild(n))}}),o.Map.include({_defaultLocateOptions:{watch:!1,setView:!1,maxZoom:1/0,timeout:1e4,maximumAge:0,enableHighAccuracy:!1},locate:function(t){if(t=this._locateOptions=o.extend(this._defaultLocateOptions,t),!navigator.geolocation)return this._handleGeolocationError({code:0,message:"Geolocation not supported."}),this;var e=o.bind(this._handleGeolocationResponse,this),i=o.bind(this._handleGeolocationError,this);return t.watch?this._locationWatchId=navigator.geolocation.watchPosition(e,i,t):navigator.geolocation.getCurrentPosition(e,i,t),this},stopLocate:function(){return navigator.geolocation&&navigator.geolocation.clearWatch(this._locationWatchId),this._locateOptions&&(this._locateOptions.setView=!1),this},_handleGeolocationError:function(t){var e=t.code,i=t.message||(1===e?"permission denied":2===e?"position unavailable":"timeout");this._locateOptions.setView&&!this._loaded&&this.fitWorld(),this.fire("locationerror",{code:e,message:"Geolocation error: "+i+"."})},_handleGeolocationResponse:function(t){var e=t.coords.latitude,i=t.coords.longitude,n=new o.LatLng(e,i),s=180*t.coords.accuracy/40075017,a=s/Math.cos(o.LatLng.DEG_TO_RAD*e),r=o.latLngBounds([e-s,i-a],[e+s,i+a]),h=this._locateOptions;if(h.setView){var l=Math.min(this.getBoundsZoom(r),h.maxZoom);this.setView(n,l)}var u={latlng:n,bounds:r,timestamp:t.timestamp};for(var c in t.coords)"number"==typeof t.coords[c]&&(u[c]=t.coords[c]);this.fire("locationfound",u)}})}(window,document); \ No newline at end of file +/* @preserve + * Leaflet 1.3.4+Detached: 0e566b2ad5e696ba9f79a9d48a7e51c8f4892441.0e566b2, a JS library for interactive maps. http://leafletjs.com + * (c) 2010-2018 Vladimir Agafonkin, (c) 2010-2011 CloudMade + */ +!function(t,i){"object"==typeof exports&&"undefined"!=typeof module?i(exports):"function"==typeof define&&define.amd?define(["exports"],i):i(t.L={})}(this,function(t){"use strict";function i(t){var i,e,n,o;for(e=1,n=arguments.length;e<n;e++){o=arguments[e];for(i in o)t[i]=o[i]}return t}function e(t,i){var e=Array.prototype.slice;if(t.bind)return t.bind.apply(t,e.call(arguments,1));var n=e.call(arguments,2);return function(){return t.apply(i,n.length?n.concat(e.call(arguments)):arguments)}}function n(t){return t._leaflet_id=t._leaflet_id||++ei,t._leaflet_id}function o(t,i,e){var n,o,s,r;return r=function(){n=!1,o&&(s.apply(e,o),o=!1)},s=function(){n?o=arguments:(t.apply(e,arguments),setTimeout(r,i),n=!0)}}function s(t,i,e){var n=i[1],o=i[0],s=n-o;return t===n&&e?t:((t-o)%s+s)%s+o}function r(){return!1}function a(t,i){var e=Math.pow(10,void 0===i?6:i);return Math.round(t*e)/e}function h(t){return t.trim?t.trim():t.replace(/^\s+|\s+$/g,"")}function u(t){return h(t).split(/\s+/)}function l(t,i){t.hasOwnProperty("options")||(t.options=t.options?ii(t.options):{});for(var e in i)t.options[e]=i[e];return t.options}function c(t,i,e){var n=[];for(var o in t)n.push(encodeURIComponent(e?o.toUpperCase():o)+"="+encodeURIComponent(t[o]));return(i&&-1!==i.indexOf("?")?"&":"?")+n.join("&")}function _(t,i){return t.replace(ni,function(t,e){var n=i[e];if(void 0===n)throw new Error("No value provided for variable "+t);return"function"==typeof n&&(n=n(i)),n})}function d(t,i){for(var e=0;e<t.length;e++)if(t[e]===i)return e;return-1}function p(t){return window["webkit"+t]||window["moz"+t]||window["ms"+t]}function m(t){var i=+new Date,e=Math.max(0,16-(i-ri));return ri=i+e,window.setTimeout(t,e)}function f(t,i,n){if(!n||ai!==m)return ai.call(window,e(t,i));t.call(i)}function g(t){t&&hi.call(window,t)}function v(){}function y(t){if("undefined"!=typeof L&&L&&L.Mixin){t=oi(t)?t:[t];for(var i=0;i<t.length;i++)t[i]===L.Mixin.Events&&console.warn("Deprecated include of L.Mixin.Events: this property will be removed in future releases, please inherit from L.Evented instead.",(new Error).stack)}}function x(t,i,e){this.x=e?Math.round(t):t,this.y=e?Math.round(i):i}function w(t,i,e){return t instanceof x?t:oi(t)?new x(t[0],t[1]):void 0===t||null===t?t:"object"==typeof t&&"x"in t&&"y"in t?new x(t.x,t.y):new x(t,i,e)}function P(t,i){if(t)for(var e=i?[t,i]:t,n=0,o=e.length;n<o;n++)this.extend(e[n])}function b(t,i){return!t||t instanceof P?t:new P(t,i)}function T(t,i){if(t)for(var e=i?[t,i]:t,n=0,o=e.length;n<o;n++)this.extend(e[n])}function z(t,i){return t instanceof T?t:new T(t,i)}function M(t,i,e){if(isNaN(t)||isNaN(i))throw new Error("Invalid LatLng object: ("+t+", "+i+")");this.lat=+t,this.lng=+i,void 0!==e&&(this.alt=+e)}function C(t,i,e){return t instanceof M?t:oi(t)&&"object"!=typeof t[0]?3===t.length?new M(t[0],t[1],t[2]):2===t.length?new M(t[0],t[1]):null:void 0===t||null===t?t:"object"==typeof t&&"lat"in t?new M(t.lat,"lng"in t?t.lng:t.lon,t.alt):void 0===i?null:new M(t,i,e)}function S(t,i,e,n){if(oi(t))return this._a=t[0],this._b=t[1],this._c=t[2],void(this._d=t[3]);this._a=t,this._b=i,this._c=e,this._d=n}function Z(t,i,e,n){return new S(t,i,e,n)}function E(t){return document.createElementNS("http://www.w3.org/2000/svg",t)}function k(t,i){var e,n,o,s,r,a,h="";for(e=0,o=t.length;e<o;e++){for(n=0,s=(r=t[e]).length;n<s;n++)a=r[n],h+=(n?"L":"M")+a.x+" "+a.y;h+=i?Ji?"z":"x":""}return h||"M0 0"}function A(t){return navigator.userAgent.toLowerCase().indexOf(t)>=0}function B(t,i,e,n){return"touchstart"===i?O(t,e,n):"touchmove"===i?W(t,e,n):"touchend"===i&&H(t,e,n),this}function I(t,i,e){var n=t["_leaflet_"+i+e];return"touchstart"===i?t.removeEventListener(te,n,!1):"touchmove"===i?t.removeEventListener(ie,n,!1):"touchend"===i&&(t.removeEventListener(ee,n,!1),t.removeEventListener(ne,n,!1)),this}function O(t,i,n){var o=e(function(t){if("mouse"!==t.pointerType&&t.MSPOINTER_TYPE_MOUSE&&t.pointerType!==t.MSPOINTER_TYPE_MOUSE){if(!(oe.indexOf(t.target.tagName)<0))return;Pt(t)}j(t,i)});t["_leaflet_touchstart"+n]=o,t.addEventListener(te,o,!1),re||(document.documentElement.addEventListener(te,R,!0),document.documentElement.addEventListener(ie,N,!0),document.documentElement.addEventListener(ee,D,!0),document.documentElement.addEventListener(ne,D,!0),re=!0)}function R(t){se[t.pointerId]=t,ae++}function N(t){se[t.pointerId]&&(se[t.pointerId]=t)}function D(t){delete se[t.pointerId],ae--}function j(t,i){t.touches=[];for(var e in se)t.touches.push(se[e]);t.changedTouches=[t],i(t)}function W(t,i,e){var n=function(t){(t.pointerType!==t.MSPOINTER_TYPE_MOUSE&&"mouse"!==t.pointerType||0!==t.buttons)&&j(t,i)};t["_leaflet_touchmove"+e]=n,t.addEventListener(ie,n,!1)}function H(t,i,e){var n=function(t){j(t,i)};t["_leaflet_touchend"+e]=n,t.addEventListener(ee,n,!1),t.addEventListener(ne,n,!1)}function F(t,i,e){function n(t){var i;if(Vi){if(!bi||"mouse"===t.pointerType)return;i=ae}else i=t.touches.length;if(!(i>1)){var e=Date.now(),n=e-(s||e);r=t.touches?t.touches[0]:t,a=n>0&&n<=h,s=e}}function o(t){if(a&&!r.cancelBubble){if(Vi){if(!bi||"mouse"===t.pointerType)return;var e,n,o={};for(n in r)e=r[n],o[n]=e&&e.bind?e.bind(r):e;r=o}r.type="dblclick",i(r),s=null}}var s,r,a=!1,h=250;return t[le+he+e]=n,t[le+ue+e]=o,t[le+"dblclick"+e]=i,t.addEventListener(he,n,!1),t.addEventListener(ue,o,!1),t.addEventListener("dblclick",i,!1),this}function U(t,i){var e=t[le+he+i],n=t[le+ue+i],o=t[le+"dblclick"+i];return t.removeEventListener(he,e,!1),t.removeEventListener(ue,n,!1),bi||t.removeEventListener("dblclick",o,!1),this}function V(t){return"string"==typeof t?document.getElementById(t):t}function q(t,i){var e=t.style[i]||t.currentStyle&&t.currentStyle[i];if((!e||"auto"===e)&&document.defaultView){var n=document.defaultView.getComputedStyle(t,null);e=n?n[i]:null}return"auto"===e?null:e}function G(t,i,e){var n=document.createElement(t);return n.className=i||"",e&&e.appendChild(n),n}function K(t){var i=t.parentNode;i&&i.removeChild(t)}function Y(t){for(;t.firstChild;)t.removeChild(t.firstChild)}function X(t){var i=t.parentNode;i.lastChild!==t&&i.appendChild(t)}function J(t){var i=t.parentNode;i.firstChild!==t&&i.insertBefore(t,i.firstChild)}function $(t,i){if(void 0!==t.classList)return t.classList.contains(i);var e=et(t);return e.length>0&&new RegExp("(^|\\s)"+i+"(\\s|$)").test(e)}function Q(t,i){if(void 0!==t.classList)for(var e=u(i),n=0,o=e.length;n<o;n++)t.classList.add(e[n]);else if(!$(t,i)){var s=et(t);it(t,(s?s+" ":"")+i)}}function tt(t,i){void 0!==t.classList?t.classList.remove(i):it(t,h((" "+et(t)+" ").replace(" "+i+" "," ")))}function it(t,i){void 0===t.className.baseVal?t.className=i:t.className.baseVal=i}function et(t){return void 0===t.className.baseVal?t.className:t.className.baseVal}function nt(t,i){"opacity"in t.style?t.style.opacity=i:"filter"in t.style&&ot(t,i)}function ot(t,i){var e=!1,n="DXImageTransform.Microsoft.Alpha";try{e=t.filters.item(n)}catch(t){if(1===i)return}i=Math.round(100*i),e?(e.Enabled=100!==i,e.Opacity=i):t.style.filter+=" progid:"+n+"(opacity="+i+")"}function st(t){for(var i=document.documentElement.style,e=0;e<t.length;e++)if(t[e]in i)return t[e];return!1}function rt(t,i,e){var n=i||new x(0,0);t.style[ce]=(Ri?"translate("+n.x+"px,"+n.y+"px)":"translate3d("+n.x+"px,"+n.y+"px,0)")+(e?" scale("+e+")":"")}function at(t,i){t._leaflet_pos=i,ji?rt(t,i):(t.style.left=i.x+"px",t.style.top=i.y+"px")}function ht(t){return t._leaflet_pos||new x(0,0)}function ut(){mt(window,"dragstart",Pt)}function lt(){ft(window,"dragstart",Pt)}function ct(t){for(;-1===t.tabIndex;)t=t.parentNode;t.style&&(_t(),me=t,fe=t.style.outline,t.style.outline="none",mt(window,"keydown",_t))}function _t(){me&&(me.style.outline=fe,me=void 0,fe=void 0,ft(window,"keydown",_t))}function dt(t){do{t=t.parentNode}while(!(t.offsetWidth&&t.offsetHeight||t===document.body));return t}function pt(t){var i=t.getBoundingClientRect();return{x:i.width/t.offsetWidth||1,y:i.height/t.offsetHeight||1,boundingClientRect:i}}function mt(t,i,e,n){if("object"==typeof i)for(var o in i)gt(t,o,i[o],e);else for(var s=0,r=(i=u(i)).length;s<r;s++)gt(t,i[s],e,n);return this}function ft(t,i,e,n){if("object"==typeof i)for(var o in i)vt(t,o,i[o],e);else if(i)for(var s=0,r=(i=u(i)).length;s<r;s++)vt(t,i[s],e,n);else{for(var a in t[ye])vt(t,a,t[ye][a]);delete t[ye]}return this}function gt(t,i,e,o){var s=i+n(e)+(o?"_"+n(o):"");if(t[ye]&&t[ye][s])return this;var r=function(i){return e.call(o||t,i||window.event)},a=r;Vi&&0===i.indexOf("touch")?B(t,i,r,s):!qi||"dblclick"!==i||!F||Vi&&Ei?"addEventListener"in t?"mousewheel"===i?t.addEventListener("onwheel"in t?"wheel":"mousewheel",r,!1):"mouseenter"===i||"mouseleave"===i?(r=function(i){i=i||window.event,Ct(t,i)&&a(i)},t.addEventListener("mouseenter"===i?"mouseover":"mouseout",r,!1)):("click"===i&&zi&&(r=function(t){St(t,a)}),t.addEventListener(i,r,!1)):"attachEvent"in t&&t.attachEvent("on"+i,r):F(t,r,s),t[ye]=t[ye]||{},t[ye][s]=r}function vt(t,i,e,o){var s=i+n(e)+(o?"_"+n(o):""),r=t[ye]&&t[ye][s];if(!r)return this;Vi&&0===i.indexOf("touch")?I(t,i,s):!qi||"dblclick"!==i||!U||Vi&&Ei?"removeEventListener"in t?"mousewheel"===i?t.removeEventListener("onwheel"in t?"wheel":"mousewheel",r,!1):t.removeEventListener("mouseenter"===i?"mouseover":"mouseleave"===i?"mouseout":i,r,!1):"detachEvent"in t&&t.detachEvent("on"+i,r):U(t,s),t[ye][s]=null}function yt(t){return t.stopPropagation?t.stopPropagation():t.originalEvent?t.originalEvent._stopped=!0:t.cancelBubble=!0,Mt(t),this}function xt(t){return gt(t,"mousewheel",yt),this}function wt(t){return mt(t,"mousedown touchstart dblclick",yt),gt(t,"click",zt),this}function Pt(t){return t.preventDefault?t.preventDefault():t.returnValue=!1,this}function Lt(t){return Pt(t),yt(t),this}function bt(t,i){if(!i)return new x(t.clientX,t.clientY);var e=pt(i),n=e.boundingClientRect;return new x((t.clientX-n.left)/e.x-i.clientLeft,(t.clientY-n.top)/e.y-i.clientTop)}function Tt(t){return bi?t.wheelDeltaY/2:t.deltaY&&0===t.deltaMode?-t.deltaY/xe:t.deltaY&&1===t.deltaMode?20*-t.deltaY:t.deltaY&&2===t.deltaMode?60*-t.deltaY:t.deltaX||t.deltaZ?0:t.wheelDelta?(t.wheelDeltaY||t.wheelDelta)/2:t.detail&&Math.abs(t.detail)<32765?20*-t.detail:t.detail?t.detail/-32765*60:0}function zt(t){we[t.type]=!0}function Mt(t){var i=we[t.type];return we[t.type]=!1,i}function Ct(t,i){var e=i.relatedTarget;if(!e)return!0;try{for(;e&&e!==t;)e=e.parentNode}catch(t){return!1}return e!==t}function St(t,i){var e=t.timeStamp||t.originalEvent&&t.originalEvent.timeStamp,n=ge&&e-ge;n&&n>100&&n<500||t.target._simulatedClick&&!t._simulated?Lt(t):(ge=e,i(t))}function Zt(t,i){if(!i||!t.length)return t.slice();var e=i*i;return t=Bt(t,e),t=kt(t,e)}function Et(t,i,e){return Math.sqrt(Dt(t,i,e,!0))}function kt(t,i){var e=t.length,n=new(typeof Uint8Array!=void 0+""?Uint8Array:Array)(e);n[0]=n[e-1]=1,At(t,n,i,0,e-1);var o,s=[];for(o=0;o<e;o++)n[o]&&s.push(t[o]);return s}function At(t,i,e,n,o){var s,r,a,h=0;for(r=n+1;r<=o-1;r++)(a=Dt(t[r],t[n],t[o],!0))>h&&(s=r,h=a);h>e&&(i[s]=1,At(t,i,e,n,s),At(t,i,e,s,o))}function Bt(t,i){for(var e=[t[0]],n=1,o=0,s=t.length;n<s;n++)Nt(t[n],t[o])>i&&(e.push(t[n]),o=n);return o<s-1&&e.push(t[s-1]),e}function It(t,i,e,n,o){var s,r,a,h=n?ke:Rt(t,e),u=Rt(i,e);for(ke=u;;){if(!(h|u))return[t,i];if(h&u)return!1;a=Rt(r=Ot(t,i,s=h||u,e,o),e),s===h?(t=r,h=a):(i=r,u=a)}}function Ot(t,i,e,n,o){var s,r,a=i.x-t.x,h=i.y-t.y,u=n.min,l=n.max;return 8&e?(s=t.x+a*(l.y-t.y)/h,r=l.y):4&e?(s=t.x+a*(u.y-t.y)/h,r=u.y):2&e?(s=l.x,r=t.y+h*(l.x-t.x)/a):1&e&&(s=u.x,r=t.y+h*(u.x-t.x)/a),new x(s,r,o)}function Rt(t,i){var e=0;return t.x<i.min.x?e|=1:t.x>i.max.x&&(e|=2),t.y<i.min.y?e|=4:t.y>i.max.y&&(e|=8),e}function Nt(t,i){var e=i.x-t.x,n=i.y-t.y;return e*e+n*n}function Dt(t,i,e,n){var o,s=i.x,r=i.y,a=e.x-s,h=e.y-r,u=a*a+h*h;return u>0&&((o=((t.x-s)*a+(t.y-r)*h)/u)>1?(s=e.x,r=e.y):o>0&&(s+=a*o,r+=h*o)),a=t.x-s,h=t.y-r,n?a*a+h*h:new x(s,r)}function jt(t){return!oi(t[0])||"object"!=typeof t[0][0]&&void 0!==t[0][0]}function Wt(t){return console.warn("Deprecated use of _flat, please use L.LineUtil.isFlat instead."),jt(t)}function Ht(t,i,e){var n,o,s,r,a,h,u,l,c,_=[1,4,2,8];for(o=0,u=t.length;o<u;o++)t[o]._code=Rt(t[o],i);for(r=0;r<4;r++){for(l=_[r],n=[],o=0,s=(u=t.length)-1;o<u;s=o++)a=t[o],h=t[s],a._code&l?h._code&l||((c=Ot(h,a,l,i,e))._code=Rt(c,i),n.push(c)):(h._code&l&&((c=Ot(h,a,l,i,e))._code=Rt(c,i),n.push(c)),n.push(a));t=n}return t}function Ft(t,i){var e,n,o,s,r="Feature"===t.type?t.geometry:t,a=r?r.coordinates:null,h=[],u=i&&i.pointToLayer,l=i&&i.coordsToLatLng||Ut;if(!a&&!r)return null;switch(r.type){case"Point":return e=l(a),u?u(t,e):new $e(e);case"MultiPoint":for(o=0,s=a.length;o<s;o++)e=l(a[o]),h.push(u?u(t,e):new $e(e));return new Ke(h);case"LineString":case"MultiLineString":return n=Vt(a,"LineString"===r.type?0:1,l),new nn(n,i);case"Polygon":case"MultiPolygon":return n=Vt(a,"Polygon"===r.type?1:2,l),new on(n,i);case"GeometryCollection":for(o=0,s=r.geometries.length;o<s;o++){var c=Ft({geometry:r.geometries[o],type:"Feature",properties:t.properties},i);c&&h.push(c)}return new Ke(h);default:throw new Error("Invalid GeoJSON object.")}}function Ut(t){return new M(t[1],t[0],t[2])}function Vt(t,i,e){for(var n,o=[],s=0,r=t.length;s<r;s++)n=i?Vt(t[s],i-1,e):(e||Ut)(t[s]),o.push(n);return o}function qt(t,i){return i="number"==typeof i?i:6,void 0!==t.alt?[a(t.lng,i),a(t.lat,i),a(t.alt,i)]:[a(t.lng,i),a(t.lat,i)]}function Gt(t,i,e,n){for(var o=[],s=0,r=t.length;s<r;s++)o.push(i?Gt(t[s],i-1,e,n):qt(t[s],n));return!i&&e&&o.push(o[0]),o}function Kt(t,e){return t.feature?i({},t.feature,{geometry:e}):Yt(e)}function Yt(t){return"Feature"===t.type||"FeatureCollection"===t.type?t:{type:"Feature",properties:{},geometry:t}}function Xt(t,i){return new sn(t,i)}function Jt(t,i){return new mn(t,i)}function $t(t){return Xi?new vn(t):null}function Qt(t){return Ji||$i?new Pn(t):null}var ti=Object.freeze;Object.freeze=function(t){return t};var ii=Object.create||function(){function t(){}return function(i){return t.prototype=i,new t}}(),ei=0,ni=/\{ *([\w_-]+) *\}/g,oi=Array.isArray||function(t){return"[object Array]"===Object.prototype.toString.call(t)},si="data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=",ri=0,ai=window.requestAnimationFrame||p("RequestAnimationFrame")||m,hi=window.cancelAnimationFrame||p("CancelAnimationFrame")||p("CancelRequestAnimationFrame")||function(t){window.clearTimeout(t)},ui=(Object.freeze||Object)({freeze:ti,extend:i,create:ii,bind:e,lastId:ei,stamp:n,throttle:o,wrapNum:s,falseFn:r,formatNum:a,trim:h,splitWords:u,setOptions:l,getParamString:c,template:_,isArray:oi,indexOf:d,emptyImageUrl:si,requestFn:ai,cancelFn:hi,requestAnimFrame:f,cancelAnimFrame:g});v.extend=function(t){var e=function(){this.initialize&&this.initialize.apply(this,arguments),this.callInitHooks()},n=e.__super__=this.prototype,o=ii(n);o.constructor=e,e.prototype=o;for(var s in this)this.hasOwnProperty(s)&&"prototype"!==s&&"__super__"!==s&&(e[s]=this[s]);return t.statics&&(i(e,t.statics),delete t.statics),t.includes&&(y(t.includes),i.apply(null,[o].concat(t.includes)),delete t.includes),o.options&&(t.options=i(ii(o.options),t.options)),i(o,t),o._initHooks=[],o.callInitHooks=function(){if(!this._initHooksCalled){n.callInitHooks&&n.callInitHooks.call(this),this._initHooksCalled=!0;for(var t=0,i=o._initHooks.length;t<i;t++)o._initHooks[t].call(this)}},e},v.include=function(t){return i(this.prototype,t),this},v.mergeOptions=function(t){return i(this.prototype.options,t),this},v.addInitHook=function(t){var i=Array.prototype.slice.call(arguments,1),e="function"==typeof t?t:function(){this[t].apply(this,i)};return this.prototype._initHooks=this.prototype._initHooks||[],this.prototype._initHooks.push(e),this};var li={on:function(t,i,e){if("object"==typeof t)for(var n in t)this._on(n,t[n],i);else for(var o=0,s=(t=u(t)).length;o<s;o++)this._on(t[o],i,e);return this},off:function(t,i,e){if(t)if("object"==typeof t)for(var n in t)this._off(n,t[n],i);else for(var o=0,s=(t=u(t)).length;o<s;o++)this._off(t[o],i,e);else delete this._events;return this},_on:function(t,i,e){this._events=this._events||{};var n=this._events[t];n||(n=[],this._events[t]=n),e===this&&(e=void 0);for(var o={fn:i,ctx:e},s=n,r=0,a=s.length;r<a;r++)if(s[r].fn===i&&s[r].ctx===e)return;s.push(o)},_off:function(t,i,e){var n,o,s;if(this._events&&(n=this._events[t]))if(i){if(e===this&&(e=void 0),n)for(o=0,s=n.length;o<s;o++){var a=n[o];if(a.ctx===e&&a.fn===i)return a.fn=r,this._firingCount&&(this._events[t]=n=n.slice()),void n.splice(o,1)}}else{for(o=0,s=n.length;o<s;o++)n[o].fn=r;delete this._events[t]}},fire:function(t,e,n){if(!this.listens(t,n))return this;var o=i({},e,{type:t,target:this,sourceTarget:e&&e.sourceTarget||this});if(this._events){var s=this._events[t];if(s){this._firingCount=this._firingCount+1||1;for(var r=0,a=s.length;r<a;r++){var h=s[r];h.fn.call(h.ctx||this,o)}this._firingCount--}}return n&&this._propagateEvent(o),this},listens:function(t,i){var e=this._events&&this._events[t];if(e&&e.length)return!0;if(i)for(var n in this._eventParents)if(this._eventParents[n].listens(t,i))return!0;return!1},once:function(t,i,n){if("object"==typeof t){for(var o in t)this.once(o,t[o],i);return this}var s=e(function(){this.off(t,i,n).off(t,s,n)},this);return this.on(t,i,n).on(t,s,n)},addEventParent:function(t){return this._eventParents=this._eventParents||{},this._eventParents[n(t)]=t,this},removeEventParent:function(t){return this._eventParents&&delete this._eventParents[n(t)],this},_propagateEvent:function(t){for(var e in this._eventParents)this._eventParents[e].fire(t.type,i({layer:t.target,propagatedFrom:t.target},t),!0)}};li.addEventListener=li.on,li.removeEventListener=li.clearAllEventListeners=li.off,li.addOneTimeEventListener=li.once,li.fireEvent=li.fire,li.hasEventListeners=li.listens;var ci=v.extend(li),_i=Math.trunc||function(t){return t>0?Math.floor(t):Math.ceil(t)};x.prototype={clone:function(){return new x(this.x,this.y)},add:function(t){return this.clone()._add(w(t))},_add:function(t){return this.x+=t.x,this.y+=t.y,this},subtract:function(t){return this.clone()._subtract(w(t))},_subtract:function(t){return this.x-=t.x,this.y-=t.y,this},divideBy:function(t){return this.clone()._divideBy(t)},_divideBy:function(t){return this.x/=t,this.y/=t,this},multiplyBy:function(t){return this.clone()._multiplyBy(t)},_multiplyBy:function(t){return this.x*=t,this.y*=t,this},scaleBy:function(t){return new x(this.x*t.x,this.y*t.y)},unscaleBy:function(t){return new x(this.x/t.x,this.y/t.y)},round:function(){return this.clone()._round()},_round:function(){return this.x=Math.round(this.x),this.y=Math.round(this.y),this},floor:function(){return this.clone()._floor()},_floor:function(){return this.x=Math.floor(this.x),this.y=Math.floor(this.y),this},ceil:function(){return this.clone()._ceil()},_ceil:function(){return this.x=Math.ceil(this.x),this.y=Math.ceil(this.y),this},trunc:function(){return this.clone()._trunc()},_trunc:function(){return this.x=_i(this.x),this.y=_i(this.y),this},distanceTo:function(t){var i=(t=w(t)).x-this.x,e=t.y-this.y;return Math.sqrt(i*i+e*e)},equals:function(t){return(t=w(t)).x===this.x&&t.y===this.y},contains:function(t){return t=w(t),Math.abs(t.x)<=Math.abs(this.x)&&Math.abs(t.y)<=Math.abs(this.y)},toString:function(){return"Point("+a(this.x)+", "+a(this.y)+")"}},P.prototype={extend:function(t){return t=w(t),this.min||this.max?(this.min.x=Math.min(t.x,this.min.x),this.max.x=Math.max(t.x,this.max.x),this.min.y=Math.min(t.y,this.min.y),this.max.y=Math.max(t.y,this.max.y)):(this.min=t.clone(),this.max=t.clone()),this},getCenter:function(t){return new x((this.min.x+this.max.x)/2,(this.min.y+this.max.y)/2,t)},getBottomLeft:function(){return new x(this.min.x,this.max.y)},getTopRight:function(){return new x(this.max.x,this.min.y)},getTopLeft:function(){return this.min},getBottomRight:function(){return this.max},getSize:function(){return this.max.subtract(this.min)},contains:function(t){var i,e;return(t="number"==typeof t[0]||t instanceof x?w(t):b(t))instanceof P?(i=t.min,e=t.max):i=e=t,i.x>=this.min.x&&e.x<=this.max.x&&i.y>=this.min.y&&e.y<=this.max.y},intersects:function(t){t=b(t);var i=this.min,e=this.max,n=t.min,o=t.max,s=o.x>=i.x&&n.x<=e.x,r=o.y>=i.y&&n.y<=e.y;return s&&r},overlaps:function(t){t=b(t);var i=this.min,e=this.max,n=t.min,o=t.max,s=o.x>i.x&&n.x<e.x,r=o.y>i.y&&n.y<e.y;return s&&r},isValid:function(){return!(!this.min||!this.max)}},T.prototype={extend:function(t){var i,e,n=this._southWest,o=this._northEast;if(t instanceof M)i=t,e=t;else{if(!(t instanceof T))return t?this.extend(C(t)||z(t)):this;if(i=t._southWest,e=t._northEast,!i||!e)return this}return n||o?(n.lat=Math.min(i.lat,n.lat),n.lng=Math.min(i.lng,n.lng),o.lat=Math.max(e.lat,o.lat),o.lng=Math.max(e.lng,o.lng)):(this._southWest=new M(i.lat,i.lng),this._northEast=new M(e.lat,e.lng)),this},pad:function(t){var i=this._southWest,e=this._northEast,n=Math.abs(i.lat-e.lat)*t,o=Math.abs(i.lng-e.lng)*t;return new T(new M(i.lat-n,i.lng-o),new M(e.lat+n,e.lng+o))},getCenter:function(){return new M((this._southWest.lat+this._northEast.lat)/2,(this._southWest.lng+this._northEast.lng)/2)},getSouthWest:function(){return this._southWest},getNorthEast:function(){return this._northEast},getNorthWest:function(){return new M(this.getNorth(),this.getWest())},getSouthEast:function(){return new M(this.getSouth(),this.getEast())},getWest:function(){return this._southWest.lng},getSouth:function(){return this._southWest.lat},getEast:function(){return this._northEast.lng},getNorth:function(){return this._northEast.lat},contains:function(t){t="number"==typeof t[0]||t instanceof M||"lat"in t?C(t):z(t);var i,e,n=this._southWest,o=this._northEast;return t instanceof T?(i=t.getSouthWest(),e=t.getNorthEast()):i=e=t,i.lat>=n.lat&&e.lat<=o.lat&&i.lng>=n.lng&&e.lng<=o.lng},intersects:function(t){t=z(t);var i=this._southWest,e=this._northEast,n=t.getSouthWest(),o=t.getNorthEast(),s=o.lat>=i.lat&&n.lat<=e.lat,r=o.lng>=i.lng&&n.lng<=e.lng;return s&&r},overlaps:function(t){t=z(t);var i=this._southWest,e=this._northEast,n=t.getSouthWest(),o=t.getNorthEast(),s=o.lat>i.lat&&n.lat<e.lat,r=o.lng>i.lng&&n.lng<e.lng;return s&&r},toBBoxString:function(){return[this.getWest(),this.getSouth(),this.getEast(),this.getNorth()].join(",")},equals:function(t,i){return!!t&&(t=z(t),this._southWest.equals(t.getSouthWest(),i)&&this._northEast.equals(t.getNorthEast(),i))},isValid:function(){return!(!this._southWest||!this._northEast)}},M.prototype={equals:function(t,i){return!!t&&(t=C(t),Math.max(Math.abs(this.lat-t.lat),Math.abs(this.lng-t.lng))<=(void 0===i?1e-9:i))},toString:function(t){return"LatLng("+a(this.lat,t)+", "+a(this.lng,t)+")"},distanceTo:function(t){return pi.distance(this,C(t))},wrap:function(){return pi.wrapLatLng(this)},toBounds:function(t){var i=180*t/40075017,e=i/Math.cos(Math.PI/180*this.lat);return z([this.lat-i,this.lng-e],[this.lat+i,this.lng+e])},clone:function(){return new M(this.lat,this.lng,this.alt)}};var di={latLngToPoint:function(t,i){var e=this.projection.project(t),n=this.scale(i);return this.transformation._transform(e,n)},pointToLatLng:function(t,i){var e=this.scale(i),n=this.transformation.untransform(t,e);return this.projection.unproject(n)},project:function(t){return this.projection.project(t)},unproject:function(t){return this.projection.unproject(t)},scale:function(t){return 256*Math.pow(2,t)},zoom:function(t){return Math.log(t/256)/Math.LN2},getProjectedBounds:function(t){if(this.infinite)return null;var i=this.projection.bounds,e=this.scale(t);return new P(this.transformation.transform(i.min,e),this.transformation.transform(i.max,e))},infinite:!1,wrapLatLng:function(t){var i=this.wrapLng?s(t.lng,this.wrapLng,!0):t.lng;return new M(this.wrapLat?s(t.lat,this.wrapLat,!0):t.lat,i,t.alt)},wrapLatLngBounds:function(t){var i=t.getCenter(),e=this.wrapLatLng(i),n=i.lat-e.lat,o=i.lng-e.lng;if(0===n&&0===o)return t;var s=t.getSouthWest(),r=t.getNorthEast();return new T(new M(s.lat-n,s.lng-o),new M(r.lat-n,r.lng-o))}},pi=i({},di,{wrapLng:[-180,180],R:6371e3,distance:function(t,i){var e=Math.PI/180,n=t.lat*e,o=i.lat*e,s=Math.sin((i.lat-t.lat)*e/2),r=Math.sin((i.lng-t.lng)*e/2),a=s*s+Math.cos(n)*Math.cos(o)*r*r,h=2*Math.atan2(Math.sqrt(a),Math.sqrt(1-a));return this.R*h}}),mi={R:6378137,MAX_LATITUDE:85.0511287798,project:function(t){var i=Math.PI/180,e=this.MAX_LATITUDE,n=Math.max(Math.min(e,t.lat),-e),o=Math.sin(n*i);return new x(this.R*t.lng*i,this.R*Math.log((1+o)/(1-o))/2)},unproject:function(t){var i=180/Math.PI;return new M((2*Math.atan(Math.exp(t.y/this.R))-Math.PI/2)*i,t.x*i/this.R)},bounds:function(){var t=6378137*Math.PI;return new P([-t,-t],[t,t])}()};S.prototype={transform:function(t,i){return this._transform(t.clone(),i)},_transform:function(t,i){return i=i||1,t.x=i*(this._a*t.x+this._b),t.y=i*(this._c*t.y+this._d),t},untransform:function(t,i){return i=i||1,new x((t.x/i-this._b)/this._a,(t.y/i-this._d)/this._c)}};var fi,gi,vi,yi=i({},pi,{code:"EPSG:3857",projection:mi,transformation:function(){var t=.5/(Math.PI*mi.R);return Z(t,.5,-t,.5)}()}),xi=i({},yi,{code:"EPSG:900913"}),wi=document.documentElement.style,Pi="ActiveXObject"in window,Li=Pi&&!document.addEventListener,bi="msLaunchUri"in navigator&&!("documentMode"in document),Ti=A("webkit"),zi=A("android"),Mi=A("android 2")||A("android 3"),Ci=parseInt(/WebKit\/([0-9]+)|$/.exec(navigator.userAgent)[1],10),Si=zi&&A("Google")&&Ci<537&&!("AudioNode"in window),Zi=!!window.opera,Ei=A("chrome"),ki=A("gecko")&&!Ti&&!Zi&&!Pi,Ai=!Ei&&A("safari"),Bi=A("phantom"),Ii="OTransition"in wi,Oi=0===navigator.platform.indexOf("Win"),Ri=Pi&&"transition"in wi,Ni="WebKitCSSMatrix"in window&&"m11"in new window.WebKitCSSMatrix&&!Mi,Di="MozPerspective"in wi,ji=!window.L_DISABLE_3D&&(Ri||Ni||Di)&&!Ii&&!Bi,Wi="undefined"!=typeof orientation||A("mobile"),Hi=Wi&&Ti,Fi=Wi&&Ni,Ui=!window.PointerEvent&&window.MSPointerEvent,Vi=!(!window.PointerEvent&&!Ui),qi=!window.L_NO_TOUCH&&(Vi||"ontouchstart"in window||window.DocumentTouch&&document instanceof window.DocumentTouch),Gi=Wi&&Zi,Ki=Wi&&ki,Yi=(window.devicePixelRatio||window.screen.deviceXDPI/window.screen.logicalXDPI)>1,Xi=!!document.createElement("canvas").getContext,Ji=!(!document.createElementNS||!E("svg").createSVGRect),$i=!Ji&&function(){try{var t=document.createElement("div");t.innerHTML='<v:shape adj="1"/>';var i=t.firstChild;return i.style.behavior="url(#default#VML)",i&&"object"==typeof i.adj}catch(t){return!1}}(),Qi=(Object.freeze||Object)({ie:Pi,ielt9:Li,edge:bi,webkit:Ti,android:zi,android23:Mi,androidStock:Si,opera:Zi,chrome:Ei,gecko:ki,safari:Ai,phantom:Bi,opera12:Ii,win:Oi,ie3d:Ri,webkit3d:Ni,gecko3d:Di,any3d:ji,mobile:Wi,mobileWebkit:Hi,mobileWebkit3d:Fi,msPointer:Ui,pointer:Vi,touch:qi,mobileOpera:Gi,mobileGecko:Ki,retina:Yi,canvas:Xi,svg:Ji,vml:$i}),te=Ui?"MSPointerDown":"pointerdown",ie=Ui?"MSPointerMove":"pointermove",ee=Ui?"MSPointerUp":"pointerup",ne=Ui?"MSPointerCancel":"pointercancel",oe=["INPUT","SELECT","OPTION"],se={},re=!1,ae=0,he=Ui?"MSPointerDown":Vi?"pointerdown":"touchstart",ue=Ui?"MSPointerUp":Vi?"pointerup":"touchend",le="_leaflet_",ce=st(["transform","webkitTransform","OTransform","MozTransform","msTransform"]),_e=st(["webkitTransition","transition","OTransition","MozTransition","msTransition"]),de="webkitTransition"===_e||"OTransition"===_e?_e+"End":"transitionend";if("onselectstart"in document)fi=function(){mt(window,"selectstart",Pt)},gi=function(){ft(window,"selectstart",Pt)};else{var pe=st(["userSelect","WebkitUserSelect","OUserSelect","MozUserSelect","msUserSelect"]);fi=function(){if(pe){var t=document.documentElement.style;vi=t[pe],t[pe]="none"}},gi=function(){pe&&(document.documentElement.style[pe]=vi,vi=void 0)}}var me,fe,ge,ve=(Object.freeze||Object)({TRANSFORM:ce,TRANSITION:_e,TRANSITION_END:de,get:V,getStyle:q,create:G,remove:K,empty:Y,toFront:X,toBack:J,hasClass:$,addClass:Q,removeClass:tt,setClass:it,getClass:et,setOpacity:nt,testProp:st,setTransform:rt,setPosition:at,getPosition:ht,disableTextSelection:fi,enableTextSelection:gi,disableImageDrag:ut,enableImageDrag:lt,preventOutline:ct,restoreOutline:_t,getSizedParentNode:dt,getScale:pt}),ye="_leaflet_events",xe=Oi&&Ei?2*window.devicePixelRatio:ki?window.devicePixelRatio:1,we={},Pe=(Object.freeze||Object)({on:mt,off:ft,stopPropagation:yt,disableScrollPropagation:xt,disableClickPropagation:wt,preventDefault:Pt,stop:Lt,getMousePosition:bt,getWheelDelta:Tt,fakeStop:zt,skipped:Mt,isExternalTarget:Ct,addListener:mt,removeListener:ft}),Le=ci.extend({run:function(t,i,e,n){this.stop(),this._el=t,this._inProgress=!0,this._duration=e||.25,this._easeOutPower=1/Math.max(n||.5,.2),this._startPos=ht(t),this._offset=i.subtract(this._startPos),this._startTime=+new Date,this.fire("start"),this._animate()},stop:function(){this._inProgress&&(this._step(!0),this._complete())},_animate:function(){this._animId=f(this._animate,this),this._step()},_step:function(t){var i=+new Date-this._startTime,e=1e3*this._duration;i<e?this._runFrame(this._easeOut(i/e),t):(this._runFrame(1),this._complete())},_runFrame:function(t,i){var e=this._startPos.add(this._offset.multiplyBy(t));i&&e._round(),at(this._el,e),this.fire("step")},_complete:function(){g(this._animId),this._inProgress=!1,this.fire("end")},_easeOut:function(t){return 1-Math.pow(1-t,this._easeOutPower)}}),be=ci.extend({options:{crs:yi,center:void 0,zoom:void 0,minZoom:void 0,maxZoom:void 0,layers:[],maxBounds:void 0,renderer:void 0,zoomAnimation:!0,zoomAnimationThreshold:4,fadeAnimation:!0,markerZoomAnimation:!0,transform3DLimit:8388608,zoomSnap:1,zoomDelta:1,trackResize:!0},initialize:function(t,i){i=l(this,i),this._initContainer(t),this._initLayout(),this._onResize=e(this._onResize,this),this._initEvents(),i.maxBounds&&this.setMaxBounds(i.maxBounds),void 0!==i.zoom&&(this._zoom=this._limitZoom(i.zoom)),i.center&&void 0!==i.zoom&&this.setView(C(i.center),i.zoom,{reset:!0}),this._handlers=[],this._layers={},this._zoomBoundLayers={},this._sizeChanged=!0,this.callInitHooks(),this._zoomAnimated=_e&&ji&&!Gi&&this.options.zoomAnimation,this._zoomAnimated&&(this._createAnimProxy(),mt(this._proxy,de,this._catchTransitionEnd,this)),this._addLayers(this.options.layers)},setView:function(t,e,n){return e=void 0===e?this._zoom:this._limitZoom(e),t=this._limitCenter(C(t),e,this.options.maxBounds),n=n||{},this._stop(),this._loaded&&!n.reset&&!0!==n&&(void 0!==n.animate&&(n.zoom=i({animate:n.animate},n.zoom),n.pan=i({animate:n.animate,duration:n.duration},n.pan)),this._zoom!==e?this._tryAnimatedZoom&&this._tryAnimatedZoom(t,e,n.zoom):this._tryAnimatedPan(t,n.pan))?(clearTimeout(this._sizeTimer),this):(this._resetView(t,e),this)},setZoom:function(t,i){return this._loaded?this.setView(this.getCenter(),t,{zoom:i}):(this._zoom=t,this)},zoomIn:function(t,i){return t=t||(ji?this.options.zoomDelta:1),this.setZoom(this._zoom+t,i)},zoomOut:function(t,i){return t=t||(ji?this.options.zoomDelta:1),this.setZoom(this._zoom-t,i)},setZoomAround:function(t,i,e){var n=this.getZoomScale(i),o=this.getSize().divideBy(2),s=(t instanceof x?t:this.latLngToContainerPoint(t)).subtract(o).multiplyBy(1-1/n),r=this.containerPointToLatLng(o.add(s));return this.setView(r,i,{zoom:e})},_getBoundsCenterZoom:function(t,i){i=i||{},t=t.getBounds?t.getBounds():z(t);var e=w(i.paddingTopLeft||i.padding||[0,0]),n=w(i.paddingBottomRight||i.padding||[0,0]),o=this.getBoundsZoom(t,!1,e.add(n));if((o="number"==typeof i.maxZoom?Math.min(i.maxZoom,o):o)===1/0)return{center:t.getCenter(),zoom:o};var s=n.subtract(e).divideBy(2),r=this.project(t.getSouthWest(),o),a=this.project(t.getNorthEast(),o);return{center:this.unproject(r.add(a).divideBy(2).add(s),o),zoom:o}},fitBounds:function(t,i){if(!(t=z(t)).isValid())throw new Error("Bounds are not valid.");var e=this._getBoundsCenterZoom(t,i);return this.setView(e.center,e.zoom,i)},fitWorld:function(t){return this.fitBounds([[-90,-180],[90,180]],t)},panTo:function(t,i){return this.setView(t,this._zoom,{pan:i})},panBy:function(t,i){if(t=w(t).round(),i=i||{},!t.x&&!t.y)return this.fire("moveend");if(!0!==i.animate&&!this.getSize().contains(t))return this._resetView(this.unproject(this.project(this.getCenter()).add(t)),this.getZoom()),this;if(this._panAnim||(this._panAnim=new Le,this._panAnim.on({step:this._onPanTransitionStep,end:this._onPanTransitionEnd},this)),i.noMoveStart||this.fire("movestart"),!1!==i.animate){Q(this._mapPane,"leaflet-pan-anim");var e=this._getMapPanePos().subtract(t).round();this._panAnim.run(this._mapPane,e,i.duration||.25,i.easeLinearity)}else this._rawPanBy(t),this.fire("move").fire("moveend");return this},flyTo:function(t,i,e){function n(t){var i=(g*g-m*m+(t?-1:1)*x*x*v*v)/(2*(t?g:m)*x*v),e=Math.sqrt(i*i+1)-i;return e<1e-9?-18:Math.log(e)}function o(t){return(Math.exp(t)-Math.exp(-t))/2}function s(t){return(Math.exp(t)+Math.exp(-t))/2}function r(t){return o(t)/s(t)}function a(t){return m*(s(w)/s(w+y*t))}function h(t){return m*(s(w)*r(w+y*t)-o(w))/x}function u(t){return 1-Math.pow(1-t,1.5)}function l(){var e=(Date.now()-P)/b,n=u(e)*L;e<=1?(this._flyToFrame=f(l,this),this._move(this.unproject(c.add(_.subtract(c).multiplyBy(h(n)/v)),p),this.getScaleZoom(m/a(n),p),{flyTo:!0})):this._move(t,i)._moveEnd(!0)}if(!1===(e=e||{}).animate||!ji)return this.setView(t,i,e);this._stop();var c=this.project(this.getCenter()),_=this.project(t),d=this.getSize(),p=this._zoom;t=C(t),i=void 0===i?p:i;var m=Math.max(d.x,d.y),g=m*this.getZoomScale(p,i),v=_.distanceTo(c)||1,y=1.42,x=y*y,w=n(0),P=Date.now(),L=(n(1)-w)/y,b=e.duration?1e3*e.duration:1e3*L*.8;return this._moveStart(!0,e.noMoveStart),l.call(this),this},flyToBounds:function(t,i){var e=this._getBoundsCenterZoom(t,i);return this.flyTo(e.center,e.zoom,i)},setMaxBounds:function(t){return(t=z(t)).isValid()?(this.options.maxBounds&&this.off("moveend",this._panInsideMaxBounds),this.options.maxBounds=t,this._loaded&&this._panInsideMaxBounds(),this.on("moveend",this._panInsideMaxBounds)):(this.options.maxBounds=null,this.off("moveend",this._panInsideMaxBounds))},setMinZoom:function(t){var i=this.options.minZoom;return this.options.minZoom=t,this._loaded&&i!==t&&(this.fire("zoomlevelschange"),this.getZoom()<this.options.minZoom)?this.setZoom(t):this},setMaxZoom:function(t){var i=this.options.maxZoom;return this.options.maxZoom=t,this._loaded&&i!==t&&(this.fire("zoomlevelschange"),this.getZoom()>this.options.maxZoom)?this.setZoom(t):this},panInsideBounds:function(t,i){this._enforcingBounds=!0;var e=this.getCenter(),n=this._limitCenter(e,this._zoom,z(t));return e.equals(n)||this.panTo(n,i),this._enforcingBounds=!1,this},invalidateSize:function(t){if(!this._loaded)return this;t=i({animate:!1,pan:!0},!0===t?{animate:!0}:t);var n=this.getSize();this._sizeChanged=!0,this._lastCenter=null;var o=this.getSize(),s=n.divideBy(2).round(),r=o.divideBy(2).round(),a=s.subtract(r);return a.x||a.y?(t.animate&&t.pan?this.panBy(a):(t.pan&&this._rawPanBy(a),this.fire("move"),t.debounceMoveend?(clearTimeout(this._sizeTimer),this._sizeTimer=setTimeout(e(this.fire,this,"moveend"),200)):this.fire("moveend")),this.fire("resize",{oldSize:n,newSize:o})):this},stop:function(){return this.setZoom(this._limitZoom(this._zoom)),this.options.zoomSnap||this.fire("viewreset"),this._stop()},locate:function(t){if(t=this._locateOptions=i({timeout:1e4,watch:!1},t),!("geolocation"in navigator))return this._handleGeolocationError({code:0,message:"Geolocation not supported."}),this;var n=e(this._handleGeolocationResponse,this),o=e(this._handleGeolocationError,this);return t.watch?this._locationWatchId=navigator.geolocation.watchPosition(n,o,t):navigator.geolocation.getCurrentPosition(n,o,t),this},stopLocate:function(){return navigator.geolocation&&navigator.geolocation.clearWatch&&navigator.geolocation.clearWatch(this._locationWatchId),this._locateOptions&&(this._locateOptions.setView=!1),this},_handleGeolocationError:function(t){var i=t.code,e=t.message||(1===i?"permission denied":2===i?"position unavailable":"timeout");this._locateOptions.setView&&!this._loaded&&this.fitWorld(),this.fire("locationerror",{code:i,message:"Geolocation error: "+e+"."})},_handleGeolocationResponse:function(t){var i=new M(t.coords.latitude,t.coords.longitude),e=i.toBounds(2*t.coords.accuracy),n=this._locateOptions;if(n.setView){var o=this.getBoundsZoom(e);this.setView(i,n.maxZoom?Math.min(o,n.maxZoom):o)}var s={latlng:i,bounds:e,timestamp:t.timestamp};for(var r in t.coords)"number"==typeof t.coords[r]&&(s[r]=t.coords[r]);this.fire("locationfound",s)},addHandler:function(t,i){if(!i)return this;var e=this[t]=new i(this);return this._handlers.push(e),this.options[t]&&e.enable(),this},remove:function(){if(this._initEvents(!0),this._containerId!==this._container._leaflet_id)throw new Error("Map container is being reused by another instance");try{delete this._container._leaflet_id,delete this._containerId}catch(t){this._container._leaflet_id=void 0,this._containerId=void 0}void 0!==this._locationWatchId&&this.stopLocate(),this._stop(),K(this._mapPane),this._clearControlPos&&this._clearControlPos(),this._resizeRequest&&(g(this._resizeRequest),this._resizeRequest=null),this._clearHandlers(),this._loaded&&this.fire("unload");var t;for(t in this._layers)this._layers[t].remove();for(t in this._panes)K(this._panes[t]);return this._layers=[],this._panes=[],delete this._mapPane,delete this._renderer,this},createPane:function(t,i){var e=G("div","leaflet-pane"+(t?" leaflet-"+t.replace("Pane","")+"-pane":""),i||this._mapPane);return t&&(this._panes[t]=e),e},getCenter:function(){return this._checkIfLoaded(),this._lastCenter&&!this._moved()?this._lastCenter:this.layerPointToLatLng(this._getCenterLayerPoint())},getZoom:function(){return this._zoom},getBounds:function(){var t=this.getPixelBounds();return new T(this.unproject(t.getBottomLeft()),this.unproject(t.getTopRight()))},getMinZoom:function(){return void 0===this.options.minZoom?this._layersMinZoom||0:this.options.minZoom},getMaxZoom:function(){return void 0===this.options.maxZoom?void 0===this._layersMaxZoom?1/0:this._layersMaxZoom:this.options.maxZoom},getBoundsZoom:function(t,i,e){t=z(t),e=w(e||[0,0]);var n=this.getZoom()||0,o=this.getMinZoom(),s=this.getMaxZoom(),r=t.getNorthWest(),a=t.getSouthEast(),h=this.getSize().subtract(e),u=b(this.project(a,n),this.project(r,n)).getSize(),l=ji?this.options.zoomSnap:1,c=h.x/u.x,_=h.y/u.y,d=i?Math.max(c,_):Math.min(c,_);return n=this.getScaleZoom(d,n),l&&(n=Math.round(n/(l/100))*(l/100),n=i?Math.ceil(n/l)*l:Math.floor(n/l)*l),Math.max(o,Math.min(s,n))},getSize:function(){return this._size&&!this._sizeChanged||(this._size=new x(this._container.clientWidth||0,this._container.clientHeight||0),this._sizeChanged=!1),this._size.clone()},getPixelBounds:function(t,i){var e=this._getTopLeftPoint(t,i);return new P(e,e.add(this.getSize()))},getPixelOrigin:function(){return this._checkIfLoaded(),this._pixelOrigin},getPixelWorldBounds:function(t){return this.options.crs.getProjectedBounds(void 0===t?this.getZoom():t)},getPane:function(t){return"string"==typeof t?this._panes[t]:t},getPanes:function(){return this._panes},getContainer:function(){return this._container},getZoomScale:function(t,i){var e=this.options.crs;return i=void 0===i?this._zoom:i,e.scale(t)/e.scale(i)},getScaleZoom:function(t,i){var e=this.options.crs;i=void 0===i?this._zoom:i;var n=e.zoom(t*e.scale(i));return isNaN(n)?1/0:n},project:function(t,i){return i=void 0===i?this._zoom:i,this.options.crs.latLngToPoint(C(t),i)},unproject:function(t,i){return i=void 0===i?this._zoom:i,this.options.crs.pointToLatLng(w(t),i)},layerPointToLatLng:function(t){var i=w(t).add(this.getPixelOrigin());return this.unproject(i)},latLngToLayerPoint:function(t){return this.project(C(t))._round()._subtract(this.getPixelOrigin())},wrapLatLng:function(t){return this.options.crs.wrapLatLng(C(t))},wrapLatLngBounds:function(t){return this.options.crs.wrapLatLngBounds(z(t))},distance:function(t,i){return this.options.crs.distance(C(t),C(i))},containerPointToLayerPoint:function(t){return w(t).subtract(this._getMapPanePos())},layerPointToContainerPoint:function(t){return w(t).add(this._getMapPanePos())},containerPointToLatLng:function(t){var i=this.containerPointToLayerPoint(w(t));return this.layerPointToLatLng(i)},latLngToContainerPoint:function(t){return this.layerPointToContainerPoint(this.latLngToLayerPoint(C(t)))},mouseEventToContainerPoint:function(t){return bt(t,this._container)},mouseEventToLayerPoint:function(t){return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(t))},mouseEventToLatLng:function(t){return this.layerPointToLatLng(this.mouseEventToLayerPoint(t))},_initContainer:function(t){var i=this._container=V(t);if(!i)throw new Error("Map container not found.");if(i._leaflet_id)throw new Error("Map container is already initialized.");mt(i,"scroll",this._onScroll,this),this._containerId=n(i)},_initLayout:function(){var t=this._container;this._fadeAnimated=this.options.fadeAnimation&&ji,Q(t,"leaflet-container"+(qi?" leaflet-touch":"")+(Yi?" leaflet-retina":"")+(Li?" leaflet-oldie":"")+(Ai?" leaflet-safari":"")+(this._fadeAnimated?" leaflet-fade-anim":""));var i=q(t,"position");"absolute"!==i&&"relative"!==i&&"fixed"!==i&&(t.style.position="relative"),this._initPanes(),this._initControlPos&&this._initControlPos()},_initPanes:function(){var t=this._panes={};this._paneRenderers={},this._mapPane=this.createPane("mapPane",this._container),at(this._mapPane,new x(0,0)),this.createPane("tilePane"),this.createPane("shadowPane"),this.createPane("overlayPane"),this.createPane("markerPane"),this.createPane("tooltipPane"),this.createPane("popupPane"),this.options.markerZoomAnimation||(Q(t.markerPane,"leaflet-zoom-hide"),Q(t.shadowPane,"leaflet-zoom-hide"))},_resetView:function(t,i){at(this._mapPane,new x(0,0));var e=!this._loaded;this._loaded=!0,i=this._limitZoom(i),this.fire("viewprereset");var n=this._zoom!==i;this._moveStart(n,!1)._move(t,i)._moveEnd(n),this.fire("viewreset"),e&&this.fire("load")},_moveStart:function(t,i){return t&&this.fire("zoomstart"),i||this.fire("movestart"),this},_move:function(t,i,e){void 0===i&&(i=this._zoom);var n=this._zoom!==i;return this._zoom=i,this._lastCenter=t,this._pixelOrigin=this._getNewPixelOrigin(t),(n||e&&e.pinch)&&this.fire("zoom",e),this.fire("move",e)},_moveEnd:function(t){return t&&this.fire("zoomend"),this.fire("moveend")},_stop:function(){return g(this._flyToFrame),this._panAnim&&this._panAnim.stop(),this},_rawPanBy:function(t){at(this._mapPane,this._getMapPanePos().subtract(t))},_getZoomSpan:function(){return this.getMaxZoom()-this.getMinZoom()},_panInsideMaxBounds:function(){this._enforcingBounds||this.panInsideBounds(this.options.maxBounds)},_checkIfLoaded:function(){if(!this._loaded)throw new Error("Set map center and zoom first.")},_initEvents:function(t){this._targets={},this._targets[n(this._container)]=this;var i=t?ft:mt;i(this._container,"click dblclick mousedown mouseup mouseover mouseout mousemove contextmenu keypress",this._handleDOMEvent,this),this.options.trackResize&&i(window,"resize",this._onResize,this),ji&&this.options.transform3DLimit&&(t?this.off:this.on).call(this,"moveend",this._onMoveEnd)},_onResize:function(){g(this._resizeRequest),this._resizeRequest=f(function(){this.invalidateSize({debounceMoveend:!0})},this)},_onScroll:function(){this._container.scrollTop=0,this._container.scrollLeft=0},_onMoveEnd:function(){var t=this._getMapPanePos();Math.max(Math.abs(t.x),Math.abs(t.y))>=this.options.transform3DLimit&&this._resetView(this.getCenter(),this.getZoom())},_findEventTargets:function(t,i){for(var e,o=[],s="mouseout"===i||"mouseover"===i,r=t.target||t.srcElement,a=!1;r;){if((e=this._targets[n(r)])&&("click"===i||"preclick"===i)&&!t._simulated&&this._draggableMoved(e)){a=!0;break}if(e&&e.listens(i,!0)){if(s&&!Ct(r,t))break;if(o.push(e),s)break}if(r===this._container)break;r=r.parentNode}return o.length||a||s||!Ct(r,t)||(o=[this]),o},_handleDOMEvent:function(t){if(this._loaded&&!Mt(t)){var i=t.type;"mousedown"!==i&&"keypress"!==i||ct(t.target||t.srcElement),this._fireDOMEvent(t,i)}},_mouseEvents:["click","dblclick","mouseover","mouseout","contextmenu"],_fireDOMEvent:function(t,e,n){if("click"===t.type){var o=i({},t);o.type="preclick",this._fireDOMEvent(o,o.type,n)}if(!t._stopped&&(n=(n||[]).concat(this._findEventTargets(t,e))).length){var s=n[0];"contextmenu"===e&&s.listens(e,!0)&&Pt(t);var r={originalEvent:t};if("keypress"!==t.type){var a=s.getLatLng&&(!s._radius||s._radius<=10);r.containerPoint=a?this.latLngToContainerPoint(s.getLatLng()):this.mouseEventToContainerPoint(t),r.layerPoint=this.containerPointToLayerPoint(r.containerPoint),r.latlng=a?s.getLatLng():this.layerPointToLatLng(r.layerPoint)}for(var h=0;h<n.length;h++)if(n[h].fire(e,r,!0),r.originalEvent._stopped||!1===n[h].options.bubblingMouseEvents&&-1!==d(this._mouseEvents,e))return}},_draggableMoved:function(t){return(t=t.dragging&&t.dragging.enabled()?t:this).dragging&&t.dragging.moved()||this.boxZoom&&this.boxZoom.moved()},_clearHandlers:function(){for(var t=0,i=this._handlers.length;t<i;t++)this._handlers[t].disable()},whenReady:function(t,i){return this._loaded?t.call(i||this,{target:this}):this.on("load",t,i),this},_getMapPanePos:function(){return ht(this._mapPane)||new x(0,0)},_moved:function(){var t=this._getMapPanePos();return t&&!t.equals([0,0])},_getTopLeftPoint:function(t,i){return(t&&void 0!==i?this._getNewPixelOrigin(t,i):this.getPixelOrigin()).subtract(this._getMapPanePos())},_getNewPixelOrigin:function(t,i){var e=this.getSize()._divideBy(2);return this.project(t,i)._subtract(e)._add(this._getMapPanePos())._round()},_latLngToNewLayerPoint:function(t,i,e){var n=this._getNewPixelOrigin(e,i);return this.project(t,i)._subtract(n)},_latLngBoundsToNewLayerBounds:function(t,i,e){var n=this._getNewPixelOrigin(e,i);return b([this.project(t.getSouthWest(),i)._subtract(n),this.project(t.getNorthWest(),i)._subtract(n),this.project(t.getSouthEast(),i)._subtract(n),this.project(t.getNorthEast(),i)._subtract(n)])},_getCenterLayerPoint:function(){return this.containerPointToLayerPoint(this.getSize()._divideBy(2))},_getCenterOffset:function(t){return this.latLngToLayerPoint(t).subtract(this._getCenterLayerPoint())},_limitCenter:function(t,i,e){if(!e)return t;var n=this.project(t,i),o=this.getSize().divideBy(2),s=new P(n.subtract(o),n.add(o)),r=this._getBoundsOffset(s,e,i);return r.round().equals([0,0])?t:this.unproject(n.add(r),i)},_limitOffset:function(t,i){if(!i)return t;var e=this.getPixelBounds(),n=new P(e.min.add(t),e.max.add(t));return t.add(this._getBoundsOffset(n,i))},_getBoundsOffset:function(t,i,e){var n=b(this.project(i.getNorthEast(),e),this.project(i.getSouthWest(),e)),o=n.min.subtract(t.min),s=n.max.subtract(t.max);return new x(this._rebound(o.x,-s.x),this._rebound(o.y,-s.y))},_rebound:function(t,i){return t+i>0?Math.round(t-i)/2:Math.max(0,Math.ceil(t))-Math.max(0,Math.floor(i))},_limitZoom:function(t){var i=this.getMinZoom(),e=this.getMaxZoom(),n=ji?this.options.zoomSnap:1;return n&&(t=Math.round(t/n)*n),Math.max(i,Math.min(e,t))},_onPanTransitionStep:function(){this.fire("move")},_onPanTransitionEnd:function(){tt(this._mapPane,"leaflet-pan-anim"),this.fire("moveend")},_tryAnimatedPan:function(t,i){var e=this._getCenterOffset(t)._trunc();return!(!0!==(i&&i.animate)&&!this.getSize().contains(e))&&(this.panBy(e,i),!0)},_createAnimProxy:function(){var t=this._proxy=G("div","leaflet-proxy leaflet-zoom-animated");this._panes.mapPane.appendChild(t),this.on("zoomanim",function(t){var i=ce,e=this._proxy.style[i];rt(this._proxy,this.project(t.center,t.zoom),this.getZoomScale(t.zoom,1)),e===this._proxy.style[i]&&this._animatingZoom&&this._onZoomTransitionEnd()},this),this.on("load moveend",function(){var t=this.getCenter(),i=this.getZoom();rt(this._proxy,this.project(t,i),this.getZoomScale(i,1))},this),this._on("unload",this._destroyAnimProxy,this)},_destroyAnimProxy:function(){K(this._proxy),delete this._proxy},_catchTransitionEnd:function(t){this._animatingZoom&&t.propertyName.indexOf("transform")>=0&&this._onZoomTransitionEnd()},_nothingToAnimate:function(){return!this._container.getElementsByClassName("leaflet-zoom-animated").length},_tryAnimatedZoom:function(t,i,e){if(this._animatingZoom)return!0;if(e=e||{},!this._zoomAnimated||!1===e.animate||this._nothingToAnimate()||Math.abs(i-this._zoom)>this.options.zoomAnimationThreshold)return!1;var n=this.getZoomScale(i),o=this._getCenterOffset(t)._divideBy(1-1/n);return!(!0!==e.animate&&!this.getSize().contains(o))&&(f(function(){this._moveStart(!0,!1)._animateZoom(t,i,!0)},this),!0)},_animateZoom:function(t,i,n,o){this._mapPane&&(n&&(this._animatingZoom=!0,this._animateToCenter=t,this._animateToZoom=i,Q(this._mapPane,"leaflet-zoom-anim")),this.fire("zoomanim",{center:t,zoom:i,noUpdate:o}),setTimeout(e(this._onZoomTransitionEnd,this),250))},_onZoomTransitionEnd:function(){this._animatingZoom&&(this._mapPane&&tt(this._mapPane,"leaflet-zoom-anim"),this._animatingZoom=!1,this._move(this._animateToCenter,this._animateToZoom),f(function(){this._moveEnd(!0)},this))}}),Te=v.extend({options:{position:"topright"},initialize:function(t){l(this,t)},getPosition:function(){return this.options.position},setPosition:function(t){var i=this._map;return i&&i.removeControl(this),this.options.position=t,i&&i.addControl(this),this},getContainer:function(){return this._container},addTo:function(t){this.remove(),this._map=t;var i=this._container=this.onAdd(t),e=this.getPosition(),n=t._controlCorners[e];return Q(i,"leaflet-control"),-1!==e.indexOf("bottom")?n.insertBefore(i,n.firstChild):n.appendChild(i),this},remove:function(){return this._map?(K(this._container),this.onRemove&&this.onRemove(this._map),this._map=null,this):this},_refocusOnMap:function(t){this._map&&t&&t.screenX>0&&t.screenY>0&&this._map.getContainer().focus()}}),ze=function(t){return new Te(t)};be.include({addControl:function(t){return t.addTo(this),this},removeControl:function(t){return t.remove(),this},_initControlPos:function(){function t(t,o){var s=e+t+" "+e+o;i[t+o]=G("div",s,n)}var i=this._controlCorners={},e="leaflet-",n=this._controlContainer=G("div",e+"control-container",this._container);t("top","left"),t("top","right"),t("bottom","left"),t("bottom","right")},_clearControlPos:function(){for(var t in this._controlCorners)K(this._controlCorners[t]);K(this._controlContainer),delete this._controlCorners,delete this._controlContainer}});var Me=Te.extend({options:{collapsed:!0,position:"topright",autoZIndex:!0,hideSingleBase:!1,sortLayers:!1,sortFunction:function(t,i,e,n){return e<n?-1:n<e?1:0}},initialize:function(t,i,e){l(this,e),this._layerControlInputs=[],this._layers=[],this._lastZIndex=0,this._handlingClick=!1;for(var n in t)this._addLayer(t[n],n);for(n in i)this._addLayer(i[n],n,!0)},onAdd:function(t){this._initLayout(),this._update(),this._map=t,t.on("zoomend",this._checkDisabledLayers,this);for(var i=0;i<this._layers.length;i++)this._layers[i].layer.on("add remove",this._onLayerChange,this);return this._container},addTo:function(t){return Te.prototype.addTo.call(this,t),this._expandIfNotCollapsed()},onRemove:function(){this._map.off("zoomend",this._checkDisabledLayers,this);for(var t=0;t<this._layers.length;t++)this._layers[t].layer.off("add remove",this._onLayerChange,this)},addBaseLayer:function(t,i){return this._addLayer(t,i),this._map?this._update():this},addOverlay:function(t,i){return this._addLayer(t,i,!0),this._map?this._update():this},removeLayer:function(t){t.off("add remove",this._onLayerChange,this);var i=this._getLayer(n(t));return i&&this._layers.splice(this._layers.indexOf(i),1),this._map?this._update():this},expand:function(){Q(this._container,"leaflet-control-layers-expanded"),this._form.style.height=null;var t=this._map.getSize().y-(this._container.offsetTop+50);return t<this._form.clientHeight?(Q(this._form,"leaflet-control-layers-scrollbar"),this._form.style.height=t+"px"):tt(this._form,"leaflet-control-layers-scrollbar"),this._checkDisabledLayers(),this},collapse:function(){return tt(this._container,"leaflet-control-layers-expanded"),this},_initLayout:function(){var t="leaflet-control-layers",i=this._container=G("div",t),e=this.options.collapsed;i.setAttribute("aria-haspopup",!0),wt(i),xt(i);var n=this._form=G("form",t+"-list");e&&(this._map.on("click",this.collapse,this),zi||mt(i,{mouseenter:this.expand,mouseleave:this.collapse},this));var o=this._layersLink=G("a",t+"-toggle",i);o.href="#",o.title="Layers",qi?(mt(o,"click",Lt),mt(o,"click",this.expand,this)):mt(o,"focus",this.expand,this),e||this.expand(),this._baseLayersList=G("div",t+"-base",n),this._separator=G("div",t+"-separator",n),this._overlaysList=G("div",t+"-overlays",n),i.appendChild(n)},_getLayer:function(t){for(var i=0;i<this._layers.length;i++)if(this._layers[i]&&n(this._layers[i].layer)===t)return this._layers[i]},_addLayer:function(t,i,n){this._map&&t.on("add remove",this._onLayerChange,this),this._layers.push({layer:t,name:i,overlay:n}),this.options.sortLayers&&this._layers.sort(e(function(t,i){return this.options.sortFunction(t.layer,i.layer,t.name,i.name)},this)),this.options.autoZIndex&&t.setZIndex&&(this._lastZIndex++,t.setZIndex(this._lastZIndex)),this._expandIfNotCollapsed()},_update:function(){if(!this._container)return this;Y(this._baseLayersList),Y(this._overlaysList),this._layerControlInputs=[];var t,i,e,n,o=0;for(e=0;e<this._layers.length;e++)n=this._layers[e],this._addItem(n),i=i||n.overlay,t=t||!n.overlay,o+=n.overlay?0:1;return this.options.hideSingleBase&&(t=t&&o>1,this._baseLayersList.style.display=t?"":"none"),this._separator.style.display=i&&t?"":"none",this},_onLayerChange:function(t){this._handlingClick||this._update();var i=this._getLayer(n(t.target)),e=i.overlay?"add"===t.type?"overlayadd":"overlayremove":"add"===t.type?"baselayerchange":null;e&&this._map.fire(e,i)},_createRadioElement:function(t,i){var e='<input type="radio" class="leaflet-control-layers-selector" name="'+t+'"'+(i?' checked="checked"':"")+"/>",n=document.createElement("div");return n.innerHTML=e,n.firstChild},_addItem:function(t){var i,e=document.createElement("label"),o=this._map.hasLayer(t.layer);t.overlay?((i=document.createElement("input")).type="checkbox",i.className="leaflet-control-layers-selector",i.defaultChecked=o):i=this._createRadioElement("leaflet-base-layers",o),this._layerControlInputs.push(i),i.layerId=n(t.layer),mt(i,"click",this._onInputClick,this);var s=document.createElement("span");s.innerHTML=" "+t.name;var r=document.createElement("div");return e.appendChild(r),r.appendChild(i),r.appendChild(s),(t.overlay?this._overlaysList:this._baseLayersList).appendChild(e),this._checkDisabledLayers(),e},_onInputClick:function(){var t,i,e=this._layerControlInputs,n=[],o=[];this._handlingClick=!0;for(var s=e.length-1;s>=0;s--)t=e[s],i=this._getLayer(t.layerId).layer,t.checked?n.push(i):t.checked||o.push(i);for(s=0;s<o.length;s++)this._map.hasLayer(o[s])&&this._map.removeLayer(o[s]);for(s=0;s<n.length;s++)this._map.hasLayer(n[s])||this._map.addLayer(n[s]);this._handlingClick=!1,this._refocusOnMap()},_checkDisabledLayers:function(){for(var t,i,e=this._layerControlInputs,n=this._map.getZoom(),o=e.length-1;o>=0;o--)t=e[o],i=this._getLayer(t.layerId).layer,t.disabled=void 0!==i.options.minZoom&&n<i.options.minZoom||void 0!==i.options.maxZoom&&n>i.options.maxZoom},_expandIfNotCollapsed:function(){return this._map&&!this.options.collapsed&&this.expand(),this},_expand:function(){return this.expand()},_collapse:function(){return this.collapse()}}),Ce=Te.extend({options:{position:"topleft",zoomInText:"+",zoomInTitle:"Zoom in",zoomOutText:"&#x2212;",zoomOutTitle:"Zoom out"},onAdd:function(t){var i="leaflet-control-zoom",e=G("div",i+" leaflet-bar"),n=this.options;return this._zoomInButton=this._createButton(n.zoomInText,n.zoomInTitle,i+"-in",e,this._zoomIn),this._zoomOutButton=this._createButton(n.zoomOutText,n.zoomOutTitle,i+"-out",e,this._zoomOut),this._updateDisabled(),t.on("zoomend zoomlevelschange",this._updateDisabled,this),e},onRemove:function(t){t.off("zoomend zoomlevelschange",this._updateDisabled,this)},disable:function(){return this._disabled=!0,this._updateDisabled(),this},enable:function(){return this._disabled=!1,this._updateDisabled(),this},_zoomIn:function(t){!this._disabled&&this._map._zoom<this._map.getMaxZoom()&&this._map.zoomIn(this._map.options.zoomDelta*(t.shiftKey?3:1))},_zoomOut:function(t){!this._disabled&&this._map._zoom>this._map.getMinZoom()&&this._map.zoomOut(this._map.options.zoomDelta*(t.shiftKey?3:1))},_createButton:function(t,i,e,n,o){var s=G("a",e,n);return s.innerHTML=t,s.href="#",s.title=i,s.setAttribute("role","button"),s.setAttribute("aria-label",i),wt(s),mt(s,"click",Lt),mt(s,"click",o,this),mt(s,"click",this._refocusOnMap,this),s},_updateDisabled:function(){var t=this._map,i="leaflet-disabled";tt(this._zoomInButton,i),tt(this._zoomOutButton,i),(this._disabled||t._zoom===t.getMinZoom())&&Q(this._zoomOutButton,i),(this._disabled||t._zoom===t.getMaxZoom())&&Q(this._zoomInButton,i)}});be.mergeOptions({zoomControl:!0}),be.addInitHook(function(){this.options.zoomControl&&(this.zoomControl=new Ce,this.addControl(this.zoomControl))});var Se=Te.extend({options:{position:"bottomleft",maxWidth:100,metric:!0,imperial:!0},onAdd:function(t){var i=G("div","leaflet-control-scale"),e=this.options;return this._addScales(e,"leaflet-control-scale-line",i),t.on(e.updateWhenIdle?"moveend":"move",this._update,this),t.whenReady(this._update,this),i},onRemove:function(t){t.off(this.options.updateWhenIdle?"moveend":"move",this._update,this)},_addScales:function(t,i,e){t.metric&&(this._mScale=G("div",i,e)),t.imperial&&(this._iScale=G("div",i,e))},_update:function(){var t=this._map,i=t.getSize().y/2,e=t.distance(t.containerPointToLatLng([0,i]),t.containerPointToLatLng([this.options.maxWidth,i]));this._updateScales(e)},_updateScales:function(t){this.options.metric&&t&&this._updateMetric(t),this.options.imperial&&t&&this._updateImperial(t)},_updateMetric:function(t){var i=this._getRoundNum(t),e=i<1e3?i+" m":i/1e3+" km";this._updateScale(this._mScale,e,i/t)},_updateImperial:function(t){var i,e,n,o=3.2808399*t;o>5280?(i=o/5280,e=this._getRoundNum(i),this._updateScale(this._iScale,e+" mi",e/i)):(n=this._getRoundNum(o),this._updateScale(this._iScale,n+" ft",n/o))},_updateScale:function(t,i,e){t.style.width=Math.round(this.options.maxWidth*e)+"px",t.innerHTML=i},_getRoundNum:function(t){var i=Math.pow(10,(Math.floor(t)+"").length-1),e=t/i;return e=e>=10?10:e>=5?5:e>=3?3:e>=2?2:1,i*e}}),Ze=Te.extend({options:{position:"bottomright",prefix:'<a href="http://leafletjs.com" title="A JS library for interactive maps">Leaflet</a>'},initialize:function(t){l(this,t),this._attributions={}},onAdd:function(t){t.attributionControl=this,this._container=G("div","leaflet-control-attribution"),wt(this._container);for(var i in t._layers)t._layers[i].getAttribution&&this.addAttribution(t._layers[i].getAttribution());return this._update(),this._container},setPrefix:function(t){return this.options.prefix=t,this._update(),this},addAttribution:function(t){return t?(this._attributions[t]||(this._attributions[t]=0),this._attributions[t]++,this._update(),this):this},removeAttribution:function(t){return t?(this._attributions[t]&&(this._attributions[t]--,this._update()),this):this},_update:function(){if(this._map){var t=[];for(var i in this._attributions)this._attributions[i]&&t.push(i);var e=[];this.options.prefix&&e.push(this.options.prefix),t.length&&e.push(t.join(", ")),this._container.innerHTML=e.join(" | ")}}});be.mergeOptions({attributionControl:!0}),be.addInitHook(function(){this.options.attributionControl&&(new Ze).addTo(this)});Te.Layers=Me,Te.Zoom=Ce,Te.Scale=Se,Te.Attribution=Ze,ze.layers=function(t,i,e){return new Me(t,i,e)},ze.zoom=function(t){return new Ce(t)},ze.scale=function(t){return new Se(t)},ze.attribution=function(t){return new Ze(t)};var Ee=v.extend({initialize:function(t){this._map=t},enable:function(){return this._enabled?this:(this._enabled=!0,this.addHooks(),this)},disable:function(){return this._enabled?(this._enabled=!1,this.removeHooks(),this):this},enabled:function(){return!!this._enabled}});Ee.addTo=function(t,i){return t.addHandler(i,this),this};var ke,Ae={Events:li},Be=qi?"touchstart mousedown":"mousedown",Ie={mousedown:"mouseup",touchstart:"touchend",pointerdown:"touchend",MSPointerDown:"touchend"},Oe={mousedown:"mousemove",touchstart:"touchmove",pointerdown:"touchmove",MSPointerDown:"touchmove"},Re=ci.extend({options:{clickTolerance:3},initialize:function(t,i,e,n){l(this,n),this._element=t,this._dragStartTarget=i||t,this._preventOutline=e},enable:function(){this._enabled||(mt(this._dragStartTarget,Be,this._onDown,this),this._enabled=!0)},disable:function(){this._enabled&&(Re._dragging===this&&this.finishDrag(),ft(this._dragStartTarget,Be,this._onDown,this),this._enabled=!1,this._moved=!1)},_onDown:function(t){if(!t._simulated&&this._enabled&&(this._moved=!1,!$(this._element,"leaflet-zoom-anim")&&!(Re._dragging||t.shiftKey||1!==t.which&&1!==t.button&&!t.touches||(Re._dragging=this,this._preventOutline&&ct(this._element),ut(),fi(),this._moving)))){this.fire("down");var i=t.touches?t.touches[0]:t,e=dt(this._element);this._startPoint=new x(i.clientX,i.clientY),this._parentScale=pt(e),mt(document,Oe[t.type],this._onMove,this),mt(document,Ie[t.type],this._onUp,this)}},_onMove:function(t){if(!t._simulated&&this._enabled)if(t.touches&&t.touches.length>1)this._moved=!0;else{var i=t.touches&&1===t.touches.length?t.touches[0]:t,e=new x(i.clientX,i.clientY)._subtract(this._startPoint);(e.x||e.y)&&(Math.abs(e.x)+Math.abs(e.y)<this.options.clickTolerance||(e.x/=this._parentScale.x,e.y/=this._parentScale.y,Pt(t),this._moved||(this.fire("dragstart"),this._moved=!0,this._startPos=ht(this._element).subtract(e),Q(document.body,"leaflet-dragging"),this._lastTarget=t.target||t.srcElement,window.SVGElementInstance&&this._lastTarget instanceof SVGElementInstance&&(this._lastTarget=this._lastTarget.correspondingUseElement),Q(this._lastTarget,"leaflet-drag-target")),this._newPos=this._startPos.add(e),this._moving=!0,g(this._animRequest),this._lastEvent=t,this._animRequest=f(this._updatePosition,this,!0)))}},_updatePosition:function(){var t={originalEvent:this._lastEvent};this.fire("predrag",t),at(this._element,this._newPos),this.fire("drag",t)},_onUp:function(t){!t._simulated&&this._enabled&&this.finishDrag()},finishDrag:function(){tt(document.body,"leaflet-dragging"),this._lastTarget&&(tt(this._lastTarget,"leaflet-drag-target"),this._lastTarget=null);for(var t in Oe)ft(document,Oe[t],this._onMove,this),ft(document,Ie[t],this._onUp,this);lt(),gi(),this._moved&&this._moving&&(g(this._animRequest),this.fire("dragend",{distance:this._newPos.distanceTo(this._startPos)})),this._moving=!1,Re._dragging=!1}}),Ne=(Object.freeze||Object)({simplify:Zt,pointToSegmentDistance:Et,closestPointOnSegment:function(t,i,e){return Dt(t,i,e)},clipSegment:It,_getEdgeIntersection:Ot,_getBitCode:Rt,_sqClosestPointOnSegment:Dt,isFlat:jt,_flat:Wt}),De=(Object.freeze||Object)({clipPolygon:Ht}),je={project:function(t){return new x(t.lng,t.lat)},unproject:function(t){return new M(t.y,t.x)},bounds:new P([-180,-90],[180,90])},We={R:6378137,R_MINOR:6356752.314245179,bounds:new P([-20037508.34279,-15496570.73972],[20037508.34279,18764656.23138]),project:function(t){var i=Math.PI/180,e=this.R,n=t.lat*i,o=this.R_MINOR/e,s=Math.sqrt(1-o*o),r=s*Math.sin(n),a=Math.tan(Math.PI/4-n/2)/Math.pow((1-r)/(1+r),s/2);return n=-e*Math.log(Math.max(a,1e-10)),new x(t.lng*i*e,n)},unproject:function(t){for(var i,e=180/Math.PI,n=this.R,o=this.R_MINOR/n,s=Math.sqrt(1-o*o),r=Math.exp(-t.y/n),a=Math.PI/2-2*Math.atan(r),h=0,u=.1;h<15&&Math.abs(u)>1e-7;h++)i=s*Math.sin(a),i=Math.pow((1-i)/(1+i),s/2),a+=u=Math.PI/2-2*Math.atan(r*i)-a;return new M(a*e,t.x*e/n)}},He=(Object.freeze||Object)({LonLat:je,Mercator:We,SphericalMercator:mi}),Fe=i({},pi,{code:"EPSG:3395",projection:We,transformation:function(){var t=.5/(Math.PI*We.R);return Z(t,.5,-t,.5)}()}),Ue=i({},pi,{code:"EPSG:4326",projection:je,transformation:Z(1/180,1,-1/180,.5)}),Ve=i({},di,{projection:je,transformation:Z(1,0,-1,0),scale:function(t){return Math.pow(2,t)},zoom:function(t){return Math.log(t)/Math.LN2},distance:function(t,i){var e=i.lng-t.lng,n=i.lat-t.lat;return Math.sqrt(e*e+n*n)},infinite:!0});di.Earth=pi,di.EPSG3395=Fe,di.EPSG3857=yi,di.EPSG900913=xi,di.EPSG4326=Ue,di.Simple=Ve;var qe=ci.extend({options:{pane:"overlayPane",attribution:null,bubblingMouseEvents:!0},addTo:function(t){return t.addLayer(this),this},remove:function(){return this.removeFrom(this._map||this._mapToAdd)},removeFrom:function(t){return t&&t.removeLayer(this),this},getPane:function(t){return this._map.getPane(t?this.options[t]||t:this.options.pane)},addInteractiveTarget:function(t){return this._map._targets[n(t)]=this,this},removeInteractiveTarget:function(t){return delete this._map._targets[n(t)],this},getAttribution:function(){return this.options.attribution},_layerAdd:function(t){var i=t.target;if(i.hasLayer(this)){if(this._map=i,this._zoomAnimated=i._zoomAnimated,this.getEvents){var e=this.getEvents();i.on(e,this),this.once("remove",function(){i.off(e,this)},this)}this.onAdd(i),this.getAttribution&&i.attributionControl&&i.attributionControl.addAttribution(this.getAttribution()),this.fire("add"),i.fire("layeradd",{layer:this})}}});be.include({addLayer:function(t){if(!t._layerAdd)throw new Error("The provided object is not a Layer.");var i=n(t);return this._layers[i]?this:(this._layers[i]=t,t._mapToAdd=this,t.beforeAdd&&t.beforeAdd(this),this.whenReady(t._layerAdd,t),this)},removeLayer:function(t){var i=n(t);return this._layers[i]?(this._loaded&&t.onRemove(this),t.getAttribution&&this.attributionControl&&this.attributionControl.removeAttribution(t.getAttribution()),delete this._layers[i],this._loaded&&(this.fire("layerremove",{layer:t}),t.fire("remove")),t._map=t._mapToAdd=null,this):this},hasLayer:function(t){return!!t&&n(t)in this._layers},eachLayer:function(t,i){for(var e in this._layers)t.call(i,this._layers[e]);return this},_addLayers:function(t){for(var i=0,e=(t=t?oi(t)?t:[t]:[]).length;i<e;i++)this.addLayer(t[i])},_addZoomLimit:function(t){!isNaN(t.options.maxZoom)&&isNaN(t.options.minZoom)||(this._zoomBoundLayers[n(t)]=t,this._updateZoomLevels())},_removeZoomLimit:function(t){var i=n(t);this._zoomBoundLayers[i]&&(delete this._zoomBoundLayers[i],this._updateZoomLevels())},_updateZoomLevels:function(){var t=1/0,i=-1/0,e=this._getZoomSpan();for(var n in this._zoomBoundLayers){var o=this._zoomBoundLayers[n].options;t=void 0===o.minZoom?t:Math.min(t,o.minZoom),i=void 0===o.maxZoom?i:Math.max(i,o.maxZoom)}this._layersMaxZoom=i===-1/0?void 0:i,this._layersMinZoom=t===1/0?void 0:t,e!==this._getZoomSpan()&&this.fire("zoomlevelschange"),void 0===this.options.maxZoom&&this._layersMaxZoom&&this.getZoom()>this._layersMaxZoom&&this.setZoom(this._layersMaxZoom),void 0===this.options.minZoom&&this._layersMinZoom&&this.getZoom()<this._layersMinZoom&&this.setZoom(this._layersMinZoom)}});var Ge=qe.extend({initialize:function(t,i){l(this,i),this._layers={};var e,n;if(t)for(e=0,n=t.length;e<n;e++)this.addLayer(t[e])},addLayer:function(t){var i=this.getLayerId(t);return this._layers[i]=t,this._map&&this._map.addLayer(t),this},removeLayer:function(t){var i=t in this._layers?t:this.getLayerId(t);return this._map&&this._layers[i]&&this._map.removeLayer(this._layers[i]),delete this._layers[i],this},hasLayer:function(t){return!!t&&(t in this._layers||this.getLayerId(t)in this._layers)},clearLayers:function(){return this.eachLayer(this.removeLayer,this)},invoke:function(t){var i,e,n=Array.prototype.slice.call(arguments,1);for(i in this._layers)(e=this._layers[i])[t]&&e[t].apply(e,n);return this},onAdd:function(t){this.eachLayer(t.addLayer,t)},onRemove:function(t){this.eachLayer(t.removeLayer,t)},eachLayer:function(t,i){for(var e in this._layers)t.call(i,this._layers[e]);return this},getLayer:function(t){return this._layers[t]},getLayers:function(){var t=[];return this.eachLayer(t.push,t),t},setZIndex:function(t){return this.invoke("setZIndex",t)},getLayerId:function(t){return n(t)}}),Ke=Ge.extend({addLayer:function(t){return this.hasLayer(t)?this:(t.addEventParent(this),Ge.prototype.addLayer.call(this,t),this.fire("layeradd",{layer:t}))},removeLayer:function(t){return this.hasLayer(t)?(t in this._layers&&(t=this._layers[t]),t.removeEventParent(this),Ge.prototype.removeLayer.call(this,t),this.fire("layerremove",{layer:t})):this},setStyle:function(t){return this.invoke("setStyle",t)},bringToFront:function(){return this.invoke("bringToFront")},bringToBack:function(){return this.invoke("bringToBack")},getBounds:function(){var t=new T;for(var i in this._layers){var e=this._layers[i];t.extend(e.getBounds?e.getBounds():e.getLatLng())}return t}}),Ye=v.extend({options:{popupAnchor:[0,0],tooltipAnchor:[0,0]},initialize:function(t){l(this,t)},createIcon:function(t){return this._createIcon("icon",t)},createShadow:function(t){return this._createIcon("shadow",t)},_createIcon:function(t,i){var e=this._getIconUrl(t);if(!e){if("icon"===t)throw new Error("iconUrl not set in Icon options (see the docs).");return null}var n=this._createImg(e,i&&"IMG"===i.tagName?i:null);return this._setIconStyles(n,t),n},_setIconStyles:function(t,i){var e=this.options,n=e[i+"Size"];"number"==typeof n&&(n=[n,n]);var o=w(n),s=w("shadow"===i&&e.shadowAnchor||e.iconAnchor||o&&o.divideBy(2,!0));t.className="leaflet-marker-"+i+" "+(e.className||""),s&&(t.style.marginLeft=-s.x+"px",t.style.marginTop=-s.y+"px"),o&&(t.style.width=o.x+"px",t.style.height=o.y+"px")},_createImg:function(t,i){return i=i||document.createElement("img"),i.src=t,i},_getIconUrl:function(t){return Yi&&this.options[t+"RetinaUrl"]||this.options[t+"Url"]}}),Xe=Ye.extend({options:{iconUrl:"marker-icon.png",iconRetinaUrl:"marker-icon-2x.png",shadowUrl:"marker-shadow.png",iconSize:[25,41],iconAnchor:[12,41],popupAnchor:[1,-34],tooltipAnchor:[16,-28],shadowSize:[41,41]},_getIconUrl:function(t){return Xe.imagePath||(Xe.imagePath=this._detectIconPath()),(this.options.imagePath||Xe.imagePath)+Ye.prototype._getIconUrl.call(this,t)},_detectIconPath:function(){var t=G("div","leaflet-default-icon-path",document.body),i=q(t,"background-image")||q(t,"backgroundImage");return document.body.removeChild(t),i=null===i||0!==i.indexOf("url")?"":i.replace(/^url\(["']?/,"").replace(/marker-icon\.png["']?\)$/,"")}}),Je=Ee.extend({initialize:function(t){this._marker=t},addHooks:function(){var t=this._marker._icon;this._draggable||(this._draggable=new Re(t,t,!0)),this._draggable.on({dragstart:this._onDragStart,predrag:this._onPreDrag,drag:this._onDrag,dragend:this._onDragEnd},this).enable(),Q(t,"leaflet-marker-draggable")},removeHooks:function(){this._draggable.off({dragstart:this._onDragStart,predrag:this._onPreDrag,drag:this._onDrag,dragend:this._onDragEnd},this).disable(),this._marker._icon&&tt(this._marker._icon,"leaflet-marker-draggable")},moved:function(){return this._draggable&&this._draggable._moved},_adjustPan:function(t){var i=this._marker,e=i._map,n=this._marker.options.autoPanSpeed,o=this._marker.options.autoPanPadding,s=ht(i._icon),r=e.getPixelBounds(),a=e.getPixelOrigin(),h=b(r.min._subtract(a).add(o),r.max._subtract(a).subtract(o));if(!h.contains(s)){var u=w((Math.max(h.max.x,s.x)-h.max.x)/(r.max.x-h.max.x)-(Math.min(h.min.x,s.x)-h.min.x)/(r.min.x-h.min.x),(Math.max(h.max.y,s.y)-h.max.y)/(r.max.y-h.max.y)-(Math.min(h.min.y,s.y)-h.min.y)/(r.min.y-h.min.y)).multiplyBy(n);e.panBy(u,{animate:!1}),this._draggable._newPos._add(u),this._draggable._startPos._add(u),at(i._icon,this._draggable._newPos),this._onDrag(t),this._panRequest=f(this._adjustPan.bind(this,t))}},_onDragStart:function(){this._oldLatLng=this._marker.getLatLng(),this._marker.closePopup().fire("movestart").fire("dragstart")},_onPreDrag:function(t){this._marker.options.autoPan&&(g(this._panRequest),this._panRequest=f(this._adjustPan.bind(this,t)))},_onDrag:function(t){var i=this._marker,e=i._shadow,n=ht(i._icon),o=i._map.layerPointToLatLng(n);e&&at(e,n),i._latlng=o,t.latlng=o,t.oldLatLng=this._oldLatLng,i.fire("move",t).fire("drag",t)},_onDragEnd:function(t){g(this._panRequest),delete this._oldLatLng,this._marker.fire("moveend").fire("dragend",t)}}),$e=qe.extend({options:{icon:new Xe,interactive:!0,keyboard:!0,title:"",alt:"",zIndexOffset:0,opacity:1,riseOnHover:!1,riseOffset:250,pane:"markerPane",bubblingMouseEvents:!1,draggable:!1,autoPan:!1,autoPanPadding:[50,50],autoPanSpeed:10},initialize:function(t,i){l(this,i),this._latlng=C(t)},onAdd:function(t){this._zoomAnimated=this._zoomAnimated&&t.options.markerZoomAnimation,this._zoomAnimated&&t.on("zoomanim",this._animateZoom,this),this._initIcon(),this.update()},onRemove:function(t){this.dragging&&this.dragging.enabled()&&(this.options.draggable=!0,this.dragging.removeHooks()),delete this.dragging,this._zoomAnimated&&t.off("zoomanim",this._animateZoom,this),this._removeIcon(),this._removeShadow()},getEvents:function(){return{zoom:this.update,viewreset:this.update}},getLatLng:function(){return this._latlng},setLatLng:function(t){var i=this._latlng;return this._latlng=C(t),this.update(),this.fire("move",{oldLatLng:i,latlng:this._latlng})},setZIndexOffset:function(t){return this.options.zIndexOffset=t,this.update()},setIcon:function(t){return this.options.icon=t,this._map&&(this._initIcon(),this.update()),this._popup&&this.bindPopup(this._popup,this._popup.options),this},getElement:function(){return this._icon},update:function(){if(this._icon&&this._map){var t=this._map.latLngToLayerPoint(this._latlng).round();this._setPos(t)}return this},_initIcon:function(){var t=this.options,i="leaflet-zoom-"+(this._zoomAnimated?"animated":"hide"),e=t.icon.createIcon(this._icon),n=!1;e!==this._icon&&(this._icon&&this._removeIcon(),n=!0,t.title&&(e.title=t.title),"IMG"===e.tagName&&(e.alt=t.alt||"")),Q(e,i),t.keyboard&&(e.tabIndex="0"),this._icon=e,t.riseOnHover&&this.on({mouseover:this._bringToFront,mouseout:this._resetZIndex});var o=t.icon.createShadow(this._shadow),s=!1;o!==this._shadow&&(this._removeShadow(),s=!0),o&&(Q(o,i),o.alt=""),this._shadow=o,t.opacity<1&&this._updateOpacity(),n&&this.getPane().appendChild(this._icon),this._initInteraction(),o&&s&&this.getPane("shadowPane").appendChild(this._shadow)},_removeIcon:function(){this.options.riseOnHover&&this.off({mouseover:this._bringToFront,mouseout:this._resetZIndex}),K(this._icon),this.removeInteractiveTarget(this._icon),this._icon=null},_removeShadow:function(){this._shadow&&K(this._shadow),this._shadow=null},_setPos:function(t){at(this._icon,t),this._shadow&&at(this._shadow,t),this._zIndex=t.y+this.options.zIndexOffset,this._resetZIndex()},_updateZIndex:function(t){this._icon.style.zIndex=this._zIndex+t},_animateZoom:function(t){var i=this._map._latLngToNewLayerPoint(this._latlng,t.zoom,t.center).round();this._setPos(i)},_initInteraction:function(){if(this.options.interactive&&(Q(this._icon,"leaflet-interactive"),this.addInteractiveTarget(this._icon),Je)){var t=this.options.draggable;this.dragging&&(t=this.dragging.enabled(),this.dragging.disable()),this.dragging=new Je(this),t&&this.dragging.enable()}},setOpacity:function(t){return this.options.opacity=t,this._map&&this._updateOpacity(),this},_updateOpacity:function(){var t=this.options.opacity;nt(this._icon,t),this._shadow&&nt(this._shadow,t)},_bringToFront:function(){this._updateZIndex(this.options.riseOffset)},_resetZIndex:function(){this._updateZIndex(0)},_getPopupAnchor:function(){return this.options.icon.options.popupAnchor},_getTooltipAnchor:function(){return this.options.icon.options.tooltipAnchor}}),Qe=qe.extend({options:{stroke:!0,color:"#3388ff",weight:3,opacity:1,lineCap:"round",lineJoin:"round",dashArray:null,dashOffset:null,fill:!1,fillColor:null,fillOpacity:.2,fillRule:"evenodd",interactive:!0,bubblingMouseEvents:!0},beforeAdd:function(t){this._renderer=t.getRenderer(this)},onAdd:function(){this._renderer._initPath(this),this._reset(),this._renderer._addPath(this)},onRemove:function(){this._renderer._removePath(this)},redraw:function(){return this._map&&this._renderer._updatePath(this),this},setStyle:function(t){return l(this,t),this._renderer&&this._renderer._updateStyle(this),this},bringToFront:function(){return this._renderer&&this._renderer._bringToFront(this),this},bringToBack:function(){return this._renderer&&this._renderer._bringToBack(this),this},getElement:function(){return this._path},_reset:function(){this._project(),this._update()},_clickTolerance:function(){return(this.options.stroke?this.options.weight/2:0)+this._renderer.options.tolerance}}),tn=Qe.extend({options:{fill:!0,radius:10},initialize:function(t,i){l(this,i),this._latlng=C(t),this._radius=this.options.radius},setLatLng:function(t){return this._latlng=C(t),this.redraw(),this.fire("move",{latlng:this._latlng})},getLatLng:function(){return this._latlng},setRadius:function(t){return this.options.radius=this._radius=t,this.redraw()},getRadius:function(){return this._radius},setStyle:function(t){var i=t&&t.radius||this._radius;return Qe.prototype.setStyle.call(this,t),this.setRadius(i),this},_project:function(){this._point=this._map.latLngToLayerPoint(this._latlng),this._updateBounds()},_updateBounds:function(){var t=this._radius,i=this._radiusY||t,e=this._clickTolerance(),n=[t+e,i+e];this._pxBounds=new P(this._point.subtract(n),this._point.add(n))},_update:function(){this._map&&this._updatePath()},_updatePath:function(){this._renderer._updateCircle(this)},_empty:function(){return this._radius&&!this._renderer._bounds.intersects(this._pxBounds)},_containsPoint:function(t){return t.distanceTo(this._point)<=this._radius+this._clickTolerance()}}),en=tn.extend({initialize:function(t,e,n){if("number"==typeof e&&(e=i({},n,{radius:e})),l(this,e),this._latlng=C(t),isNaN(this.options.radius))throw new Error("Circle radius cannot be NaN");this._mRadius=this.options.radius},setRadius:function(t){return this._mRadius=t,this.redraw()},getRadius:function(){return this._mRadius},getBounds:function(){var t=[this._radius,this._radiusY||this._radius];return new T(this._map.layerPointToLatLng(this._point.subtract(t)),this._map.layerPointToLatLng(this._point.add(t)))},setStyle:Qe.prototype.setStyle,_project:function(){var t=this._latlng.lng,i=this._latlng.lat,e=this._map,n=e.options.crs;if(n.distance===pi.distance){var o=Math.PI/180,s=this._mRadius/pi.R/o,r=e.project([i+s,t]),a=e.project([i-s,t]),h=r.add(a).divideBy(2),u=e.unproject(h).lat,l=Math.acos((Math.cos(s*o)-Math.sin(i*o)*Math.sin(u*o))/(Math.cos(i*o)*Math.cos(u*o)))/o;(isNaN(l)||0===l)&&(l=s/Math.cos(Math.PI/180*i)),this._point=h.subtract(e.getPixelOrigin()),this._radius=isNaN(l)?0:h.x-e.project([u,t-l]).x,this._radiusY=h.y-r.y}else{var c=n.unproject(n.project(this._latlng).subtract([this._mRadius,0]));this._point=e.latLngToLayerPoint(this._latlng),this._radius=this._point.x-e.latLngToLayerPoint(c).x}this._updateBounds()}}),nn=Qe.extend({options:{smoothFactor:1,noClip:!1},initialize:function(t,i){l(this,i),this._setLatLngs(t)},getLatLngs:function(){return this._latlngs},setLatLngs:function(t){return this._setLatLngs(t),this.redraw()},isEmpty:function(){return!this._latlngs.length},closestLayerPoint:function(t){for(var i,e,n=1/0,o=null,s=Dt,r=0,a=this._parts.length;r<a;r++)for(var h=this._parts[r],u=1,l=h.length;u<l;u++){var c=s(t,i=h[u-1],e=h[u],!0);c<n&&(n=c,o=s(t,i,e))}return o&&(o.distance=Math.sqrt(n)),o},getCenter:function(){if(!this._map)throw new Error("Must add layer to map before using getCenter()");var t,i,e,n,o,s,r,a=this._rings[0],h=a.length;if(!h)return null;for(t=0,i=0;t<h-1;t++)i+=a[t].distanceTo(a[t+1])/2;if(0===i)return this._map.layerPointToLatLng(a[0]);for(t=0,n=0;t<h-1;t++)if(o=a[t],s=a[t+1],e=o.distanceTo(s),(n+=e)>i)return r=(n-i)/e,this._map.layerPointToLatLng([s.x-r*(s.x-o.x),s.y-r*(s.y-o.y)])},getBounds:function(){return this._bounds},addLatLng:function(t,i){return i=i||this._defaultShape(),t=C(t),i.push(t),this._bounds.extend(t),this.redraw()},_setLatLngs:function(t){this._bounds=new T,this._latlngs=this._convertLatLngs(t)},_defaultShape:function(){return jt(this._latlngs)?this._latlngs:this._latlngs[0]},_convertLatLngs:function(t){for(var i=[],e=jt(t),n=0,o=t.length;n<o;n++)e?(i[n]=C(t[n]),this._bounds.extend(i[n])):i[n]=this._convertLatLngs(t[n]);return i},_project:function(){var t=new P;this._rings=[],this._projectLatlngs(this._latlngs,this._rings,t);var i=this._clickTolerance(),e=new x(i,i);this._bounds.isValid()&&t.isValid()&&(t.min._subtract(e),t.max._add(e),this._pxBounds=t)},_projectLatlngs:function(t,i,e){var n,o,s=t[0]instanceof M,r=t.length;if(s){for(o=[],n=0;n<r;n++)o[n]=this._map.latLngToLayerPoint(t[n]),e.extend(o[n]);i.push(o)}else for(n=0;n<r;n++)this._projectLatlngs(t[n],i,e)},_clipPoints:function(){var t=this._renderer._bounds;if(this._parts=[],this._pxBounds&&this._pxBounds.intersects(t))if(this.options.noClip)this._parts=this._rings;else{var i,e,n,o,s,r,a,h=this._parts;for(i=0,n=0,o=this._rings.length;i<o;i++)for(e=0,s=(a=this._rings[i]).length;e<s-1;e++)(r=It(a[e],a[e+1],t,e,!0))&&(h[n]=h[n]||[],h[n].push(r[0]),r[1]===a[e+1]&&e!==s-2||(h[n].push(r[1]),n++))}},_simplifyPoints:function(){for(var t=this._parts,i=this.options.smoothFactor,e=0,n=t.length;e<n;e++)t[e]=Zt(t[e],i)},_update:function(){this._map&&(this._clipPoints(),this._simplifyPoints(),this._updatePath())},_updatePath:function(){this._renderer._updatePoly(this)},_containsPoint:function(t,i){var e,n,o,s,r,a,h=this._clickTolerance();if(!this._pxBounds||!this._pxBounds.contains(t))return!1;for(e=0,s=this._parts.length;e<s;e++)for(n=0,o=(r=(a=this._parts[e]).length)-1;n<r;o=n++)if((i||0!==n)&&Et(t,a[o],a[n])<=h)return!0;return!1}});nn._flat=Wt;var on=nn.extend({options:{fill:!0},isEmpty:function(){return!this._latlngs.length||!this._latlngs[0].length},getCenter:function(){if(!this._map)throw new Error("Must add layer to map before using getCenter()");var t,i,e,n,o,s,r,a,h,u=this._rings[0],l=u.length;if(!l)return null;for(s=r=a=0,t=0,i=l-1;t<l;i=t++)e=u[t],n=u[i],o=e.y*n.x-n.y*e.x,r+=(e.x+n.x)*o,a+=(e.y+n.y)*o,s+=3*o;return h=0===s?u[0]:[r/s,a/s],this._map.layerPointToLatLng(h)},_convertLatLngs:function(t){var i=nn.prototype._convertLatLngs.call(this,t),e=i.length;return e>=2&&i[0]instanceof M&&i[0].equals(i[e-1])&&i.pop(),i},_setLatLngs:function(t){nn.prototype._setLatLngs.call(this,t),jt(this._latlngs)&&(this._latlngs=[this._latlngs])},_defaultShape:function(){return jt(this._latlngs[0])?this._latlngs[0]:this._latlngs[0][0]},_clipPoints:function(){var t=this._renderer._bounds,i=this.options.weight,e=new x(i,i);if(t=new P(t.min.subtract(e),t.max.add(e)),this._parts=[],this._pxBounds&&this._pxBounds.intersects(t))if(this.options.noClip)this._parts=this._rings;else for(var n,o=0,s=this._rings.length;o<s;o++)(n=Ht(this._rings[o],t,!0)).length&&this._parts.push(n)},_updatePath:function(){this._renderer._updatePoly(this,!0)},_containsPoint:function(t){var i,e,n,o,s,r,a,h,u=!1;if(!this._pxBounds||!this._pxBounds.contains(t))return!1;for(o=0,a=this._parts.length;o<a;o++)for(s=0,r=(h=(i=this._parts[o]).length)-1;s<h;r=s++)e=i[s],n=i[r],e.y>t.y!=n.y>t.y&&t.x<(n.x-e.x)*(t.y-e.y)/(n.y-e.y)+e.x&&(u=!u);return u||nn.prototype._containsPoint.call(this,t,!0)}}),sn=Ke.extend({initialize:function(t,i){l(this,i),this._layers={},t&&this.addData(t)},addData:function(t){var i,e,n,o=oi(t)?t:t.features;if(o){for(i=0,e=o.length;i<e;i++)((n=o[i]).geometries||n.geometry||n.features||n.coordinates)&&this.addData(n);return this}var s=this.options;if(s.filter&&!s.filter(t))return this;var r=Ft(t,s);return r?(r.feature=Yt(t),r.defaultOptions=r.options,this.resetStyle(r),s.onEachFeature&&s.onEachFeature(t,r),this.addLayer(r)):this},resetStyle:function(t){return t.options=i({},t.defaultOptions),this._setLayerStyle(t,this.options.style),this},setStyle:function(t){return this.eachLayer(function(i){this._setLayerStyle(i,t)},this)},_setLayerStyle:function(t,i){"function"==typeof i&&(i=i(t.feature)),t.setStyle&&t.setStyle(i)}}),rn={toGeoJSON:function(t){return Kt(this,{type:"Point",coordinates:qt(this.getLatLng(),t)})}};$e.include(rn),en.include(rn),tn.include(rn),nn.include({toGeoJSON:function(t){var i=!jt(this._latlngs),e=Gt(this._latlngs,i?1:0,!1,t);return Kt(this,{type:(i?"Multi":"")+"LineString",coordinates:e})}}),on.include({toGeoJSON:function(t){var i=!jt(this._latlngs),e=i&&!jt(this._latlngs[0]),n=Gt(this._latlngs,e?2:i?1:0,!0,t);return i||(n=[n]),Kt(this,{type:(e?"Multi":"")+"Polygon",coordinates:n})}}),Ge.include({toMultiPoint:function(t){var i=[];return this.eachLayer(function(e){i.push(e.toGeoJSON(t).geometry.coordinates)}),Kt(this,{type:"MultiPoint",coordinates:i})},toGeoJSON:function(t){var i=this.feature&&this.feature.geometry&&this.feature.geometry.type;if("MultiPoint"===i)return this.toMultiPoint(t);var e="GeometryCollection"===i,n=[];return this.eachLayer(function(i){if(i.toGeoJSON){var o=i.toGeoJSON(t);if(e)n.push(o.geometry);else{var s=Yt(o);"FeatureCollection"===s.type?n.push.apply(n,s.features):n.push(s)}}}),e?Kt(this,{geometries:n,type:"GeometryCollection"}):{type:"FeatureCollection",features:n}}});var an=Xt,hn=qe.extend({options:{opacity:1,alt:"",interactive:!1,crossOrigin:!1,errorOverlayUrl:"",zIndex:1,className:""},initialize:function(t,i,e){this._url=t,this._bounds=z(i),l(this,e)},onAdd:function(){this._image||(this._initImage(),this.options.opacity<1&&this._updateOpacity()),this.options.interactive&&(Q(this._image,"leaflet-interactive"),this.addInteractiveTarget(this._image)),this.getPane().appendChild(this._image),this._reset()},onRemove:function(){K(this._image),this.options.interactive&&this.removeInteractiveTarget(this._image)},setOpacity:function(t){return this.options.opacity=t,this._image&&this._updateOpacity(),this},setStyle:function(t){return t.opacity&&this.setOpacity(t.opacity),this},bringToFront:function(){return this._map&&X(this._image),this},bringToBack:function(){return this._map&&J(this._image),this},setUrl:function(t){return this._url=t,this._image&&(this._image.src=t),this},setBounds:function(t){return this._bounds=z(t),this._map&&this._reset(),this},getEvents:function(){var t={zoom:this._reset,viewreset:this._reset};return this._zoomAnimated&&(t.zoomanim=this._animateZoom),t},setZIndex:function(t){return this.options.zIndex=t,this._updateZIndex(),this},getBounds:function(){return this._bounds},getElement:function(){return this._image},_initImage:function(){var t="IMG"===this._url.tagName,i=this._image=t?this._url:G("img");Q(i,"leaflet-image-layer"),this._zoomAnimated&&Q(i,"leaflet-zoom-animated"),this.options.className&&Q(i,this.options.className),i.onselectstart=r,i.onmousemove=r,i.onload=e(this.fire,this,"load"),i.onerror=e(this._overlayOnError,this,"error"),(this.options.crossOrigin||""===this.options.crossOrigin)&&(i.crossOrigin=!0===this.options.crossOrigin?"":this.options.crossOrigin),this.options.zIndex&&this._updateZIndex(),t?this._url=i.src:(i.src=this._url,i.alt=this.options.alt)},_animateZoom:function(t){var i=this._map.getZoomScale(t.zoom),e=this._map._latLngBoundsToNewLayerBounds(this._bounds,t.zoom,t.center).min;rt(this._image,e,i)},_reset:function(){var t=this._image,i=new P(this._map.latLngToLayerPoint(this._bounds.getNorthWest()),this._map.latLngToLayerPoint(this._bounds.getSouthEast())),e=i.getSize();at(t,i.min),t.style.width=e.x+"px",t.style.height=e.y+"px"},_updateOpacity:function(){nt(this._image,this.options.opacity)},_updateZIndex:function(){this._image&&void 0!==this.options.zIndex&&null!==this.options.zIndex&&(this._image.style.zIndex=this.options.zIndex)},_overlayOnError:function(){this.fire("error");var t=this.options.errorOverlayUrl;t&&this._url!==t&&(this._url=t,this._image.src=t)}}),un=hn.extend({options:{autoplay:!0,loop:!0},_initImage:function(){var t="VIDEO"===this._url.tagName,i=this._image=t?this._url:G("video");if(Q(i,"leaflet-image-layer"),this._zoomAnimated&&Q(i,"leaflet-zoom-animated"),i.onselectstart=r,i.onmousemove=r,i.onloadeddata=e(this.fire,this,"load"),t){for(var n=i.getElementsByTagName("source"),o=[],s=0;s<n.length;s++)o.push(n[s].src);this._url=n.length>0?o:[i.src]}else{oi(this._url)||(this._url=[this._url]),i.autoplay=!!this.options.autoplay,i.loop=!!this.options.loop;for(var a=0;a<this._url.length;a++){var h=G("source");h.src=this._url[a],i.appendChild(h)}}}}),ln=qe.extend({options:{offset:[0,7],className:"",pane:"popupPane"},initialize:function(t,i){l(this,t),this._source=i},onAdd:function(t){this._zoomAnimated=t._zoomAnimated,this._container||this._initLayout(),t._fadeAnimated&&nt(this._container,0),clearTimeout(this._removeTimeout),this.getPane().appendChild(this._container),this.update(),t._fadeAnimated&&nt(this._container,1),this.bringToFront()},onRemove:function(t){t._fadeAnimated?(nt(this._container,0),this._removeTimeout=setTimeout(e(K,void 0,this._container),200)):K(this._container)},getLatLng:function(){return this._latlng},setLatLng:function(t){return this._latlng=C(t),this._map&&(this._updatePosition(),this._adjustPan()),this},getContent:function(){return this._content},setContent:function(t){return this._content=t,this.update(),this},getElement:function(){return this._container},update:function(){this._map&&(this._container.style.visibility="hidden",this._updateContent(),this._updateLayout(),this._updatePosition(),this._container.style.visibility="",this._adjustPan())},getEvents:function(){var t={zoom:this._updatePosition,viewreset:this._updatePosition};return this._zoomAnimated&&(t.zoomanim=this._animateZoom),t},isOpen:function(){return!!this._map&&this._map.hasLayer(this)},bringToFront:function(){return this._map&&X(this._container),this},bringToBack:function(){return this._map&&J(this._container),this},_updateContent:function(){if(this._content){var t=this._contentNode,i="function"==typeof this._content?this._content(this._source||this):this._content;if("string"==typeof i)t.innerHTML=i;else{for(;t.hasChildNodes();)t.removeChild(t.firstChild);t.appendChild(i)}this.fire("contentupdate")}},_updatePosition:function(){if(this._map){var t=this._map.latLngToLayerPoint(this._latlng),i=w(this.options.offset),e=this._getAnchor();this._zoomAnimated?at(this._container,t.add(e)):i=i.add(t).add(e);var n=this._containerBottom=-i.y,o=this._containerLeft=-Math.round(this._containerWidth/2)+i.x;this._container.style.bottom=n+"px",this._container.style.left=o+"px"}},_getAnchor:function(){return[0,0]}}),cn=ln.extend({options:{maxWidth:300,minWidth:50,maxHeight:null,autoPan:!0,autoPanPaddingTopLeft:null,autoPanPaddingBottomRight:null,autoPanPadding:[5,5],keepInView:!1,closeButton:!0,autoClose:!0,closeOnEscapeKey:!0,className:""},openOn:function(t){return t.openPopup(this),this},onAdd:function(t){ln.prototype.onAdd.call(this,t),t.fire("popupopen",{popup:this}),this._source&&(this._source.fire("popupopen",{popup:this},!0),this._source instanceof Qe||this._source.on("preclick",yt))},onRemove:function(t){ln.prototype.onRemove.call(this,t),t.fire("popupclose",{popup:this}),this._source&&(this._source.fire("popupclose",{popup:this},!0),this._source instanceof Qe||this._source.off("preclick",yt))},getEvents:function(){var t=ln.prototype.getEvents.call(this);return(void 0!==this.options.closeOnClick?this.options.closeOnClick:this._map.options.closePopupOnClick)&&(t.preclick=this._close),this.options.keepInView&&(t.moveend=this._adjustPan),t},_close:function(){this._map&&this._map.closePopup(this)},_initLayout:function(){var t="leaflet-popup",i=this._container=G("div",t+" "+(this.options.className||"")+" leaflet-zoom-animated"),e=this._wrapper=G("div",t+"-content-wrapper",i);if(this._contentNode=G("div",t+"-content",e),wt(e),xt(this._contentNode),mt(e,"contextmenu",yt),this._tipContainer=G("div",t+"-tip-container",i),this._tip=G("div",t+"-tip",this._tipContainer),this.options.closeButton){var n=this._closeButton=G("a",t+"-close-button",i);n.href="#close",n.innerHTML="&#215;",mt(n,"click",this._onCloseButtonClick,this)}},_updateLayout:function(){var t=this._contentNode,i=t.style;i.width="",i.whiteSpace="nowrap";var e=t.offsetWidth;e=Math.min(e,this.options.maxWidth),e=Math.max(e,this.options.minWidth),i.width=e+1+"px",i.whiteSpace="",i.height="";var n=t.offsetHeight,o=this.options.maxHeight;o&&n>o?(i.height=o+"px",Q(t,"leaflet-popup-scrolled")):tt(t,"leaflet-popup-scrolled"),this._containerWidth=this._container.offsetWidth},_animateZoom:function(t){var i=this._map._latLngToNewLayerPoint(this._latlng,t.zoom,t.center),e=this._getAnchor();at(this._container,i.add(e))},_adjustPan:function(){if(!(!this.options.autoPan||this._map._panAnim&&this._map._panAnim._inProgress)){var t=this._map,i=parseInt(q(this._container,"marginBottom"),10)||0,e=this._container.offsetHeight+i,n=this._containerWidth,o=new x(this._containerLeft,-e-this._containerBottom);o._add(ht(this._container));var s=t.layerPointToContainerPoint(o),r=w(this.options.autoPanPadding),a=w(this.options.autoPanPaddingTopLeft||r),h=w(this.options.autoPanPaddingBottomRight||r),u=t.getSize(),l=0,c=0;s.x+n+h.x>u.x&&(l=s.x+n-u.x+h.x),s.x-l-a.x<0&&(l=s.x-a.x),s.y+e+h.y>u.y&&(c=s.y+e-u.y+h.y),s.y-c-a.y<0&&(c=s.y-a.y),(l||c)&&t.fire("autopanstart").panBy([l,c])}},_onCloseButtonClick:function(t){this._close(),Lt(t)},_getAnchor:function(){return w(this._source&&this._source._getPopupAnchor?this._source._getPopupAnchor():[0,0])}});be.mergeOptions({closePopupOnClick:!0}),be.include({openPopup:function(t,i,e){return t instanceof cn||(t=new cn(e).setContent(t)),i&&t.setLatLng(i),this.hasLayer(t)?this:(this._popup&&this._popup.options.autoClose&&this.closePopup(),this._popup=t,this.addLayer(t))},closePopup:function(t){return t&&t!==this._popup||(t=this._popup,this._popup=null),t&&this.removeLayer(t),this}}),qe.include({bindPopup:function(t,i){return t instanceof cn?(l(t,i),this._popup=t,t._source=this):(this._popup&&!i||(this._popup=new cn(i,this)),this._popup.setContent(t)),this._popupHandlersAdded||(this.on({click:this._openPopup,keypress:this._onKeyPress,remove:this.closePopup,move:this._movePopup}),this._popupHandlersAdded=!0),this},unbindPopup:function(){return this._popup&&(this.off({click:this._openPopup,keypress:this._onKeyPress,remove:this.closePopup,move:this._movePopup}),this._popupHandlersAdded=!1,this._popup=null),this},openPopup:function(t,i){if(t instanceof qe||(i=t,t=this),t instanceof Ke)for(var e in this._layers){t=this._layers[e];break}return i||(i=t.getCenter?t.getCenter():t.getLatLng()),this._popup&&this._map&&(this._popup._source=t,this._popup.update(),this._map.openPopup(this._popup,i)),this},closePopup:function(){return this._popup&&this._popup._close(),this},togglePopup:function(t){return this._popup&&(this._popup._map?this.closePopup():this.openPopup(t)),this},isPopupOpen:function(){return!!this._popup&&this._popup.isOpen()},setPopupContent:function(t){return this._popup&&this._popup.setContent(t),this},getPopup:function(){return this._popup},_openPopup:function(t){var i=t.layer||t.target;this._popup&&this._map&&(Lt(t),i instanceof Qe?this.openPopup(t.layer||t.target,t.latlng):this._map.hasLayer(this._popup)&&this._popup._source===i?this.closePopup():this.openPopup(i,t.latlng))},_movePopup:function(t){this._popup.setLatLng(t.latlng)},_onKeyPress:function(t){13===t.originalEvent.keyCode&&this._openPopup(t)}});var _n=ln.extend({options:{pane:"tooltipPane",offset:[0,0],direction:"auto",permanent:!1,sticky:!1,interactive:!1,opacity:.9},onAdd:function(t){ln.prototype.onAdd.call(this,t),this.setOpacity(this.options.opacity),t.fire("tooltipopen",{tooltip:this}),this._source&&this._source.fire("tooltipopen",{tooltip:this},!0)},onRemove:function(t){ln.prototype.onRemove.call(this,t),t.fire("tooltipclose",{tooltip:this}),this._source&&this._source.fire("tooltipclose",{tooltip:this},!0)},getEvents:function(){var t=ln.prototype.getEvents.call(this);return qi&&!this.options.permanent&&(t.preclick=this._close),t},_close:function(){this._map&&this._map.closeTooltip(this)},_initLayout:function(){var t="leaflet-tooltip "+(this.options.className||"")+" leaflet-zoom-"+(this._zoomAnimated?"animated":"hide");this._contentNode=this._container=G("div",t)},_updateLayout:function(){},_adjustPan:function(){},_setPosition:function(t){var i=this._map,e=this._container,n=i.latLngToContainerPoint(i.getCenter()),o=i.layerPointToContainerPoint(t),s=this.options.direction,r=e.offsetWidth,a=e.offsetHeight,h=w(this.options.offset),u=this._getAnchor();"top"===s?t=t.add(w(-r/2+h.x,-a+h.y+u.y,!0)):"bottom"===s?t=t.subtract(w(r/2-h.x,-h.y,!0)):"center"===s?t=t.subtract(w(r/2+h.x,a/2-u.y+h.y,!0)):"right"===s||"auto"===s&&o.x<n.x?(s="right",t=t.add(w(h.x+u.x,u.y-a/2+h.y,!0))):(s="left",t=t.subtract(w(r+u.x-h.x,a/2-u.y-h.y,!0))),tt(e,"leaflet-tooltip-right"),tt(e,"leaflet-tooltip-left"),tt(e,"leaflet-tooltip-top"),tt(e,"leaflet-tooltip-bottom"),Q(e,"leaflet-tooltip-"+s),at(e,t)},_updatePosition:function(){var t=this._map.latLngToLayerPoint(this._latlng);this._setPosition(t)},setOpacity:function(t){this.options.opacity=t,this._container&&nt(this._container,t)},_animateZoom:function(t){var i=this._map._latLngToNewLayerPoint(this._latlng,t.zoom,t.center);this._setPosition(i)},_getAnchor:function(){return w(this._source&&this._source._getTooltipAnchor&&!this.options.sticky?this._source._getTooltipAnchor():[0,0])}});be.include({openTooltip:function(t,i,e){return t instanceof _n||(t=new _n(e).setContent(t)),i&&t.setLatLng(i),this.hasLayer(t)?this:this.addLayer(t)},closeTooltip:function(t){return t&&this.removeLayer(t),this}}),qe.include({bindTooltip:function(t,i){return t instanceof _n?(l(t,i),this._tooltip=t,t._source=this):(this._tooltip&&!i||(this._tooltip=new _n(i,this)),this._tooltip.setContent(t)),this._initTooltipInteractions(),this._tooltip.options.permanent&&this._map&&this._map.hasLayer(this)&&this.openTooltip(),this},unbindTooltip:function(){return this._tooltip&&(this._initTooltipInteractions(!0),this.closeTooltip(),this._tooltip=null),this},_initTooltipInteractions:function(t){if(t||!this._tooltipHandlersAdded){var i=t?"off":"on",e={remove:this.closeTooltip,move:this._moveTooltip};this._tooltip.options.permanent?e.add=this._openTooltip:(e.mouseover=this._openTooltip,e.mouseout=this.closeTooltip,this._tooltip.options.sticky&&(e.mousemove=this._moveTooltip),qi&&(e.click=this._openTooltip)),this[i](e),this._tooltipHandlersAdded=!t}},openTooltip:function(t,i){if(t instanceof qe||(i=t,t=this),t instanceof Ke)for(var e in this._layers){t=this._layers[e];break}return i||(i=t.getCenter?t.getCenter():t.getLatLng()),this._tooltip&&this._map&&(this._tooltip._source=t,this._tooltip.update(),this._map.openTooltip(this._tooltip,i),this._tooltip.options.interactive&&this._tooltip._container&&(Q(this._tooltip._container,"leaflet-clickable"),this.addInteractiveTarget(this._tooltip._container))),this},closeTooltip:function(){return this._tooltip&&(this._tooltip._close(),this._tooltip.options.interactive&&this._tooltip._container&&(tt(this._tooltip._container,"leaflet-clickable"),this.removeInteractiveTarget(this._tooltip._container))),this},toggleTooltip:function(t){return this._tooltip&&(this._tooltip._map?this.closeTooltip():this.openTooltip(t)),this},isTooltipOpen:function(){return this._tooltip.isOpen()},setTooltipContent:function(t){return this._tooltip&&this._tooltip.setContent(t),this},getTooltip:function(){return this._tooltip},_openTooltip:function(t){var i=t.layer||t.target;this._tooltip&&this._map&&this.openTooltip(i,this._tooltip.options.sticky?t.latlng:void 0)},_moveTooltip:function(t){var i,e,n=t.latlng;this._tooltip.options.sticky&&t.originalEvent&&(i=this._map.mouseEventToContainerPoint(t.originalEvent),e=this._map.containerPointToLayerPoint(i),n=this._map.layerPointToLatLng(e)),this._tooltip.setLatLng(n)}});var dn=Ye.extend({options:{iconSize:[12,12],html:!1,bgPos:null,className:"leaflet-div-icon"},createIcon:function(t){var i=t&&"DIV"===t.tagName?t:document.createElement("div"),e=this.options;if(i.innerHTML=!1!==e.html?e.html:"",e.bgPos){var n=w(e.bgPos);i.style.backgroundPosition=-n.x+"px "+-n.y+"px"}return this._setIconStyles(i,"icon"),i},createShadow:function(){return null}});Ye.Default=Xe;var pn=qe.extend({options:{tileSize:256,opacity:1,updateWhenIdle:Wi,updateWhenZooming:!0,updateInterval:200,zIndex:1,bounds:null,minZoom:0,maxZoom:void 0,maxNativeZoom:void 0,minNativeZoom:void 0,noWrap:!1,pane:"tilePane",className:"",keepBuffer:2},initialize:function(t){l(this,t)},onAdd:function(){this._initContainer(),this._levels={},this._tiles={},this._resetView(),this._update()},beforeAdd:function(t){t._addZoomLimit(this)},onRemove:function(t){this._removeAllTiles(),K(this._container),t._removeZoomLimit(this),this._container=null,this._tileZoom=void 0},bringToFront:function(){return this._map&&(X(this._container),this._setAutoZIndex(Math.max)),this},bringToBack:function(){return this._map&&(J(this._container),this._setAutoZIndex(Math.min)),this},getContainer:function(){return this._container},setOpacity:function(t){return this.options.opacity=t,this._updateOpacity(),this},setZIndex:function(t){return this.options.zIndex=t,this._updateZIndex(),this},isLoading:function(){return this._loading},redraw:function(){return this._map&&(this._removeAllTiles(),this._update()),this},getEvents:function(){var t={viewprereset:this._invalidateAll,viewreset:this._resetView,zoom:this._resetView,moveend:this._onMoveEnd};return this.options.updateWhenIdle||(this._onMove||(this._onMove=o(this._onMoveEnd,this.options.updateInterval,this)),t.move=this._onMove),this._zoomAnimated&&(t.zoomanim=this._animateZoom),t},createTile:function(){return document.createElement("div")},getTileSize:function(){var t=this.options.tileSize;return t instanceof x?t:new x(t,t)},_updateZIndex:function(){this._container&&void 0!==this.options.zIndex&&null!==this.options.zIndex&&(this._container.style.zIndex=this.options.zIndex)},_setAutoZIndex:function(t){for(var i,e=this.getPane().children,n=-t(-1/0,1/0),o=0,s=e.length;o<s;o++)i=e[o].style.zIndex,e[o]!==this._container&&i&&(n=t(n,+i));isFinite(n)&&(this.options.zIndex=n+t(-1,1),this._updateZIndex())},_updateOpacity:function(){if(this._map&&!Li){nt(this._container,this.options.opacity);var t=+new Date,i=!1,e=!1;for(var n in this._tiles){var o=this._tiles[n];if(o.current&&o.loaded){var s=Math.min(1,(t-o.loaded)/200);nt(o.el,s),s<1?i=!0:(o.active?e=!0:this._onOpaqueTile(o),o.active=!0)}}e&&!this._noPrune&&this._pruneTiles(),i&&(g(this._fadeFrame),this._fadeFrame=f(this._updateOpacity,this))}},_onOpaqueTile:r,_initContainer:function(){this._container||(this._container=G("div","leaflet-layer "+(this.options.className||"")),this._updateZIndex(),this.options.opacity<1&&this._updateOpacity(),this.getPane().appendChild(this._container))},_updateLevels:function(){var t=this._tileZoom,i=this.options.maxZoom;if(void 0!==t){for(var e in this._levels)this._levels[e].el.children.length||e===t?(this._levels[e].el.style.zIndex=i-Math.abs(t-e),this._onUpdateLevel(e)):(K(this._levels[e].el),this._removeTilesAtZoom(e),this._onRemoveLevel(e),delete this._levels[e]);var n=this._levels[t],o=this._map;return n||((n=this._levels[t]={}).el=G("div","leaflet-tile-container leaflet-zoom-animated",this._container),n.el.style.zIndex=i,n.origin=o.project(o.unproject(o.getPixelOrigin()),t).round(),n.zoom=t,this._setZoomTransform(n,o.getCenter(),o.getZoom()),n.el.offsetWidth,this._onCreateLevel(n)),this._level=n,n}},_onUpdateLevel:r,_onRemoveLevel:r,_onCreateLevel:r,_pruneTiles:function(){if(this._map){var t,i,e=this._map.getZoom();if(e>this.options.maxZoom||e<this.options.minZoom)this._removeAllTiles();else{for(t in this._tiles)(i=this._tiles[t]).retain=i.current;for(t in this._tiles)if((i=this._tiles[t]).current&&!i.active){var n=i.coords;this._retainParent(n.x,n.y,n.z,n.z-5)||this._retainChildren(n.x,n.y,n.z,n.z+2)}for(t in this._tiles)this._tiles[t].retain||this._removeTile(t)}}},_removeTilesAtZoom:function(t){for(var i in this._tiles)this._tiles[i].coords.z===t&&this._removeTile(i)},_removeAllTiles:function(){for(var t in this._tiles)this._removeTile(t)},_invalidateAll:function(){for(var t in this._levels)K(this._levels[t].el),this._onRemoveLevel(t),delete this._levels[t];this._removeAllTiles(),this._tileZoom=void 0},_retainParent:function(t,i,e,n){var o=Math.floor(t/2),s=Math.floor(i/2),r=e-1,a=new x(+o,+s);a.z=+r;var h=this._tileCoordsToKey(a),u=this._tiles[h];return u&&u.active?(u.retain=!0,!0):(u&&u.loaded&&(u.retain=!0),r>n&&this._retainParent(o,s,r,n))},_retainChildren:function(t,i,e,n){for(var o=2*t;o<2*t+2;o++)for(var s=2*i;s<2*i+2;s++){var r=new x(o,s);r.z=e+1;var a=this._tileCoordsToKey(r),h=this._tiles[a];h&&h.active?h.retain=!0:(h&&h.loaded&&(h.retain=!0),e+1<n&&this._retainChildren(o,s,e+1,n))}},_resetView:function(t){var i=t&&(t.pinch||t.flyTo);this._setView(this._map.getCenter(),this._map.getZoom(),i,i)},_animateZoom:function(t){this._setView(t.center,t.zoom,!0,t.noUpdate)},_clampZoom:function(t){var i=this.options;return void 0!==i.minNativeZoom&&t<i.minNativeZoom?i.minNativeZoom:void 0!==i.maxNativeZoom&&i.maxNativeZoom<t?i.maxNativeZoom:t},_setView:function(t,i,e,n){var o=this._clampZoom(Math.round(i));(void 0!==this.options.maxZoom&&o>this.options.maxZoom||void 0!==this.options.minZoom&&o<this.options.minZoom)&&(o=void 0);var s=this.options.updateWhenZooming&&o!==this._tileZoom;n&&!s||(this._tileZoom=o,this._abortLoading&&this._abortLoading(),this._updateLevels(),this._resetGrid(),void 0!==o&&this._update(t),e||this._pruneTiles(),this._noPrune=!!e),this._setZoomTransforms(t,i)},_setZoomTransforms:function(t,i){for(var e in this._levels)this._setZoomTransform(this._levels[e],t,i)},_setZoomTransform:function(t,i,e){var n=this._map.getZoomScale(e,t.zoom),o=t.origin.multiplyBy(n).subtract(this._map._getNewPixelOrigin(i,e)).round();ji?rt(t.el,o,n):at(t.el,o)},_resetGrid:function(){var t=this._map,i=t.options.crs,e=this._tileSize=this.getTileSize(),n=this._tileZoom,o=this._map.getPixelWorldBounds(this._tileZoom);o&&(this._globalTileRange=this._pxBoundsToTileRange(o)),this._wrapX=i.wrapLng&&!this.options.noWrap&&[Math.floor(t.project([0,i.wrapLng[0]],n).x/e.x),Math.ceil(t.project([0,i.wrapLng[1]],n).x/e.y)],this._wrapY=i.wrapLat&&!this.options.noWrap&&[Math.floor(t.project([i.wrapLat[0],0],n).y/e.x),Math.ceil(t.project([i.wrapLat[1],0],n).y/e.y)]},_onMoveEnd:function(){this._map&&!this._map._animatingZoom&&this._update()},_getTiledPixelBounds:function(t){var i=this._map,e=i._animatingZoom?Math.max(i._animateToZoom,i.getZoom()):i.getZoom(),n=i.getZoomScale(e,this._tileZoom),o=i.project(t,this._tileZoom).floor(),s=i.getSize().divideBy(2*n);return new P(o.subtract(s),o.add(s))},_update:function(t){var i=this._map;if(i){var e=this._clampZoom(i.getZoom());if(void 0===t&&(t=i.getCenter()),void 0!==this._tileZoom){var n=this._getTiledPixelBounds(t),o=this._pxBoundsToTileRange(n),s=o.getCenter(),r=[],a=this.options.keepBuffer,h=new P(o.getBottomLeft().subtract([a,-a]),o.getTopRight().add([a,-a]));if(!(isFinite(o.min.x)&&isFinite(o.min.y)&&isFinite(o.max.x)&&isFinite(o.max.y)))throw new Error("Attempted to load an infinite number of tiles");for(var u in this._tiles){var l=this._tiles[u].coords;l.z===this._tileZoom&&h.contains(new x(l.x,l.y))||(this._tiles[u].current=!1)}if(Math.abs(e-this._tileZoom)>1)this._setView(t,e);else{for(var c=o.min.y;c<=o.max.y;c++)for(var _=o.min.x;_<=o.max.x;_++){var d=new x(_,c);if(d.z=this._tileZoom,this._isValidTile(d)){var p=this._tiles[this._tileCoordsToKey(d)];p?p.current=!0:r.push(d)}}if(r.sort(function(t,i){return t.distanceTo(s)-i.distanceTo(s)}),0!==r.length){this._loading||(this._loading=!0,this.fire("loading"));var m=document.createDocumentFragment();for(_=0;_<r.length;_++)this._addTile(r[_],m);this._level.el.appendChild(m)}}}}},_isValidTile:function(t){var i=this._map.options.crs;if(!i.infinite){var e=this._globalTileRange;if(!i.wrapLng&&(t.x<e.min.x||t.x>e.max.x)||!i.wrapLat&&(t.y<e.min.y||t.y>e.max.y))return!1}if(!this.options.bounds)return!0;var n=this._tileCoordsToBounds(t);return z(this.options.bounds).overlaps(n)},_keyToBounds:function(t){return this._tileCoordsToBounds(this._keyToTileCoords(t))},_tileCoordsToNwSe:function(t){var i=this._map,e=this.getTileSize(),n=t.scaleBy(e),o=n.add(e);return[i.unproject(n,t.z),i.unproject(o,t.z)]},_tileCoordsToBounds:function(t){var i=this._tileCoordsToNwSe(t),e=new T(i[0],i[1]);return this.options.noWrap||(e=this._map.wrapLatLngBounds(e)),e},_tileCoordsToKey:function(t){return t.x+":"+t.y+":"+t.z},_keyToTileCoords:function(t){var i=t.split(":"),e=new x(+i[0],+i[1]);return e.z=+i[2],e},_removeTile:function(t){var i=this._tiles[t];i&&(K(i.el),delete this._tiles[t],this.fire("tileunload",{tile:i.el,coords:this._keyToTileCoords(t)}))},_initTile:function(t){Q(t,"leaflet-tile");var i=this.getTileSize();t.style.width=i.x+"px",t.style.height=i.y+"px",t.onselectstart=r,t.onmousemove=r,Li&&this.options.opacity<1&&nt(t,this.options.opacity),zi&&!Mi&&(t.style.WebkitBackfaceVisibility="hidden")},_addTile:function(t,i){var n=this._getTilePos(t),o=this._tileCoordsToKey(t),s=this.createTile(this._wrapCoords(t),e(this._tileReady,this,t));this._initTile(s),this.createTile.length<2&&f(e(this._tileReady,this,t,null,s)),at(s,n),this._tiles[o]={el:s,coords:t,current:!0},i.appendChild(s),this.fire("tileloadstart",{tile:s,coords:t})},_tileReady:function(t,i,n){i&&this.fire("tileerror",{error:i,tile:n,coords:t});var o=this._tileCoordsToKey(t);(n=this._tiles[o])&&(n.loaded=+new Date,this._map._fadeAnimated?(nt(n.el,0),g(this._fadeFrame),this._fadeFrame=f(this._updateOpacity,this)):(n.active=!0,this._pruneTiles()),i||(Q(n.el,"leaflet-tile-loaded"),this.fire("tileload",{tile:n.el,coords:t})),this._noTilesToLoad()&&(this._loading=!1,this.fire("load"),Li||!this._map._fadeAnimated?f(this._pruneTiles,this):setTimeout(e(this._pruneTiles,this),250)))},_getTilePos:function(t){return t.scaleBy(this.getTileSize()).subtract(this._level.origin)},_wrapCoords:function(t){var i=new x(this._wrapX?s(t.x,this._wrapX):t.x,this._wrapY?s(t.y,this._wrapY):t.y);return i.z=t.z,i},_pxBoundsToTileRange:function(t){var i=this.getTileSize();return new P(t.min.unscaleBy(i).floor(),t.max.unscaleBy(i).ceil().subtract([1,1]))},_noTilesToLoad:function(){for(var t in this._tiles)if(!this._tiles[t].loaded)return!1;return!0}}),mn=pn.extend({options:{minZoom:0,maxZoom:18,subdomains:"abc",errorTileUrl:"",zoomOffset:0,tms:!1,zoomReverse:!1,detectRetina:!1,crossOrigin:!1},initialize:function(t,i){this._url=t,(i=l(this,i)).detectRetina&&Yi&&i.maxZoom>0&&(i.tileSize=Math.floor(i.tileSize/2),i.zoomReverse?(i.zoomOffset--,i.minZoom++):(i.zoomOffset++,i.maxZoom--),i.minZoom=Math.max(0,i.minZoom)),"string"==typeof i.subdomains&&(i.subdomains=i.subdomains.split("")),zi||this.on("tileunload",this._onTileRemove)},setUrl:function(t,i){return this._url=t,i||this.redraw(),this},createTile:function(t,i){var n=document.createElement("img");return mt(n,"load",e(this._tileOnLoad,this,i,n)),mt(n,"error",e(this._tileOnError,this,i,n)),(this.options.crossOrigin||""===this.options.crossOrigin)&&(n.crossOrigin=!0===this.options.crossOrigin?"":this.options.crossOrigin),n.alt="",n.setAttribute("role","presentation"),n.src=this.getTileUrl(t),n},getTileUrl:function(t){var e={r:Yi?"@2x":"",s:this._getSubdomain(t),x:t.x,y:t.y,z:this._getZoomForUrl()};if(this._map&&!this._map.options.crs.infinite){var n=this._globalTileRange.max.y-t.y;this.options.tms&&(e.y=n),e["-y"]=n}return _(this._url,i(e,this.options))},_tileOnLoad:function(t,i){Li?setTimeout(e(t,this,null,i),0):t(null,i)},_tileOnError:function(t,i,e){var n=this.options.errorTileUrl;n&&i.getAttribute("src")!==n&&(i.src=n),t(e,i)},_onTileRemove:function(t){t.tile.onload=null},_getZoomForUrl:function(){var t=this._tileZoom,i=this.options.maxZoom,e=this.options.zoomReverse,n=this.options.zoomOffset;return e&&(t=i-t),t+n},_getSubdomain:function(t){var i=Math.abs(t.x+t.y)%this.options.subdomains.length;return this.options.subdomains[i]},_abortLoading:function(){var t,i;for(t in this._tiles)this._tiles[t].coords.z!==this._tileZoom&&((i=this._tiles[t].el).onload=r,i.onerror=r,i.complete||(i.src=si,K(i),delete this._tiles[t]))},_removeTile:function(t){var i=this._tiles[t];if(i)return Si||i.el.setAttribute("src",si),pn.prototype._removeTile.call(this,t)},_tileReady:function(t,i,e){if(this._map&&(!e||e.getAttribute("src")!==si))return pn.prototype._tileReady.call(this,t,i,e)}}),fn=mn.extend({defaultWmsParams:{service:"WMS",request:"GetMap",layers:"",styles:"",format:"image/jpeg",transparent:!1,version:"1.1.1"},options:{crs:null,uppercase:!1},initialize:function(t,e){this._url=t;var n=i({},this.defaultWmsParams);for(var o in e)o in this.options||(n[o]=e[o]);var s=(e=l(this,e)).detectRetina&&Yi?2:1,r=this.getTileSize();n.width=r.x*s,n.height=r.y*s,this.wmsParams=n},onAdd:function(t){this._crs=this.options.crs||t.options.crs,this._wmsVersion=parseFloat(this.wmsParams.version);var i=this._wmsVersion>=1.3?"crs":"srs";this.wmsParams[i]=this._crs.code,mn.prototype.onAdd.call(this,t)},getTileUrl:function(t){var i=this._tileCoordsToNwSe(t),e=this._crs,n=b(e.project(i[0]),e.project(i[1])),o=n.min,s=n.max,r=(this._wmsVersion>=1.3&&this._crs===Ue?[o.y,o.x,s.y,s.x]:[o.x,o.y,s.x,s.y]).join(","),a=mn.prototype.getTileUrl.call(this,t);return a+c(this.wmsParams,a,this.options.uppercase)+(this.options.uppercase?"&BBOX=":"&bbox=")+r},setParams:function(t,e){return i(this.wmsParams,t),e||this.redraw(),this}});mn.WMS=fn,Jt.wms=function(t,i){return new fn(t,i)};var gn=qe.extend({options:{padding:.1,tolerance:0},initialize:function(t){l(this,t),n(this),this._layers=this._layers||{}},onAdd:function(){this._container||(this._initContainer(),this._zoomAnimated&&Q(this._container,"leaflet-zoom-animated")),this.getPane().appendChild(this._container),this._update(),this.on("update",this._updatePaths,this)},onRemove:function(){this.off("update",this._updatePaths,this),this._destroyContainer()},getEvents:function(){var t={viewreset:this._reset,zoom:this._onZoom,moveend:this._update,zoomend:this._onZoomEnd};return this._zoomAnimated&&(t.zoomanim=this._onAnimZoom),t},_onAnimZoom:function(t){this._updateTransform(t.center,t.zoom)},_onZoom:function(){this._updateTransform(this._map.getCenter(),this._map.getZoom())},_updateTransform:function(t,i){var e=this._map.getZoomScale(i,this._zoom),n=ht(this._container),o=this._map.getSize().multiplyBy(.5+this.options.padding),s=this._map.project(this._center,i),r=this._map.project(t,i).subtract(s),a=o.multiplyBy(-e).add(n).add(o).subtract(r);ji?rt(this._container,a,e):at(this._container,a)},_reset:function(){this._update(),this._updateTransform(this._center,this._zoom);for(var t in this._layers)this._layers[t]._reset()},_onZoomEnd:function(){for(var t in this._layers)this._layers[t]._project()},_updatePaths:function(){for(var t in this._layers)this._layers[t]._update()},_update:function(){var t=this.options.padding,i=this._map.getSize(),e=this._map.containerPointToLayerPoint(i.multiplyBy(-t)).round();this._bounds=new P(e,e.add(i.multiplyBy(1+2*t)).round()),this._center=this._map.getCenter(),this._zoom=this._map.getZoom()}}),vn=gn.extend({getEvents:function(){var t=gn.prototype.getEvents.call(this);return t.viewprereset=this._onViewPreReset,t},_onViewPreReset:function(){this._postponeUpdatePaths=!0},onAdd:function(){gn.prototype.onAdd.call(this),this._draw()},_initContainer:function(){var t=this._container=document.createElement("canvas");mt(t,"mousemove",o(this._onMouseMove,32,this),this),mt(t,"click dblclick mousedown mouseup contextmenu",this._onClick,this),mt(t,"mouseout",this._handleMouseOut,this),this._ctx=t.getContext("2d")},_destroyContainer:function(){g(this._redrawRequest),delete this._ctx,K(this._container),ft(this._container),delete this._container},_updatePaths:function(){if(!this._postponeUpdatePaths){this._redrawBounds=null;for(var t in this._layers)this._layers[t]._update();this._redraw()}},_update:function(){if(!this._map._animatingZoom||!this._bounds){this._drawnLayers={},gn.prototype._update.call(this);var t=this._bounds,i=this._container,e=t.getSize(),n=Yi?2:1;at(i,t.min),i.width=n*e.x,i.height=n*e.y,i.style.width=e.x+"px",i.style.height=e.y+"px",Yi&&this._ctx.scale(2,2),this._ctx.translate(-t.min.x,-t.min.y),this.fire("update")}},_reset:function(){gn.prototype._reset.call(this),this._postponeUpdatePaths&&(this._postponeUpdatePaths=!1,this._updatePaths())},_initPath:function(t){this._updateDashArray(t),this._layers[n(t)]=t;var i=t._order={layer:t,prev:this._drawLast,next:null};this._drawLast&&(this._drawLast.next=i),this._drawLast=i,this._drawFirst=this._drawFirst||this._drawLast},_addPath:function(t){this._requestRedraw(t)},_removePath:function(t){var i=t._order,e=i.next,o=i.prev;e?e.prev=o:this._drawLast=o,o?o.next=e:this._drawFirst=e,delete this._drawnLayers[t._leaflet_id],delete t._order,delete this._layers[n(t)],this._requestRedraw(t)},_updatePath:function(t){this._extendRedrawBounds(t),t._project(),t._update(),this._requestRedraw(t)},_updateStyle:function(t){this._updateDashArray(t),this._requestRedraw(t)},_updateDashArray:function(t){if("string"==typeof t.options.dashArray){var i,e=t.options.dashArray.split(/[, ]+/),n=[];for(i=0;i<e.length;i++)n.push(Number(e[i]));t.options._dashArray=n}else t.options._dashArray=t.options.dashArray},_requestRedraw:function(t){this._map&&(this._extendRedrawBounds(t),this._redrawRequest=this._redrawRequest||f(this._redraw,this))},_extendRedrawBounds:function(t){if(t._pxBounds){var i=(t.options.weight||0)+1;this._redrawBounds=this._redrawBounds||new P,this._redrawBounds.extend(t._pxBounds.min.subtract([i,i])),this._redrawBounds.extend(t._pxBounds.max.add([i,i]))}},_redraw:function(){this._redrawRequest=null,this._redrawBounds&&(this._redrawBounds.min._floor(),this._redrawBounds.max._ceil()),this._clear(),this._draw(),this._redrawBounds=null},_clear:function(){var t=this._redrawBounds;if(t){var i=t.getSize();this._ctx.clearRect(t.min.x,t.min.y,i.x,i.y)}else this._ctx.clearRect(0,0,this._container.width,this._container.height)},_draw:function(){var t,i=this._redrawBounds;if(this._ctx.save(),i){var e=i.getSize();this._ctx.beginPath(),this._ctx.rect(i.min.x,i.min.y,e.x,e.y),this._ctx.clip()}this._drawing=!0;for(var n=this._drawFirst;n;n=n.next)t=n.layer,(!i||t._pxBounds&&t._pxBounds.intersects(i))&&t._updatePath();this._drawing=!1,this._ctx.restore()},_updatePoly:function(t,i){if(this._drawing){var e,n,o,s,r=t._parts,a=r.length,h=this._ctx;if(a){for(this._drawnLayers[t._leaflet_id]=t,h.beginPath(),e=0;e<a;e++){for(n=0,o=r[e].length;n<o;n++)s=r[e][n],h[n?"lineTo":"moveTo"](s.x,s.y);i&&h.closePath()}this._fillStroke(h,t)}}},_updateCircle:function(t){if(this._drawing&&!t._empty()){var i=t._point,e=this._ctx,n=Math.max(Math.round(t._radius),1),o=(Math.max(Math.round(t._radiusY),1)||n)/n;this._drawnLayers[t._leaflet_id]=t,1!==o&&(e.save(),e.scale(1,o)),e.beginPath(),e.arc(i.x,i.y/o,n,0,2*Math.PI,!1),1!==o&&e.restore(),this._fillStroke(e,t)}},_fillStroke:function(t,i){var e=i.options;e.fill&&(t.globalAlpha=e.fillOpacity,t.fillStyle=e.fillColor||e.color,t.fill(e.fillRule||"evenodd")),e.stroke&&0!==e.weight&&(t.setLineDash&&t.setLineDash(i.options&&i.options._dashArray||[]),t.globalAlpha=e.opacity,t.lineWidth=e.weight,t.strokeStyle=e.color,t.lineCap=e.lineCap,t.lineJoin=e.lineJoin,t.stroke())},_onClick:function(t){for(var i,e,n=this._map.mouseEventToLayerPoint(t),o=this._drawFirst;o;o=o.next)(i=o.layer).options.interactive&&i._containsPoint(n)&&!this._map._draggableMoved(i)&&(e=i);e&&(zt(t),this._fireEvent([e],t))},_onMouseMove:function(t){if(this._map&&!this._map.dragging.moving()&&!this._map._animatingZoom){var i=this._map.mouseEventToLayerPoint(t);this._handleMouseHover(t,i)}},_handleMouseOut:function(t){var i=this._hoveredLayer;i&&(tt(this._container,"leaflet-interactive"),this._fireEvent([i],t,"mouseout"),this._hoveredLayer=null)},_handleMouseHover:function(t,i){for(var e,n,o=this._drawFirst;o;o=o.next)(e=o.layer).options.interactive&&e._containsPoint(i)&&(n=e);n!==this._hoveredLayer&&(this._handleMouseOut(t),n&&(Q(this._container,"leaflet-interactive"),this._fireEvent([n],t,"mouseover"),this._hoveredLayer=n)),this._hoveredLayer&&this._fireEvent([this._hoveredLayer],t)},_fireEvent:function(t,i,e){this._map._fireDOMEvent(i,e||i.type,t)},_bringToFront:function(t){var i=t._order,e=i.next,n=i.prev;e&&(e.prev=n,n?n.next=e:e&&(this._drawFirst=e),i.prev=this._drawLast,this._drawLast.next=i,i.next=null,this._drawLast=i,this._requestRedraw(t))},_bringToBack:function(t){var i=t._order,e=i.next,n=i.prev;n&&(n.next=e,e?e.prev=n:n&&(this._drawLast=n),i.prev=null,i.next=this._drawFirst,this._drawFirst.prev=i,this._drawFirst=i,this._requestRedraw(t))}}),yn=function(){try{return document.namespaces.add("lvml","urn:schemas-microsoft-com:vml"),function(t){return document.createElement("<lvml:"+t+' class="lvml">')}}catch(t){return function(t){return document.createElement("<"+t+' xmlns="urn:schemas-microsoft.com:vml" class="lvml">')}}}(),xn={_initContainer:function(){this._container=G("div","leaflet-vml-container")},_update:function(){this._map._animatingZoom||(gn.prototype._update.call(this),this.fire("update"))},_initPath:function(t){var i=t._container=yn("shape");Q(i,"leaflet-vml-shape "+(this.options.className||"")),i.coordsize="1 1",t._path=yn("path"),i.appendChild(t._path),this._updateStyle(t),this._layers[n(t)]=t},_addPath:function(t){var i=t._container;this._container.appendChild(i),t.options.interactive&&t.addInteractiveTarget(i)},_removePath:function(t){var i=t._container;K(i),t.removeInteractiveTarget(i),delete this._layers[n(t)]},_updateStyle:function(t){var i=t._stroke,e=t._fill,n=t.options,o=t._container;o.stroked=!!n.stroke,o.filled=!!n.fill,n.stroke?(i||(i=t._stroke=yn("stroke")),o.appendChild(i),i.weight=n.weight+"px",i.color=n.color,i.opacity=n.opacity,n.dashArray?i.dashStyle=oi(n.dashArray)?n.dashArray.join(" "):n.dashArray.replace(/( *, *)/g," "):i.dashStyle="",i.endcap=n.lineCap.replace("butt","flat"),i.joinstyle=n.lineJoin):i&&(o.removeChild(i),t._stroke=null),n.fill?(e||(e=t._fill=yn("fill")),o.appendChild(e),e.color=n.fillColor||n.color,e.opacity=n.fillOpacity):e&&(o.removeChild(e),t._fill=null)},_updateCircle:function(t){var i=t._point.round(),e=Math.round(t._radius),n=Math.round(t._radiusY||e);this._setPath(t,t._empty()?"M0 0":"AL "+i.x+","+i.y+" "+e+","+n+" 0,23592600")},_setPath:function(t,i){t._path.v=i},_bringToFront:function(t){X(t._container)},_bringToBack:function(t){J(t._container)}},wn=$i?yn:E,Pn=gn.extend({getEvents:function(){var t=gn.prototype.getEvents.call(this);return t.zoomstart=this._onZoomStart,t},_initContainer:function(){this._container=wn("svg"),this._container.setAttribute("pointer-events","none"),this._rootGroup=wn("g"),this._container.appendChild(this._rootGroup)},_destroyContainer:function(){K(this._container),ft(this._container),delete this._container,delete this._rootGroup,delete this._svgSize},_onZoomStart:function(){this._update()},_update:function(){if(!this._map._animatingZoom||!this._bounds){gn.prototype._update.call(this);var t=this._bounds,i=t.getSize(),e=this._container;this._svgSize&&this._svgSize.equals(i)||(this._svgSize=i,e.setAttribute("width",i.x),e.setAttribute("height",i.y)),at(e,t.min),e.setAttribute("viewBox",[t.min.x,t.min.y,i.x,i.y].join(" ")),this.fire("update")}},_initPath:function(t){var i=t._path=wn("path");t.options.className&&Q(i,t.options.className),t.options.interactive&&Q(i,"leaflet-interactive"),this._updateStyle(t),this._layers[n(t)]=t},_addPath:function(t){this._rootGroup||this._initContainer(),this._rootGroup.appendChild(t._path),t.addInteractiveTarget(t._path)},_removePath:function(t){K(t._path),t.removeInteractiveTarget(t._path),delete this._layers[n(t)]},_updatePath:function(t){t._project(),t._update()},_updateStyle:function(t){var i=t._path,e=t.options;i&&(e.stroke?(i.setAttribute("stroke",e.color),i.setAttribute("stroke-opacity",e.opacity),i.setAttribute("stroke-width",e.weight),i.setAttribute("stroke-linecap",e.lineCap),i.setAttribute("stroke-linejoin",e.lineJoin),e.dashArray?i.setAttribute("stroke-dasharray",e.dashArray):i.removeAttribute("stroke-dasharray"),e.dashOffset?i.setAttribute("stroke-dashoffset",e.dashOffset):i.removeAttribute("stroke-dashoffset")):i.setAttribute("stroke","none"),e.fill?(i.setAttribute("fill",e.fillColor||e.color),i.setAttribute("fill-opacity",e.fillOpacity),i.setAttribute("fill-rule",e.fillRule||"evenodd")):i.setAttribute("fill","none"))},_updatePoly:function(t,i){this._setPath(t,k(t._parts,i))},_updateCircle:function(t){var i=t._point,e=Math.max(Math.round(t._radius),1),n="a"+e+","+(Math.max(Math.round(t._radiusY),1)||e)+" 0 1,0 ",o=t._empty()?"M0 0":"M"+(i.x-e)+","+i.y+n+2*e+",0 "+n+2*-e+",0 ";this._setPath(t,o)},_setPath:function(t,i){t._path.setAttribute("d",i)},_bringToFront:function(t){X(t._path)},_bringToBack:function(t){J(t._path)}});$i&&Pn.include(xn),be.include({getRenderer:function(t){var i=t.options.renderer||this._getPaneRenderer(t.options.pane)||this.options.renderer||this._renderer;return i||(i=this._renderer=this._createRenderer()),this.hasLayer(i)||this.addLayer(i),i},_getPaneRenderer:function(t){if("overlayPane"===t||void 0===t)return!1;var i=this._paneRenderers[t];return void 0===i&&(i=this._createRenderer({pane:t}),this._paneRenderers[t]=i),i},_createRenderer:function(t){return this.options.preferCanvas&&$t(t)||Qt(t)}});var Ln=on.extend({initialize:function(t,i){on.prototype.initialize.call(this,this._boundsToLatLngs(t),i)},setBounds:function(t){return this.setLatLngs(this._boundsToLatLngs(t))},_boundsToLatLngs:function(t){return t=z(t),[t.getSouthWest(),t.getNorthWest(),t.getNorthEast(),t.getSouthEast()]}});Pn.create=wn,Pn.pointsToPath=k,sn.geometryToLayer=Ft,sn.coordsToLatLng=Ut,sn.coordsToLatLngs=Vt,sn.latLngToCoords=qt,sn.latLngsToCoords=Gt,sn.getFeature=Kt,sn.asFeature=Yt,be.mergeOptions({boxZoom:!0});var bn=Ee.extend({initialize:function(t){this._map=t,this._container=t._container,this._pane=t._panes.overlayPane,this._resetStateTimeout=0,t.on("unload",this._destroy,this)},addHooks:function(){mt(this._container,"mousedown",this._onMouseDown,this)},removeHooks:function(){ft(this._container,"mousedown",this._onMouseDown,this)},moved:function(){return this._moved},_destroy:function(){K(this._pane),delete this._pane},_resetState:function(){this._resetStateTimeout=0,this._moved=!1},_clearDeferredResetState:function(){0!==this._resetStateTimeout&&(clearTimeout(this._resetStateTimeout),this._resetStateTimeout=0)},_onMouseDown:function(t){if(!t.shiftKey||1!==t.which&&1!==t.button)return!1;this._clearDeferredResetState(),this._resetState(),fi(),ut(),this._startPoint=this._map.mouseEventToContainerPoint(t),mt(document,{contextmenu:Lt,mousemove:this._onMouseMove,mouseup:this._onMouseUp,keydown:this._onKeyDown},this)},_onMouseMove:function(t){this._moved||(this._moved=!0,this._box=G("div","leaflet-zoom-box",this._container),Q(this._container,"leaflet-crosshair"),this._map.fire("boxzoomstart")),this._point=this._map.mouseEventToContainerPoint(t);var i=new P(this._point,this._startPoint),e=i.getSize();at(this._box,i.min),this._box.style.width=e.x+"px",this._box.style.height=e.y+"px"},_finish:function(){this._moved&&(K(this._box),tt(this._container,"leaflet-crosshair")),gi(),lt(),ft(document,{contextmenu:Lt,mousemove:this._onMouseMove,mouseup:this._onMouseUp,keydown:this._onKeyDown},this)},_onMouseUp:function(t){if((1===t.which||1===t.button)&&(this._finish(),this._moved)){this._clearDeferredResetState(),this._resetStateTimeout=setTimeout(e(this._resetState,this),0);var i=new T(this._map.containerPointToLatLng(this._startPoint),this._map.containerPointToLatLng(this._point));this._map.fitBounds(i).fire("boxzoomend",{boxZoomBounds:i})}},_onKeyDown:function(t){27===t.keyCode&&this._finish()}});be.addInitHook("addHandler","boxZoom",bn),be.mergeOptions({doubleClickZoom:!0});var Tn=Ee.extend({addHooks:function(){this._map.on("dblclick",this._onDoubleClick,this)},removeHooks:function(){this._map.off("dblclick",this._onDoubleClick,this)},_onDoubleClick:function(t){var i=this._map,e=i.getZoom(),n=i.options.zoomDelta,o=t.originalEvent.shiftKey?e-n:e+n;"center"===i.options.doubleClickZoom?i.setZoom(o):i.setZoomAround(t.containerPoint,o)}});be.addInitHook("addHandler","doubleClickZoom",Tn),be.mergeOptions({dragging:!0,inertia:!Mi,inertiaDeceleration:3400,inertiaMaxSpeed:1/0,easeLinearity:.2,worldCopyJump:!1,maxBoundsViscosity:0});var zn=Ee.extend({addHooks:function(){if(!this._draggable){var t=this._map;this._draggable=new Re(t._mapPane,t._container),this._draggable.on({dragstart:this._onDragStart,drag:this._onDrag,dragend:this._onDragEnd},this),this._draggable.on("predrag",this._onPreDragLimit,this),t.options.worldCopyJump&&(this._draggable.on("predrag",this._onPreDragWrap,this),t.on("zoomend",this._onZoomEnd,this),t.whenReady(this._onZoomEnd,this))}Q(this._map._container,"leaflet-grab leaflet-touch-drag"),this._draggable.enable(),this._positions=[],this._times=[]},removeHooks:function(){tt(this._map._container,"leaflet-grab"),tt(this._map._container,"leaflet-touch-drag"),this._draggable.disable()},moved:function(){return this._draggable&&this._draggable._moved},moving:function(){return this._draggable&&this._draggable._moving},_onDragStart:function(){var t=this._map;if(t._stop(),this._map.options.maxBounds&&this._map.options.maxBoundsViscosity){var i=z(this._map.options.maxBounds);this._offsetLimit=b(this._map.latLngToContainerPoint(i.getNorthWest()).multiplyBy(-1),this._map.latLngToContainerPoint(i.getSouthEast()).multiplyBy(-1).add(this._map.getSize())),this._viscosity=Math.min(1,Math.max(0,this._map.options.maxBoundsViscosity))}else this._offsetLimit=null;t.fire("movestart").fire("dragstart"),t.options.inertia&&(this._positions=[],this._times=[])},_onDrag:function(t){if(this._map.options.inertia){var i=this._lastTime=+new Date,e=this._lastPos=this._draggable._absPos||this._draggable._newPos;this._positions.push(e),this._times.push(i),this._prunePositions(i)}this._map.fire("move",t).fire("drag",t)},_prunePositions:function(t){for(;this._positions.length>1&&t-this._times[0]>50;)this._positions.shift(),this._times.shift()},_onZoomEnd:function(){var t=this._map.getSize().divideBy(2),i=this._map.latLngToLayerPoint([0,0]);this._initialWorldOffset=i.subtract(t).x,this._worldWidth=this._map.getPixelWorldBounds().getSize().x},_viscousLimit:function(t,i){return t-(t-i)*this._viscosity},_onPreDragLimit:function(){if(this._viscosity&&this._offsetLimit){var t=this._draggable._newPos.subtract(this._draggable._startPos),i=this._offsetLimit;t.x<i.min.x&&(t.x=this._viscousLimit(t.x,i.min.x)),t.y<i.min.y&&(t.y=this._viscousLimit(t.y,i.min.y)),t.x>i.max.x&&(t.x=this._viscousLimit(t.x,i.max.x)),t.y>i.max.y&&(t.y=this._viscousLimit(t.y,i.max.y)),this._draggable._newPos=this._draggable._startPos.add(t)}},_onPreDragWrap:function(){var t=this._worldWidth,i=Math.round(t/2),e=this._initialWorldOffset,n=this._draggable._newPos.x,o=(n-i+e)%t+i-e,s=(n+i+e)%t-i-e,r=Math.abs(o+e)<Math.abs(s+e)?o:s;this._draggable._absPos=this._draggable._newPos.clone(),this._draggable._newPos.x=r},_onDragEnd:function(t){var i=this._map,e=i.options,n=!e.inertia||this._times.length<2;if(i.fire("dragend",t),n)i.fire("moveend");else{this._prunePositions(+new Date);var o=this._lastPos.subtract(this._positions[0]),s=(this._lastTime-this._times[0])/1e3,r=e.easeLinearity,a=o.multiplyBy(r/s),h=a.distanceTo([0,0]),u=Math.min(e.inertiaMaxSpeed,h),l=a.multiplyBy(u/h),c=u/(e.inertiaDeceleration*r),_=l.multiplyBy(-c/2).round();_.x||_.y?(_=i._limitOffset(_,i.options.maxBounds),f(function(){i.panBy(_,{duration:c,easeLinearity:r,noMoveStart:!0,animate:!0})})):i.fire("moveend")}}});be.addInitHook("addHandler","dragging",zn),be.mergeOptions({keyboard:!0,keyboardPanDelta:80});var Mn=Ee.extend({keyCodes:{left:[37],right:[39],down:[40],up:[38],zoomIn:[187,107,61,171],zoomOut:[189,109,54,173]},initialize:function(t){this._map=t,this._setPanDelta(t.options.keyboardPanDelta),this._setZoomDelta(t.options.zoomDelta)},addHooks:function(){var t=this._map._container;t.tabIndex<=0&&(t.tabIndex="0"),mt(t,{focus:this._onFocus,blur:this._onBlur,mousedown:this._onMouseDown},this),this._map.on({focus:this._addHooks,blur:this._removeHooks},this)},removeHooks:function(){this._removeHooks(),ft(this._map._container,{focus:this._onFocus,blur:this._onBlur,mousedown:this._onMouseDown},this),this._map.off({focus:this._addHooks,blur:this._removeHooks},this)},_onMouseDown:function(){if(!this._focused){var t=document.body,i=document.documentElement,e=t.scrollTop||i.scrollTop,n=t.scrollLeft||i.scrollLeft;this._map._container.focus(),window.scrollTo(n,e)}},_onFocus:function(){this._focused=!0,this._map.fire("focus")},_onBlur:function(){this._focused=!1,this._map.fire("blur")},_setPanDelta:function(t){var i,e,n=this._panKeys={},o=this.keyCodes;for(i=0,e=o.left.length;i<e;i++)n[o.left[i]]=[-1*t,0];for(i=0,e=o.right.length;i<e;i++)n[o.right[i]]=[t,0];for(i=0,e=o.down.length;i<e;i++)n[o.down[i]]=[0,t];for(i=0,e=o.up.length;i<e;i++)n[o.up[i]]=[0,-1*t]},_setZoomDelta:function(t){var i,e,n=this._zoomKeys={},o=this.keyCodes;for(i=0,e=o.zoomIn.length;i<e;i++)n[o.zoomIn[i]]=t;for(i=0,e=o.zoomOut.length;i<e;i++)n[o.zoomOut[i]]=-t},_addHooks:function(){mt(document,"keydown",this._onKeyDown,this)},_removeHooks:function(){ft(document,"keydown",this._onKeyDown,this)},_onKeyDown:function(t){if(!(t.altKey||t.ctrlKey||t.metaKey)){var i,e=t.keyCode,n=this._map;if(e in this._panKeys)n._panAnim&&n._panAnim._inProgress||(i=this._panKeys[e],t.shiftKey&&(i=w(i).multiplyBy(3)),n.panBy(i),n.options.maxBounds&&n.panInsideBounds(n.options.maxBounds));else if(e in this._zoomKeys)n.setZoom(n.getZoom()+(t.shiftKey?3:1)*this._zoomKeys[e]);else{if(27!==e||!n._popup||!n._popup.options.closeOnEscapeKey)return;n.closePopup()}Lt(t)}}});be.addInitHook("addHandler","keyboard",Mn),be.mergeOptions({scrollWheelZoom:!0,wheelDebounceTime:40,wheelPxPerZoomLevel:60});var Cn=Ee.extend({addHooks:function(){mt(this._map._container,"mousewheel",this._onWheelScroll,this),this._delta=0},removeHooks:function(){ft(this._map._container,"mousewheel",this._onWheelScroll,this)},_onWheelScroll:function(t){var i=Tt(t),n=this._map.options.wheelDebounceTime;this._delta+=i,this._lastMousePos=this._map.mouseEventToContainerPoint(t),this._startTime||(this._startTime=+new Date);var o=Math.max(n-(+new Date-this._startTime),0);clearTimeout(this._timer),this._timer=setTimeout(e(this._performZoom,this),o),Lt(t)},_performZoom:function(){var t=this._map,i=t.getZoom(),e=this._map.options.zoomSnap||0;t._stop();var n=this._delta/(4*this._map.options.wheelPxPerZoomLevel),o=4*Math.log(2/(1+Math.exp(-Math.abs(n))))/Math.LN2,s=e?Math.ceil(o/e)*e:o,r=t._limitZoom(i+(this._delta>0?s:-s))-i;this._delta=0,this._startTime=null,r&&("center"===t.options.scrollWheelZoom?t.setZoom(i+r):t.setZoomAround(this._lastMousePos,i+r))}});be.addInitHook("addHandler","scrollWheelZoom",Cn),be.mergeOptions({tap:!0,tapTolerance:15});var Sn=Ee.extend({addHooks:function(){mt(this._map._container,"touchstart",this._onDown,this)},removeHooks:function(){ft(this._map._container,"touchstart",this._onDown,this)},_onDown:function(t){if(t.touches){if(Pt(t),this._fireClick=!0,t.touches.length>1)return this._fireClick=!1,void clearTimeout(this._holdTimeout);var i=t.touches[0],n=i.target;this._startPos=this._newPos=new x(i.clientX,i.clientY),n.tagName&&"a"===n.tagName.toLowerCase()&&Q(n,"leaflet-active"),this._holdTimeout=setTimeout(e(function(){this._isTapValid()&&(this._fireClick=!1,this._onUp(),this._simulateEvent("contextmenu",i))},this),1e3),this._simulateEvent("mousedown",i),mt(document,{touchmove:this._onMove,touchend:this._onUp},this)}},_onUp:function(t){if(clearTimeout(this._holdTimeout),ft(document,{touchmove:this._onMove,touchend:this._onUp},this),this._fireClick&&t&&t.changedTouches){var i=t.changedTouches[0],e=i.target;e&&e.tagName&&"a"===e.tagName.toLowerCase()&&tt(e,"leaflet-active"),this._simulateEvent("mouseup",i),this._isTapValid()&&this._simulateEvent("click",i)}},_isTapValid:function(){return this._newPos.distanceTo(this._startPos)<=this._map.options.tapTolerance},_onMove:function(t){var i=t.touches[0];this._newPos=new x(i.clientX,i.clientY),this._simulateEvent("mousemove",i)},_simulateEvent:function(t,i){var e=document.createEvent("MouseEvents");e._simulated=!0,i.target._simulatedClick=!0,e.initMouseEvent(t,!0,!0,window,1,i.screenX,i.screenY,i.clientX,i.clientY,!1,!1,!1,!1,0,null),i.target.dispatchEvent(e)}});qi&&!Vi&&be.addInitHook("addHandler","tap",Sn),be.mergeOptions({touchZoom:qi&&!Mi,bounceAtZoomLimits:!0});var Zn=Ee.extend({addHooks:function(){Q(this._map._container,"leaflet-touch-zoom"),mt(this._map._container,"touchstart",this._onTouchStart,this)},removeHooks:function(){tt(this._map._container,"leaflet-touch-zoom"),ft(this._map._container,"touchstart",this._onTouchStart,this)},_onTouchStart:function(t){var i=this._map;if(t.touches&&2===t.touches.length&&!i._animatingZoom&&!this._zooming){var e=i.mouseEventToContainerPoint(t.touches[0]),n=i.mouseEventToContainerPoint(t.touches[1]);this._centerPoint=i.getSize()._divideBy(2),this._startLatLng=i.containerPointToLatLng(this._centerPoint),"center"!==i.options.touchZoom&&(this._pinchStartLatLng=i.containerPointToLatLng(e.add(n)._divideBy(2))),this._startDist=e.distanceTo(n),this._startZoom=i.getZoom(),this._moved=!1,this._zooming=!0,i._stop(),mt(document,"touchmove",this._onTouchMove,this),mt(document,"touchend",this._onTouchEnd,this),Pt(t)}},_onTouchMove:function(t){if(t.touches&&2===t.touches.length&&this._zooming){var i=this._map,n=i.mouseEventToContainerPoint(t.touches[0]),o=i.mouseEventToContainerPoint(t.touches[1]),s=n.distanceTo(o)/this._startDist;if(this._zoom=i.getScaleZoom(s,this._startZoom),!i.options.bounceAtZoomLimits&&(this._zoom<i.getMinZoom()&&s<1||this._zoom>i.getMaxZoom()&&s>1)&&(this._zoom=i._limitZoom(this._zoom)),"center"===i.options.touchZoom){if(this._center=this._startLatLng,1===s)return}else{var r=n._add(o)._divideBy(2)._subtract(this._centerPoint);if(1===s&&0===r.x&&0===r.y)return;this._center=i.unproject(i.project(this._pinchStartLatLng,this._zoom).subtract(r),this._zoom)}this._moved||(i._moveStart(!0,!1),this._moved=!0),g(this._animRequest);var a=e(i._move,i,this._center,this._zoom,{pinch:!0,round:!1});this._animRequest=f(a,this,!0),Pt(t)}},_onTouchEnd:function(){this._moved&&this._zooming?(this._zooming=!1,g(this._animRequest),ft(document,"touchmove",this._onTouchMove),ft(document,"touchend",this._onTouchEnd),this._map.options.zoomAnimation?this._map._animateZoom(this._center,this._map._limitZoom(this._zoom),!0,this._map.options.zoomSnap):this._map._resetView(this._center,this._map._limitZoom(this._zoom))):this._zooming=!1}});be.addInitHook("addHandler","touchZoom",Zn),be.BoxZoom=bn,be.DoubleClickZoom=Tn,be.Drag=zn,be.Keyboard=Mn,be.ScrollWheelZoom=Cn,be.Tap=Sn,be.TouchZoom=Zn,Object.freeze=ti,t.version="1.3.4+HEAD.0e566b2",t.Control=Te,t.control=ze,t.Browser=Qi,t.Evented=ci,t.Mixin=Ae,t.Util=ui,t.Class=v,t.Handler=Ee,t.extend=i,t.bind=e,t.stamp=n,t.setOptions=l,t.DomEvent=Pe,t.DomUtil=ve,t.PosAnimation=Le,t.Draggable=Re,t.LineUtil=Ne,t.PolyUtil=De,t.Point=x,t.point=w,t.Bounds=P,t.bounds=b,t.Transformation=S,t.transformation=Z,t.Projection=He,t.LatLng=M,t.latLng=C,t.LatLngBounds=T,t.latLngBounds=z,t.CRS=di,t.GeoJSON=sn,t.geoJSON=Xt,t.geoJson=an,t.Layer=qe,t.LayerGroup=Ge,t.layerGroup=function(t,i){return new Ge(t,i)},t.FeatureGroup=Ke,t.featureGroup=function(t){return new Ke(t)},t.ImageOverlay=hn,t.imageOverlay=function(t,i,e){return new hn(t,i,e)},t.VideoOverlay=un,t.videoOverlay=function(t,i,e){return new un(t,i,e)},t.DivOverlay=ln,t.Popup=cn,t.popup=function(t,i){return new cn(t,i)},t.Tooltip=_n,t.tooltip=function(t,i){return new _n(t,i)},t.Icon=Ye,t.icon=function(t){return new Ye(t)},t.DivIcon=dn,t.divIcon=function(t){return new dn(t)},t.Marker=$e,t.marker=function(t,i){return new $e(t,i)},t.TileLayer=mn,t.tileLayer=Jt,t.GridLayer=pn,t.gridLayer=function(t){return new pn(t)},t.SVG=Pn,t.svg=Qt,t.Renderer=gn,t.Canvas=vn,t.canvas=$t,t.Path=Qe,t.CircleMarker=tn,t.circleMarker=function(t,i){return new tn(t,i)},t.Circle=en,t.circle=function(t,i,e){return new en(t,i,e)},t.Polyline=nn,t.polyline=function(t,i){return new nn(t,i)},t.Polygon=on,t.polygon=function(t,i){return new on(t,i)},t.Rectangle=Ln,t.rectangle=function(t,i){return new Ln(t,i)},t.Map=be,t.map=function(t,i){return new be(t,i)};var En=window.L;t.noConflict=function(){return window.L=En,this},window.L=t}); \ No newline at end of file diff --git a/flask_admin/static/vendor/leaflet/leaflet.js.map b/flask_admin/static/vendor/leaflet/leaflet.js.map new file mode 100644 index 000000000..e4298b3ec --- /dev/null +++ b/flask_admin/static/vendor/leaflet/leaflet.js.map @@ -0,0 +1 @@ +{"version":3,"sources":["dist/leaflet-src.js"],"names":["global","factory","exports","module","define","amd","L","this","extend","dest","i","j","len","src","arguments","length","bind","fn","obj","slice","Array","prototype","apply","call","args","concat","stamp","_leaflet_id","lastId","throttle","time","context","lock","wrapperFn","later","setTimeout","wrapNum","x","range","includeMax","max","min","d","falseFn","formatNum","num","digits","pow","Math","undefined","round","trim","str","replace","splitWords","split","setOptions","options","hasOwnProperty","create","getParamString","existingUrl","uppercase","params","push","encodeURIComponent","toUpperCase","indexOf","join","template","data","templateRe","key","value","Error","array","el","getPrefixed","name","window","timeoutDefer","Date","timeToCall","lastTime","requestAnimFrame","immediate","requestFn","cancelAnimFrame","id","cancelFn","Class","checkDeprecatedMixinEvents","includes","Mixin","isArray","Events","console","warn","stack","Point","y","toPoint","Bounds","a","b","points","toBounds","LatLngBounds","corner1","corner2","latlngs","toLatLngBounds","LatLng","lat","lng","alt","isNaN","toLatLng","c","lon","Transformation","_a","_b","_c","_d","toTransformation","svgCreate","document","createElementNS","pointsToPath","rings","closed","len2","p","svg","userAgentContains","navigator","userAgent","toLowerCase","addPointerListener","type","handler","_addPointerStart","_addPointerMove","_addPointerEnd","removePointerListener","removeEventListener","POINTER_DOWN","POINTER_MOVE","POINTER_UP","POINTER_CANCEL","onDown","e","pointerType","MSPOINTER_TYPE_MOUSE","TAG_WHITE_LIST","target","tagName","preventDefault","_handlePointer","addEventListener","_pointerDocListener","documentElement","_globalPointerDown","_globalPointerMove","_globalPointerUp","_pointers","pointerId","_pointersCount","touches","changedTouches","onMove","buttons","onUp","addDoubleTapListener","onTouchStart","count","pointer","edge","now","delta","last","touch$$1","doubleTap","delay","onTouchEnd","cancelBubble","prop","newTouch","_pre","_touchstart","_touchend","removeDoubleTapListener","touchstart","touchend","dblclick","get","getElementById","getStyle","style","currentStyle","defaultView","css","getComputedStyle","create$1","className","container","createElement","appendChild","remove","parent","parentNode","removeChild","empty","firstChild","toFront","lastChild","toBack","insertBefore","hasClass","classList","contains","getClass","RegExp","test","addClass","classes","add","setClass","removeClass","baseVal","setOpacity","opacity","_setOpacityIE","filter","filterName","filters","item","Enabled","Opacity","testProp","props","setTransform","offset","scale","pos","TRANSFORM","ie3d","setPosition","point","_leaflet_pos","any3d","left","top","getPosition","disableImageDrag","on","enableImageDrag","off","preventOutline","element","tabIndex","restoreOutline","_outlineElement","_outlineStyle","outline","getSizedParentNode","offsetWidth","offsetHeight","body","getScale","rect","getBoundingClientRect","width","height","boundingClientRect","types","addOne","removeOne","eventsKey","event","originalHandler","touch","chrome","isExternalTarget","android","filterClick","attachEvent","detachEvent","stopPropagation","originalEvent","_stopped","skipped","disableScrollPropagation","disableClickPropagation","fakeStop","returnValue","stop","getMousePosition","clientX","clientY","clientLeft","clientTop","getWheelDelta","wheelDeltaY","deltaY","deltaMode","wheelPxFactor","deltaX","deltaZ","wheelDelta","detail","abs","skipEvents","events","related","relatedTarget","err","timeStamp","elapsed","lastClick","_simulatedClick","_simulated","simplify","tolerance","sqTolerance","_reducePoints","_simplifyDP","pointToSegmentDistance","p1","p2","sqrt","_sqClosestPointOnSegment","markers","Uint8Array","_simplifyDPStep","newPoints","first","index","sqDist","maxSqDist","reducedPoints","prev","_sqDist","clipSegment","bounds","useLastCode","codeOut","newCode","codeA","_lastCode","_getBitCode","codeB","_getEdgeIntersection","code","dx","dy","t","dot","isFlat","_flat","clipPolygon","clippedPoints","k","edges","_code","geometryToLayer","geojson","latlng","geometry","coords","coordinates","layers","pointToLayer","_coordsToLatLng","coordsToLatLng","Marker","FeatureGroup","coordsToLatLngs","Polyline","Polygon","geometries","layer","properties","levelsDeep","latLngToCoords","precision","latLngsToCoords","getFeature","newGeometry","feature","asFeature","geoJSON","GeoJSON","tileLayer","url","TileLayer","canvas$1","canvas","Canvas","svg$1","vml","SVG","freeze","Object","F","proto","toString","emptyImageUrl","requestAnimationFrame","cancelAnimationFrame","clearTimeout","Util","NewClass","initialize","callInitHooks","parentProto","__super__","constructor","statics","_initHooks","_initHooksCalled","include","mergeOptions","addInitHook","init","_on","_off","_events","typeListeners","newListener","ctx","listeners","l","_firingCount","splice","fire","propagate","listens","sourceTarget","_propagateEvent","_eventParents","once","addEventParent","removeEventParent","propagatedFrom","clearAllEventListeners","addOneTimeEventListener","fireEvent","hasEventListeners","Evented","trunc","v","floor","ceil","clone","_add","subtract","_subtract","divideBy","_divideBy","multiplyBy","_multiplyBy","scaleBy","unscaleBy","_round","_floor","_ceil","_trunc","distanceTo","equals","getCenter","getBottomLeft","getTopRight","getTopLeft","getBottomRight","getSize","intersects","min2","max2","xIntersects","yIntersects","overlaps","xOverlaps","yOverlaps","isValid","sw2","ne2","sw","_southWest","ne","_northEast","pad","bufferRatio","heightBuffer","widthBuffer","getSouthWest","getNorthEast","getNorthWest","getNorth","getWest","getSouthEast","getSouth","getEast","latIntersects","lngIntersects","latOverlaps","lngOverlaps","toBBoxString","maxMargin","other","Earth","distance","wrap","wrapLatLng","sizeInMeters","latAccuracy","lngAccuracy","cos","PI","CRS","latLngToPoint","zoom","projectedPoint","projection","project","transformation","_transform","pointToLatLng","untransformedPoint","untransform","unproject","log","LN2","getProjectedBounds","infinite","s","transform","wrapLng","wrapLat","wrapLatLngBounds","center","newCenter","latShift","lngShift","R","latlng1","latlng2","rad","lat1","lat2","sinDLat","sin","sinDLon","atan2","SphericalMercator","MAX_LATITUDE","atan","exp","disableTextSelection","enableTextSelection","_userSelect","EPSG3857","EPSG900913","style$1","ie","ielt9","webkit","android23","webkitVer","parseInt","exec","androidStock","opera","gecko","safari","phantom","opera12","win","platform","webkit3d","WebKitCSSMatrix","gecko3d","L_DISABLE_3D","mobile","orientation","mobileWebkit","mobileWebkit3d","msPointer","PointerEvent","MSPointerEvent","L_NO_TOUCH","DocumentTouch","mobileOpera","mobileGecko","retina","devicePixelRatio","screen","deviceXDPI","logicalXDPI","getContext","createSVGRect","div","innerHTML","shape","behavior","adj","Browser","TRANSITION","TRANSITION_END","userSelectProperty","DomUtil","DomEvent","addListener","removeListener","PosAnimation","run","newPos","duration","easeLinearity","_el","_inProgress","_duration","_easeOutPower","_startPos","_offset","_startTime","_animate","_step","_complete","_animId","_runFrame","_easeOut","progress","Map","crs","minZoom","maxZoom","maxBounds","renderer","zoomAnimation","zoomAnimationThreshold","fadeAnimation","markerZoomAnimation","transform3DLimit","zoomSnap","zoomDelta","trackResize","_initContainer","_initLayout","_onResize","_initEvents","setMaxBounds","_zoom","_limitZoom","setView","reset","_handlers","_layers","_zoomBoundLayers","_sizeChanged","_zoomAnimated","_createAnimProxy","_proxy","_catchTransitionEnd","_addLayers","_limitCenter","_stop","_loaded","animate","pan","_tryAnimatedZoom","_tryAnimatedPan","_sizeTimer","_resetView","setZoom","zoomIn","zoomOut","setZoomAround","getZoomScale","viewHalf","centerOffset","latLngToContainerPoint","containerPointToLatLng","_getBoundsCenterZoom","getBounds","paddingTL","paddingTopLeft","padding","paddingBR","paddingBottomRight","getBoundsZoom","Infinity","paddingOffset","swPoint","nePoint","fitBounds","fitWorld","panTo","panBy","getZoom","_panAnim","step","_onPanTransitionStep","end","_onPanTransitionEnd","noMoveStart","_mapPane","_getMapPanePos","_rawPanBy","flyTo","targetCenter","targetZoom","r","w1","w0","rho2","u1","sq","sinh","n","cosh","tanh","w","r0","rho","u","easeOut","frame","start","S","_flyToFrame","_move","from","to","startZoom","getScaleZoom","_moveEnd","size","_moveStart","flyToBounds","_panInsideMaxBounds","setMinZoom","oldZoom","setMaxZoom","panInsideBounds","_enforcingBounds","invalidateSize","oldSize","_lastCenter","newSize","oldCenter","debounceMoveend","locate","_locateOptions","timeout","watch","_handleGeolocationError","message","onResponse","_handleGeolocationResponse","onError","_locationWatchId","geolocation","watchPosition","getCurrentPosition","stopLocate","clearWatch","error","latitude","longitude","accuracy","timestamp","addHandler","HandlerClass","enable","_containerId","_container","_clearControlPos","_resizeRequest","_clearHandlers","_panes","_renderer","createPane","pane","_checkIfLoaded","_moved","layerPointToLatLng","_getCenterLayerPoint","getPixelBounds","getMinZoom","_layersMinZoom","getMaxZoom","_layersMaxZoom","inside","nw","se","boundsSize","snap","scalex","scaley","_size","clientWidth","clientHeight","topLeftPoint","_getTopLeftPoint","getPixelOrigin","_pixelOrigin","getPixelWorldBounds","getPane","getPanes","getContainer","toZoom","fromZoom","latLngToLayerPoint","containerPointToLayerPoint","layerPointToContainerPoint","layerPoint","mouseEventToContainerPoint","mouseEventToLayerPoint","mouseEventToLatLng","_onScroll","_fadeAnimated","position","_initPanes","_initControlPos","panes","_paneRenderers","markerPane","shadowPane","loading","zoomChanged","_getNewPixelOrigin","pinch","_getZoomSpan","remove$$1","_targets","onOff","_handleDOMEvent","_onMoveEnd","scrollTop","scrollLeft","_findEventTargets","targets","isHover","srcElement","dragging","_draggableMoved","_fireDOMEvent","_mouseEvents","synth","isMarker","getLatLng","_radius","containerPoint","bubblingMouseEvents","enabled","moved","boxZoom","disable","whenReady","callback","_latLngToNewLayerPoint","topLeft","_latLngBoundsToNewLayerBounds","latLngBounds","_getCenterOffset","centerPoint","viewBounds","_getBoundsOffset","_limitOffset","newBounds","pxBounds","projectedMaxBounds","minOffset","maxOffset","_rebound","right","proxy","mapPane","_animatingZoom","_onZoomTransitionEnd","z","_destroyAnimProxy","propertyName","_nothingToAnimate","getElementsByClassName","_animateZoom","startAnim","noUpdate","_animateToCenter","_animateToZoom","Control","map","_map","removeControl","addControl","addTo","onAdd","corner","_controlCorners","onRemove","_refocusOnMap","screenX","screenY","focus","control","createCorner","vSide","hSide","corners","_controlContainer","Layers","collapsed","autoZIndex","hideSingleBase","sortLayers","sortFunction","layerA","layerB","nameA","nameB","baseLayers","overlays","_layerControlInputs","_lastZIndex","_handlingClick","_addLayer","_update","_checkDisabledLayers","_onLayerChange","_expandIfNotCollapsed","addBaseLayer","addOverlay","removeLayer","_getLayer","expand","_form","acceptableHeight","offsetTop","collapse","setAttribute","form","mouseenter","mouseleave","link","_layersLink","href","title","_baseLayersList","_separator","_overlaysList","overlay","sort","setZIndex","baseLayersPresent","overlaysPresent","baseLayersCount","_addItem","display","_createRadioElement","checked","radioHtml","radioFragment","input","label","hasLayer","defaultChecked","layerId","_onInputClick","holder","inputs","addedLayers","removedLayers","addLayer","disabled","_expand","_collapse","Zoom","zoomInText","zoomInTitle","zoomOutText","zoomOutTitle","zoomName","_zoomInButton","_createButton","_zoomIn","_zoomOutButton","_zoomOut","_updateDisabled","_disabled","shiftKey","html","zoomControl","Scale","maxWidth","metric","imperial","_addScales","updateWhenIdle","_mScale","_iScale","maxMeters","_updateScales","_updateMetric","_updateImperial","meters","_getRoundNum","_updateScale","maxMiles","miles","feet","maxFeet","text","ratio","pow10","Attribution","prefix","_attributions","attributionControl","getAttribution","addAttribution","setPrefix","removeAttribution","attribs","prefixAndAttribs","attribution","Handler","_enabled","addHooks","removeHooks","START","END","mousedown","pointerdown","MSPointerDown","MOVE","Draggable","clickTolerance","dragStartTarget","preventOutline$$1","_element","_dragStartTarget","_preventOutline","_onDown","_dragging","finishDrag","which","button","_moving","sizedParent","_startPoint","_parentScale","_onMove","_onUp","_lastTarget","SVGElementInstance","correspondingUseElement","_newPos","_animRequest","_lastEvent","_updatePosition","LineUtil","closestPointOnSegment","PolyUtil","LonLat","Mercator","R_MINOR","tmp","con","ts","tan","phi","dphi","EPSG3395","EPSG4326","Simple","Layer","removeFrom","_mapToAdd","addInteractiveTarget","targetEl","removeInteractiveTarget","_layerAdd","getEvents","beforeAdd","eachLayer","method","_addZoomLimit","_updateZoomLevels","_removeZoomLimit","oldZoomSpan","LayerGroup","getLayerId","clearLayers","invoke","methodName","getLayer","getLayers","zIndex","setStyle","bringToFront","bringToBack","Icon","popupAnchor","tooltipAnchor","createIcon","oldIcon","_createIcon","createShadow","_getIconUrl","img","_createImg","_setIconStyles","sizeOption","anchor","shadowAnchor","iconAnchor","marginLeft","marginTop","IconDefault","iconUrl","iconRetinaUrl","shadowUrl","iconSize","shadowSize","imagePath","_detectIconPath","path","MarkerDrag","marker","_marker","icon","_icon","_draggable","dragstart","_onDragStart","predrag","_onPreDrag","drag","_onDrag","dragend","_onDragEnd","_adjustPan","speed","autoPanSpeed","autoPanPadding","iconPos","origin","panBounds","movement","_panRequest","_oldLatLng","closePopup","autoPan","shadow","_shadow","_latlng","oldLatLng","interactive","keyboard","zIndexOffset","riseOnHover","riseOffset","draggable","_initIcon","update","_removeIcon","_removeShadow","viewreset","setLatLng","setZIndexOffset","setIcon","_popup","bindPopup","getElement","_setPos","classToAdd","addIcon","mouseover","_bringToFront","mouseout","_resetZIndex","newShadow","addShadow","_updateOpacity","_initInteraction","_zIndex","_updateZIndex","opt","_getPopupAnchor","_getTooltipAnchor","Path","stroke","color","weight","lineCap","lineJoin","dashArray","dashOffset","fill","fillColor","fillOpacity","fillRule","getRenderer","_initPath","_reset","_addPath","_removePath","redraw","_updatePath","_updateStyle","_bringToBack","_path","_project","_clickTolerance","CircleMarker","radius","setRadius","getRadius","_point","_updateBounds","r2","_radiusY","_pxBounds","_updateCircle","_empty","_bounds","_containsPoint","Circle","legacyOptions","_mRadius","half","latR","bottom","lngR","acos","smoothFactor","noClip","_setLatLngs","getLatLngs","_latlngs","setLatLngs","isEmpty","closestLayerPoint","minDistance","minPoint","closest","jLen","_parts","halfDist","segDist","dist","_rings","addLatLng","_defaultShape","_convertLatLngs","result","flat","_projectLatlngs","projectedBounds","ring","_clipPoints","segment","parts","_simplifyPoints","_updatePoly","part","f","area","pop","clipped","addData","features","defaultOptions","resetStyle","onEachFeature","_setLayerStyle","PointToGeoJSON","toGeoJSON","multi","holes","toMultiPoint","isGeometryCollection","jsons","json","geoJson","ImageOverlay","crossOrigin","errorOverlayUrl","_url","_image","_initImage","styleOpts","setUrl","setBounds","zoomanim","wasElementSupplied","onselectstart","onmousemove","onload","onerror","_overlayOnError","image","errorUrl","VideoOverlay","autoplay","loop","vid","onloadeddata","sourceElements","getElementsByTagName","sources","source","DivOverlay","_source","_removeTimeout","getContent","_content","setContent","content","visibility","_updateContent","_updateLayout","isOpen","node","_contentNode","hasChildNodes","_getAnchor","_containerBottom","_containerLeft","_containerWidth","Popup","minWidth","maxHeight","autoPanPaddingTopLeft","autoPanPaddingBottomRight","keepInView","closeButton","autoClose","closeOnEscapeKey","openOn","openPopup","popup","closeOnClick","closePopupOnClick","preclick","_close","moveend","wrapper","_wrapper","_tipContainer","_tip","_closeButton","_onCloseButtonClick","whiteSpace","marginBottom","containerHeight","containerWidth","layerPos","containerPos","_popupHandlersAdded","click","_openPopup","keypress","_onKeyPress","move","_movePopup","unbindPopup","togglePopup","isPopupOpen","setPopupContent","getPopup","keyCode","Tooltip","direction","permanent","sticky","tooltip","closeTooltip","_setPosition","tooltipPoint","tooltipWidth","tooltipHeight","openTooltip","bindTooltip","_tooltip","_initTooltipInteractions","unbindTooltip","_tooltipHandlersAdded","_moveTooltip","_openTooltip","mousemove","toggleTooltip","isTooltipOpen","setTooltipContent","getTooltip","DivIcon","bgPos","backgroundPosition","Default","GridLayer","tileSize","updateWhenZooming","updateInterval","maxNativeZoom","minNativeZoom","noWrap","keepBuffer","_levels","_tiles","_removeAllTiles","_tileZoom","_setAutoZIndex","isLoading","_loading","viewprereset","_invalidateAll","createTile","getTileSize","compare","children","edgeZIndex","isFinite","nextFrame","willPrune","tile","current","loaded","fade","active","_onOpaqueTile","_noPrune","_pruneTiles","_fadeFrame","_updateLevels","_onUpdateLevel","_removeTilesAtZoom","_onRemoveLevel","level","_setZoomTransform","_onCreateLevel","_level","retain","_retainParent","_retainChildren","_removeTile","x2","y2","z2","coords2","_tileCoordsToKey","animating","_setView","_clampZoom","noPrune","tileZoom","tileZoomChanged","_abortLoading","_resetGrid","_setZoomTransforms","translate","_tileSize","_globalTileRange","_pxBoundsToTileRange","_wrapX","_wrapY","_getTiledPixelBounds","mapZoom","pixelCenter","halfSize","pixelBounds","tileRange","tileCenter","queue","margin","noPruneRange","_isValidTile","fragment","createDocumentFragment","_addTile","tileBounds","_tileCoordsToBounds","_keyToBounds","_keyToTileCoords","_tileCoordsToNwSe","nwPoint","sePoint","bp","_initTile","WebkitBackfaceVisibility","tilePos","_getTilePos","_wrapCoords","_tileReady","_noTilesToLoad","newCoords","subdomains","errorTileUrl","zoomOffset","tms","zoomReverse","detectRetina","_onTileRemove","noRedraw","done","_tileOnLoad","_tileOnError","getTileUrl","_getSubdomain","_getZoomForUrl","invertedY","getAttribute","tilePoint","complete","TileLayerWMS","defaultWmsParams","service","request","styles","format","transparent","version","wmsParams","realRetina","_crs","_wmsVersion","parseFloat","projectionKey","bbox","setParams","WMS","wms","Renderer","_updatePaths","_destroyContainer","_onZoom","zoomend","_onZoomEnd","_onAnimZoom","ev","_updateTransform","currentCenterPoint","_center","topLeftOffset","_onViewPreReset","_postponeUpdatePaths","_draw","_onMouseMove","_onClick","_handleMouseOut","_ctx","_redrawRequest","_redrawBounds","_redraw","_drawnLayers","m","_updateDashArray","order","_order","_drawLast","next","_drawFirst","_requestRedraw","_extendRedrawBounds","Number","_dashArray","_clear","clearRect","save","beginPath","clip","_drawing","restore","closePath","_fillStroke","arc","globalAlpha","fillStyle","setLineDash","lineWidth","strokeStyle","clickedLayer","_fireEvent","moving","_handleMouseHover","_hoveredLayer","candidateHoveredLayer","vmlCreate","namespaces","vmlMixin","coordsize","_stroke","_fill","stroked","filled","dashStyle","endcap","joinstyle","_setPath","create$2","zoomstart","_onZoomStart","_rootGroup","_svgSize","removeAttribute","_getPaneRenderer","_createRenderer","preferCanvas","Rectangle","_boundsToLatLngs","BoxZoom","_pane","overlayPane","_resetStateTimeout","_destroy","_onMouseDown","_resetState","_clearDeferredResetState","contextmenu","mouseup","_onMouseUp","keydown","_onKeyDown","_box","_finish","boxZoomBounds","doubleClickZoom","DoubleClickZoom","_onDoubleClick","inertia","inertiaDeceleration","inertiaMaxSpeed","worldCopyJump","maxBoundsViscosity","Drag","_onPreDragLimit","_onPreDragWrap","_positions","_times","_offsetLimit","_viscosity","_lastTime","_lastPos","_absPos","_prunePositions","shift","pxCenter","pxWorldCenter","_initialWorldOffset","_worldWidth","_viscousLimit","threshold","limit","worldWidth","halfWidth","newX1","newX2","newX","noInertia","ease","speedVector","limitedSpeed","limitedSpeedVector","decelerationDuration","keyboardPanDelta","Keyboard","keyCodes","down","up","_setPanDelta","_setZoomDelta","_onFocus","blur","_onBlur","_addHooks","_removeHooks","_focused","docEl","scrollTo","panDelta","keys","_panKeys","codes","_zoomKeys","altKey","ctrlKey","metaKey","scrollWheelZoom","wheelDebounceTime","wheelPxPerZoomLevel","ScrollWheelZoom","_onWheelScroll","_delta","debounce","_lastMousePos","_timer","_performZoom","d2","d3","d4","tap","tapTolerance","Tap","_fireClick","_holdTimeout","_isTapValid","_simulateEvent","touchmove","simulatedEvent","createEvent","initMouseEvent","dispatchEvent","touchZoom","bounceAtZoomLimits","TouchZoom","_onTouchStart","_zooming","_centerPoint","_startLatLng","_pinchStartLatLng","_startDist","_startZoom","_onTouchMove","_onTouchEnd","moveFn","Projection","latLng","layerGroup","featureGroup","imageOverlay","videoOverlay","video","divIcon","gridLayer","circleMarker","circle","polyline","polygon","rectangle","oldL","noConflict"],"mappings":";;;;CAKC,SAAUA,EAAQC,GACC,iBAAZC,SAA0C,oBAAXC,OAAyBF,EAAQC,SACrD,mBAAXE,QAAyBA,OAAOC,IAAMD,QAAQ,WAAYH,GAChEA,EAASD,EAAOM,MAHlB,CAIEC,KAAM,SAAWL,GAAW,aAe9B,SAASM,EAAOC,GACf,IAAIC,EAAGC,EAAGC,EAAKC,EAEf,IAAKF,EAAI,EAAGC,EAAME,UAAUC,OAAQJ,EAAIC,EAAKD,IAAK,CACjDE,EAAMC,UAAUH,GAChB,IAAKD,KAAKG,EACTJ,EAAKC,GAAKG,EAAIH,GAGhB,OAAOD,EAgBR,SAASO,EAAKC,EAAIC,GACjB,IAAIC,EAAQC,MAAMC,UAAUF,MAE5B,GAAIF,EAAGD,KACN,OAAOC,EAAGD,KAAKM,MAAML,EAAIE,EAAMI,KAAKT,UAAW,IAGhD,IAAIU,EAAOL,EAAMI,KAAKT,UAAW,GAEjC,OAAO,WACN,OAAOG,EAAGK,MAAMJ,EAAKM,EAAKT,OAASS,EAAKC,OAAON,EAAMI,KAAKT,YAAcA,YAU1E,SAASY,EAAMR,GAGd,OADAA,EAAIS,YAAcT,EAAIS,eAAiBC,GAChCV,EAAIS,YAWZ,SAASE,EAASZ,EAAIa,EAAMC,GAC3B,IAAIC,EAAMR,EAAMS,EAAWC,EAwB3B,OAtBAA,EAAQ,WAEPF,GAAO,EACHR,IACHS,EAAUX,MAAMS,EAASP,GACzBA,GAAO,IAITS,EAAY,WACPD,EAEHR,EAAOV,WAIPG,EAAGK,MAAMS,EAASjB,WAClBqB,WAAWD,EAAOJ,GAClBE,GAAO,IAWV,SAASI,EAAQC,EAAGC,EAAOC,GAC1B,IAAIC,EAAMF,EAAM,GACZG,EAAMH,EAAM,GACZI,EAAIF,EAAMC,EACd,OAAOJ,IAAMG,GAAOD,EAAaF,IAAMA,EAAII,GAAOC,EAAIA,GAAKA,EAAID,EAKhE,SAASE,IAAY,OAAO,EAI5B,SAASC,EAAUC,EAAKC,GACvB,IAAIC,EAAMC,KAAKD,IAAI,QAAgBE,IAAXH,EAAuB,EAAIA,GACnD,OAAOE,KAAKE,MAAML,EAAME,GAAOA,EAKhC,SAASI,EAAKC,GACb,OAAOA,EAAID,KAAOC,EAAID,OAASC,EAAIC,QAAQ,aAAc,IAK1D,SAASC,EAAWF,GACnB,OAAOD,EAAKC,GAAKG,MAAM,OAKxB,SAASC,EAAWtC,EAAKuC,GACnBvC,EAAIwC,eAAe,aACvBxC,EAAIuC,QAAUvC,EAAIuC,QAAUE,GAAOzC,EAAIuC,aAExC,IAAK,IAAI/C,KAAK+C,EACbvC,EAAIuC,QAAQ/C,GAAK+C,EAAQ/C,GAE1B,OAAOQ,EAAIuC,QAQZ,SAASG,EAAe1C,EAAK2C,EAAaC,GACzC,IAAIC,KACJ,IAAK,IAAIrD,KAAKQ,EACb6C,EAAOC,KAAKC,mBAAmBH,EAAYpD,EAAEwD,cAAgBxD,GAAK,IAAMuD,mBAAmB/C,EAAIR,KAEhG,OAAUmD,IAA6C,IAA9BA,EAAYM,QAAQ,KAAqB,IAAN,KAAaJ,EAAOK,KAAK,KAUtF,SAASC,EAASjB,EAAKkB,GACtB,OAAOlB,EAAIC,QAAQkB,GAAY,SAAUnB,EAAKoB,GAC7C,IAAIC,EAAQH,EAAKE,GAEjB,QAAcvB,IAAVwB,EACH,MAAM,IAAIC,MAAM,kCAAoCtB,GAKrD,MAH4B,mBAAVqB,IACjBA,EAAQA,EAAMH,IAERG,IAYT,SAASN,EAAQQ,EAAOC,GACvB,IAAK,IAAIlE,EAAI,EAAGA,EAAIiE,EAAM5D,OAAQL,IACjC,GAAIiE,EAAMjE,KAAOkE,EAAM,OAAOlE,EAE/B,OAAQ,EAWT,SAASmE,EAAYC,GACpB,OAAOC,OAAO,SAAWD,IAASC,OAAO,MAAQD,IAASC,OAAO,KAAOD,GAMzE,SAASE,EAAa/D,GACrB,IAAIa,GAAQ,IAAImD,KACZC,EAAalC,KAAKR,IAAI,EAAG,IAAMV,EAAOqD,KAG1C,OADAA,GAAWrD,EAAOoD,EACXH,OAAO5C,WAAWlB,EAAIiE,GAa9B,SAASE,EAAiBnE,EAAIc,EAASsD,GACtC,IAAIA,GAAaC,KAAcN,EAG9B,OAAOM,GAAU/D,KAAKwD,OAAQ/D,EAAKC,EAAIc,IAFvCd,EAAGM,KAAKQ,GAQV,SAASwD,EAAgBC,GACpBA,GACHC,GAASlE,KAAKwD,OAAQS,GAsCxB,SAASE,KAuGT,SAASC,EAA2BC,GACnC,GAAiB,oBAANtF,GAAsBA,GAAMA,EAAEuF,MAAzC,CAEAD,EAAWE,GAAQF,GAAYA,GAAYA,GAE3C,IAAK,IAAIlF,EAAI,EAAGA,EAAIkF,EAAS7E,OAAQL,IAChCkF,EAASlF,KAAOJ,EAAEuF,MAAME,QAC3BC,QAAQC,KAAK,kIAE8B,IAAIvB,OAAQwB,QAkU1D,SAASC,EAAM9D,EAAG+D,EAAGlD,GAEpB3C,KAAK8B,EAAKa,EAAQF,KAAKE,MAAMb,GAAKA,EAElC9B,KAAK6F,EAAKlD,EAAQF,KAAKE,MAAMkD,GAAKA,EAiLnC,SAASC,EAAQhE,EAAG+D,EAAGlD,GACtB,OAAIb,aAAa8D,EACT9D,EAEJyD,GAAQzD,GACJ,IAAI8D,EAAM9D,EAAE,GAAIA,EAAE,SAEhBY,IAANZ,GAAyB,OAANA,EACfA,EAES,iBAANA,GAAkB,MAAOA,GAAK,MAAOA,EACxC,IAAI8D,EAAM9D,EAAEA,EAAGA,EAAE+D,GAElB,IAAID,EAAM9D,EAAG+D,EAAGlD,GA4BxB,SAASoD,EAAOC,EAAGC,GAClB,GAAKD,EAIL,IAAK,IAFDE,EAASD,GAAKD,EAAGC,GAAKD,EAEjB7F,EAAI,EAAGE,EAAM6F,EAAO1F,OAAQL,EAAIE,EAAKF,IAC7CH,KAAKC,OAAOiG,EAAO/F,IAsIrB,SAASgG,EAASH,EAAGC,GACpB,OAAKD,GAAKA,aAAaD,EACfC,EAED,IAAID,EAAOC,EAAGC,GAiCtB,SAASG,EAAaC,EAASC,GAC9B,GAAKD,EAIL,IAAK,IAFDE,EAAUD,GAAWD,EAASC,GAAWD,EAEpClG,EAAI,EAAGE,EAAMkG,EAAQ/F,OAAQL,EAAIE,EAAKF,IAC9CH,KAAKC,OAAOsG,EAAQpG,IA+MtB,SAASqG,EAAeR,EAAGC,GAC1B,OAAID,aAAaI,EACTJ,EAED,IAAII,EAAaJ,EAAGC,GA4B5B,SAASQ,EAAOC,EAAKC,EAAKC,GACzB,GAAIC,MAAMH,IAAQG,MAAMF,GACvB,MAAM,IAAIxC,MAAM,2BAA6BuC,EAAM,KAAOC,EAAM,KAKjE3G,KAAK0G,KAAOA,EAIZ1G,KAAK2G,KAAOA,OAIAjE,IAARkE,IACH5G,KAAK4G,KAAOA,GAoEd,SAASE,EAASd,EAAGC,EAAGc,GACvB,OAAIf,aAAaS,EACTT,EAEJT,GAAQS,IAAsB,iBAATA,EAAE,GACT,IAAbA,EAAExF,OACE,IAAIiG,EAAOT,EAAE,GAAIA,EAAE,GAAIA,EAAE,IAEhB,IAAbA,EAAExF,OACE,IAAIiG,EAAOT,EAAE,GAAIA,EAAE,IAEpB,UAEEtD,IAANsD,GAAyB,OAANA,EACfA,EAES,iBAANA,GAAkB,QAASA,EAC9B,IAAIS,EAAOT,EAAEU,IAAK,QAASV,EAAIA,EAAEW,IAAMX,EAAEgB,IAAKhB,EAAEY,UAE9ClE,IAANuD,EACI,KAED,IAAIQ,EAAOT,EAAGC,EAAGc,GAoOzB,SAASE,EAAejB,EAAGC,EAAGc,EAAG5E,GAChC,GAAIoD,GAAQS,GAMX,OAJAhG,KAAKkH,GAAKlB,EAAE,GACZhG,KAAKmH,GAAKnB,EAAE,GACZhG,KAAKoH,GAAKpB,EAAE,QACZhG,KAAKqH,GAAKrB,EAAE,IAGbhG,KAAKkH,GAAKlB,EACVhG,KAAKmH,GAAKlB,EACVjG,KAAKoH,GAAKL,EACV/G,KAAKqH,GAAKlF,EAwCX,SAASmF,EAAiBtB,EAAGC,EAAGc,EAAG5E,GAClC,OAAO,IAAI8E,EAAejB,EAAGC,EAAGc,EAAG5E,GAiCpC,SAASoF,EAAUhD,GAClB,OAAOiD,SAASC,gBAAgB,6BAA8BlD,GAM/D,SAASmD,EAAaC,EAAOC,GAC5B,IACAzH,EAAGC,EAAGC,EAAKwH,EAAM3B,EAAQ4B,EADrBjF,EAAM,GAGV,IAAK1C,EAAI,EAAGE,EAAMsH,EAAMnH,OAAQL,EAAIE,EAAKF,IAAK,CAG7C,IAAKC,EAAI,EAAGyH,GAFZ3B,EAASyB,EAAMxH,IAEWK,OAAQJ,EAAIyH,EAAMzH,IAC3C0H,EAAI5B,EAAO9F,GACXyC,IAAQzC,EAAI,IAAM,KAAO0H,EAAEhG,EAAI,IAAMgG,EAAEjC,EAIxChD,GAAO+E,EAAUG,GAAM,IAAM,IAAO,GAIrC,OAAOlF,GAAO,OAiJf,SAASmF,EAAkBnF,GAC1B,OAAOoF,UAAUC,UAAUC,cAAcvE,QAAQf,IAAQ,EAyD1D,SAASuF,EAAmBzH,EAAK0H,EAAMC,EAASrD,GAW/C,MAVa,eAAToD,EACHE,EAAiB5H,EAAK2H,EAASrD,GAEZ,cAAToD,EACVG,EAAgB7H,EAAK2H,EAASrD,GAEX,aAAToD,GACVI,EAAe9H,EAAK2H,EAASrD,GAGvBjF,KAGR,SAAS0I,EAAsB/H,EAAK0H,EAAMpD,GACzC,IAAIqD,EAAU3H,EAAI,YAAc0H,EAAOpD,GAavC,MAXa,eAAToD,EACH1H,EAAIgI,oBAAoBC,GAAcN,GAAS,GAE5B,cAATD,EACV1H,EAAIgI,oBAAoBE,GAAcP,GAAS,GAE5B,aAATD,IACV1H,EAAIgI,oBAAoBG,GAAYR,GAAS,GAC7C3H,EAAIgI,oBAAoBI,GAAgBT,GAAS,IAG3CtI,KAGR,SAASuI,EAAiB5H,EAAK2H,EAASrD,GACvC,IAAI+D,EAASvI,EAAK,SAAUwI,GAC3B,GAAsB,UAAlBA,EAAEC,aAA2BD,EAAEE,sBAAwBF,EAAEC,cAAgBD,EAAEE,qBAAsB,CAIpG,KAAIC,GAAexF,QAAQqF,EAAEI,OAAOC,SAAW,GAG9C,OAFAC,GAAeN,GAMjBO,EAAeP,EAAGX,KAGnB3H,EAAI,sBAAwBsE,GAAM+D,EAClCrI,EAAI8I,iBAAiBb,GAAcI,GAAQ,GAGtCU,KAEJlC,SAASmC,gBAAgBF,iBAAiBb,GAAcgB,GAAoB,GAC5EpC,SAASmC,gBAAgBF,iBAAiBZ,GAAcgB,GAAoB,GAC5ErC,SAASmC,gBAAgBF,iBAAiBX,GAAYgB,GAAkB,GACxEtC,SAASmC,gBAAgBF,iBAAiBV,GAAgBe,GAAkB,GAE5EJ,IAAsB,GAIxB,SAASE,EAAmBX,GAC3Bc,GAAUd,EAAEe,WAAaf,EACzBgB,KAGD,SAASJ,EAAmBZ,GACvBc,GAAUd,EAAEe,aACfD,GAAUd,EAAEe,WAAaf,GAI3B,SAASa,EAAiBb,UAClBc,GAAUd,EAAEe,WACnBC,KAGD,SAAST,EAAeP,EAAGX,GAC1BW,EAAEiB,WACF,IAAK,IAAI/J,KAAK4J,GACbd,EAAEiB,QAAQzG,KAAKsG,GAAU5J,IAE1B8I,EAAEkB,gBAAkBlB,GAEpBX,EAAQW,GAGT,SAAST,EAAgB7H,EAAK2H,EAASrD,GACtC,IAAImF,EAAS,SAAUnB,IAEjBA,EAAEC,cAAgBD,EAAEE,sBAA0C,UAAlBF,EAAEC,aAA0C,IAAdD,EAAEoB,UAEjFb,EAAeP,EAAGX,IAGnB3H,EAAI,qBAAuBsE,GAAMmF,EACjCzJ,EAAI8I,iBAAiBZ,GAAcuB,GAAQ,GAG5C,SAAS3B,EAAe9H,EAAK2H,EAASrD,GACrC,IAAIqF,EAAO,SAAUrB,GACpBO,EAAeP,EAAGX,IAGnB3H,EAAI,oBAAsBsE,GAAMqF,EAChC3J,EAAI8I,iBAAiBX,GAAYwB,GAAM,GACvC3J,EAAI8I,iBAAiBV,GAAgBuB,GAAM,GAY5C,SAASC,EAAqB5J,EAAK2H,EAASrD,GAK3C,SAASuF,EAAavB,GACrB,IAAIwB,EAEJ,GAAIC,GAAS,CACZ,IAAMC,IAA2B,UAAlB1B,EAAEC,YAA2B,OAC5CuB,EAAQR,QAERQ,EAAQxB,EAAEiB,QAAQ1J,OAGnB,KAAIiK,EAAQ,GAAZ,CAEA,IAAIG,EAAMlG,KAAKkG,MACXC,EAAQD,GAAOE,GAAQF,GAE3BG,EAAW9B,EAAEiB,QAAUjB,EAAEiB,QAAQ,GAAKjB,EACtC+B,EAAaH,EAAQ,GAAKA,GAASI,EACnCH,EAAOF,GAGR,SAASM,EAAWjC,GACnB,GAAI+B,IAAcD,EAASI,aAAc,CACxC,GAAIT,GAAS,CACZ,IAAMC,IAA2B,UAAlB1B,EAAEC,YAA2B,OAE5C,IACIkC,EAAMjL,EADNkL,KAGJ,IAAKlL,KAAK4K,EACTK,EAAOL,EAAS5K,GAChBkL,EAASlL,GAAKiL,GAAQA,EAAK3K,KAAO2K,EAAK3K,KAAKsK,GAAYK,EAEzDL,EAAWM,EAEZN,EAAS1C,KAAO,WAChBC,EAAQyC,GACRD,EAAO,MAxCT,IAAIA,EAAMC,EACNC,GAAY,EACZC,EAAQ,IAuDZ,OAbAtK,EAAI2K,GAAOC,GAActG,GAAMuF,EAC/B7J,EAAI2K,GAAOE,GAAYvG,GAAMiG,EAC7BvK,EAAI2K,GAAO,WAAarG,GAAMqD,EAE9B3H,EAAI8I,iBAAiB8B,GAAaf,GAAc,GAChD7J,EAAI8I,iBAAiB+B,GAAWN,GAAY,GAM5CvK,EAAI8I,iBAAiB,WAAYnB,GAAS,GAEnCtI,KAGR,SAASyL,EAAwB9K,EAAKsE,GACrC,IAAIyG,EAAa/K,EAAI2K,GAAOC,GAActG,GACtC0G,EAAWhL,EAAI2K,GAAOE,GAAYvG,GAClC2G,EAAWjL,EAAI2K,GAAO,WAAarG,GAQvC,OANAtE,EAAIgI,oBAAoB4C,GAAaG,GAAY,GACjD/K,EAAIgI,oBAAoB6C,GAAWG,GAAU,GACxChB,IACJhK,EAAIgI,oBAAoB,WAAYiD,GAAU,GAGxC5L,KAqCR,SAAS6L,EAAI5G,GACZ,MAAqB,iBAAPA,EAAkBuC,SAASsE,eAAe7G,GAAMA,EAM/D,SAAS8G,EAAS1H,EAAI2H,GACrB,IAAI9H,EAAQG,EAAG2H,MAAMA,IAAW3H,EAAG4H,cAAgB5H,EAAG4H,aAAaD,GAEnE,KAAM9H,GAAmB,SAAVA,IAAqBsD,SAAS0E,YAAa,CACzD,IAAIC,EAAM3E,SAAS0E,YAAYE,iBAAiB/H,EAAI,MACpDH,EAAQiI,EAAMA,EAAIH,GAAS,KAE5B,MAAiB,SAAV9H,EAAmB,KAAOA,EAKlC,SAASmI,EAAS/C,EAASgD,EAAWC,GACrC,IAAIlI,EAAKmD,SAASgF,cAAclD,GAMhC,OALAjF,EAAGiI,UAAYA,GAAa,GAExBC,GACHA,EAAUE,YAAYpI,GAEhBA,EAKR,SAASqI,EAAOrI,GACf,IAAIsI,EAAStI,EAAGuI,WACZD,GACHA,EAAOE,YAAYxI,GAMrB,SAASyI,EAAMzI,GACd,KAAOA,EAAG0I,YACT1I,EAAGwI,YAAYxI,EAAG0I,YAMpB,SAASC,EAAQ3I,GAChB,IAAIsI,EAAStI,EAAGuI,WACZD,EAAOM,YAAc5I,GACxBsI,EAAOF,YAAYpI,GAMrB,SAAS6I,EAAO7I,GACf,IAAIsI,EAAStI,EAAGuI,WACZD,EAAOI,aAAe1I,GACzBsI,EAAOQ,aAAa9I,EAAIsI,EAAOI,YAMjC,SAASK,EAAS/I,EAAIE,GACrB,QAAqB7B,IAAjB2B,EAAGgJ,UACN,OAAOhJ,EAAGgJ,UAAUC,SAAS/I,GAE9B,IAAI+H,EAAYiB,GAASlJ,GACzB,OAAOiI,EAAU9L,OAAS,GAAK,IAAIgN,OAAO,UAAYjJ,EAAO,WAAWkJ,KAAKnB,GAK9E,SAASoB,EAASrJ,EAAIE,GACrB,QAAqB7B,IAAjB2B,EAAGgJ,UAEN,IAAK,IADDM,EAAU5K,EAAWwB,GAChBpE,EAAI,EAAGE,EAAMsN,EAAQnN,OAAQL,EAAIE,EAAKF,IAC9CkE,EAAGgJ,UAAUO,IAAID,EAAQxN,SAEpB,IAAKiN,EAAS/I,EAAIE,GAAO,CAC/B,IAAI+H,EAAYiB,GAASlJ,GACzBwJ,GAASxJ,GAAKiI,EAAYA,EAAY,IAAM,IAAM/H,IAMpD,SAASuJ,GAAYzJ,EAAIE,QACH7B,IAAjB2B,EAAGgJ,UACNhJ,EAAGgJ,UAAUX,OAAOnI,GAEpBsJ,GAASxJ,EAAIzB,GAAM,IAAM2K,GAASlJ,GAAM,KAAKvB,QAAQ,IAAMyB,EAAO,IAAK,OAMzE,SAASsJ,GAASxJ,EAAIE,QACQ7B,IAAzB2B,EAAGiI,UAAUyB,QAChB1J,EAAGiI,UAAY/H,EAGfF,EAAGiI,UAAUyB,QAAUxJ,EAMzB,SAASgJ,GAASlJ,GACjB,YAAgC3B,IAAzB2B,EAAGiI,UAAUyB,QAAwB1J,EAAGiI,UAAYjI,EAAGiI,UAAUyB,QAMzE,SAASC,GAAW3J,EAAIH,GACnB,YAAaG,EAAG2H,MACnB3H,EAAG2H,MAAMiC,QAAU/J,EACT,WAAYG,EAAG2H,OACzBkC,GAAc7J,EAAIH,GAIpB,SAASgK,GAAc7J,EAAIH,GAC1B,IAAIiK,GAAS,EACTC,EAAa,mCAGjB,IACCD,EAAS9J,EAAGgK,QAAQC,KAAKF,GACxB,MAAOnF,GAGR,GAAc,IAAV/E,EAAe,OAGpBA,EAAQzB,KAAKE,MAAc,IAARuB,GAEfiK,GACHA,EAAOI,QAAqB,MAAVrK,EAClBiK,EAAOK,QAAUtK,GAEjBG,EAAG2H,MAAMmC,QAAU,WAAaC,EAAa,YAAclK,EAAQ,IAQrE,SAASuK,GAASC,GAGjB,IAAK,IAFD1C,EAAQxE,SAASmC,gBAAgBqC,MAE5B7L,EAAI,EAAGA,EAAIuO,EAAMlO,OAAQL,IACjC,GAAIuO,EAAMvO,KAAM6L,EACf,OAAO0C,EAAMvO,GAGf,OAAO,EAOR,SAASwO,GAAatK,EAAIuK,EAAQC,GACjC,IAAIC,EAAMF,GAAU,IAAIhJ,EAAM,EAAG,GAEjCvB,EAAG2H,MAAM+C,KACPC,GACA,aAAeF,EAAIhN,EAAI,MAAQgN,EAAIjJ,EAAI,MACvC,eAAiBiJ,EAAIhN,EAAI,MAAQgN,EAAIjJ,EAAI,UACzCgJ,EAAQ,UAAYA,EAAQ,IAAM,IAOrC,SAASI,GAAY5K,EAAI6K,GAGxB7K,EAAG8K,aAAeD,EAGdE,GACHT,GAAatK,EAAI6K,IAEjB7K,EAAG2H,MAAMqD,KAAOH,EAAMpN,EAAI,KAC1BuC,EAAG2H,MAAMsD,IAAMJ,EAAMrJ,EAAI,MAM3B,SAAS0J,GAAYlL,GAIpB,OAAOA,EAAG8K,cAAgB,IAAIvJ,EAAM,EAAG,GA2CxC,SAAS4J,KACRC,GAAGjL,OAAQ,YAAa+E,IAKzB,SAASmG,KACRC,GAAInL,OAAQ,YAAa+E,IAU1B,SAASqG,GAAeC,GACvB,MAA6B,IAAtBA,EAAQC,UACdD,EAAUA,EAAQjD,WAEdiD,EAAQ7D,QACb+D,KACAC,GAAkBH,EAClBI,GAAgBJ,EAAQ7D,MAAMkE,QAC9BL,EAAQ7D,MAAMkE,QAAU,OACxBT,GAAGjL,OAAQ,UAAWuL,KAKvB,SAASA,KACHC,KACLA,GAAgBhE,MAAMkE,QAAUD,GAChCD,QAAkBtN,EAClBuN,QAAgBvN,EAChBiN,GAAInL,OAAQ,UAAWuL,KAKxB,SAASI,GAAmBN,GAC3B,GACCA,EAAUA,EAAQjD,mBACRiD,EAAQO,aAAgBP,EAAQQ,cAAiBR,IAAYrI,SAAS8I,OACjF,OAAOT,EAOR,SAASU,GAASV,GACjB,IAAIW,EAAOX,EAAQY,wBAEnB,OACC3O,EAAG0O,EAAKE,MAAQb,EAAQO,aAAe,EACvCvK,EAAG2K,EAAKG,OAASd,EAAQQ,cAAgB,EACzCO,mBAAoBJ,GAoDtB,SAASf,GAAG9O,EAAKkQ,EAAOnQ,EAAIc,GAE3B,GAAqB,iBAAVqP,EACV,IAAK,IAAIxI,KAAQwI,EAChBC,GAAOnQ,EAAK0H,EAAMwI,EAAMxI,GAAO3H,QAKhC,IAAK,IAAIP,EAAI,EAAGE,GAFhBwQ,EAAQ9N,EAAW8N,IAESrQ,OAAQL,EAAIE,EAAKF,IAC5C2Q,GAAOnQ,EAAKkQ,EAAM1Q,GAAIO,EAAIc,GAI5B,OAAOxB,KAaR,SAAS2P,GAAIhP,EAAKkQ,EAAOnQ,EAAIc,GAE5B,GAAqB,iBAAVqP,EACV,IAAK,IAAIxI,KAAQwI,EAChBE,GAAUpQ,EAAK0H,EAAMwI,EAAMxI,GAAO3H,QAE7B,GAAImQ,EAGV,IAAK,IAAI1Q,EAAI,EAAGE,GAFhBwQ,EAAQ9N,EAAW8N,IAESrQ,OAAQL,EAAIE,EAAKF,IAC5C4Q,GAAUpQ,EAAKkQ,EAAM1Q,GAAIO,EAAIc,OAExB,CACN,IAAK,IAAIpB,KAAKO,EAAIqQ,IACjBD,GAAUpQ,EAAKP,EAAGO,EAAIqQ,IAAW5Q,WAE3BO,EAAIqQ,IAGZ,OAAOhR,KAGR,SAAS8Q,GAAOnQ,EAAK0H,EAAM3H,EAAIc,GAC9B,IAAIyD,EAAKoD,EAAOlH,EAAMT,IAAOc,EAAU,IAAML,EAAMK,GAAW,IAE9D,GAAIb,EAAIqQ,KAAcrQ,EAAIqQ,IAAW/L,GAAO,OAAOjF,KAEnD,IAAIsI,EAAU,SAAUW,GACvB,OAAOvI,EAAGM,KAAKQ,GAAWb,EAAKsI,GAAKzE,OAAOyM,QAGxCC,EAAkB5I,EAElBoC,IAAqC,IAA1BrC,EAAKzE,QAAQ,SAE3BwE,EAAmBzH,EAAK0H,EAAMC,EAASrD,IAE7BkM,IAAmB,aAAT9I,IAAwBkC,GAChCG,IAAW0G,GAKb,qBAAsBzQ,EAEnB,eAAT0H,EACH1H,EAAI8I,iBAAiB,YAAa9I,EAAM,QAAU,aAAc2H,GAAS,GAErD,eAATD,GAAoC,eAATA,GACtCC,EAAU,SAAUW,GACnBA,EAAIA,GAAKzE,OAAOyM,MACZI,GAAiB1Q,EAAKsI,IACzBiI,EAAgBjI,IAGlBtI,EAAI8I,iBAA0B,eAATpB,EAAwB,YAAc,WAAYC,GAAS,KAGnE,UAATD,GAAoBiJ,KACvBhJ,EAAU,SAAUW,GACnBsI,GAAYtI,EAAGiI,KAGjBvQ,EAAI8I,iBAAiBpB,EAAMC,GAAS,IAG3B,gBAAiB3H,GAC3BA,EAAI6Q,YAAY,KAAOnJ,EAAMC,GA1B7BiC,EAAqB5J,EAAK2H,EAASrD,GA6BpCtE,EAAIqQ,IAAarQ,EAAIqQ,QACrBrQ,EAAIqQ,IAAW/L,GAAMqD,EAGtB,SAASyI,GAAUpQ,EAAK0H,EAAM3H,EAAIc,GAEjC,IAAIyD,EAAKoD,EAAOlH,EAAMT,IAAOc,EAAU,IAAML,EAAMK,GAAW,IAC1D8G,EAAU3H,EAAIqQ,KAAcrQ,EAAIqQ,IAAW/L,GAE/C,IAAKqD,EAAW,OAAOtI,KAEnB0K,IAAqC,IAA1BrC,EAAKzE,QAAQ,SAC3B8E,EAAsB/H,EAAK0H,EAAMpD,IAEvBkM,IAAmB,aAAT9I,IAAwBoD,GAChCf,IAAW0G,GAGb,wBAAyBzQ,EAEtB,eAAT0H,EACH1H,EAAIgI,oBAAoB,YAAahI,EAAM,QAAU,aAAc2H,GAAS,GAG5E3H,EAAIgI,oBACM,eAATN,EAAwB,YACf,eAATA,EAAwB,WAAaA,EAAMC,GAAS,GAG5C,gBAAiB3H,GAC3BA,EAAI8Q,YAAY,KAAOpJ,EAAMC,GAd7BmD,EAAwB9K,EAAKsE,GAiB9BtE,EAAIqQ,IAAW/L,GAAM,KAUtB,SAASyM,GAAgBzI,GAWxB,OATIA,EAAEyI,gBACLzI,EAAEyI,kBACQzI,EAAE0I,cACZ1I,EAAE0I,cAAcC,UAAW,EAE3B3I,EAAEkC,cAAe,EAElB0G,GAAQ5I,GAEDjJ,KAKR,SAAS8R,GAAyBzN,GAEjC,OADAyM,GAAOzM,EAAI,aAAcqN,IAClB1R,KAMR,SAAS+R,GAAwB1N,GAGhC,OAFAoL,GAAGpL,EAAI,gCAAiCqN,IACxCZ,GAAOzM,EAAI,QAAS2N,IACbhS,KAQR,SAASuJ,GAAeN,GAMvB,OALIA,EAAEM,eACLN,EAAEM,iBAEFN,EAAEgJ,aAAc,EAEVjS,KAKR,SAASkS,GAAKjJ,GAGb,OAFAM,GAAeN,GACfyI,GAAgBzI,GACTjJ,KAMR,SAASmS,GAAiBlJ,EAAGsD,GAC5B,IAAKA,EACJ,OAAO,IAAI3G,EAAMqD,EAAEmJ,QAASnJ,EAAEoJ,SAG/B,IAAIxD,EAAQ0B,GAAShE,GACjBqC,EAASC,EAAM+B,mBAEnB,OAAO,IAAIhL,GAGTqD,EAAEmJ,QAAUxD,EAAOS,MAAQR,EAAM/M,EAAIyK,EAAU+F,YAC/CrJ,EAAEoJ,QAAUzD,EAAOU,KAAOT,EAAMhJ,EAAI0G,EAAUgG,WAejD,SAASC,GAAcvJ,GACtB,OAAO,GAASA,EAAEwJ,YAAc,EACxBxJ,EAAEyJ,QAA0B,IAAhBzJ,EAAE0J,WAAoB1J,EAAEyJ,OAASE,GAC7C3J,EAAEyJ,QAA0B,IAAhBzJ,EAAE0J,UAA+B,IAAX1J,EAAEyJ,OACpCzJ,EAAEyJ,QAA0B,IAAhBzJ,EAAE0J,UAA+B,IAAX1J,EAAEyJ,OACpCzJ,EAAE4J,QAAU5J,EAAE6J,OAAU,EACzB7J,EAAE8J,YAAc9J,EAAEwJ,aAAexJ,EAAE8J,YAAc,EAChD9J,EAAE+J,QAAUvQ,KAAKwQ,IAAIhK,EAAE+J,QAAU,MAAqB,IAAX/J,EAAE+J,OAC9C/J,EAAE+J,OAAS/J,EAAE+J,QAAU,MAAQ,GAC/B,EAKR,SAAShB,GAAS/I,GAEjBiK,GAAWjK,EAAEZ,OAAQ,EAGtB,SAASwJ,GAAQ5I,GAChB,IAAIkK,EAASD,GAAWjK,EAAEZ,MAG1B,OADA6K,GAAWjK,EAAEZ,OAAQ,EACd8K,EAIR,SAAS9B,GAAiBhN,EAAI4E,GAE7B,IAAImK,EAAUnK,EAAEoK,cAEhB,IAAKD,EAAW,OAAO,EAEvB,IACC,KAAOA,GAAYA,IAAY/O,GAC9B+O,EAAUA,EAAQxG,WAElB,MAAO0G,GACR,OAAO,EAER,OAAQF,IAAY/O,EAMrB,SAASkN,GAAYtI,EAAGX,GACvB,IAAIiL,EAAatK,EAAEsK,WAActK,EAAE0I,eAAiB1I,EAAE0I,cAAc4B,UAChEC,EAAUC,IAAcF,EAAYE,GAOnCD,GAAWA,EAAU,KAAOA,EAAU,KAASvK,EAAEI,OAAOqK,kBAAoBzK,EAAE0K,WAClFzB,GAAKjJ,IAGNwK,GAAYF,EAEZjL,EAAQW,IAkgGT,SAAS2K,GAAS1N,EAAQ2N,GACzB,IAAKA,IAAc3N,EAAO1F,OACzB,OAAO0F,EAAOtF,QAGf,IAAIkT,EAAcD,EAAYA,EAQ9B,OALI3N,EAAS6N,GAAc7N,EAAQ4N,GAG/B5N,EAAS8N,GAAY9N,EAAQ4N,GAOlC,SAASG,GAAuBnM,EAAGoM,EAAIC,GACtC,OAAO1R,KAAK2R,KAAKC,GAAyBvM,EAAGoM,EAAIC,GAAI,IAUtD,SAASH,GAAY9N,EAAQ4N,GAE5B,IAAIzT,EAAM6F,EAAO1F,OAEb8T,EAAU,WADgBC,iBAAe7R,EAAY,GAAK6R,WAAa1T,OACxCR,GAE/BiU,EAAQ,GAAKA,EAAQjU,EAAM,GAAK,EAEpCmU,GAAgBtO,EAAQoO,EAASR,EAAa,EAAGzT,EAAM,GAEvD,IAAIF,EACAsU,KAEJ,IAAKtU,EAAI,EAAGA,EAAIE,EAAKF,IAChBmU,EAAQnU,IACXsU,EAAUhR,KAAKyC,EAAO/F,IAIxB,OAAOsU,EAGR,SAASD,GAAgBtO,EAAQoO,EAASR,EAAaY,EAAO5J,GAE7D,IACA6J,EAAOxU,EAAGyU,EADNC,EAAY,EAGhB,IAAK1U,EAAIuU,EAAQ,EAAGvU,GAAK2K,EAAO,EAAG3K,KAClCyU,EAASP,GAAyBnO,EAAO/F,GAAI+F,EAAOwO,GAAQxO,EAAO4E,IAAO,IAE7D+J,IACZF,EAAQxU,EACR0U,EAAYD,GAIVC,EAAYf,IACfQ,EAAQK,GAAS,EAEjBH,GAAgBtO,EAAQoO,EAASR,EAAaY,EAAOC,GACrDH,GAAgBtO,EAAQoO,EAASR,EAAaa,EAAO7J,IAKvD,SAASiJ,GAAc7N,EAAQ4N,GAG9B,IAAK,IAFDgB,GAAiB5O,EAAO,IAEnB/F,EAAI,EAAG4U,EAAO,EAAG1U,EAAM6F,EAAO1F,OAAQL,EAAIE,EAAKF,IACnD6U,GAAQ9O,EAAO/F,GAAI+F,EAAO6O,IAASjB,IACtCgB,EAAcrR,KAAKyC,EAAO/F,IAC1B4U,EAAO5U,GAMT,OAHI4U,EAAO1U,EAAM,GAChByU,EAAcrR,KAAKyC,EAAO7F,EAAM,IAE1ByU,EAUR,SAASG,GAAYjP,EAAGC,EAAGiP,EAAQC,EAAaxS,GAC/C,IAGIyS,EAAStN,EAAGuN,EAHZC,EAAQH,EAAcI,GAAYC,GAAYxP,EAAGkP,GACjDO,EAAQD,GAAYvP,EAAGiP,GAO3B,IAFIK,GAAYE,IAEH,CAEZ,KAAMH,EAAQG,GACb,OAAQzP,EAAGC,GAIZ,GAAIqP,EAAQG,EACX,OAAO,EAMRJ,EAAUG,GADV1N,EAAI4N,GAAqB1P,EAAGC,EAD5BmP,EAAUE,GAASG,EACqBP,EAAQvS,GACvBuS,GAErBE,IAAYE,GACftP,EAAI8B,EACJwN,EAAQD,IAERpP,EAAI6B,EACJ2N,EAAQJ,IAKX,SAASK,GAAqB1P,EAAGC,EAAG0P,EAAMT,EAAQvS,GACjD,IAIIb,EAAG+D,EAJH+P,EAAK3P,EAAEnE,EAAIkE,EAAElE,EACb+T,EAAK5P,EAAEJ,EAAIG,EAAEH,EACb3D,EAAMgT,EAAOhT,IACbD,EAAMiT,EAAOjT,IAoBjB,OAjBW,EAAP0T,GACH7T,EAAIkE,EAAElE,EAAI8T,GAAM3T,EAAI4D,EAAIG,EAAEH,GAAKgQ,EAC/BhQ,EAAI5D,EAAI4D,GAES,EAAP8P,GACV7T,EAAIkE,EAAElE,EAAI8T,GAAM1T,EAAI2D,EAAIG,EAAEH,GAAKgQ,EAC/BhQ,EAAI3D,EAAI2D,GAES,EAAP8P,GACV7T,EAAIG,EAAIH,EACR+D,EAAIG,EAAEH,EAAIgQ,GAAM5T,EAAIH,EAAIkE,EAAElE,GAAK8T,GAEd,EAAPD,IACV7T,EAAII,EAAIJ,EACR+D,EAAIG,EAAEH,EAAIgQ,GAAM3T,EAAIJ,EAAIkE,EAAElE,GAAK8T,GAGzB,IAAIhQ,EAAM9D,EAAG+D,EAAGlD,GAGxB,SAAS6S,GAAY1N,EAAGoN,GACvB,IAAIS,EAAO,EAcX,OAZI7N,EAAEhG,EAAIoT,EAAOhT,IAAIJ,EACpB6T,GAAQ,EACE7N,EAAEhG,EAAIoT,EAAOjT,IAAIH,IAC3B6T,GAAQ,GAGL7N,EAAEjC,EAAIqP,EAAOhT,IAAI2D,EACpB8P,GAAQ,EACE7N,EAAEjC,EAAIqP,EAAOjT,IAAI4D,IAC3B8P,GAAQ,GAGFA,EAIR,SAASX,GAAQd,EAAIC,GACpB,IAAIyB,EAAKzB,EAAGrS,EAAIoS,EAAGpS,EACf+T,EAAK1B,EAAGtO,EAAIqO,EAAGrO,EACnB,OAAO+P,EAAKA,EAAKC,EAAKA,EAIvB,SAASxB,GAAyBvM,EAAGoM,EAAIC,EAAIS,GAC5C,IAKIkB,EALAhU,EAAIoS,EAAGpS,EACP+D,EAAIqO,EAAGrO,EACP+P,EAAKzB,EAAGrS,EAAIA,EACZ+T,EAAK1B,EAAGtO,EAAIA,EACZkQ,EAAMH,EAAKA,EAAKC,EAAKA,EAkBzB,OAfIE,EAAM,KACTD,IAAMhO,EAAEhG,EAAIA,GAAK8T,GAAM9N,EAAEjC,EAAIA,GAAKgQ,GAAME,GAEhC,GACPjU,EAAIqS,EAAGrS,EACP+D,EAAIsO,EAAGtO,GACGiQ,EAAI,IACdhU,GAAK8T,EAAKE,EACVjQ,GAAKgQ,EAAKC,IAIZF,EAAK9N,EAAEhG,EAAIA,EACX+T,EAAK/N,EAAEjC,EAAIA,EAEJ+O,EAASgB,EAAKA,EAAKC,EAAKA,EAAK,IAAIjQ,EAAM9D,EAAG+D,GAMlD,SAASmQ,GAAOzP,GACf,OAAQhB,GAAQgB,EAAQ,KAAiC,iBAAlBA,EAAQ,GAAG,SAA4C,IAAlBA,EAAQ,GAAG,GAGxF,SAAS0P,GAAM1P,GAEd,OADAd,QAAQC,KAAK,kEACNsQ,GAAOzP,GA2Bf,SAAS2P,GAAYhQ,EAAQgP,EAAQvS,GACpC,IAAIwT,EAEAhW,EAAGC,EAAGgW,EACNpQ,EAAGC,EACH5F,EAAKsK,EAAM7C,EAHXuO,GAAS,EAAG,EAAG,EAAG,GAKtB,IAAKlW,EAAI,EAAGE,EAAM6F,EAAO1F,OAAQL,EAAIE,EAAKF,IACzC+F,EAAO/F,GAAGmW,MAAQd,GAAYtP,EAAO/F,GAAI+U,GAI1C,IAAKkB,EAAI,EAAGA,EAAI,EAAGA,IAAK,CAIvB,IAHAzL,EAAO0L,EAAMD,GACbD,KAEKhW,EAAI,EAAwBC,GAArBC,EAAM6F,EAAO1F,QAAkB,EAAGL,EAAIE,EAAKD,EAAID,IAC1D6F,EAAIE,EAAO/F,GACX8F,EAAIC,EAAO9F,GAGL4F,EAAEsQ,MAAQ3L,EAUH1E,EAAEqQ,MAAQ3L,KACtB7C,EAAI4N,GAAqBzP,EAAGD,EAAG2E,EAAMuK,EAAQvS,IAC3C2T,MAAQd,GAAY1N,EAAGoN,GACzBiB,EAAc1S,KAAKqE,KAXf7B,EAAEqQ,MAAQ3L,KACb7C,EAAI4N,GAAqBzP,EAAGD,EAAG2E,EAAMuK,EAAQvS,IAC3C2T,MAAQd,GAAY1N,EAAGoN,GACzBiB,EAAc1S,KAAKqE,IAEpBqO,EAAc1S,KAAKuC,IASrBE,EAASiQ,EAGV,OAAOjQ,EA83ER,SAASqQ,GAAgBC,EAAStT,GAEjC,IAKIuT,EAAQlQ,EAASpG,EAAGE,EALpBqW,EAA4B,YAAjBF,EAAQnO,KAAqBmO,EAAQE,SAAWF,EAC3DG,EAASD,EAAWA,EAASE,YAAc,KAC3CC,KACAC,EAAe5T,GAAWA,EAAQ4T,aAClCC,EAAkB7T,GAAWA,EAAQ8T,gBAAkBA,GAG3D,IAAKL,IAAWD,EACf,OAAO,KAGR,OAAQA,EAASrO,MACjB,IAAK,QAEJ,OADAoO,EAASM,EAAgBJ,GAClBG,EAAeA,EAAaN,EAASC,GAAU,IAAIQ,GAAOR,GAElE,IAAK,aACJ,IAAKtW,EAAI,EAAGE,EAAMsW,EAAOnW,OAAQL,EAAIE,EAAKF,IACzCsW,EAASM,EAAgBJ,EAAOxW,IAChC0W,EAAOpT,KAAKqT,EAAeA,EAAaN,EAASC,GAAU,IAAIQ,GAAOR,IAEvE,OAAO,IAAIS,GAAaL,GAEzB,IAAK,aACL,IAAK,kBAEJ,OADAtQ,EAAU4Q,GAAgBR,EAA0B,eAAlBD,EAASrO,KAAwB,EAAI,EAAG0O,GACnE,IAAIK,GAAS7Q,EAASrD,GAE9B,IAAK,UACL,IAAK,eAEJ,OADAqD,EAAU4Q,GAAgBR,EAA0B,YAAlBD,EAASrO,KAAqB,EAAI,EAAG0O,GAChE,IAAIM,GAAQ9Q,EAASrD,GAE7B,IAAK,qBACJ,IAAK/C,EAAI,EAAGE,EAAMqW,EAASY,WAAW9W,OAAQL,EAAIE,EAAKF,IAAK,CAC3D,IAAIoX,EAAQhB,IACXG,SAAUA,EAASY,WAAWnX,GAC9BkI,KAAM,UACNmP,WAAYhB,EAAQgB,YAClBtU,GAECqU,GACHV,EAAOpT,KAAK8T,GAGd,OAAO,IAAIL,GAAaL,GAEzB,QACC,MAAM,IAAI1S,MAAM,4BAOlB,SAAS6S,GAAeL,GACvB,OAAO,IAAIlQ,EAAOkQ,EAAO,GAAIA,EAAO,GAAIA,EAAO,IAOhD,SAASQ,GAAgBR,EAAQc,EAAYV,GAG5C,IAAK,IAAgCN,EAFjClQ,KAEKpG,EAAI,EAAGE,EAAMsW,EAAOnW,OAAgBL,EAAIE,EAAKF,IACrDsW,EAASgB,EACRN,GAAgBR,EAAOxW,GAAIsX,EAAa,EAAGV,IAC1CA,GAAmBC,IAAgBL,EAAOxW,IAE5CoG,EAAQ9C,KAAKgT,GAGd,OAAOlQ,EAKR,SAASmR,GAAejB,EAAQkB,GAE/B,OADAA,EAAiC,iBAAdA,EAAyBA,EAAY,OAClCjV,IAAf+T,EAAO7P,KACZvE,EAAUoU,EAAO9P,IAAKgR,GAAYtV,EAAUoU,EAAO/P,IAAKiR,GAAYtV,EAAUoU,EAAO7P,IAAK+Q,KAC1FtV,EAAUoU,EAAO9P,IAAKgR,GAAYtV,EAAUoU,EAAO/P,IAAKiR,IAM3D,SAASC,GAAgBrR,EAASkR,EAAY7P,EAAQ+P,GAGrD,IAAK,IAFDhB,KAEKxW,EAAI,EAAGE,EAAMkG,EAAQ/F,OAAQL,EAAIE,EAAKF,IAC9CwW,EAAOlT,KAAKgU,EACXG,GAAgBrR,EAAQpG,GAAIsX,EAAa,EAAG7P,EAAQ+P,GACpDD,GAAenR,EAAQpG,GAAIwX,IAO7B,OAJKF,GAAc7P,GAClB+O,EAAOlT,KAAKkT,EAAO,IAGbA,EAGR,SAASkB,GAAWN,EAAOO,GAC1B,OAAOP,EAAMQ,QACZ9X,KAAWsX,EAAMQ,SAAUrB,SAAUoB,IACrCE,GAAUF,GAKZ,SAASE,GAAUxB,GAClB,MAAqB,YAAjBA,EAAQnO,MAAuC,sBAAjBmO,EAAQnO,KAClCmO,GAIPnO,KAAM,UACNmP,cACAd,SAAUF,GA+HZ,SAASyB,GAAQzB,EAAStT,GACzB,OAAO,IAAIgV,GAAQ1B,EAAStT,GA+pF7B,SAASiV,GAAUC,EAAKlV,GACvB,OAAO,IAAImV,GAAUD,EAAKlV,GA2tB3B,SAASoV,GAASpV,GACjB,OAAOqV,GAAS,IAAIC,GAAOtV,GAAW,KA+VvC,SAASuV,GAAMvV,GACd,OAAO6E,IAAO2Q,GAAM,IAAIC,GAAIzV,GAAW,KA16YxC,IAQI0V,GAASC,OAAOD,OACpBC,OAAOD,OAAS,SAAUjY,GAAO,OAAOA,GAkBxC,IAAIyC,GAASyV,OAAOzV,QAAU,WAC7B,SAAS0V,KACT,OAAO,SAAUC,GAEhB,OADAD,EAAEhY,UAAYiY,EACP,IAAID,GAJiB,GA2B1BzX,GAAS,EAyGT2C,GAAa,qBAuBbuB,GAAU1E,MAAM0E,SAAW,SAAU5E,GACxC,MAAgD,mBAAxCkY,OAAO/X,UAAUkY,SAAShY,KAAKL,IAgBpCsY,GAAgB,6DAQhBrU,GAAW,EAWXG,GAAYP,OAAO0U,uBAAyB5U,EAAY,0BAA4BG,EACpFS,GAAWV,OAAO2U,sBAAwB7U,EAAY,yBACxDA,EAAY,gCAAkC,SAAUW,GAAMT,OAAO4U,aAAanU,IAyBhFoU,IAAQR,OAAOD,QAAUC,SAC5BD,OAAQA,GACR3Y,OAAQA,EACRmD,OAAQA,GACR3C,KAAMA,EACNY,OAAQA,GACRF,MAAOA,EACPG,SAAUA,EACVO,QAASA,EACTO,QAASA,EACTC,UAAWA,EACXO,KAAMA,EACNG,WAAYA,EACZE,WAAYA,EACZI,eAAgBA,EAChBS,SAAUA,EACVyB,QAASA,GACT3B,QAASA,EACTqV,cAAeA,GACflU,UAAWA,GACXG,SAAUA,GACVL,iBAAkBA,EAClBG,gBAAiBA,IAalBG,EAAMlF,OAAS,SAAUyO,GAKxB,IAAI4K,EAAW,WAGVtZ,KAAKuZ,YACRvZ,KAAKuZ,WAAWxY,MAAMf,KAAMO,WAI7BP,KAAKwZ,iBAGFC,EAAcH,EAASI,UAAY1Z,KAAKc,UAExCiY,EAAQ3V,GAAOqW,GACnBV,EAAMY,YAAcL,EAEpBA,EAASxY,UAAYiY,EAGrB,IAAK,IAAI5Y,KAAKH,KACTA,KAAKmD,eAAehD,IAAY,cAANA,GAA2B,cAANA,IAClDmZ,EAASnZ,GAAKH,KAAKG,IA2CrB,OAtCIuO,EAAMkL,UACT3Z,EAAOqZ,EAAU5K,EAAMkL,gBAChBlL,EAAMkL,SAIVlL,EAAMrJ,WACTD,EAA2BsJ,EAAMrJ,UACjCpF,EAAOc,MAAM,MAAOgY,GAAO7X,OAAOwN,EAAMrJ,kBACjCqJ,EAAMrJ,UAIV0T,EAAM7V,UACTwL,EAAMxL,QAAUjD,EAAOmD,GAAO2V,EAAM7V,SAAUwL,EAAMxL,UAIrDjD,EAAO8Y,EAAOrK,GAEdqK,EAAMc,cAGNd,EAAMS,cAAgB,WAErB,IAAIxZ,KAAK8Z,iBAAT,CAEIL,EAAYD,eACfC,EAAYD,cAAcxY,KAAKhB,MAGhCA,KAAK8Z,kBAAmB,EAExB,IAAK,IAAI3Z,EAAI,EAAGE,EAAM0Y,EAAMc,WAAWrZ,OAAQL,EAAIE,EAAKF,IACvD4Y,EAAMc,WAAW1Z,GAAGa,KAAKhB,QAIpBsZ,GAMRnU,EAAM4U,QAAU,SAAUrL,GAEzB,OADAzO,EAAOD,KAAKc,UAAW4N,GAChB1O,MAKRmF,EAAM6U,aAAe,SAAU9W,GAE9B,OADAjD,EAAOD,KAAKc,UAAUoC,QAASA,GACxBlD,MAKRmF,EAAM8U,YAAc,SAAUvZ,GAC7B,IAAIO,EAAOJ,MAAMC,UAAUF,MAAMI,KAAKT,UAAW,GAE7C2Z,EAAqB,mBAAPxZ,EAAoBA,EAAK,WAC1CV,KAAKU,GAAIK,MAAMf,KAAMiB,IAKtB,OAFAjB,KAAKc,UAAU+Y,WAAa7Z,KAAKc,UAAU+Y,eAC3C7Z,KAAKc,UAAU+Y,WAAWpW,KAAKyW,GACxBla,MA0CR,IAAIwF,IAQHiK,GAAI,SAAUoB,EAAOnQ,EAAIc,GAGxB,GAAqB,iBAAVqP,EACV,IAAK,IAAIxI,KAAQwI,EAGhB7Q,KAAKma,IAAI9R,EAAMwI,EAAMxI,GAAO3H,QAO7B,IAAK,IAAIP,EAAI,EAAGE,GAFhBwQ,EAAQ9N,EAAW8N,IAESrQ,OAAQL,EAAIE,EAAKF,IAC5CH,KAAKma,IAAItJ,EAAM1Q,GAAIO,EAAIc,GAIzB,OAAOxB,MAcR2P,IAAK,SAAUkB,EAAOnQ,EAAIc,GAEzB,GAAKqP,EAIE,GAAqB,iBAAVA,EACjB,IAAK,IAAIxI,KAAQwI,EAChB7Q,KAAKoa,KAAK/R,EAAMwI,EAAMxI,GAAO3H,QAM9B,IAAK,IAAIP,EAAI,EAAGE,GAFhBwQ,EAAQ9N,EAAW8N,IAESrQ,OAAQL,EAAIE,EAAKF,IAC5CH,KAAKoa,KAAKvJ,EAAM1Q,GAAIO,EAAIc,eAXlBxB,KAAKqa,QAeb,OAAOra,MAIRma,IAAK,SAAU9R,EAAM3H,EAAIc,GACxBxB,KAAKqa,QAAUra,KAAKqa,YAGpB,IAAIC,EAAgBta,KAAKqa,QAAQhS,GAC5BiS,IACJA,KACAta,KAAKqa,QAAQhS,GAAQiS,GAGlB9Y,IAAYxB,OAEfwB,OAAUkB,GAMX,IAAK,IAJD6X,GAAe7Z,GAAIA,EAAI8Z,IAAKhZ,GAC5BiZ,EAAYH,EAGPna,EAAI,EAAGE,EAAMoa,EAAUja,OAAQL,EAAIE,EAAKF,IAChD,GAAIsa,EAAUta,GAAGO,KAAOA,GAAM+Z,EAAUta,GAAGqa,MAAQhZ,EAClD,OAIFiZ,EAAUhX,KAAK8W,IAGhBH,KAAM,SAAU/R,EAAM3H,EAAIc,GACzB,IAAIiZ,EACAta,EACAE,EAEJ,GAAKL,KAAKqa,UAEVI,EAAYza,KAAKqa,QAAQhS,IAMzB,GAAK3H,GAcL,GAJIc,IAAYxB,OACfwB,OAAUkB,GAGP+X,EAGH,IAAKta,EAAI,EAAGE,EAAMoa,EAAUja,OAAQL,EAAIE,EAAKF,IAAK,CACjD,IAAIua,EAAID,EAAUta,GAClB,GAAIua,EAAEF,MAAQhZ,GACVkZ,EAAEha,KAAOA,EAWZ,OARAga,EAAEha,GAAK0B,EAEHpC,KAAK2a,eAER3a,KAAKqa,QAAQhS,GAAQoS,EAAYA,EAAU7Z,cAE5C6Z,EAAUG,OAAOza,EAAG,QA7BvB,CAEC,IAAKA,EAAI,EAAGE,EAAMoa,EAAUja,OAAQL,EAAIE,EAAKF,IAC5Csa,EAAUta,GAAGO,GAAK0B,SAGZpC,KAAKqa,QAAQhS,KAmCtBwS,KAAM,SAAUxS,EAAMtE,EAAM+W,GAC3B,IAAK9a,KAAK+a,QAAQ1S,EAAMyS,GAAc,OAAO9a,KAE7C,IAAIiR,EAAQhR,KAAW8D,GACtBsE,KAAMA,EACNgB,OAAQrJ,KACRgb,aAAcjX,GAAQA,EAAKiX,cAAgBhb,OAG5C,GAAIA,KAAKqa,QAAS,CACjB,IAAII,EAAYza,KAAKqa,QAAQhS,GAE7B,GAAIoS,EAAW,CACdza,KAAK2a,aAAgB3a,KAAK2a,aAAe,GAAM,EAC/C,IAAK,IAAIxa,EAAI,EAAGE,EAAMoa,EAAUja,OAAQL,EAAIE,EAAKF,IAAK,CACrD,IAAIua,EAAID,EAAUta,GAClBua,EAAEha,GAAGM,KAAK0Z,EAAEF,KAAOxa,KAAMiR,GAG1BjR,KAAK2a,gBASP,OALIG,GAEH9a,KAAKib,gBAAgBhK,GAGfjR,MAKR+a,QAAS,SAAU1S,EAAMyS,GACxB,IAAIL,EAAYza,KAAKqa,SAAWra,KAAKqa,QAAQhS,GAC7C,GAAIoS,GAAaA,EAAUja,OAAU,OAAO,EAE5C,GAAIsa,EAEH,IAAK,IAAI7V,KAAMjF,KAAKkb,cACnB,GAAIlb,KAAKkb,cAAcjW,GAAI8V,QAAQ1S,EAAMyS,GAAc,OAAO,EAGhE,OAAO,GAKRK,KAAM,SAAUtK,EAAOnQ,EAAIc,GAE1B,GAAqB,iBAAVqP,EAAoB,CAC9B,IAAK,IAAIxI,KAAQwI,EAChB7Q,KAAKmb,KAAK9S,EAAMwI,EAAMxI,GAAO3H,GAE9B,OAAOV,KAGR,IAAIsI,EAAU7H,EAAK,WAClBT,KACK2P,IAAIkB,EAAOnQ,EAAIc,GACfmO,IAAIkB,EAAOvI,EAAS9G,IACvBxB,MAGH,OAAOA,KACFyP,GAAGoB,EAAOnQ,EAAIc,GACdiO,GAAGoB,EAAOvI,EAAS9G,IAKzB4Z,eAAgB,SAAUza,GAGzB,OAFAX,KAAKkb,cAAgBlb,KAAKkb,kBAC1Blb,KAAKkb,cAAc/Z,EAAMR,IAAQA,EAC1BX,MAKRqb,kBAAmB,SAAU1a,GAI5B,OAHIX,KAAKkb,sBACDlb,KAAKkb,cAAc/Z,EAAMR,IAE1BX,MAGRib,gBAAiB,SAAUhS,GAC1B,IAAK,IAAIhE,KAAMjF,KAAKkb,cACnBlb,KAAKkb,cAAcjW,GAAI4V,KAAK5R,EAAEZ,KAAMpI,GACnCsX,MAAOtO,EAAEI,OACTiS,eAAgBrS,EAAEI,QAChBJ,IAAI,KASVzD,GAAOiE,iBAAmBjE,GAAOiK,GAOjCjK,GAAOmD,oBAAsBnD,GAAO+V,uBAAyB/V,GAAOmK,IAIpEnK,GAAOgW,wBAA0BhW,GAAO2V,KAIxC3V,GAAOiW,UAAYjW,GAAOqV,KAI1BrV,GAAOkW,kBAAoBlW,GAAOuV,QAElC,IAAIY,GAAUxW,EAAMlF,OAAOuF,IAiCvBoW,GAAQnZ,KAAKmZ,OAAS,SAAUC,GACnC,OAAOA,EAAI,EAAIpZ,KAAKqZ,MAAMD,GAAKpZ,KAAKsZ,KAAKF,IAG1CjW,EAAM9E,WAILkb,MAAO,WACN,OAAO,IAAIpW,EAAM5F,KAAK8B,EAAG9B,KAAK6F,IAK/B+H,IAAK,SAAUsB,GAEd,OAAOlP,KAAKgc,QAAQC,KAAKnW,EAAQoJ,KAGlC+M,KAAM,SAAU/M,GAIf,OAFAlP,KAAK8B,GAAKoN,EAAMpN,EAChB9B,KAAK6F,GAAKqJ,EAAMrJ,EACT7F,MAKRkc,SAAU,SAAUhN,GACnB,OAAOlP,KAAKgc,QAAQG,UAAUrW,EAAQoJ,KAGvCiN,UAAW,SAAUjN,GAGpB,OAFAlP,KAAK8B,GAAKoN,EAAMpN,EAChB9B,KAAK6F,GAAKqJ,EAAMrJ,EACT7F,MAKRoc,SAAU,SAAU9Z,GACnB,OAAOtC,KAAKgc,QAAQK,UAAU/Z,IAG/B+Z,UAAW,SAAU/Z,GAGpB,OAFAtC,KAAK8B,GAAKQ,EACVtC,KAAK6F,GAAKvD,EACHtC,MAKRsc,WAAY,SAAUha,GACrB,OAAOtC,KAAKgc,QAAQO,YAAYja,IAGjCia,YAAa,SAAUja,GAGtB,OAFAtC,KAAK8B,GAAKQ,EACVtC,KAAK6F,GAAKvD,EACHtC,MAQRwc,QAAS,SAAUtN,GAClB,OAAO,IAAItJ,EAAM5F,KAAK8B,EAAIoN,EAAMpN,EAAG9B,KAAK6F,EAAIqJ,EAAMrJ,IAMnD4W,UAAW,SAAUvN,GACpB,OAAO,IAAItJ,EAAM5F,KAAK8B,EAAIoN,EAAMpN,EAAG9B,KAAK6F,EAAIqJ,EAAMrJ,IAKnDlD,MAAO,WACN,OAAO3C,KAAKgc,QAAQU,UAGrBA,OAAQ,WAGP,OAFA1c,KAAK8B,EAAIW,KAAKE,MAAM3C,KAAK8B,GACzB9B,KAAK6F,EAAIpD,KAAKE,MAAM3C,KAAK6F,GAClB7F,MAKR8b,MAAO,WACN,OAAO9b,KAAKgc,QAAQW,UAGrBA,OAAQ,WAGP,OAFA3c,KAAK8B,EAAIW,KAAKqZ,MAAM9b,KAAK8B,GACzB9B,KAAK6F,EAAIpD,KAAKqZ,MAAM9b,KAAK6F,GAClB7F,MAKR+b,KAAM,WACL,OAAO/b,KAAKgc,QAAQY,SAGrBA,MAAO,WAGN,OAFA5c,KAAK8B,EAAIW,KAAKsZ,KAAK/b,KAAK8B,GACxB9B,KAAK6F,EAAIpD,KAAKsZ,KAAK/b,KAAK6F,GACjB7F,MAKR4b,MAAO,WACN,OAAO5b,KAAKgc,QAAQa,UAGrBA,OAAQ,WAGP,OAFA7c,KAAK8B,EAAI8Z,GAAM5b,KAAK8B,GACpB9B,KAAK6F,EAAI+V,GAAM5b,KAAK6F,GACb7F,MAKR8c,WAAY,SAAU5N,GAGrB,IAAIpN,GAFJoN,EAAQpJ,EAAQoJ,IAEFpN,EAAI9B,KAAK8B,EACnB+D,EAAIqJ,EAAMrJ,EAAI7F,KAAK6F,EAEvB,OAAOpD,KAAK2R,KAAKtS,EAAIA,EAAI+D,EAAIA,IAK9BkX,OAAQ,SAAU7N,GAGjB,OAFAA,EAAQpJ,EAAQoJ,IAEHpN,IAAM9B,KAAK8B,GACjBoN,EAAMrJ,IAAM7F,KAAK6F,GAKzByH,SAAU,SAAU4B,GAGnB,OAFAA,EAAQpJ,EAAQoJ,GAETzM,KAAKwQ,IAAI/D,EAAMpN,IAAMW,KAAKwQ,IAAIjT,KAAK8B,IACnCW,KAAKwQ,IAAI/D,EAAMrJ,IAAMpD,KAAKwQ,IAAIjT,KAAK6F,IAK3CmT,SAAU,WACT,MAAO,SACC3W,EAAUrC,KAAK8B,GAAK,KACpBO,EAAUrC,KAAK6F,GAAK,MAiE9BE,EAAOjF,WAGNb,OAAQ,SAAUiP,GAgBjB,OAfAA,EAAQpJ,EAAQoJ,GAMXlP,KAAKkC,KAAQlC,KAAKiC,KAItBjC,KAAKkC,IAAIJ,EAAIW,KAAKP,IAAIgN,EAAMpN,EAAG9B,KAAKkC,IAAIJ,GACxC9B,KAAKiC,IAAIH,EAAIW,KAAKR,IAAIiN,EAAMpN,EAAG9B,KAAKiC,IAAIH,GACxC9B,KAAKkC,IAAI2D,EAAIpD,KAAKP,IAAIgN,EAAMrJ,EAAG7F,KAAKkC,IAAI2D,GACxC7F,KAAKiC,IAAI4D,EAAIpD,KAAKR,IAAIiN,EAAMrJ,EAAG7F,KAAKiC,IAAI4D,KANxC7F,KAAKkC,IAAMgN,EAAM8M,QACjBhc,KAAKiC,IAAMiN,EAAM8M,SAOXhc,MAKRgd,UAAW,SAAUra,GACpB,OAAO,IAAIiD,GACF5F,KAAKkC,IAAIJ,EAAI9B,KAAKiC,IAAIH,GAAK,GAC3B9B,KAAKkC,IAAI2D,EAAI7F,KAAKiC,IAAI4D,GAAK,EAAGlD,IAKxCsa,cAAe,WACd,OAAO,IAAIrX,EAAM5F,KAAKkC,IAAIJ,EAAG9B,KAAKiC,IAAI4D,IAKvCqX,YAAa,WACZ,OAAO,IAAItX,EAAM5F,KAAKiC,IAAIH,EAAG9B,KAAKkC,IAAI2D,IAKvCsX,WAAY,WACX,OAAOnd,KAAKkC,KAKbkb,eAAgB,WACf,OAAOpd,KAAKiC,KAKbob,QAAS,WACR,OAAOrd,KAAKiC,IAAIia,SAASlc,KAAKkC,MAQ/BoL,SAAU,SAAU3M,GACnB,IAAIuB,EAAKD,EAeT,OAZCtB,EADqB,iBAAXA,EAAI,IAAmBA,aAAeiF,EAC1CE,EAAQnF,GAERwF,EAASxF,cAGGoF,GAClB7D,EAAMvB,EAAIuB,IACVD,EAAMtB,EAAIsB,KAEVC,EAAMD,EAAMtB,EAGLuB,EAAIJ,GAAK9B,KAAKkC,IAAIJ,GAClBG,EAAIH,GAAK9B,KAAKiC,IAAIH,GAClBI,EAAI2D,GAAK7F,KAAKkC,IAAI2D,GAClB5D,EAAI4D,GAAK7F,KAAKiC,IAAI4D,GAM3ByX,WAAY,SAAUpI,GACrBA,EAAS/O,EAAS+O,GAElB,IAAIhT,EAAMlC,KAAKkC,IACXD,EAAMjC,KAAKiC,IACXsb,EAAOrI,EAAOhT,IACdsb,EAAOtI,EAAOjT,IACdwb,EAAeD,EAAK1b,GAAKI,EAAIJ,GAAOyb,EAAKzb,GAAKG,EAAIH,EAClD4b,EAAeF,EAAK3X,GAAK3D,EAAI2D,GAAO0X,EAAK1X,GAAK5D,EAAI4D,EAEtD,OAAO4X,GAAeC,GAMvBC,SAAU,SAAUzI,GACnBA,EAAS/O,EAAS+O,GAElB,IAAIhT,EAAMlC,KAAKkC,IACXD,EAAMjC,KAAKiC,IACXsb,EAAOrI,EAAOhT,IACdsb,EAAOtI,EAAOjT,IACd2b,EAAaJ,EAAK1b,EAAII,EAAIJ,GAAOyb,EAAKzb,EAAIG,EAAIH,EAC9C+b,EAAaL,EAAK3X,EAAI3D,EAAI2D,GAAO0X,EAAK1X,EAAI5D,EAAI4D,EAElD,OAAO+X,GAAaC,GAGrBC,QAAS,WACR,SAAU9d,KAAKkC,MAAOlC,KAAKiC,OAyD7BmE,EAAatF,WAQZb,OAAQ,SAAUU,GACjB,IAEIod,EAAKC,EAFLC,EAAKje,KAAKke,WACVC,EAAKne,KAAKoe,WAGd,GAAIzd,aAAe8F,EAClBsX,EAAMpd,EACNqd,EAAMrd,MAEA,CAAA,KAAIA,aAAeyF,GAOzB,OAAOzF,EAAMX,KAAKC,OAAO6G,EAASnG,IAAQ6F,EAAe7F,IAAQX,KAHjE,GAHA+d,EAAMpd,EAAIud,WACVF,EAAMrd,EAAIyd,YAELL,IAAQC,EAAO,OAAOhe,KAgB5B,OAVKie,GAAOE,GAIXF,EAAGvX,IAAMjE,KAAKP,IAAI6b,EAAIrX,IAAKuX,EAAGvX,KAC9BuX,EAAGtX,IAAMlE,KAAKP,IAAI6b,EAAIpX,IAAKsX,EAAGtX,KAC9BwX,EAAGzX,IAAMjE,KAAKR,IAAI+b,EAAItX,IAAKyX,EAAGzX,KAC9ByX,EAAGxX,IAAMlE,KAAKR,IAAI+b,EAAIrX,IAAKwX,EAAGxX,OAN9B3G,KAAKke,WAAa,IAAIzX,EAAOsX,EAAIrX,IAAKqX,EAAIpX,KAC1C3G,KAAKoe,WAAa,IAAI3X,EAAOuX,EAAItX,IAAKsX,EAAIrX,MAQpC3G,MAORqe,IAAK,SAAUC,GACd,IAAIL,EAAKje,KAAKke,WACVC,EAAKne,KAAKoe,WACVG,EAAe9b,KAAKwQ,IAAIgL,EAAGvX,IAAMyX,EAAGzX,KAAO4X,EAC3CE,EAAc/b,KAAKwQ,IAAIgL,EAAGtX,IAAMwX,EAAGxX,KAAO2X,EAE9C,OAAO,IAAIlY,EACH,IAAIK,EAAOwX,EAAGvX,IAAM6X,EAAcN,EAAGtX,IAAM6X,GAC3C,IAAI/X,EAAO0X,EAAGzX,IAAM6X,EAAcJ,EAAGxX,IAAM6X,KAKpDxB,UAAW,WACV,OAAO,IAAIvW,GACFzG,KAAKke,WAAWxX,IAAM1G,KAAKoe,WAAW1X,KAAO,GAC7C1G,KAAKke,WAAWvX,IAAM3G,KAAKoe,WAAWzX,KAAO,IAKvD8X,aAAc,WACb,OAAOze,KAAKke,YAKbQ,aAAc,WACb,OAAO1e,KAAKoe,YAKbO,aAAc,WACb,OAAO,IAAIlY,EAAOzG,KAAK4e,WAAY5e,KAAK6e,YAKzCC,aAAc,WACb,OAAO,IAAIrY,EAAOzG,KAAK+e,WAAY/e,KAAKgf,YAKzCH,QAAS,WACR,OAAO7e,KAAKke,WAAWvX,KAKxBoY,SAAU,WACT,OAAO/e,KAAKke,WAAWxX,KAKxBsY,QAAS,WACR,OAAOhf,KAAKoe,WAAWzX,KAKxBiY,SAAU,WACT,OAAO5e,KAAKoe,WAAW1X,KASxB4G,SAAU,SAAU3M,GAElBA,EADqB,iBAAXA,EAAI,IAAmBA,aAAe8F,GAAU,QAAS9F,EAC7DmG,EAASnG,GAET6F,EAAe7F,GAGtB,IAEIod,EAAKC,EAFLC,EAAKje,KAAKke,WACVC,EAAKne,KAAKoe,WAUd,OAPIzd,aAAeyF,GAClB2X,EAAMpd,EAAI8d,eACVT,EAAMrd,EAAI+d,gBAEVX,EAAMC,EAAMrd,EAGLod,EAAIrX,KAAOuX,EAAGvX,KAASsX,EAAItX,KAAOyX,EAAGzX,KACrCqX,EAAIpX,KAAOsX,EAAGtX,KAASqX,EAAIrX,KAAOwX,EAAGxX,KAK9C2W,WAAY,SAAUpI,GACrBA,EAAS1O,EAAe0O,GAExB,IAAI+I,EAAKje,KAAKke,WACVC,EAAKne,KAAKoe,WACVL,EAAM7I,EAAOuJ,eACbT,EAAM9I,EAAOwJ,eAEbO,EAAiBjB,EAAItX,KAAOuX,EAAGvX,KAASqX,EAAIrX,KAAOyX,EAAGzX,IACtDwY,EAAiBlB,EAAIrX,KAAOsX,EAAGtX,KAASoX,EAAIpX,KAAOwX,EAAGxX,IAE1D,OAAOsY,GAAiBC,GAKzBvB,SAAU,SAAUzI,GACnBA,EAAS1O,EAAe0O,GAExB,IAAI+I,EAAKje,KAAKke,WACVC,EAAKne,KAAKoe,WACVL,EAAM7I,EAAOuJ,eACbT,EAAM9I,EAAOwJ,eAEbS,EAAenB,EAAItX,IAAMuX,EAAGvX,KAASqX,EAAIrX,IAAMyX,EAAGzX,IAClD0Y,EAAepB,EAAIrX,IAAMsX,EAAGtX,KAASoX,EAAIpX,IAAMwX,EAAGxX,IAEtD,OAAOwY,GAAeC,GAKvBC,aAAc,WACb,OAAQrf,KAAK6e,UAAW7e,KAAK+e,WAAY/e,KAAKgf,UAAWhf,KAAK4e,YAAY/a,KAAK,MAKhFkZ,OAAQ,SAAU7H,EAAQoK,GACzB,QAAKpK,IAELA,EAAS1O,EAAe0O,GAEjBlV,KAAKke,WAAWnB,OAAO7H,EAAOuJ,eAAgBa,IAC9Ctf,KAAKoe,WAAWrB,OAAO7H,EAAOwJ,eAAgBY,KAKtDxB,QAAS,WACR,SAAU9d,KAAKke,aAAcle,KAAKoe,cAgEpC3X,EAAO3F,WAGNic,OAAQ,SAAUpc,EAAK2e,GACtB,QAAK3e,IAELA,EAAMmG,EAASnG,GAEF8B,KAAKR,IACVQ,KAAKwQ,IAAIjT,KAAK0G,IAAM/F,EAAI+F,KACxBjE,KAAKwQ,IAAIjT,KAAK2G,IAAMhG,EAAIgG,aAEAjE,IAAd4c,EAA0B,KAASA,KAKtDtG,SAAU,SAAUrB,GACnB,MAAO,UACCtV,EAAUrC,KAAK0G,IAAKiR,GAAa,KACjCtV,EAAUrC,KAAK2G,IAAKgR,GAAa,KAK1CmF,WAAY,SAAUyC,GACrB,OAAOC,GAAMC,SAASzf,KAAM8G,EAASyY,KAKtCG,KAAM,WACL,OAAOF,GAAMG,WAAW3f,OAKzBmG,SAAU,SAAUyZ,GACnB,IAAIC,EAAc,IAAMD,EAAe,SACnCE,EAAcD,EAAcpd,KAAKsd,IAAKtd,KAAKud,GAAK,IAAOhgB,KAAK0G,KAEhE,OAAOF,GACExG,KAAK0G,IAAMmZ,EAAa7f,KAAK2G,IAAMmZ,IACnC9f,KAAK0G,IAAMmZ,EAAa7f,KAAK2G,IAAMmZ,KAG7C9D,MAAO,WACN,OAAO,IAAIvV,EAAOzG,KAAK0G,IAAK1G,KAAK2G,IAAK3G,KAAK4G,OA2D7C,IAAIqZ,IAGHC,cAAe,SAAUzJ,EAAQ0J,GAChC,IAAIC,EAAiBpgB,KAAKqgB,WAAWC,QAAQ7J,GACzC5H,EAAQ7O,KAAK6O,MAAMsR,GAEvB,OAAOngB,KAAKugB,eAAeC,WAAWJ,EAAgBvR,IAMvD4R,cAAe,SAAUvR,EAAOiR,GAC/B,IAAItR,EAAQ7O,KAAK6O,MAAMsR,GACnBO,EAAqB1gB,KAAKugB,eAAeI,YAAYzR,EAAOL,GAEhE,OAAO7O,KAAKqgB,WAAWO,UAAUF,IAMlCJ,QAAS,SAAU7J,GAClB,OAAOzW,KAAKqgB,WAAWC,QAAQ7J,IAMhCmK,UAAW,SAAU1R,GACpB,OAAOlP,KAAKqgB,WAAWO,UAAU1R,IAOlCL,MAAO,SAAUsR,GAChB,OAAO,IAAM1d,KAAKD,IAAI,EAAG2d,IAM1BA,KAAM,SAAUtR,GACf,OAAOpM,KAAKoe,IAAIhS,EAAQ,KAAOpM,KAAKqe,KAKrCC,mBAAoB,SAAUZ,GAC7B,GAAIngB,KAAKghB,SAAY,OAAO,KAE5B,IAAI/a,EAAIjG,KAAKqgB,WAAWnL,OACpB+L,EAAIjhB,KAAK6O,MAAMsR,GAInB,OAAO,IAAIpa,EAHD/F,KAAKugB,eAAeW,UAAUjb,EAAE/D,IAAK+e,GACrCjhB,KAAKugB,eAAeW,UAAUjb,EAAEhE,IAAKgf,KAwBhDD,UAAU,EAKVrB,WAAY,SAAUlJ,GACrB,IAAI9P,EAAM3G,KAAKmhB,QAAUtf,EAAQ4U,EAAO9P,IAAK3G,KAAKmhB,SAAS,GAAQ1K,EAAO9P,IAI1E,OAAO,IAAIF,EAHDzG,KAAKohB,QAAUvf,EAAQ4U,EAAO/P,IAAK1G,KAAKohB,SAAS,GAAQ3K,EAAO/P,IAGnDC,EAFb8P,EAAO7P,MASlBya,iBAAkB,SAAUnM,GAC3B,IAAIoM,EAASpM,EAAO8H,YAChBuE,EAAYvhB,KAAK2f,WAAW2B,GAC5BE,EAAWF,EAAO5a,IAAM6a,EAAU7a,IAClC+a,EAAWH,EAAO3a,IAAM4a,EAAU5a,IAEtC,GAAiB,IAAb6a,GAA+B,IAAbC,EACrB,OAAOvM,EAGR,IAAI+I,EAAK/I,EAAOuJ,eACZN,EAAKjJ,EAAOwJ,eAIhB,OAAO,IAAItY,EAHC,IAAIK,EAAOwX,EAAGvX,IAAM8a,EAAUvD,EAAGtX,IAAM8a,GACvC,IAAIhb,EAAO0X,EAAGzX,IAAM8a,EAAUrD,EAAGxX,IAAM8a,MAgBjDjC,GAAQvf,KAAWggB,IACtBkB,UAAW,IAAK,KAKhBO,EAAG,OAGHjC,SAAU,SAAUkC,EAASC,GAC5B,IAAIC,EAAMpf,KAAKud,GAAK,IAChB8B,EAAOH,EAAQjb,IAAMmb,EACrBE,EAAOH,EAAQlb,IAAMmb,EACrBG,EAAUvf,KAAKwf,KAAKL,EAAQlb,IAAMib,EAAQjb,KAAOmb,EAAM,GACvDK,EAAUzf,KAAKwf,KAAKL,EAAQjb,IAAMgb,EAAQhb,KAAOkb,EAAM,GACvD7b,EAAIgc,EAAUA,EAAUvf,KAAKsd,IAAI+B,GAAQrf,KAAKsd,IAAIgC,GAAQG,EAAUA,EACpEnb,EAAI,EAAItE,KAAK0f,MAAM1f,KAAK2R,KAAKpO,GAAIvD,KAAK2R,KAAK,EAAIpO,IACnD,OAAOhG,KAAK0hB,EAAI3a,KAadqb,IAEHV,EAAG,QACHW,aAAc,cAEd/B,QAAS,SAAU7J,GAClB,IAAItU,EAAIM,KAAKud,GAAK,IACd/d,EAAMjC,KAAKqiB,aACX3b,EAAMjE,KAAKR,IAAIQ,KAAKP,IAAID,EAAKwU,EAAO/P,MAAOzE,GAC3CggB,EAAMxf,KAAKwf,IAAIvb,EAAMvE,GAEzB,OAAO,IAAIyD,EACV5F,KAAK0hB,EAAIjL,EAAO9P,IAAMxE,EACtBnC,KAAK0hB,EAAIjf,KAAKoe,KAAK,EAAIoB,IAAQ,EAAIA,IAAQ,IAG7CrB,UAAW,SAAU1R,GACpB,IAAI/M,EAAI,IAAMM,KAAKud,GAEnB,OAAO,IAAIvZ,GACT,EAAIhE,KAAK6f,KAAK7f,KAAK8f,IAAIrT,EAAMrJ,EAAI7F,KAAK0hB,IAAOjf,KAAKud,GAAK,GAAM7d,EAC9D+M,EAAMpN,EAAIK,EAAInC,KAAK0hB,IAGrBxM,OAAQ,WACP,IAAI/S,EAAI,QAAUM,KAAKud,GACvB,OAAO,IAAIja,IAAS5D,GAAIA,IAAKA,EAAGA,IAFzB,IA0CT8E,EAAenG,WAIdogB,UAAW,SAAUhS,EAAOL,GAC3B,OAAO7O,KAAKwgB,WAAWtR,EAAM8M,QAASnN,IAIvC2R,WAAY,SAAUtR,EAAOL,GAI5B,OAHAA,EAAQA,GAAS,EACjBK,EAAMpN,EAAI+M,GAAS7O,KAAKkH,GAAKgI,EAAMpN,EAAI9B,KAAKmH,IAC5C+H,EAAMrJ,EAAIgJ,GAAS7O,KAAKoH,GAAK8H,EAAMrJ,EAAI7F,KAAKqH,IACrC6H,GAMRyR,YAAa,SAAUzR,EAAOL,GAE7B,OADAA,EAAQA,GAAS,EACV,IAAIjJ,GACFsJ,EAAMpN,EAAI+M,EAAQ7O,KAAKmH,IAAMnH,KAAKkH,IAClCgI,EAAMrJ,EAAIgJ,EAAQ7O,KAAKqH,IAAMrH,KAAKoH,MA2B7C,IAirBIob,GACAC,GACAC,GAnrBAC,GAAW1iB,KAAWuf,IACzB7J,KAAM,YACN0K,WAAY+B,GAEZ7B,eAAiB,WAChB,IAAI1R,EAAQ,IAAOpM,KAAKud,GAAKoC,GAAkBV,GAC/C,OAAOpa,EAAiBuH,EAAO,IAAMA,EAAO,IAF7B,KAMb+T,GAAa3iB,KAAW0iB,IAC3BhN,KAAM,gBAoDHkN,GAAUrb,SAASmC,gBAAgBqC,MAGnC8W,GAAK,kBAAmBte,OAGxBue,GAAQD,KAAOtb,SAASiC,iBAGxBkB,GAAO,gBAAiB1C,aAAe,iBAAkBT,UAIzDwb,GAAShb,EAAkB,UAI3BsJ,GAAUtJ,EAAkB,WAG5Bib,GAAYjb,EAAkB,cAAgBA,EAAkB,aAGhEkb,GAAYC,SAAS,qBAAqBC,KAAKnb,UAAUC,WAAW,GAAI,IAExEmb,GAAe/R,IAAWtJ,EAAkB,WAAakb,GAAY,OAAS,cAAe1e,QAG7F8e,KAAU9e,OAAO8e,MAGjBlS,GAASpJ,EAAkB,UAG3Bub,GAAQvb,EAAkB,WAAagb,KAAWM,KAAUR,GAG5DU,IAAUpS,IAAUpJ,EAAkB,UAEtCyb,GAAUzb,EAAkB,WAI5B0b,GAAU,gBAAiBb,GAG3Bc,GAA4C,IAAtC1b,UAAU2b,SAAShgB,QAAQ,OAGjCoL,GAAO8T,IAAO,eAAgBD,GAG9BgB,GAAY,oBAAqBrf,QAAY,QAAS,IAAIA,OAAOsf,kBAAuBb,GAGxFc,GAAU,mBAAoBlB,GAI9BzT,IAAS5K,OAAOwf,eAAiBhV,IAAQ6U,IAAYE,MAAaL,KAAYD,GAG9EQ,GAAgC,oBAAhBC,aAA+Blc,EAAkB,UAGjEmc,GAAeF,IAAUjB,GAIzBoB,GAAiBH,IAAUJ,GAI3BQ,IAAa7f,OAAO8f,cAAgB9f,OAAO+f,eAI3C7Z,MAAalG,OAAO8f,eAAgBD,IAOpClT,IAAS3M,OAAOggB,aAAe9Z,IAAW,iBAAkBlG,QAC7DA,OAAOigB,eAAiBjd,oBAAoBhD,OAAOigB,eAGlDC,GAAcT,IAAUX,GAIxBqB,GAAcV,IAAUV,GAIxBqB,IAAUpgB,OAAOqgB,kBAAqBrgB,OAAOsgB,OAAOC,WAAavgB,OAAOsgB,OAAOE,aAAgB,EAK/FzM,KACM/Q,SAASgF,cAAc,UAAUyY,WAKvCld,MAASP,SAASC,kBAAmBF,EAAU,OAAO2d,eAItDxM,IAAO3Q,IAAQ,WAClB,IACC,IAAIod,EAAM3d,SAASgF,cAAc,OACjC2Y,EAAIC,UAAY,qBAEhB,IAAIC,EAAQF,EAAIpY,WAGhB,OAFAsY,EAAMrZ,MAAMsZ,SAAW,oBAEhBD,GAA+B,iBAAdA,EAAME,IAE7B,MAAOtc,GACR,OAAO,GAXS,GAqBduc,IAAW3M,OAAOD,QAAUC,SAC/BiK,GAAIA,GACJC,MAAOA,GACPpY,KAAMA,GACNqY,OAAQA,GACR1R,QAASA,GACT2R,UAAWA,GACXI,aAAcA,GACdC,MAAOA,GACPlS,OAAQA,GACRmS,MAAOA,GACPC,OAAQA,GACRC,QAASA,GACTC,QAASA,GACTC,IAAKA,GACL3U,KAAMA,GACN6U,SAAUA,GACVE,QAASA,GACT3U,MAAOA,GACP6U,OAAQA,GACRE,aAAcA,GACdC,eAAgBA,GAChBC,UAAWA,GACX3Z,QAASA,GACTyG,MAAOA,GACPuT,YAAaA,GACbC,YAAaA,GACbC,OAAQA,GACRrM,OAAQA,GACRxQ,IAAKA,GACL2Q,IAAKA,KAQF9P,GAAiByb,GAAY,gBAAoB,cACjDxb,GAAiBwb,GAAY,gBAAoB,cACjDvb,GAAiBub,GAAY,cAAoB,YACjDtb,GAAiBsb,GAAY,kBAAoB,gBACjDjb,IAAkB,QAAS,SAAU,UAErCW,MACAL,IAAsB,EAGtBO,GAAiB,EAuHjBsB,GAAc8Y,GAAY,gBAAkB3Z,GAAU,cAAgB,aACtEc,GAAY6Y,GAAY,cAAgB3Z,GAAU,YAAc,WAChEY,GAAO,YA4FPyD,GAAYN,IACd,YAAa,kBAAmB,aAAc,eAAgB,gBAO5DgX,GAAahX,IACf,mBAAoB,aAAc,cAAe,gBAAiB,iBAIhEiX,GACY,qBAAfD,IAAoD,gBAAfA,GAA+BA,GAAa,MAAQ,gBA8N1F,GAAI,kBAAmBje,SACtBgb,GAAuB,WACtB/S,GAAGjL,OAAQ,cAAe+E,KAE3BkZ,GAAsB,WACrB9S,GAAInL,OAAQ,cAAe+E,SAEtB,CACN,IAAIoc,GAAqBlX,IACvB,aAAc,mBAAoB,cAAe,gBAAiB,iBAEpE+T,GAAuB,WACtB,GAAImD,GAAoB,CACvB,IAAI3Z,EAAQxE,SAASmC,gBAAgBqC,MACrC0W,GAAc1W,EAAM2Z,IACpB3Z,EAAM2Z,IAAsB,SAG9BlD,GAAsB,WACjBkD,KACHne,SAASmC,gBAAgBqC,MAAM2Z,IAAsBjD,GACrDA,QAAchgB,IAkBjB,IAAIsN,GACAC,GA4WAwD,GAxTAmS,IAAW/M,OAAOD,QAAUC,SAC/B9J,UAAWA,GACX0W,WAAYA,GACZC,eAAgBA,GAChB7Z,IAAKA,EACLE,SAAUA,EACV3I,OAAQiJ,EACRK,OAAQA,EACRI,MAAOA,EACPE,QAASA,EACTE,OAAQA,EACRE,SAAUA,EACVM,SAAUA,EACVI,YAAaA,GACbD,SAAUA,GACVN,SAAUA,GACVS,WAAYA,GACZS,SAAUA,GACVE,aAAcA,GACdM,YAAaA,GACbM,YAAaA,GACbiT,qBAAsBA,GACtBC,oBAAqBA,GACrBjT,iBAAkBA,GAClBE,gBAAiBA,GACjBE,eAAgBA,GAChBG,eAAgBA,GAChBI,mBAAoBA,GACpBI,SAAUA,KAoCPS,GAAY,kBAoMZ4B,GACF+Q,IAAOvS,GAAU,EAAI5M,OAAOqgB,iBAC7BtB,GAAQ/e,OAAOqgB,iBAAmB,EAmB/B3R,MAuDA2S,IAAYhN,OAAOD,QAAUC,SAChCpJ,GAAIA,GACJE,IAAKA,GACL+B,gBAAiBA,GACjBI,yBAA0BA,GAC1BC,wBAAyBA,GACzBxI,eAAgBA,GAChB2I,KAAMA,GACNC,iBAAkBA,GAClBK,cAAeA,GACfR,SAAUA,GACVH,QAASA,GACTR,iBAAkBA,GAClByU,YAAarW,GACbsW,eAAgBpW,KAoBbqW,GAAerK,GAAQ1b,QAO1BgmB,IAAK,SAAU5hB,EAAI6hB,EAAQC,EAAUC,GACpCpmB,KAAKkS,OAELlS,KAAKqmB,IAAMhiB,EACXrE,KAAKsmB,aAAc,EACnBtmB,KAAKumB,UAAYJ,GAAY,IAC7BnmB,KAAKwmB,cAAgB,EAAI/jB,KAAKR,IAAImkB,GAAiB,GAAK,IAExDpmB,KAAKymB,UAAYlX,GAAYlL,GAC7BrE,KAAK0mB,QAAUR,EAAOhK,SAASlc,KAAKymB,WACpCzmB,KAAK2mB,YAAc,IAAIjiB,KAIvB1E,KAAK6a,KAAK,SAEV7a,KAAK4mB,YAKN1U,KAAM,WACAlS,KAAKsmB,cAEVtmB,KAAK6mB,OAAM,GACX7mB,KAAK8mB,cAGNF,SAAU,WAET5mB,KAAK+mB,QAAUliB,EAAiB7E,KAAK4mB,SAAU5mB,MAC/CA,KAAK6mB,SAGNA,MAAO,SAAUlkB,GAChB,IAAI6Q,GAAY,IAAI9O,KAAU1E,KAAK2mB,WAC/BR,EAA4B,IAAjBnmB,KAAKumB,UAEhB/S,EAAU2S,EACbnmB,KAAKgnB,UAAUhnB,KAAKinB,SAASzT,EAAU2S,GAAWxjB,IAElD3C,KAAKgnB,UAAU,GACfhnB,KAAK8mB,cAIPE,UAAW,SAAUE,EAAUvkB,GAC9B,IAAImM,EAAM9O,KAAKymB,UAAU7Y,IAAI5N,KAAK0mB,QAAQpK,WAAW4K,IACjDvkB,GACHmM,EAAI4N,SAELzN,GAAYjP,KAAKqmB,IAAKvX,GAItB9O,KAAK6a,KAAK,SAGXiM,UAAW,WACV9hB,EAAgBhF,KAAK+mB,SAErB/mB,KAAKsmB,aAAc,EAGnBtmB,KAAK6a,KAAK,QAGXoM,SAAU,SAAUnR,GACnB,OAAO,EAAIrT,KAAKD,IAAI,EAAIsT,EAAG9V,KAAKwmB,kBAuB9BW,GAAMxL,GAAQ1b,QAEjBiD,SAKCkkB,IAAKzE,GAILrB,YAAQ5e,EAIRyd,UAAMzd,EAMN2kB,aAAS3kB,EAMT4kB,aAAS5kB,EAITmU,UAOA0Q,eAAW7kB,EAKX8kB,cAAU9kB,EAOV+kB,eAAe,EAIfC,uBAAwB,EAKxBC,eAAe,EAMfC,qBAAqB,EAMrBC,iBAAkB,QASlBC,SAAU,EAOVC,UAAW,EAIXC,aAAa,GAGdzO,WAAY,SAAUtU,EAAI/B,GACzBA,EAAUD,EAAWjD,KAAMkD,GAE3BlD,KAAKioB,eAAehjB,GACpBjF,KAAKkoB,cAGLloB,KAAKmoB,UAAY1nB,EAAKT,KAAKmoB,UAAWnoB,MAEtCA,KAAKooB,cAEDllB,EAAQqkB,WACXvnB,KAAKqoB,aAAanlB,EAAQqkB,gBAGN7kB,IAAjBQ,EAAQid,OACXngB,KAAKsoB,MAAQtoB,KAAKuoB,WAAWrlB,EAAQid,OAGlCjd,EAAQoe,aAA2B5e,IAAjBQ,EAAQid,MAC7BngB,KAAKwoB,QAAQ1hB,EAAS5D,EAAQoe,QAASpe,EAAQid,MAAOsI,OAAO,IAG9DzoB,KAAK0oB,aACL1oB,KAAK2oB,WACL3oB,KAAK4oB,oBACL5oB,KAAK6oB,cAAe,EAEpB7oB,KAAKwZ,gBAGLxZ,KAAK8oB,cAAgBrD,IAAcrW,KAAUsV,IAC3C1kB,KAAKkD,QAAQukB,cAIXznB,KAAK8oB,gBACR9oB,KAAK+oB,mBACLtZ,GAAGzP,KAAKgpB,OAAQtD,GAAgB1lB,KAAKipB,oBAAqBjpB,OAG3DA,KAAKkpB,WAAWlpB,KAAKkD,QAAQ2T,SAS9B2R,QAAS,SAAUlH,EAAQnB,EAAMjd,GAQhC,OANAid,OAAgBzd,IAATyd,EAAqBngB,KAAKsoB,MAAQtoB,KAAKuoB,WAAWpI,GACzDmB,EAASthB,KAAKmpB,aAAariB,EAASwa,GAASnB,EAAMngB,KAAKkD,QAAQqkB,WAChErkB,EAAUA,MAEVlD,KAAKopB,QAEDppB,KAAKqpB,UAAYnmB,EAAQulB,QAAqB,IAAZvlB,SAEbR,IAApBQ,EAAQomB,UACXpmB,EAAQid,KAAOlgB,GAAQqpB,QAASpmB,EAAQomB,SAAUpmB,EAAQid,MAC1Djd,EAAQqmB,IAAMtpB,GAAQqpB,QAASpmB,EAAQomB,QAASnD,SAAUjjB,EAAQijB,UAAWjjB,EAAQqmB,MAIzEvpB,KAAKsoB,QAAUnI,EAC3BngB,KAAKwpB,kBAAoBxpB,KAAKwpB,iBAAiBlI,EAAQnB,EAAMjd,EAAQid,MACrEngB,KAAKypB,gBAAgBnI,EAAQpe,EAAQqmB,OAIrCnQ,aAAapZ,KAAK0pB,YACX1pB,OAKTA,KAAK2pB,WAAWrI,EAAQnB,GAEjBngB,OAKR4pB,QAAS,SAAUzJ,EAAMjd,GACxB,OAAKlD,KAAKqpB,QAIHrpB,KAAKwoB,QAAQxoB,KAAKgd,YAAamD,GAAOA,KAAMjd,KAHlDlD,KAAKsoB,MAAQnI,EACNngB,OAOT6pB,OAAQ,SAAUhf,EAAO3H,GAExB,OADA2H,EAAQA,IAAUuE,GAAQpP,KAAKkD,QAAQ6kB,UAAY,GAC5C/nB,KAAK4pB,QAAQ5pB,KAAKsoB,MAAQzd,EAAO3H,IAKzC4mB,QAAS,SAAUjf,EAAO3H,GAEzB,OADA2H,EAAQA,IAAUuE,GAAQpP,KAAKkD,QAAQ6kB,UAAY,GAC5C/nB,KAAK4pB,QAAQ5pB,KAAKsoB,MAAQzd,EAAO3H,IASzC6mB,cAAe,SAAUtT,EAAQ0J,EAAMjd,GACtC,IAAI2L,EAAQ7O,KAAKgqB,aAAa7J,GAC1B8J,EAAWjqB,KAAKqd,UAAUjB,SAAS,GAGnC8N,GAFiBzT,aAAkB7Q,EAAQ6Q,EAASzW,KAAKmqB,uBAAuB1T,IAElDyF,SAAS+N,GAAU3N,WAAW,EAAI,EAAIzN,GACpE0S,EAAYvhB,KAAKoqB,uBAAuBH,EAASrc,IAAIsc,IAEzD,OAAOlqB,KAAKwoB,QAAQjH,EAAWpB,GAAOA,KAAMjd,KAG7CmnB,qBAAsB,SAAUnV,EAAQhS,GAEvCA,EAAUA,MACVgS,EAASA,EAAOoV,UAAYpV,EAAOoV,YAAc9jB,EAAe0O,GAEhE,IAAIqV,EAAYzkB,EAAQ5C,EAAQsnB,gBAAkBtnB,EAAQunB,UAAY,EAAG,IACrEC,EAAY5kB,EAAQ5C,EAAQynB,oBAAsBznB,EAAQunB,UAAY,EAAG,IAEzEtK,EAAOngB,KAAK4qB,cAAc1V,GAAQ,EAAOqV,EAAU3c,IAAI8c,IAI3D,IAFAvK,EAAmC,iBAApBjd,EAAQokB,QAAwB7kB,KAAKP,IAAIgB,EAAQokB,QAASnH,GAAQA,KAEpE0K,EAAAA,EACZ,OACCvJ,OAAQpM,EAAO8H,YACfmD,KAAMA,GAIR,IAAI2K,EAAgBJ,EAAUxO,SAASqO,GAAWnO,SAAS,GAEvD2O,EAAU/qB,KAAKsgB,QAAQpL,EAAOuJ,eAAgB0B,GAC9C6K,EAAUhrB,KAAKsgB,QAAQpL,EAAOwJ,eAAgByB,GAGlD,OACCmB,OAHYthB,KAAK4gB,UAAUmK,EAAQnd,IAAIod,GAAS5O,SAAS,GAAGxO,IAAIkd,GAAgB3K,GAIhFA,KAAMA,IAOR8K,UAAW,SAAU/V,EAAQhS,GAI5B,KAFAgS,EAAS1O,EAAe0O,IAEZ4I,UACX,MAAM,IAAI3Z,MAAM,yBAGjB,IAAIkF,EAASrJ,KAAKqqB,qBAAqBnV,EAAQhS,GAC/C,OAAOlD,KAAKwoB,QAAQnf,EAAOiY,OAAQjY,EAAO8W,KAAMjd,IAMjDgoB,SAAU,SAAUhoB,GACnB,OAAOlD,KAAKirB,aAAa,IAAK,MAAO,GAAI,MAAO/nB,IAKjDioB,MAAO,SAAU7J,EAAQpe,GACxB,OAAOlD,KAAKwoB,QAAQlH,EAAQthB,KAAKsoB,OAAQiB,IAAKrmB,KAK/CkoB,MAAO,SAAUxc,EAAQ1L,GAIxB,GAHA0L,EAAS9I,EAAQ8I,GAAQjM,QACzBO,EAAUA,OAEL0L,EAAO9M,IAAM8M,EAAO/I,EACxB,OAAO7F,KAAK6a,KAAK,WAIlB,IAAwB,IAApB3X,EAAQomB,UAAqBtpB,KAAKqd,UAAU/P,SAASsB,GAExD,OADA5O,KAAK2pB,WAAW3pB,KAAK4gB,UAAU5gB,KAAKsgB,QAAQtgB,KAAKgd,aAAapP,IAAIgB,IAAU5O,KAAKqrB,WAC1ErrB,KAkBR,GAfKA,KAAKsrB,WACTtrB,KAAKsrB,SAAW,IAAItF,GAEpBhmB,KAAKsrB,SAAS7b,IACb8b,KAAQvrB,KAAKwrB,qBACbC,IAAOzrB,KAAK0rB,qBACV1rB,OAICkD,EAAQyoB,aACZ3rB,KAAK6a,KAAK,cAIa,IAApB3X,EAAQomB,QAAmB,CAC9B5b,EAAS1N,KAAK4rB,SAAU,oBAExB,IAAI1F,EAASlmB,KAAK6rB,iBAAiB3P,SAAStN,GAAQjM,QACpD3C,KAAKsrB,SAASrF,IAAIjmB,KAAK4rB,SAAU1F,EAAQhjB,EAAQijB,UAAY,IAAMjjB,EAAQkjB,oBAE3EpmB,KAAK8rB,UAAUld,GACf5O,KAAK6a,KAAK,QAAQA,KAAK,WAGxB,OAAO7a,MAMR+rB,MAAO,SAAUC,EAAcC,EAAY/oB,GAuB1C,SAASgpB,EAAE/rB,GACV,IAII8F,GAFKkmB,EAAKA,EAAKC,EAAKA,GAFfjsB,GAAK,EAAI,GAEgBksB,EAAOA,EAAOC,EAAKA,IAC5C,GAFAnsB,EAAIgsB,EAAKC,GAEAC,EAAOC,GAErBC,EAAK9pB,KAAK2R,KAAKnO,EAAIA,EAAI,GAAKA,EAMhC,OAFcsmB,EAAK,MAAe,GAAK9pB,KAAKoe,IAAI0L,GAKjD,SAASC,EAAKC,GAAK,OAAQhqB,KAAK8f,IAAIkK,GAAKhqB,KAAK8f,KAAKkK,IAAM,EACzD,SAASC,EAAKD,GAAK,OAAQhqB,KAAK8f,IAAIkK,GAAKhqB,KAAK8f,KAAKkK,IAAM,EACzD,SAASE,EAAKF,GAAK,OAAOD,EAAKC,GAAKC,EAAKD,GAIzC,SAASG,EAAE3L,GAAK,OAAOmL,GAAMM,EAAKG,GAAMH,EAAKG,EAAKC,EAAM7L,IACxD,SAAS8L,EAAE9L,GAAK,OAAOmL,GAAMM,EAAKG,GAAMF,EAAKE,EAAKC,EAAM7L,GAAKuL,EAAKK,IAAOR,EAEzE,SAASW,EAAQlX,GAAK,OAAO,EAAIrT,KAAKD,IAAI,EAAIsT,EAAG,KAMjD,SAASmX,IACR,IAAInX,GAAKpR,KAAKkG,MAAQsiB,GAAS/G,EAC3BlF,EAAI+L,EAAQlX,GAAKqX,EAEjBrX,GAAK,GACR9V,KAAKotB,YAAcvoB,EAAiBooB,EAAOjtB,MAE3CA,KAAKqtB,MACJrtB,KAAK4gB,UAAU0M,EAAK1f,IAAI2f,EAAGrR,SAASoR,GAAMhR,WAAWyQ,EAAE9L,GAAKqL,IAAMkB,GAClExtB,KAAKytB,aAAarB,EAAKQ,EAAE3L,GAAIuM,IAC5BzB,OAAO,KAGT/rB,KACEqtB,MAAMrB,EAAcC,GACpByB,UAAS,GAjEb,IAAwB,KADxBxqB,EAAUA,OACEomB,UAAsBla,GACjC,OAAOpP,KAAKwoB,QAAQwD,EAAcC,EAAY/oB,GAG/ClD,KAAKopB,QAEL,IAAIkE,EAAOttB,KAAKsgB,QAAQtgB,KAAKgd,aACzBuQ,EAAKvtB,KAAKsgB,QAAQ0L,GAClB2B,EAAO3tB,KAAKqd,UACZmQ,EAAYxtB,KAAKsoB,MAErB0D,EAAellB,EAASklB,GACxBC,OAA4BvpB,IAAfupB,EAA2BuB,EAAYvB,EAEpD,IAAIG,EAAK3pB,KAAKR,IAAI0rB,EAAK7rB,EAAG6rB,EAAK9nB,GAC3BsmB,EAAKC,EAAKpsB,KAAKgqB,aAAawD,EAAWvB,GACvCK,EAAMiB,EAAGzQ,WAAWwQ,IAAU,EAC9BR,EAAM,KACNT,EAAOS,EAAMA,EAqBbD,EAAKX,EAAE,GAOPgB,EAAQxoB,KAAKkG,MACbuiB,GAAKjB,EAAE,GAAKW,GAAMC,EAClB3G,EAAWjjB,EAAQijB,SAAW,IAAOjjB,EAAQijB,SAAW,IAAOgH,EAAI,GAwBvE,OAHAntB,KAAK4tB,YAAW,EAAM1qB,EAAQyoB,aAE9BsB,EAAMjsB,KAAKhB,MACJA,MAMR6tB,YAAa,SAAU3Y,EAAQhS,GAC9B,IAAImG,EAASrJ,KAAKqqB,qBAAqBnV,EAAQhS,GAC/C,OAAOlD,KAAK+rB,MAAM1iB,EAAOiY,OAAQjY,EAAO8W,KAAMjd,IAK/CmlB,aAAc,SAAUnT,GAGvB,OAFAA,EAAS1O,EAAe0O,IAEZ4I,WAGD9d,KAAKkD,QAAQqkB,WACvBvnB,KAAK2P,IAAI,UAAW3P,KAAK8tB,qBAG1B9tB,KAAKkD,QAAQqkB,UAAYrS,EAErBlV,KAAKqpB,SACRrpB,KAAK8tB,sBAGC9tB,KAAKyP,GAAG,UAAWzP,KAAK8tB,uBAZ9B9tB,KAAKkD,QAAQqkB,UAAY,KAClBvnB,KAAK2P,IAAI,UAAW3P,KAAK8tB,uBAgBlCC,WAAY,SAAU5N,GACrB,IAAI6N,EAAUhuB,KAAKkD,QAAQmkB,QAG3B,OAFArnB,KAAKkD,QAAQmkB,QAAUlH,EAEnBngB,KAAKqpB,SAAW2E,IAAY7N,IAC/BngB,KAAK6a,KAAK,oBAEN7a,KAAKqrB,UAAYrrB,KAAKkD,QAAQmkB,SAC1BrnB,KAAK4pB,QAAQzJ,GAIfngB,MAKRiuB,WAAY,SAAU9N,GACrB,IAAI6N,EAAUhuB,KAAKkD,QAAQokB,QAG3B,OAFAtnB,KAAKkD,QAAQokB,QAAUnH,EAEnBngB,KAAKqpB,SAAW2E,IAAY7N,IAC/BngB,KAAK6a,KAAK,oBAEN7a,KAAKqrB,UAAYrrB,KAAKkD,QAAQokB,SAC1BtnB,KAAK4pB,QAAQzJ,GAIfngB,MAKRkuB,gBAAiB,SAAUhZ,EAAQhS,GAClClD,KAAKmuB,kBAAmB,EACxB,IAAI7M,EAASthB,KAAKgd,YACduE,EAAYvhB,KAAKmpB,aAAa7H,EAAQthB,KAAKsoB,MAAO9hB,EAAe0O,IAOrE,OALKoM,EAAOvE,OAAOwE,IAClBvhB,KAAKmrB,MAAM5J,EAAWre,GAGvBlD,KAAKmuB,kBAAmB,EACjBnuB,MAgBRouB,eAAgB,SAAUlrB,GACzB,IAAKlD,KAAKqpB,QAAW,OAAOrpB,KAE5BkD,EAAUjD,GACTqpB,SAAS,EACTC,KAAK,IACS,IAAZrmB,GAAoBomB,SAAS,GAAQpmB,GAExC,IAAImrB,EAAUruB,KAAKqd,UACnBrd,KAAK6oB,cAAe,EACpB7oB,KAAKsuB,YAAc,KAEnB,IAAIC,EAAUvuB,KAAKqd,UACfmR,EAAYH,EAAQjS,SAAS,GAAGzZ,QAChC4e,EAAYgN,EAAQnS,SAAS,GAAGzZ,QAChCiM,EAAS4f,EAAUtS,SAASqF,GAEhC,OAAK3S,EAAO9M,GAAM8M,EAAO/I,GAErB3C,EAAQomB,SAAWpmB,EAAQqmB,IAC9BvpB,KAAKorB,MAAMxc,IAGP1L,EAAQqmB,KACXvpB,KAAK8rB,UAAUld,GAGhB5O,KAAK6a,KAAK,QAEN3X,EAAQurB,iBACXrV,aAAapZ,KAAK0pB,YAClB1pB,KAAK0pB,WAAa9nB,WAAWnB,EAAKT,KAAK6a,KAAM7a,KAAM,WAAY,MAE/DA,KAAK6a,KAAK,YAOL7a,KAAK6a,KAAK,UAChBwT,QAASA,EACTE,QAASA,KAzB2BvuB,MAgCtCkS,KAAM,WAKL,OAJAlS,KAAK4pB,QAAQ5pB,KAAKuoB,WAAWvoB,KAAKsoB,QAC7BtoB,KAAKkD,QAAQ4kB,UACjB9nB,KAAK6a,KAAK,aAEJ7a,KAAKopB,SAYbsF,OAAQ,SAAUxrB,GAWjB,GATAA,EAAUlD,KAAK2uB,eAAiB1uB,GAC/B2uB,QAAS,IACTC,OAAO,GAKL3rB,KAEG,gBAAiB+E,WAKtB,OAJAjI,KAAK8uB,yBACJnZ,KAAM,EACNoZ,QAAS,+BAEH/uB,KAGR,IAAIgvB,EAAavuB,EAAKT,KAAKivB,2BAA4BjvB,MACnDkvB,EAAUzuB,EAAKT,KAAK8uB,wBAAyB9uB,MAQjD,OANIkD,EAAQ2rB,MACX7uB,KAAKmvB,iBACGlnB,UAAUmnB,YAAYC,cAAcL,EAAYE,EAAShsB,GAEjE+E,UAAUmnB,YAAYE,mBAAmBN,EAAYE,EAAShsB,GAExDlD,MAORuvB,WAAY,WAOX,OANItnB,UAAUmnB,aAAennB,UAAUmnB,YAAYI,YAClDvnB,UAAUmnB,YAAYI,WAAWxvB,KAAKmvB,kBAEnCnvB,KAAK2uB,iBACR3uB,KAAK2uB,eAAenG,SAAU,GAExBxoB,MAGR8uB,wBAAyB,SAAUW,GAClC,IAAI1oB,EAAI0oB,EAAM9Z,KACVoZ,EAAUU,EAAMV,UACD,IAANhoB,EAAU,oBACJ,IAANA,EAAU,uBAAyB,WAE5C/G,KAAK2uB,eAAenG,UAAYxoB,KAAKqpB,SACxCrpB,KAAKkrB,WAMNlrB,KAAK6a,KAAK,iBACTlF,KAAM5O,EACNgoB,QAAS,sBAAwBA,EAAU,OAI7CE,2BAA4B,SAAUngB,GACrC,IAEI2H,EAAS,IAAIhQ,EAFPqI,EAAI6H,OAAO+Y,SACX5gB,EAAI6H,OAAOgZ,WAEjBza,EAASuB,EAAOtQ,SAA+B,EAAtB2I,EAAI6H,OAAOiZ,UACpC1sB,EAAUlD,KAAK2uB,eAEnB,GAAIzrB,EAAQslB,QAAS,CACpB,IAAIrI,EAAOngB,KAAK4qB,cAAc1V,GAC9BlV,KAAKwoB,QAAQ/R,EAAQvT,EAAQokB,QAAU7kB,KAAKP,IAAIie,EAAMjd,EAAQokB,SAAWnH,GAG1E,IAAIpc,GACH0S,OAAQA,EACRvB,OAAQA,EACR2a,UAAW/gB,EAAI+gB,WAGhB,IAAK,IAAI1vB,KAAK2O,EAAI6H,OACY,iBAAlB7H,EAAI6H,OAAOxW,KACrB4D,EAAK5D,GAAK2O,EAAI6H,OAAOxW,IAOvBH,KAAK6a,KAAK,gBAAiB9W,IAO5B+rB,WAAY,SAAUvrB,EAAMwrB,GAC3B,IAAKA,EAAgB,OAAO/vB,KAE5B,IAAIsI,EAAUtI,KAAKuE,GAAQ,IAAIwrB,EAAa/vB,MAQ5C,OANAA,KAAK0oB,UAAUjlB,KAAK6E,GAEhBtI,KAAKkD,QAAQqB,IAChB+D,EAAQ0nB,SAGFhwB,MAKR0M,OAAQ,WAIP,GAFA1M,KAAKooB,aAAY,GAEbpoB,KAAKiwB,eAAiBjwB,KAAKkwB,WAAW9uB,YACzC,MAAM,IAAI+C,MAAM,qDAGjB,WAEQnE,KAAKkwB,WAAW9uB,mBAChBpB,KAAKiwB,aACX,MAAOhnB,GAERjJ,KAAKkwB,WAAW9uB,iBAAcsB,EAE9B1C,KAAKiwB,kBAAevtB,OAGSA,IAA1B1C,KAAKmvB,kBACRnvB,KAAKuvB,aAGNvvB,KAAKopB,QAEL1c,EAAO1M,KAAK4rB,UAER5rB,KAAKmwB,kBACRnwB,KAAKmwB,mBAEFnwB,KAAKowB,iBACRprB,EAAgBhF,KAAKowB,gBACrBpwB,KAAKowB,eAAiB,MAGvBpwB,KAAKqwB,iBAEDrwB,KAAKqpB,SAIRrpB,KAAK6a,KAAK,UAGX,IAAI1a,EACJ,IAAKA,KAAKH,KAAK2oB,QACd3oB,KAAK2oB,QAAQxoB,GAAGuM,SAEjB,IAAKvM,KAAKH,KAAKswB,OACd5jB,EAAO1M,KAAKswB,OAAOnwB,IAQpB,OALAH,KAAK2oB,WACL3oB,KAAKswB,iBACEtwB,KAAK4rB,gBACL5rB,KAAKuwB,UAELvwB,MAQRwwB,WAAY,SAAUjsB,EAAMgI,GAC3B,IACIkkB,EAAOpkB,EAAS,MADJ,gBAAkB9H,EAAO,YAAcA,EAAKzB,QAAQ,OAAQ,IAAM,QAAU,IACtDyJ,GAAavM,KAAK4rB,UAKxD,OAHIrnB,IACHvE,KAAKswB,OAAO/rB,GAAQksB,GAEdA,GAORzT,UAAW,WAGV,OAFAhd,KAAK0wB,iBAED1wB,KAAKsuB,cAAgBtuB,KAAK2wB,SACtB3wB,KAAKsuB,YAENtuB,KAAK4wB,mBAAmB5wB,KAAK6wB,yBAKrCxF,QAAS,WACR,OAAOrrB,KAAKsoB,OAKbgC,UAAW,WACV,IAAIpV,EAASlV,KAAK8wB,iBAIlB,OAAO,IAAI1qB,EAHFpG,KAAK4gB,UAAU1L,EAAO+H,iBACtBjd,KAAK4gB,UAAU1L,EAAOgI,iBAOhC6T,WAAY,WACX,YAAgCruB,IAAzB1C,KAAKkD,QAAQmkB,QAAwBrnB,KAAKgxB,gBAAkB,EAAIhxB,KAAKkD,QAAQmkB,SAKrF4J,WAAY,WACX,YAAgCvuB,IAAzB1C,KAAKkD,QAAQokB,aACM5kB,IAAxB1C,KAAKkxB,eAA+BrG,EAAAA,EAAW7qB,KAAKkxB,eACrDlxB,KAAKkD,QAAQokB,SAQfsD,cAAe,SAAU1V,EAAQic,EAAQ1G,GACxCvV,EAAS1O,EAAe0O,GACxBuV,EAAU3kB,EAAQ2kB,IAAY,EAAG,IAEjC,IAAItK,EAAOngB,KAAKqrB,WAAa,EACzBnpB,EAAMlC,KAAK+wB,aACX9uB,EAAMjC,KAAKixB,aACXG,EAAKlc,EAAOyJ,eACZ0S,EAAKnc,EAAO4J,eACZ6O,EAAO3tB,KAAKqd,UAAUnB,SAASuO,GAC/B6G,EAAanrB,EAASnG,KAAKsgB,QAAQ+Q,EAAIlR,GAAOngB,KAAKsgB,QAAQ8Q,EAAIjR,IAAO9C,UACtEkU,EAAOniB,GAAQpP,KAAKkD,QAAQ4kB,SAAW,EACvC0J,EAAS7D,EAAK7rB,EAAIwvB,EAAWxvB,EAC7B2vB,EAAS9D,EAAK9nB,EAAIyrB,EAAWzrB,EAC7BgJ,EAAQsiB,EAAS1uB,KAAKR,IAAIuvB,EAAQC,GAAUhvB,KAAKP,IAAIsvB,EAAQC,GASjE,OAPAtR,EAAOngB,KAAKytB,aAAa5e,EAAOsR,GAE5BoR,IACHpR,EAAO1d,KAAKE,MAAMwd,GAAQoR,EAAO,OAASA,EAAO,KACjDpR,EAAOgR,EAAS1uB,KAAKsZ,KAAKoE,EAAOoR,GAAQA,EAAO9uB,KAAKqZ,MAAMqE,EAAOoR,GAAQA,GAGpE9uB,KAAKR,IAAIC,EAAKO,KAAKP,IAAID,EAAKke,KAKpC9C,QAAS,WAQR,OAPKrd,KAAK0xB,QAAS1xB,KAAK6oB,eACvB7oB,KAAK0xB,MAAQ,IAAI9rB,EAChB5F,KAAKkwB,WAAWyB,aAAe,EAC/B3xB,KAAKkwB,WAAW0B,cAAgB,GAEjC5xB,KAAK6oB,cAAe,GAEd7oB,KAAK0xB,MAAM1V,SAMnB8U,eAAgB,SAAUxP,EAAQnB,GACjC,IAAI0R,EAAe7xB,KAAK8xB,iBAAiBxQ,EAAQnB,GACjD,OAAO,IAAIpa,EAAO8rB,EAAcA,EAAajkB,IAAI5N,KAAKqd,aASvD0U,eAAgB,WAEf,OADA/xB,KAAK0wB,iBACE1wB,KAAKgyB,cAMbC,oBAAqB,SAAU9R,GAC9B,OAAOngB,KAAKkD,QAAQkkB,IAAIrG,wBAA4Bre,IAATyd,EAAqBngB,KAAKqrB,UAAYlL,IAOlF+R,QAAS,SAAUzB,GAClB,MAAuB,iBAATA,EAAoBzwB,KAAKswB,OAAOG,GAAQA,GAMvD0B,SAAU,WACT,OAAOnyB,KAAKswB,QAKb8B,aAAc,WACb,OAAOpyB,KAAKkwB,YASblG,aAAc,SAAUqI,EAAQC,GAE/B,IAAIlL,EAAMpnB,KAAKkD,QAAQkkB,IAEvB,OADAkL,OAAwB5vB,IAAb4vB,EAAyBtyB,KAAKsoB,MAAQgK,EAC1ClL,EAAIvY,MAAMwjB,GAAUjL,EAAIvY,MAAMyjB,IAOtC7E,aAAc,SAAU5e,EAAOyjB,GAC9B,IAAIlL,EAAMpnB,KAAKkD,QAAQkkB,IACvBkL,OAAwB5vB,IAAb4vB,EAAyBtyB,KAAKsoB,MAAQgK,EACjD,IAAInS,EAAOiH,EAAIjH,KAAKtR,EAAQuY,EAAIvY,MAAMyjB,IACtC,OAAOzrB,MAAMsZ,GAAQ0K,EAAAA,EAAW1K,GAQjCG,QAAS,SAAU7J,EAAQ0J,GAE1B,OADAA,OAAgBzd,IAATyd,EAAqBngB,KAAKsoB,MAAQnI,EAClCngB,KAAKkD,QAAQkkB,IAAIlH,cAAcpZ,EAAS2P,GAAS0J,IAKzDS,UAAW,SAAU1R,EAAOiR,GAE3B,OADAA,OAAgBzd,IAATyd,EAAqBngB,KAAKsoB,MAAQnI,EAClCngB,KAAKkD,QAAQkkB,IAAI3G,cAAc3a,EAAQoJ,GAAQiR,IAMvDyQ,mBAAoB,SAAU1hB,GAC7B,IAAIkR,EAAiBta,EAAQoJ,GAAOtB,IAAI5N,KAAK+xB,kBAC7C,OAAO/xB,KAAK4gB,UAAUR,IAMvBmS,mBAAoB,SAAU9b,GAE7B,OADqBzW,KAAKsgB,QAAQxZ,EAAS2P,IAASiG,SAC9BP,UAAUnc,KAAK+xB,mBAStCpS,WAAY,SAAUlJ,GACrB,OAAOzW,KAAKkD,QAAQkkB,IAAIzH,WAAW7Y,EAAS2P,KAS7C4K,iBAAkB,SAAU5K,GAC3B,OAAOzW,KAAKkD,QAAQkkB,IAAI/F,iBAAiB7a,EAAeiQ,KAMzDgJ,SAAU,SAAUkC,EAASC,GAC5B,OAAO5hB,KAAKkD,QAAQkkB,IAAI3H,SAAS3Y,EAAS6a,GAAU7a,EAAS8a,KAM9D4Q,2BAA4B,SAAUtjB,GACrC,OAAOpJ,EAAQoJ,GAAOgN,SAASlc,KAAK6rB,mBAMrC4G,2BAA4B,SAAUvjB,GACrC,OAAOpJ,EAAQoJ,GAAOtB,IAAI5N,KAAK6rB,mBAMhCzB,uBAAwB,SAAUlb,GACjC,IAAIwjB,EAAa1yB,KAAKwyB,2BAA2B1sB,EAAQoJ,IACzD,OAAOlP,KAAK4wB,mBAAmB8B,IAMhCvI,uBAAwB,SAAU1T,GACjC,OAAOzW,KAAKyyB,2BAA2BzyB,KAAKuyB,mBAAmBzrB,EAAS2P,MAMzEkc,2BAA4B,SAAU1pB,GACrC,OAAOkJ,GAAiBlJ,EAAGjJ,KAAKkwB,aAMjC0C,uBAAwB,SAAU3pB,GACjC,OAAOjJ,KAAKwyB,2BAA2BxyB,KAAK2yB,2BAA2B1pB,KAMxE4pB,mBAAoB,SAAU5pB,GAC7B,OAAOjJ,KAAK4wB,mBAAmB5wB,KAAK4yB,uBAAuB3pB,KAM5Dgf,eAAgB,SAAUhjB,GACzB,IAAIsH,EAAYvM,KAAKkwB,WAAarkB,EAAI5G,GAEtC,IAAKsH,EACJ,MAAM,IAAIpI,MAAM,4BACV,GAAIoI,EAAUnL,YACpB,MAAM,IAAI+C,MAAM,yCAGjBsL,GAAGlD,EAAW,SAAUvM,KAAK8yB,UAAW9yB,MACxCA,KAAKiwB,aAAe9uB,EAAMoL,IAG3B2b,YAAa,WACZ,IAAI3b,EAAYvM,KAAKkwB,WAErBlwB,KAAK+yB,cAAgB/yB,KAAKkD,QAAQykB,eAAiBvY,GAEnD1B,EAASnB,EAAW,qBAClB4E,GAAQ,iBAAmB,KAC3ByT,GAAS,kBAAoB,KAC7B7B,GAAQ,iBAAmB,KAC3BS,GAAS,kBAAoB,KAC7BxjB,KAAK+yB,cAAgB,qBAAuB,KAE9C,IAAIC,EAAWjnB,EAASQ,EAAW,YAElB,aAAbymB,GAAwC,aAAbA,GAAwC,UAAbA,IACzDzmB,EAAUP,MAAMgnB,SAAW,YAG5BhzB,KAAKizB,aAEDjzB,KAAKkzB,iBACRlzB,KAAKkzB,mBAIPD,WAAY,WACX,IAAIE,EAAQnzB,KAAKswB,UACjBtwB,KAAKozB,kBAcLpzB,KAAK4rB,SAAW5rB,KAAKwwB,WAAW,UAAWxwB,KAAKkwB,YAChDjhB,GAAYjP,KAAK4rB,SAAU,IAAIhmB,EAAM,EAAG,IAIxC5F,KAAKwwB,WAAW,YAGhBxwB,KAAKwwB,WAAW,cAGhBxwB,KAAKwwB,WAAW,eAGhBxwB,KAAKwwB,WAAW,cAGhBxwB,KAAKwwB,WAAW,eAGhBxwB,KAAKwwB,WAAW,aAEXxwB,KAAKkD,QAAQ0kB,sBACjBla,EAASylB,EAAME,WAAY,qBAC3B3lB,EAASylB,EAAMG,WAAY,uBAQ7B3J,WAAY,SAAUrI,EAAQnB,GAC7BlR,GAAYjP,KAAK4rB,SAAU,IAAIhmB,EAAM,EAAG,IAExC,IAAI2tB,GAAWvzB,KAAKqpB,QACpBrpB,KAAKqpB,SAAU,EACflJ,EAAOngB,KAAKuoB,WAAWpI,GAEvBngB,KAAK6a,KAAK,gBAEV,IAAI2Y,EAAcxzB,KAAKsoB,QAAUnI,EACjCngB,KACE4tB,WAAW4F,GAAa,GACxBnG,MAAM/L,EAAQnB,GACduN,SAAS8F,GAKXxzB,KAAK6a,KAAK,aAKN0Y,GACHvzB,KAAK6a,KAAK,SAIZ+S,WAAY,SAAU4F,EAAa7H,GAWlC,OANI6H,GACHxzB,KAAK6a,KAAK,aAEN8Q,GACJ3rB,KAAK6a,KAAK,aAEJ7a,MAGRqtB,MAAO,SAAU/L,EAAQnB,EAAMpc,QACjBrB,IAATyd,IACHA,EAAOngB,KAAKsoB,OAEb,IAAIkL,EAAcxzB,KAAKsoB,QAAUnI,EAgBjC,OAdAngB,KAAKsoB,MAAQnI,EACbngB,KAAKsuB,YAAchN,EACnBthB,KAAKgyB,aAAehyB,KAAKyzB,mBAAmBnS,IAKxCkS,GAAgBzvB,GAAQA,EAAK2vB,QAChC1zB,KAAK6a,KAAK,OAAQ9W,GAMZ/D,KAAK6a,KAAK,OAAQ9W,IAG1B2pB,SAAU,SAAU8F,GAUnB,OAPIA,GACHxzB,KAAK6a,KAAK,WAMJ7a,KAAK6a,KAAK,YAGlBuO,MAAO,WAKN,OAJApkB,EAAgBhF,KAAKotB,aACjBptB,KAAKsrB,UACRtrB,KAAKsrB,SAASpZ,OAERlS,MAGR8rB,UAAW,SAAUld,GACpBK,GAAYjP,KAAK4rB,SAAU5rB,KAAK6rB,iBAAiB3P,SAAStN,KAG3D+kB,aAAc,WACb,OAAO3zB,KAAKixB,aAAejxB,KAAK+wB,cAGjCjD,oBAAqB,WACf9tB,KAAKmuB,kBACTnuB,KAAKkuB,gBAAgBluB,KAAKkD,QAAQqkB,YAIpCmJ,eAAgB,WACf,IAAK1wB,KAAKqpB,QACT,MAAM,IAAIllB,MAAM,mCAOlBikB,YAAa,SAAUwL,GACtB5zB,KAAK6zB,YACL7zB,KAAK6zB,SAAS1yB,EAAMnB,KAAKkwB,aAAelwB,KAExC,IAAI8zB,EAAQF,EAAYjkB,GAAMF,GAuB9BqkB,EAAM9zB,KAAKkwB,WAAY,qFAC+BlwB,KAAK+zB,gBAAiB/zB,MAExEA,KAAKkD,QAAQ8kB,aAChB8L,EAAMtvB,OAAQ,SAAUxE,KAAKmoB,UAAWnoB,MAGrCoP,IAASpP,KAAKkD,QAAQ2kB,mBACxB+L,EAAY5zB,KAAK2P,IAAM3P,KAAKyP,IAAIzO,KAAKhB,KAAM,UAAWA,KAAKg0B,aAI9D7L,UAAW,WACVnjB,EAAgBhF,KAAKowB,gBACrBpwB,KAAKowB,eAAiBvrB,EACd,WAAc7E,KAAKouB,gBAAgBK,iBAAiB,KAAWzuB,OAGxE8yB,UAAW,WACV9yB,KAAKkwB,WAAW+D,UAAa,EAC7Bj0B,KAAKkwB,WAAWgE,WAAa,GAG9BF,WAAY,WACX,IAAIllB,EAAM9O,KAAK6rB,iBACXppB,KAAKR,IAAIQ,KAAKwQ,IAAInE,EAAIhN,GAAIW,KAAKwQ,IAAInE,EAAIjJ,KAAO7F,KAAKkD,QAAQ2kB,kBAG9D7nB,KAAK2pB,WAAW3pB,KAAKgd,YAAahd,KAAKqrB,YAIzC8I,kBAAmB,SAAUlrB,EAAGZ,GAO/B,IANA,IACIgB,EADA+qB,KAEAC,EAAmB,aAAThsB,GAAgC,cAATA,EACjC/H,EAAM2I,EAAEI,QAAUJ,EAAEqrB,WACpBC,GAAW,EAERj0B,GAAK,CAEX,IADA+I,EAASrJ,KAAK6zB,SAAS1yB,EAAMb,OACL,UAAT+H,GAA6B,aAATA,KAAyBY,EAAE0K,YAAc3T,KAAKw0B,gBAAgBnrB,GAAS,CAEzGkrB,GAAW,EACX,MAED,GAAIlrB,GAAUA,EAAO0R,QAAQ1S,GAAM,GAAO,CACzC,GAAIgsB,IAAYhjB,GAAiB/Q,EAAK2I,GAAM,MAE5C,GADAmrB,EAAQ3wB,KAAK4F,GACTgrB,EAAW,MAEhB,GAAI/zB,IAAQN,KAAKkwB,WAAc,MAC/B5vB,EAAMA,EAAIsM,WAKX,OAHKwnB,EAAQ5zB,QAAW+zB,GAAaF,IAAWhjB,GAAiB/Q,EAAK2I,KACrEmrB,GAAWp0B,OAELo0B,GAGRL,gBAAiB,SAAU9qB,GAC1B,GAAKjJ,KAAKqpB,UAAWxX,GAAQ5I,GAA7B,CAEA,IAAIZ,EAAOY,EAAEZ,KAEA,cAATA,GAAiC,aAATA,GAE3BuH,GAAe3G,EAAEI,QAAUJ,EAAEqrB,YAG9Bt0B,KAAKy0B,cAAcxrB,EAAGZ,KAGvBqsB,cAAe,QAAS,WAAY,YAAa,WAAY,eAE7DD,cAAe,SAAUxrB,EAAGZ,EAAM+rB,GAEjC,GAAe,UAAXnrB,EAAEZ,KAAkB,CAMvB,IAAIssB,EAAQ10B,KAAWgJ,GACvB0rB,EAAMtsB,KAAO,WACbrI,KAAKy0B,cAAcE,EAAOA,EAAMtsB,KAAM+rB,GAGvC,IAAInrB,EAAE2I,WAGNwiB,GAAWA,OAAelzB,OAAOlB,KAAKm0B,kBAAkBlrB,EAAGZ,KAE9C7H,OAAb,CAEA,IAAI6I,EAAS+qB,EAAQ,GACR,gBAAT/rB,GAA0BgB,EAAO0R,QAAQ1S,GAAM,IAClDkB,GAAeN,GAGhB,IAAIlF,GACH4N,cAAe1I,GAGhB,GAAe,aAAXA,EAAEZ,KAAqB,CAC1B,IAAIusB,EAAWvrB,EAAOwrB,aAAexrB,EAAOyrB,SAAWzrB,EAAOyrB,SAAW,IACzE/wB,EAAKgxB,eAAiBH,EACrB50B,KAAKmqB,uBAAuB9gB,EAAOwrB,aAAe70B,KAAK2yB,2BAA2B1pB,GACnFlF,EAAK2uB,WAAa1yB,KAAKwyB,2BAA2BzuB,EAAKgxB,gBACvDhxB,EAAK0S,OAASme,EAAWvrB,EAAOwrB,YAAc70B,KAAK4wB,mBAAmB7sB,EAAK2uB,YAG5E,IAAK,IAAIvyB,EAAI,EAAGA,EAAIi0B,EAAQ5zB,OAAQL,IAEnC,GADAi0B,EAAQj0B,GAAG0a,KAAKxS,EAAMtE,GAAM,GACxBA,EAAK4N,cAAcC,WACsB,IAA3CwiB,EAAQj0B,GAAG+C,QAAQ8xB,sBAAuE,IAAtCpxB,EAAQ5D,KAAK00B,aAAcrsB,GAAiB,SAIpGmsB,gBAAiB,SAAU7zB,GAE1B,OADAA,EAAMA,EAAI4zB,UAAY5zB,EAAI4zB,SAASU,UAAYt0B,EAAMX,MACzCu0B,UAAY5zB,EAAI4zB,SAASW,SAAal1B,KAAKm1B,SAAWn1B,KAAKm1B,QAAQD,SAGhF7E,eAAgB,WACf,IAAK,IAAIlwB,EAAI,EAAGE,EAAML,KAAK0oB,UAAUloB,OAAQL,EAAIE,EAAKF,IACrDH,KAAK0oB,UAAUvoB,GAAGi1B,WAUpBC,UAAW,SAAUC,EAAU9zB,GAM9B,OALIxB,KAAKqpB,QACRiM,EAASt0B,KAAKQ,GAAWxB,MAAOqJ,OAAQrJ,OAExCA,KAAKyP,GAAG,OAAQ6lB,EAAU9zB,GAEpBxB,MAMR6rB,eAAgB,WACf,OAAOtc,GAAYvP,KAAK4rB,WAAa,IAAIhmB,EAAM,EAAG,IAGnD+qB,OAAQ,WACP,IAAI7hB,EAAM9O,KAAK6rB,iBACf,OAAO/c,IAAQA,EAAIiO,QAAQ,EAAG,KAG/B+U,iBAAkB,SAAUxQ,EAAQnB,GAInC,OAHkBmB,QAAmB5e,IAATyd,EAC3BngB,KAAKyzB,mBAAmBnS,EAAQnB,GAChCngB,KAAK+xB,kBACa7V,SAASlc,KAAK6rB,mBAGlC4H,mBAAoB,SAAUnS,EAAQnB,GACrC,IAAI8J,EAAWjqB,KAAKqd,UAAUhB,UAAU,GACxC,OAAOrc,KAAKsgB,QAAQgB,EAAQnB,GAAMhE,UAAU8N,GAAUhO,KAAKjc,KAAK6rB,kBAAkBnP,UAGnF6Y,uBAAwB,SAAU9e,EAAQ0J,EAAMmB,GAC/C,IAAIkU,EAAUx1B,KAAKyzB,mBAAmBnS,EAAQnB,GAC9C,OAAOngB,KAAKsgB,QAAQ7J,EAAQ0J,GAAMhE,UAAUqZ,IAG7CC,8BAA+B,SAAUC,EAAcvV,EAAMmB,GAC5D,IAAIkU,EAAUx1B,KAAKyzB,mBAAmBnS,EAAQnB,GAC9C,OAAOha,GACNnG,KAAKsgB,QAAQoV,EAAajX,eAAgB0B,GAAMhE,UAAUqZ,GAC1Dx1B,KAAKsgB,QAAQoV,EAAa/W,eAAgBwB,GAAMhE,UAAUqZ,GAC1Dx1B,KAAKsgB,QAAQoV,EAAa5W,eAAgBqB,GAAMhE,UAAUqZ,GAC1Dx1B,KAAKsgB,QAAQoV,EAAahX,eAAgByB,GAAMhE,UAAUqZ,MAK5D3E,qBAAsB,WACrB,OAAO7wB,KAAKwyB,2BAA2BxyB,KAAKqd,UAAUhB,UAAU,KAIjEsZ,iBAAkB,SAAUlf,GAC3B,OAAOzW,KAAKuyB,mBAAmB9b,GAAQyF,SAASlc,KAAK6wB,yBAItD1H,aAAc,SAAU7H,EAAQnB,EAAMjL,GAErC,IAAKA,EAAU,OAAOoM,EAEtB,IAAIsU,EAAc51B,KAAKsgB,QAAQgB,EAAQnB,GACnC8J,EAAWjqB,KAAKqd,UAAUjB,SAAS,GACnCyZ,EAAa,IAAI9vB,EAAO6vB,EAAY1Z,SAAS+N,GAAW2L,EAAYhoB,IAAIqc,IACxErb,EAAS5O,KAAK81B,iBAAiBD,EAAY3gB,EAAQiL,GAKvD,OAAIvR,EAAOjM,QAAQoa,QAAQ,EAAG,IACtBuE,EAGDthB,KAAK4gB,UAAUgV,EAAYhoB,IAAIgB,GAASuR,IAIhD4V,aAAc,SAAUnnB,EAAQsG,GAC/B,IAAKA,EAAU,OAAOtG,EAEtB,IAAIinB,EAAa71B,KAAK8wB,iBAClBkF,EAAY,IAAIjwB,EAAO8vB,EAAW3zB,IAAI0L,IAAIgB,GAASinB,EAAW5zB,IAAI2L,IAAIgB,IAE1E,OAAOA,EAAOhB,IAAI5N,KAAK81B,iBAAiBE,EAAW9gB,KAIpD4gB,iBAAkB,SAAUG,EAAU1O,EAAWpH,GAChD,IAAI+V,EAAqB/vB,EACjBnG,KAAKsgB,QAAQiH,EAAU7I,eAAgByB,GACvCngB,KAAKsgB,QAAQiH,EAAU9I,eAAgB0B,IAE3CgW,EAAYD,EAAmBh0B,IAAIga,SAAS+Z,EAAS/zB,KACrDk0B,EAAYF,EAAmBj0B,IAAIia,SAAS+Z,EAASh0B,KAKzD,OAAO,IAAI2D,EAHF5F,KAAKq2B,SAASF,EAAUr0B,GAAIs0B,EAAUt0B,GACtC9B,KAAKq2B,SAASF,EAAUtwB,GAAIuwB,EAAUvwB,KAKhDwwB,SAAU,SAAUhnB,EAAMinB,GACzB,OAAOjnB,EAAOinB,EAAQ,EACrB7zB,KAAKE,MAAM0M,EAAOinB,GAAS,EAC3B7zB,KAAKR,IAAI,EAAGQ,KAAKsZ,KAAK1M,IAAS5M,KAAKR,IAAI,EAAGQ,KAAKqZ,MAAMwa,KAGxD/N,WAAY,SAAUpI,GACrB,IAAIje,EAAMlC,KAAK+wB,aACX9uB,EAAMjC,KAAKixB,aACXM,EAAOniB,GAAQpP,KAAKkD,QAAQ4kB,SAAW,EAI3C,OAHIyJ,IACHpR,EAAO1d,KAAKE,MAAMwd,EAAOoR,GAAQA,GAE3B9uB,KAAKR,IAAIC,EAAKO,KAAKP,IAAID,EAAKke,KAGpCqL,qBAAsB,WACrBxrB,KAAK6a,KAAK,SAGX6Q,oBAAqB,WACpB5d,GAAY9N,KAAK4rB,SAAU,oBAC3B5rB,KAAK6a,KAAK,YAGX4O,gBAAiB,SAAUnI,EAAQpe,GAElC,IAAI0L,EAAS5O,KAAK21B,iBAAiBrU,GAAQzE,SAG3C,SAAqC,KAAhC3Z,GAAWA,EAAQomB,WAAsBtpB,KAAKqd,UAAU/P,SAASsB,MAEtE5O,KAAKorB,MAAMxc,EAAQ1L,IAEZ,IAGR6lB,iBAAkB,WAEjB,IAAIwN,EAAQv2B,KAAKgpB,OAAS3c,EAAS,MAAO,uCAC1CrM,KAAKswB,OAAOkG,QAAQ/pB,YAAY8pB,GAEhCv2B,KAAKyP,GAAG,WAAY,SAAUxG,GAC7B,IAAImC,EAAO2D,GACPmS,EAAYlhB,KAAKgpB,OAAOhd,MAAMZ,GAElCuD,GAAa3O,KAAKgpB,OAAQhpB,KAAKsgB,QAAQrX,EAAEqY,OAAQrY,EAAEkX,MAAOngB,KAAKgqB,aAAa/gB,EAAEkX,KAAM,IAGhFe,IAAclhB,KAAKgpB,OAAOhd,MAAMZ,IAASpL,KAAKy2B,gBACjDz2B,KAAK02B,wBAEJ12B,MAEHA,KAAKyP,GAAG,eAAgB,WACvB,IAAI1I,EAAI/G,KAAKgd,YACT2Z,EAAI32B,KAAKqrB,UACb1c,GAAa3O,KAAKgpB,OAAQhpB,KAAKsgB,QAAQvZ,EAAG4vB,GAAI32B,KAAKgqB,aAAa2M,EAAG,KACjE32B,MAEHA,KAAKma,IAAI,SAAUna,KAAK42B,kBAAmB52B,OAG5C42B,kBAAmB,WAClBlqB,EAAO1M,KAAKgpB,eACLhpB,KAAKgpB,QAGbC,oBAAqB,SAAUhgB,GAC1BjJ,KAAKy2B,gBAAkBxtB,EAAE4tB,aAAajzB,QAAQ,cAAgB,GACjE5D,KAAK02B,wBAIPI,kBAAmB,WAClB,OAAQ92B,KAAKkwB,WAAW6G,uBAAuB,yBAAyBv2B,QAGzEgpB,iBAAkB,SAAUlI,EAAQnB,EAAMjd,GAEzC,GAAIlD,KAAKy2B,eAAkB,OAAO,EAKlC,GAHAvzB,EAAUA,OAGLlD,KAAK8oB,gBAAqC,IAApB5lB,EAAQomB,SAAqBtpB,KAAK82B,qBACrDr0B,KAAKwQ,IAAIkN,EAAOngB,KAAKsoB,OAAStoB,KAAKkD,QAAQwkB,uBAA0B,OAAO,EAGpF,IAAI7Y,EAAQ7O,KAAKgqB,aAAa7J,GAC1BvR,EAAS5O,KAAK21B,iBAAiBrU,GAAQjF,UAAU,EAAI,EAAIxN,GAG7D,SAAwB,IAApB3L,EAAQomB,UAAqBtpB,KAAKqd,UAAU/P,SAASsB,MAEzD/J,EAAiB,WAChB7E,KACK4tB,YAAW,GAAM,GACjBoJ,aAAa1V,EAAQnB,GAAM,IAC9BngB,OAEI,IAGRg3B,aAAc,SAAU1V,EAAQnB,EAAM8W,EAAWC,GAC3Cl3B,KAAK4rB,WAENqL,IACHj3B,KAAKy2B,gBAAiB,EAGtBz2B,KAAKm3B,iBAAmB7V,EACxBthB,KAAKo3B,eAAiBjX,EAEtBzS,EAAS1N,KAAK4rB,SAAU,sBAKzB5rB,KAAK6a,KAAK,YACTyG,OAAQA,EACRnB,KAAMA,EACN+W,SAAUA,IAIXt1B,WAAWnB,EAAKT,KAAK02B,qBAAsB12B,MAAO,OAGnD02B,qBAAsB,WAChB12B,KAAKy2B,iBAENz2B,KAAK4rB,UACR9d,GAAY9N,KAAK4rB,SAAU,qBAG5B5rB,KAAKy2B,gBAAiB,EAEtBz2B,KAAKqtB,MAAMrtB,KAAKm3B,iBAAkBn3B,KAAKo3B,gBAGvCvyB,EAAiB,WAChB7E,KAAK0tB,UAAS,IACZ1tB,UA2BDq3B,GAAUlyB,EAAMlF,QAGnBiD,SAIC8vB,SAAU,YAGXzZ,WAAY,SAAUrW,GACrBD,EAAWjD,KAAMkD,IASlBqM,YAAa,WACZ,OAAOvP,KAAKkD,QAAQ8vB,UAKrB/jB,YAAa,SAAU+jB,GACtB,IAAIsE,EAAMt3B,KAAKu3B,KAYf,OAVID,GACHA,EAAIE,cAAcx3B,MAGnBA,KAAKkD,QAAQ8vB,SAAWA,EAEpBsE,GACHA,EAAIG,WAAWz3B,MAGTA,MAKRoyB,aAAc,WACb,OAAOpyB,KAAKkwB,YAKbwH,MAAO,SAAUJ,GAChBt3B,KAAK0M,SACL1M,KAAKu3B,KAAOD,EAEZ,IAAI/qB,EAAYvM,KAAKkwB,WAAalwB,KAAK23B,MAAML,GACzCxoB,EAAM9O,KAAKuP,cACXqoB,EAASN,EAAIO,gBAAgB/oB,GAUjC,OARApB,EAASnB,EAAW,oBAEW,IAA3BuC,EAAIlL,QAAQ,UACfg0B,EAAOzqB,aAAaZ,EAAWqrB,EAAO7qB,YAEtC6qB,EAAOnrB,YAAYF,GAGbvM,MAKR0M,OAAQ,WACP,OAAK1M,KAAKu3B,MAIV7qB,EAAO1M,KAAKkwB,YAERlwB,KAAK83B,UACR93B,KAAK83B,SAAS93B,KAAKu3B,MAGpBv3B,KAAKu3B,KAAO,KAELv3B,MAXCA,MAcT+3B,cAAe,SAAU9uB,GAEpBjJ,KAAKu3B,MAAQtuB,GAAKA,EAAE+uB,QAAU,GAAK/uB,EAAEgvB,QAAU,GAClDj4B,KAAKu3B,KAAKnF,eAAe8F,WAKxBC,GAAU,SAAUj1B,GACvB,OAAO,IAAIm0B,GAAQn0B,IAkBpBikB,GAAIpN,SAGH0d,WAAY,SAAUU,GAErB,OADAA,EAAQT,MAAM13B,MACPA,MAKRw3B,cAAe,SAAUW,GAExB,OADAA,EAAQzrB,SACD1M,MAGRkzB,gBAAiB,WAMhB,SAASkF,EAAaC,EAAOC,GAC5B,IAAIhsB,EAAYoO,EAAI2d,EAAQ,IAAM3d,EAAI4d,EAEtCC,EAAQF,EAAQC,GAASjsB,EAAS,MAAOC,EAAWC,GARrD,IAAIgsB,EAAUv4B,KAAK63B,mBACfnd,EAAI,WACJnO,EAAYvM,KAAKw4B,kBACTnsB,EAAS,MAAOqO,EAAI,oBAAqB1a,KAAKkwB,YAQ1DkI,EAAa,MAAO,QACpBA,EAAa,MAAO,SACpBA,EAAa,SAAU,QACvBA,EAAa,SAAU,UAGxBjI,iBAAkB,WACjB,IAAK,IAAIhwB,KAAKH,KAAK63B,gBAClBnrB,EAAO1M,KAAK63B,gBAAgB13B,IAE7BuM,EAAO1M,KAAKw4B,0BACLx4B,KAAK63B,uBACL73B,KAAKw4B,qBA2Cd,IAAIC,GAASpB,GAAQp3B,QAGpBiD,SAGCw1B,WAAW,EACX1F,SAAU,WAIV2F,YAAY,EAIZC,gBAAgB,EAKhBC,YAAY,EAQZC,aAAc,SAAUC,EAAQC,EAAQC,EAAOC,GAC9C,OAAOD,EAAQC,GAAS,EAAKA,EAAQD,EAAQ,EAAI,IAInD1f,WAAY,SAAU4f,EAAYC,EAAUl2B,GAC3CD,EAAWjD,KAAMkD,GAEjBlD,KAAKq5B,uBACLr5B,KAAK2oB,WACL3oB,KAAKs5B,YAAc,EACnBt5B,KAAKu5B,gBAAiB,EAEtB,IAAK,IAAIp5B,KAAKg5B,EACbn5B,KAAKw5B,UAAUL,EAAWh5B,GAAIA,GAG/B,IAAKA,KAAKi5B,EACTp5B,KAAKw5B,UAAUJ,EAASj5B,GAAIA,GAAG,IAIjCw3B,MAAO,SAAUL,GAChBt3B,KAAKkoB,cACLloB,KAAKy5B,UAELz5B,KAAKu3B,KAAOD,EACZA,EAAI7nB,GAAG,UAAWzP,KAAK05B,qBAAsB15B,MAE7C,IAAK,IAAIG,EAAI,EAAGA,EAAIH,KAAK2oB,QAAQnoB,OAAQL,IACxCH,KAAK2oB,QAAQxoB,GAAGoX,MAAM9H,GAAG,aAAczP,KAAK25B,eAAgB35B,MAG7D,OAAOA,KAAKkwB,YAGbwH,MAAO,SAAUJ,GAGhB,OAFAD,GAAQv2B,UAAU42B,MAAM12B,KAAKhB,KAAMs3B,GAE5Bt3B,KAAK45B,yBAGb9B,SAAU,WACT93B,KAAKu3B,KAAK5nB,IAAI,UAAW3P,KAAK05B,qBAAsB15B,MAEpD,IAAK,IAAIG,EAAI,EAAGA,EAAIH,KAAK2oB,QAAQnoB,OAAQL,IACxCH,KAAK2oB,QAAQxoB,GAAGoX,MAAM5H,IAAI,aAAc3P,KAAK25B,eAAgB35B,OAM/D65B,aAAc,SAAUtiB,EAAOhT,GAE9B,OADAvE,KAAKw5B,UAAUjiB,EAAOhT,GACdvE,KAAS,KAAIA,KAAKy5B,UAAYz5B,MAKvC85B,WAAY,SAAUviB,EAAOhT,GAE5B,OADAvE,KAAKw5B,UAAUjiB,EAAOhT,GAAM,GACpBvE,KAAS,KAAIA,KAAKy5B,UAAYz5B,MAKvC+5B,YAAa,SAAUxiB,GACtBA,EAAM5H,IAAI,aAAc3P,KAAK25B,eAAgB35B,MAE7C,IAAIW,EAAMX,KAAKg6B,UAAU74B,EAAMoW,IAI/B,OAHI5W,GACHX,KAAK2oB,QAAQ/N,OAAO5a,KAAK2oB,QAAQ/kB,QAAQjD,GAAM,GAExCX,KAAS,KAAIA,KAAKy5B,UAAYz5B,MAKvCi6B,OAAQ,WACPvsB,EAAS1N,KAAKkwB,WAAY,mCAC1BlwB,KAAKk6B,MAAMluB,MAAM2E,OAAS,KAC1B,IAAIwpB,EAAmBn6B,KAAKu3B,KAAKla,UAAUxX,GAAK7F,KAAKkwB,WAAWkK,UAAY,IAQ5E,OAPID,EAAmBn6B,KAAKk6B,MAAMtI,cACjClkB,EAAS1N,KAAKk6B,MAAO,oCACrBl6B,KAAKk6B,MAAMluB,MAAM2E,OAASwpB,EAAmB,MAE7CrsB,GAAY9N,KAAKk6B,MAAO,oCAEzBl6B,KAAK05B,uBACE15B,MAKRq6B,SAAU,WAET,OADAvsB,GAAY9N,KAAKkwB,WAAY,mCACtBlwB,MAGRkoB,YAAa,WACZ,IAAI5b,EAAY,yBACZC,EAAYvM,KAAKkwB,WAAa7jB,EAAS,MAAOC,GAC9CosB,EAAY14B,KAAKkD,QAAQw1B,UAG7BnsB,EAAU+tB,aAAa,iBAAiB,GAExCvoB,GAAwBxF,GACxBuF,GAAyBvF,GAEzB,IAAIguB,EAAOv6B,KAAKk6B,MAAQ7tB,EAAS,OAAQC,EAAY,SAEjDosB,IACH14B,KAAKu3B,KAAK9nB,GAAG,QAASzP,KAAKq6B,SAAUr6B,MAEhCsR,IACJ7B,GAAGlD,GACFiuB,WAAYx6B,KAAKi6B,OACjBQ,WAAYz6B,KAAKq6B,UACfr6B,OAIL,IAAI06B,EAAO16B,KAAK26B,YAActuB,EAAS,IAAKC,EAAY,UAAWC,GACnEmuB,EAAKE,KAAO,IACZF,EAAKG,MAAQ,SAET1pB,IACH1B,GAAGirB,EAAM,QAASxoB,IAClBzC,GAAGirB,EAAM,QAAS16B,KAAKi6B,OAAQj6B,OAE/ByP,GAAGirB,EAAM,QAAS16B,KAAKi6B,OAAQj6B,MAG3B04B,GACJ14B,KAAKi6B,SAGNj6B,KAAK86B,gBAAkBzuB,EAAS,MAAOC,EAAY,QAASiuB,GAC5Dv6B,KAAK+6B,WAAa1uB,EAAS,MAAOC,EAAY,aAAciuB,GAC5Dv6B,KAAKg7B,cAAgB3uB,EAAS,MAAOC,EAAY,YAAaiuB,GAE9DhuB,EAAUE,YAAY8tB,IAGvBP,UAAW,SAAU/0B,GACpB,IAAK,IAAI9E,EAAI,EAAGA,EAAIH,KAAK2oB,QAAQnoB,OAAQL,IAExC,GAAIH,KAAK2oB,QAAQxoB,IAAMgB,EAAMnB,KAAK2oB,QAAQxoB,GAAGoX,SAAWtS,EACvD,OAAOjF,KAAK2oB,QAAQxoB,IAKvBq5B,UAAW,SAAUjiB,EAAOhT,EAAM02B,GAC7Bj7B,KAAKu3B,MACRhgB,EAAM9H,GAAG,aAAczP,KAAK25B,eAAgB35B,MAG7CA,KAAK2oB,QAAQllB,MACZ8T,MAAOA,EACPhT,KAAMA,EACN02B,QAASA,IAGNj7B,KAAKkD,QAAQ21B,YAChB74B,KAAK2oB,QAAQuS,KAAKz6B,EAAK,SAAUuF,EAAGC,GACnC,OAAOjG,KAAKkD,QAAQ41B,aAAa9yB,EAAEuR,MAAOtR,EAAEsR,MAAOvR,EAAEzB,KAAM0B,EAAE1B,OAC3DvE,OAGAA,KAAKkD,QAAQy1B,YAAcphB,EAAM4jB,YACpCn7B,KAAKs5B,cACL/hB,EAAM4jB,UAAUn7B,KAAKs5B,cAGtBt5B,KAAK45B,yBAGNH,QAAS,WACR,IAAKz5B,KAAKkwB,WAAc,OAAOlwB,KAE/B8M,EAAM9M,KAAK86B,iBACXhuB,EAAM9M,KAAKg7B,eAEXh7B,KAAKq5B,uBACL,IAAI+B,EAAmBC,EAAiBl7B,EAAGQ,EAAK26B,EAAkB,EAElE,IAAKn7B,EAAI,EAAGA,EAAIH,KAAK2oB,QAAQnoB,OAAQL,IACpCQ,EAAMX,KAAK2oB,QAAQxoB,GACnBH,KAAKu7B,SAAS56B,GACd06B,EAAkBA,GAAmB16B,EAAIs6B,QACzCG,EAAoBA,IAAsBz6B,EAAIs6B,QAC9CK,GAAoB36B,EAAIs6B,QAAc,EAAJ,EAWnC,OAPIj7B,KAAKkD,QAAQ01B,iBAChBwC,EAAoBA,GAAqBE,EAAkB,EAC3Dt7B,KAAK86B,gBAAgB9uB,MAAMwvB,QAAUJ,EAAoB,GAAK,QAG/Dp7B,KAAK+6B,WAAW/uB,MAAMwvB,QAAUH,GAAmBD,EAAoB,GAAK,OAErEp7B,MAGR25B,eAAgB,SAAU1wB,GACpBjJ,KAAKu5B,gBACTv5B,KAAKy5B,UAGN,IAAI94B,EAAMX,KAAKg6B,UAAU74B,EAAM8H,EAAEI,SAW7BhB,EAAO1H,EAAIs6B,QACF,QAAXhyB,EAAEZ,KAAiB,aAAe,gBACvB,QAAXY,EAAEZ,KAAiB,kBAAoB,KAErCA,GACHrI,KAAKu3B,KAAK1c,KAAKxS,EAAM1H,IAKvB86B,oBAAqB,SAAUl3B,EAAMm3B,GAEpC,IAAIC,EAAY,qEACdp3B,EAAO,KAAOm3B,EAAU,qBAAuB,IAAM,KAEnDE,EAAgBp0B,SAASgF,cAAc,OAG3C,OAFAovB,EAAcxW,UAAYuW,EAEnBC,EAAc7uB,YAGtBwuB,SAAU,SAAU56B,GACnB,IAEIk7B,EAFAC,EAAQt0B,SAASgF,cAAc,SAC/BkvB,EAAU17B,KAAKu3B,KAAKwE,SAASp7B,EAAI4W,OAGjC5W,EAAIs6B,UACPY,EAAQr0B,SAASgF,cAAc,UACzBnE,KAAO,WACbwzB,EAAMvvB,UAAY,kCAClBuvB,EAAMG,eAAiBN,GAEvBG,EAAQ77B,KAAKy7B,oBAAoB,sBAAuBC,GAGzD17B,KAAKq5B,oBAAoB51B,KAAKo4B,GAC9BA,EAAMI,QAAU96B,EAAMR,EAAI4W,OAE1B9H,GAAGosB,EAAO,QAAS77B,KAAKk8B,cAAel8B,MAEvC,IAAIuE,EAAOiD,SAASgF,cAAc,QAClCjI,EAAK6gB,UAAY,IAAMzkB,EAAI4D,KAI3B,IAAI43B,EAAS30B,SAASgF,cAAc,OAUpC,OARAsvB,EAAMrvB,YAAY0vB,GAClBA,EAAO1vB,YAAYovB,GACnBM,EAAO1vB,YAAYlI,IAEH5D,EAAIs6B,QAAUj7B,KAAKg7B,cAAgBh7B,KAAK86B,iBAC9CruB,YAAYqvB,GAEtB97B,KAAK05B,uBACEoC,GAGRI,cAAe,WACd,IACIL,EAAOtkB,EADP6kB,EAASp8B,KAAKq5B,oBAEdgD,KACAC,KAEJt8B,KAAKu5B,gBAAiB,EAEtB,IAAK,IAAIp5B,EAAIi8B,EAAO57B,OAAS,EAAGL,GAAK,EAAGA,IACvC07B,EAAQO,EAAOj8B,GACfoX,EAAQvX,KAAKg6B,UAAU6B,EAAMI,SAAS1kB,MAElCskB,EAAMH,QACTW,EAAY54B,KAAK8T,GACNskB,EAAMH,SACjBY,EAAc74B,KAAK8T,GAKrB,IAAKpX,EAAI,EAAGA,EAAIm8B,EAAc97B,OAAQL,IACjCH,KAAKu3B,KAAKwE,SAASO,EAAcn8B,KACpCH,KAAKu3B,KAAKwC,YAAYuC,EAAcn8B,IAGtC,IAAKA,EAAI,EAAGA,EAAIk8B,EAAY77B,OAAQL,IAC9BH,KAAKu3B,KAAKwE,SAASM,EAAYl8B,KACnCH,KAAKu3B,KAAKgF,SAASF,EAAYl8B,IAIjCH,KAAKu5B,gBAAiB,EAEtBv5B,KAAK+3B,iBAGN2B,qBAAsB,WAMrB,IAAK,IAJDmC,EACAtkB,EAFA6kB,EAASp8B,KAAKq5B,oBAGdlZ,EAAOngB,KAAKu3B,KAAKlM,UAEZlrB,EAAIi8B,EAAO57B,OAAS,EAAGL,GAAK,EAAGA,IACvC07B,EAAQO,EAAOj8B,GACfoX,EAAQvX,KAAKg6B,UAAU6B,EAAMI,SAAS1kB,MACtCskB,EAAMW,cAAsC95B,IAA1B6U,EAAMrU,QAAQmkB,SAAyBlH,EAAO5I,EAAMrU,QAAQmkB,cAClC3kB,IAA1B6U,EAAMrU,QAAQokB,SAAyBnH,EAAO5I,EAAMrU,QAAQokB,SAKhFsS,sBAAuB,WAItB,OAHI55B,KAAKu3B,OAASv3B,KAAKkD,QAAQw1B,WAC9B14B,KAAKi6B,SAECj6B,MAGRy8B,QAAS,WAER,OAAOz8B,KAAKi6B,UAGbyC,UAAW,WAEV,OAAO18B,KAAKq6B,cAoBVsC,GAAOtF,GAAQp3B,QAGlBiD,SACC8vB,SAAU,UAIV4J,WAAY,IAIZC,YAAa,UAIbC,YAAa,WAIbC,aAAc,YAGfpF,MAAO,SAAUL,GAChB,IAAI0F,EAAW,uBACXzwB,EAAYF,EAAS,MAAO2wB,EAAW,gBACvC95B,EAAUlD,KAAKkD,QAUnB,OARAlD,KAAKi9B,cAAiBj9B,KAAKk9B,cAAch6B,EAAQ05B,WAAY15B,EAAQ25B,YAC7DG,EAAW,MAAQzwB,EAAWvM,KAAKm9B,SAC3Cn9B,KAAKo9B,eAAiBp9B,KAAKk9B,cAAch6B,EAAQ45B,YAAa55B,EAAQ65B,aAC9DC,EAAW,OAAQzwB,EAAWvM,KAAKq9B,UAE3Cr9B,KAAKs9B,kBACLhG,EAAI7nB,GAAG,2BAA4BzP,KAAKs9B,gBAAiBt9B,MAElDuM,GAGRurB,SAAU,SAAUR,GACnBA,EAAI3nB,IAAI,2BAA4B3P,KAAKs9B,gBAAiBt9B,OAG3Do1B,QAAS,WAGR,OAFAp1B,KAAKu9B,WAAY,EACjBv9B,KAAKs9B,kBACEt9B,MAGRgwB,OAAQ,WAGP,OAFAhwB,KAAKu9B,WAAY,EACjBv9B,KAAKs9B,kBACEt9B,MAGRm9B,QAAS,SAAUl0B,IACbjJ,KAAKu9B,WAAav9B,KAAKu3B,KAAKjP,MAAQtoB,KAAKu3B,KAAKtG,cAClDjxB,KAAKu3B,KAAK1N,OAAO7pB,KAAKu3B,KAAKr0B,QAAQ6kB,WAAa9e,EAAEu0B,SAAW,EAAI,KAInEH,SAAU,SAAUp0B,IACdjJ,KAAKu9B,WAAav9B,KAAKu3B,KAAKjP,MAAQtoB,KAAKu3B,KAAKxG,cAClD/wB,KAAKu3B,KAAKzN,QAAQ9pB,KAAKu3B,KAAKr0B,QAAQ6kB,WAAa9e,EAAEu0B,SAAW,EAAI,KAIpEN,cAAe,SAAUO,EAAM5C,EAAOvuB,EAAWC,EAAW7L,GAC3D,IAAIg6B,EAAOruB,EAAS,IAAKC,EAAWC,GAgBpC,OAfAmuB,EAAKtV,UAAYqY,EACjB/C,EAAKE,KAAO,IACZF,EAAKG,MAAQA,EAKbH,EAAKJ,aAAa,OAAQ,UAC1BI,EAAKJ,aAAa,aAAcO,GAEhC9oB,GAAwB2oB,GACxBjrB,GAAGirB,EAAM,QAASxoB,IAClBzC,GAAGirB,EAAM,QAASh6B,EAAIV,MACtByP,GAAGirB,EAAM,QAAS16B,KAAK+3B,cAAe/3B,MAE/B06B,GAGR4C,gBAAiB,WAChB,IAAIhG,EAAMt3B,KAAKu3B,KACXjrB,EAAY,mBAEhBwB,GAAY9N,KAAKi9B,cAAe3wB,GAChCwB,GAAY9N,KAAKo9B,eAAgB9wB,IAE7BtM,KAAKu9B,WAAajG,EAAIhP,QAAUgP,EAAIvG,eACvCrjB,EAAS1N,KAAKo9B,eAAgB9wB,IAE3BtM,KAAKu9B,WAAajG,EAAIhP,QAAUgP,EAAIrG,eACvCvjB,EAAS1N,KAAKi9B,cAAe3wB,MAShC6a,GAAInN,cACH0jB,aAAa,IAGdvW,GAAIlN,YAAY,WACXja,KAAKkD,QAAQw6B,cAKhB19B,KAAK09B,YAAc,IAAIf,GACvB38B,KAAKy3B,WAAWz3B,KAAK09B,gBAOvB,IAkBIC,GAAQtG,GAAQp3B,QAGnBiD,SACC8vB,SAAU,aAIV4K,SAAU,IAIVC,QAAQ,EAIRC,UAAU,GAMXnG,MAAO,SAAUL,GAChB,IACI/qB,EAAYF,EAAS,MADT,yBAEZnJ,EAAUlD,KAAKkD,QAOnB,OALAlD,KAAK+9B,WAAW76B,EAASoJ,6BAAqBC,GAE9C+qB,EAAI7nB,GAAGvM,EAAQ86B,eAAiB,UAAY,OAAQh+B,KAAKy5B,QAASz5B,MAClEs3B,EAAIjC,UAAUr1B,KAAKy5B,QAASz5B,MAErBuM,GAGRurB,SAAU,SAAUR,GACnBA,EAAI3nB,IAAI3P,KAAKkD,QAAQ86B,eAAiB,UAAY,OAAQh+B,KAAKy5B,QAASz5B,OAGzE+9B,WAAY,SAAU76B,EAASoJ,EAAWC,GACrCrJ,EAAQ26B,SACX79B,KAAKi+B,QAAU5xB,EAAS,MAAOC,EAAWC,IAEvCrJ,EAAQ46B,WACX99B,KAAKk+B,QAAU7xB,EAAS,MAAOC,EAAWC,KAI5CktB,QAAS,WACR,IAAInC,EAAMt3B,KAAKu3B,KACX1xB,EAAIyxB,EAAIja,UAAUxX,EAAI,EAEtBs4B,EAAY7G,EAAI7X,SACnB6X,EAAIlN,wBAAwB,EAAGvkB,IAC/ByxB,EAAIlN,wBAAwBpqB,KAAKkD,QAAQ06B,SAAU/3B,KAEpD7F,KAAKo+B,cAAcD,IAGpBC,cAAe,SAAUD,GACpBn+B,KAAKkD,QAAQ26B,QAAUM,GAC1Bn+B,KAAKq+B,cAAcF,GAEhBn+B,KAAKkD,QAAQ46B,UAAYK,GAC5Bn+B,KAAKs+B,gBAAgBH,IAIvBE,cAAe,SAAUF,GACxB,IAAII,EAASv+B,KAAKw+B,aAAaL,GAC3BrC,EAAQyC,EAAS,IAAOA,EAAS,KAAQA,EAAS,IAAQ,MAE9Dv+B,KAAKy+B,aAAaz+B,KAAKi+B,QAASnC,EAAOyC,EAASJ,IAGjDG,gBAAiB,SAAUH,GAC1B,IACIO,EAAUC,EAAOC,EADjBC,EAAsB,UAAZV,EAGVU,EAAU,MACbH,EAAWG,EAAU,KACrBF,EAAQ3+B,KAAKw+B,aAAaE,GAC1B1+B,KAAKy+B,aAAaz+B,KAAKk+B,QAASS,EAAQ,MAAOA,EAAQD,KAGvDE,EAAO5+B,KAAKw+B,aAAaK,GACzB7+B,KAAKy+B,aAAaz+B,KAAKk+B,QAASU,EAAO,MAAOA,EAAOC,KAIvDJ,aAAc,SAAU5vB,EAAOiwB,EAAMC,GACpClwB,EAAM7C,MAAM0E,MAAQjO,KAAKE,MAAM3C,KAAKkD,QAAQ06B,SAAWmB,GAAS,KAChElwB,EAAMuW,UAAY0Z,GAGnBN,aAAc,SAAUl8B,GACvB,IAAI08B,EAAQv8B,KAAKD,IAAI,IAAKC,KAAKqZ,MAAMxZ,GAAO,IAAI9B,OAAS,GACrD2B,EAAIG,EAAM08B,EAOd,OALA78B,EAAIA,GAAK,GAAK,GACVA,GAAK,EAAI,EACTA,GAAK,EAAI,EACTA,GAAK,EAAI,EAAI,EAEV68B,EAAQ78B,KAmBb88B,GAAc5H,GAAQp3B,QAGzBiD,SACC8vB,SAAU,cAIVkM,OAAQ,wFAGT3lB,WAAY,SAAUrW,GACrBD,EAAWjD,KAAMkD,GAEjBlD,KAAKm/B,kBAGNxH,MAAO,SAAUL,GAChBA,EAAI8H,mBAAqBp/B,KACzBA,KAAKkwB,WAAa7jB,EAAS,MAAO,+BAClC0F,GAAwB/R,KAAKkwB,YAG7B,IAAK,IAAI/vB,KAAKm3B,EAAI3O,QACb2O,EAAI3O,QAAQxoB,GAAGk/B,gBAClBr/B,KAAKs/B,eAAehI,EAAI3O,QAAQxoB,GAAGk/B,kBAMrC,OAFAr/B,KAAKy5B,UAEEz5B,KAAKkwB,YAKbqP,UAAW,SAAUL,GAGpB,OAFAl/B,KAAKkD,QAAQg8B,OAASA,EACtBl/B,KAAKy5B,UACEz5B,MAKRs/B,eAAgB,SAAUR,GACzB,OAAKA,GAEA9+B,KAAKm/B,cAAcL,KACvB9+B,KAAKm/B,cAAcL,GAAQ,GAE5B9+B,KAAKm/B,cAAcL,KAEnB9+B,KAAKy5B,UAEEz5B,MATaA,MAcrBw/B,kBAAmB,SAAUV,GAC5B,OAAKA,GAED9+B,KAAKm/B,cAAcL,KACtB9+B,KAAKm/B,cAAcL,KACnB9+B,KAAKy5B,WAGCz5B,MAPaA,MAUrBy5B,QAAS,WACR,GAAKz5B,KAAKu3B,KAAV,CAEA,IAAIkI,KAEJ,IAAK,IAAIt/B,KAAKH,KAAKm/B,cACdn/B,KAAKm/B,cAAch/B,IACtBs/B,EAAQh8B,KAAKtD,GAIf,IAAIu/B,KAEA1/B,KAAKkD,QAAQg8B,QAChBQ,EAAiBj8B,KAAKzD,KAAKkD,QAAQg8B,QAEhCO,EAAQj/B,QACXk/B,EAAiBj8B,KAAKg8B,EAAQ57B,KAAK,OAGpC7D,KAAKkwB,WAAW9K,UAAYsa,EAAiB77B,KAAK,WAQpDsjB,GAAInN,cACHolB,oBAAoB,IAGrBjY,GAAIlN,YAAY,WACXja,KAAKkD,QAAQk8B,qBAChB,IAAIH,IAAcvH,MAAM13B,QAW1Bq3B,GAAQoB,OAASA,GACjBpB,GAAQsF,KAAOA,GACftF,GAAQsG,MAAQA,GAChBtG,GAAQ4H,YAAcA,GAEtB9G,GAAQthB,OA9YK,SAAUsiB,EAAYC,EAAUl2B,GAC5C,OAAO,IAAIu1B,GAAOU,EAAYC,EAAUl2B,IA8YzCi1B,GAAQhY,KAtQG,SAAUjd,GACpB,OAAO,IAAIy5B,GAAKz5B,IAsQjBi1B,GAAQtpB,MAtII,SAAU3L,GACrB,OAAO,IAAIy6B,GAAMz6B,IAsIlBi1B,GAAQwH,YAZU,SAAUz8B,GAC3B,OAAO,IAAI+7B,GAAY/7B,IAsBxB,IAAI08B,GAAUz6B,EAAMlF,QACnBsZ,WAAY,SAAU+d,GACrBt3B,KAAKu3B,KAAOD,GAKbtH,OAAQ,WACP,OAAIhwB,KAAK6/B,SAAmB7/B,MAE5BA,KAAK6/B,UAAW,EAChB7/B,KAAK8/B,WACE9/B,OAKRo1B,QAAS,WACR,OAAKp1B,KAAK6/B,UAEV7/B,KAAK6/B,UAAW,EAChB7/B,KAAK+/B,cACE//B,MAJsBA,MAS9Bi1B,QAAS,WACR,QAASj1B,KAAK6/B,YAchBD,GAAQlI,MAAQ,SAAUJ,EAAK/yB,GAE9B,OADA+yB,EAAIxH,WAAWvrB,EAAMvE,MACdA,MAGR,IAkVIuV,GAlVAjQ,IAASE,OAAQA,IAkBjBw6B,GAAQ7uB,GAAQ,uBAAyB,YACzC8uB,IACHC,UAAW,UACXx0B,WAAY,WACZy0B,YAAa,WACbC,cAAe,YAEZC,IACHH,UAAW,YACXx0B,WAAY,YACZy0B,YAAa,YACbC,cAAe,aAIZE,GAAY3kB,GAAQ1b,QAEvBiD,SAMCq9B,eAAgB,GAKjBhnB,WAAY,SAAU1J,EAAS2wB,EAAiBC,EAAmBv9B,GAClED,EAAWjD,KAAMkD,GAEjBlD,KAAK0gC,SAAW7wB,EAChB7P,KAAK2gC,iBAAmBH,GAAmB3wB,EAC3C7P,KAAK4gC,gBAAkBH,GAKxBzQ,OAAQ,WACHhwB,KAAK6/B,WAETpwB,GAAGzP,KAAK2gC,iBAAkBX,GAAOhgC,KAAK6gC,QAAS7gC,MAE/CA,KAAK6/B,UAAW,IAKjBzK,QAAS,WACHp1B,KAAK6/B,WAINS,GAAUQ,YAAc9gC,MAC3BA,KAAK+gC,aAGNpxB,GAAI3P,KAAK2gC,iBAAkBX,GAAOhgC,KAAK6gC,QAAS7gC,MAEhDA,KAAK6/B,UAAW,EAChB7/B,KAAK2wB,QAAS,IAGfkQ,QAAS,SAAU53B,GAMlB,IAAIA,EAAE0K,YAAe3T,KAAK6/B,WAE1B7/B,KAAK2wB,QAAS,GAEVvjB,EAASpN,KAAK0gC,SAAU,wBAExBJ,GAAUQ,WAAa73B,EAAEu0B,UAA0B,IAAZv0B,EAAE+3B,OAA8B,IAAb/3B,EAAEg4B,SAAkBh4B,EAAEiB,UACpFo2B,GAAUQ,UAAY9gC,KAElBA,KAAK4gC,iBACRhxB,GAAe5P,KAAK0gC,UAGrBlxB,KACAgT,KAEIxiB,KAAKkhC,WAAT,CAIAlhC,KAAK6a,KAAK,QAEV,IAAInG,EAAQzL,EAAEiB,QAAUjB,EAAEiB,QAAQ,GAAKjB,EACnCk4B,EAAchxB,GAAmBnQ,KAAK0gC,UAE1C1gC,KAAKohC,YAAc,IAAIx7B,EAAM8O,EAAMtC,QAASsC,EAAMrC,SAGlDrS,KAAKqhC,aAAe9wB,GAAS4wB,GAE7B1xB,GAAGjI,SAAU64B,GAAKp3B,EAAEZ,MAAOrI,KAAKshC,QAASthC,MACzCyP,GAAGjI,SAAUy4B,GAAIh3B,EAAEZ,MAAOrI,KAAKuhC,MAAOvhC,QAGvCshC,QAAS,SAAUr4B,GAMlB,IAAIA,EAAE0K,YAAe3T,KAAK6/B,SAE1B,GAAI52B,EAAEiB,SAAWjB,EAAEiB,QAAQ1J,OAAS,EACnCR,KAAK2wB,QAAS,MADf,CAKA,IAAIjc,EAASzL,EAAEiB,SAAgC,IAArBjB,EAAEiB,QAAQ1J,OAAeyI,EAAEiB,QAAQ,GAAKjB,EAC9D2F,EAAS,IAAIhJ,EAAM8O,EAAMtC,QAASsC,EAAMrC,SAAS8J,UAAUnc,KAAKohC,cAE/DxyB,EAAO9M,GAAM8M,EAAO/I,KACrBpD,KAAKwQ,IAAIrE,EAAO9M,GAAKW,KAAKwQ,IAAIrE,EAAO/I,GAAK7F,KAAKkD,QAAQq9B,iBAK3D3xB,EAAO9M,GAAK9B,KAAKqhC,aAAav/B,EAC9B8M,EAAO/I,GAAK7F,KAAKqhC,aAAax7B,EAE9B0D,GAAeN,GAEVjJ,KAAK2wB,SAGT3wB,KAAK6a,KAAK,aAEV7a,KAAK2wB,QAAS,EACd3wB,KAAKymB,UAAYlX,GAAYvP,KAAK0gC,UAAUxkB,SAAStN,GAErDlB,EAASlG,SAAS8I,KAAM,oBAExBtQ,KAAKwhC,YAAcv4B,EAAEI,QAAUJ,EAAEqrB,WAG5B9vB,OAAyB,oBAAMxE,KAAKwhC,uBAAuBC,qBAC/DzhC,KAAKwhC,YAAcxhC,KAAKwhC,YAAYE,yBAErCh0B,EAAS1N,KAAKwhC,YAAa,wBAG5BxhC,KAAK2hC,QAAU3hC,KAAKymB,UAAU7Y,IAAIgB,GAClC5O,KAAKkhC,SAAU,EAEfl8B,EAAgBhF,KAAK4hC,cACrB5hC,KAAK6hC,WAAa54B,EAClBjJ,KAAK4hC,aAAe/8B,EAAiB7E,KAAK8hC,gBAAiB9hC,MAAM,OAGlE8hC,gBAAiB,WAChB,IAAI74B,GAAK0I,cAAe3R,KAAK6hC,YAK7B7hC,KAAK6a,KAAK,UAAW5R,GACrBgG,GAAYjP,KAAK0gC,SAAU1gC,KAAK2hC,SAIhC3hC,KAAK6a,KAAK,OAAQ5R,IAGnBs4B,MAAO,SAAUt4B,IAMZA,EAAE0K,YAAe3T,KAAK6/B,UAC1B7/B,KAAK+gC,cAGNA,WAAY,WACXjzB,GAAYtG,SAAS8I,KAAM,oBAEvBtQ,KAAKwhC,cACR1zB,GAAY9N,KAAKwhC,YAAa,uBAC9BxhC,KAAKwhC,YAAc,MAGpB,IAAK,IAAIrhC,KAAKkgC,GACb1wB,GAAInI,SAAU64B,GAAKlgC,GAAIH,KAAKshC,QAASthC,MACrC2P,GAAInI,SAAUy4B,GAAI9/B,GAAIH,KAAKuhC,MAAOvhC,MAGnC0P,KACA+S,KAEIziB,KAAK2wB,QAAU3wB,KAAKkhC,UAEvBl8B,EAAgBhF,KAAK4hC,cAIrB5hC,KAAK6a,KAAK,WACT4E,SAAUzf,KAAK2hC,QAAQ7kB,WAAW9c,KAAKymB,cAIzCzmB,KAAKkhC,SAAU,EACfZ,GAAUQ,WAAY,KAqPpBiB,IAAYlpB,OAAOD,QAAUC,SAChCjF,SAAUA,GACVK,uBAAwBA,GACxB+tB,sBA1MD,SAA+Bl6B,EAAGoM,EAAIC,GACrC,OAAOE,GAAyBvM,EAAGoM,EAAIC,IA0MvCc,YAAaA,GACbS,qBAAsBA,GACtBF,YAAaA,GACbnB,yBAA0BA,GAC1B2B,OAAQA,GACRC,MAAOA,KA0DJgsB,IAAYppB,OAAOD,QAAUC,SAChC3C,YAAaA,KAgBVgsB,IACH5hB,QAAS,SAAU7J,GAClB,OAAO,IAAI7Q,EAAM6Q,EAAO9P,IAAK8P,EAAO/P,MAGrCka,UAAW,SAAU1R,GACpB,OAAO,IAAIzI,EAAOyI,EAAMrJ,EAAGqJ,EAAMpN,IAGlCoT,OAAQ,IAAInP,IAAS,KAAM,KAAM,IAAK,MAUnCo8B,IACHzgB,EAAG,QACH0gB,QAAS,kBAETltB,OAAQ,IAAInP,IAAS,gBAAiB,iBAAkB,eAAgB,iBAExEua,QAAS,SAAU7J,GAClB,IAAItU,EAAIM,KAAKud,GAAK,IACdkM,EAAIlsB,KAAK0hB,EACT7b,EAAI4Q,EAAO/P,IAAMvE,EACjBkgC,EAAMriC,KAAKoiC,QAAUlW,EACrBjjB,EAAIxG,KAAK2R,KAAK,EAAIiuB,EAAMA,GACxBC,EAAMr5B,EAAIxG,KAAKwf,IAAIpc,GAEnB08B,EAAK9/B,KAAK+/B,IAAI//B,KAAKud,GAAK,EAAIna,EAAI,GAAKpD,KAAKD,KAAK,EAAI8/B,IAAQ,EAAIA,GAAMr5B,EAAI,GAG7E,OAFApD,GAAKqmB,EAAIzpB,KAAKoe,IAAIpe,KAAKR,IAAIsgC,EAAI,QAExB,IAAI38B,EAAM6Q,EAAO9P,IAAMxE,EAAI+pB,EAAGrmB,IAGtC+a,UAAW,SAAU1R,GAQpB,IAAK,IAAuBozB,EAPxBngC,EAAI,IAAMM,KAAKud,GACfkM,EAAIlsB,KAAK0hB,EACT2gB,EAAMriC,KAAKoiC,QAAUlW,EACrBjjB,EAAIxG,KAAK2R,KAAK,EAAIiuB,EAAMA,GACxBE,EAAK9/B,KAAK8f,KAAKrT,EAAMrJ,EAAIqmB,GACzBuW,EAAMhgC,KAAKud,GAAK,EAAI,EAAIvd,KAAK6f,KAAKigB,GAE7BpiC,EAAI,EAAGuiC,EAAO,GAAUviC,EAAI,IAAMsC,KAAKwQ,IAAIyvB,GAAQ,KAAMviC,IACjEmiC,EAAMr5B,EAAIxG,KAAKwf,IAAIwgB,GACnBH,EAAM7/B,KAAKD,KAAK,EAAI8/B,IAAQ,EAAIA,GAAMr5B,EAAI,GAE1Cw5B,GADAC,EAAOjgC,KAAKud,GAAK,EAAI,EAAIvd,KAAK6f,KAAKigB,EAAKD,GAAOG,EAIhD,OAAO,IAAIh8B,EAAOg8B,EAAMtgC,EAAG+M,EAAMpN,EAAIK,EAAI+pB,KA8BvCvX,IAASkE,OAAOD,QAAUC,SAC7BqpB,OAAQA,GACRC,SAAUA,GACV/f,kBAAmBA,KAShBugB,GAAW1iC,KAAWuf,IACzB7J,KAAM,YACN0K,WAAY8hB,GAEZ5hB,eAAiB,WAChB,IAAI1R,EAAQ,IAAOpM,KAAKud,GAAKmiB,GAASzgB,GACtC,OAAOpa,EAAiBuH,EAAO,IAAMA,EAAO,IAF7B,KAmBb+zB,GAAW3iC,KAAWuf,IACzB7J,KAAM,YACN0K,WAAY6hB,GACZ3hB,eAAgBjZ,EAAiB,EAAI,IAAK,GAAI,EAAI,IAAK,MAapDu7B,GAAS5iC,KAAWggB,IACvBI,WAAY6hB,GACZ3hB,eAAgBjZ,EAAiB,EAAG,GAAI,EAAG,GAE3CuH,MAAO,SAAUsR,GAChB,OAAO1d,KAAKD,IAAI,EAAG2d,IAGpBA,KAAM,SAAUtR,GACf,OAAOpM,KAAKoe,IAAIhS,GAASpM,KAAKqe,KAG/BrB,SAAU,SAAUkC,EAASC,GAC5B,IAAIhM,EAAKgM,EAAQjb,IAAMgb,EAAQhb,IAC3BkP,EAAK+L,EAAQlb,IAAMib,EAAQjb,IAE/B,OAAOjE,KAAK2R,KAAKwB,EAAKA,EAAKC,EAAKA,IAGjCmL,UAAU,IAGXf,GAAIT,MAAQA,GACZS,GAAI0iB,SAAWA,GACf1iB,GAAI0C,SAAWA,GACf1C,GAAI2C,WAAaA,GACjB3C,GAAI2iB,SAAWA,GACf3iB,GAAI4iB,OAASA,GA2Bb,IAAIC,GAAQnnB,GAAQ1b,QAGnBiD,SAGCutB,KAAM,cAINkP,YAAa,KAEb3K,qBAAqB,GAStB0C,MAAO,SAAUJ,GAEhB,OADAA,EAAIiF,SAASv8B,MACNA,MAKR0M,OAAQ,WACP,OAAO1M,KAAK+iC,WAAW/iC,KAAKu3B,MAAQv3B,KAAKgjC,YAK1CD,WAAY,SAAUpiC,GAIrB,OAHIA,GACHA,EAAIo5B,YAAY/5B,MAEVA,MAKRkyB,QAAS,SAAU3tB,GAClB,OAAOvE,KAAKu3B,KAAKrF,QAAQ3tB,EAAQvE,KAAKkD,QAAQqB,IAASA,EAAQvE,KAAKkD,QAAQutB,OAG7EwS,qBAAsB,SAAUC,GAE/B,OADAljC,KAAKu3B,KAAK1D,SAAS1yB,EAAM+hC,IAAaljC,KAC/BA,MAGRmjC,wBAAyB,SAAUD,GAElC,cADOljC,KAAKu3B,KAAK1D,SAAS1yB,EAAM+hC,IACzBljC,MAKRq/B,eAAgB,WACf,OAAOr/B,KAAKkD,QAAQy8B,aAGrByD,UAAW,SAAUn6B,GACpB,IAAIquB,EAAMruB,EAAEI,OAGZ,GAAKiuB,EAAIyE,SAAS/7B,MAAlB,CAKA,GAHAA,KAAKu3B,KAAOD,EACZt3B,KAAK8oB,cAAgBwO,EAAIxO,cAErB9oB,KAAKqjC,UAAW,CACnB,IAAIlwB,EAASnT,KAAKqjC,YAClB/L,EAAI7nB,GAAG0D,EAAQnT,MACfA,KAAKmb,KAAK,SAAU,WACnBmc,EAAI3nB,IAAIwD,EAAQnT,OACdA,MAGJA,KAAK23B,MAAML,GAEPt3B,KAAKq/B,gBAAkB/H,EAAI8H,oBAC9B9H,EAAI8H,mBAAmBE,eAAet/B,KAAKq/B,kBAG5Cr/B,KAAK6a,KAAK,OACVyc,EAAIzc,KAAK,YAAatD,MAAOvX,WAqC/BmnB,GAAIpN,SAGHwiB,SAAU,SAAUhlB,GACnB,IAAKA,EAAM6rB,UACV,MAAM,IAAIj/B,MAAM,uCAGjB,IAAIc,EAAK9D,EAAMoW,GACf,OAAIvX,KAAK2oB,QAAQ1jB,GAAcjF,MAC/BA,KAAK2oB,QAAQ1jB,GAAMsS,EAEnBA,EAAMyrB,UAAYhjC,KAEduX,EAAM+rB,WACT/rB,EAAM+rB,UAAUtjC,MAGjBA,KAAKq1B,UAAU9d,EAAM6rB,UAAW7rB,GAEzBvX,OAKR+5B,YAAa,SAAUxiB,GACtB,IAAItS,EAAK9D,EAAMoW,GAEf,OAAKvX,KAAK2oB,QAAQ1jB,IAEdjF,KAAKqpB,SACR9R,EAAMugB,SAAS93B,MAGZuX,EAAM8nB,gBAAkBr/B,KAAKo/B,oBAChCp/B,KAAKo/B,mBAAmBI,kBAAkBjoB,EAAM8nB,yBAG1Cr/B,KAAK2oB,QAAQ1jB,GAEhBjF,KAAKqpB,UACRrpB,KAAK6a,KAAK,eAAgBtD,MAAOA,IACjCA,EAAMsD,KAAK,WAGZtD,EAAMggB,KAAOhgB,EAAMyrB,UAAY,KAExBhjC,MAnByBA,MAwBjC+7B,SAAU,SAAUxkB,GACnB,QAASA,GAAUpW,EAAMoW,KAAUvX,KAAK2oB,SAWzC4a,UAAW,SAAUC,EAAQhiC,GAC5B,IAAK,IAAIrB,KAAKH,KAAK2oB,QAClB6a,EAAOxiC,KAAKQ,EAASxB,KAAK2oB,QAAQxoB,IAEnC,OAAOH,MAGRkpB,WAAY,SAAUrS,GAGrB,IAAK,IAAI1W,EAAI,EAAGE,GAFhBwW,EAASA,EAAUtR,GAAQsR,GAAUA,GAAUA,OAElBrW,OAAQL,EAAIE,EAAKF,IAC7CH,KAAKu8B,SAAS1lB,EAAO1W,KAIvBsjC,cAAe,SAAUlsB,IACpB1Q,MAAM0Q,EAAMrU,QAAQokB,UAAazgB,MAAM0Q,EAAMrU,QAAQmkB,WACxDrnB,KAAK4oB,iBAAiBznB,EAAMoW,IAAUA,EACtCvX,KAAK0jC,sBAIPC,iBAAkB,SAAUpsB,GAC3B,IAAItS,EAAK9D,EAAMoW,GAEXvX,KAAK4oB,iBAAiB3jB,YAClBjF,KAAK4oB,iBAAiB3jB,GAC7BjF,KAAK0jC,sBAIPA,kBAAmB,WAClB,IAAIrc,EAAUwD,EAAAA,EACVvD,GAAWuD,EAAAA,EACX+Y,EAAc5jC,KAAK2zB,eAEvB,IAAK,IAAIxzB,KAAKH,KAAK4oB,iBAAkB,CACpC,IAAI1lB,EAAUlD,KAAK4oB,iBAAiBzoB,GAAG+C,QAEvCmkB,OAA8B3kB,IAApBQ,EAAQmkB,QAAwBA,EAAU5kB,KAAKP,IAAImlB,EAASnkB,EAAQmkB,SAC9EC,OAA8B5kB,IAApBQ,EAAQokB,QAAwBA,EAAU7kB,KAAKR,IAAIqlB,EAASpkB,EAAQokB,SAG/EtnB,KAAKkxB,eAAiB5J,KAAauD,EAAAA,OAAWnoB,EAAY4kB,EAC1DtnB,KAAKgxB,eAAiB3J,IAAYwD,EAAAA,OAAWnoB,EAAY2kB,EAMrDuc,IAAgB5jC,KAAK2zB,gBACxB3zB,KAAK6a,KAAK,yBAGkBnY,IAAzB1C,KAAKkD,QAAQokB,SAAyBtnB,KAAKkxB,gBAAkBlxB,KAAKqrB,UAAYrrB,KAAKkxB,gBACtFlxB,KAAK4pB,QAAQ5pB,KAAKkxB,qBAEUxuB,IAAzB1C,KAAKkD,QAAQmkB,SAAyBrnB,KAAKgxB,gBAAkBhxB,KAAKqrB,UAAYrrB,KAAKgxB,gBACtFhxB,KAAK4pB,QAAQ5pB,KAAKgxB,mBAuBrB,IAAI6S,GAAaf,GAAM7iC,QAEtBsZ,WAAY,SAAU1C,EAAQ3T,GAC7BD,EAAWjD,KAAMkD,GAEjBlD,KAAK2oB,WAEL,IAAIxoB,EAAGE,EAEP,GAAIwW,EACH,IAAK1W,EAAI,EAAGE,EAAMwW,EAAOrW,OAAQL,EAAIE,EAAKF,IACzCH,KAAKu8B,SAAS1lB,EAAO1W,KAOxBo8B,SAAU,SAAUhlB,GACnB,IAAItS,EAAKjF,KAAK8jC,WAAWvsB,GAQzB,OANAvX,KAAK2oB,QAAQ1jB,GAAMsS,EAEfvX,KAAKu3B,MACRv3B,KAAKu3B,KAAKgF,SAAShlB,GAGbvX,MAQR+5B,YAAa,SAAUxiB,GACtB,IAAItS,EAAKsS,KAASvX,KAAK2oB,QAAUpR,EAAQvX,KAAK8jC,WAAWvsB,GAQzD,OANIvX,KAAKu3B,MAAQv3B,KAAK2oB,QAAQ1jB,IAC7BjF,KAAKu3B,KAAKwC,YAAY/5B,KAAK2oB,QAAQ1jB,WAG7BjF,KAAK2oB,QAAQ1jB,GAEbjF,MAQR+7B,SAAU,SAAUxkB,GACnB,QAASA,IAAUA,KAASvX,KAAK2oB,SAAW3oB,KAAK8jC,WAAWvsB,KAAUvX,KAAK2oB,UAK5Eob,YAAa,WACZ,OAAO/jC,KAAKujC,UAAUvjC,KAAK+5B,YAAa/5B,OAOzCgkC,OAAQ,SAAUC,GACjB,IACI9jC,EAAGoX,EADHtW,EAAOJ,MAAMC,UAAUF,MAAMI,KAAKT,UAAW,GAGjD,IAAKJ,KAAKH,KAAK2oB,SACdpR,EAAQvX,KAAK2oB,QAAQxoB,IAEX8jC,IACT1sB,EAAM0sB,GAAYljC,MAAMwW,EAAOtW,GAIjC,OAAOjB,MAGR23B,MAAO,SAAUL,GAChBt3B,KAAKujC,UAAUjM,EAAIiF,SAAUjF,IAG9BQ,SAAU,SAAUR,GACnBt3B,KAAKujC,UAAUjM,EAAIyC,YAAazC,IAUjCiM,UAAW,SAAUC,EAAQhiC,GAC5B,IAAK,IAAIrB,KAAKH,KAAK2oB,QAClB6a,EAAOxiC,KAAKQ,EAASxB,KAAK2oB,QAAQxoB,IAEnC,OAAOH,MAKRkkC,SAAU,SAAUj/B,GACnB,OAAOjF,KAAK2oB,QAAQ1jB,IAKrBk/B,UAAW,WACV,IAAIttB,KAEJ,OADA7W,KAAKujC,UAAU1sB,EAAOpT,KAAMoT,GACrBA,GAKRskB,UAAW,SAAUiJ,GACpB,OAAOpkC,KAAKgkC,OAAO,YAAaI,IAKjCN,WAAY,SAAUvsB,GACrB,OAAOpW,EAAMoW,MAiCXL,GAAe2sB,GAAW5jC,QAE7Bs8B,SAAU,SAAUhlB,GACnB,OAAIvX,KAAK+7B,SAASxkB,GACVvX,MAGRuX,EAAM6D,eAAepb,MAErB6jC,GAAW/iC,UAAUy7B,SAASv7B,KAAKhB,KAAMuX,GAIlCvX,KAAK6a,KAAK,YAAatD,MAAOA,MAGtCwiB,YAAa,SAAUxiB,GACtB,OAAKvX,KAAK+7B,SAASxkB,IAGfA,KAASvX,KAAK2oB,UACjBpR,EAAQvX,KAAK2oB,QAAQpR,IAGtBA,EAAM8D,kBAAkBrb,MAExB6jC,GAAW/iC,UAAUi5B,YAAY/4B,KAAKhB,KAAMuX,GAIrCvX,KAAK6a,KAAK,eAAgBtD,MAAOA,KAZhCvX,MAiBTqkC,SAAU,SAAUr4B,GACnB,OAAOhM,KAAKgkC,OAAO,WAAYh4B,IAKhCs4B,aAAc,WACb,OAAOtkC,KAAKgkC,OAAO,iBAKpBO,YAAa,WACZ,OAAOvkC,KAAKgkC,OAAO,gBAKpB1Z,UAAW,WACV,IAAIpV,EAAS,IAAI9O,EAEjB,IAAK,IAAInB,KAAMjF,KAAK2oB,QAAS,CAC5B,IAAIpR,EAAQvX,KAAK2oB,QAAQ1jB,GACzBiQ,EAAOjV,OAAOsX,EAAM+S,UAAY/S,EAAM+S,YAAc/S,EAAMsd,aAE3D,OAAO3f,KAsCLsvB,GAAOr/B,EAAMlF,QA0ChBiD,SACCuhC,aAAc,EAAG,GACjBC,eAAgB,EAAG,IAGpBnrB,WAAY,SAAUrW,GACrBD,EAAWjD,KAAMkD,IAMlByhC,WAAY,SAAUC,GACrB,OAAO5kC,KAAK6kC,YAAY,OAAQD,IAKjCE,aAAc,SAAUF,GACvB,OAAO5kC,KAAK6kC,YAAY,SAAUD,IAGnCC,YAAa,SAAUtgC,EAAMqgC,GAC5B,IAAItkC,EAAMN,KAAK+kC,YAAYxgC,GAE3B,IAAKjE,EAAK,CACT,GAAa,SAATiE,EACH,MAAM,IAAIJ,MAAM,mDAEjB,OAAO,KAGR,IAAI6gC,EAAMhlC,KAAKilC,WAAW3kC,EAAKskC,GAA+B,QAApBA,EAAQt7B,QAAoBs7B,EAAU,MAGhF,OAFA5kC,KAAKklC,eAAeF,EAAKzgC,GAElBygC,GAGRE,eAAgB,SAAUF,EAAKzgC,GAC9B,IAAIrB,EAAUlD,KAAKkD,QACfiiC,EAAajiC,EAAQqB,EAAO,QAEN,iBAAf4gC,IACVA,GAAcA,EAAYA,IAG3B,IAAIxX,EAAO7nB,EAAQq/B,GACfC,EAASt/B,EAAiB,WAATvB,GAAqBrB,EAAQmiC,cAAgBniC,EAAQoiC,YAC9D3X,GAAQA,EAAKvR,SAAS,GAAG,IAErC4oB,EAAI14B,UAAY,kBAAoB/H,EAAO,KAAOrB,EAAQoJ,WAAa,IAEnE84B,IACHJ,EAAIh5B,MAAMu5B,YAAeH,EAAOtjC,EAAK,KACrCkjC,EAAIh5B,MAAMw5B,WAAeJ,EAAOv/B,EAAK,MAGlC8nB,IACHqX,EAAIh5B,MAAM0E,MAASid,EAAK7rB,EAAI,KAC5BkjC,EAAIh5B,MAAM2E,OAASgd,EAAK9nB,EAAI,OAI9Bo/B,WAAY,SAAU3kC,EAAK+D,GAG1B,OAFAA,EAAKA,GAAMmD,SAASgF,cAAc,OAClCnI,EAAG/D,IAAMA,EACF+D,GAGR0gC,YAAa,SAAUxgC,GACtB,OAAOqgB,IAAU5kB,KAAKkD,QAAQqB,EAAO,cAAgBvE,KAAKkD,QAAQqB,EAAO,UA2BvEkhC,GAAcjB,GAAKvkC,QAEtBiD,SACCwiC,QAAe,kBACfC,cAAe,qBACfC,UAAe,oBACfC,UAAc,GAAI,IAClBP,YAAc,GAAI,IAClBb,aAAc,GAAI,IAClBC,eAAgB,IAAK,IACrBoB,YAAc,GAAI,KAGnBf,YAAa,SAAUxgC,GAStB,OARKkhC,GAAYM,YAChBN,GAAYM,UAAY/lC,KAAKgmC,oBAOtBhmC,KAAKkD,QAAQ6iC,WAAaN,GAAYM,WAAavB,GAAK1jC,UAAUikC,YAAY/jC,KAAKhB,KAAMuE,IAGlGyhC,gBAAiB,WAChB,IAAI3hC,EAAKgI,EAAS,MAAQ,4BAA6B7E,SAAS8I,MAC5D21B,EAAOl6B,EAAS1H,EAAI,qBACb0H,EAAS1H,EAAI,mBAUxB,OARAmD,SAAS8I,KAAKzD,YAAYxI,GAGzB4hC,EADY,OAATA,GAAyC,IAAxBA,EAAKriC,QAAQ,OAC1B,GAEAqiC,EAAKnjC,QAAQ,cAAe,IAAIA,QAAQ,2BAA4B,OAyB1EojC,GAAatG,GAAQ3/B,QACxBsZ,WAAY,SAAU4sB,GACrBnmC,KAAKomC,QAAUD,GAGhBrG,SAAU,WACT,IAAIuG,EAAOrmC,KAAKomC,QAAQE,MAEnBtmC,KAAKumC,aACTvmC,KAAKumC,WAAa,IAAIjG,GAAU+F,EAAMA,GAAM,IAG7CrmC,KAAKumC,WAAW92B,IACf+2B,UAAWxmC,KAAKymC,aAChBC,QAAS1mC,KAAK2mC,WACdC,KAAM5mC,KAAK6mC,QACXC,QAAS9mC,KAAK+mC,YACZ/mC,MAAMgwB,SAETtiB,EAAS24B,EAAM,6BAGhBtG,YAAa,WACZ//B,KAAKumC,WAAW52B,KACf62B,UAAWxmC,KAAKymC,aAChBC,QAAS1mC,KAAK2mC,WACdC,KAAM5mC,KAAK6mC,QACXC,QAAS9mC,KAAK+mC,YACZ/mC,MAAMo1B,UAELp1B,KAAKomC,QAAQE,OAChBx4B,GAAY9N,KAAKomC,QAAQE,MAAO,6BAIlCpR,MAAO,WACN,OAAOl1B,KAAKumC,YAAcvmC,KAAKumC,WAAW5V,QAG3CqW,WAAY,SAAU/9B,GACrB,IAAIk9B,EAASnmC,KAAKomC,QACd9O,EAAM6O,EAAO5O,KACb0P,EAAQjnC,KAAKomC,QAAQljC,QAAQgkC,aAC7Bzc,EAAUzqB,KAAKomC,QAAQljC,QAAQikC,eAC/BC,EAAU73B,GAAY42B,EAAOG,OAC7BpxB,EAASoiB,EAAIxG,iBACbuW,EAAS/P,EAAIvF,iBAEbuV,EAAYnhC,EACf+O,EAAOhT,IAAIia,UAAUkrB,GAAQz5B,IAAI6c,GACjCvV,EAAOjT,IAAIka,UAAUkrB,GAAQnrB,SAASuO,IAGvC,IAAK6c,EAAUh6B,SAAS85B,GAAU,CAEjC,IAAIG,EAAWzhC,GACbrD,KAAKR,IAAIqlC,EAAUrlC,IAAIH,EAAGslC,EAAQtlC,GAAKwlC,EAAUrlC,IAAIH,IAAMoT,EAAOjT,IAAIH,EAAIwlC,EAAUrlC,IAAIH,IACxFW,KAAKP,IAAIolC,EAAUplC,IAAIJ,EAAGslC,EAAQtlC,GAAKwlC,EAAUplC,IAAIJ,IAAMoT,EAAOhT,IAAIJ,EAAIwlC,EAAUplC,IAAIJ,IAExFW,KAAKR,IAAIqlC,EAAUrlC,IAAI4D,EAAGuhC,EAAQvhC,GAAKyhC,EAAUrlC,IAAI4D,IAAMqP,EAAOjT,IAAI4D,EAAIyhC,EAAUrlC,IAAI4D,IACxFpD,KAAKP,IAAIolC,EAAUplC,IAAI2D,EAAGuhC,EAAQvhC,GAAKyhC,EAAUplC,IAAI2D,IAAMqP,EAAOhT,IAAI2D,EAAIyhC,EAAUplC,IAAI2D,IACxFyW,WAAW2qB,GAEb3P,EAAIlM,MAAMmc,GAAWje,SAAS,IAE9BtpB,KAAKumC,WAAW5E,QAAQ1lB,KAAKsrB,GAC7BvnC,KAAKumC,WAAW9f,UAAUxK,KAAKsrB,GAE/Bt4B,GAAYk3B,EAAOG,MAAOtmC,KAAKumC,WAAW5E,SAC1C3hC,KAAK6mC,QAAQ59B,GAEbjJ,KAAKwnC,YAAc3iC,EAAiB7E,KAAKgnC,WAAWvmC,KAAKT,KAAMiJ,MAIjEw9B,aAAc,WAQbzmC,KAAKynC,WAAaznC,KAAKomC,QAAQvR,YAC/B70B,KAAKomC,QACAsB,aACA7sB,KAAK,aACLA,KAAK,cAGX8rB,WAAY,SAAU19B,GACjBjJ,KAAKomC,QAAQljC,QAAQykC,UACxB3iC,EAAgBhF,KAAKwnC,aACrBxnC,KAAKwnC,YAAc3iC,EAAiB7E,KAAKgnC,WAAWvmC,KAAKT,KAAMiJ,MAIjE49B,QAAS,SAAU59B,GAClB,IAAIk9B,EAASnmC,KAAKomC,QACdwB,EAASzB,EAAO0B,QAChBT,EAAU73B,GAAY42B,EAAOG,OAC7B7vB,EAAS0vB,EAAO5O,KAAK3G,mBAAmBwW,GAGxCQ,GACH34B,GAAY24B,EAAQR,GAGrBjB,EAAO2B,QAAUrxB,EACjBxN,EAAEwN,OAASA,EACXxN,EAAE8+B,UAAY/nC,KAAKynC,WAInBtB,EACKtrB,KAAK,OAAQ5R,GACb4R,KAAK,OAAQ5R,IAGnB89B,WAAY,SAAU99B,GAIpBjE,EAAgBhF,KAAKwnC,oBAIfxnC,KAAKynC,WACZznC,KAAKomC,QACAvrB,KAAK,WACLA,KAAK,UAAW5R,MAiBnBgO,GAAS6rB,GAAM7iC,QAIlBiD,SAKCmjC,KAAM,IAAIZ,GAGVuC,aAAa,EAIbC,UAAU,EAIVpN,MAAO,GAIPj0B,IAAK,GAILshC,aAAc,EAIdj6B,QAAS,EAITk6B,aAAa,EAIbC,WAAY,IAIZ3X,KAAM,aAKNuE,qBAAqB,EAKrBqT,WAAW,EAIXV,SAAS,EAKTR,gBAAiB,GAAI,IAIrBD,aAAc,IAQf3tB,WAAY,SAAU9C,EAAQvT,GAC7BD,EAAWjD,KAAMkD,GACjBlD,KAAK8nC,QAAUhhC,EAAS2P,IAGzBkhB,MAAO,SAAUL,GAChBt3B,KAAK8oB,cAAgB9oB,KAAK8oB,eAAiBwO,EAAIp0B,QAAQ0kB,oBAEnD5nB,KAAK8oB,eACRwO,EAAI7nB,GAAG,WAAYzP,KAAKg3B,aAAch3B,MAGvCA,KAAKsoC,YACLtoC,KAAKuoC,UAGNzQ,SAAU,SAAUR,GACft3B,KAAKu0B,UAAYv0B,KAAKu0B,SAASU,YAClCj1B,KAAKkD,QAAQmlC,WAAY,EACzBroC,KAAKu0B,SAASwL,sBAER//B,KAAKu0B,SAERv0B,KAAK8oB,eACRwO,EAAI3nB,IAAI,WAAY3P,KAAKg3B,aAAch3B,MAGxCA,KAAKwoC,cACLxoC,KAAKyoC,iBAGNpF,UAAW,WACV,OACCljB,KAAMngB,KAAKuoC,OACXG,UAAW1oC,KAAKuoC,SAMlB1T,UAAW,WACV,OAAO70B,KAAK8nC,SAKba,UAAW,SAAUlyB,GACpB,IAAIsxB,EAAY/nC,KAAK8nC,QAMrB,OALA9nC,KAAK8nC,QAAUhhC,EAAS2P,GACxBzW,KAAKuoC,SAIEvoC,KAAK6a,KAAK,QAASktB,UAAWA,EAAWtxB,OAAQzW,KAAK8nC,WAK9Dc,gBAAiB,SAAUh6B,GAE1B,OADA5O,KAAKkD,QAAQglC,aAAet5B,EACrB5O,KAAKuoC,UAKbM,QAAS,SAAUxC,GAalB,OAXArmC,KAAKkD,QAAQmjC,KAAOA,EAEhBrmC,KAAKu3B,OACRv3B,KAAKsoC,YACLtoC,KAAKuoC,UAGFvoC,KAAK8oC,QACR9oC,KAAK+oC,UAAU/oC,KAAK8oC,OAAQ9oC,KAAK8oC,OAAO5lC,SAGlClD,MAGRgpC,WAAY,WACX,OAAOhpC,KAAKsmC,OAGbiC,OAAQ,WAEP,GAAIvoC,KAAKsmC,OAAStmC,KAAKu3B,KAAM,CAC5B,IAAIzoB,EAAM9O,KAAKu3B,KAAKhF,mBAAmBvyB,KAAK8nC,SAASnlC,QACrD3C,KAAKipC,QAAQn6B,GAGd,OAAO9O,MAGRsoC,UAAW,WACV,IAAIplC,EAAUlD,KAAKkD,QACfgmC,EAAa,iBAAmBlpC,KAAK8oB,cAAgB,WAAa,QAElEud,EAAOnjC,EAAQmjC,KAAK1B,WAAW3kC,KAAKsmC,OACpC6C,GAAU,EAGV9C,IAASrmC,KAAKsmC,QACbtmC,KAAKsmC,OACRtmC,KAAKwoC,cAENW,GAAU,EAENjmC,EAAQ23B,QACXwL,EAAKxL,MAAQ33B,EAAQ23B,OAGD,QAAjBwL,EAAK/8B,UACR+8B,EAAKz/B,IAAM1D,EAAQ0D,KAAO,KAI5B8G,EAAS24B,EAAM6C,GAEXhmC,EAAQ+kC,WACX5B,EAAKv2B,SAAW,KAGjB9P,KAAKsmC,MAAQD,EAETnjC,EAAQilC,aACXnoC,KAAKyP,IACJ25B,UAAWppC,KAAKqpC,cAChBC,SAAUtpC,KAAKupC,eAIjB,IAAIC,EAAYtmC,EAAQmjC,KAAKvB,aAAa9kC,KAAK6nC,SAC3C4B,GAAY,EAEZD,IAAcxpC,KAAK6nC,UACtB7nC,KAAKyoC,gBACLgB,GAAY,GAGTD,IACH97B,EAAS87B,EAAWN,GACpBM,EAAU5iC,IAAM,IAEjB5G,KAAK6nC,QAAU2B,EAGXtmC,EAAQ+K,QAAU,GACrBjO,KAAK0pC,iBAIFP,GACHnpC,KAAKkyB,UAAUzlB,YAAYzM,KAAKsmC,OAEjCtmC,KAAK2pC,mBACDH,GAAaC,GAChBzpC,KAAKkyB,QAAQ,cAAczlB,YAAYzM,KAAK6nC,UAI9CW,YAAa,WACRxoC,KAAKkD,QAAQilC,aAChBnoC,KAAK2P,KACJy5B,UAAWppC,KAAKqpC,cAChBC,SAAUtpC,KAAKupC,eAIjB78B,EAAO1M,KAAKsmC,OACZtmC,KAAKmjC,wBAAwBnjC,KAAKsmC,OAElCtmC,KAAKsmC,MAAQ,MAGdmC,cAAe,WACVzoC,KAAK6nC,SACRn7B,EAAO1M,KAAK6nC,SAEb7nC,KAAK6nC,QAAU,MAGhBoB,QAAS,SAAUn6B,GAClBG,GAAYjP,KAAKsmC,MAAOx3B,GAEpB9O,KAAK6nC,SACR54B,GAAYjP,KAAK6nC,QAAS/4B,GAG3B9O,KAAK4pC,QAAU96B,EAAIjJ,EAAI7F,KAAKkD,QAAQglC,aAEpCloC,KAAKupC,gBAGNM,cAAe,SAAUj7B,GACxB5O,KAAKsmC,MAAMt6B,MAAMo4B,OAASpkC,KAAK4pC,QAAUh7B,GAG1CooB,aAAc,SAAU8S,GACvB,IAAIh7B,EAAM9O,KAAKu3B,KAAKhC,uBAAuBv1B,KAAK8nC,QAASgC,EAAI3pB,KAAM2pB,EAAIxoB,QAAQ3e,QAE/E3C,KAAKipC,QAAQn6B,IAGd66B,iBAAkB,WAEjB,GAAK3pC,KAAKkD,QAAQ8kC,cAElBt6B,EAAS1N,KAAKsmC,MAAO,uBAErBtmC,KAAKijC,qBAAqBjjC,KAAKsmC,OAE3BJ,IAAY,CACf,IAAImC,EAAYroC,KAAKkD,QAAQmlC,UACzBroC,KAAKu0B,WACR8T,EAAYroC,KAAKu0B,SAASU,UAC1Bj1B,KAAKu0B,SAASa,WAGfp1B,KAAKu0B,SAAW,IAAI2R,GAAWlmC,MAE3BqoC,GACHroC,KAAKu0B,SAASvE,WAOjBhiB,WAAY,SAAUC,GAMrB,OALAjO,KAAKkD,QAAQ+K,QAAUA,EACnBjO,KAAKu3B,MACRv3B,KAAK0pC,iBAGC1pC,MAGR0pC,eAAgB,WACf,IAAIz7B,EAAUjO,KAAKkD,QAAQ+K,QAE3BD,GAAWhO,KAAKsmC,MAAOr4B,GAEnBjO,KAAK6nC,SACR75B,GAAWhO,KAAK6nC,QAAS55B,IAI3Bo7B,cAAe,WACdrpC,KAAK6pC,cAAc7pC,KAAKkD,QAAQklC,aAGjCmB,aAAc,WACbvpC,KAAK6pC,cAAc,IAGpBE,gBAAiB,WAChB,OAAO/pC,KAAKkD,QAAQmjC,KAAKnjC,QAAQuhC,aAGlCuF,kBAAmB,WAClB,OAAOhqC,KAAKkD,QAAQmjC,KAAKnjC,QAAQwhC,iBAsB/BuF,GAAOnH,GAAM7iC,QAIhBiD,SAGCgnC,QAAQ,EAIRC,MAAO,UAIPC,OAAQ,EAIRn8B,QAAS,EAITo8B,QAAS,QAITC,SAAU,QAIVC,UAAW,KAIXC,WAAY,KAIZC,MAAM,EAINC,UAAW,KAIXC,YAAa,GAIbC,SAAU,UAKV5C,aAAa,EAKbhT,qBAAqB,GAGtBsO,UAAW,SAAUhM,GAGpBt3B,KAAKuwB,UAAY+G,EAAIuT,YAAY7qC,OAGlC23B,MAAO,WACN33B,KAAKuwB,UAAUua,UAAU9qC,MACzBA,KAAK+qC,SACL/qC,KAAKuwB,UAAUya,SAAShrC,OAGzB83B,SAAU,WACT93B,KAAKuwB,UAAU0a,YAAYjrC,OAK5BkrC,OAAQ,WAIP,OAHIlrC,KAAKu3B,MACRv3B,KAAKuwB,UAAU4a,YAAYnrC,MAErBA,MAKRqkC,SAAU,SAAUr4B,GAKnB,OAJA/I,EAAWjD,KAAMgM,GACbhM,KAAKuwB,WACRvwB,KAAKuwB,UAAU6a,aAAaprC,MAEtBA,MAKRskC,aAAc,WAIb,OAHItkC,KAAKuwB,WACRvwB,KAAKuwB,UAAU8Y,cAAcrpC,MAEvBA,MAKRukC,YAAa,WAIZ,OAHIvkC,KAAKuwB,WACRvwB,KAAKuwB,UAAU8a,aAAarrC,MAEtBA,MAGRgpC,WAAY,WACX,OAAOhpC,KAAKsrC,OAGbP,OAAQ,WAEP/qC,KAAKurC,WACLvrC,KAAKy5B,WAGN+R,gBAAiB,WAEhB,OAAQxrC,KAAKkD,QAAQgnC,OAASlqC,KAAKkD,QAAQknC,OAAS,EAAI,GAAKpqC,KAAKuwB,UAAUrtB,QAAQ2Q,aAYlF43B,GAAexB,GAAKhqC,QAIvBiD,SACCunC,MAAM,EAINiB,OAAQ,IAGTnyB,WAAY,SAAU9C,EAAQvT,GAC7BD,EAAWjD,KAAMkD,GACjBlD,KAAK8nC,QAAUhhC,EAAS2P,GACxBzW,KAAK80B,QAAU90B,KAAKkD,QAAQwoC,QAK7B/C,UAAW,SAAUlyB,GAGpB,OAFAzW,KAAK8nC,QAAUhhC,EAAS2P,GACxBzW,KAAKkrC,SACElrC,KAAK6a,KAAK,QAASpE,OAAQzW,KAAK8nC,WAKxCjT,UAAW,WACV,OAAO70B,KAAK8nC,SAKb6D,UAAW,SAAUD,GAEpB,OADA1rC,KAAKkD,QAAQwoC,OAAS1rC,KAAK80B,QAAU4W,EAC9B1rC,KAAKkrC,UAKbU,UAAW,WACV,OAAO5rC,KAAK80B,SAGbuP,SAAW,SAAUnhC,GACpB,IAAIwoC,EAASxoC,GAAWA,EAAQwoC,QAAU1rC,KAAK80B,QAG/C,OAFAmV,GAAKnpC,UAAUujC,SAASrjC,KAAKhB,KAAMkD,GACnClD,KAAK2rC,UAAUD,GACR1rC,MAGRurC,SAAU,WACTvrC,KAAK6rC,OAAS7rC,KAAKu3B,KAAKhF,mBAAmBvyB,KAAK8nC,SAChD9nC,KAAK8rC,iBAGNA,cAAe,WACd,IAAI5f,EAAIlsB,KAAK80B,QACTiX,EAAK/rC,KAAKgsC,UAAY9f,EACtBU,EAAI5sB,KAAKwrC,kBACT1jC,GAAKokB,EAAIU,EAAGmf,EAAKnf,GACrB5sB,KAAKisC,UAAY,IAAIlmC,EAAO/F,KAAK6rC,OAAO3vB,SAASpU,GAAI9H,KAAK6rC,OAAOj+B,IAAI9F,KAGtE2xB,QAAS,WACJz5B,KAAKu3B,MACRv3B,KAAKmrC,eAIPA,YAAa,WACZnrC,KAAKuwB,UAAU2b,cAAclsC,OAG9BmsC,OAAQ,WACP,OAAOnsC,KAAK80B,UAAY90B,KAAKuwB,UAAU6b,QAAQ9uB,WAAWtd,KAAKisC,YAIhEI,eAAgB,SAAUvkC,GACzB,OAAOA,EAAEgV,WAAW9c,KAAK6rC,SAAW7rC,KAAK80B,QAAU90B,KAAKwrC,qBA2BtDc,GAASb,GAAaxrC,QAEzBsZ,WAAY,SAAU9C,EAAQvT,EAASqpC,GAQtC,GAPuB,iBAAZrpC,IAEVA,EAAUjD,KAAWssC,GAAgBb,OAAQxoC,KAE9CD,EAAWjD,KAAMkD,GACjBlD,KAAK8nC,QAAUhhC,EAAS2P,GAEpB5P,MAAM7G,KAAKkD,QAAQwoC,QAAW,MAAM,IAAIvnC,MAAM,+BAKlDnE,KAAKwsC,SAAWxsC,KAAKkD,QAAQwoC,QAK9BC,UAAW,SAAUD,GAEpB,OADA1rC,KAAKwsC,SAAWd,EACT1rC,KAAKkrC,UAKbU,UAAW,WACV,OAAO5rC,KAAKwsC,UAKbliB,UAAW,WACV,IAAImiB,GAAQzsC,KAAK80B,QAAS90B,KAAKgsC,UAAYhsC,KAAK80B,SAEhD,OAAO,IAAI1uB,EACVpG,KAAKu3B,KAAK3G,mBAAmB5wB,KAAK6rC,OAAO3vB,SAASuwB,IAClDzsC,KAAKu3B,KAAK3G,mBAAmB5wB,KAAK6rC,OAAOj+B,IAAI6+B,MAG/CpI,SAAU4F,GAAKnpC,UAAUujC,SAEzBkH,SAAU,WAET,IAAI5kC,EAAM3G,KAAK8nC,QAAQnhC,IACnBD,EAAM1G,KAAK8nC,QAAQphC,IACnB4wB,EAAMt3B,KAAKu3B,KACXnQ,EAAMkQ,EAAIp0B,QAAQkkB,IAEtB,GAAIA,EAAI3H,WAAaD,GAAMC,SAAU,CACpC,IAAItd,EAAIM,KAAKud,GAAK,IACd0sB,EAAQ1sC,KAAKwsC,SAAWhtB,GAAMkC,EAAKvf,EACnCmN,EAAMgoB,EAAIhX,SAAS5Z,EAAMgmC,EAAM/lC,IAC/BgmC,EAASrV,EAAIhX,SAAS5Z,EAAMgmC,EAAM/lC,IAClCmB,EAAIwH,EAAI1B,IAAI++B,GAAQvwB,SAAS,GAC7B2F,EAAOuV,EAAI1W,UAAU9Y,GAAGpB,IACxBkmC,EAAOnqC,KAAKoqC,MAAMpqC,KAAKsd,IAAI2sB,EAAOvqC,GAAKM,KAAKwf,IAAIvb,EAAMvE,GAAKM,KAAKwf,IAAIF,EAAO5f,KAClEM,KAAKsd,IAAIrZ,EAAMvE,GAAKM,KAAKsd,IAAIgC,EAAO5f,KAAOA,GAEpD0E,MAAM+lC,IAAkB,IAATA,KAClBA,EAAOF,EAAOjqC,KAAKsd,IAAItd,KAAKud,GAAK,IAAMtZ,IAGxC1G,KAAK6rC,OAAS/jC,EAAEoU,SAASob,EAAIvF,kBAC7B/xB,KAAK80B,QAAUjuB,MAAM+lC,GAAQ,EAAI9kC,EAAEhG,EAAIw1B,EAAIhX,SAASyB,EAAMpb,EAAMimC,IAAO9qC,EACvE9B,KAAKgsC,SAAWlkC,EAAEjC,EAAIyJ,EAAIzJ,MAEpB,CACN,IAAI+b,EAAUwF,EAAIxG,UAAUwG,EAAI9G,QAAQtgB,KAAK8nC,SAAS5rB,UAAUlc,KAAKwsC,SAAU,KAE/ExsC,KAAK6rC,OAASvU,EAAI/E,mBAAmBvyB,KAAK8nC,SAC1C9nC,KAAK80B,QAAU90B,KAAK6rC,OAAO/pC,EAAIw1B,EAAI/E,mBAAmB3Q,GAAS9f,EAGhE9B,KAAK8rC,mBAsDH10B,GAAW6yB,GAAKhqC,QAInBiD,SAIC4pC,aAAc,EAIdC,QAAQ,GAGTxzB,WAAY,SAAUhT,EAASrD,GAC9BD,EAAWjD,KAAMkD,GACjBlD,KAAKgtC,YAAYzmC,IAKlB0mC,WAAY,WACX,OAAOjtC,KAAKktC,UAKbC,WAAY,SAAU5mC,GAErB,OADAvG,KAAKgtC,YAAYzmC,GACVvG,KAAKkrC,UAKbkC,QAAS,WACR,OAAQptC,KAAKktC,SAAS1sC,QAKvB6sC,kBAAmB,SAAUvlC,GAM5B,IAAK,IAFDoM,EAAIC,EAHJm5B,EAAcziB,EAAAA,EACd0iB,EAAW,KACXC,EAAUn5B,GAGLjU,EAAI,EAAGqtC,EAAOztC,KAAK0tC,OAAOltC,OAAQJ,EAAIqtC,EAAMrtC,IAGpD,IAAK,IAFD8F,EAASlG,KAAK0tC,OAAOttC,GAEhBD,EAAI,EAAGE,EAAM6F,EAAO1F,OAAQL,EAAIE,EAAKF,IAAK,CAIlD,IAAIyU,EAAS44B,EAAQ1lC,EAHrBoM,EAAKhO,EAAO/F,EAAI,GAChBgU,EAAKjO,EAAO/F,IAEoB,GAE5ByU,EAAS04B,IACZA,EAAc14B,EACd24B,EAAWC,EAAQ1lC,EAAGoM,EAAIC,IAO7B,OAHIo5B,IACHA,EAAS9tB,SAAWhd,KAAK2R,KAAKk5B,IAExBC,GAKRvwB,UAAW,WAEV,IAAKhd,KAAKu3B,KACT,MAAM,IAAIpzB,MAAM,kDAGjB,IAAIhE,EAAGwtC,EAAUC,EAASC,EAAM35B,EAAIC,EAAI4qB,EACpC74B,EAASlG,KAAK8tC,OAAO,GACrBztC,EAAM6F,EAAO1F,OAEjB,IAAKH,EAAO,OAAO,KAInB,IAAKF,EAAI,EAAGwtC,EAAW,EAAGxtC,EAAIE,EAAM,EAAGF,IACtCwtC,GAAYznC,EAAO/F,GAAG2c,WAAW5W,EAAO/F,EAAI,IAAM,EAInD,GAAiB,IAAbwtC,EACH,OAAO3tC,KAAKu3B,KAAK3G,mBAAmB1qB,EAAO,IAG5C,IAAK/F,EAAI,EAAG0tC,EAAO,EAAG1tC,EAAIE,EAAM,EAAGF,IAMlC,GALA+T,EAAKhO,EAAO/F,GACZgU,EAAKjO,EAAO/F,EAAI,GAChBytC,EAAU15B,EAAG4I,WAAW3I,IACxB05B,GAAQD,GAEGD,EAEV,OADA5O,GAAS8O,EAAOF,GAAYC,EACrB5tC,KAAKu3B,KAAK3G,oBAChBzc,EAAGrS,EAAIi9B,GAAS5qB,EAAGrS,EAAIoS,EAAGpS,GAC1BqS,EAAGtO,EAAIk5B,GAAS5qB,EAAGtO,EAAIqO,EAAGrO,MAQ9BykB,UAAW,WACV,OAAOtqB,KAAKosC,SAOb2B,UAAW,SAAUt3B,EAAQlQ,GAK5B,OAJAA,EAAUA,GAAWvG,KAAKguC,gBAC1Bv3B,EAAS3P,EAAS2P,GAClBlQ,EAAQ9C,KAAKgT,GACbzW,KAAKosC,QAAQnsC,OAAOwW,GACbzW,KAAKkrC,UAGb8B,YAAa,SAAUzmC,GACtBvG,KAAKosC,QAAU,IAAIhmC,EACnBpG,KAAKktC,SAAWltC,KAAKiuC,gBAAgB1nC,IAGtCynC,cAAe,WACd,OAAOh4B,GAAOhW,KAAKktC,UAAYltC,KAAKktC,SAAWltC,KAAKktC,SAAS,IAI9De,gBAAiB,SAAU1nC,GAI1B,IAAK,IAHD2nC,KACAC,EAAOn4B,GAAOzP,GAETpG,EAAI,EAAGE,EAAMkG,EAAQ/F,OAAQL,EAAIE,EAAKF,IAC1CguC,GACHD,EAAO/tC,GAAK2G,EAASP,EAAQpG,IAC7BH,KAAKosC,QAAQnsC,OAAOiuC,EAAO/tC,KAE3B+tC,EAAO/tC,GAAKH,KAAKiuC,gBAAgB1nC,EAAQpG,IAI3C,OAAO+tC,GAGR3C,SAAU,WACT,IAAItV,EAAW,IAAIlwB,EACnB/F,KAAK8tC,UACL9tC,KAAKouC,gBAAgBpuC,KAAKktC,SAAUltC,KAAK8tC,OAAQ7X,GAEjD,IAAIrJ,EAAI5sB,KAAKwrC,kBACT1jC,EAAI,IAAIlC,EAAMgnB,EAAGA,GAEjB5sB,KAAKosC,QAAQtuB,WAAamY,EAASnY,YACtCmY,EAAS/zB,IAAIia,UAAUrU,GACvBmuB,EAASh0B,IAAIga,KAAKnU,GAClB9H,KAAKisC,UAAYhW,IAKnBmY,gBAAiB,SAAU7nC,EAAS2nC,EAAQG,GAC3C,IAEIluC,EAAGmuC,EAFHH,EAAO5nC,EAAQ,aAAcE,EAC7BpG,EAAMkG,EAAQ/F,OAGlB,GAAI2tC,EAAM,CAET,IADAG,KACKnuC,EAAI,EAAGA,EAAIE,EAAKF,IACpBmuC,EAAKnuC,GAAKH,KAAKu3B,KAAKhF,mBAAmBhsB,EAAQpG,IAC/CkuC,EAAgBpuC,OAAOquC,EAAKnuC,IAE7B+tC,EAAOzqC,KAAK6qC,QAEZ,IAAKnuC,EAAI,EAAGA,EAAIE,EAAKF,IACpBH,KAAKouC,gBAAgB7nC,EAAQpG,GAAI+tC,EAAQG,IAM5CE,YAAa,WACZ,IAAIr5B,EAASlV,KAAKuwB,UAAU6b,QAG5B,GADApsC,KAAK0tC,UACA1tC,KAAKisC,WAAcjsC,KAAKisC,UAAU3uB,WAAWpI,GAIlD,GAAIlV,KAAKkD,QAAQ6pC,OAChB/sC,KAAK0tC,OAAS1tC,KAAK8tC,WADpB,CAKA,IACI3tC,EAAGC,EAAGgW,EAAG/V,EAAKwH,EAAM2mC,EAAStoC,EAD7BuoC,EAAQzuC,KAAK0tC,OAGjB,IAAKvtC,EAAI,EAAGiW,EAAI,EAAG/V,EAAML,KAAK8tC,OAAOttC,OAAQL,EAAIE,EAAKF,IAGrD,IAAKC,EAAI,EAAGyH,GAFZ3B,EAASlG,KAAK8tC,OAAO3tC,IAEKK,OAAQJ,EAAIyH,EAAO,EAAGzH,KAC/CouC,EAAUv5B,GAAY/O,EAAO9F,GAAI8F,EAAO9F,EAAI,GAAI8U,EAAQ9U,GAAG,MAI3DquC,EAAMr4B,GAAKq4B,EAAMr4B,OACjBq4B,EAAMr4B,GAAG3S,KAAK+qC,EAAQ,IAGjBA,EAAQ,KAAOtoC,EAAO9F,EAAI,IAAQA,IAAMyH,EAAO,IACnD4mC,EAAMr4B,GAAG3S,KAAK+qC,EAAQ,IACtBp4B,QAOJs4B,gBAAiB,WAIhB,IAAK,IAHDD,EAAQzuC,KAAK0tC,OACb75B,EAAY7T,KAAKkD,QAAQ4pC,aAEpB3sC,EAAI,EAAGE,EAAMouC,EAAMjuC,OAAQL,EAAIE,EAAKF,IAC5CsuC,EAAMtuC,GAAKyT,GAAS66B,EAAMtuC,GAAI0T,IAIhC4lB,QAAS,WACHz5B,KAAKu3B,OAEVv3B,KAAKuuC,cACLvuC,KAAK0uC,kBACL1uC,KAAKmrC,gBAGNA,YAAa,WACZnrC,KAAKuwB,UAAUoe,YAAY3uC,OAI5BqsC,eAAgB,SAAUvkC,EAAGF,GAC5B,IAAIzH,EAAGC,EAAGgW,EAAG/V,EAAKwH,EAAM+mC,EACpBhiB,EAAI5sB,KAAKwrC,kBAEb,IAAKxrC,KAAKisC,YAAcjsC,KAAKisC,UAAU3+B,SAASxF,GAAM,OAAO,EAG7D,IAAK3H,EAAI,EAAGE,EAAML,KAAK0tC,OAAOltC,OAAQL,EAAIE,EAAKF,IAG9C,IAAKC,EAAI,EAAuBgW,GAApBvO,GAFZ+mC,EAAO5uC,KAAK0tC,OAAOvtC,IAEKK,QAAmB,EAAGJ,EAAIyH,EAAMuO,EAAIhW,IAC3D,IAAKwH,GAAiB,IAANxH,IAEZ6T,GAAuBnM,EAAG8mC,EAAKx4B,GAAIw4B,EAAKxuC,KAAOwsB,EAClD,OAAO,EAIV,OAAO,KAcTxV,GAASnB,MAAQA,GAgDjB,IAAIoB,GAAUD,GAASnX,QAEtBiD,SACCunC,MAAM,GAGP2C,QAAS,WACR,OAAQptC,KAAKktC,SAAS1sC,SAAWR,KAAKktC,SAAS,GAAG1sC,QAGnDwc,UAAW,WAEV,IAAKhd,KAAKu3B,KACT,MAAM,IAAIpzB,MAAM,kDAGjB,IAAIhE,EAAGC,EAAG8T,EAAIC,EAAI06B,EAAGC,EAAMhtC,EAAG+D,EAAGyb,EAC7Bpb,EAASlG,KAAK8tC,OAAO,GACrBztC,EAAM6F,EAAO1F,OAEjB,IAAKH,EAAO,OAAO,KAMnB,IAFAyuC,EAAOhtC,EAAI+D,EAAI,EAEV1F,EAAI,EAAGC,EAAIC,EAAM,EAAGF,EAAIE,EAAKD,EAAID,IACrC+T,EAAKhO,EAAO/F,GACZgU,EAAKjO,EAAO9F,GAEZyuC,EAAI36B,EAAGrO,EAAIsO,EAAGrS,EAAIqS,EAAGtO,EAAIqO,EAAGpS,EAC5BA,IAAMoS,EAAGpS,EAAIqS,EAAGrS,GAAK+sC,EACrBhpC,IAAMqO,EAAGrO,EAAIsO,EAAGtO,GAAKgpC,EACrBC,GAAY,EAAJD,EAST,OAJCvtB,EAFY,IAATwtB,EAEM5oC,EAAO,IAENpE,EAAIgtC,EAAMjpC,EAAIipC,GAElB9uC,KAAKu3B,KAAK3G,mBAAmBtP,IAGrC2sB,gBAAiB,SAAU1nC,GAC1B,IAAI2nC,EAAS92B,GAAStW,UAAUmtC,gBAAgBjtC,KAAKhB,KAAMuG,GACvDlG,EAAM6tC,EAAO1tC,OAMjB,OAHIH,GAAO,GAAK6tC,EAAO,aAAcznC,GAAUynC,EAAO,GAAGnxB,OAAOmxB,EAAO7tC,EAAM,KAC5E6tC,EAAOa,MAEDb,GAGRlB,YAAa,SAAUzmC,GACtB6Q,GAAStW,UAAUksC,YAAYhsC,KAAKhB,KAAMuG,GACtCyP,GAAOhW,KAAKktC,YACfltC,KAAKktC,UAAYltC,KAAKktC,YAIxBc,cAAe,WACd,OAAOh4B,GAAOhW,KAAKktC,SAAS,IAAMltC,KAAKktC,SAAS,GAAKltC,KAAKktC,SAAS,GAAG,IAGvEqB,YAAa,WAGZ,IAAIr5B,EAASlV,KAAKuwB,UAAU6b,QACxBxf,EAAI5sB,KAAKkD,QAAQknC,OACjBtiC,EAAI,IAAIlC,EAAMgnB,EAAGA,GAMrB,GAHA1X,EAAS,IAAInP,EAAOmP,EAAOhT,IAAIga,SAASpU,GAAIoN,EAAOjT,IAAI2L,IAAI9F,IAE3D9H,KAAK0tC,UACA1tC,KAAKisC,WAAcjsC,KAAKisC,UAAU3uB,WAAWpI,GAIlD,GAAIlV,KAAKkD,QAAQ6pC,OAChB/sC,KAAK0tC,OAAS1tC,KAAK8tC,YAIpB,IAAK,IAAqCkB,EAAjC7uC,EAAI,EAAGE,EAAML,KAAK8tC,OAAOttC,OAAiBL,EAAIE,EAAKF,KAC3D6uC,EAAU94B,GAAYlW,KAAK8tC,OAAO3tC,GAAI+U,GAAQ,IAClC1U,QACXR,KAAK0tC,OAAOjqC,KAAKurC,IAKpB7D,YAAa,WACZnrC,KAAKuwB,UAAUoe,YAAY3uC,MAAM,IAIlCqsC,eAAgB,SAAUvkC,GACzB,IACI8mC,EAAM16B,EAAIC,EAAIhU,EAAGC,EAAGgW,EAAG/V,EAAKwH,EAD5BspB,GAAS,EAGb,IAAKnxB,KAAKisC,YAAcjsC,KAAKisC,UAAU3+B,SAASxF,GAAM,OAAO,EAG7D,IAAK3H,EAAI,EAAGE,EAAML,KAAK0tC,OAAOltC,OAAQL,EAAIE,EAAKF,IAG9C,IAAKC,EAAI,EAAuBgW,GAApBvO,GAFZ+mC,EAAO5uC,KAAK0tC,OAAOvtC,IAEKK,QAAmB,EAAGJ,EAAIyH,EAAMuO,EAAIhW,IAC3D8T,EAAK06B,EAAKxuC,GACV+T,EAAKy6B,EAAKx4B,GAEJlC,EAAGrO,EAAIiC,EAAEjC,GAAQsO,EAAGtO,EAAIiC,EAAEjC,GAAQiC,EAAEhG,GAAKqS,EAAGrS,EAAIoS,EAAGpS,IAAMgG,EAAEjC,EAAIqO,EAAGrO,IAAMsO,EAAGtO,EAAIqO,EAAGrO,GAAKqO,EAAGpS,IAC/FqvB,GAAUA,GAMb,OAAOA,GAAU/Z,GAAStW,UAAUurC,eAAerrC,KAAKhB,KAAM8H,GAAG,MAgC/DoQ,GAAUhB,GAAajX,QAiD1BsZ,WAAY,SAAU/C,EAAStT,GAC9BD,EAAWjD,KAAMkD,GAEjBlD,KAAK2oB,WAEDnS,GACHxW,KAAKivC,QAAQz4B,IAMfy4B,QAAS,SAAUz4B,GAClB,IACIrW,EAAGE,EAAK0X,EADRm3B,EAAW3pC,GAAQiR,GAAWA,EAAUA,EAAQ04B,SAGpD,GAAIA,EAAU,CACb,IAAK/uC,EAAI,EAAGE,EAAM6uC,EAAS1uC,OAAQL,EAAIE,EAAKF,MAE3C4X,EAAUm3B,EAAS/uC,IACPmX,YAAcS,EAAQrB,UAAYqB,EAAQm3B,UAAYn3B,EAAQnB,cACzE5W,KAAKivC,QAAQl3B,GAGf,OAAO/X,KAGR,IAAIkD,EAAUlD,KAAKkD,QAEnB,GAAIA,EAAQiL,SAAWjL,EAAQiL,OAAOqI,GAAY,OAAOxW,KAEzD,IAAIuX,EAAQhB,GAAgBC,EAAStT,GACrC,OAAKqU,GAGLA,EAAMQ,QAAUC,GAAUxB,GAE1Be,EAAM43B,eAAiB53B,EAAMrU,QAC7BlD,KAAKovC,WAAW73B,GAEZrU,EAAQmsC,eACXnsC,EAAQmsC,cAAc74B,EAASe,GAGzBvX,KAAKu8B,SAAShlB,IAXbvX,MAgBTovC,WAAY,SAAU73B,GAIrB,OAFAA,EAAMrU,QAAUjD,KAAWsX,EAAM43B,gBACjCnvC,KAAKsvC,eAAe/3B,EAAOvX,KAAKkD,QAAQ8I,OACjChM,MAKRqkC,SAAU,SAAUr4B,GACnB,OAAOhM,KAAKujC,UAAU,SAAUhsB,GAC/BvX,KAAKsvC,eAAe/3B,EAAOvL,IACzBhM,OAGJsvC,eAAgB,SAAU/3B,EAAOvL,GACX,mBAAVA,IACVA,EAAQA,EAAMuL,EAAMQ,UAEjBR,EAAM8sB,UACT9sB,EAAM8sB,SAASr4B,MA2IdujC,IACHC,UAAW,SAAU73B,GACpB,OAAOE,GAAW7X,MACjBqI,KAAM,QACNuO,YAAac,GAAe1X,KAAK60B,YAAald,OAQjDV,GAAO8C,QAAQw1B,IAKfjD,GAAOvyB,QAAQw1B,IACf9D,GAAa1xB,QAAQw1B,IAMrBn4B,GAAS2C,SACRy1B,UAAW,SAAU73B,GACpB,IAAI83B,GAASz5B,GAAOhW,KAAKktC,UAErBv2B,EAASiB,GAAgB5X,KAAKktC,SAAUuC,EAAQ,EAAI,GAAG,EAAO93B,GAElE,OAAOE,GAAW7X,MACjBqI,MAAOonC,EAAQ,QAAU,IAAM,aAC/B74B,YAAaD,OAQhBU,GAAQ0C,SACPy1B,UAAW,SAAU73B,GACpB,IAAI+3B,GAAS15B,GAAOhW,KAAKktC,UACrBuC,EAAQC,IAAU15B,GAAOhW,KAAKktC,SAAS,IAEvCv2B,EAASiB,GAAgB5X,KAAKktC,SAAUuC,EAAQ,EAAIC,EAAQ,EAAI,GAAG,EAAM/3B,GAM7E,OAJK+3B,IACJ/4B,GAAUA,IAGJkB,GAAW7X,MACjBqI,MAAOonC,EAAQ,QAAU,IAAM,UAC/B74B,YAAaD,OAOhBktB,GAAW9pB,SACV41B,aAAc,SAAUh4B,GACvB,IAAIhB,KAMJ,OAJA3W,KAAKujC,UAAU,SAAUhsB,GACxBZ,EAAOlT,KAAK8T,EAAMi4B,UAAU73B,GAAWjB,SAASE,eAG1CiB,GAAW7X,MACjBqI,KAAM,aACNuO,YAAaD,KAMf64B,UAAW,SAAU73B,GAEpB,IAAItP,EAAOrI,KAAK+X,SAAW/X,KAAK+X,QAAQrB,UAAY1W,KAAK+X,QAAQrB,SAASrO,KAE1E,GAAa,eAATA,EACH,OAAOrI,KAAK2vC,aAAah4B,GAG1B,IAAIi4B,EAAgC,uBAATvnC,EACvBwnC,KAmBJ,OAjBA7vC,KAAKujC,UAAU,SAAUhsB,GACxB,GAAIA,EAAMi4B,UAAW,CACpB,IAAIM,EAAOv4B,EAAMi4B,UAAU73B,GAC3B,GAAIi4B,EACHC,EAAMpsC,KAAKqsC,EAAKp5B,cACV,CACN,IAAIqB,EAAUC,GAAU83B,GAEH,sBAAjB/3B,EAAQ1P,KACXwnC,EAAMpsC,KAAK1C,MAAM8uC,EAAO93B,EAAQm3B,UAEhCW,EAAMpsC,KAAKsU,OAMX63B,EACI/3B,GAAW7X,MACjBsX,WAAYu4B,EACZxnC,KAAM,wBAKPA,KAAM,oBACN6mC,SAAUW,MAeb,IAAIE,GAAU93B,GAkBV+3B,GAAelN,GAAM7iC,QAIxBiD,SAGC+K,QAAS,EAITrH,IAAK,GAILohC,aAAa,EAMbiI,aAAa,EAIbC,gBAAiB,GAIjB9L,OAAQ,EAIR93B,UAAW,IAGZiN,WAAY,SAAUnB,EAAKlD,EAAQhS,GAClClD,KAAKmwC,KAAO/3B,EACZpY,KAAKosC,QAAU5lC,EAAe0O,GAE9BjS,EAAWjD,KAAMkD,IAGlBy0B,MAAO,WACD33B,KAAKowC,SACTpwC,KAAKqwC,aAEDrwC,KAAKkD,QAAQ+K,QAAU,GAC1BjO,KAAK0pC,kBAIH1pC,KAAKkD,QAAQ8kC,cAChBt6B,EAAS1N,KAAKowC,OAAQ,uBACtBpwC,KAAKijC,qBAAqBjjC,KAAKowC,SAGhCpwC,KAAKkyB,UAAUzlB,YAAYzM,KAAKowC,QAChCpwC,KAAK+qC,UAGNjT,SAAU,WACTprB,EAAO1M,KAAKowC,QACRpwC,KAAKkD,QAAQ8kC,aAChBhoC,KAAKmjC,wBAAwBnjC,KAAKowC,SAMpCpiC,WAAY,SAAUC,GAMrB,OALAjO,KAAKkD,QAAQ+K,QAAUA,EAEnBjO,KAAKowC,QACRpwC,KAAK0pC,iBAEC1pC,MAGRqkC,SAAU,SAAUiM,GAInB,OAHIA,EAAUriC,SACbjO,KAAKgO,WAAWsiC,EAAUriC,SAEpBjO,MAKRskC,aAAc,WAIb,OAHItkC,KAAKu3B,MACRvqB,EAAQhN,KAAKowC,QAEPpwC,MAKRukC,YAAa,WAIZ,OAHIvkC,KAAKu3B,MACRrqB,EAAOlN,KAAKowC,QAENpwC,MAKRuwC,OAAQ,SAAUn4B,GAMjB,OALApY,KAAKmwC,KAAO/3B,EAERpY,KAAKowC,SACRpwC,KAAKowC,OAAO9vC,IAAM8X,GAEZpY,MAKRwwC,UAAW,SAAUt7B,GAMpB,OALAlV,KAAKosC,QAAU5lC,EAAe0O,GAE1BlV,KAAKu3B,MACRv3B,KAAK+qC,SAEC/qC,MAGRqjC,UAAW,WACV,IAAIlwB,GACHgN,KAAMngB,KAAK+qC,OACXrC,UAAW1oC,KAAK+qC,QAOjB,OAJI/qC,KAAK8oB,gBACR3V,EAAOs9B,SAAWzwC,KAAKg3B,cAGjB7jB,GAKRgoB,UAAW,SAAUj3B,GAGpB,OAFAlE,KAAKkD,QAAQkhC,OAASlgC,EACtBlE,KAAK6pC,gBACE7pC,MAKRsqB,UAAW,WACV,OAAOtqB,KAAKosC,SAMbpD,WAAY,WACX,OAAOhpC,KAAKowC,QAGbC,WAAY,WACX,IAAIK,EAA2C,QAAtB1wC,KAAKmwC,KAAK7mC,QAC/B07B,EAAMhlC,KAAKowC,OAASM,EAAqB1wC,KAAKmwC,KAAO9jC,EAAS,OAElEqB,EAASs3B,EAAK,uBACVhlC,KAAK8oB,eAAiBpb,EAASs3B,EAAK,yBACpChlC,KAAKkD,QAAQoJ,WAAaoB,EAASs3B,EAAKhlC,KAAKkD,QAAQoJ,WAEzD04B,EAAI2L,cAAgBvuC,EACpB4iC,EAAI4L,YAAcxuC,EAIlB4iC,EAAI6L,OAASpwC,EAAKT,KAAK6a,KAAM7a,KAAM,QACnCglC,EAAI8L,QAAUrwC,EAAKT,KAAK+wC,gBAAiB/wC,KAAM,UAE3CA,KAAKkD,QAAQ+sC,aAA4C,KAA7BjwC,KAAKkD,QAAQ+sC,eAC5CjL,EAAIiL,aAA2C,IAA7BjwC,KAAKkD,QAAQ+sC,YAAuB,GAAKjwC,KAAKkD,QAAQ+sC,aAGrEjwC,KAAKkD,QAAQkhC,QAChBpkC,KAAK6pC,gBAGF6G,EACH1wC,KAAKmwC,KAAOnL,EAAI1kC,KAIjB0kC,EAAI1kC,IAAMN,KAAKmwC,KACfnL,EAAIp+B,IAAM5G,KAAKkD,QAAQ0D,MAGxBowB,aAAc,SAAU/tB,GACvB,IAAI4F,EAAQ7O,KAAKu3B,KAAKvN,aAAa/gB,EAAEkX,MACjCvR,EAAS5O,KAAKu3B,KAAK9B,8BAA8Bz1B,KAAKosC,QAASnjC,EAAEkX,KAAMlX,EAAEqY,QAAQpf,IAErFyM,GAAa3O,KAAKowC,OAAQxhC,EAAQC,IAGnCk8B,OAAQ,WACP,IAAIiG,EAAQhxC,KAAKowC,OACbl7B,EAAS,IAAInP,EACT/F,KAAKu3B,KAAKhF,mBAAmBvyB,KAAKosC,QAAQztB,gBAC1C3e,KAAKu3B,KAAKhF,mBAAmBvyB,KAAKosC,QAAQttB,iBAC9C6O,EAAOzY,EAAOmI,UAElBpO,GAAY+hC,EAAO97B,EAAOhT,KAE1B8uC,EAAMhlC,MAAM0E,MAASid,EAAK7rB,EAAI,KAC9BkvC,EAAMhlC,MAAM2E,OAASgd,EAAK9nB,EAAI,MAG/B6jC,eAAgB,WACf17B,GAAWhO,KAAKowC,OAAQpwC,KAAKkD,QAAQ+K,UAGtC47B,cAAe,WACV7pC,KAAKowC,aAAkC1tC,IAAxB1C,KAAKkD,QAAQkhC,QAAgD,OAAxBpkC,KAAKkD,QAAQkhC,SACpEpkC,KAAKowC,OAAOpkC,MAAMo4B,OAASpkC,KAAKkD,QAAQkhC,SAI1C2M,gBAAiB,WAGhB/wC,KAAK6a,KAAK,SAEV,IAAIo2B,EAAWjxC,KAAKkD,QAAQgtC,gBACxBe,GAAYjxC,KAAKmwC,OAASc,IAC7BjxC,KAAKmwC,KAAOc,EACZjxC,KAAKowC,OAAO9vC,IAAM2wC,MA+BjBC,GAAelB,GAAa/vC,QAI/BiD,SAGCiuC,UAAU,EAIVC,MAAM,GAGPf,WAAY,WACX,IAAIK,EAA2C,UAAtB1wC,KAAKmwC,KAAK7mC,QAC/B+nC,EAAMrxC,KAAKowC,OAASM,EAAqB1wC,KAAKmwC,KAAO9jC,EAAS,SAYlE,GAVAqB,EAAS2jC,EAAK,uBACVrxC,KAAK8oB,eAAiBpb,EAAS2jC,EAAK,yBAExCA,EAAIV,cAAgBvuC,EACpBivC,EAAIT,YAAcxuC,EAIlBivC,EAAIC,aAAe7wC,EAAKT,KAAK6a,KAAM7a,KAAM,QAErC0wC,EAAJ,CAGC,IAAK,IAFDa,EAAiBF,EAAIG,qBAAqB,UAC1CC,KACKrxC,EAAI,EAAGA,EAAImxC,EAAe/wC,OAAQJ,IAC1CqxC,EAAQhuC,KAAK8tC,EAAenxC,GAAGE,KAGhCN,KAAKmwC,KAAQoB,EAAe/wC,OAAS,EAAKixC,GAAWJ,EAAI/wC,SAP1D,CAWKiF,GAAQvF,KAAKmwC,QAASnwC,KAAKmwC,MAAQnwC,KAAKmwC,OAE7CkB,EAAIF,WAAanxC,KAAKkD,QAAQiuC,SAC9BE,EAAID,OAASpxC,KAAKkD,QAAQkuC,KAC1B,IAAK,IAAIjxC,EAAI,EAAGA,EAAIH,KAAKmwC,KAAK3vC,OAAQL,IAAK,CAC1C,IAAIuxC,EAASrlC,EAAS,UACtBqlC,EAAOpxC,IAAMN,KAAKmwC,KAAKhwC,GACvBkxC,EAAI5kC,YAAYilC,QA0BfC,GAAa7O,GAAM7iC,QAItBiD,SAIC0L,QAAS,EAAG,GAIZtC,UAAW,GAIXmkB,KAAM,aAGPlX,WAAY,SAAUrW,EAASwuC,GAC9BzuC,EAAWjD,KAAMkD,GAEjBlD,KAAK4xC,QAAUF,GAGhB/Z,MAAO,SAAUL,GAChBt3B,KAAK8oB,cAAgBwO,EAAIxO,cAEpB9oB,KAAKkwB,YACTlwB,KAAKkoB,cAGFoP,EAAIvE,eACP/kB,GAAWhO,KAAKkwB,WAAY,GAG7B9W,aAAapZ,KAAK6xC,gBAClB7xC,KAAKkyB,UAAUzlB,YAAYzM,KAAKkwB,YAChClwB,KAAKuoC,SAEDjR,EAAIvE,eACP/kB,GAAWhO,KAAKkwB,WAAY,GAG7BlwB,KAAKskC,gBAGNxM,SAAU,SAAUR,GACfA,EAAIvE,eACP/kB,GAAWhO,KAAKkwB,WAAY,GAC5BlwB,KAAK6xC,eAAiBjwC,WAAWnB,EAAKiM,OAAQhK,EAAW1C,KAAKkwB,YAAa,MAE3ExjB,EAAO1M,KAAKkwB,aAOd2E,UAAW,WACV,OAAO70B,KAAK8nC,SAKba,UAAW,SAAUlyB,GAMpB,OALAzW,KAAK8nC,QAAUhhC,EAAS2P,GACpBzW,KAAKu3B,OACRv3B,KAAK8hC,kBACL9hC,KAAKgnC,cAEChnC,MAKR8xC,WAAY,WACX,OAAO9xC,KAAK+xC,UAKbC,WAAY,SAAUC,GAGrB,OAFAjyC,KAAK+xC,SAAWE,EAChBjyC,KAAKuoC,SACEvoC,MAKRgpC,WAAY,WACX,OAAOhpC,KAAKkwB,YAKbqY,OAAQ,WACFvoC,KAAKu3B,OAEVv3B,KAAKkwB,WAAWlkB,MAAMkmC,WAAa,SAEnClyC,KAAKmyC,iBACLnyC,KAAKoyC,gBACLpyC,KAAK8hC,kBAEL9hC,KAAKkwB,WAAWlkB,MAAMkmC,WAAa,GAEnClyC,KAAKgnC,eAGN3D,UAAW,WACV,IAAIlwB,GACHgN,KAAMngB,KAAK8hC,gBACX4G,UAAW1oC,KAAK8hC,iBAMjB,OAHI9hC,KAAK8oB,gBACR3V,EAAOs9B,SAAWzwC,KAAKg3B,cAEjB7jB,GAKRk/B,OAAQ,WACP,QAASryC,KAAKu3B,MAAQv3B,KAAKu3B,KAAKwE,SAAS/7B,OAK1CskC,aAAc,WAIb,OAHItkC,KAAKu3B,MACRvqB,EAAQhN,KAAKkwB,YAEPlwB,MAKRukC,YAAa,WAIZ,OAHIvkC,KAAKu3B,MACRrqB,EAAOlN,KAAKkwB,YAENlwB,MAGRmyC,eAAgB,WACf,GAAKnyC,KAAK+xC,SAAV,CAEA,IAAIO,EAAOtyC,KAAKuyC,aACZN,EAAoC,mBAAlBjyC,KAAK+xC,SAA2B/xC,KAAK+xC,SAAS/xC,KAAK4xC,SAAW5xC,MAAQA,KAAK+xC,SAEjG,GAAuB,iBAAZE,EACVK,EAAKltB,UAAY6sB,MACX,CACN,KAAOK,EAAKE,iBACXF,EAAKzlC,YAAYylC,EAAKvlC,YAEvBulC,EAAK7lC,YAAYwlC,GAElBjyC,KAAK6a,KAAK,mBAGXinB,gBAAiB,WAChB,GAAK9hC,KAAKu3B,KAAV,CAEA,IAAIzoB,EAAM9O,KAAKu3B,KAAKhF,mBAAmBvyB,KAAK8nC,SACxCl5B,EAAS9I,EAAQ9F,KAAKkD,QAAQ0L,QAC9Bw2B,EAASplC,KAAKyyC,aAEdzyC,KAAK8oB,cACR7Z,GAAYjP,KAAKkwB,WAAYphB,EAAIlB,IAAIw3B,IAErCx2B,EAASA,EAAOhB,IAAIkB,GAAKlB,IAAIw3B,GAG9B,IAAIuH,EAAS3sC,KAAK0yC,kBAAoB9jC,EAAO/I,EACzCwJ,EAAOrP,KAAK2yC,gBAAkBlwC,KAAKE,MAAM3C,KAAK4yC,gBAAkB,GAAKhkC,EAAO9M,EAGhF9B,KAAKkwB,WAAWlkB,MAAM2gC,OAASA,EAAS,KACxC3sC,KAAKkwB,WAAWlkB,MAAMqD,KAAOA,EAAO,OAGrCojC,WAAY,WACX,OAAQ,EAAG,MAiCTI,GAAQlB,GAAW1xC,QAItBiD,SAGC06B,SAAU,IAIVkV,SAAU,GAKVC,UAAW,KAKXpL,SAAS,EAKTqL,sBAAuB,KAKvBC,0BAA2B,KAI3B9L,gBAAiB,EAAG,GAKpB+L,YAAY,EAIZC,aAAa,EAKbC,WAAW,EAKXC,kBAAkB,EAQlB/mC,UAAW,IAMZgnC,OAAQ,SAAUhc,GAEjB,OADAA,EAAIic,UAAUvzC,MACPA,MAGR23B,MAAO,SAAUL,GAChBqa,GAAW7wC,UAAU62B,MAAM32B,KAAKhB,KAAMs3B,GAMtCA,EAAIzc,KAAK,aAAc24B,MAAOxzC,OAE1BA,KAAK4xC,UAKR5xC,KAAK4xC,QAAQ/2B,KAAK,aAAc24B,MAAOxzC,OAAO,GAGxCA,KAAK4xC,mBAAmB3H,IAC7BjqC,KAAK4xC,QAAQniC,GAAG,WAAYiC,MAK/BomB,SAAU,SAAUR,GACnBqa,GAAW7wC,UAAUg3B,SAAS92B,KAAKhB,KAAMs3B,GAMzCA,EAAIzc,KAAK,cAAe24B,MAAOxzC,OAE3BA,KAAK4xC,UAKR5xC,KAAK4xC,QAAQ/2B,KAAK,cAAe24B,MAAOxzC,OAAO,GACzCA,KAAK4xC,mBAAmB3H,IAC7BjqC,KAAK4xC,QAAQjiC,IAAI,WAAY+B,MAKhC2xB,UAAW,WACV,IAAIlwB,EAASw+B,GAAW7wC,UAAUuiC,UAAUriC,KAAKhB,MAUjD,YARkC0C,IAA9B1C,KAAKkD,QAAQuwC,aAA6BzzC,KAAKkD,QAAQuwC,aAAezzC,KAAKu3B,KAAKr0B,QAAQwwC,qBAC3FvgC,EAAOwgC,SAAW3zC,KAAK4zC,QAGpB5zC,KAAKkD,QAAQgwC,aAChB//B,EAAO0gC,QAAU7zC,KAAKgnC,YAGhB7zB,GAGRygC,OAAQ,WACH5zC,KAAKu3B,MACRv3B,KAAKu3B,KAAKmQ,WAAW1nC,OAIvBkoB,YAAa,WACZ,IAAIgX,EAAS,gBACT3yB,EAAYvM,KAAKkwB,WAAa7jB,EAAS,MAC1C6yB,EAAS,KAAOl/B,KAAKkD,QAAQoJ,WAAa,IAC1C,0BAEGwnC,EAAU9zC,KAAK+zC,SAAW1nC,EAAS,MAAO6yB,EAAS,mBAAoB3yB,GAU3E,GATAvM,KAAKuyC,aAAelmC,EAAS,MAAO6yB,EAAS,WAAY4U,GAEzD/hC,GAAwB+hC,GACxBhiC,GAAyB9R,KAAKuyC,cAC9B9iC,GAAGqkC,EAAS,cAAepiC,IAE3B1R,KAAKg0C,cAAgB3nC,EAAS,MAAO6yB,EAAS,iBAAkB3yB,GAChEvM,KAAKi0C,KAAO5nC,EAAS,MAAO6yB,EAAS,OAAQl/B,KAAKg0C,eAE9Ch0C,KAAKkD,QAAQiwC,YAAa,CAC7B,IAAIA,EAAcnzC,KAAKk0C,aAAe7nC,EAAS,IAAK6yB,EAAS,gBAAiB3yB,GAC9E4mC,EAAYvY,KAAO,SACnBuY,EAAY/tB,UAAY,SAExB3V,GAAG0jC,EAAa,QAASnzC,KAAKm0C,oBAAqBn0C,QAIrDoyC,cAAe,WACd,IAAI7lC,EAAYvM,KAAKuyC,aACjBvmC,EAAQO,EAAUP,MAEtBA,EAAM0E,MAAQ,GACd1E,EAAMooC,WAAa,SAEnB,IAAI1jC,EAAQnE,EAAU6D,YACtBM,EAAQjO,KAAKP,IAAIwO,EAAO1Q,KAAKkD,QAAQ06B,UACrCltB,EAAQjO,KAAKR,IAAIyO,EAAO1Q,KAAKkD,QAAQ4vC,UAErC9mC,EAAM0E,MAASA,EAAQ,EAAK,KAC5B1E,EAAMooC,WAAa,GAEnBpoC,EAAM2E,OAAS,GAEf,IAAIA,EAASpE,EAAU8D,aACnB0iC,EAAY/yC,KAAKkD,QAAQ6vC,UAGzBA,GAAapiC,EAASoiC,GACzB/mC,EAAM2E,OAASoiC,EAAY,KAC3BrlC,EAASnB,EAJU,2BAMnBuB,GAAYvB,EANO,0BASpBvM,KAAK4yC,gBAAkB5yC,KAAKkwB,WAAW9f,aAGxC4mB,aAAc,SAAU/tB,GACvB,IAAI6F,EAAM9O,KAAKu3B,KAAKhC,uBAAuBv1B,KAAK8nC,QAAS7+B,EAAEkX,KAAMlX,EAAEqY,QAC/D8jB,EAASplC,KAAKyyC,aAClBxjC,GAAYjP,KAAKkwB,WAAYphB,EAAIlB,IAAIw3B,KAGtC4B,WAAY,WACX,MAAKhnC,KAAKkD,QAAQykC,SAAY3nC,KAAKu3B,KAAKjM,UAAYtrB,KAAKu3B,KAAKjM,SAAShF,aAAvE,CAEA,IAAIgR,EAAMt3B,KAAKu3B,KACX8c,EAAelxB,SAASpX,EAAS/L,KAAKkwB,WAAY,gBAAiB,KAAO,EAC1EokB,EAAkBt0C,KAAKkwB,WAAW7f,aAAegkC,EACjDE,EAAiBv0C,KAAK4yC,gBACtB4B,EAAW,IAAI5uC,EAAM5F,KAAK2yC,gBAAiB2B,EAAkBt0C,KAAK0yC,kBAEtE8B,EAASv4B,KAAK1M,GAAYvP,KAAKkwB,aAE/B,IAAIukB,EAAend,EAAI7E,2BAA2B+hB,GAC9C/pB,EAAU3kB,EAAQ9F,KAAKkD,QAAQikC,gBAC/B5c,EAAYzkB,EAAQ9F,KAAKkD,QAAQ8vC,uBAAyBvoB,GAC1DC,EAAY5kB,EAAQ9F,KAAKkD,QAAQ+vC,2BAA6BxoB,GAC9DkD,EAAO2J,EAAIja,UACXzH,EAAK,EACLC,EAAK,EAEL4+B,EAAa3yC,EAAIyyC,EAAiB7pB,EAAU5oB,EAAI6rB,EAAK7rB,IACxD8T,EAAK6+B,EAAa3yC,EAAIyyC,EAAiB5mB,EAAK7rB,EAAI4oB,EAAU5oB,GAEvD2yC,EAAa3yC,EAAI8T,EAAK2U,EAAUzoB,EAAI,IACvC8T,EAAK6+B,EAAa3yC,EAAIyoB,EAAUzoB,GAE7B2yC,EAAa5uC,EAAIyuC,EAAkB5pB,EAAU7kB,EAAI8nB,EAAK9nB,IACzDgQ,EAAK4+B,EAAa5uC,EAAIyuC,EAAkB3mB,EAAK9nB,EAAI6kB,EAAU7kB,GAExD4uC,EAAa5uC,EAAIgQ,EAAK0U,EAAU1kB,EAAI,IACvCgQ,EAAK4+B,EAAa5uC,EAAI0kB,EAAU1kB,IAO7B+P,GAAMC,IACTyhB,EACKzc,KAAK,gBACLuQ,OAAOxV,EAAIC,MAIlBs+B,oBAAqB,SAAUlrC,GAC9BjJ,KAAK4zC,SACL1hC,GAAKjJ,IAGNwpC,WAAY,WAEX,OAAO3sC,EAAQ9F,KAAK4xC,SAAW5xC,KAAK4xC,QAAQ7H,gBAAkB/pC,KAAK4xC,QAAQ7H,mBAAqB,EAAG,OAkBrG5iB,GAAInN,cACH05B,mBAAmB,IAMpBvsB,GAAIpN,SAMHw5B,UAAW,SAAUC,EAAO/8B,EAAQvT,GASnC,OARMswC,aAAiBX,KACtBW,EAAQ,IAAIX,GAAM3vC,GAAS8uC,WAAWwB,IAGnC/8B,GACH+8B,EAAM7K,UAAUlyB,GAGbzW,KAAK+7B,SAASyX,GACVxzC,MAGJA,KAAK8oC,QAAU9oC,KAAK8oC,OAAO5lC,QAAQkwC,WACtCpzC,KAAK0nC,aAGN1nC,KAAK8oC,OAAS0K,EACPxzC,KAAKu8B,SAASiX,KAKtB9L,WAAY,SAAU8L,GAQrB,OAPKA,GAASA,IAAUxzC,KAAK8oC,SAC5B0K,EAAQxzC,KAAK8oC,OACb9oC,KAAK8oC,OAAS,MAEX0K,GACHxzC,KAAK+5B,YAAYyZ,GAEXxzC,QAoBT8iC,GAAM/oB,SAMLgvB,UAAW,SAAUkJ,EAAS/uC,GAuB7B,OArBI+uC,aAAmBY,IACtB5vC,EAAWgvC,EAAS/uC,GACpBlD,KAAK8oC,OAASmJ,EACdA,EAAQL,QAAU5xC,OAEbA,KAAK8oC,SAAU5lC,IACnBlD,KAAK8oC,OAAS,IAAI+J,GAAM3vC,EAASlD,OAElCA,KAAK8oC,OAAOkJ,WAAWC,IAGnBjyC,KAAK00C,sBACT10C,KAAKyP,IACJklC,MAAO30C,KAAK40C,WACZC,SAAU70C,KAAK80C,YACfpoC,OAAQ1M,KAAK0nC,WACbqN,KAAM/0C,KAAKg1C,aAEZh1C,KAAK00C,qBAAsB,GAGrB10C,MAKRi1C,YAAa,WAWZ,OAVIj1C,KAAK8oC,SACR9oC,KAAK2P,KACJglC,MAAO30C,KAAK40C,WACZC,SAAU70C,KAAK80C,YACfpoC,OAAQ1M,KAAK0nC,WACbqN,KAAM/0C,KAAKg1C,aAEZh1C,KAAK00C,qBAAsB,EAC3B10C,KAAK8oC,OAAS,MAER9oC,MAKRuzC,UAAW,SAAUh8B,EAAOd,GAM3B,GALMc,aAAiBurB,KACtBrsB,EAASc,EACTA,EAAQvX,MAGLuX,aAAiBL,GACpB,IAAK,IAAIjS,KAAMjF,KAAK2oB,QAAS,CAC5BpR,EAAQvX,KAAK2oB,QAAQ1jB,GACrB,MAmBF,OAfKwR,IACJA,EAASc,EAAMyF,UAAYzF,EAAMyF,YAAczF,EAAMsd,aAGlD70B,KAAK8oC,QAAU9oC,KAAKu3B,OAEvBv3B,KAAK8oC,OAAO8I,QAAUr6B,EAGtBvX,KAAK8oC,OAAOP,SAGZvoC,KAAKu3B,KAAKgc,UAAUvzC,KAAK8oC,OAAQryB,IAG3BzW,MAKR0nC,WAAY,WAIX,OAHI1nC,KAAK8oC,QACR9oC,KAAK8oC,OAAO8K,SAEN5zC,MAKRk1C,YAAa,SAAU7rC,GAQtB,OAPIrJ,KAAK8oC,SACJ9oC,KAAK8oC,OAAOvR,KACfv3B,KAAK0nC,aAEL1nC,KAAKuzC,UAAUlqC,IAGVrJ,MAKRm1C,YAAa,WACZ,QAAQn1C,KAAK8oC,QAAS9oC,KAAK8oC,OAAOuJ,UAKnC+C,gBAAiB,SAAUnD,GAI1B,OAHIjyC,KAAK8oC,QACR9oC,KAAK8oC,OAAOkJ,WAAWC,GAEjBjyC,MAKRq1C,SAAU,WACT,OAAOr1C,KAAK8oC,QAGb8L,WAAY,SAAU3rC,GACrB,IAAIsO,EAAQtO,EAAEsO,OAAStO,EAAEI,OAEpBrJ,KAAK8oC,QAIL9oC,KAAKu3B,OAKVrlB,GAAKjJ,GAIDsO,aAAiB0yB,GACpBjqC,KAAKuzC,UAAUtqC,EAAEsO,OAAStO,EAAEI,OAAQJ,EAAEwN,QAMnCzW,KAAKu3B,KAAKwE,SAAS/7B,KAAK8oC,SAAW9oC,KAAK8oC,OAAO8I,UAAYr6B,EAC9DvX,KAAK0nC,aAEL1nC,KAAKuzC,UAAUh8B,EAAOtO,EAAEwN,UAI1Bu+B,WAAY,SAAU/rC,GACrBjJ,KAAK8oC,OAAOH,UAAU1/B,EAAEwN,SAGzBq+B,YAAa,SAAU7rC,GACU,KAA5BA,EAAE0I,cAAc2jC,SACnBt1C,KAAK40C,WAAW3rC,MA2BnB,IAAIssC,GAAU5D,GAAW1xC,QAIxBiD,SAGCutB,KAAM,cAIN7hB,QAAS,EAAG,GAOZ4mC,UAAW,OAIXC,WAAW,EAIXC,QAAQ,EAIR1N,aAAa,EAIb/5B,QAAS,IAGV0pB,MAAO,SAAUL,GAChBqa,GAAW7wC,UAAU62B,MAAM32B,KAAKhB,KAAMs3B,GACtCt3B,KAAKgO,WAAWhO,KAAKkD,QAAQ+K,SAM7BqpB,EAAIzc,KAAK,eAAgB86B,QAAS31C,OAE9BA,KAAK4xC,SAKR5xC,KAAK4xC,QAAQ/2B,KAAK,eAAgB86B,QAAS31C,OAAO,IAIpD83B,SAAU,SAAUR,GACnBqa,GAAW7wC,UAAUg3B,SAAS92B,KAAKhB,KAAMs3B,GAMzCA,EAAIzc,KAAK,gBAAiB86B,QAAS31C,OAE/BA,KAAK4xC,SAKR5xC,KAAK4xC,QAAQ/2B,KAAK,gBAAiB86B,QAAS31C,OAAO,IAIrDqjC,UAAW,WACV,IAAIlwB,EAASw+B,GAAW7wC,UAAUuiC,UAAUriC,KAAKhB,MAMjD,OAJImR,KAAUnR,KAAKkD,QAAQuyC,YAC1BtiC,EAAOwgC,SAAW3zC,KAAK4zC,QAGjBzgC,GAGRygC,OAAQ,WACH5zC,KAAKu3B,MACRv3B,KAAKu3B,KAAKqe,aAAa51C,OAIzBkoB,YAAa,WACZ,IACI5b,EAAY4yB,oBAAgBl/B,KAAKkD,QAAQoJ,WAAa,IAAM,kBAAoBtM,KAAK8oB,cAAgB,WAAa,QAEtH9oB,KAAKuyC,aAAevyC,KAAKkwB,WAAa7jB,EAAS,MAAOC,IAGvD8lC,cAAe,aAEfpL,WAAY,aAEZ6O,aAAc,SAAU/mC,GACvB,IAAIwoB,EAAMt3B,KAAKu3B,KACXhrB,EAAYvM,KAAKkwB,WACjB0F,EAAc0B,EAAInN,uBAAuBmN,EAAIta,aAC7C84B,EAAexe,EAAI7E,2BAA2B3jB,GAC9C0mC,EAAYx1C,KAAKkD,QAAQsyC,UACzBO,EAAexpC,EAAU6D,YACzB4lC,EAAgBzpC,EAAU8D,aAC1BzB,EAAS9I,EAAQ9F,KAAKkD,QAAQ0L,QAC9Bw2B,EAASplC,KAAKyyC,aAEA,QAAd+C,EACH1mC,EAAMA,EAAIlB,IAAI9H,GAASiwC,EAAe,EAAInnC,EAAO9M,GAAIk0C,EAAgBpnC,EAAO/I,EAAIu/B,EAAOv/B,GAAG,IAClE,WAAd2vC,EACV1mC,EAAMA,EAAIoN,SAASpW,EAAQiwC,EAAe,EAAInnC,EAAO9M,GAAI8M,EAAO/I,GAAG,IAC3C,WAAd2vC,EACV1mC,EAAMA,EAAIoN,SAASpW,EAAQiwC,EAAe,EAAInnC,EAAO9M,EAAGk0C,EAAgB,EAAI5Q,EAAOv/B,EAAI+I,EAAO/I,GAAG,IACzE,UAAd2vC,GAAuC,SAAdA,GAAwBM,EAAah0C,EAAI8zB,EAAY9zB,GACxF0zC,EAAY,QACZ1mC,EAAMA,EAAIlB,IAAI9H,EAAQ8I,EAAO9M,EAAIsjC,EAAOtjC,EAAGsjC,EAAOv/B,EAAImwC,EAAgB,EAAIpnC,EAAO/I,GAAG,MAEpF2vC,EAAY,OACZ1mC,EAAMA,EAAIoN,SAASpW,EAAQiwC,EAAe3Q,EAAOtjC,EAAI8M,EAAO9M,EAAGk0C,EAAgB,EAAI5Q,EAAOv/B,EAAI+I,EAAO/I,GAAG,KAGzGiI,GAAYvB,EAAW,yBACvBuB,GAAYvB,EAAW,wBACvBuB,GAAYvB,EAAW,uBACvBuB,GAAYvB,EAAW,0BACvBmB,EAASnB,EAAW,mBAAqBipC,GACzCvmC,GAAY1C,EAAWuC,IAGxBgzB,gBAAiB,WAChB,IAAIhzB,EAAM9O,KAAKu3B,KAAKhF,mBAAmBvyB,KAAK8nC,SAC5C9nC,KAAK61C,aAAa/mC,IAGnBd,WAAY,SAAUC,GACrBjO,KAAKkD,QAAQ+K,QAAUA,EAEnBjO,KAAKkwB,YACRliB,GAAWhO,KAAKkwB,WAAYjiB,IAI9B+oB,aAAc,SAAU/tB,GACvB,IAAI6F,EAAM9O,KAAKu3B,KAAKhC,uBAAuBv1B,KAAK8nC,QAAS7+B,EAAEkX,KAAMlX,EAAEqY,QACnEthB,KAAK61C,aAAa/mC,IAGnB2jC,WAAY,WAEX,OAAO3sC,EAAQ9F,KAAK4xC,SAAW5xC,KAAK4xC,QAAQ5H,oBAAsBhqC,KAAKkD,QAAQwyC,OAAS11C,KAAK4xC,QAAQ5H,qBAAuB,EAAG,OAcjI7iB,GAAIpN,SAOHk8B,YAAa,SAAUN,EAASl/B,EAAQvT,GASvC,OARMyyC,aAAmBJ,KACxBI,EAAU,IAAIJ,GAAQryC,GAAS8uC,WAAW2D,IAGvCl/B,GACHk/B,EAAQhN,UAAUlyB,GAGfzW,KAAK+7B,SAAS4Z,GACV31C,KAGDA,KAAKu8B,SAASoZ,IAKtBC,aAAc,SAAUD,GAIvB,OAHIA,GACH31C,KAAK+5B,YAAY4b,GAEX31C,QAmBT8iC,GAAM/oB,SAMLm8B,YAAa,SAAUjE,EAAS/uC,GAoB/B,OAlBI+uC,aAAmBsD,IACtBtyC,EAAWgvC,EAAS/uC,GACpBlD,KAAKm2C,SAAWlE,EAChBA,EAAQL,QAAU5xC,OAEbA,KAAKm2C,WAAYjzC,IACrBlD,KAAKm2C,SAAW,IAAIZ,GAAQryC,EAASlD,OAEtCA,KAAKm2C,SAASnE,WAAWC,IAI1BjyC,KAAKo2C,2BAEDp2C,KAAKm2C,SAASjzC,QAAQuyC,WAAaz1C,KAAKu3B,MAAQv3B,KAAKu3B,KAAKwE,SAAS/7B,OACtEA,KAAKi2C,cAGCj2C,MAKRq2C,cAAe,WAMd,OALIr2C,KAAKm2C,WACRn2C,KAAKo2C,0BAAyB,GAC9Bp2C,KAAK41C,eACL51C,KAAKm2C,SAAW,MAEVn2C,MAGRo2C,yBAA0B,SAAUxiB,GACnC,GAAKA,IAAa5zB,KAAKs2C,sBAAvB,CACA,IAAIxiB,EAAQF,EAAY,MAAQ,KAC5BzgB,GACHzG,OAAQ1M,KAAK41C,aACbb,KAAM/0C,KAAKu2C,cAEPv2C,KAAKm2C,SAASjzC,QAAQuyC,UAU1BtiC,EAAOvF,IAAM5N,KAAKw2C,cATlBrjC,EAAOi2B,UAAYppC,KAAKw2C,aACxBrjC,EAAOm2B,SAAWtpC,KAAK41C,aACnB51C,KAAKm2C,SAASjzC,QAAQwyC,SACzBviC,EAAOsjC,UAAYz2C,KAAKu2C,cAErBplC,KACHgC,EAAOwhC,MAAQ30C,KAAKw2C,eAKtBx2C,KAAK8zB,GAAO3gB,GACZnT,KAAKs2C,uBAAyB1iB,IAK/BqiB,YAAa,SAAU1+B,EAAOd,GAM7B,GALMc,aAAiBurB,KACtBrsB,EAASc,EACTA,EAAQvX,MAGLuX,aAAiBL,GACpB,IAAK,IAAIjS,KAAMjF,KAAK2oB,QAAS,CAC5BpR,EAAQvX,KAAK2oB,QAAQ1jB,GACrB,MA2BF,OAvBKwR,IACJA,EAASc,EAAMyF,UAAYzF,EAAMyF,YAAczF,EAAMsd,aAGlD70B,KAAKm2C,UAAYn2C,KAAKu3B,OAGzBv3B,KAAKm2C,SAASvE,QAAUr6B,EAGxBvX,KAAKm2C,SAAS5N,SAGdvoC,KAAKu3B,KAAK0e,YAAYj2C,KAAKm2C,SAAU1/B,GAIjCzW,KAAKm2C,SAASjzC,QAAQ8kC,aAAehoC,KAAKm2C,SAASjmB,aACtDxiB,EAAS1N,KAAKm2C,SAASjmB,WAAY,qBACnClwB,KAAKijC,qBAAqBjjC,KAAKm2C,SAASjmB,cAInClwB,MAKR41C,aAAc,WAQb,OAPI51C,KAAKm2C,WACRn2C,KAAKm2C,SAASvC,SACV5zC,KAAKm2C,SAASjzC,QAAQ8kC,aAAehoC,KAAKm2C,SAASjmB,aACtDpiB,GAAY9N,KAAKm2C,SAASjmB,WAAY,qBACtClwB,KAAKmjC,wBAAwBnjC,KAAKm2C,SAASjmB,cAGtClwB,MAKR02C,cAAe,SAAUrtC,GAQxB,OAPIrJ,KAAKm2C,WACJn2C,KAAKm2C,SAAS5e,KACjBv3B,KAAK41C,eAEL51C,KAAKi2C,YAAY5sC,IAGZrJ,MAKR22C,cAAe,WACd,OAAO32C,KAAKm2C,SAAS9D,UAKtBuE,kBAAmB,SAAU3E,GAI5B,OAHIjyC,KAAKm2C,UACRn2C,KAAKm2C,SAASnE,WAAWC,GAEnBjyC,MAKR62C,WAAY,WACX,OAAO72C,KAAKm2C,UAGbK,aAAc,SAAUvtC,GACvB,IAAIsO,EAAQtO,EAAEsO,OAAStO,EAAEI,OAEpBrJ,KAAKm2C,UAAan2C,KAAKu3B,MAG5Bv3B,KAAKi2C,YAAY1+B,EAAOvX,KAAKm2C,SAASjzC,QAAQwyC,OAASzsC,EAAEwN,YAAS/T,IAGnE6zC,aAAc,SAAUttC,GACvB,IAAuB8rB,EAAgBrC,EAAnCjc,EAASxN,EAAEwN,OACXzW,KAAKm2C,SAASjzC,QAAQwyC,QAAUzsC,EAAE0I,gBACrCojB,EAAiB/0B,KAAKu3B,KAAK5E,2BAA2B1pB,EAAE0I,eACxD+gB,EAAa1yB,KAAKu3B,KAAK/E,2BAA2BuC,GAClDte,EAASzW,KAAKu3B,KAAK3G,mBAAmB8B,IAEvC1yB,KAAKm2C,SAASxN,UAAUlyB,MAuB1B,IAAIqgC,GAAUtS,GAAKvkC,QAClBiD,SAGC2iC,UAAW,GAAI,IAOfpI,MAAM,EAINsZ,MAAO,KAEPzqC,UAAW,oBAGZq4B,WAAY,SAAUC,GACrB,IAAIzf,EAAOyf,GAA+B,QAApBA,EAAQt7B,QAAqBs7B,EAAUp9B,SAASgF,cAAc,OAChFtJ,EAAUlD,KAAKkD,QAInB,GAFAiiB,EAAIC,WAA6B,IAAjBliB,EAAQu6B,KAAiBv6B,EAAQu6B,KAAO,GAEpDv6B,EAAQ6zC,MAAO,CAClB,IAAIA,EAAQjxC,EAAQ5C,EAAQ6zC,OAC5B5xB,EAAInZ,MAAMgrC,oBAAuBD,EAAMj1C,EAAK,OAAUi1C,EAAMlxC,EAAK,KAIlE,OAFA7F,KAAKklC,eAAe/f,EAAK,QAElBA,GAGR2f,aAAc,WACb,OAAO,QAUTN,GAAKyS,QAAUxR,GAoEf,IAAIyR,GAAYpU,GAAM7iC,QAIrBiD,SAGCi0C,SAAU,IAIVlpC,QAAS,EAOT+vB,eAAgB/Z,GAIhBmzB,mBAAmB,EAInBC,eAAgB,IAIhBjT,OAAQ,EAIRlvB,OAAQ,KAIRmS,QAAS,EAITC,aAAS5kB,EAMT40C,mBAAe50C,EAMf60C,mBAAe70C,EAQf80C,QAAQ,EAIR/mB,KAAM,WAINnkB,UAAW,GAIXmrC,WAAY,GAGbl+B,WAAY,SAAUrW,GACrBD,EAAWjD,KAAMkD,IAGlBy0B,MAAO,WACN33B,KAAKioB,iBAELjoB,KAAK03C,WACL13C,KAAK23C,UAEL33C,KAAK2pB,aACL3pB,KAAKy5B,WAGN6J,UAAW,SAAUhM,GACpBA,EAAImM,cAAczjC,OAGnB83B,SAAU,SAAUR,GACnBt3B,KAAK43C,kBACLlrC,EAAO1M,KAAKkwB,YACZoH,EAAIqM,iBAAiB3jC,MACrBA,KAAKkwB,WAAa,KAClBlwB,KAAK63C,eAAYn1C,GAKlB4hC,aAAc,WAKb,OAJItkC,KAAKu3B,OACRvqB,EAAQhN,KAAKkwB,YACblwB,KAAK83C,eAAer1C,KAAKR,MAEnBjC,MAKRukC,YAAa,WAKZ,OAJIvkC,KAAKu3B,OACRrqB,EAAOlN,KAAKkwB,YACZlwB,KAAK83C,eAAer1C,KAAKP,MAEnBlC,MAKRoyB,aAAc,WACb,OAAOpyB,KAAKkwB,YAKbliB,WAAY,SAAUC,GAGrB,OAFAjO,KAAKkD,QAAQ+K,QAAUA,EACvBjO,KAAK0pC,iBACE1pC,MAKRm7B,UAAW,SAAUiJ,GAIpB,OAHApkC,KAAKkD,QAAQkhC,OAASA,EACtBpkC,KAAK6pC,gBAEE7pC,MAKR+3C,UAAW,WACV,OAAO/3C,KAAKg4C,UAKb9M,OAAQ,WAKP,OAJIlrC,KAAKu3B,OACRv3B,KAAK43C,kBACL53C,KAAKy5B,WAECz5B,MAGRqjC,UAAW,WACV,IAAIlwB,GACH8kC,aAAcj4C,KAAKk4C,eACnBxP,UAAW1oC,KAAK2pB,WAChBxJ,KAAMngB,KAAK2pB,WACXkqB,QAAS7zC,KAAKg0B,YAgBf,OAbKh0B,KAAKkD,QAAQ86B,iBAEZh+B,KAAKshC,UACTthC,KAAKshC,QAAUhgC,EAAStB,KAAKg0B,WAAYh0B,KAAKkD,QAAQm0C,eAAgBr3C,OAGvEmT,EAAO4hC,KAAO/0C,KAAKshC,SAGhBthC,KAAK8oB,gBACR3V,EAAOs9B,SAAWzwC,KAAKg3B,cAGjB7jB,GASRglC,WAAY,WACX,OAAO3wC,SAASgF,cAAc,QAM/B4rC,YAAa,WACZ,IAAIn3B,EAAIjhB,KAAKkD,QAAQi0C,SACrB,OAAOl2B,aAAarb,EAAQqb,EAAI,IAAIrb,EAAMqb,EAAGA,IAG9C4oB,cAAe,WACV7pC,KAAKkwB,iBAAsCxtB,IAAxB1C,KAAKkD,QAAQkhC,QAAgD,OAAxBpkC,KAAKkD,QAAQkhC,SACxEpkC,KAAKkwB,WAAWlkB,MAAMo4B,OAASpkC,KAAKkD,QAAQkhC,SAI9C0T,eAAgB,SAAUO,GAMzB,IAAK,IAAgCjU,EAHjCvtB,EAAS7W,KAAKkyB,UAAUomB,SACxBC,GAAcF,GAASxtB,EAAAA,EAAUA,EAAAA,GAE5B1qB,EAAI,EAAGE,EAAMwW,EAAOrW,OAAgBL,EAAIE,EAAKF,IAErDikC,EAASvtB,EAAO1W,GAAG6L,MAAMo4B,OAErBvtB,EAAO1W,KAAOH,KAAKkwB,YAAckU,IACpCmU,EAAaF,EAAQE,GAAanU,IAIhCoU,SAASD,KACZv4C,KAAKkD,QAAQkhC,OAASmU,EAAaF,GAAS,EAAG,GAC/Cr4C,KAAK6pC,kBAIPH,eAAgB,WACf,GAAK1pC,KAAKu3B,OAGNxU,GAAJ,CAEA/U,GAAWhO,KAAKkwB,WAAYlwB,KAAKkD,QAAQ+K,SAEzC,IAAIrD,GAAO,IAAIlG,KACX+zC,GAAY,EACZC,GAAY,EAEhB,IAAK,IAAIz0C,KAAOjE,KAAK23C,OAAQ,CAC5B,IAAIgB,EAAO34C,KAAK23C,OAAO1zC,GACvB,GAAK00C,EAAKC,SAAYD,EAAKE,OAA3B,CAEA,IAAIC,EAAOr2C,KAAKP,IAAI,GAAI0I,EAAM+tC,EAAKE,QAAU,KAE7C7qC,GAAW2qC,EAAKt0C,GAAIy0C,GAChBA,EAAO,EACVL,GAAY,GAERE,EAAKI,OACRL,GAAY,EAEZ14C,KAAKg5C,cAAcL,GAEpBA,EAAKI,QAAS,IAIZL,IAAc14C,KAAKi5C,UAAYj5C,KAAKk5C,cAEpCT,IACHzzC,EAAgBhF,KAAKm5C,YACrBn5C,KAAKm5C,WAAat0C,EAAiB7E,KAAK0pC,eAAgB1pC,SAI1Dg5C,cAAe52C,EAEf6lB,eAAgB,WACXjoB,KAAKkwB,aAETlwB,KAAKkwB,WAAa7jB,EAAS,MAAO,kBAAoBrM,KAAKkD,QAAQoJ,WAAa,KAChFtM,KAAK6pC,gBAED7pC,KAAKkD,QAAQ+K,QAAU,GAC1BjO,KAAK0pC,iBAGN1pC,KAAKkyB,UAAUzlB,YAAYzM,KAAKkwB,cAGjCkpB,cAAe,WAEd,IAAIj5B,EAAOngB,KAAK63C,UACZvwB,EAAUtnB,KAAKkD,QAAQokB,QAE3B,QAAa5kB,IAATyd,EAAJ,CAEA,IAAK,IAAIwW,KAAK32B,KAAK03C,QACd13C,KAAK03C,QAAQ/gB,GAAGtyB,GAAGi0C,SAAS93C,QAAUm2B,IAAMxW,GAC/CngB,KAAK03C,QAAQ/gB,GAAGtyB,GAAG2H,MAAMo4B,OAAS9c,EAAU7kB,KAAKwQ,IAAIkN,EAAOwW,GAC5D32B,KAAKq5C,eAAe1iB,KAEpBjqB,EAAO1M,KAAK03C,QAAQ/gB,GAAGtyB,IACvBrE,KAAKs5C,mBAAmB3iB,GACxB32B,KAAKu5C,eAAe5iB,UACb32B,KAAK03C,QAAQ/gB,IAItB,IAAI6iB,EAAQx5C,KAAK03C,QAAQv3B,GACrBmX,EAAMt3B,KAAKu3B,KAqBf,OAnBKiiB,KACJA,EAAQx5C,KAAK03C,QAAQv3B,OAEf9b,GAAKgI,EAAS,MAAO,+CAAgDrM,KAAKkwB,YAChFspB,EAAMn1C,GAAG2H,MAAMo4B,OAAS9c,EAExBkyB,EAAMnS,OAAS/P,EAAIhX,QAAQgX,EAAI1W,UAAU0W,EAAIvF,kBAAmB5R,GAAMxd,QACtE62C,EAAMr5B,KAAOA,EAEbngB,KAAKy5C,kBAAkBD,EAAOliB,EAAIta,YAAasa,EAAIjM,WAG3CmuB,EAAMn1C,GAAG+L,YAEjBpQ,KAAK05C,eAAeF,IAGrBx5C,KAAK25C,OAASH,EAEPA,IAGRH,eAAgBj3C,EAEhBm3C,eAAgBn3C,EAEhBs3C,eAAgBt3C,EAEhB82C,YAAa,WACZ,GAAKl5C,KAAKu3B,KAAV,CAIA,IAAItzB,EAAK00C,EAELx4B,EAAOngB,KAAKu3B,KAAKlM,UACrB,GAAIlL,EAAOngB,KAAKkD,QAAQokB,SACvBnH,EAAOngB,KAAKkD,QAAQmkB,QACpBrnB,KAAK43C,sBAFN,CAMA,IAAK3zC,KAAOjE,KAAK23C,QAChBgB,EAAO34C,KAAK23C,OAAO1zC,IACd21C,OAASjB,EAAKC,QAGpB,IAAK30C,KAAOjE,KAAK23C,OAEhB,IADAgB,EAAO34C,KAAK23C,OAAO1zC,IACV20C,UAAYD,EAAKI,OAAQ,CACjC,IAAIpiC,EAASgiC,EAAKhiC,OACb3W,KAAK65C,cAAcljC,EAAO7U,EAAG6U,EAAO9Q,EAAG8Q,EAAOggB,EAAGhgB,EAAOggB,EAAI,IAChE32B,KAAK85C,gBAAgBnjC,EAAO7U,EAAG6U,EAAO9Q,EAAG8Q,EAAOggB,EAAGhgB,EAAOggB,EAAI,GAKjE,IAAK1yB,KAAOjE,KAAK23C,OACX33C,KAAK23C,OAAO1zC,GAAK21C,QACrB55C,KAAK+5C,YAAY91C,MAKpBq1C,mBAAoB,SAAUn5B,GAC7B,IAAK,IAAIlc,KAAOjE,KAAK23C,OAChB33C,KAAK23C,OAAO1zC,GAAK0S,OAAOggB,IAAMxW,GAGlCngB,KAAK+5C,YAAY91C,IAInB2zC,gBAAiB,WAChB,IAAK,IAAI3zC,KAAOjE,KAAK23C,OACpB33C,KAAK+5C,YAAY91C,IAInBi0C,eAAgB,WACf,IAAK,IAAIvhB,KAAK32B,KAAK03C,QAClBhrC,EAAO1M,KAAK03C,QAAQ/gB,GAAGtyB,IACvBrE,KAAKu5C,eAAe5iB,UACb32B,KAAK03C,QAAQ/gB,GAErB32B,KAAK43C,kBAEL53C,KAAK63C,eAAYn1C,GAGlBm3C,cAAe,SAAU/3C,EAAG+D,EAAG8wB,EAAGtP,GACjC,IAAI2yB,EAAKv3C,KAAKqZ,MAAMha,EAAI,GACpBm4C,EAAKx3C,KAAKqZ,MAAMjW,EAAI,GACpBq0C,EAAKvjB,EAAI,EACTwjB,EAAU,IAAIv0C,GAAOo0C,GAAKC,GAC9BE,EAAQxjB,GAAKujB,EAEb,IAAIj2C,EAAMjE,KAAKo6C,iBAAiBD,GAC5BxB,EAAO34C,KAAK23C,OAAO1zC,GAEvB,OAAI00C,GAAQA,EAAKI,QAChBJ,EAAKiB,QAAS,GACP,IAEGjB,GAAQA,EAAKE,SACvBF,EAAKiB,QAAS,GAGXM,EAAK7yB,GACDrnB,KAAK65C,cAAcG,EAAIC,EAAIC,EAAI7yB,KAMxCyyB,gBAAiB,SAAUh4C,EAAG+D,EAAG8wB,EAAGrP,GAEnC,IAAK,IAAInnB,EAAI,EAAI2B,EAAG3B,EAAI,EAAI2B,EAAI,EAAG3B,IAClC,IAAK,IAAIC,EAAI,EAAIyF,EAAGzF,EAAI,EAAIyF,EAAI,EAAGzF,IAAK,CAEvC,IAAIuW,EAAS,IAAI/Q,EAAMzF,EAAGC,GAC1BuW,EAAOggB,EAAIA,EAAI,EAEf,IAAI1yB,EAAMjE,KAAKo6C,iBAAiBzjC,GAC5BgiC,EAAO34C,KAAK23C,OAAO1zC,GAEnB00C,GAAQA,EAAKI,OAChBJ,EAAKiB,QAAS,GAGJjB,GAAQA,EAAKE,SACvBF,EAAKiB,QAAS,GAGXjjB,EAAI,EAAIrP,GACXtnB,KAAK85C,gBAAgB35C,EAAGC,EAAGu2B,EAAI,EAAGrP,MAMtCqC,WAAY,SAAU1gB,GACrB,IAAIoxC,EAAYpxC,IAAMA,EAAEyqB,OAASzqB,EAAE8iB,OACnC/rB,KAAKs6C,SAASt6C,KAAKu3B,KAAKva,YAAahd,KAAKu3B,KAAKlM,UAAWgvB,EAAWA,IAGtErjB,aAAc,SAAU/tB,GACvBjJ,KAAKs6C,SAASrxC,EAAEqY,OAAQrY,EAAEkX,MAAM,EAAMlX,EAAEiuB,WAGzCqjB,WAAY,SAAUp6B,GACrB,IAAIjd,EAAUlD,KAAKkD,QAEnB,YAAIR,IAAcQ,EAAQq0C,eAAiBp3B,EAAOjd,EAAQq0C,cAClDr0C,EAAQq0C,mBAGZ70C,IAAcQ,EAAQo0C,eAAiBp0C,EAAQo0C,cAAgBn3B,EAC3Djd,EAAQo0C,cAGTn3B,GAGRm6B,SAAU,SAAUh5B,EAAQnB,EAAMq6B,EAAStjB,GAC1C,IAAIujB,EAAWz6C,KAAKu6C,WAAW93C,KAAKE,MAAMwd,UACZzd,IAAzB1C,KAAKkD,QAAQokB,SAAyBmzB,EAAWz6C,KAAKkD,QAAQokB,cACrC5kB,IAAzB1C,KAAKkD,QAAQmkB,SAAyBozB,EAAWz6C,KAAKkD,QAAQmkB,WAClEozB,OAAW/3C,GAGZ,IAAIg4C,EAAkB16C,KAAKkD,QAAQk0C,mBAAsBqD,IAAaz6C,KAAK63C,UAEtE3gB,IAAYwjB,IAEhB16C,KAAK63C,UAAY4C,EAEbz6C,KAAK26C,eACR36C,KAAK26C,gBAGN36C,KAAKo5C,gBACLp5C,KAAK46C,kBAEYl4C,IAAb+3C,GACHz6C,KAAKy5B,QAAQnY,GAGTk5B,GACJx6C,KAAKk5C,cAKNl5C,KAAKi5C,WAAauB,GAGnBx6C,KAAK66C,mBAAmBv5B,EAAQnB,IAGjC06B,mBAAoB,SAAUv5B,EAAQnB,GACrC,IAAK,IAAIhgB,KAAKH,KAAK03C,QAClB13C,KAAKy5C,kBAAkBz5C,KAAK03C,QAAQv3C,GAAImhB,EAAQnB,IAIlDs5B,kBAAmB,SAAUD,EAAOl4B,EAAQnB,GAC3C,IAAItR,EAAQ7O,KAAKu3B,KAAKvN,aAAa7J,EAAMq5B,EAAMr5B,MAC3C26B,EAAYtB,EAAMnS,OAAO/qB,WAAWzN,GAC/BqN,SAASlc,KAAKu3B,KAAK9D,mBAAmBnS,EAAQnB,IAAOxd,QAE1DyM,GACHT,GAAa6qC,EAAMn1C,GAAIy2C,EAAWjsC,GAElCI,GAAYuqC,EAAMn1C,GAAIy2C,IAIxBF,WAAY,WACX,IAAItjB,EAAMt3B,KAAKu3B,KACXnQ,EAAMkQ,EAAIp0B,QAAQkkB,IAClB+vB,EAAWn3C,KAAK+6C,UAAY/6C,KAAKo4C,cACjCqC,EAAWz6C,KAAK63C,UAEhB3iC,EAASlV,KAAKu3B,KAAKtF,oBAAoBjyB,KAAK63C,WAC5C3iC,IACHlV,KAAKg7C,iBAAmBh7C,KAAKi7C,qBAAqB/lC,IAGnDlV,KAAKk7C,OAAS9zB,EAAIjG,UAAYnhB,KAAKkD,QAAQs0C,SAC1C/0C,KAAKqZ,MAAMwb,EAAIhX,SAAS,EAAG8G,EAAIjG,QAAQ,IAAKs5B,GAAU34C,EAAIq1C,EAASr1C,GACnEW,KAAKsZ,KAAKub,EAAIhX,SAAS,EAAG8G,EAAIjG,QAAQ,IAAKs5B,GAAU34C,EAAIq1C,EAAStxC,IAEnE7F,KAAKm7C,OAAS/zB,EAAIhG,UAAYphB,KAAKkD,QAAQs0C,SAC1C/0C,KAAKqZ,MAAMwb,EAAIhX,SAAS8G,EAAIhG,QAAQ,GAAI,GAAIq5B,GAAU50C,EAAIsxC,EAASr1C,GACnEW,KAAKsZ,KAAKub,EAAIhX,SAAS8G,EAAIhG,QAAQ,GAAI,GAAIq5B,GAAU50C,EAAIsxC,EAAStxC,KAIpEmuB,WAAY,WACNh0B,KAAKu3B,OAAQv3B,KAAKu3B,KAAKd,gBAE5Bz2B,KAAKy5B,WAGN2hB,qBAAsB,SAAU95B,GAC/B,IAAIgW,EAAMt3B,KAAKu3B,KACX8jB,EAAU/jB,EAAIb,eAAiBh0B,KAAKR,IAAIq1B,EAAIF,eAAgBE,EAAIjM,WAAaiM,EAAIjM,UACjFxc,EAAQyoB,EAAItN,aAAaqxB,EAASr7C,KAAK63C,WACvCyD,EAAchkB,EAAIhX,QAAQgB,EAAQthB,KAAK63C,WAAW/7B,QAClDy/B,EAAWjkB,EAAIja,UAAUjB,SAAiB,EAARvN,GAEtC,OAAO,IAAI9I,EAAOu1C,EAAYp/B,SAASq/B,GAAWD,EAAY1tC,IAAI2tC,KAInE9hB,QAAS,SAAUnY,GAClB,IAAIgW,EAAMt3B,KAAKu3B,KACf,GAAKD,EAAL,CACA,IAAInX,EAAOngB,KAAKu6C,WAAWjjB,EAAIjM,WAG/B,QADe3oB,IAAX4e,IAAwBA,EAASgW,EAAIta,kBAClBta,IAAnB1C,KAAK63C,UAAT,CAEA,IAAI2D,EAAcx7C,KAAKo7C,qBAAqB95B,GACxCm6B,EAAYz7C,KAAKi7C,qBAAqBO,GACtCE,EAAaD,EAAUz+B,YACvB2+B,KACAC,EAAS57C,KAAKkD,QAAQu0C,WACtBoE,EAAe,IAAI91C,EAAO01C,EAAUx+B,gBAAgBf,UAAU0/B,GAASA,IAC7CH,EAAUv+B,cAActP,KAAKguC,GAASA,KAGpE,KAAMpD,SAASiD,EAAUv5C,IAAIJ,IACvB02C,SAASiD,EAAUv5C,IAAI2D,IACvB2yC,SAASiD,EAAUx5C,IAAIH,IACvB02C,SAASiD,EAAUx5C,IAAI4D,IAAO,MAAM,IAAI1B,MAAM,iDAEpD,IAAK,IAAIF,KAAOjE,KAAK23C,OAAQ,CAC5B,IAAI5wC,EAAI/G,KAAK23C,OAAO1zC,GAAK0S,OACrB5P,EAAE4vB,IAAM32B,KAAK63C,WAAcgE,EAAavuC,SAAS,IAAI1H,EAAMmB,EAAEjF,EAAGiF,EAAElB,MACrE7F,KAAK23C,OAAO1zC,GAAK20C,SAAU,GAM7B,GAAIn2C,KAAKwQ,IAAIkN,EAAOngB,KAAK63C,WAAa,EAAK73C,KAAKs6C,SAASh5B,EAAQnB,OAAjE,CAGA,IAAK,IAAI/f,EAAIq7C,EAAUv5C,IAAI2D,EAAGzF,GAAKq7C,EAAUx5C,IAAI4D,EAAGzF,IACnD,IAAK,IAAID,EAAIs7C,EAAUv5C,IAAIJ,EAAG3B,GAAKs7C,EAAUx5C,IAAIH,EAAG3B,IAAK,CACxD,IAAIwW,EAAS,IAAI/Q,EAAMzF,EAAGC,GAG1B,GAFAuW,EAAOggB,EAAI32B,KAAK63C,UAEX73C,KAAK87C,aAAanlC,GAAvB,CAEA,IAAIgiC,EAAO34C,KAAK23C,OAAO33C,KAAKo6C,iBAAiBzjC,IACzCgiC,EACHA,EAAKC,SAAU,EAEf+C,EAAMl4C,KAAKkT,IAUd,GAJAglC,EAAMzgB,KAAK,SAAUl1B,EAAGC,GACvB,OAAOD,EAAE8W,WAAW4+B,GAAcz1C,EAAE6W,WAAW4+B,KAG3B,IAAjBC,EAAMn7C,OAAc,CAElBR,KAAKg4C,WACTh4C,KAAKg4C,UAAW,EAGhBh4C,KAAK6a,KAAK,YAIX,IAAIkhC,EAAWv0C,SAASw0C,yBAExB,IAAK77C,EAAI,EAAGA,EAAIw7C,EAAMn7C,OAAQL,IAC7BH,KAAKi8C,SAASN,EAAMx7C,GAAI47C,GAGzB/7C,KAAK25C,OAAOt1C,GAAGoI,YAAYsvC,QAI7BD,aAAc,SAAUnlC,GACvB,IAAIyQ,EAAMpnB,KAAKu3B,KAAKr0B,QAAQkkB,IAE5B,IAAKA,EAAIpG,SAAU,CAElB,IAAI9L,EAASlV,KAAKg7C,iBAClB,IAAM5zB,EAAIjG,UAAYxK,EAAO7U,EAAIoT,EAAOhT,IAAIJ,GAAK6U,EAAO7U,EAAIoT,EAAOjT,IAAIH,KACjEslB,EAAIhG,UAAYzK,EAAO9Q,EAAIqP,EAAOhT,IAAI2D,GAAK8Q,EAAO9Q,EAAIqP,EAAOjT,IAAI4D,GAAO,OAAO,EAGtF,IAAK7F,KAAKkD,QAAQgS,OAAU,OAAO,EAGnC,IAAIgnC,EAAal8C,KAAKm8C,oBAAoBxlC,GAC1C,OAAOnQ,EAAexG,KAAKkD,QAAQgS,QAAQyI,SAASu+B,IAGrDE,aAAc,SAAUn4C,GACvB,OAAOjE,KAAKm8C,oBAAoBn8C,KAAKq8C,iBAAiBp4C,KAGvDq4C,kBAAmB,SAAU3lC,GAC5B,IAAI2gB,EAAMt3B,KAAKu3B,KACX4f,EAAWn3C,KAAKo4C,cAChBmE,EAAU5lC,EAAO6F,QAAQ26B,GACzBqF,EAAUD,EAAQ3uC,IAAIupC,GAG1B,OAFS7f,EAAI1W,UAAU27B,EAAS5lC,EAAOggB,GAC9BW,EAAI1W,UAAU47B,EAAS7lC,EAAOggB,KAKxCwlB,oBAAqB,SAAUxlC,GAC9B,IAAI8lC,EAAKz8C,KAAKs8C,kBAAkB3lC,GAC5BzB,EAAS,IAAI9O,EAAaq2C,EAAG,GAAIA,EAAG,IAKxC,OAHKz8C,KAAKkD,QAAQs0C,SACjBtiC,EAASlV,KAAKu3B,KAAKlW,iBAAiBnM,IAE9BA,GAGRklC,iBAAkB,SAAUzjC,GAC3B,OAAOA,EAAO7U,EAAI,IAAM6U,EAAO9Q,EAAI,IAAM8Q,EAAOggB,GAIjD0lB,iBAAkB,SAAUp4C,GAC3B,IAAImS,EAAInS,EAAIjB,MAAM,KACd2T,EAAS,IAAI/Q,GAAOwQ,EAAE,IAAKA,EAAE,IAEjC,OADAO,EAAOggB,GAAKvgB,EAAE,GACPO,GAGRojC,YAAa,SAAU91C,GACtB,IAAI00C,EAAO34C,KAAK23C,OAAO1zC,GAClB00C,IAELjsC,EAAOisC,EAAKt0C,WAELrE,KAAK23C,OAAO1zC,GAInBjE,KAAK6a,KAAK,cACT89B,KAAMA,EAAKt0C,GACXsS,OAAQ3W,KAAKq8C,iBAAiBp4C,OAIhCy4C,UAAW,SAAU/D,GACpBjrC,EAASirC,EAAM,gBAEf,IAAIxB,EAAWn3C,KAAKo4C,cACpBO,EAAK3sC,MAAM0E,MAAQymC,EAASr1C,EAAI,KAChC62C,EAAK3sC,MAAM2E,OAASwmC,EAAStxC,EAAI,KAEjC8yC,EAAKhI,cAAgBvuC,EACrBu2C,EAAK/H,YAAcxuC,EAGf2gB,IAAS/iB,KAAKkD,QAAQ+K,QAAU,GACnCD,GAAW2qC,EAAM34C,KAAKkD,QAAQ+K,SAK3BqD,KAAY2R,KACf01B,EAAK3sC,MAAM2wC,yBAA2B,WAIxCV,SAAU,SAAUtlC,EAAQpK,GAC3B,IAAIqwC,EAAU58C,KAAK68C,YAAYlmC,GAC3B1S,EAAMjE,KAAKo6C,iBAAiBzjC,GAE5BgiC,EAAO34C,KAAKm4C,WAAWn4C,KAAK88C,YAAYnmC,GAASlW,EAAKT,KAAK+8C,WAAY/8C,KAAM2W,IAEjF3W,KAAK08C,UAAU/D,GAIX34C,KAAKm4C,WAAW33C,OAAS,GAE5BqE,EAAiBpE,EAAKT,KAAK+8C,WAAY/8C,KAAM2W,EAAQ,KAAMgiC,IAG5D1pC,GAAY0pC,EAAMiE,GAGlB58C,KAAK23C,OAAO1zC,IACXI,GAAIs0C,EACJhiC,OAAQA,EACRiiC,SAAS,GAGVrsC,EAAUE,YAAYksC,GAGtB34C,KAAK6a,KAAK,iBACT89B,KAAMA,EACNhiC,OAAQA,KAIVomC,WAAY,SAAUpmC,EAAQrD,EAAKqlC,GAC9BrlC,GAGHtT,KAAK6a,KAAK,aACT4U,MAAOnc,EACPqlC,KAAMA,EACNhiC,OAAQA,IAIV,IAAI1S,EAAMjE,KAAKo6C,iBAAiBzjC,IAEhCgiC,EAAO34C,KAAK23C,OAAO1zC,MAGnB00C,EAAKE,QAAU,IAAIn0C,KACf1E,KAAKu3B,KAAKxE,eACb/kB,GAAW2qC,EAAKt0C,GAAI,GACpBW,EAAgBhF,KAAKm5C,YACrBn5C,KAAKm5C,WAAat0C,EAAiB7E,KAAK0pC,eAAgB1pC,QAExD24C,EAAKI,QAAS,EACd/4C,KAAKk5C,eAGD5lC,IACJ5F,EAASirC,EAAKt0C,GAAI,uBAIlBrE,KAAK6a,KAAK,YACT89B,KAAMA,EAAKt0C,GACXsS,OAAQA,KAIN3W,KAAKg9C,mBACRh9C,KAAKg4C,UAAW,EAGhBh4C,KAAK6a,KAAK,QAENkI,KAAU/iB,KAAKu3B,KAAKxE,cACvBluB,EAAiB7E,KAAKk5C,YAAal5C,MAInC4B,WAAWnB,EAAKT,KAAKk5C,YAAal5C,MAAO,QAK5C68C,YAAa,SAAUlmC,GACtB,OAAOA,EAAO6F,QAAQxc,KAAKo4C,eAAel8B,SAASlc,KAAK25C,OAAOtS,SAGhEyV,YAAa,SAAUnmC,GACtB,IAAIsmC,EAAY,IAAIr3C,EACnB5F,KAAKk7C,OAASr5C,EAAQ8U,EAAO7U,EAAG9B,KAAKk7C,QAAUvkC,EAAO7U,EACtD9B,KAAKm7C,OAASt5C,EAAQ8U,EAAO9Q,EAAG7F,KAAKm7C,QAAUxkC,EAAO9Q,GAEvD,OADAo3C,EAAUtmB,EAAIhgB,EAAOggB,EACdsmB,GAGRhC,qBAAsB,SAAU/lC,GAC/B,IAAIiiC,EAAWn3C,KAAKo4C,cACpB,OAAO,IAAIryC,EACVmP,EAAOhT,IAAIua,UAAU06B,GAAUr7B,QAC/B5G,EAAOjT,IAAIwa,UAAU06B,GAAUp7B,OAAOG,UAAU,EAAG,MAGrD8gC,eAAgB,WACf,IAAK,IAAI/4C,KAAOjE,KAAK23C,OACpB,IAAK33C,KAAK23C,OAAO1zC,GAAK40C,OAAU,OAAO,EAExC,OAAO,KAyCLxgC,GAAY6+B,GAAUj3C,QAIzBiD,SAGCmkB,QAAS,EAITC,QAAS,GAIT41B,WAAY,MAIZC,aAAc,GAIdC,WAAY,EAIZC,KAAK,EAILC,aAAa,EAIbC,cAAc,EAMdtN,aAAa,GAGd12B,WAAY,SAAUnB,EAAKlV,GAE1BlD,KAAKmwC,KAAO/3B,GAEZlV,EAAUD,EAAWjD,KAAMkD,IAGfq6C,cAAgB34B,IAAU1hB,EAAQokB,QAAU,IAEvDpkB,EAAQi0C,SAAW10C,KAAKqZ,MAAM5Y,EAAQi0C,SAAW,GAE5Cj0C,EAAQo6C,aAIZp6C,EAAQk6C,aACRl6C,EAAQmkB,YAJRnkB,EAAQk6C,aACRl6C,EAAQokB,WAMTpkB,EAAQmkB,QAAU5kB,KAAKR,IAAI,EAAGiB,EAAQmkB,UAGL,iBAAvBnkB,EAAQg6C,aAClBh6C,EAAQg6C,WAAah6C,EAAQg6C,WAAWl6C,MAAM,KAI1CsO,IACJtR,KAAKyP,GAAG,aAAczP,KAAKw9C,gBAM7BjN,OAAQ,SAAUn4B,EAAKqlC,GAMtB,OALAz9C,KAAKmwC,KAAO/3B,EAEPqlC,GACJz9C,KAAKkrC,SAEClrC,MAORm4C,WAAY,SAAUxhC,EAAQ+mC,GAC7B,IAAI/E,EAAOnxC,SAASgF,cAAc,OAuBlC,OArBAiD,GAAGkpC,EAAM,OAAQl4C,EAAKT,KAAK29C,YAAa39C,KAAM09C,EAAM/E,IACpDlpC,GAAGkpC,EAAM,QAASl4C,EAAKT,KAAK49C,aAAc59C,KAAM09C,EAAM/E,KAElD34C,KAAKkD,QAAQ+sC,aAA4C,KAA7BjwC,KAAKkD,QAAQ+sC,eAC5C0I,EAAK1I,aAA2C,IAA7BjwC,KAAKkD,QAAQ+sC,YAAuB,GAAKjwC,KAAKkD,QAAQ+sC,aAO1E0I,EAAK/xC,IAAM,GAMX+xC,EAAKre,aAAa,OAAQ,gBAE1Bqe,EAAKr4C,IAAMN,KAAK69C,WAAWlnC,GAEpBgiC,GASRkF,WAAY,SAAUlnC,GACrB,IAAI5S,GACHmoB,EAAGtH,GAAS,MAAQ,GACpB3D,EAAGjhB,KAAK89C,cAAcnnC,GACtB7U,EAAG6U,EAAO7U,EACV+D,EAAG8Q,EAAO9Q,EACV8wB,EAAG32B,KAAK+9C,kBAET,GAAI/9C,KAAKu3B,OAASv3B,KAAKu3B,KAAKr0B,QAAQkkB,IAAIpG,SAAU,CACjD,IAAIg9B,EAAYh+C,KAAKg7C,iBAAiB/4C,IAAI4D,EAAI8Q,EAAO9Q,EACjD7F,KAAKkD,QAAQm6C,MAChBt5C,EAAQ,EAAIi6C,GAEbj6C,EAAK,MAAQi6C,EAGd,OAAOl6C,EAAS9D,KAAKmwC,KAAMlwC,EAAO8D,EAAM/D,KAAKkD,WAG9Cy6C,YAAa,SAAUD,EAAM/E,GAExB51B,GACHnhB,WAAWnB,EAAKi9C,EAAM19C,KAAM,KAAM24C,GAAO,GAEzC+E,EAAK,KAAM/E,IAIbiF,aAAc,SAAUF,EAAM/E,EAAM1vC,GACnC,IAAIgoC,EAAWjxC,KAAKkD,QAAQi6C,aACxBlM,GAAY0H,EAAKsF,aAAa,SAAWhN,IAC5C0H,EAAKr4C,IAAM2wC,GAEZyM,EAAKz0C,EAAG0vC,IAGT6E,cAAe,SAAUv0C,GACxBA,EAAE0vC,KAAK9H,OAAS,MAGjBkN,eAAgB,WACf,IAAI59B,EAAOngB,KAAK63C,UAChBvwB,EAAUtnB,KAAKkD,QAAQokB,QACvBg2B,EAAct9C,KAAKkD,QAAQo6C,YAC3BF,EAAap9C,KAAKkD,QAAQk6C,WAM1B,OAJIE,IACHn9B,EAAOmH,EAAUnH,GAGXA,EAAOi9B,GAGfU,cAAe,SAAUI,GACxB,IAAIvpC,EAAQlS,KAAKwQ,IAAIirC,EAAUp8C,EAAIo8C,EAAUr4C,GAAK7F,KAAKkD,QAAQg6C,WAAW18C,OAC1E,OAAOR,KAAKkD,QAAQg6C,WAAWvoC,IAIhCgmC,cAAe,WACd,IAAIx6C,EAAGw4C,EACP,IAAKx4C,KAAKH,KAAK23C,OACV33C,KAAK23C,OAAOx3C,GAAGwW,OAAOggB,IAAM32B,KAAK63C,aACpCc,EAAO34C,KAAK23C,OAAOx3C,GAAGkE,IAEjBwsC,OAASzuC,EACdu2C,EAAK7H,QAAU1uC,EAEVu2C,EAAKwF,WACTxF,EAAKr4C,IAAM2Y,GACXvM,EAAOisC,UACA34C,KAAK23C,OAAOx3C,MAMvB45C,YAAa,SAAU91C,GACtB,IAAI00C,EAAO34C,KAAK23C,OAAO1zC,GACvB,GAAK00C,EASL,OAJKt1B,IACJs1B,EAAKt0C,GAAGi2B,aAAa,MAAOrhB,IAGtBi+B,GAAUp2C,UAAUi5C,YAAY/4C,KAAKhB,KAAMiE,IAGnD84C,WAAY,SAAUpmC,EAAQrD,EAAKqlC,GAClC,GAAK34C,KAAKu3B,QAASohB,GAAQA,EAAKsF,aAAa,SAAWhlC,IAIxD,OAAOi+B,GAAUp2C,UAAUi8C,WAAW/7C,KAAKhB,KAAM2W,EAAQrD,EAAKqlC,MA8B5DyF,GAAe/lC,GAAUpY,QAO5Bo+C,kBACCC,QAAS,MACTC,QAAS,SAIT1nC,OAAQ,GAIR2nC,OAAQ,GAIRC,OAAQ,aAIRC,aAAa,EAIbC,QAAS,SAGVz7C,SAICkkB,IAAK,KAIL7jB,WAAW,GAGZgW,WAAY,SAAUnB,EAAKlV,GAE1BlD,KAAKmwC,KAAO/3B,EAEZ,IAAIwmC,EAAY3+C,KAAWD,KAAKq+C,kBAGhC,IAAK,IAAIl+C,KAAK+C,EACP/C,KAAKH,KAAKkD,UACf07C,EAAUz+C,GAAK+C,EAAQ/C,IAMzB,IAAI0+C,GAFJ37C,EAAUD,EAAWjD,KAAMkD,IAEFq6C,cAAgB34B,GAAS,EAAI,EAClDuyB,EAAWn3C,KAAKo4C,cACpBwG,EAAUluC,MAAQymC,EAASr1C,EAAI+8C,EAC/BD,EAAUjuC,OAASwmC,EAAStxC,EAAIg5C,EAEhC7+C,KAAK4+C,UAAYA,GAGlBjnB,MAAO,SAAUL,GAEhBt3B,KAAK8+C,KAAO9+C,KAAKkD,QAAQkkB,KAAOkQ,EAAIp0B,QAAQkkB,IAC5CpnB,KAAK++C,YAAcC,WAAWh/C,KAAK4+C,UAAUD,SAE7C,IAAIM,EAAgBj/C,KAAK++C,aAAe,IAAM,MAAQ,MACtD/+C,KAAK4+C,UAAUK,GAAiBj/C,KAAK8+C,KAAKnpC,KAE1C0C,GAAUvX,UAAU62B,MAAM32B,KAAKhB,KAAMs3B,IAGtCumB,WAAY,SAAUlnC,GAErB,IAAIulC,EAAal8C,KAAKs8C,kBAAkB3lC,GACpCyQ,EAAMpnB,KAAK8+C,KACX5pC,EAAS/O,EAASihB,EAAI9G,QAAQ47B,EAAW,IAAK90B,EAAI9G,QAAQ47B,EAAW,KACrEh6C,EAAMgT,EAAOhT,IACbD,EAAMiT,EAAOjT,IACbi9C,GAAQl/C,KAAK++C,aAAe,KAAO/+C,KAAK8+C,OAASlc,IAChD1gC,EAAI2D,EAAG3D,EAAIJ,EAAGG,EAAI4D,EAAG5D,EAAIH,IACzBI,EAAIJ,EAAGI,EAAI2D,EAAG5D,EAAIH,EAAGG,EAAI4D,IAAIhC,KAAK,KACnCuU,EAAMC,GAAUvX,UAAU+8C,WAAW78C,KAAKhB,KAAM2W,GACpD,OAAOyB,EACN/U,EAAerD,KAAK4+C,UAAWxmC,EAAKpY,KAAKkD,QAAQK,YAChDvD,KAAKkD,QAAQK,UAAY,SAAW,UAAY27C,GAKnDC,UAAW,SAAU37C,EAAQi6C,GAQ5B,OANAx9C,EAAOD,KAAK4+C,UAAWp7C,GAElBi6C,GACJz9C,KAAKkrC,SAGClrC,QAWTqY,GAAU+mC,IAAMhB,GAChBjmC,GAAUknC,IALV,SAAsBjnC,EAAKlV,GAC1B,OAAO,IAAIk7C,GAAahmC,EAAKlV,IA0B9B,IAAIo8C,GAAWxc,GAAM7iC,QAIpBiD,SAICunB,QAAS,GAIT5W,UAAY,GAGb0F,WAAY,SAAUrW,GACrBD,EAAWjD,KAAMkD,GACjB/B,EAAMnB,MACNA,KAAK2oB,QAAU3oB,KAAK2oB,aAGrBgP,MAAO,WACD33B,KAAKkwB,aACTlwB,KAAKioB,iBAEDjoB,KAAK8oB,eACRpb,EAAS1N,KAAKkwB,WAAY,0BAI5BlwB,KAAKkyB,UAAUzlB,YAAYzM,KAAKkwB,YAChClwB,KAAKy5B,UACLz5B,KAAKyP,GAAG,SAAUzP,KAAKu/C,aAAcv/C,OAGtC83B,SAAU,WACT93B,KAAK2P,IAAI,SAAU3P,KAAKu/C,aAAcv/C,MACtCA,KAAKw/C,qBAGNnc,UAAW,WACV,IAAIlwB,GACHu1B,UAAW1oC,KAAK+qC,OAChB5qB,KAAMngB,KAAKy/C,QACX5L,QAAS7zC,KAAKy5B,QACdimB,QAAS1/C,KAAK2/C,YAKf,OAHI3/C,KAAK8oB,gBACR3V,EAAOs9B,SAAWzwC,KAAK4/C,aAEjBzsC,GAGRysC,YAAa,SAAUC,GACtB7/C,KAAK8/C,iBAAiBD,EAAGv+B,OAAQu+B,EAAG1/B,OAGrCs/B,QAAS,WACRz/C,KAAK8/C,iBAAiB9/C,KAAKu3B,KAAKva,YAAahd,KAAKu3B,KAAKlM,YAGxDy0B,iBAAkB,SAAUx+B,EAAQnB,GACnC,IAAItR,EAAQ7O,KAAKu3B,KAAKvN,aAAa7J,EAAMngB,KAAKsoB,OAC1C0K,EAAWzjB,GAAYvP,KAAKkwB,YAC5BjG,EAAWjqB,KAAKu3B,KAAKla,UAAUf,WAAW,GAAMtc,KAAKkD,QAAQunB,SAC7Ds1B,EAAqB//C,KAAKu3B,KAAKjX,QAAQtgB,KAAKggD,QAAS7/B,GAErD+J,EADkBlqB,KAAKu3B,KAAKjX,QAAQgB,EAAQnB,GACbjE,SAAS6jC,GAExCE,EAAgBh2B,EAAS3N,YAAYzN,GAAOjB,IAAIolB,GAAUplB,IAAIqc,GAAU/N,SAASgO,GAEjF9a,GACHT,GAAa3O,KAAKkwB,WAAY+vB,EAAepxC,GAE7CI,GAAYjP,KAAKkwB,WAAY+vB,IAI/BlV,OAAQ,WACP/qC,KAAKy5B,UACLz5B,KAAK8/C,iBAAiB9/C,KAAKggD,QAAShgD,KAAKsoB,OAEzC,IAAK,IAAIrjB,KAAMjF,KAAK2oB,QACnB3oB,KAAK2oB,QAAQ1jB,GAAI8lC,UAInB4U,WAAY,WACX,IAAK,IAAI16C,KAAMjF,KAAK2oB,QACnB3oB,KAAK2oB,QAAQ1jB,GAAIsmC,YAInBgU,aAAc,WACb,IAAK,IAAIt6C,KAAMjF,KAAK2oB,QACnB3oB,KAAK2oB,QAAQ1jB,GAAIw0B,WAInBA,QAAS,WAGR,IAAI3xB,EAAI9H,KAAKkD,QAAQunB,QACjBkD,EAAO3tB,KAAKu3B,KAAKla,UACjBnb,EAAMlC,KAAKu3B,KAAK/E,2BAA2B7E,EAAKrR,YAAYxU,IAAInF,QAEpE3C,KAAKosC,QAAU,IAAIrmC,EAAO7D,EAAKA,EAAI0L,IAAI+f,EAAKrR,WAAW,EAAQ,EAAJxU,IAAQnF,SAEnE3C,KAAKggD,QAAUhgD,KAAKu3B,KAAKva,YACzBhd,KAAKsoB,MAAQtoB,KAAKu3B,KAAKlM,aAoCrB7S,GAAS8mC,GAASr/C,QACrBojC,UAAW,WACV,IAAIlwB,EAASmsC,GAASx+C,UAAUuiC,UAAUriC,KAAKhB,MAE/C,OADAmT,EAAO8kC,aAAej4C,KAAKkgD,gBACpB/sC,GAGR+sC,gBAAiB,WAEhBlgD,KAAKmgD,sBAAuB,GAG7BxoB,MAAO,WACN2nB,GAASx+C,UAAU62B,MAAM32B,KAAKhB,MAI9BA,KAAKogD,SAGNn4B,eAAgB,WACf,IAAI1b,EAAYvM,KAAKkwB,WAAa1oB,SAASgF,cAAc,UAEzDiD,GAAGlD,EAAW,YAAajL,EAAStB,KAAKqgD,aAAc,GAAIrgD,MAAOA,MAClEyP,GAAGlD,EAAW,+CAAgDvM,KAAKsgD,SAAUtgD,MAC7EyP,GAAGlD,EAAW,WAAYvM,KAAKugD,gBAAiBvgD,MAEhDA,KAAKwgD,KAAOj0C,EAAU0Y,WAAW,OAGlCu6B,kBAAmB,WAClBx6C,EAAgBhF,KAAKygD,uBACdzgD,KAAKwgD,KACZ9zC,EAAO1M,KAAKkwB,YACZvgB,GAAI3P,KAAKkwB,mBACFlwB,KAAKkwB,YAGbqvB,aAAc,WACb,IAAIv/C,KAAKmgD,qBAAT,CAGAngD,KAAK0gD,cAAgB,KACrB,IAAK,IAAIz7C,KAAMjF,KAAK2oB,QACX3oB,KAAK2oB,QAAQ1jB,GACfw0B,UAEPz5B,KAAK2gD,YAGNlnB,QAAS,WACR,IAAIz5B,KAAKu3B,KAAKd,iBAAkBz2B,KAAKosC,QAArC,CAEApsC,KAAK4gD,gBAELtB,GAASx+C,UAAU24B,QAAQz4B,KAAKhB,MAEhC,IAAIiG,EAAIjG,KAAKosC,QACT7/B,EAAYvM,KAAKkwB,WACjBvC,EAAO1nB,EAAEoX,UACTwjC,EAAIj8B,GAAS,EAAI,EAErB3V,GAAY1C,EAAWtG,EAAE/D,KAGzBqK,EAAUmE,MAAQmwC,EAAIlzB,EAAK7rB,EAC3ByK,EAAUoE,OAASkwC,EAAIlzB,EAAK9nB,EAC5B0G,EAAUP,MAAM0E,MAAQid,EAAK7rB,EAAI,KACjCyK,EAAUP,MAAM2E,OAASgd,EAAK9nB,EAAI,KAE9B+e,IACH5kB,KAAKwgD,KAAK3xC,MAAM,EAAG,GAIpB7O,KAAKwgD,KAAK1F,WAAW70C,EAAE/D,IAAIJ,GAAImE,EAAE/D,IAAI2D,GAGrC7F,KAAK6a,KAAK,YAGXkwB,OAAQ,WACPuU,GAASx+C,UAAUiqC,OAAO/pC,KAAKhB,MAE3BA,KAAKmgD,uBACRngD,KAAKmgD,sBAAuB,EAC5BngD,KAAKu/C,iBAIPzU,UAAW,SAAUvzB,GACpBvX,KAAK8gD,iBAAiBvpC,GACtBvX,KAAK2oB,QAAQxnB,EAAMoW,IAAUA,EAE7B,IAAIwpC,EAAQxpC,EAAMypC,QACjBzpC,MAAOA,EACPxC,KAAM/U,KAAKihD,UACXC,KAAM,MAEHlhD,KAAKihD,YAAajhD,KAAKihD,UAAUC,KAAOH,GAC5C/gD,KAAKihD,UAAYF,EACjB/gD,KAAKmhD,WAAanhD,KAAKmhD,YAAcnhD,KAAKihD,WAG3CjW,SAAU,SAAUzzB,GACnBvX,KAAKohD,eAAe7pC,IAGrB0zB,YAAa,SAAU1zB,GACtB,IAAIwpC,EAAQxpC,EAAMypC,OACdE,EAAOH,EAAMG,KACbnsC,EAAOgsC,EAAMhsC,KAEbmsC,EACHA,EAAKnsC,KAAOA,EAEZ/U,KAAKihD,UAAYlsC,EAEdA,EACHA,EAAKmsC,KAAOA,EAEZlhD,KAAKmhD,WAAaD,SAGZlhD,KAAK4gD,aAAarpC,EAAMnW,oBAExBmW,EAAMypC,cAENhhD,KAAK2oB,QAAQxnB,EAAMoW,IAE1BvX,KAAKohD,eAAe7pC,IAGrB4zB,YAAa,SAAU5zB,GAGtBvX,KAAKqhD,oBAAoB9pC,GACzBA,EAAMg0B,WACNh0B,EAAMkiB,UAGNz5B,KAAKohD,eAAe7pC,IAGrB6zB,aAAc,SAAU7zB,GACvBvX,KAAK8gD,iBAAiBvpC,GACtBvX,KAAKohD,eAAe7pC,IAGrBupC,iBAAkB,SAAUvpC,GAC3B,GAAuC,iBAA5BA,EAAMrU,QAAQqnC,UAAwB,CAChD,IAEIpqC,EAFAsuC,EAAQl3B,EAAMrU,QAAQqnC,UAAUvnC,MAAM,SACtCunC,KAEJ,IAAKpqC,EAAI,EAAGA,EAAIsuC,EAAMjuC,OAAQL,IAC7BoqC,EAAU9mC,KAAK69C,OAAO7S,EAAMtuC,KAE7BoX,EAAMrU,QAAQq+C,WAAahX,OAE3BhzB,EAAMrU,QAAQq+C,WAAahqC,EAAMrU,QAAQqnC,WAI3C6W,eAAgB,SAAU7pC,GACpBvX,KAAKu3B,OAEVv3B,KAAKqhD,oBAAoB9pC,GACzBvX,KAAKygD,eAAiBzgD,KAAKygD,gBAAkB57C,EAAiB7E,KAAK2gD,QAAS3gD,QAG7EqhD,oBAAqB,SAAU9pC,GAC9B,GAAIA,EAAM00B,UAAW,CACpB,IAAIxhB,GAAWlT,EAAMrU,QAAQknC,QAAU,GAAK,EAC5CpqC,KAAK0gD,cAAgB1gD,KAAK0gD,eAAiB,IAAI36C,EAC/C/F,KAAK0gD,cAAczgD,OAAOsX,EAAM00B,UAAU/pC,IAAIga,UAAUuO,EAASA,KACjEzqB,KAAK0gD,cAAczgD,OAAOsX,EAAM00B,UAAUhqC,IAAI2L,KAAK6c,EAASA,OAI9Dk2B,QAAS,WACR3gD,KAAKygD,eAAiB,KAElBzgD,KAAK0gD,gBACR1gD,KAAK0gD,cAAcx+C,IAAIya,SACvB3c,KAAK0gD,cAAcz+C,IAAI2a,SAGxB5c,KAAKwhD,SACLxhD,KAAKogD,QAELpgD,KAAK0gD,cAAgB,MAGtBc,OAAQ,WACP,IAAItsC,EAASlV,KAAK0gD,cAClB,GAAIxrC,EAAQ,CACX,IAAIyY,EAAOzY,EAAOmI,UAClBrd,KAAKwgD,KAAKiB,UAAUvsC,EAAOhT,IAAIJ,EAAGoT,EAAOhT,IAAI2D,EAAG8nB,EAAK7rB,EAAG6rB,EAAK9nB,QAE7D7F,KAAKwgD,KAAKiB,UAAU,EAAG,EAAGzhD,KAAKkwB,WAAWxf,MAAO1Q,KAAKkwB,WAAWvf,SAInEyvC,MAAO,WACN,IAAI7oC,EAAOrC,EAASlV,KAAK0gD,cAEzB,GADA1gD,KAAKwgD,KAAKkB,OACNxsC,EAAQ,CACX,IAAIyY,EAAOzY,EAAOmI,UAClBrd,KAAKwgD,KAAKmB,YACV3hD,KAAKwgD,KAAKhwC,KAAK0E,EAAOhT,IAAIJ,EAAGoT,EAAOhT,IAAI2D,EAAG8nB,EAAK7rB,EAAG6rB,EAAK9nB,GACxD7F,KAAKwgD,KAAKoB,OAGX5hD,KAAK6hD,UAAW,EAEhB,IAAK,IAAId,EAAQ/gD,KAAKmhD,WAAYJ,EAAOA,EAAQA,EAAMG,KACtD3pC,EAAQwpC,EAAMxpC,QACTrC,GAAWqC,EAAM00B,WAAa10B,EAAM00B,UAAU3uB,WAAWpI,KAC7DqC,EAAM4zB,cAIRnrC,KAAK6hD,UAAW,EAEhB7hD,KAAKwgD,KAAKsB,WAGXnT,YAAa,SAAUp3B,EAAO3P,GAC7B,GAAK5H,KAAK6hD,SAAV,CAEA,IAAI1hD,EAAGC,EAAGyH,EAAMC,EACZ2mC,EAAQl3B,EAAMm2B,OACdrtC,EAAMouC,EAAMjuC,OACZga,EAAMxa,KAAKwgD,KAEf,GAAKngD,EAAL,CAMA,IAJAL,KAAK4gD,aAAarpC,EAAMnW,aAAemW,EAEvCiD,EAAImnC,YAECxhD,EAAI,EAAGA,EAAIE,EAAKF,IAAK,CACzB,IAAKC,EAAI,EAAGyH,EAAO4mC,EAAMtuC,GAAGK,OAAQJ,EAAIyH,EAAMzH,IAC7C0H,EAAI2mC,EAAMtuC,GAAGC,GACboa,EAAIpa,EAAI,SAAW,UAAU0H,EAAEhG,EAAGgG,EAAEjC,GAEjC+B,GACH4S,EAAIunC,YAIN/hD,KAAKgiD,YAAYxnC,EAAKjD,MAKvB20B,cAAe,SAAU30B,GAExB,GAAKvX,KAAK6hD,WAAYtqC,EAAM40B,SAA5B,CAEA,IAAIrkC,EAAIyP,EAAMs0B,OACVrxB,EAAMxa,KAAKwgD,KACXt0B,EAAIzpB,KAAKR,IAAIQ,KAAKE,MAAM4U,EAAMud,SAAU,GACxC7T,GAAKxe,KAAKR,IAAIQ,KAAKE,MAAM4U,EAAMy0B,UAAW,IAAM9f,GAAKA,EAEzDlsB,KAAK4gD,aAAarpC,EAAMnW,aAAemW,EAE7B,IAAN0J,IACHzG,EAAIknC,OACJlnC,EAAI3L,MAAM,EAAGoS,IAGdzG,EAAImnC,YACJnnC,EAAIynC,IAAIn6C,EAAEhG,EAAGgG,EAAEjC,EAAIob,EAAGiL,EAAG,EAAa,EAAVzpB,KAAKud,IAAQ,GAE/B,IAANiB,GACHzG,EAAIsnC,UAGL9hD,KAAKgiD,YAAYxnC,EAAKjD,KAGvByqC,YAAa,SAAUxnC,EAAKjD,GAC3B,IAAIrU,EAAUqU,EAAMrU,QAEhBA,EAAQunC,OACXjwB,EAAI0nC,YAAch/C,EAAQynC,YAC1BnwB,EAAI2nC,UAAYj/C,EAAQwnC,WAAaxnC,EAAQinC,MAC7C3vB,EAAIiwB,KAAKvnC,EAAQ0nC,UAAY,YAG1B1nC,EAAQgnC,QAA6B,IAAnBhnC,EAAQknC,SACzB5vB,EAAI4nC,aACP5nC,EAAI4nC,YAAY7qC,EAAMrU,SAAWqU,EAAMrU,QAAQq+C,gBAEhD/mC,EAAI0nC,YAAch/C,EAAQ+K,QAC1BuM,EAAI6nC,UAAYn/C,EAAQknC,OACxB5vB,EAAI8nC,YAAcp/C,EAAQinC,MAC1B3vB,EAAI6vB,QAAUnnC,EAAQmnC,QACtB7vB,EAAI8vB,SAAWpnC,EAAQonC,SACvB9vB,EAAI0vB,WAONoW,SAAU,SAAUr3C,GAGnB,IAAK,IAF4CsO,EAAOgrC,EAApDrzC,EAAQlP,KAAKu3B,KAAK3E,uBAAuB3pB,GAEpC83C,EAAQ/gD,KAAKmhD,WAAYJ,EAAOA,EAAQA,EAAMG,MACtD3pC,EAAQwpC,EAAMxpC,OACJrU,QAAQ8kC,aAAezwB,EAAM80B,eAAen9B,KAAWlP,KAAKu3B,KAAK/C,gBAAgBjd,KAC1FgrC,EAAehrC,GAGbgrC,IACHvwC,GAAS/I,GACTjJ,KAAKwiD,YAAYD,GAAet5C,KAIlCo3C,aAAc,SAAUp3C,GACvB,GAAKjJ,KAAKu3B,OAAQv3B,KAAKu3B,KAAKhD,SAASkuB,WAAYziD,KAAKu3B,KAAKd,eAA3D,CAEA,IAAIvnB,EAAQlP,KAAKu3B,KAAK3E,uBAAuB3pB,GAC7CjJ,KAAK0iD,kBAAkBz5C,EAAGiG,KAI3BqxC,gBAAiB,SAAUt3C,GAC1B,IAAIsO,EAAQvX,KAAK2iD,cACbprC,IAEHzJ,GAAY9N,KAAKkwB,WAAY,uBAC7BlwB,KAAKwiD,YAAYjrC,GAAQtO,EAAG,YAC5BjJ,KAAK2iD,cAAgB,OAIvBD,kBAAmB,SAAUz5C,EAAGiG,GAG/B,IAAK,IAFDqI,EAAOqrC,EAEF7B,EAAQ/gD,KAAKmhD,WAAYJ,EAAOA,EAAQA,EAAMG,MACtD3pC,EAAQwpC,EAAMxpC,OACJrU,QAAQ8kC,aAAezwB,EAAM80B,eAAen9B,KACrD0zC,EAAwBrrC,GAItBqrC,IAA0B5iD,KAAK2iD,gBAClC3iD,KAAKugD,gBAAgBt3C,GAEjB25C,IACHl1C,EAAS1N,KAAKkwB,WAAY,uBAC1BlwB,KAAKwiD,YAAYI,GAAwB35C,EAAG,aAC5CjJ,KAAK2iD,cAAgBC,IAInB5iD,KAAK2iD,eACR3iD,KAAKwiD,YAAYxiD,KAAK2iD,eAAgB15C,IAIxCu5C,WAAY,SAAU3rC,EAAQ5N,EAAGZ,GAChCrI,KAAKu3B,KAAK9C,cAAcxrB,EAAGZ,GAAQY,EAAEZ,KAAMwO,IAG5CwyB,cAAe,SAAU9xB,GACxB,IAAIwpC,EAAQxpC,EAAMypC,OACdE,EAAOH,EAAMG,KACbnsC,EAAOgsC,EAAMhsC,KAEbmsC,IACHA,EAAKnsC,KAAOA,EAKTA,EACHA,EAAKmsC,KAAOA,EACFA,IAGVlhD,KAAKmhD,WAAaD,GAGnBH,EAAMhsC,KAAO/U,KAAKihD,UAClBjhD,KAAKihD,UAAUC,KAAOH,EAEtBA,EAAMG,KAAO,KACblhD,KAAKihD,UAAYF,EAEjB/gD,KAAKohD,eAAe7pC,KAGrB8zB,aAAc,SAAU9zB,GACvB,IAAIwpC,EAAQxpC,EAAMypC,OACdE,EAAOH,EAAMG,KACbnsC,EAAOgsC,EAAMhsC,KAEbA,IACHA,EAAKmsC,KAAOA,EAKTA,EACHA,EAAKnsC,KAAOA,EACFA,IAGV/U,KAAKihD,UAAYlsC,GAGlBgsC,EAAMhsC,KAAO,KAEbgsC,EAAMG,KAAOlhD,KAAKmhD,WAClBnhD,KAAKmhD,WAAWpsC,KAAOgsC,EACvB/gD,KAAKmhD,WAAaJ,EAElB/gD,KAAKohD,eAAe7pC,OAelBsrC,GAAY,WACf,IAEC,OADAr7C,SAASs7C,WAAWl1C,IAAI,OAAQ,iCACzB,SAAUrJ,GAChB,OAAOiD,SAASgF,cAAc,SAAWjI,EAAO,mBAEhD,MAAO0E,GACR,OAAO,SAAU1E,GAChB,OAAOiD,SAASgF,cAAc,IAAMjI,EAAO,0DAR9B,GAwBZw+C,IAEH96B,eAAgB,WACfjoB,KAAKkwB,WAAa7jB,EAAS,MAAO,0BAGnCotB,QAAS,WACJz5B,KAAKu3B,KAAKd,iBACd6oB,GAASx+C,UAAU24B,QAAQz4B,KAAKhB,MAChCA,KAAK6a,KAAK,YAGXiwB,UAAW,SAAUvzB,GACpB,IAAIhL,EAAYgL,EAAM2Y,WAAa2yB,GAAU,SAE7Cn1C,EAASnB,EAAW,sBAAwBvM,KAAKkD,QAAQoJ,WAAa,KAEtEC,EAAUy2C,UAAY,MAEtBzrC,EAAM+zB,MAAQuX,GAAU,QACxBt2C,EAAUE,YAAY8K,EAAM+zB,OAE5BtrC,KAAKorC,aAAa7zB,GAClBvX,KAAK2oB,QAAQxnB,EAAMoW,IAAUA,GAG9ByzB,SAAU,SAAUzzB,GACnB,IAAIhL,EAAYgL,EAAM2Y,WACtBlwB,KAAKkwB,WAAWzjB,YAAYF,GAExBgL,EAAMrU,QAAQ8kC,aACjBzwB,EAAM0rB,qBAAqB12B,IAI7B0+B,YAAa,SAAU1zB,GACtB,IAAIhL,EAAYgL,EAAM2Y,WACtBxjB,EAAOH,GACPgL,EAAM4rB,wBAAwB52B,UACvBvM,KAAK2oB,QAAQxnB,EAAMoW,KAG3B6zB,aAAc,SAAU7zB,GACvB,IAAI2yB,EAAS3yB,EAAM0rC,QACfxY,EAAOlzB,EAAM2rC,MACbhgD,EAAUqU,EAAMrU,QAChBqJ,EAAYgL,EAAM2Y,WAEtB3jB,EAAU42C,UAAYjgD,EAAQgnC,OAC9B39B,EAAU62C,SAAWlgD,EAAQunC,KAEzBvnC,EAAQgnC,QACNA,IACJA,EAAS3yB,EAAM0rC,QAAUJ,GAAU,WAEpCt2C,EAAUE,YAAYy9B,GACtBA,EAAOE,OAASlnC,EAAQknC,OAAS,KACjCF,EAAOC,MAAQjnC,EAAQinC,MACvBD,EAAOj8B,QAAU/K,EAAQ+K,QAErB/K,EAAQqnC,UACXL,EAAOmZ,UAAY99C,GAAQrC,EAAQqnC,WAC/BrnC,EAAQqnC,UAAU1mC,KAAK,KACvBX,EAAQqnC,UAAUznC,QAAQ,WAAY,KAE1ConC,EAAOmZ,UAAY,GAEpBnZ,EAAOoZ,OAASpgD,EAAQmnC,QAAQvnC,QAAQ,OAAQ,QAChDonC,EAAOqZ,UAAYrgD,EAAQonC,UAEjBJ,IACV39B,EAAUM,YAAYq9B,GACtB3yB,EAAM0rC,QAAU,MAGb//C,EAAQunC,MACNA,IACJA,EAAOlzB,EAAM2rC,MAAQL,GAAU,SAEhCt2C,EAAUE,YAAYg+B,GACtBA,EAAKN,MAAQjnC,EAAQwnC,WAAaxnC,EAAQinC,MAC1CM,EAAKx8B,QAAU/K,EAAQynC,aAEbF,IACVl+B,EAAUM,YAAY49B,GACtBlzB,EAAM2rC,MAAQ,OAIhBhX,cAAe,SAAU30B,GACxB,IAAIzP,EAAIyP,EAAMs0B,OAAOlpC,QACjBupB,EAAIzpB,KAAKE,MAAM4U,EAAMud,SACrBiX,EAAKtpC,KAAKE,MAAM4U,EAAMy0B,UAAY9f,GAEtClsB,KAAKwjD,SAASjsC,EAAOA,EAAM40B,SAAW,OACrC,MAAQrkC,EAAEhG,EAAI,IAAMgG,EAAEjC,EAAI,IAAMqmB,EAAI,IAAM6f,EAAK,gBAGjDyX,SAAU,SAAUjsC,EAAO0uB,GAC1B1uB,EAAM+zB,MAAMzvB,EAAIoqB,GAGjBoD,cAAe,SAAU9xB,GACxBvK,EAAQuK,EAAM2Y,aAGfmb,aAAc,SAAU9zB,GACvBrK,EAAOqK,EAAM2Y,cAIXuzB,GAAW/qC,GAAMmqC,GAAYt7C,EAsC7BoR,GAAM2mC,GAASr/C,QAElBojC,UAAW,WACV,IAAIlwB,EAASmsC,GAASx+C,UAAUuiC,UAAUriC,KAAKhB,MAE/C,OADAmT,EAAOuwC,UAAY1jD,KAAK2jD,aACjBxwC,GAGR8U,eAAgB,WACfjoB,KAAKkwB,WAAauzB,GAAS,OAG3BzjD,KAAKkwB,WAAWoK,aAAa,iBAAkB,QAE/Ct6B,KAAK4jD,WAAaH,GAAS,KAC3BzjD,KAAKkwB,WAAWzjB,YAAYzM,KAAK4jD,aAGlCpE,kBAAmB,WAClB9yC,EAAO1M,KAAKkwB,YACZvgB,GAAI3P,KAAKkwB,mBACFlwB,KAAKkwB,kBACLlwB,KAAK4jD,kBACL5jD,KAAK6jD,UAGbF,aAAc,WAIb3jD,KAAKy5B,WAGNA,QAAS,WACR,IAAIz5B,KAAKu3B,KAAKd,iBAAkBz2B,KAAKosC,QAArC,CAEAkT,GAASx+C,UAAU24B,QAAQz4B,KAAKhB,MAEhC,IAAIiG,EAAIjG,KAAKosC,QACTze,EAAO1nB,EAAEoX,UACT9Q,EAAYvM,KAAKkwB,WAGhBlwB,KAAK6jD,UAAa7jD,KAAK6jD,SAAS9mC,OAAO4Q,KAC3C3tB,KAAK6jD,SAAWl2B,EAChBphB,EAAU+tB,aAAa,QAAS3M,EAAK7rB,GACrCyK,EAAU+tB,aAAa,SAAU3M,EAAK9nB,IAIvCoJ,GAAY1C,EAAWtG,EAAE/D,KACzBqK,EAAU+tB,aAAa,WAAYr0B,EAAE/D,IAAIJ,EAAGmE,EAAE/D,IAAI2D,EAAG8nB,EAAK7rB,EAAG6rB,EAAK9nB,GAAGhC,KAAK,MAE1E7D,KAAK6a,KAAK,YAKXiwB,UAAW,SAAUvzB,GACpB,IAAI0uB,EAAO1uB,EAAM+zB,MAAQmY,GAAS,QAK9BlsC,EAAMrU,QAAQoJ,WACjBoB,EAASu4B,EAAM1uB,EAAMrU,QAAQoJ,WAG1BiL,EAAMrU,QAAQ8kC,aACjBt6B,EAASu4B,EAAM,uBAGhBjmC,KAAKorC,aAAa7zB,GAClBvX,KAAK2oB,QAAQxnB,EAAMoW,IAAUA,GAG9ByzB,SAAU,SAAUzzB,GACdvX,KAAK4jD,YAAc5jD,KAAKioB,iBAC7BjoB,KAAK4jD,WAAWn3C,YAAY8K,EAAM+zB,OAClC/zB,EAAM0rB,qBAAqB1rB,EAAM+zB,QAGlCL,YAAa,SAAU1zB,GACtB7K,EAAO6K,EAAM+zB,OACb/zB,EAAM4rB,wBAAwB5rB,EAAM+zB,cAC7BtrC,KAAK2oB,QAAQxnB,EAAMoW,KAG3B4zB,YAAa,SAAU5zB,GACtBA,EAAMg0B,WACNh0B,EAAMkiB,WAGP2R,aAAc,SAAU7zB,GACvB,IAAI0uB,EAAO1uB,EAAM+zB,MACbpoC,EAAUqU,EAAMrU,QAEf+iC,IAED/iC,EAAQgnC,QACXjE,EAAK3L,aAAa,SAAUp3B,EAAQinC,OACpClE,EAAK3L,aAAa,iBAAkBp3B,EAAQ+K,SAC5Cg4B,EAAK3L,aAAa,eAAgBp3B,EAAQknC,QAC1CnE,EAAK3L,aAAa,iBAAkBp3B,EAAQmnC,SAC5CpE,EAAK3L,aAAa,kBAAmBp3B,EAAQonC,UAEzCpnC,EAAQqnC,UACXtE,EAAK3L,aAAa,mBAAoBp3B,EAAQqnC,WAE9CtE,EAAK6d,gBAAgB,oBAGlB5gD,EAAQsnC,WACXvE,EAAK3L,aAAa,oBAAqBp3B,EAAQsnC,YAE/CvE,EAAK6d,gBAAgB,sBAGtB7d,EAAK3L,aAAa,SAAU,QAGzBp3B,EAAQunC,MACXxE,EAAK3L,aAAa,OAAQp3B,EAAQwnC,WAAaxnC,EAAQinC,OACvDlE,EAAK3L,aAAa,eAAgBp3B,EAAQynC,aAC1C1E,EAAK3L,aAAa,YAAap3B,EAAQ0nC,UAAY,YAEnD3E,EAAK3L,aAAa,OAAQ,UAI5BqU,YAAa,SAAUp3B,EAAO3P,GAC7B5H,KAAKwjD,SAASjsC,EAAO7P,EAAa6P,EAAMm2B,OAAQ9lC,KAGjDskC,cAAe,SAAU30B,GACxB,IAAIzP,EAAIyP,EAAMs0B,OACV3f,EAAIzpB,KAAKR,IAAIQ,KAAKE,MAAM4U,EAAMud,SAAU,GAExCmtB,EAAM,IAAM/1B,EAAI,KADXzpB,KAAKR,IAAIQ,KAAKE,MAAM4U,EAAMy0B,UAAW,IAAM9f,GACrB,UAG3B/pB,EAAIoV,EAAM40B,SAAW,OACxB,KAAOrkC,EAAEhG,EAAIoqB,GAAK,IAAMpkB,EAAEjC,EAC1Bo8C,EAAW,EAAJ/1B,EAAS,MAChB+1B,EAAY,GAAJ/1B,EAAS,MAElBlsB,KAAKwjD,SAASjsC,EAAOpV,IAGtBqhD,SAAU,SAAUjsC,EAAO0uB,GAC1B1uB,EAAM+zB,MAAMhR,aAAa,IAAK2L,IAI/BoD,cAAe,SAAU9xB,GACxBvK,EAAQuK,EAAM+zB,QAGfD,aAAc,SAAU9zB,GACvBrK,EAAOqK,EAAM+zB,UAIX5yB,IACHC,GAAIoB,QAAQgpC,IAUb57B,GAAIpN,SAKH8wB,YAAa,SAAUtzB,GAItB,IAAIiQ,EAAWjQ,EAAMrU,QAAQskB,UAAYxnB,KAAK+jD,iBAAiBxsC,EAAMrU,QAAQutB,OAASzwB,KAAKkD,QAAQskB,UAAYxnB,KAAKuwB,UASpH,OAPK/I,IACJA,EAAWxnB,KAAKuwB,UAAYvwB,KAAKgkD,mBAG7BhkD,KAAK+7B,SAASvU,IAClBxnB,KAAKu8B,SAAS/U,GAERA,GAGRu8B,iBAAkB,SAAUx/C,GAC3B,GAAa,gBAATA,QAAmC7B,IAAT6B,EAC7B,OAAO,EAGR,IAAIijB,EAAWxnB,KAAKozB,eAAe7uB,GAKnC,YAJiB7B,IAAb8kB,IACHA,EAAWxnB,KAAKgkD,iBAAiBvzB,KAAMlsB,IACvCvE,KAAKozB,eAAe7uB,GAAQijB,GAEtBA,GAGRw8B,gBAAiB,SAAU9gD,GAI1B,OAAQlD,KAAKkD,QAAQ+gD,cAAgB3rC,GAASpV,IAAauV,GAAMvV,MA+BnE,IAAIghD,GAAY7sC,GAAQpX,QACvBsZ,WAAY,SAAUmc,EAAcxyB,GACnCmU,GAAQvW,UAAUyY,WAAWvY,KAAKhB,KAAMA,KAAKmkD,iBAAiBzuB,GAAexyB,IAK9EstC,UAAW,SAAU9a,GACpB,OAAO11B,KAAKmtC,WAAWntC,KAAKmkD,iBAAiBzuB,KAG9CyuB,iBAAkB,SAAUzuB,GAE3B,OADAA,EAAelvB,EAAekvB,IAE7BA,EAAajX,eACbiX,EAAa/W,eACb+W,EAAahX,eACbgX,EAAa5W,mBAWhBnG,GAAIvV,OAASqgD,GACb9qC,GAAIjR,aAAeA,EAEnBwQ,GAAQ3B,gBAAkBA,GAC1B2B,GAAQlB,eAAiBA,GACzBkB,GAAQf,gBAAkBA,GAC1Be,GAAQR,eAAiBA,GACzBQ,GAAQN,gBAAkBA,GAC1BM,GAAQL,WAAaA,GACrBK,GAAQF,UAAYA,GASpBmP,GAAInN,cAIHmb,SAAS,IAGV,IAAIivB,GAAUxkB,GAAQ3/B,QACrBsZ,WAAY,SAAU+d,GACrBt3B,KAAKu3B,KAAOD,EACZt3B,KAAKkwB,WAAaoH,EAAIpH,WACtBlwB,KAAKqkD,MAAQ/sB,EAAIhH,OAAOg0B,YACxBtkD,KAAKukD,mBAAqB,EAC1BjtB,EAAI7nB,GAAG,SAAUzP,KAAKwkD,SAAUxkD,OAGjC8/B,SAAU,WACTrwB,GAAGzP,KAAKkwB,WAAY,YAAalwB,KAAKykD,aAAczkD,OAGrD+/B,YAAa,WACZpwB,GAAI3P,KAAKkwB,WAAY,YAAalwB,KAAKykD,aAAczkD,OAGtDk1B,MAAO,WACN,OAAOl1B,KAAK2wB,QAGb6zB,SAAU,WACT93C,EAAO1M,KAAKqkD,cACLrkD,KAAKqkD,OAGbK,YAAa,WACZ1kD,KAAKukD,mBAAqB,EAC1BvkD,KAAK2wB,QAAS,GAGfg0B,yBAA0B,WACO,IAA5B3kD,KAAKukD,qBACRnrC,aAAapZ,KAAKukD,oBAClBvkD,KAAKukD,mBAAqB,IAI5BE,aAAc,SAAUx7C,GACvB,IAAKA,EAAEu0B,UAA0B,IAAZv0B,EAAE+3B,OAA8B,IAAb/3B,EAAEg4B,OAAkB,OAAO,EAInEjhC,KAAK2kD,2BACL3kD,KAAK0kD,cAELliC,KACAhT,KAEAxP,KAAKohC,YAAcphC,KAAKu3B,KAAK5E,2BAA2B1pB,GAExDwG,GAAGjI,UACFo9C,YAAa1yC,GACbukC,UAAWz2C,KAAKqgD,aAChBwE,QAAS7kD,KAAK8kD,WACdC,QAAS/kD,KAAKglD,YACZhlD,OAGJqgD,aAAc,SAAUp3C,GAClBjJ,KAAK2wB,SACT3wB,KAAK2wB,QAAS,EAEd3wB,KAAKilD,KAAO54C,EAAS,MAAO,mBAAoBrM,KAAKkwB,YACrDxiB,EAAS1N,KAAKkwB,WAAY,qBAE1BlwB,KAAKu3B,KAAK1c,KAAK,iBAGhB7a,KAAK6rC,OAAS7rC,KAAKu3B,KAAK5E,2BAA2B1pB,GAEnD,IAAIiM,EAAS,IAAInP,EAAO/F,KAAK6rC,OAAQ7rC,KAAKohC,aACtCzT,EAAOzY,EAAOmI,UAElBpO,GAAYjP,KAAKilD,KAAM/vC,EAAOhT,KAE9BlC,KAAKilD,KAAKj5C,MAAM0E,MAASid,EAAK7rB,EAAI,KAClC9B,KAAKilD,KAAKj5C,MAAM2E,OAASgd,EAAK9nB,EAAI,MAGnCq/C,QAAS,WACJllD,KAAK2wB,SACRjkB,EAAO1M,KAAKilD,MACZn3C,GAAY9N,KAAKkwB,WAAY,sBAG9BzN,KACA/S,KAEAC,GAAInI,UACHo9C,YAAa1yC,GACbukC,UAAWz2C,KAAKqgD,aAChBwE,QAAS7kD,KAAK8kD,WACdC,QAAS/kD,KAAKglD,YACZhlD,OAGJ8kD,WAAY,SAAU77C,GACrB,IAAiB,IAAZA,EAAE+3B,OAA8B,IAAb/3B,EAAEg4B,UAE1BjhC,KAAKklD,UAEAllD,KAAK2wB,QAAV,CAGA3wB,KAAK2kD,2BACL3kD,KAAKukD,mBAAqB3iD,WAAWnB,EAAKT,KAAK0kD,YAAa1kD,MAAO,GAEnE,IAAIkV,EAAS,IAAI9O,EACTpG,KAAKu3B,KAAKnN,uBAAuBpqB,KAAKohC,aACtCphC,KAAKu3B,KAAKnN,uBAAuBpqB,KAAK6rC,SAE9C7rC,KAAKu3B,KACHtM,UAAU/V,GACV2F,KAAK,cAAesqC,cAAejwC,MAGtC8vC,WAAY,SAAU/7C,GACH,KAAdA,EAAEqsC,SACLt1C,KAAKklD,aAQR/9B,GAAIlN,YAAY,aAAc,UAAWmqC,IASzCj9B,GAAInN,cAMHorC,iBAAiB,IAGlB,IAAIC,GAAkBzlB,GAAQ3/B,QAC7B6/B,SAAU,WACT9/B,KAAKu3B,KAAK9nB,GAAG,WAAYzP,KAAKslD,eAAgBtlD,OAG/C+/B,YAAa,WACZ//B,KAAKu3B,KAAK5nB,IAAI,WAAY3P,KAAKslD,eAAgBtlD,OAGhDslD,eAAgB,SAAUr8C,GACzB,IAAIquB,EAAMt3B,KAAKu3B,KACXvJ,EAAUsJ,EAAIjM,UACdxgB,EAAQysB,EAAIp0B,QAAQ6kB,UACpB5H,EAAOlX,EAAE0I,cAAc6rB,SAAWxP,EAAUnjB,EAAQmjB,EAAUnjB,EAE9B,WAAhCysB,EAAIp0B,QAAQkiD,gBACf9tB,EAAI1N,QAAQzJ,GAEZmX,EAAIvN,cAAc9gB,EAAE8rB,eAAgB5U,MAiBvCgH,GAAIlN,YAAY,aAAc,kBAAmBorC,IAQjDl+B,GAAInN,cAGHua,UAAU,EAQVgxB,SAAUtiC,GAIVuiC,oBAAqB,KAIrBC,gBAAiB56B,EAAAA,EAGjBzE,cAAe,GAOfs/B,eAAe,EAQfC,mBAAoB,IAGrB,IAAIC,GAAOhmB,GAAQ3/B,QAClB6/B,SAAU,WACT,IAAK9/B,KAAKumC,WAAY,CACrB,IAAIjP,EAAMt3B,KAAKu3B,KAEfv3B,KAAKumC,WAAa,IAAIjG,GAAUhJ,EAAI1L,SAAU0L,EAAIpH,YAElDlwB,KAAKumC,WAAW92B,IACf+2B,UAAWxmC,KAAKymC,aAChBG,KAAM5mC,KAAK6mC,QACXC,QAAS9mC,KAAK+mC,YACZ/mC,MAEHA,KAAKumC,WAAW92B,GAAG,UAAWzP,KAAK6lD,gBAAiB7lD,MAChDs3B,EAAIp0B,QAAQwiD,gBACf1lD,KAAKumC,WAAW92B,GAAG,UAAWzP,KAAK8lD,eAAgB9lD,MACnDs3B,EAAI7nB,GAAG,UAAWzP,KAAK2/C,WAAY3/C,MAEnCs3B,EAAIjC,UAAUr1B,KAAK2/C,WAAY3/C,OAGjC0N,EAAS1N,KAAKu3B,KAAKrH,WAAY,mCAC/BlwB,KAAKumC,WAAWvW,SAChBhwB,KAAK+lD,cACL/lD,KAAKgmD,WAGNjmB,YAAa,WACZjyB,GAAY9N,KAAKu3B,KAAKrH,WAAY,gBAClCpiB,GAAY9N,KAAKu3B,KAAKrH,WAAY,sBAClClwB,KAAKumC,WAAWnR,WAGjBF,MAAO,WACN,OAAOl1B,KAAKumC,YAAcvmC,KAAKumC,WAAW5V,QAG3C8xB,OAAQ,WACP,OAAOziD,KAAKumC,YAAcvmC,KAAKumC,WAAWrF,SAG3CuF,aAAc,WACb,IAAInP,EAAMt3B,KAAKu3B,KAGf,GADAD,EAAIlO,QACAppB,KAAKu3B,KAAKr0B,QAAQqkB,WAAavnB,KAAKu3B,KAAKr0B,QAAQyiD,mBAAoB,CACxE,IAAIzwC,EAAS1O,EAAexG,KAAKu3B,KAAKr0B,QAAQqkB,WAE9CvnB,KAAKimD,aAAe9/C,EACnBnG,KAAKu3B,KAAKpN,uBAAuBjV,EAAOyJ,gBAAgBrC,YAAY,GACpEtc,KAAKu3B,KAAKpN,uBAAuBjV,EAAO4J,gBAAgBxC,YAAY,GAClE1O,IAAI5N,KAAKu3B,KAAKla,YAEjBrd,KAAKkmD,WAAazjD,KAAKP,IAAI,EAAKO,KAAKR,IAAI,EAAKjC,KAAKu3B,KAAKr0B,QAAQyiD,0BAEhE3lD,KAAKimD,aAAe,KAGrB3uB,EACKzc,KAAK,aACLA,KAAK,aAENyc,EAAIp0B,QAAQqiD,UACfvlD,KAAK+lD,cACL/lD,KAAKgmD,YAIPnf,QAAS,SAAU59B,GAClB,GAAIjJ,KAAKu3B,KAAKr0B,QAAQqiD,QAAS,CAC9B,IAAIhkD,EAAOvB,KAAKmmD,WAAa,IAAIzhD,KAC7BoK,EAAM9O,KAAKomD,SAAWpmD,KAAKumC,WAAW8f,SAAWrmD,KAAKumC,WAAW5E,QAErE3hC,KAAK+lD,WAAWtiD,KAAKqL,GACrB9O,KAAKgmD,OAAOviD,KAAKlC,GAEjBvB,KAAKsmD,gBAAgB/kD,GAGtBvB,KAAKu3B,KACA1c,KAAK,OAAQ5R,GACb4R,KAAK,OAAQ5R,IAGnBq9C,gBAAiB,SAAU/kD,GAC1B,KAAOvB,KAAK+lD,WAAWvlD,OAAS,GAAKe,EAAOvB,KAAKgmD,OAAO,GAAK,IAC5DhmD,KAAK+lD,WAAWQ,QAChBvmD,KAAKgmD,OAAOO,SAId5G,WAAY,WACX,IAAI6G,EAAWxmD,KAAKu3B,KAAKla,UAAUjB,SAAS,GACxCqqC,EAAgBzmD,KAAKu3B,KAAKhF,oBAAoB,EAAG,IAErDvyB,KAAK0mD,oBAAsBD,EAAcvqC,SAASsqC,GAAU1kD,EAC5D9B,KAAK2mD,YAAc3mD,KAAKu3B,KAAKtF,sBAAsB5U,UAAUvb,GAG9D8kD,cAAe,SAAU1iD,EAAO2iD,GAC/B,OAAO3iD,GAASA,EAAQ2iD,GAAa7mD,KAAKkmD,YAG3CL,gBAAiB,WAChB,GAAK7lD,KAAKkmD,YAAelmD,KAAKimD,aAA9B,CAEA,IAAIr3C,EAAS5O,KAAKumC,WAAW5E,QAAQzlB,SAASlc,KAAKumC,WAAW9f,WAE1DqgC,EAAQ9mD,KAAKimD,aACbr3C,EAAO9M,EAAIglD,EAAM5kD,IAAIJ,IAAK8M,EAAO9M,EAAI9B,KAAK4mD,cAAch4C,EAAO9M,EAAGglD,EAAM5kD,IAAIJ,IAC5E8M,EAAO/I,EAAIihD,EAAM5kD,IAAI2D,IAAK+I,EAAO/I,EAAI7F,KAAK4mD,cAAch4C,EAAO/I,EAAGihD,EAAM5kD,IAAI2D,IAC5E+I,EAAO9M,EAAIglD,EAAM7kD,IAAIH,IAAK8M,EAAO9M,EAAI9B,KAAK4mD,cAAch4C,EAAO9M,EAAGglD,EAAM7kD,IAAIH,IAC5E8M,EAAO/I,EAAIihD,EAAM7kD,IAAI4D,IAAK+I,EAAO/I,EAAI7F,KAAK4mD,cAAch4C,EAAO/I,EAAGihD,EAAM7kD,IAAI4D,IAEhF7F,KAAKumC,WAAW5E,QAAU3hC,KAAKumC,WAAW9f,UAAU7Y,IAAIgB,KAGzDk3C,eAAgB,WAEf,IAAIiB,EAAa/mD,KAAK2mD,YAClBK,EAAYvkD,KAAKE,MAAMokD,EAAa,GACpCnxC,EAAK5V,KAAK0mD,oBACV5kD,EAAI9B,KAAKumC,WAAW5E,QAAQ7/B,EAC5BmlD,GAASnlD,EAAIklD,EAAYpxC,GAAMmxC,EAAaC,EAAYpxC,EACxDsxC,GAASplD,EAAIklD,EAAYpxC,GAAMmxC,EAAaC,EAAYpxC,EACxDuxC,EAAO1kD,KAAKwQ,IAAIg0C,EAAQrxC,GAAMnT,KAAKwQ,IAAIi0C,EAAQtxC,GAAMqxC,EAAQC,EAEjElnD,KAAKumC,WAAW8f,QAAUrmD,KAAKumC,WAAW5E,QAAQ3lB,QAClDhc,KAAKumC,WAAW5E,QAAQ7/B,EAAIqlD,GAG7BpgB,WAAY,SAAU99B,GACrB,IAAIquB,EAAMt3B,KAAKu3B,KACXr0B,EAAUo0B,EAAIp0B,QAEdkkD,GAAalkD,EAAQqiD,SAAWvlD,KAAKgmD,OAAOxlD,OAAS,EAIzD,GAFA82B,EAAIzc,KAAK,UAAW5R,GAEhBm+C,EACH9vB,EAAIzc,KAAK,eAEH,CACN7a,KAAKsmD,iBAAiB,IAAI5hD,MAE1B,IAAI8wC,EAAYx1C,KAAKomD,SAASlqC,SAASlc,KAAK+lD,WAAW,IACnD5/B,GAAYnmB,KAAKmmD,UAAYnmD,KAAKgmD,OAAO,IAAM,IAC/CqB,EAAOnkD,EAAQkjB,cAEfkhC,EAAc9R,EAAUl5B,WAAW+qC,EAAOlhC,GAC1C8gB,EAAQqgB,EAAYxqC,YAAY,EAAG,IAEnCyqC,EAAe9kD,KAAKP,IAAIgB,EAAQuiD,gBAAiBxe,GACjDugB,EAAqBF,EAAYhrC,WAAWirC,EAAetgB,GAE3DwgB,EAAuBF,GAAgBrkD,EAAQsiD,oBAAsB6B,GACrEz4C,EAAS44C,EAAmBlrC,YAAYmrC,EAAuB,GAAG9kD,QAEjEiM,EAAO9M,GAAM8M,EAAO/I,GAIxB+I,EAAS0oB,EAAIvB,aAAannB,EAAQ0oB,EAAIp0B,QAAQqkB,WAE9C1iB,EAAiB,WAChByyB,EAAIlM,MAAMxc,GACTuX,SAAUshC,EACVrhC,cAAeihC,EACf17B,aAAa,EACbrC,SAAS,OAVXgO,EAAIzc,KAAK,eAqBbsM,GAAIlN,YAAY,aAAc,WAAY2rC,IAQ1Cz+B,GAAInN,cAIHiuB,UAAU,EAIVyf,iBAAkB,KAGnB,IAAIC,GAAW/nB,GAAQ3/B,QAEtB2nD,UACCv4C,MAAU,IACVinB,OAAU,IACVuxB,MAAU,IACVC,IAAU,IACVj+B,QAAU,IAAK,IAAK,GAAI,KACxBC,SAAU,IAAK,IAAK,GAAI,MAGzBvQ,WAAY,SAAU+d,GACrBt3B,KAAKu3B,KAAOD,EAEZt3B,KAAK+nD,aAAazwB,EAAIp0B,QAAQwkD,kBAC9B1nD,KAAKgoD,cAAc1wB,EAAIp0B,QAAQ6kB,YAGhC+X,SAAU,WACT,IAAIvzB,EAAYvM,KAAKu3B,KAAKrH,WAGtB3jB,EAAUuD,UAAY,IACzBvD,EAAUuD,SAAW,KAGtBL,GAAGlD,GACF2rB,MAAOl4B,KAAKioD,SACZC,KAAMloD,KAAKmoD,QACXjoB,UAAWlgC,KAAKykD,cACdzkD,MAEHA,KAAKu3B,KAAK9nB,IACTyoB,MAAOl4B,KAAKooD,UACZF,KAAMloD,KAAKqoD,cACTroD,OAGJ+/B,YAAa,WACZ//B,KAAKqoD,eAEL14C,GAAI3P,KAAKu3B,KAAKrH,YACbgI,MAAOl4B,KAAKioD,SACZC,KAAMloD,KAAKmoD,QACXjoB,UAAWlgC,KAAKykD,cACdzkD,MAEHA,KAAKu3B,KAAK5nB,KACTuoB,MAAOl4B,KAAKooD,UACZF,KAAMloD,KAAKqoD,cACTroD,OAGJykD,aAAc,WACb,IAAIzkD,KAAKsoD,SAAT,CAEA,IAAIh4C,EAAO9I,SAAS8I,KAChBi4C,EAAQ/gD,SAASmC,gBACjB2F,EAAMgB,EAAK2jB,WAAas0B,EAAMt0B,UAC9B5kB,EAAOiB,EAAK4jB,YAAcq0B,EAAMr0B,WAEpCl0B,KAAKu3B,KAAKrH,WAAWgI,QAErB1zB,OAAOgkD,SAASn5C,EAAMC,KAGvB24C,SAAU,WACTjoD,KAAKsoD,UAAW,EAChBtoD,KAAKu3B,KAAK1c,KAAK,UAGhBstC,QAAS,WACRnoD,KAAKsoD,UAAW,EAChBtoD,KAAKu3B,KAAK1c,KAAK,SAGhBktC,aAAc,SAAUU,GACvB,IAEItoD,EAAGE,EAFHqoD,EAAO1oD,KAAK2oD,YACZC,EAAQ5oD,KAAK4nD,SAGjB,IAAKznD,EAAI,EAAGE,EAAMuoD,EAAMv5C,KAAK7O,OAAQL,EAAIE,EAAKF,IAC7CuoD,EAAKE,EAAMv5C,KAAKlP,MAAQ,EAAIsoD,EAAU,GAEvC,IAAKtoD,EAAI,EAAGE,EAAMuoD,EAAMtyB,MAAM91B,OAAQL,EAAIE,EAAKF,IAC9CuoD,EAAKE,EAAMtyB,MAAMn2B,KAAOsoD,EAAU,GAEnC,IAAKtoD,EAAI,EAAGE,EAAMuoD,EAAMf,KAAKrnD,OAAQL,EAAIE,EAAKF,IAC7CuoD,EAAKE,EAAMf,KAAK1nD,KAAO,EAAGsoD,GAE3B,IAAKtoD,EAAI,EAAGE,EAAMuoD,EAAMd,GAAGtnD,OAAQL,EAAIE,EAAKF,IAC3CuoD,EAAKE,EAAMd,GAAG3nD,KAAO,GAAI,EAAIsoD,IAI/BT,cAAe,SAAUjgC,GACxB,IAEI5nB,EAAGE,EAFHqoD,EAAO1oD,KAAK6oD,aACZD,EAAQ5oD,KAAK4nD,SAGjB,IAAKznD,EAAI,EAAGE,EAAMuoD,EAAM/+B,OAAOrpB,OAAQL,EAAIE,EAAKF,IAC/CuoD,EAAKE,EAAM/+B,OAAO1pB,IAAM4nB,EAEzB,IAAK5nB,EAAI,EAAGE,EAAMuoD,EAAM9+B,QAAQtpB,OAAQL,EAAIE,EAAKF,IAChDuoD,EAAKE,EAAM9+B,QAAQ3pB,KAAO4nB,GAI5BqgC,UAAW,WACV34C,GAAGjI,SAAU,UAAWxH,KAAKglD,WAAYhlD,OAG1CqoD,aAAc,WACb14C,GAAInI,SAAU,UAAWxH,KAAKglD,WAAYhlD,OAG3CglD,WAAY,SAAU/7C,GACrB,KAAIA,EAAE6/C,QAAU7/C,EAAE8/C,SAAW9/C,EAAE+/C,SAA/B,CAEA,IAEIp6C,EAFA3K,EAAMgF,EAAEqsC,QACRhe,EAAMt3B,KAAKu3B,KAGf,GAAItzB,KAAOjE,KAAK2oD,SACVrxB,EAAIhM,UAAagM,EAAIhM,SAAShF,cAClC1X,EAAS5O,KAAK2oD,SAAS1kD,GACnBgF,EAAEu0B,WACL5uB,EAAS9I,EAAQ8I,GAAQ0N,WAAW,IAGrCgb,EAAIlM,MAAMxc,GAEN0oB,EAAIp0B,QAAQqkB,WACf+P,EAAIpJ,gBAAgBoJ,EAAIp0B,QAAQqkB,iBAG5B,GAAItjB,KAAOjE,KAAK6oD,UACtBvxB,EAAI1N,QAAQ0N,EAAIjM,WAAapiB,EAAEu0B,SAAW,EAAI,GAAKx9B,KAAK6oD,UAAU5kD,QAE5D,CAAA,GAAY,KAARA,IAAcqzB,EAAIwR,SAAUxR,EAAIwR,OAAO5lC,QAAQmwC,iBAIzD,OAHA/b,EAAIoQ,aAMLx1B,GAAKjJ,OAQPke,GAAIlN,YAAY,aAAc,WAAY0tC,IAQ1CxgC,GAAInN,cAKHivC,iBAAiB,EAKjBC,kBAAmB,GAMnBC,oBAAqB,KAGtB,IAAIC,GAAkBxpB,GAAQ3/B,QAC7B6/B,SAAU,WACTrwB,GAAGzP,KAAKu3B,KAAKrH,WAAY,aAAclwB,KAAKqpD,eAAgBrpD,MAE5DA,KAAKspD,OAAS,GAGfvpB,YAAa,WACZpwB,GAAI3P,KAAKu3B,KAAKrH,WAAY,aAAclwB,KAAKqpD,eAAgBrpD,OAG9DqpD,eAAgB,SAAUpgD,GACzB,IAAI4B,EAAQ2H,GAAcvJ,GAEtBsgD,EAAWvpD,KAAKu3B,KAAKr0B,QAAQgmD,kBAEjClpD,KAAKspD,QAAUz+C,EACf7K,KAAKwpD,cAAgBxpD,KAAKu3B,KAAK5E,2BAA2B1pB,GAErDjJ,KAAK2mB,aACT3mB,KAAK2mB,YAAc,IAAIjiB,MAGxB,IAAI2K,EAAO5M,KAAKR,IAAIsnD,IAAa,IAAI7kD,KAAS1E,KAAK2mB,YAAa,GAEhEvN,aAAapZ,KAAKypD,QAClBzpD,KAAKypD,OAAS7nD,WAAWnB,EAAKT,KAAK0pD,aAAc1pD,MAAOqP,GAExD6C,GAAKjJ,IAGNygD,aAAc,WACb,IAAIpyB,EAAMt3B,KAAKu3B,KACXpX,EAAOmX,EAAIjM,UACXkG,EAAOvxB,KAAKu3B,KAAKr0B,QAAQ4kB,UAAY,EAEzCwP,EAAIlO,QAGJ,IAAIugC,EAAK3pD,KAAKspD,QAAkD,EAAxCtpD,KAAKu3B,KAAKr0B,QAAQimD,qBACtCS,EAAK,EAAInnD,KAAKoe,IAAI,GAAK,EAAIpe,KAAK8f,KAAK9f,KAAKwQ,IAAI02C,MAASlnD,KAAKqe,IAC5D+oC,EAAKt4B,EAAO9uB,KAAKsZ,KAAK6tC,EAAKr4B,GAAQA,EAAOq4B,EAC1C/+C,EAAQysB,EAAI/O,WAAWpI,GAAQngB,KAAKspD,OAAS,EAAIO,GAAMA,IAAO1pC,EAElEngB,KAAKspD,OAAS,EACdtpD,KAAK2mB,WAAa,KAEb9b,IAE+B,WAAhCysB,EAAIp0B,QAAQ+lD,gBACf3xB,EAAI1N,QAAQzJ,EAAOtV,GAEnBysB,EAAIvN,cAAc/pB,KAAKwpD,cAAerpC,EAAOtV,OAQhDsc,GAAIlN,YAAY,aAAc,kBAAmBmvC,IAQjDjiC,GAAInN,cAKH8vC,KAAK,EAKLC,aAAc,KAGf,IAAIC,GAAMpqB,GAAQ3/B,QACjB6/B,SAAU,WACTrwB,GAAGzP,KAAKu3B,KAAKrH,WAAY,aAAclwB,KAAK6gC,QAAS7gC,OAGtD+/B,YAAa,WACZpwB,GAAI3P,KAAKu3B,KAAKrH,WAAY,aAAclwB,KAAK6gC,QAAS7gC,OAGvD6gC,QAAS,SAAU53B,GAClB,GAAKA,EAAEiB,QAAP,CAOA,GALAX,GAAeN,GAEfjJ,KAAKiqD,YAAa,EAGdhhD,EAAEiB,QAAQ1J,OAAS,EAGtB,OAFAR,KAAKiqD,YAAa,OAClB7wC,aAAapZ,KAAKkqD,cAInB,IAAIx1C,EAAQzL,EAAEiB,QAAQ,GAClB7F,EAAKqQ,EAAMrL,OAEfrJ,KAAKymB,UAAYzmB,KAAK2hC,QAAU,IAAI/7B,EAAM8O,EAAMtC,QAASsC,EAAMrC,SAG3DhO,EAAGiF,SAAwC,MAA7BjF,EAAGiF,QAAQnB,eAC5BuF,EAASrJ,EAAI,kBAIdrE,KAAKkqD,aAAetoD,WAAWnB,EAAK,WAC/BT,KAAKmqD,gBACRnqD,KAAKiqD,YAAa,EAClBjqD,KAAKuhC,QACLvhC,KAAKoqD,eAAe,cAAe11C,KAElC1U,MAAO,KAEVA,KAAKoqD,eAAe,YAAa11C,GAEjCjF,GAAGjI,UACF6iD,UAAWrqD,KAAKshC,QAChB31B,SAAU3L,KAAKuhC,OACbvhC,QAGJuhC,MAAO,SAAUt4B,GAQhB,GAPAmQ,aAAapZ,KAAKkqD,cAElBv6C,GAAInI,UACH6iD,UAAWrqD,KAAKshC,QAChB31B,SAAU3L,KAAKuhC,OACbvhC,MAECA,KAAKiqD,YAAchhD,GAAKA,EAAEkB,eAAgB,CAE7C,IAAIuK,EAAQzL,EAAEkB,eAAe,GACzB9F,EAAKqQ,EAAMrL,OAEXhF,GAAMA,EAAGiF,SAAwC,MAA7BjF,EAAGiF,QAAQnB,eAClC2F,GAAYzJ,EAAI,kBAGjBrE,KAAKoqD,eAAe,UAAW11C,GAG3B1U,KAAKmqD,eACRnqD,KAAKoqD,eAAe,QAAS11C,KAKhCy1C,YAAa,WACZ,OAAOnqD,KAAK2hC,QAAQ7kB,WAAW9c,KAAKymB,YAAczmB,KAAKu3B,KAAKr0B,QAAQ6mD,cAGrEzoB,QAAS,SAAUr4B,GAClB,IAAIyL,EAAQzL,EAAEiB,QAAQ,GACtBlK,KAAK2hC,QAAU,IAAI/7B,EAAM8O,EAAMtC,QAASsC,EAAMrC,SAC9CrS,KAAKoqD,eAAe,YAAa11C,IAGlC01C,eAAgB,SAAU/hD,EAAMY,GAC/B,IAAIqhD,EAAiB9iD,SAAS+iD,YAAY,eAE1CD,EAAe32C,YAAa,EAC5B1K,EAAEI,OAAOqK,iBAAkB,EAE3B42C,EAAeE,eACPniD,GAAM,GAAM,EAAM7D,OAAQ,EAC1ByE,EAAE+uB,QAAS/uB,EAAEgvB,QACbhvB,EAAEmJ,QAASnJ,EAAEoJ,SACb,GAAO,GAAO,GAAO,EAAO,EAAG,MAEvCpJ,EAAEI,OAAOohD,cAAcH,MAOrBn5C,KAAUzG,IACbyc,GAAIlN,YAAY,aAAc,MAAO+vC,IAStC7iC,GAAInN,cAOH0wC,UAAWv5C,KAAU8R,GAKrB0nC,oBAAoB,IAGrB,IAAIC,GAAYhrB,GAAQ3/B,QACvB6/B,SAAU,WACTpyB,EAAS1N,KAAKu3B,KAAKrH,WAAY,sBAC/BzgB,GAAGzP,KAAKu3B,KAAKrH,WAAY,aAAclwB,KAAK6qD,cAAe7qD,OAG5D+/B,YAAa,WACZjyB,GAAY9N,KAAKu3B,KAAKrH,WAAY,sBAClCvgB,GAAI3P,KAAKu3B,KAAKrH,WAAY,aAAclwB,KAAK6qD,cAAe7qD,OAG7D6qD,cAAe,SAAU5hD,GACxB,IAAIquB,EAAMt3B,KAAKu3B,KACf,GAAKtuB,EAAEiB,SAAgC,IAArBjB,EAAEiB,QAAQ1J,SAAgB82B,EAAIb,iBAAkBz2B,KAAK8qD,SAAvE,CAEA,IAAI52C,EAAKojB,EAAI3E,2BAA2B1pB,EAAEiB,QAAQ,IAC9CiK,EAAKmjB,EAAI3E,2BAA2B1pB,EAAEiB,QAAQ,IAElDlK,KAAK+qD,aAAezzB,EAAIja,UAAUhB,UAAU,GAC5Crc,KAAKgrD,aAAe1zB,EAAIlN,uBAAuBpqB,KAAK+qD,cACtB,WAA1BzzB,EAAIp0B,QAAQwnD,YACf1qD,KAAKirD,kBAAoB3zB,EAAIlN,uBAAuBlW,EAAGtG,IAAIuG,GAAIkI,UAAU,KAG1Erc,KAAKkrD,WAAah3C,EAAG4I,WAAW3I,GAChCnU,KAAKmrD,WAAa7zB,EAAIjM,UAEtBrrB,KAAK2wB,QAAS,EACd3wB,KAAK8qD,UAAW,EAEhBxzB,EAAIlO,QAEJ3Z,GAAGjI,SAAU,YAAaxH,KAAKorD,aAAcprD,MAC7CyP,GAAGjI,SAAU,WAAYxH,KAAKqrD,YAAarrD,MAE3CuJ,GAAeN,KAGhBmiD,aAAc,SAAUniD,GACvB,GAAKA,EAAEiB,SAAgC,IAArBjB,EAAEiB,QAAQ1J,QAAiBR,KAAK8qD,SAAlD,CAEA,IAAIxzB,EAAMt3B,KAAKu3B,KACXrjB,EAAKojB,EAAI3E,2BAA2B1pB,EAAEiB,QAAQ,IAC9CiK,EAAKmjB,EAAI3E,2BAA2B1pB,EAAEiB,QAAQ,IAC9C2E,EAAQqF,EAAG4I,WAAW3I,GAAMnU,KAAKkrD,WAUrC,GARAlrD,KAAKsoB,MAAQgP,EAAI7J,aAAa5e,EAAO7O,KAAKmrD,aAErC7zB,EAAIp0B,QAAQynD,qBACf3qD,KAAKsoB,MAAQgP,EAAIvG,cAAgBliB,EAAQ,GACzC7O,KAAKsoB,MAAQgP,EAAIrG,cAAgBpiB,EAAQ,KAC1C7O,KAAKsoB,MAAQgP,EAAI/O,WAAWvoB,KAAKsoB,QAGJ,WAA1BgP,EAAIp0B,QAAQwnD,WAEf,GADA1qD,KAAKggD,QAAUhgD,KAAKgrD,aACN,IAAVn8C,EAAe,WACb,CAEN,IAAIhE,EAAQqJ,EAAG+H,KAAK9H,GAAIkI,UAAU,GAAGF,UAAUnc,KAAK+qD,cACpD,GAAc,IAAVl8C,GAA2B,IAAZhE,EAAM/I,GAAuB,IAAZ+I,EAAMhF,EAAW,OACrD7F,KAAKggD,QAAU1oB,EAAI1W,UAAU0W,EAAIhX,QAAQtgB,KAAKirD,kBAAmBjrD,KAAKsoB,OAAOpM,SAASrR,GAAQ7K,KAAKsoB,OAG/FtoB,KAAK2wB,SACT2G,EAAI1J,YAAW,GAAM,GACrB5tB,KAAK2wB,QAAS,GAGf3rB,EAAgBhF,KAAK4hC,cAErB,IAAI0pB,EAAS7qD,EAAK62B,EAAIjK,MAAOiK,EAAKt3B,KAAKggD,QAAShgD,KAAKsoB,OAAQoL,OAAO,EAAM/wB,OAAO,IACjF3C,KAAK4hC,aAAe/8B,EAAiBymD,EAAQtrD,MAAM,GAEnDuJ,GAAeN,KAGhBoiD,YAAa,WACPrrD,KAAK2wB,QAAW3wB,KAAK8qD,UAK1B9qD,KAAK8qD,UAAW,EAChB9lD,EAAgBhF,KAAK4hC,cAErBjyB,GAAInI,SAAU,YAAaxH,KAAKorD,cAChCz7C,GAAInI,SAAU,WAAYxH,KAAKqrD,aAG3BrrD,KAAKu3B,KAAKr0B,QAAQukB,cACrBznB,KAAKu3B,KAAKP,aAAah3B,KAAKggD,QAAShgD,KAAKu3B,KAAKhP,WAAWvoB,KAAKsoB,QAAQ,EAAMtoB,KAAKu3B,KAAKr0B,QAAQ4kB,UAE/F9nB,KAAKu3B,KAAK5N,WAAW3pB,KAAKggD,QAAShgD,KAAKu3B,KAAKhP,WAAWvoB,KAAKsoB,SAd7DtoB,KAAK8qD,UAAW,KAsBnB3jC,GAAIlN,YAAY,aAAc,YAAa2wC,IAE3CzjC,GAAIi9B,QAAUA,GACdj9B,GAAIk+B,gBAAkBA,GACtBl+B,GAAIy+B,KAAOA,GACXz+B,GAAIwgC,SAAWA,GACfxgC,GAAIiiC,gBAAkBA,GACtBjiC,GAAI6iC,IAAMA,GACV7iC,GAAIyjC,UAAYA,GAEhB/xC,OAAOD,OAASA,GAEhBjZ,EAAQg/C,QA38aM,qBA48adh/C,EAAQ03B,QAAUA,GAClB13B,EAAQw4B,QAAUA,GAClBx4B,EAAQ6lB,QAAUA,GAClB7lB,EAAQgc,QAAUA,GAClBhc,EAAQ2F,MAAQA,GAChB3F,EAAQ0Z,KAAOA,GACf1Z,EAAQwF,MAAQA,EAChBxF,EAAQigC,QAAUA,GAClBjgC,EAAQM,OAASA,EACjBN,EAAQc,KAAOA,EACfd,EAAQwB,MAAQA,EAChBxB,EAAQsD,WAAaA,EACrBtD,EAAQkmB,SAAWA,GACnBlmB,EAAQimB,QAAUA,GAClBjmB,EAAQqmB,aAAeA,GACvBrmB,EAAQ2gC,UAAYA,GACpB3gC,EAAQoiC,SAAWA,GACnBpiC,EAAQsiC,SAAWA,GACnBtiC,EAAQiG,MAAQA,EAChBjG,EAAQuP,MAAQpJ,EAChBnG,EAAQoG,OAASA,EACjBpG,EAAQuV,OAAS/O,EACjBxG,EAAQsH,eAAiBA,EACzBtH,EAAQ4gB,eAAiBjZ,EACzB3H,EAAQ4rD,WAAa52C,GACrBhV,EAAQ8G,OAASA,EACjB9G,EAAQ6rD,OAAS1kD,EACjBnH,EAAQyG,aAAeA,EACvBzG,EAAQ+1B,aAAelvB,EACvB7G,EAAQsgB,IAAMA,GACdtgB,EAAQuY,QAAUA,GAClBvY,EAAQsY,QAAUA,GAClBtY,EAAQowC,QAAUA,GAClBpwC,EAAQmjC,MAAQA,GAChBnjC,EAAQkkC,WAAaA,GACrBlkC,EAAQ8rD,WAtzNS,SAAU50C,EAAQ3T,GAClC,OAAO,IAAI2gC,GAAWhtB,EAAQ3T,IAszN/BvD,EAAQuX,aAAeA,GACvBvX,EAAQ+rD,aA5tNW,SAAU70C,GAC5B,OAAO,IAAIK,GAAaL,IA4tNzBlX,EAAQqwC,aAAeA,GACvBrwC,EAAQgsD,aAhiJW,SAAUvzC,EAAKlD,EAAQhS,GACzC,OAAO,IAAI8sC,GAAa53B,EAAKlD,EAAQhS,IAgiJtCvD,EAAQuxC,aAAeA,GACvBvxC,EAAQisD,aA/8IR,SAAsBC,EAAO32C,EAAQhS,GACpC,OAAO,IAAIguC,GAAa2a,EAAO32C,EAAQhS,IA+8IxCvD,EAAQgyC,WAAaA,GACrBhyC,EAAQkzC,MAAQA,GAChBlzC,EAAQ6zC,MA5+HI,SAAUtwC,EAASwuC,GAC9B,OAAO,IAAImB,GAAM3vC,EAASwuC,IA4+H3B/xC,EAAQ41C,QAAUA,GAClB51C,EAAQg2C,QAvkHM,SAAUzyC,EAASwuC,GAChC,OAAO,IAAI6D,GAAQryC,EAASwuC,IAukH7B/xC,EAAQ6kC,KAAOA,GACf7kC,EAAQ0mC,KAhlNR,SAAcnjC,GACb,OAAO,IAAIshC,GAAKthC,IAglNjBvD,EAAQm3C,QAAUA,GAClBn3C,EAAQmsD,QA7yGR,SAAiB5oD,GAChB,OAAO,IAAI4zC,GAAQ5zC,IA6yGpBvD,EAAQsX,OAASA,GACjBtX,EAAQwmC,OAvhMR,SAAgB1vB,EAAQvT,GACvB,OAAO,IAAI+T,GAAOR,EAAQvT,IAuhM3BvD,EAAQ0Y,UAAYA,GACpB1Y,EAAQwY,UAAYA,GACpBxY,EAAQu3C,UAAYA,GACpBv3C,EAAQosD,UA95ER,SAAmB7oD,GAClB,OAAO,IAAIg0C,GAAUh0C,IA85EtBvD,EAAQgZ,IAAMA,GACdhZ,EAAQoI,IAAM0Q,GACd9Y,EAAQ2/C,SAAWA,GACnB3/C,EAAQ6Y,OAASA,GACjB7Y,EAAQ4Y,OAASD,GACjB3Y,EAAQsqC,KAAOA,GACftqC,EAAQ8rC,aAAeA,GACvB9rC,EAAQqsD,aAjzLR,SAAsBv1C,EAAQvT,GAC7B,OAAO,IAAIuoC,GAAah1B,EAAQvT,IAizLjCvD,EAAQ2sC,OAASA,GACjB3sC,EAAQssD,OAzsLR,SAAgBx1C,EAAQvT,EAASqpC,GAChC,OAAO,IAAID,GAAO71B,EAAQvT,EAASqpC,IAysLpC5sC,EAAQyX,SAAWA,GACnBzX,EAAQusD,SA74KR,SAAkB3lD,EAASrD,GAC1B,OAAO,IAAIkU,GAAS7Q,EAASrD,IA64K9BvD,EAAQ0X,QAAUA,GAClB1X,EAAQwsD,QA1tKR,SAAiB5lD,EAASrD,GACzB,OAAO,IAAImU,GAAQ9Q,EAASrD,IA0tK7BvD,EAAQukD,UAAYA,GACpBvkD,EAAQysD,UA1gCR,SAAmB12B,EAAcxyB,GAChC,OAAO,IAAIghD,GAAUxuB,EAAcxyB,IA0gCpCvD,EAAQwnB,IAAMA,GACdxnB,EAAQ23B,IAl/RR,SAAmBryB,EAAI/B,GACtB,OAAO,IAAIikB,GAAIliB,EAAI/B,IAm/RpB,IAAImpD,GAAO7nD,OAAOzE,EAClBJ,EAAQ2sD,WAAa,WAEpB,OADA9nD,OAAOzE,EAAIssD,GACJrsD,MAIRwE,OAAOzE,EAAIJ","file":"dist/leaflet.js.map"} \ No newline at end of file diff --git a/flask_admin/templates/bootstrap2/admin/lib.html b/flask_admin/templates/bootstrap2/admin/lib.html index 682de0c45..f05d5f93e 100644 --- a/flask_admin/templates/bootstrap2/admin/lib.html +++ b/flask_admin/templates/bootstrap2/admin/lib.html @@ -219,8 +219,8 @@ <h3>{{ text }}</h3> <link href="{{ admin_static.url(filename='vendor/select2/select2.css', v='3.5.2') }}" rel="stylesheet"> <link href="{{ admin_static.url(filename='vendor/bootstrap-daterangepicker/daterangepicker-bs2.css', v='1.3.22') }}" rel="stylesheet"> {% if config.MAPBOX_MAP_ID %} - <link href="{{ admin_static.url(filename='vendor/leaflet/leaflet.css', v='1.0.0') }}" rel="stylesheet"> - <link href="{{ admin_static.url(filename='vendor/leaflet/leaflet.draw.css', v='0.3.2') }}" rel="stylesheet"> + <link href="{{ admin_static.url(filename='vendor/leaflet/leaflet.css', v='1.0.2') }}" rel="stylesheet"> + <link href="{{ admin_static.url(filename='vendor/leaflet/leaflet.draw.css', v='0.4.6') }}" rel="stylesheet"> {% endif %} {% if editable_columns %} <link href="{{ admin_static.url(filename='vendor/x-editable/css/bootstrap2-editable.css', v='1.5.1.1') }}" rel="stylesheet"> @@ -234,9 +234,13 @@ <h3>{{ text }}</h3> {% if config.MAPBOX_ACCESS_TOKEN %} window.MAPBOX_ACCESS_TOKEN = "{{ config.MAPBOX_ACCESS_TOKEN }}"; {% endif %} + {% if config.DEFAULT_CENTER_LAT and config.DEFAULT_CENTER_LONG %} + window.DEFAULT_CENTER_LAT = "{{ config.DEFAULT_CENTER_LAT }}"; + window.DEFAULT_CENTER_LONG = "{{ config.DEFAULT_CENTER_LONG }}"; + {% endif %} </script> - <script src="{{ admin_static.url(filename='vendor/leaflet/leaflet.js', v='0.7.3') }}"></script> - <script src="{{ admin_static.url(filename='vendor/leaflet/leaflet.draw.js', v='0.2.3') }}"></script> + <script src="{{ admin_static.url(filename='vendor/leaflet/leaflet.js', v='1.0.2') }}"></script> + <script src="{{ admin_static.url(filename='vendor/leaflet/leaflet.draw.js', v='0.4.6') }}"></script> {% if config.MAPBOX_SEARCH %} <script> window.MAPBOX_SEARCH = "{{ config.MAPBOX_SEARCH }}"; diff --git a/flask_admin/templates/bootstrap3/admin/lib.html b/flask_admin/templates/bootstrap3/admin/lib.html index 322cb9d3c..6bfdb05a6 100644 --- a/flask_admin/templates/bootstrap3/admin/lib.html +++ b/flask_admin/templates/bootstrap3/admin/lib.html @@ -210,8 +210,8 @@ <h3>{{ text }}</h3> <link href="{{ admin_static.url(filename='vendor/select2/select2-bootstrap3.css', v='1.4.6') }}" rel="stylesheet"> <link href="{{ admin_static.url(filename='vendor/bootstrap-daterangepicker/daterangepicker-bs3.css', v='1.3.22') }}" rel="stylesheet"> {% if config.MAPBOX_MAP_ID %} - <link href="{{ admin_static.url(filename='vendor/leaflet/leaflet.css', v='1.0.0') }}" rel="stylesheet"> - <link href="{{ admin_static.url(filename='vendor/leaflet/leaflet.draw.css', v='0.3.2') }}" rel="stylesheet"> + <link href="{{ admin_static.url(filename='vendor/leaflet/leaflet.css', v='1.0.2') }}" rel="stylesheet"> + <link href="{{ admin_static.url(filename='vendor/leaflet/leaflet.draw.css', v='0.4.6') }}" rel="stylesheet"> {% endif %} {% if editable_columns %} <link href="{{ admin_static.url(filename='vendor/x-editable/css/bootstrap3-editable.css', v='1.5.1.1') }}" rel="stylesheet"> @@ -225,9 +225,13 @@ <h3>{{ text }}</h3> {% if config.MAPBOX_ACCESS_TOKEN %} window.MAPBOX_ACCESS_TOKEN = "{{ config.MAPBOX_ACCESS_TOKEN }}"; {% endif %} + {% if config.DEFAULT_CENTER_LAT and config.DEFAULT_CENTER_LONG %} + window.DEFAULT_CENTER_LAT = "{{ config.DEFAULT_CENTER_LAT }}"; + window.DEFAULT_CENTER_LONG = "{{ config.DEFAULT_CENTER_LONG }}"; + {% endif %} </script> - <script src="{{ admin_static.url(filename='vendor/leaflet/leaflet.js', v='1.0.0') }}"></script> - <script src="{{ admin_static.url(filename='vendor/leaflet/leaflet.draw.js', v='0.3.2') }}"></script> + <script src="{{ admin_static.url(filename='vendor/leaflet/leaflet.js', v='1.0.2') }}"></script> + <script src="{{ admin_static.url(filename='vendor/leaflet/leaflet.draw.js', v='0.4.6') }}"></script> {% if config.MAPBOX_SEARCH %} <script> window.MAPBOX_SEARCH = "{{ config.MAPBOX_SEARCH }}";
feast-dev__feast-3280
[ { "content": "# Copyright 2019 The Feast Authors\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# https://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\nimport copy\nimport glob\nimport json\nimport os\nimport pathlib\nimport re\nimport shutil\nimport subprocess\nimport sys\nfrom distutils.cmd import Command\nfrom distutils.dir_util import copy_tree\nfrom pathlib import Path\nfrom subprocess import CalledProcessError\n\nfrom setuptools import Extension, find_packages\n\ntry:\n from setuptools import setup\n from setuptools.command.build_ext import build_ext as _build_ext\n from setuptools.command.build_py import build_py\n from setuptools.command.develop import develop\n from setuptools.command.install import install\n\nexcept ImportError:\n from distutils.command.build_ext import build_ext as _build_ext\n from distutils.command.build_py import build_py\n from distutils.core import setup\n\nNAME = \"feast\"\nDESCRIPTION = \"Python SDK for Feast\"\nURL = \"https://github.com/feast-dev/feast\"\nAUTHOR = \"Feast\"\nREQUIRES_PYTHON = \">=3.7.0\"\n\nREQUIRED = [\n \"click>=7.0.0,<9.0.0\",\n \"colorama>=0.3.9,<1\",\n \"dill==0.3.*\",\n \"fastavro>=1.1.0,<2\",\n \"google-api-core>=1.23.0,<3\",\n \"googleapis-common-protos>=1.52.*,<2\",\n \"grpcio>=1.47.0,<2\",\n \"grpcio-reflection>=1.47.0,<2\",\n \"Jinja2>=2,<4\",\n \"jsonschema\",\n \"mmh3\",\n \"numpy>=1.22,<3\",\n \"pandas>=1.4.3,<2\",\n \"pandavro==1.5.*\", # For some reason pandavro higher than 1.5.* only support pandas less than 1.3.\n \"protobuf<5,>3\",\n \"proto-plus>=1.20.0,<2\",\n \"pyarrow>=4,<9\",\n \"pydantic>=1,<2\",\n \"pygments>=2.12.0,<3\",\n \"PyYAML>=5.4.*,<7\",\n \"SQLAlchemy[mypy]>1,<2\",\n \"tabulate>=0.8.0,<1\",\n \"tenacity>=7,<9\",\n \"toml>=0.10.0,<1\",\n \"tqdm>=4,<5\",\n \"typeguard\",\n \"fastapi>=0.68.0,<1\",\n \"uvicorn[standard]>=0.14.0,<1\",\n \"dask>=2021.*,<2022.02.0\",\n \"bowler\", # Needed for automatic repo upgrades\n]\n\nGCP_REQUIRED = [\n \"google-cloud-bigquery[pandas]>=2,<4\",\n \"google-cloud-bigquery-storage >= 2.0.0,<3\",\n \"google-cloud-datastore>=2.1.*,<3\",\n \"google-cloud-storage>=1.34.*,<3\",\n \"google-cloud-bigtable>=2.11.*,<3\",\n]\n\nREDIS_REQUIRED = [\n \"redis==4.2.2\",\n \"hiredis>=2.0.0,<3\",\n]\n\nAWS_REQUIRED = [\"boto3>=1.17.0,<=1.20.23\", \"docker>=5.0.2\", \"s3fs>=0.4.0,<=2022.01.0\"]\n\nBYTEWAX_REQUIRED = [\"bytewax==0.10.0\", \"docker>=5.0.2\", \"kubernetes<=20.13.0\"]\n\nSNOWFLAKE_REQUIRED = [\n \"snowflake-connector-python[pandas]>=2.7.3,<3\",\n # `pyOpenSSL==22.1.0` requires `cryptography<39,>=38.0.0`, which is incompatible\n # with `snowflake-connector-python[pandas]==2.8.0`, which depends on\n # `cryptography<37.0.0,>=3.1.0`.\n \"pyOpenSSL<22.1.0\",\n]\n\nSPARK_REQUIRED = [\n \"pyspark>=3.0.0,<4\",\n]\n\nTRINO_REQUIRED = [\n \"trino>=0.305.0,<0.400.0\",\n]\n\nPOSTGRES_REQUIRED = [\n \"psycopg2-binary>=2.8.3,<3\",\n]\n\nMYSQL_REQUIRED = [\"mysqlclient\", \"pymysql\", \"types-PyMySQL\"]\n\nHBASE_REQUIRED = [\n \"happybase>=1.2.0,<3\",\n]\n\nCASSANDRA_REQUIRED = [\n \"cassandra-driver>=3.24.0,<4\",\n]\n\nGE_REQUIRED = [\"great_expectations>=0.14.0,<0.15.0\"]\n\nGO_REQUIRED = [\n \"cffi==1.15.*,<2\",\n]\n\nAZURE_REQUIRED = [\n \"azure-storage-blob>=0.37.0\",\n \"azure-identity>=1.6.1\",\n \"SQLAlchemy>=1.4.19\",\n \"pyodbc>=4.0.30\",\n \"pymssql\",\n]\n\nCI_REQUIRED = (\n [\n \"build\",\n \"cryptography>=35.0,<36\",\n \"flake8\",\n \"black>=22.6.0,<23\",\n \"isort>=5,<6\",\n \"grpcio-tools>=1.47.0\",\n \"grpcio-testing>=1.47.0\",\n \"minio==7.1.0\",\n \"mock==2.0.0\",\n \"moto<4\",\n \"mypy>=0.931\",\n \"mypy-protobuf==3.1\",\n \"avro==1.10.0\",\n \"gcsfs>=0.4.0,<=2022.01.0\",\n \"urllib3>=1.25.4,<2\",\n \"psutil==5.9.0\",\n \"pytest>=6.0.0,<8\",\n \"pytest-cov\",\n \"pytest-xdist\",\n \"pytest-benchmark>=3.4.1,<4\",\n \"pytest-lazy-fixture==0.6.3\",\n \"pytest-timeout==1.4.2\",\n \"pytest-ordering==0.6.*\",\n \"pytest-mock==1.10.4\",\n \"Sphinx!=4.0.0,<4.4.0\",\n \"sphinx-rtd-theme\",\n \"testcontainers>=3.5,<4\",\n \"adlfs==0.5.9\",\n \"firebase-admin>=5.2.0,<6\",\n \"pre-commit\",\n \"assertpy==1.1\",\n \"pip-tools\",\n \"pybindgen\",\n \"types-protobuf\",\n \"types-python-dateutil\",\n \"types-pytz\",\n \"types-PyYAML\",\n \"types-redis\",\n \"types-requests\",\n \"types-setuptools\",\n \"types-tabulate\",\n ]\n + GCP_REQUIRED\n + REDIS_REQUIRED\n + AWS_REQUIRED\n + BYTEWAX_REQUIRED\n + SNOWFLAKE_REQUIRED\n + SPARK_REQUIRED\n + POSTGRES_REQUIRED\n + MYSQL_REQUIRED\n + TRINO_REQUIRED\n + GE_REQUIRED\n + HBASE_REQUIRED\n + CASSANDRA_REQUIRED\n + AZURE_REQUIRED\n)\n\n\n# rtd builds fail because of mysql not being installed in their environment.\n# We can add mysql there, but it's not strictly needed. This will be faster for builds.\nDOCS_REQUIRED = CI_REQUIRED.copy()\nfor _r in MYSQL_REQUIRED:\n DOCS_REQUIRED.remove(_r)\n\nDEV_REQUIRED = [\"mypy-protobuf==3.1\", \"grpcio-testing==1.*\"] + CI_REQUIRED\n\n# Get git repo root directory\nrepo_root = str(pathlib.Path(__file__).resolve().parent)\n\n# README file from Feast repo root directory\nREADME_FILE = os.path.join(repo_root, \"README.md\")\nwith open(README_FILE, \"r\", encoding=\"utf8\") as f:\n LONG_DESCRIPTION = f.read()\n\n# Add Support for parsing tags that have a prefix containing '/' (ie 'sdk/go') to setuptools_scm.\n# Regex modified from default tag regex in:\n# https://github.com/pypa/setuptools_scm/blob/2a1b46d38fb2b8aeac09853e660bcd0d7c1bc7be/src/setuptools_scm/config.py#L9\nTAG_REGEX = re.compile(\n r\"^(?:[\\/\\w-]+)?(?P<version>[vV]?\\d+(?:\\.\\d+){0,2}[^\\+]*)(?:\\+.*)?$\"\n)\n\n# Only set use_scm_version if git executable exists (setting this variable causes pip to use git under the hood)\nif shutil.which(\"git\"):\n use_scm_version = {\"root\": \".\", \"relative_to\": __file__, \"tag_regex\": TAG_REGEX}\nelse:\n use_scm_version = None\n\nPROTO_SUBDIRS = [\"core\", \"serving\", \"types\", \"storage\"]\nPYTHON_CODE_PREFIX = \"sdk/python\"\n\n\nclass BuildPythonProtosCommand(Command):\n description = \"Builds the proto files into Python files.\"\n user_options = [\n (\"inplace\", \"i\", \"Write generated proto files to source directory.\"),\n ]\n\n def initialize_options(self):\n self.python_protoc = [\n sys.executable,\n \"-m\",\n \"grpc_tools.protoc\",\n ] # find_executable(\"protoc\")\n self.proto_folder = os.path.join(repo_root, \"protos\")\n self.sub_folders = PROTO_SUBDIRS\n self.build_lib = None\n self.inplace = 0\n\n def finalize_options(self):\n self.set_undefined_options(\"build\", (\"build_lib\", \"build_lib\"))\n\n @property\n def python_folder(self):\n if self.inplace:\n return os.path.join(\n os.path.dirname(__file__) or os.getcwd(), \"sdk/python/feast/protos\"\n )\n\n return os.path.join(self.build_lib, \"feast/protos\")\n\n def _generate_python_protos(self, path: str):\n proto_files = glob.glob(os.path.join(self.proto_folder, path))\n Path(self.python_folder).mkdir(parents=True, exist_ok=True)\n subprocess.check_call(\n self.python_protoc\n + [\n \"-I\",\n self.proto_folder,\n \"--python_out\",\n self.python_folder,\n \"--grpc_python_out\",\n self.python_folder,\n \"--mypy_out\",\n self.python_folder,\n ]\n + proto_files\n )\n\n def run(self):\n for sub_folder in self.sub_folders:\n self._generate_python_protos(f\"feast/{sub_folder}/*.proto\")\n # We need the __init__ files for each of the generated subdirs\n # so that they are regular packages, and don't need the `--namespace-packages` flags\n # when being typechecked using mypy.\n with open(f\"{self.python_folder}/feast/{sub_folder}/__init__.py\", \"w\"):\n pass\n\n with open(f\"{self.python_folder}/__init__.py\", \"w\"):\n pass\n with open(f\"{self.python_folder}/feast/__init__.py\", \"w\"):\n pass\n\n for path in Path(self.python_folder).rglob(\"*.py\"):\n for folder in self.sub_folders:\n # Read in the file\n with open(path, \"r\") as file:\n filedata = file.read()\n\n # Replace the target string\n filedata = filedata.replace(\n f\"from feast.{folder}\", f\"from feast.protos.feast.{folder}\"\n )\n\n # Write the file out again\n with open(path, \"w\") as file:\n file.write(filedata)\n\n\ndef _generate_path_with_gopath():\n go_path = subprocess.check_output([\"go\", \"env\", \"GOPATH\"]).decode(\"utf-8\")\n go_path = go_path.strip()\n path_val = os.getenv(\"PATH\")\n path_val = f\"{path_val}:{go_path}/bin\"\n\n return path_val\n\n\ndef _ensure_go_and_proto_toolchain():\n try:\n version = subprocess.check_output([\"go\", \"version\"])\n except Exception as e:\n raise RuntimeError(\"Unable to find go toolchain\") from e\n\n semver_string = re.search(r\"go[\\S]+\", str(version)).group().lstrip(\"go\")\n parts = semver_string.split(\".\")\n if not (int(parts[0]) >= 1 and int(parts[1]) >= 16):\n raise RuntimeError(f\"Go compiler too old; expected 1.16+ found {semver_string}\")\n\n path_val = _generate_path_with_gopath()\n\n try:\n subprocess.check_call([\"protoc-gen-go\", \"--version\"], env={\"PATH\": path_val})\n subprocess.check_call(\n [\"protoc-gen-go-grpc\", \"--version\"], env={\"PATH\": path_val}\n )\n except Exception as e:\n raise RuntimeError(\"Unable to find go/grpc extensions for protoc\") from e\n\n\nclass BuildGoProtosCommand(Command):\n description = \"Builds the proto files into Go files.\"\n user_options = []\n\n def initialize_options(self):\n self.go_protoc = [\n sys.executable,\n \"-m\",\n \"grpc_tools.protoc\",\n ] # find_executable(\"protoc\")\n self.proto_folder = os.path.join(repo_root, \"protos\")\n self.go_folder = os.path.join(repo_root, \"go/protos\")\n self.sub_folders = PROTO_SUBDIRS\n self.path_val = _generate_path_with_gopath()\n\n def finalize_options(self):\n pass\n\n def _generate_go_protos(self, path: str):\n proto_files = glob.glob(os.path.join(self.proto_folder, path))\n\n try:\n subprocess.check_call(\n self.go_protoc\n + [\n \"-I\",\n self.proto_folder,\n \"--go_out\",\n self.go_folder,\n \"--go_opt=module=github.com/feast-dev/feast/go/protos\",\n \"--go-grpc_out\",\n self.go_folder,\n \"--go-grpc_opt=module=github.com/feast-dev/feast/go/protos\",\n ]\n + proto_files,\n env={\"PATH\": self.path_val},\n )\n except CalledProcessError as e:\n print(f\"Stderr: {e.stderr}\")\n print(f\"Stdout: {e.stdout}\")\n\n def run(self):\n go_dir = Path(repo_root) / \"go\" / \"protos\"\n go_dir.mkdir(exist_ok=True)\n for sub_folder in self.sub_folders:\n self._generate_go_protos(f\"feast/{sub_folder}/*.proto\")\n\n\nclass BuildCommand(build_py):\n \"\"\"Custom build command.\"\"\"\n\n def run(self):\n self.run_command(\"build_python_protos\")\n if os.getenv(\"COMPILE_GO\", \"false\").lower() == \"true\":\n _ensure_go_and_proto_toolchain()\n self.run_command(\"build_go_protos\")\n\n self.run_command(\"build_ext\")\n build_py.run(self)\n\n\nclass DevelopCommand(develop):\n \"\"\"Custom develop command.\"\"\"\n\n def run(self):\n self.reinitialize_command(\"build_python_protos\", inplace=1)\n self.run_command(\"build_python_protos\")\n if os.getenv(\"COMPILE_GO\", \"false\").lower() == \"true\":\n _ensure_go_and_proto_toolchain()\n self.run_command(\"build_go_protos\")\n\n develop.run(self)\n\n\nclass build_ext(_build_ext):\n def finalize_options(self) -> None:\n super().finalize_options()\n if os.getenv(\"COMPILE_GO\", \"false\").lower() == \"false\":\n self.extensions = [e for e in self.extensions if not self._is_go_ext(e)]\n\n def _is_go_ext(self, ext: Extension):\n return any(\n source.endswith(\".go\") or source.startswith(\"github\")\n for source in ext.sources\n )\n\n def build_extension(self, ext: Extension):\n print(f\"Building extension {ext}\")\n if not self._is_go_ext(ext):\n # the base class may mutate `self.compiler`\n compiler = copy.deepcopy(self.compiler)\n self.compiler, compiler = compiler, self.compiler\n try:\n return _build_ext.build_extension(self, ext)\n finally:\n self.compiler, compiler = compiler, self.compiler\n\n bin_path = _generate_path_with_gopath()\n go_env = json.loads(\n subprocess.check_output([\"go\", \"env\", \"-json\"]).decode(\"utf-8\").strip()\n )\n\n print(f\"Go env: {go_env}\")\n print(f\"CWD: {os.getcwd()}\")\n\n destination = os.path.dirname(os.path.abspath(self.get_ext_fullpath(ext.name)))\n subprocess.check_call(\n [\"go\", \"install\", \"golang.org/x/tools/cmd/goimports\"],\n env={\"PATH\": bin_path, **go_env},\n )\n subprocess.check_call(\n [\"go\", \"get\", \"github.com/go-python/gopy@v0.4.4\"],\n env={\"PATH\": bin_path, **go_env},\n )\n subprocess.check_call(\n [\"go\", \"install\", \"github.com/go-python/gopy\"],\n env={\"PATH\": bin_path, **go_env},\n )\n subprocess.check_call(\n [\n \"gopy\",\n \"build\",\n \"-output\",\n destination,\n \"-vm\",\n sys.executable,\n \"--build-tags\",\n \"cgo,ccalloc\",\n \"--dynamic-link=True\",\n \"-no-make\",\n *ext.sources,\n ],\n env={\n \"PATH\": bin_path,\n \"CGO_LDFLAGS_ALLOW\": \".*\",\n **go_env,\n },\n )\n\n def copy_extensions_to_source(self):\n build_py = self.get_finalized_command(\"build_py\")\n for ext in self.extensions:\n fullname = self.get_ext_fullname(ext.name)\n modpath = fullname.split(\".\")\n package = \".\".join(modpath[:-1])\n package_dir = build_py.get_package_dir(package)\n\n src_dir = dest_dir = package_dir\n\n if src_dir.startswith(PYTHON_CODE_PREFIX):\n src_dir = package_dir[len(PYTHON_CODE_PREFIX) :]\n src_dir = src_dir.lstrip(\"/\")\n\n src_dir = os.path.join(self.build_lib, src_dir)\n\n # copy whole directory\n print(f\"Copying from {src_dir} to {dest_dir}\")\n copy_tree(src_dir, dest_dir)\n\n\nsetup(\n name=NAME,\n author=AUTHOR,\n description=DESCRIPTION,\n long_description=LONG_DESCRIPTION,\n long_description_content_type=\"text/markdown\",\n python_requires=REQUIRES_PYTHON,\n url=URL,\n packages=find_packages(\n where=PYTHON_CODE_PREFIX, exclude=(\"java\", \"infra\", \"sdk/python/tests\", \"ui\")\n ),\n package_dir={\"\": PYTHON_CODE_PREFIX},\n install_requires=REQUIRED,\n # https://stackoverflow.com/questions/28509965/setuptools-development-requirements\n # Install dev requirements with: pip install -e .[dev]\n extras_require={\n \"dev\": DEV_REQUIRED,\n \"ci\": CI_REQUIRED,\n \"gcp\": GCP_REQUIRED,\n \"aws\": AWS_REQUIRED,\n \"bytewax\": BYTEWAX_REQUIRED,\n \"redis\": REDIS_REQUIRED,\n \"snowflake\": SNOWFLAKE_REQUIRED,\n \"spark\": SPARK_REQUIRED,\n \"trino\": TRINO_REQUIRED,\n \"postgres\": POSTGRES_REQUIRED,\n \"azure\": AZURE_REQUIRED,\n \"mysql\": MYSQL_REQUIRED,\n \"ge\": GE_REQUIRED,\n \"hbase\": HBASE_REQUIRED,\n \"go\": GO_REQUIRED,\n \"docs\": DOCS_REQUIRED,\n \"cassandra\": CASSANDRA_REQUIRED,\n },\n include_package_data=True,\n license=\"Apache\",\n classifiers=[\n # Trove classifiers\n # Full list: https://pypi.python.org/pypi?%3Aaction=list_classifiers\n \"License :: OSI Approved :: Apache Software License\",\n \"Programming Language :: Python\",\n \"Programming Language :: Python :: 3\",\n \"Programming Language :: Python :: 3.7\",\n ],\n entry_points={\"console_scripts\": [\"feast=feast.cli:cli\"]},\n use_scm_version=use_scm_version,\n setup_requires=[\n \"setuptools_scm\",\n \"grpcio>=1.47.0\",\n \"grpcio-tools>=1.47.0\",\n \"mypy-protobuf==3.1\",\n \"pybindgen==0.22.0\",\n \"sphinx!=4.0.0\",\n ],\n cmdclass={\n \"build_python_protos\": BuildPythonProtosCommand,\n \"build_go_protos\": BuildGoProtosCommand,\n \"build_py\": BuildCommand,\n \"develop\": DevelopCommand,\n \"build_ext\": build_ext,\n },\n ext_modules=[\n Extension(\n \"feast.embedded_go.lib._embedded\",\n [\"github.com/feast-dev/feast/go/embedded\"],\n )\n ],\n)\n", "path": "setup.py" } ]
[ { "content": "# Copyright 2019 The Feast Authors\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# https://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\nimport copy\nimport glob\nimport json\nimport os\nimport pathlib\nimport re\nimport shutil\nimport subprocess\nimport sys\nfrom distutils.cmd import Command\nfrom distutils.dir_util import copy_tree\nfrom pathlib import Path\nfrom subprocess import CalledProcessError\n\nfrom setuptools import Extension, find_packages\n\ntry:\n from setuptools import setup\n from setuptools.command.build_ext import build_ext as _build_ext\n from setuptools.command.build_py import build_py\n from setuptools.command.develop import develop\n from setuptools.command.install import install\n\nexcept ImportError:\n from distutils.command.build_ext import build_ext as _build_ext\n from distutils.command.build_py import build_py\n from distutils.core import setup\n\nNAME = \"feast\"\nDESCRIPTION = \"Python SDK for Feast\"\nURL = \"https://github.com/feast-dev/feast\"\nAUTHOR = \"Feast\"\nREQUIRES_PYTHON = \">=3.8.0\"\n\nREQUIRED = [\n \"click>=7.0.0,<9.0.0\",\n \"colorama>=0.3.9,<1\",\n \"dill==0.3.*\",\n \"fastavro>=1.1.0,<2\",\n \"google-api-core>=1.23.0,<3\",\n \"googleapis-common-protos>=1.52.*,<2\",\n \"grpcio>=1.47.0,<2\",\n \"grpcio-reflection>=1.47.0,<2\",\n \"Jinja2>=2,<4\",\n \"jsonschema\",\n \"mmh3\",\n \"numpy>=1.22,<3\",\n \"pandas>=1.4.3,<2\",\n \"pandavro==1.5.*\", # For some reason pandavro higher than 1.5.* only support pandas less than 1.3.\n \"protobuf<5,>3\",\n \"proto-plus>=1.20.0,<2\",\n \"pyarrow>=4,<9\",\n \"pydantic>=1,<2\",\n \"pygments>=2.12.0,<3\",\n \"PyYAML>=5.4.*,<7\",\n \"SQLAlchemy[mypy]>1,<2\",\n \"tabulate>=0.8.0,<1\",\n \"tenacity>=7,<9\",\n \"toml>=0.10.0,<1\",\n \"tqdm>=4,<5\",\n \"typeguard\",\n \"fastapi>=0.68.0,<1\",\n \"uvicorn[standard]>=0.14.0,<1\",\n \"dask>=2021.*,<2022.02.0\",\n \"bowler\", # Needed for automatic repo upgrades\n]\n\nGCP_REQUIRED = [\n \"google-cloud-bigquery[pandas]>=2,<4\",\n \"google-cloud-bigquery-storage >= 2.0.0,<3\",\n \"google-cloud-datastore>=2.1.*,<3\",\n \"google-cloud-storage>=1.34.*,<3\",\n \"google-cloud-bigtable>=2.11.*,<3\",\n]\n\nREDIS_REQUIRED = [\n \"redis==4.2.2\",\n \"hiredis>=2.0.0,<3\",\n]\n\nAWS_REQUIRED = [\"boto3>=1.17.0,<=1.20.23\", \"docker>=5.0.2\", \"s3fs>=0.4.0,<=2022.01.0\"]\n\nBYTEWAX_REQUIRED = [\"bytewax==0.10.0\", \"docker>=5.0.2\", \"kubernetes<=20.13.0\"]\n\nSNOWFLAKE_REQUIRED = [\n \"snowflake-connector-python[pandas]>=2.7.3,<3\",\n # `pyOpenSSL==22.1.0` requires `cryptography<39,>=38.0.0`, which is incompatible\n # with `snowflake-connector-python[pandas]==2.8.0`, which depends on\n # `cryptography<37.0.0,>=3.1.0`.\n \"pyOpenSSL<22.1.0\",\n]\n\nSPARK_REQUIRED = [\n \"pyspark>=3.0.0,<4\",\n]\n\nTRINO_REQUIRED = [\n \"trino>=0.305.0,<0.400.0\",\n]\n\nPOSTGRES_REQUIRED = [\n \"psycopg2-binary>=2.8.3,<3\",\n]\n\nMYSQL_REQUIRED = [\"mysqlclient\", \"pymysql\", \"types-PyMySQL\"]\n\nHBASE_REQUIRED = [\n \"happybase>=1.2.0,<3\",\n]\n\nCASSANDRA_REQUIRED = [\n \"cassandra-driver>=3.24.0,<4\",\n]\n\nGE_REQUIRED = [\"great_expectations>=0.14.0,<0.15.0\"]\n\nGO_REQUIRED = [\n \"cffi==1.15.*,<2\",\n]\n\nAZURE_REQUIRED = [\n \"azure-storage-blob>=0.37.0\",\n \"azure-identity>=1.6.1\",\n \"SQLAlchemy>=1.4.19\",\n \"pyodbc>=4.0.30\",\n \"pymssql\",\n]\n\nCI_REQUIRED = (\n [\n \"build\",\n \"cryptography>=35.0,<36\",\n \"flake8\",\n \"black>=22.6.0,<23\",\n \"isort>=5,<6\",\n \"grpcio-tools>=1.47.0\",\n \"grpcio-testing>=1.47.0\",\n \"minio==7.1.0\",\n \"mock==2.0.0\",\n \"moto<4\",\n \"mypy>=0.931\",\n \"mypy-protobuf==3.1\",\n \"avro==1.10.0\",\n \"gcsfs>=0.4.0,<=2022.01.0\",\n \"urllib3>=1.25.4,<2\",\n \"psutil==5.9.0\",\n \"pytest>=6.0.0,<8\",\n \"pytest-cov\",\n \"pytest-xdist\",\n \"pytest-benchmark>=3.4.1,<4\",\n \"pytest-lazy-fixture==0.6.3\",\n \"pytest-timeout==1.4.2\",\n \"pytest-ordering==0.6.*\",\n \"pytest-mock==1.10.4\",\n \"Sphinx!=4.0.0,<4.4.0\",\n \"sphinx-rtd-theme\",\n \"testcontainers>=3.5,<4\",\n \"adlfs==0.5.9\",\n \"firebase-admin>=5.2.0,<6\",\n \"pre-commit\",\n \"assertpy==1.1\",\n \"pip-tools\",\n \"pybindgen\",\n \"types-protobuf\",\n \"types-python-dateutil\",\n \"types-pytz\",\n \"types-PyYAML\",\n \"types-redis\",\n \"types-requests\",\n \"types-setuptools\",\n \"types-tabulate\",\n ]\n + GCP_REQUIRED\n + REDIS_REQUIRED\n + AWS_REQUIRED\n + BYTEWAX_REQUIRED\n + SNOWFLAKE_REQUIRED\n + SPARK_REQUIRED\n + POSTGRES_REQUIRED\n + MYSQL_REQUIRED\n + TRINO_REQUIRED\n + GE_REQUIRED\n + HBASE_REQUIRED\n + CASSANDRA_REQUIRED\n + AZURE_REQUIRED\n)\n\n\n# rtd builds fail because of mysql not being installed in their environment.\n# We can add mysql there, but it's not strictly needed. This will be faster for builds.\nDOCS_REQUIRED = CI_REQUIRED.copy()\nfor _r in MYSQL_REQUIRED:\n DOCS_REQUIRED.remove(_r)\n\nDEV_REQUIRED = [\"mypy-protobuf==3.1\", \"grpcio-testing==1.*\"] + CI_REQUIRED\n\n# Get git repo root directory\nrepo_root = str(pathlib.Path(__file__).resolve().parent)\n\n# README file from Feast repo root directory\nREADME_FILE = os.path.join(repo_root, \"README.md\")\nwith open(README_FILE, \"r\", encoding=\"utf8\") as f:\n LONG_DESCRIPTION = f.read()\n\n# Add Support for parsing tags that have a prefix containing '/' (ie 'sdk/go') to setuptools_scm.\n# Regex modified from default tag regex in:\n# https://github.com/pypa/setuptools_scm/blob/2a1b46d38fb2b8aeac09853e660bcd0d7c1bc7be/src/setuptools_scm/config.py#L9\nTAG_REGEX = re.compile(\n r\"^(?:[\\/\\w-]+)?(?P<version>[vV]?\\d+(?:\\.\\d+){0,2}[^\\+]*)(?:\\+.*)?$\"\n)\n\n# Only set use_scm_version if git executable exists (setting this variable causes pip to use git under the hood)\nif shutil.which(\"git\"):\n use_scm_version = {\"root\": \".\", \"relative_to\": __file__, \"tag_regex\": TAG_REGEX}\nelse:\n use_scm_version = None\n\nPROTO_SUBDIRS = [\"core\", \"serving\", \"types\", \"storage\"]\nPYTHON_CODE_PREFIX = \"sdk/python\"\n\n\nclass BuildPythonProtosCommand(Command):\n description = \"Builds the proto files into Python files.\"\n user_options = [\n (\"inplace\", \"i\", \"Write generated proto files to source directory.\"),\n ]\n\n def initialize_options(self):\n self.python_protoc = [\n sys.executable,\n \"-m\",\n \"grpc_tools.protoc\",\n ] # find_executable(\"protoc\")\n self.proto_folder = os.path.join(repo_root, \"protos\")\n self.sub_folders = PROTO_SUBDIRS\n self.build_lib = None\n self.inplace = 0\n\n def finalize_options(self):\n self.set_undefined_options(\"build\", (\"build_lib\", \"build_lib\"))\n\n @property\n def python_folder(self):\n if self.inplace:\n return os.path.join(\n os.path.dirname(__file__) or os.getcwd(), \"sdk/python/feast/protos\"\n )\n\n return os.path.join(self.build_lib, \"feast/protos\")\n\n def _generate_python_protos(self, path: str):\n proto_files = glob.glob(os.path.join(self.proto_folder, path))\n Path(self.python_folder).mkdir(parents=True, exist_ok=True)\n subprocess.check_call(\n self.python_protoc\n + [\n \"-I\",\n self.proto_folder,\n \"--python_out\",\n self.python_folder,\n \"--grpc_python_out\",\n self.python_folder,\n \"--mypy_out\",\n self.python_folder,\n ]\n + proto_files\n )\n\n def run(self):\n for sub_folder in self.sub_folders:\n self._generate_python_protos(f\"feast/{sub_folder}/*.proto\")\n # We need the __init__ files for each of the generated subdirs\n # so that they are regular packages, and don't need the `--namespace-packages` flags\n # when being typechecked using mypy.\n with open(f\"{self.python_folder}/feast/{sub_folder}/__init__.py\", \"w\"):\n pass\n\n with open(f\"{self.python_folder}/__init__.py\", \"w\"):\n pass\n with open(f\"{self.python_folder}/feast/__init__.py\", \"w\"):\n pass\n\n for path in Path(self.python_folder).rglob(\"*.py\"):\n for folder in self.sub_folders:\n # Read in the file\n with open(path, \"r\") as file:\n filedata = file.read()\n\n # Replace the target string\n filedata = filedata.replace(\n f\"from feast.{folder}\", f\"from feast.protos.feast.{folder}\"\n )\n\n # Write the file out again\n with open(path, \"w\") as file:\n file.write(filedata)\n\n\ndef _generate_path_with_gopath():\n go_path = subprocess.check_output([\"go\", \"env\", \"GOPATH\"]).decode(\"utf-8\")\n go_path = go_path.strip()\n path_val = os.getenv(\"PATH\")\n path_val = f\"{path_val}:{go_path}/bin\"\n\n return path_val\n\n\ndef _ensure_go_and_proto_toolchain():\n try:\n version = subprocess.check_output([\"go\", \"version\"])\n except Exception as e:\n raise RuntimeError(\"Unable to find go toolchain\") from e\n\n semver_string = re.search(r\"go[\\S]+\", str(version)).group().lstrip(\"go\")\n parts = semver_string.split(\".\")\n if not (int(parts[0]) >= 1 and int(parts[1]) >= 16):\n raise RuntimeError(f\"Go compiler too old; expected 1.16+ found {semver_string}\")\n\n path_val = _generate_path_with_gopath()\n\n try:\n subprocess.check_call([\"protoc-gen-go\", \"--version\"], env={\"PATH\": path_val})\n subprocess.check_call(\n [\"protoc-gen-go-grpc\", \"--version\"], env={\"PATH\": path_val}\n )\n except Exception as e:\n raise RuntimeError(\"Unable to find go/grpc extensions for protoc\") from e\n\n\nclass BuildGoProtosCommand(Command):\n description = \"Builds the proto files into Go files.\"\n user_options = []\n\n def initialize_options(self):\n self.go_protoc = [\n sys.executable,\n \"-m\",\n \"grpc_tools.protoc\",\n ] # find_executable(\"protoc\")\n self.proto_folder = os.path.join(repo_root, \"protos\")\n self.go_folder = os.path.join(repo_root, \"go/protos\")\n self.sub_folders = PROTO_SUBDIRS\n self.path_val = _generate_path_with_gopath()\n\n def finalize_options(self):\n pass\n\n def _generate_go_protos(self, path: str):\n proto_files = glob.glob(os.path.join(self.proto_folder, path))\n\n try:\n subprocess.check_call(\n self.go_protoc\n + [\n \"-I\",\n self.proto_folder,\n \"--go_out\",\n self.go_folder,\n \"--go_opt=module=github.com/feast-dev/feast/go/protos\",\n \"--go-grpc_out\",\n self.go_folder,\n \"--go-grpc_opt=module=github.com/feast-dev/feast/go/protos\",\n ]\n + proto_files,\n env={\"PATH\": self.path_val},\n )\n except CalledProcessError as e:\n print(f\"Stderr: {e.stderr}\")\n print(f\"Stdout: {e.stdout}\")\n\n def run(self):\n go_dir = Path(repo_root) / \"go\" / \"protos\"\n go_dir.mkdir(exist_ok=True)\n for sub_folder in self.sub_folders:\n self._generate_go_protos(f\"feast/{sub_folder}/*.proto\")\n\n\nclass BuildCommand(build_py):\n \"\"\"Custom build command.\"\"\"\n\n def run(self):\n self.run_command(\"build_python_protos\")\n if os.getenv(\"COMPILE_GO\", \"false\").lower() == \"true\":\n _ensure_go_and_proto_toolchain()\n self.run_command(\"build_go_protos\")\n\n self.run_command(\"build_ext\")\n build_py.run(self)\n\n\nclass DevelopCommand(develop):\n \"\"\"Custom develop command.\"\"\"\n\n def run(self):\n self.reinitialize_command(\"build_python_protos\", inplace=1)\n self.run_command(\"build_python_protos\")\n if os.getenv(\"COMPILE_GO\", \"false\").lower() == \"true\":\n _ensure_go_and_proto_toolchain()\n self.run_command(\"build_go_protos\")\n\n develop.run(self)\n\n\nclass build_ext(_build_ext):\n def finalize_options(self) -> None:\n super().finalize_options()\n if os.getenv(\"COMPILE_GO\", \"false\").lower() == \"false\":\n self.extensions = [e for e in self.extensions if not self._is_go_ext(e)]\n\n def _is_go_ext(self, ext: Extension):\n return any(\n source.endswith(\".go\") or source.startswith(\"github\")\n for source in ext.sources\n )\n\n def build_extension(self, ext: Extension):\n print(f\"Building extension {ext}\")\n if not self._is_go_ext(ext):\n # the base class may mutate `self.compiler`\n compiler = copy.deepcopy(self.compiler)\n self.compiler, compiler = compiler, self.compiler\n try:\n return _build_ext.build_extension(self, ext)\n finally:\n self.compiler, compiler = compiler, self.compiler\n\n bin_path = _generate_path_with_gopath()\n go_env = json.loads(\n subprocess.check_output([\"go\", \"env\", \"-json\"]).decode(\"utf-8\").strip()\n )\n\n print(f\"Go env: {go_env}\")\n print(f\"CWD: {os.getcwd()}\")\n\n destination = os.path.dirname(os.path.abspath(self.get_ext_fullpath(ext.name)))\n subprocess.check_call(\n [\"go\", \"install\", \"golang.org/x/tools/cmd/goimports\"],\n env={\"PATH\": bin_path, **go_env},\n )\n subprocess.check_call(\n [\"go\", \"get\", \"github.com/go-python/gopy@v0.4.4\"],\n env={\"PATH\": bin_path, **go_env},\n )\n subprocess.check_call(\n [\"go\", \"install\", \"github.com/go-python/gopy\"],\n env={\"PATH\": bin_path, **go_env},\n )\n subprocess.check_call(\n [\n \"gopy\",\n \"build\",\n \"-output\",\n destination,\n \"-vm\",\n sys.executable,\n \"--build-tags\",\n \"cgo,ccalloc\",\n \"--dynamic-link=True\",\n \"-no-make\",\n *ext.sources,\n ],\n env={\n \"PATH\": bin_path,\n \"CGO_LDFLAGS_ALLOW\": \".*\",\n **go_env,\n },\n )\n\n def copy_extensions_to_source(self):\n build_py = self.get_finalized_command(\"build_py\")\n for ext in self.extensions:\n fullname = self.get_ext_fullname(ext.name)\n modpath = fullname.split(\".\")\n package = \".\".join(modpath[:-1])\n package_dir = build_py.get_package_dir(package)\n\n src_dir = dest_dir = package_dir\n\n if src_dir.startswith(PYTHON_CODE_PREFIX):\n src_dir = package_dir[len(PYTHON_CODE_PREFIX) :]\n src_dir = src_dir.lstrip(\"/\")\n\n src_dir = os.path.join(self.build_lib, src_dir)\n\n # copy whole directory\n print(f\"Copying from {src_dir} to {dest_dir}\")\n copy_tree(src_dir, dest_dir)\n\n\nsetup(\n name=NAME,\n author=AUTHOR,\n description=DESCRIPTION,\n long_description=LONG_DESCRIPTION,\n long_description_content_type=\"text/markdown\",\n python_requires=REQUIRES_PYTHON,\n url=URL,\n packages=find_packages(\n where=PYTHON_CODE_PREFIX, exclude=(\"java\", \"infra\", \"sdk/python/tests\", \"ui\")\n ),\n package_dir={\"\": PYTHON_CODE_PREFIX},\n install_requires=REQUIRED,\n # https://stackoverflow.com/questions/28509965/setuptools-development-requirements\n # Install dev requirements with: pip install -e .[dev]\n extras_require={\n \"dev\": DEV_REQUIRED,\n \"ci\": CI_REQUIRED,\n \"gcp\": GCP_REQUIRED,\n \"aws\": AWS_REQUIRED,\n \"bytewax\": BYTEWAX_REQUIRED,\n \"redis\": REDIS_REQUIRED,\n \"snowflake\": SNOWFLAKE_REQUIRED,\n \"spark\": SPARK_REQUIRED,\n \"trino\": TRINO_REQUIRED,\n \"postgres\": POSTGRES_REQUIRED,\n \"azure\": AZURE_REQUIRED,\n \"mysql\": MYSQL_REQUIRED,\n \"ge\": GE_REQUIRED,\n \"hbase\": HBASE_REQUIRED,\n \"go\": GO_REQUIRED,\n \"docs\": DOCS_REQUIRED,\n \"cassandra\": CASSANDRA_REQUIRED,\n },\n include_package_data=True,\n license=\"Apache\",\n classifiers=[\n # Trove classifiers\n # Full list: https://pypi.python.org/pypi?%3Aaction=list_classifiers\n \"License :: OSI Approved :: Apache Software License\",\n \"Programming Language :: Python\",\n \"Programming Language :: Python :: 3\",\n \"Programming Language :: Python :: 3.7\",\n ],\n entry_points={\"console_scripts\": [\"feast=feast.cli:cli\"]},\n use_scm_version=use_scm_version,\n setup_requires=[\n \"setuptools_scm\",\n \"grpcio>=1.47.0\",\n \"grpcio-tools>=1.47.0\",\n \"mypy-protobuf==3.1\",\n \"pybindgen==0.22.0\",\n \"sphinx!=4.0.0\",\n ],\n cmdclass={\n \"build_python_protos\": BuildPythonProtosCommand,\n \"build_go_protos\": BuildGoProtosCommand,\n \"build_py\": BuildCommand,\n \"develop\": DevelopCommand,\n \"build_ext\": build_ext,\n },\n ext_modules=[\n Extension(\n \"feast.embedded_go.lib._embedded\",\n [\"github.com/feast-dev/feast/go/embedded\"],\n )\n ],\n)\n", "path": "setup.py" } ]
diff --git a/setup.py b/setup.py index 2b09bcbe946..fbd3cf5368f 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ DESCRIPTION = "Python SDK for Feast" URL = "https://github.com/feast-dev/feast" AUTHOR = "Feast" -REQUIRES_PYTHON = ">=3.7.0" +REQUIRES_PYTHON = ">=3.8.0" REQUIRED = [ "click>=7.0.0,<9.0.0",
pytorch__TensorRT-376
[ { "content": "from typing import List, Dict, Any\nimport torch\nfrom torch import nn\n\nimport trtorch._C\nfrom trtorch._compile_spec import _parse_compile_spec\nfrom trtorch._version import __version__\nfrom types import FunctionType\n\n\ndef compile(module: torch.jit.ScriptModule, compile_spec: Any) -> torch.jit.ScriptModule:\n \"\"\"Compile a TorchScript module for NVIDIA GPUs using TensorRT\n\n Takes a existing TorchScript module and a set of settings to configure the compiler\n and will convert methods to JIT Graphs which call equivalent TensorRT engines\n\n Converts specifically the forward method of a TorchScript Module\n\n Args:\n module (torch.jit.ScriptModule): Source module, a result of tracing or scripting a PyTorch\n ``torch.nn.Module``\n compile_spec (dict): Compilation settings including operating precision, target device, etc.\n One key is required which is ``input_shapes``, describing the input sizes or ranges for inputs\n to the graph. All other keys are optional\n\n .. code-block:: py\n\n compile_spec = {\n \"input_shapes\": [\n (1, 3, 224, 224), # Static input shape for input #1\n {\n \"min\": (1, 3, 224, 224),\n \"opt\": (1, 3, 512, 512),\n \"max\": (1, 3, 1024, 1024)\n } # Dynamic input shape for input #2\n ],\n \"device\": {\n \"device_type\": torch.device(\"cuda\"), # Type of device to run engine on (for DLA use trtorch.DeviceType.DLA)\n \"gpu_id\": 0, # Target gpu id to run engine (Use Xavier as gpu id for DLA)\n \"dla_core\": 0, # (DLA only) Target dla core id to run engine\n \"allow_gpu_fallback\": false, # (DLA only) Allow layers unsupported on DLA to run on GPU\n },\n \"op_precision\": torch.half, # Operating precision set to FP16\n \"refit\": false, # enable refit\n \"debug\": false, # enable debuggable engine\n \"strict_types\": false, # kernels should strictly run in operating precision\n \"capability\": trtorch.EngineCapability.DEFAULT, # Restrict kernel selection to safe gpu kernels or safe dla kernels\n \"num_min_timing_iters\": 2, # Number of minimization timing iterations used to select kernels\n \"num_avg_timing_iters\": 1, # Number of averaging timing iterations used to select kernels\n \"workspace_size\": 0, # Maximum size of workspace given to TensorRT\n \"max_batch_size\": 0, # Maximum batch size (must be >= 1 to be set, 0 means not set)\n }\n\n Input Sizes can be specified as torch sizes, tuples or lists. Op precisions can be specified using\n torch datatypes or trtorch datatypes and you can use either torch devices or the trtorch device type enum\n to select device type.\n\n Returns:\n torch.jit.ScriptModule: Compiled TorchScript Module, when run it will execute via TensorRT\n \"\"\"\n\n if isinstance(module, torch.jit.ScriptFunction):\n raise TypeError(\n \"torch.jit.ScriptFunction currently is not directly supported, wrap the function in a module to compile\")\n\n compiled_cpp_mod = trtorch._C.compile_graph(module._c, _parse_compile_spec(compile_spec))\n compiled_module = torch.jit._recursive.wrap_cpp_module(compiled_cpp_mod)\n return compiled_module\n\n\ndef convert_method_to_trt_engine(module: torch.jit.ScriptModule, method_name: str, compile_spec: Any) -> str:\n \"\"\"Convert a TorchScript module method to a serialized TensorRT engine\n\n Converts a specified method of a module to a serialized TensorRT engine given a dictionary of conversion settings\n\n Args:\n module (torch.jit.ScriptModule): Source module, a result of tracing or scripting a PyTorch\n ``torch.nn.Module``\n method_name (str): Name of method to convert\n compile_spec (dict): Compilation settings including operating precision, target device, etc.\n One key is required which is ``input_shapes``, describing the input sizes or ranges for inputs\n to the graph. All other keys are optional\n\n .. code-block:: py\n\n CompileSpec = {\n \"input_shapes\": [\n (1, 3, 224, 224), # Static input shape for input #1\n {\n \"min\": (1, 3, 224, 224),\n \"opt\": (1, 3, 512, 512),\n \"max\": (1, 3, 1024, 1024)\n } # Dynamic input shape for input #2\n ],\n \"device\": {\n \"device_type\": torch.device(\"cuda\"), # Type of device to run engine on (for DLA use trtorch.DeviceType.DLA)\n \"gpu_id\": 0, # Target gpu id to run engine (Use Xavier as gpu id for DLA)\n \"dla_core\": 0, # (DLA only) Target dla core id to run engine\n \"allow_gpu_fallback\": false, # (DLA only) Allow layers unsupported on DLA to run on GPU\n },\n \"op_precision\": torch.half, # Operating precision set to FP16\n \"disable_tf32\": False, # Force FP32 layers to use traditional as FP32 format vs the default behavior of rounding the inputs to 10-bit mantissas before multiplying, but accumulates the sum using 23-bit mantissas\n \"refit\": false, # enable refit\n \"debug\": false, # enable debuggable engine\n \"strict_types\": false, # kernels should strictly run in operating precision\n \"capability\": trtorch.EngineCapability.DEFAULT, # Restrict kernel selection to safe gpu kernels or safe dla kernels\n \"num_min_timing_iters\": 2, # Number of minimization timing iterations used to select kernels\n \"num_avg_timing_iters\": 1, # Number of averaging timing iterations used to select kernels\n \"workspace_size\": 0, # Maximum size of workspace given to TensorRT\n \"max_batch_size\": 0, # Maximum batch size (must be >= 1 to be set, 0 means not set)\n }\n\n Input Sizes can be specified as torch sizes, tuples or lists. Op precisions can be specified using\n torch datatypes or trtorch datatypes and you can use either torch devices or the trtorch device type enum\n to select device type.\n\n Returns:\n bytes: Serialized TensorRT engine, can either be saved to a file or deserialized via TensorRT APIs\n \"\"\"\n if isinstance(module, torch.jit.ScriptFunction):\n raise TypeError(\n \"torch.jit.ScriptFunctions currently are not directly supported, wrap the function in a module to compile\")\n\n return trtorch._C.convert_graph_to_trt_engine(module._c, method_name, _parse_compile_spec(compile_spec))\n\n\ndef check_method_op_support(module: torch.jit.ScriptModule, method_name: str) -> bool:\n \"\"\"Checks to see if a method is fully supported by TRTorch\n\n Checks if a method of a TorchScript module can be compiled by TRTorch, if not, a list of operators\n that are not supported are printed out and the function returns false, else true.\n\n Args:\n module (torch.jit.ScriptModule): Source module, a result of tracing or scripting a PyTorch\n ``torch.nn.Module``\n method_name (str): Name of method to check\n\n Returns:\n bool: True if supported Method\n \"\"\"\n return trtorch._C.check_method_op_support(module._c, method_name)\n\n\ndef dump_build_info():\n \"\"\"Prints build information about the TRTorch distribution to stdout\n \"\"\"\n print(get_build_info())\n\n\ndef get_build_info() -> str:\n \"\"\"Returns a string containing the build information of TRTorch distribution\n\n Returns:\n str: String containing the build information for TRTorch distribution\n \"\"\"\n build_info = trtorch._C.get_build_info()\n build_info = \"TRTorch Version: \" + str(__version__) + '\\n' + build_info\n return build_info\n\ndef set_device(gpu_id):\n trtorch._C.set_device(gpu_id)\n", "path": "py/trtorch/_compiler.py" } ]
[ { "content": "from typing import List, Dict, Any\nimport torch\nfrom torch import nn\n\nimport trtorch._C\nfrom trtorch._compile_spec import _parse_compile_spec\nfrom trtorch._version import __version__\nfrom types import FunctionType\n\n\ndef compile(module: torch.jit.ScriptModule, compile_spec: Any) -> torch.jit.ScriptModule:\n \"\"\"Compile a TorchScript module for NVIDIA GPUs using TensorRT\n\n Takes a existing TorchScript module and a set of settings to configure the compiler\n and will convert methods to JIT Graphs which call equivalent TensorRT engines\n\n Converts specifically the forward method of a TorchScript Module\n\n Args:\n module (torch.jit.ScriptModule): Source module, a result of tracing or scripting a PyTorch\n ``torch.nn.Module``\n compile_spec (dict): Compilation settings including operating precision, target device, etc.\n One key is required which is ``input_shapes``, describing the input sizes or ranges for inputs\n to the graph. All other keys are optional\n\n .. code-block:: py\n\n compile_spec = {\n \"input_shapes\": [\n (1, 3, 224, 224), # Static input shape for input #1\n {\n \"min\": (1, 3, 224, 224),\n \"opt\": (1, 3, 512, 512),\n \"max\": (1, 3, 1024, 1024)\n } # Dynamic input shape for input #2\n ],\n \"device\": {\n \"device_type\": torch.device(\"cuda\"), # Type of device to run engine on (for DLA use trtorch.DeviceType.DLA)\n \"gpu_id\": 0, # Target gpu id to run engine (Use Xavier as gpu id for DLA)\n \"dla_core\": 0, # (DLA only) Target dla core id to run engine\n \"allow_gpu_fallback\": false, # (DLA only) Allow layers unsupported on DLA to run on GPU\n },\n \"op_precision\": torch.half, # Operating precision set to FP16\n \"refit\": false, # enable refit\n \"debug\": false, # enable debuggable engine\n \"strict_types\": false, # kernels should strictly run in operating precision\n \"capability\": trtorch.EngineCapability.DEFAULT, # Restrict kernel selection to safe gpu kernels or safe dla kernels\n \"num_min_timing_iters\": 2, # Number of minimization timing iterations used to select kernels\n \"num_avg_timing_iters\": 1, # Number of averaging timing iterations used to select kernels\n \"workspace_size\": 0, # Maximum size of workspace given to TensorRT\n \"max_batch_size\": 0, # Maximum batch size (must be >= 1 to be set, 0 means not set)\n }\n\n Input Sizes can be specified as torch sizes, tuples or lists. Op precisions can be specified using\n torch datatypes or trtorch datatypes and you can use either torch devices or the trtorch device type enum\n to select device type.\n\n Returns:\n torch.jit.ScriptModule: Compiled TorchScript Module, when run it will execute via TensorRT\n \"\"\"\n\n if isinstance(module, torch.jit.ScriptFunction):\n raise TypeError(\n \"torch.jit.ScriptFunction currently is not directly supported, wrap the function in a module to compile\")\n\n compiled_cpp_mod = trtorch._C.compile_graph(module._c, _parse_compile_spec(compile_spec))\n compiled_module = torch.jit._recursive.wrap_cpp_module(compiled_cpp_mod)\n return compiled_module\n\n\ndef convert_method_to_trt_engine(module: torch.jit.ScriptModule, method_name: str, compile_spec: Any) -> str:\n \"\"\"Convert a TorchScript module method to a serialized TensorRT engine\n\n Converts a specified method of a module to a serialized TensorRT engine given a dictionary of conversion settings\n\n Args:\n module (torch.jit.ScriptModule): Source module, a result of tracing or scripting a PyTorch\n ``torch.nn.Module``\n method_name (str): Name of method to convert\n compile_spec (dict): Compilation settings including operating precision, target device, etc.\n One key is required which is ``input_shapes``, describing the input sizes or ranges for inputs\n to the graph. All other keys are optional\n\n .. code-block:: py\n\n CompileSpec = {\n \"input_shapes\": [\n (1, 3, 224, 224), # Static input shape for input #1\n {\n \"min\": (1, 3, 224, 224),\n \"opt\": (1, 3, 512, 512),\n \"max\": (1, 3, 1024, 1024)\n } # Dynamic input shape for input #2\n ],\n \"device\": {\n \"device_type\": torch.device(\"cuda\"), # Type of device to run engine on (for DLA use trtorch.DeviceType.DLA)\n \"gpu_id\": 0, # Target gpu id to run engine (Use Xavier as gpu id for DLA)\n \"dla_core\": 0, # (DLA only) Target dla core id to run engine\n \"allow_gpu_fallback\": false, # (DLA only) Allow layers unsupported on DLA to run on GPU\n },\n \"op_precision\": torch.half, # Operating precision set to FP16\n \"disable_tf32\": False, # Force FP32 layers to use traditional as FP32 format vs the default behavior of rounding the inputs to 10-bit mantissas before multiplying, but accumulates the sum using 23-bit mantissas\n \"refit\": false, # enable refit\n \"debug\": false, # enable debuggable engine\n \"strict_types\": false, # kernels should strictly run in operating precision\n \"capability\": trtorch.EngineCapability.DEFAULT, # Restrict kernel selection to safe gpu kernels or safe dla kernels\n \"num_min_timing_iters\": 2, # Number of minimization timing iterations used to select kernels\n \"num_avg_timing_iters\": 1, # Number of averaging timing iterations used to select kernels\n \"workspace_size\": 0, # Maximum size of workspace given to TensorRT\n \"max_batch_size\": 0, # Maximum batch size (must be >= 1 to be set, 0 means not set)\n }\n\n Input Sizes can be specified as torch sizes, tuples or lists. Op precisions can be specified using\n torch datatypes or trtorch datatypes and you can use either torch devices or the trtorch device type enum\n to select device type.\n\n Returns:\n bytes: Serialized TensorRT engine, can either be saved to a file or deserialized via TensorRT APIs\n \"\"\"\n if isinstance(module, torch.jit.ScriptFunction):\n raise TypeError(\n \"torch.jit.ScriptFunctions currently are not directly supported, wrap the function in a module to compile\")\n\n return trtorch._C.convert_graph_to_trt_engine(module._c, method_name, _parse_compile_spec(compile_spec))\n\n\ndef check_method_op_support(module: torch.jit.ScriptModule, method_name: str) -> bool:\n \"\"\"Checks to see if a method is fully supported by TRTorch\n\n Checks if a method of a TorchScript module can be compiled by TRTorch, if not, a list of operators\n that are not supported are printed out and the function returns false, else true.\n\n Args:\n module (torch.jit.ScriptModule): Source module, a result of tracing or scripting a PyTorch\n ``torch.nn.Module``\n method_name (str): Name of method to check\n\n Returns:\n bool: True if supported Method\n \"\"\"\n return trtorch._C.check_method_op_support(module._c, method_name)\n\n\ndef dump_build_info():\n \"\"\"Prints build information about the TRTorch distribution to stdout\n \"\"\"\n print(get_build_info())\n\n\ndef get_build_info() -> str:\n \"\"\"Returns a string containing the build information of TRTorch distribution\n\n Returns:\n str: String containing the build information for TRTorch distribution\n \"\"\"\n build_info = trtorch._C.get_build_info()\n build_info = \"TRTorch Version: \" + str(__version__) + '\\n' + build_info\n return build_info\n\n\ndef set_device(gpu_id):\n trtorch._C.set_device(gpu_id)\n", "path": "py/trtorch/_compiler.py" } ]
diff --git a/core/conversion/conversionctx/ConversionCtx.cpp b/core/conversion/conversionctx/ConversionCtx.cpp index 9d47026c60..04f6aafe5c 100644 --- a/core/conversion/conversionctx/ConversionCtx.cpp +++ b/core/conversion/conversionctx/ConversionCtx.cpp @@ -148,7 +148,9 @@ std::string ConversionCtx::SerializeEngine() { auto engine = builder->buildEngineWithConfig(*net, *cfg); auto serialized_engine = engine->serialize(); engine->destroy(); - return std::string((const char*)serialized_engine->data(), serialized_engine->size()); + auto engine_str = std::string((const char*)serialized_engine->data(), serialized_engine->size()); + serialized_engine->destroy(); + return engine_str; } bool ConversionCtx::CheckLayerAddition(const torch::jit::Node* n) { diff --git a/py/trtorch/_compiler.py b/py/trtorch/_compiler.py index fdb6fc2e80..65c91732e6 100644 --- a/py/trtorch/_compiler.py +++ b/py/trtorch/_compiler.py @@ -157,5 +157,6 @@ def get_build_info() -> str: build_info = "TRTorch Version: " + str(__version__) + '\n' + build_info return build_info + def set_device(gpu_id): trtorch._C.set_device(gpu_id) diff --git a/tests/py/test_multi_gpu.py b/tests/py/test_multi_gpu.py index 4fb433f441..92748fc640 100644 --- a/tests/py/test_multi_gpu.py +++ b/tests/py/test_multi_gpu.py @@ -5,7 +5,9 @@ from model_test_case import ModelTestCase + class TestMultiGpuSwitching(ModelTestCase): + def setUp(self): if torch.cuda.device_count() < 2: self.fail("Test is not relevant for this platform since number of available CUDA devices is less than 2") @@ -55,12 +57,14 @@ def test_compile_script(self): trtorch.set_device(0) self.assertTrue(same < 2e-3) + def test_suite(): suite = unittest.TestSuite() suite.addTest(TestMultiGpuSwitching.parametrize(TestMultiGpuSwitching, model=models.resnet18(pretrained=True))) return suite + suite = test_suite() runner = unittest.TextTestRunner()
cookiecutter__cookiecutter-1562
[ { "content": "#!/usr/bin/env python\n\"\"\"cookiecutter distutils configuration.\"\"\"\nfrom setuptools import setup\n\nversion = \"2.0.0\"\n\nwith open('README.md', encoding='utf-8') as readme_file:\n readme = readme_file.read()\n\nrequirements = [\n 'binaryornot>=0.4.4',\n 'Jinja2>=2.7,<4.0.0',\n 'click>=7.0',\n 'pyyaml>=5.3.1',\n 'jinja2-time>=0.2.0',\n 'python-slugify>=4.0.0',\n 'requests>=2.23.0',\n]\n\nsetup(\n name='cookiecutter',\n version=version,\n description=(\n 'A command-line utility that creates projects from project '\n 'templates, e.g. creating a Python package project from a '\n 'Python package project template.'\n ),\n long_description=readme,\n long_description_content_type='text/markdown',\n author='Audrey Feldroy',\n author_email='audreyr@gmail.com',\n url='https://github.com/cookiecutter/cookiecutter',\n packages=['cookiecutter'],\n package_dir={'cookiecutter': 'cookiecutter'},\n entry_points={'console_scripts': ['cookiecutter = cookiecutter.__main__:main']},\n include_package_data=True,\n python_requires='>=3.6',\n install_requires=requirements,\n license='BSD',\n zip_safe=False,\n classifiers=[\n \"Development Status :: 5 - Production/Stable\",\n \"Environment :: Console\",\n \"Intended Audience :: Developers\",\n \"Natural Language :: English\",\n \"License :: OSI Approved :: BSD License\",\n \"Programming Language :: Python :: 3 :: Only\",\n \"Programming Language :: Python :: 3\",\n \"Programming Language :: Python :: 3.6\",\n \"Programming Language :: Python :: 3.7\",\n \"Programming Language :: Python :: 3.8\",\n \"Programming Language :: Python :: 3.9\",\n \"Programming Language :: Python :: Implementation :: CPython\",\n \"Programming Language :: Python :: Implementation :: PyPy\",\n \"Programming Language :: Python\",\n \"Topic :: Software Development\",\n ],\n keywords=[\n \"cookiecutter\",\n \"Python\",\n \"projects\",\n \"project templates\",\n \"Jinja2\",\n \"skeleton\",\n \"scaffolding\",\n \"project directory\",\n \"package\",\n \"packaging\",\n ],\n)\n", "path": "setup.py" } ]
[ { "content": "#!/usr/bin/env python\n\"\"\"cookiecutter distutils configuration.\"\"\"\nfrom setuptools import setup\n\nversion = \"2.0.0\"\n\nwith open('README.md', encoding='utf-8') as readme_file:\n readme = readme_file.read()\n\nrequirements = [\n 'binaryornot>=0.4.4',\n 'Jinja2>=2.7,<4.0.0',\n 'click>=7.0,<8.0.0',\n 'pyyaml>=5.3.1',\n 'jinja2-time>=0.2.0',\n 'python-slugify>=4.0.0',\n 'requests>=2.23.0',\n]\n\nsetup(\n name='cookiecutter',\n version=version,\n description=(\n 'A command-line utility that creates projects from project '\n 'templates, e.g. creating a Python package project from a '\n 'Python package project template.'\n ),\n long_description=readme,\n long_description_content_type='text/markdown',\n author='Audrey Feldroy',\n author_email='audreyr@gmail.com',\n url='https://github.com/cookiecutter/cookiecutter',\n packages=['cookiecutter'],\n package_dir={'cookiecutter': 'cookiecutter'},\n entry_points={'console_scripts': ['cookiecutter = cookiecutter.__main__:main']},\n include_package_data=True,\n python_requires='>=3.6',\n install_requires=requirements,\n license='BSD',\n zip_safe=False,\n classifiers=[\n \"Development Status :: 5 - Production/Stable\",\n \"Environment :: Console\",\n \"Intended Audience :: Developers\",\n \"Natural Language :: English\",\n \"License :: OSI Approved :: BSD License\",\n \"Programming Language :: Python :: 3 :: Only\",\n \"Programming Language :: Python :: 3\",\n \"Programming Language :: Python :: 3.6\",\n \"Programming Language :: Python :: 3.7\",\n \"Programming Language :: Python :: 3.8\",\n \"Programming Language :: Python :: 3.9\",\n \"Programming Language :: Python :: Implementation :: CPython\",\n \"Programming Language :: Python :: Implementation :: PyPy\",\n \"Programming Language :: Python\",\n \"Topic :: Software Development\",\n ],\n keywords=[\n \"cookiecutter\",\n \"Python\",\n \"projects\",\n \"project templates\",\n \"Jinja2\",\n \"skeleton\",\n \"scaffolding\",\n \"project directory\",\n \"package\",\n \"packaging\",\n ],\n)\n", "path": "setup.py" } ]
diff --git a/setup.py b/setup.py index 124dc40c9..654010fa0 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ requirements = [ 'binaryornot>=0.4.4', 'Jinja2>=2.7,<4.0.0', - 'click>=7.0', + 'click>=7.0,<8.0.0', 'pyyaml>=5.3.1', 'jinja2-time>=0.2.0', 'python-slugify>=4.0.0', diff --git a/tests/test_read_user_dict.py b/tests/test_read_user_dict.py index 8d16441e2..ccf632258 100644 --- a/tests/test_read_user_dict.py +++ b/tests/test_read_user_dict.py @@ -97,6 +97,17 @@ def test_should_call_prompt_with_process_json(mocker): ) +def test_should_not_call_process_json_default_value(mocker, monkeypatch): + """Make sure that `process_json` is not called when using default value.""" + mock_process_json = mocker.patch('cookiecutter.prompt.process_json', autospec=True) + + runner = click.testing.CliRunner() + with runner.isolation(input="\n"): + read_user_dict('name', {'project_slug': 'pytest-plugin'}) + + mock_process_json.assert_not_called() + + def test_read_user_dict_default_value(mocker): """Make sure that `read_user_dict` returns the default value.
OpenEnergyPlatform__oeplatform-605
[ { "content": "from django.conf.urls import url\nfrom django.conf.urls.static import static\nfrom django.views.generic import TemplateView\n\nfrom modelview import views\nfrom oeplatform import settings\n\nurlpatterns = [\n url(r\"^$\", TemplateView.as_view(template_name=\"ontology/about.html\")),\n]\n", "path": "ontology/urls.py" } ]
[ { "content": "from django.conf.urls import url\nfrom django.conf.urls.static import static\nfrom django.views.generic import TemplateView\n\nfrom modelview import views\nfrom oeplatform import settings\n\nurlpatterns = [\n url(r\"^$\", TemplateView.as_view(template_name=\"ontology/about.html\")),\n url(r\"^ontology/oeo-steering-committee$\",\n TemplateView.as_view(template_name=\"ontology/oeo-steering-committee.html\"),\n name=\"oeo-s-c\"),\n]\n", "path": "ontology/urls.py" } ]
diff --git a/ontology/templates/ontology/about.html b/ontology/templates/ontology/about.html index 8b4d99b67..b621807f0 100644 --- a/ontology/templates/ontology/about.html +++ b/ontology/templates/ontology/about.html @@ -53,6 +53,6 @@ <h3 id="where-and-how-can-i-contribute">Where and how can I contribute?</h3> <p>The OEO development was initiated in the project “SzenarienDB” and is augmented in the project “LOD_GEOSS”. The development is community based and <a href="https://github.com/OpenEnergyPlatform/ontology">takes place on GitHub</a>. </p> -<p>A OEO steering committee was created in autumn 2019.</p> +<p>A <a href={% url 'oeo-s-c'%}>OEO steering committee</a> was created in autumn 2019.</p> {% endblock %} diff --git a/ontology/templates/ontology/oeo-steering-committee.html b/ontology/templates/ontology/oeo-steering-committee.html new file mode 100644 index 000000000..218ffa797 --- /dev/null +++ b/ontology/templates/ontology/oeo-steering-committee.html @@ -0,0 +1,23 @@ +{% extends "base/base.html" %} +{% load bootstrap4 %} + +{% block main-content-body %} +{% load static %} + +<h2>Open Energy Ontology Steering Committee (OEO-SC)</h2> <br> + +<h3 id="oeo-sc">What is the Steering Committee?</h3> +<p>In order to increase the awareness of the ontology, + adoption in currently running and planned projects and to shepherd its development, + a steering committee was summoned: The OEO Steering Committee (OSO-SC). </p> + +<p>Regular, short conference calls, as well as personal meeting (e.g. at already planned events) + are used to exchange information on planned or already done tasks. + A continuous exchange between ontology developers and the OEO-SC takes place on GitHub.</p> + +<h3 id="oeo-sc-members">Who is involved with the OEO-SC</h3> +<p>The Steering Committee is organized by the project team of the + research project SzenarienDB and moderated by Ludwig Hülk (RLI). + The members are:</p> + +{% endblock main-content-body %} \ No newline at end of file diff --git a/ontology/urls.py b/ontology/urls.py index 1958aea8e..eb52e5a5f 100644 --- a/ontology/urls.py +++ b/ontology/urls.py @@ -7,4 +7,7 @@ urlpatterns = [ url(r"^$", TemplateView.as_view(template_name="ontology/about.html")), + url(r"^ontology/oeo-steering-committee$", + TemplateView.as_view(template_name="ontology/oeo-steering-committee.html"), + name="oeo-s-c"), ]
cocotb__cocotb-797
[ { "content": "# -*- coding: utf-8 -*-\n#\n# cocotb documentation build configuration file, created by\n# sphinx-quickstart on Wed Jun 19 14:44:09 2013.\n#\n# This file is execfile()d with the current directory set to its containing dir.\n#\n# Note that not all possible configuration values are present in this\n# autogenerated file.\n#\n# All configuration values have a default; values that are commented out\n# serve to show the default.\n\nimport sys, os\nimport datetime\n\n# If extensions (or modules to document with autodoc) are in another directory,\n# add these directories to sys.path here. If the directory is relative to the\n# documentation root, use os.path.abspath to make it absolute, like shown here.\nsys.path.insert(0, os.path.abspath('../..'))\n\n# Add in-tree extensions to path\nsys.path.insert(0, os.path.abspath('../sphinxext'))\n\nos.environ[\"SPHINX_BUILD\"] = \"1\"\n\n# -- General configuration -----------------------------------------------------\n\n# If your documentation needs a minimal Sphinx version, state it here.\n#needs_sphinx = '1.0'\n\n# Add any Sphinx extension module names here, as strings. They can be extensions\n# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.\nextensions = [\n 'sphinx.ext.autodoc', \n 'sphinx.ext.doctest', \n 'sphinx.ext.todo', \n 'sphinx.ext.coverage', \n 'sphinx.ext.imgmath', \n 'sphinx.ext.viewcode',\n 'sphinx.ext.napoleon',\n 'sphinx.ext.intersphinx',\n 'cairosvgconverter',\n ]\n\nintersphinx_mapping = {'https://docs.python.org/3': None}\n\n# Add any paths that contain templates here, relative to this directory.\ntemplates_path = ['_templates']\n\n# The suffix of source filenames.\nsource_suffix = '.rst'\n\n# The encoding of source files.\n#source_encoding = 'utf-8-sig'\n\n# The master toctree document.\nmaster_doc = 'index'\n\n# General information about the project.\nproject = u'cocotb'\ncopyright = u'2014-{0}, PotentialVentures'.format(datetime.datetime.now().year)\n\n# The version info for the project you're documenting, acts as replacement for\n# |version| and |release|, also used in various other places throughout the\n# built documents.\n#\n# The short X.Y version.\nversion = '1.1'\n# The full version, including alpha/beta/rc tags.\nrelease = '1.1'\n\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n#language = None\n\n# There are two options for replacing |today|: either, you set today to some\n# non-false value, then it is used:\n#today = ''\n# Else, today_fmt is used as the format for a strftime call.\n#today_fmt = '%B %d, %Y'\n\n# List of patterns, relative to source directory, that match files and\n# directories to ignore when looking for source files.\nexclude_patterns = []\n\n# The reST default role (used for this markup: `text`) to use for all documents.\n#default_role = None\n\n# If true, '()' will be appended to :func: etc. cross-reference text.\n#add_function_parentheses = True\n\n# If true, the current module name will be prepended to all description\n# unit titles (such as .. function::).\n#add_module_names = True\n\n# If true, sectionauthor and moduleauthor directives will be shown in the\n# output. They are ignored by default.\n#show_authors = False\n\n# The name of the Pygments (syntax highlighting) style to use.\npygments_style = 'sphinx'\n\n# A list of ignored prefixes for module index sorting.\n#modindex_common_prefix = []\n\n# If true, keep warnings as \"system message\" paragraphs in the built documents.\n#keep_warnings = False\n\n\n# -- Options for HTML output ---------------------------------------------------\n\n# The theme to use for HTML and HTML Help pages. See the documentation for\n# a list of builtin themes.\nhtml_theme = 'default'\n\n# Theme options are theme-specific and customize the look and feel of a theme\n# further. For a list of options available for each theme, see the\n# documentation.\n#html_theme_options = {}\n\n# Add any paths that contain custom themes here, relative to this directory.\n#html_theme_path = []\n\n# The name for this set of Sphinx documents. If None, it defaults to\n# \"<project> v<release> documentation\".\n#html_title = None\n\n# A shorter title for the navigation bar. Default is the same as html_title.\n#html_short_title = None\n\n# The name of an image file (relative to this directory) to place at the top\n# of the sidebar.\n#html_logo = None\n\n# The name of an image file (within the static path) to use as favicon of the\n# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32\n# pixels large.\n#html_favicon = None\n\n# Add any paths that contain custom static files (such as style sheets) here,\n# relative to this directory. They are copied after the builtin static files,\n# so a file named \"default.css\" will overwrite the builtin \"default.css\".\nhtml_static_path = ['_static']\n\n# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,\n# using the given strftime format.\n#html_last_updated_fmt = '%b %d, %Y'\n\n# If true, SmartyPants will be used to convert quotes and dashes to\n# typographically correct entities.\n#html_use_smartypants = True\n\n# Custom sidebar templates, maps document names to template names.\n#html_sidebars = {}\n\n# Additional templates that should be rendered to pages, maps page names to\n# template names.\n#html_additional_pages = {}\n\n# If false, no module index is generated.\n#html_domain_indices = True\n\n# If false, no index is generated.\n#html_use_index = True\n\n# If true, the index is split into individual pages for each letter.\n#html_split_index = False\n\n# If true, links to the reST sources are added to the pages.\n#html_show_sourcelink = True\n\n# If true, \"Created using Sphinx\" is shown in the HTML footer. Default is True.\n#html_show_sphinx = True\n\n# If true, \"(C) Copyright ...\" is shown in the HTML footer. Default is True.\n#html_show_copyright = True\n\n# If true, an OpenSearch description file will be output, and all pages will\n# contain a <link> tag referring to it. The value of this option must be the\n# base URL from which the finished HTML is served.\n#html_use_opensearch = ''\n\n# This is the file name suffix for HTML files (e.g. \".xhtml\").\n#html_file_suffix = None\n\n# Output file base name for HTML help builder.\nhtmlhelp_basename = 'cocotbdoc'\n\n\n# -- Options for LaTeX output --------------------------------------------------\n\nlatex_elements = {\n# The paper size ('letterpaper' or 'a4paper').\n#'papersize': 'letterpaper',\n\n# The font size ('10pt', '11pt' or '12pt').\n#'pointsize': '10pt',\n\n# Additional stuff for the LaTeX preamble.\n#'preamble': '',\n}\n\n# Grouping the document tree into LaTeX files. List of tuples\n# (source start file, target name, title, author, documentclass [howto/manual]).\nlatex_documents = [\n ('index', 'cocotb.tex', u'cocotb Documentation',\n u'PotentialVentures', 'manual'),\n]\n\n# The name of an image file (relative to this directory) to place at the top of\n# the title page.\n#latex_logo = None\n\n# For \"manual\" documents, if this is true, then toplevel headings are parts,\n# not chapters.\n#latex_use_parts = False\n\n# If true, show page references after internal links.\n#latex_show_pagerefs = False\n\n# If true, show URL addresses after external links.\n#latex_show_urls = False\n\n# Documents to append as an appendix to all manuals.\n#latex_appendices = []\n\n# If false, no module index is generated.\n#latex_domain_indices = True\n\n\n# -- Options for manual page output --------------------------------------------\n\n# One entry per manual page. List of tuples\n# (source start file, name, description, authors, manual section).\nman_pages = [\n ('index', 'cocotb', u'cocotb Documentation',\n [u'PotentialVentures'], 1)\n]\n\n# If true, show URL addresses after external links.\n#man_show_urls = False\n\n\n# -- Options for Texinfo output ------------------------------------------------\n\n# Grouping the document tree into Texinfo files. List of tuples\n# (source start file, target name, title, author,\n# dir menu entry, description, category)\ntexinfo_documents = [\n ('index', 'cocotb', u'cocotb Documentation',\n u'PotentialVentures', 'cocotb', 'Coroutine Cosimulation TestBench \\\n environment for efficient verification of RTL using Python.',\n 'Miscellaneous'),\n]\n\n# Documents to append as an appendix to all manuals.\n#texinfo_appendices = []\n\n# If false, no module index is generated.\n#texinfo_domain_indices = True\n\n# How to display URL addresses: 'footnote', 'no', or 'inline'.\n#texinfo_show_urls = 'footnote'\n\n# If true, do not generate a @detailmenu in the \"Top\" node's menu.\n#texinfo_no_detailmenu = False\n\n# For now show the todoy \ntodo_include_todos = True\n", "path": "documentation/source/conf.py" } ]
[ { "content": "# -*- coding: utf-8 -*-\n#\n# cocotb documentation build configuration file, created by\n# sphinx-quickstart on Wed Jun 19 14:44:09 2013.\n#\n# This file is execfile()d with the current directory set to its containing dir.\n#\n# Note that not all possible configuration values are present in this\n# autogenerated file.\n#\n# All configuration values have a default; values that are commented out\n# serve to show the default.\n\nimport sys, os\nimport datetime\n\n# If extensions (or modules to document with autodoc) are in another directory,\n# add these directories to sys.path here. If the directory is relative to the\n# documentation root, use os.path.abspath to make it absolute, like shown here.\nsys.path.insert(0, os.path.abspath('../..'))\n\n# Add in-tree extensions to path\nsys.path.insert(0, os.path.abspath('../sphinxext'))\n\nos.environ[\"SPHINX_BUILD\"] = \"1\"\n\n# -- General configuration -----------------------------------------------------\n\n# If your documentation needs a minimal Sphinx version, state it here.\n#needs_sphinx = '1.0'\n\n# Add any Sphinx extension module names here, as strings. They can be extensions\n# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.\nextensions = [\n 'sphinx.ext.autodoc', \n 'sphinx.ext.doctest', \n 'sphinx.ext.todo', \n 'sphinx.ext.coverage', \n 'sphinx.ext.imgmath', \n 'sphinx.ext.viewcode',\n 'sphinx.ext.napoleon',\n 'sphinx.ext.intersphinx',\n 'cairosvgconverter',\n 'sphinxcontrib_trio',\n ]\n\nintersphinx_mapping = {'https://docs.python.org/3': None}\n\n# Add any paths that contain templates here, relative to this directory.\ntemplates_path = ['_templates']\n\n# The suffix of source filenames.\nsource_suffix = '.rst'\n\n# The encoding of source files.\n#source_encoding = 'utf-8-sig'\n\n# The master toctree document.\nmaster_doc = 'index'\n\n# General information about the project.\nproject = u'cocotb'\ncopyright = u'2014-{0}, PotentialVentures'.format(datetime.datetime.now().year)\n\n# The version info for the project you're documenting, acts as replacement for\n# |version| and |release|, also used in various other places throughout the\n# built documents.\n#\n# The short X.Y version.\nversion = '1.1'\n# The full version, including alpha/beta/rc tags.\nrelease = '1.1'\n\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n#language = None\n\n# There are two options for replacing |today|: either, you set today to some\n# non-false value, then it is used:\n#today = ''\n# Else, today_fmt is used as the format for a strftime call.\n#today_fmt = '%B %d, %Y'\n\n# List of patterns, relative to source directory, that match files and\n# directories to ignore when looking for source files.\nexclude_patterns = []\n\n# The reST default role (used for this markup: `text`) to use for all documents.\n#default_role = None\n\n# If true, '()' will be appended to :func: etc. cross-reference text.\n#add_function_parentheses = True\n\n# If true, the current module name will be prepended to all description\n# unit titles (such as .. function::).\n#add_module_names = True\n\n# If true, sectionauthor and moduleauthor directives will be shown in the\n# output. They are ignored by default.\n#show_authors = False\n\n# The name of the Pygments (syntax highlighting) style to use.\npygments_style = 'sphinx'\n\n# A list of ignored prefixes for module index sorting.\n#modindex_common_prefix = []\n\n# If true, keep warnings as \"system message\" paragraphs in the built documents.\n#keep_warnings = False\n\n\n# -- Options for HTML output ---------------------------------------------------\n\n# The theme to use for HTML and HTML Help pages. See the documentation for\n# a list of builtin themes.\nhtml_theme = 'default'\n\n# Theme options are theme-specific and customize the look and feel of a theme\n# further. For a list of options available for each theme, see the\n# documentation.\n#html_theme_options = {}\n\n# Add any paths that contain custom themes here, relative to this directory.\n#html_theme_path = []\n\n# The name for this set of Sphinx documents. If None, it defaults to\n# \"<project> v<release> documentation\".\n#html_title = None\n\n# A shorter title for the navigation bar. Default is the same as html_title.\n#html_short_title = None\n\n# The name of an image file (relative to this directory) to place at the top\n# of the sidebar.\n#html_logo = None\n\n# The name of an image file (within the static path) to use as favicon of the\n# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32\n# pixels large.\n#html_favicon = None\n\n# Add any paths that contain custom static files (such as style sheets) here,\n# relative to this directory. They are copied after the builtin static files,\n# so a file named \"default.css\" will overwrite the builtin \"default.css\".\nhtml_static_path = ['_static']\n\n# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,\n# using the given strftime format.\n#html_last_updated_fmt = '%b %d, %Y'\n\n# If true, SmartyPants will be used to convert quotes and dashes to\n# typographically correct entities.\n#html_use_smartypants = True\n\n# Custom sidebar templates, maps document names to template names.\n#html_sidebars = {}\n\n# Additional templates that should be rendered to pages, maps page names to\n# template names.\n#html_additional_pages = {}\n\n# If false, no module index is generated.\n#html_domain_indices = True\n\n# If false, no index is generated.\n#html_use_index = True\n\n# If true, the index is split into individual pages for each letter.\n#html_split_index = False\n\n# If true, links to the reST sources are added to the pages.\n#html_show_sourcelink = True\n\n# If true, \"Created using Sphinx\" is shown in the HTML footer. Default is True.\n#html_show_sphinx = True\n\n# If true, \"(C) Copyright ...\" is shown in the HTML footer. Default is True.\n#html_show_copyright = True\n\n# If true, an OpenSearch description file will be output, and all pages will\n# contain a <link> tag referring to it. The value of this option must be the\n# base URL from which the finished HTML is served.\n#html_use_opensearch = ''\n\n# This is the file name suffix for HTML files (e.g. \".xhtml\").\n#html_file_suffix = None\n\n# Output file base name for HTML help builder.\nhtmlhelp_basename = 'cocotbdoc'\n\n\n# -- Options for LaTeX output --------------------------------------------------\n\nlatex_elements = {\n# The paper size ('letterpaper' or 'a4paper').\n#'papersize': 'letterpaper',\n\n# The font size ('10pt', '11pt' or '12pt').\n#'pointsize': '10pt',\n\n# Additional stuff for the LaTeX preamble.\n#'preamble': '',\n}\n\n# Grouping the document tree into LaTeX files. List of tuples\n# (source start file, target name, title, author, documentclass [howto/manual]).\nlatex_documents = [\n ('index', 'cocotb.tex', u'cocotb Documentation',\n u'PotentialVentures', 'manual'),\n]\n\n# The name of an image file (relative to this directory) to place at the top of\n# the title page.\n#latex_logo = None\n\n# For \"manual\" documents, if this is true, then toplevel headings are parts,\n# not chapters.\n#latex_use_parts = False\n\n# If true, show page references after internal links.\n#latex_show_pagerefs = False\n\n# If true, show URL addresses after external links.\n#latex_show_urls = False\n\n# Documents to append as an appendix to all manuals.\n#latex_appendices = []\n\n# If false, no module index is generated.\n#latex_domain_indices = True\n\n\n# -- Options for manual page output --------------------------------------------\n\n# One entry per manual page. List of tuples\n# (source start file, name, description, authors, manual section).\nman_pages = [\n ('index', 'cocotb', u'cocotb Documentation',\n [u'PotentialVentures'], 1)\n]\n\n# If true, show URL addresses after external links.\n#man_show_urls = False\n\n\n# -- Options for Texinfo output ------------------------------------------------\n\n# Grouping the document tree into Texinfo files. List of tuples\n# (source start file, target name, title, author,\n# dir menu entry, description, category)\ntexinfo_documents = [\n ('index', 'cocotb', u'cocotb Documentation',\n u'PotentialVentures', 'cocotb', 'Coroutine Cosimulation TestBench \\\n environment for efficient verification of RTL using Python.',\n 'Miscellaneous'),\n]\n\n# Documents to append as an appendix to all manuals.\n#texinfo_appendices = []\n\n# If false, no module index is generated.\n#texinfo_domain_indices = True\n\n# How to display URL addresses: 'footnote', 'no', or 'inline'.\n#texinfo_show_urls = 'footnote'\n\n# If true, do not generate a @detailmenu in the \"Top\" node's menu.\n#texinfo_no_detailmenu = False\n\n# For now show the todoy \ntodo_include_todos = True\n", "path": "documentation/source/conf.py" } ]
diff --git a/documentation/requirements.txt b/documentation/requirements.txt index 8208293ef9..26374d457e 100644 --- a/documentation/requirements.txt +++ b/documentation/requirements.txt @@ -2,3 +2,4 @@ Sphinx>=1.6 sphinx-rtd-theme cairosvg +sphinxcontrib-trio diff --git a/documentation/source/conf.py b/documentation/source/conf.py index cf81a560ee..703248d7d2 100644 --- a/documentation/source/conf.py +++ b/documentation/source/conf.py @@ -41,6 +41,7 @@ 'sphinx.ext.napoleon', 'sphinx.ext.intersphinx', 'cairosvgconverter', + 'sphinxcontrib_trio', ] intersphinx_mapping = {'https://docs.python.org/3': None}
google__jax-1807
[ { "content": "#!/usr/bin/python\n#\n# Copyright 2018 Google LLC\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# https://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n#\n# Helper script for building JAX's libjax easily.\n\nfrom __future__ import absolute_import\nfrom __future__ import division\nfrom __future__ import print_function\n\nimport argparse\nimport collections\nimport hashlib\nimport os\nimport platform\nimport re\nimport shutil\nimport stat\nimport subprocess\nimport sys\nimport urllib\n\n# pylint: disable=g-import-not-at-top\nif hasattr(urllib, \"urlretrieve\"):\n urlretrieve = urllib.urlretrieve\nelse:\n import urllib.request\n urlretrieve = urllib.request.urlretrieve\n\nif hasattr(shutil, \"which\"):\n which = shutil.which\nelse:\n from distutils.spawn import find_executable as which\n# pylint: enable=g-import-not-at-top\n\n\ndef shell(cmd):\n output = subprocess.check_output(cmd)\n return output.decode(\"UTF-8\").strip()\n\n\n# Python\n\ndef get_python_bin_path(python_bin_path_flag):\n \"\"\"Returns the path to the Python interpreter to use.\"\"\"\n return python_bin_path_flag or sys.executable\n\n\n# Bazel\n\nBAZEL_BASE_URI = \"https://github.com/bazelbuild/bazel/releases/download/0.29.1/\"\nBazelPackage = collections.namedtuple(\"BazelPackage\", [\"file\", \"sha256\"])\nbazel_packages = {\n \"Linux\":\n BazelPackage(\n file=\"bazel-0.29.1-linux-x86_64\",\n sha256=\n \"da3031d811f42f6208d24a87984b5b07e1c75afede184cad86eb02bef6c3b9b0\"),\n \"Darwin\":\n BazelPackage(\n file=\"bazel-0.29.1-darwin-x86_64\",\n sha256=\n \"34daae4caafbdb0952415ed6f97f47f03df84df9af146e9eb910ba65c073efdd\"),\n}\n\n\ndef download_and_verify_bazel():\n \"\"\"Downloads a bazel binary from Github, verifying its SHA256 hash.\"\"\"\n package = bazel_packages.get(platform.system())\n if package is None:\n return None\n\n if not os.access(package.file, os.X_OK):\n uri = BAZEL_BASE_URI + package.file\n sys.stdout.write(\"Downloading bazel from: {}\\n\".format(uri))\n\n def progress(block_count, block_size, total_size):\n if total_size <= 0:\n total_size = 170**6\n progress = (block_count * block_size) / total_size\n num_chars = 40\n progress_chars = int(num_chars * progress)\n sys.stdout.write(\"{} [{}{}] {}%\\r\".format(\n package.file, \"#\" * progress_chars,\n \".\" * (num_chars - progress_chars), int(progress * 100.0)))\n\n tmp_path, _ = urlretrieve(uri, None, progress)\n sys.stdout.write(\"\\n\")\n\n # Verify that the downloaded Bazel binary has the expected SHA256.\n downloaded_file = open(tmp_path, \"rb\")\n contents = downloaded_file.read()\n downloaded_file.close()\n digest = hashlib.sha256(contents).hexdigest()\n if digest != package.sha256:\n print(\n \"Checksum mismatch for downloaded bazel binary (expected {}; got {}).\"\n .format(package.sha256, digest))\n sys.exit(-1)\n\n # Write the file as the bazel file name.\n out_file = open(package.file, \"wb\")\n out_file.write(contents)\n out_file.close()\n\n # Mark the file as executable.\n st = os.stat(package.file)\n os.chmod(package.file,\n st.st_mode | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)\n\n return \"./\" + package.file\n\n\ndef get_bazel_path(bazel_path_flag):\n \"\"\"Returns the path to a Bazel binary, downloading Bazel if not found.\"\"\"\n if bazel_path_flag:\n return bazel_path_flag\n\n bazel = which(\"bazel\")\n if bazel:\n return bazel\n\n bazel = download_and_verify_bazel()\n if bazel:\n return bazel\n\n print(\"Cannot find or download bazel. Please install bazel.\")\n sys.exit(-1)\n\n\ndef check_bazel_version(bazel_path, min_version, max_version):\n \"\"\"Checks Bazel's version is in the range [`min_version`, `max_version`).\"\"\"\n version_output = shell([bazel_path, \"--bazelrc=/dev/null\", \"version\"])\n match = re.search(\"Build label: *([0-9\\\\.]+)[^0-9\\\\.]\", version_output)\n if match is None:\n print(\"Warning: bazel installation is not a release version. Make sure \"\n \"bazel is at least {}\".format(min_version))\n return\n version = match.group(1)\n min_ints = [int(x) for x in min_version.split(\".\")]\n actual_ints = [int(x) for x in match.group(1).split(\".\")]\n if min_ints > actual_ints:\n print(\"Outdated bazel revision (>= {} required, found {})\".format(\n min_version, version))\n sys.exit(0)\n if max_version is not None:\n max_ints = [int(x) for x in max_version.split(\".\")]\n if actual_ints >= max_ints:\n print(\"Please downgrade your bazel revision to build JAX (>= {} and < {}\"\n \" required, found {})\".format(min_version, max_version, version))\n sys.exit(0)\n\n\nBAZELRC_TEMPLATE = \"\"\"\nbuild --repo_env PYTHON_BIN_PATH=\"{python_bin_path}\"\nbuild --python_path=\"{python_bin_path}\"\nbuild --repo_env TF_NEED_CUDA=\"{tf_need_cuda}\"\nbuild --distinct_host_configuration=false\nbuild --copt=-Wno-sign-compare\nbuild -c opt\nbuild:opt --copt=-march=native\nbuild:opt --host_copt=-march=native\nbuild:mkl_open_source_only --define=tensorflow_mkldnn_contraction_kernel=1\n\n# Sets the default Apple platform to macOS.\nbuild --apple_platform_type=macos\n\n# Make Bazel print out all options from rc files.\nbuild --announce_rc\n\n# Disable enabled-by-default TensorFlow features that we don't care about.\nbuild --define=no_aws_support=true\nbuild --define=no_gcp_support=true\nbuild --define=no_hdfs_support=true\nbuild --define=no_kafka_support=true\nbuild --define=no_ignite_support=true\nbuild --define=grpc_no_ares=true\n\nbuild:cuda --crosstool_top=@local_config_cuda//crosstool:toolchain\nbuild:cuda --define=using_cuda=true --define=using_cuda_nvcc=true\n\nbuild --spawn_strategy=standalone\nbuild --strategy=Genrule=standalone\n\nbuild --cxxopt=-std=c++14\nbuild --host_cxxopt=-std=c++14\n\"\"\"\n\n\n\ndef write_bazelrc(cuda_toolkit_path=None, cudnn_install_path=None, **kwargs):\n f = open(\"../.bazelrc\", \"w\")\n f.write(BAZELRC_TEMPLATE.format(**kwargs))\n if cuda_toolkit_path:\n f.write(\"build --action_env CUDA_TOOLKIT_PATH=\\\"{cuda_toolkit_path}\\\"\\n\"\n .format(cuda_toolkit_path=cuda_toolkit_path))\n if cudnn_install_path:\n f.write(\"build --action_env CUDNN_INSTALL_PATH=\\\"{cudnn_install_path}\\\"\\n\"\n .format(cudnn_install_path=cudnn_install_path))\n f.close()\n\n\nBANNER = r\"\"\"\n _ _ __ __\n | | / \\ \\ \\/ /\n _ | |/ _ \\ \\ /\n| |_| / ___ \\/ \\\n \\___/_/ \\/_/\\_\\\n\n\"\"\"\n\nEPILOG = \"\"\"\n\nFrom the 'build' directory in the JAX repository, run\n python build.py\nor\n python3 build.py\nto download and build JAX's XLA (jaxlib) dependency.\n\"\"\"\n\n\ndef _parse_string_as_bool(s):\n \"\"\"Parses a string as a boolean argument.\"\"\"\n lower = s.lower()\n if lower == \"true\":\n return True\n elif lower == \"false\":\n return False\n else:\n raise ValueError(\"Expected either 'true' or 'false'; got {}\".format(s))\n\n\ndef add_boolean_argument(parser, name, default=False, help_str=None):\n \"\"\"Creates a boolean flag.\"\"\"\n group = parser.add_mutually_exclusive_group()\n group.add_argument(\n \"--\" + name,\n nargs=\"?\",\n default=default,\n const=True,\n type=_parse_string_as_bool,\n help=help_str)\n group.add_argument(\"--no\" + name, dest=name, action=\"store_false\")\n\n\ndef main():\n parser = argparse.ArgumentParser(\n description=\"Builds libjax from source.\", epilog=EPILOG)\n parser.add_argument(\n \"--bazel_path\",\n help=\"Path to the Bazel binary to use. The default is to find bazel via \"\n \"the PATH; if none is found, downloads a fresh copy of bazel from \"\n \"GitHub.\")\n parser.add_argument(\n \"--python_bin_path\",\n help=\"Path to Python binary to use. The default is the Python \"\n \"interpreter used to run the build script.\")\n add_boolean_argument(\n parser,\n \"enable_march_native\",\n default=False,\n help_str=\"Generate code targeted to the current machine? This may \"\n \"increase performance, but may generate code that does not run on \"\n \"older machines.\")\n add_boolean_argument(\n parser,\n \"enable_mkl_dnn\",\n default=True,\n help_str=\"Should we build with MKL-DNN enabled?\")\n add_boolean_argument(\n parser,\n \"enable_cuda\",\n help_str=\"Should we build with CUDA enabled? Requires CUDA and CuDNN.\")\n parser.add_argument(\n \"--cuda_path\",\n default=None,\n help=\"Path to the CUDA toolkit.\")\n parser.add_argument(\n \"--cudnn_path\",\n default=None,\n help=\"Path to CUDNN libraries.\")\n parser.add_argument(\n \"--bazel_startup_options\",\n action=\"append\", default=[],\n help=\"Additional startup options to pass to bazel.\")\n parser.add_argument(\n \"--bazel_options\",\n action=\"append\", default=[],\n help=\"Additional options to pass to bazel.\")\n args = parser.parse_args()\n\n print(BANNER)\n os.chdir(os.path.dirname(__file__ or args.prog) or '.')\n\n # Find a working Bazel.\n bazel_path = get_bazel_path(args.bazel_path)\n check_bazel_version(bazel_path, min_version=\"0.24.0\", max_version=None)\n print(\"Bazel binary path: {}\".format(bazel_path))\n\n python_bin_path = get_python_bin_path(args.python_bin_path)\n print(\"Python binary path: {}\".format(python_bin_path))\n\n print(\"MKL-DNN enabled: {}\".format(\"yes\" if args.enable_mkl_dnn else \"no\"))\n print(\"-march=native: {}\".format(\"yes\" if args.enable_march_native else \"no\"))\n\n cuda_toolkit_path = args.cuda_path\n cudnn_install_path = args.cudnn_path\n print(\"CUDA enabled: {}\".format(\"yes\" if args.enable_cuda else \"no\"))\n if args.enable_cuda:\n if cuda_toolkit_path:\n print(\"CUDA toolkit path: {}\".format(cuda_toolkit_path))\n if cudnn_install_path:\n print(\"CUDNN library path: {}\".format(cudnn_install_path))\n write_bazelrc(\n python_bin_path=python_bin_path,\n tf_need_cuda=1 if args.enable_cuda else 0,\n cuda_toolkit_path=cuda_toolkit_path,\n cudnn_install_path=cudnn_install_path)\n\n print(\"\\nBuilding XLA and installing it in the jaxlib source tree...\")\n config_args = args.bazel_options\n if args.enable_march_native:\n config_args += [\"--config=opt\"]\n if args.enable_mkl_dnn:\n config_args += [\"--config=mkl_open_source_only\"]\n if args.enable_cuda:\n config_args += [\"--config=cuda\"]\n config_args += [\"--define=xla_python_enable_gpu=true\"]\n command = ([bazel_path] + args.bazel_startup_options +\n [\"run\", \"--verbose_failures=true\"] + config_args +\n [\":install_xla_in_source_tree\", os.getcwd()])\n print(\" \".join(command))\n shell(command)\n shell([bazel_path, \"shutdown\"])\n\n\nif __name__ == \"__main__\":\n main()\n", "path": "build/build.py" } ]
[ { "content": "#!/usr/bin/python\n#\n# Copyright 2018 Google LLC\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# https://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n#\n# Helper script for building JAX's libjax easily.\n\nfrom __future__ import absolute_import\nfrom __future__ import division\nfrom __future__ import print_function\n\nimport argparse\nimport collections\nimport hashlib\nimport os\nimport platform\nimport re\nimport shutil\nimport stat\nimport subprocess\nimport sys\nimport urllib\n\n# pylint: disable=g-import-not-at-top\nif hasattr(urllib, \"urlretrieve\"):\n urlretrieve = urllib.urlretrieve\nelse:\n import urllib.request\n urlretrieve = urllib.request.urlretrieve\n\nif hasattr(shutil, \"which\"):\n which = shutil.which\nelse:\n from distutils.spawn import find_executable as which\n# pylint: enable=g-import-not-at-top\n\n\ndef shell(cmd):\n output = subprocess.check_output(cmd)\n return output.decode(\"UTF-8\").strip()\n\n\n# Python\n\ndef get_python_bin_path(python_bin_path_flag):\n \"\"\"Returns the path to the Python interpreter to use.\"\"\"\n return python_bin_path_flag or sys.executable\n\n\n# Bazel\n\nBAZEL_BASE_URI = \"https://github.com/bazelbuild/bazel/releases/download/0.29.1/\"\nBazelPackage = collections.namedtuple(\"BazelPackage\", [\"file\", \"sha256\"])\nbazel_packages = {\n \"Linux\":\n BazelPackage(\n file=\"bazel-0.29.1-linux-x86_64\",\n sha256=\n \"da3031d811f42f6208d24a87984b5b07e1c75afede184cad86eb02bef6c3b9b0\"),\n \"Darwin\":\n BazelPackage(\n file=\"bazel-0.29.1-darwin-x86_64\",\n sha256=\n \"34daae4caafbdb0952415ed6f97f47f03df84df9af146e9eb910ba65c073efdd\"),\n}\n\n\ndef download_and_verify_bazel():\n \"\"\"Downloads a bazel binary from Github, verifying its SHA256 hash.\"\"\"\n package = bazel_packages.get(platform.system())\n if package is None:\n return None\n\n if not os.access(package.file, os.X_OK):\n uri = BAZEL_BASE_URI + package.file\n sys.stdout.write(\"Downloading bazel from: {}\\n\".format(uri))\n\n def progress(block_count, block_size, total_size):\n if total_size <= 0:\n total_size = 170**6\n progress = (block_count * block_size) / total_size\n num_chars = 40\n progress_chars = int(num_chars * progress)\n sys.stdout.write(\"{} [{}{}] {}%\\r\".format(\n package.file, \"#\" * progress_chars,\n \".\" * (num_chars - progress_chars), int(progress * 100.0)))\n\n tmp_path, _ = urlretrieve(uri, None, progress)\n sys.stdout.write(\"\\n\")\n\n # Verify that the downloaded Bazel binary has the expected SHA256.\n downloaded_file = open(tmp_path, \"rb\")\n contents = downloaded_file.read()\n downloaded_file.close()\n digest = hashlib.sha256(contents).hexdigest()\n if digest != package.sha256:\n print(\n \"Checksum mismatch for downloaded bazel binary (expected {}; got {}).\"\n .format(package.sha256, digest))\n sys.exit(-1)\n\n # Write the file as the bazel file name.\n out_file = open(package.file, \"wb\")\n out_file.write(contents)\n out_file.close()\n\n # Mark the file as executable.\n st = os.stat(package.file)\n os.chmod(package.file,\n st.st_mode | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)\n\n return \"./\" + package.file\n\n\ndef get_bazel_path(bazel_path_flag):\n \"\"\"Returns the path to a Bazel binary, downloading Bazel if not found.\"\"\"\n if bazel_path_flag:\n return bazel_path_flag\n\n bazel = which(\"bazel\")\n if bazel:\n return bazel\n\n bazel = download_and_verify_bazel()\n if bazel:\n return bazel\n\n print(\"Cannot find or download bazel. Please install bazel.\")\n sys.exit(-1)\n\n\ndef check_bazel_version(bazel_path, min_version, max_version):\n \"\"\"Checks Bazel's version is in the range [`min_version`, `max_version`).\"\"\"\n version_output = shell([bazel_path, \"--bazelrc=/dev/null\", \"version\"])\n match = re.search(\"Build label: *([0-9\\\\.]+)[^0-9\\\\.]\", version_output)\n if match is None:\n print(\"Warning: bazel installation is not a release version. Make sure \"\n \"bazel is at least {}\".format(min_version))\n return\n version = match.group(1)\n min_ints = [int(x) for x in min_version.split(\".\")]\n actual_ints = [int(x) for x in match.group(1).split(\".\")]\n if min_ints > actual_ints:\n print(\"Outdated bazel revision (>= {} required, found {})\".format(\n min_version, version))\n sys.exit(0)\n if max_version is not None:\n max_ints = [int(x) for x in max_version.split(\".\")]\n if actual_ints >= max_ints:\n print(\"Please downgrade your bazel revision to build JAX (>= {} and < {}\"\n \" required, found {})\".format(min_version, max_version, version))\n sys.exit(0)\n\n\nBAZELRC_TEMPLATE = \"\"\"\nbuild --repo_env PYTHON_BIN_PATH=\"{python_bin_path}\"\nbuild --python_path=\"{python_bin_path}\"\nbuild --repo_env TF_NEED_CUDA=\"{tf_need_cuda}\"\nbuild --distinct_host_configuration=false\nbuild --copt=-Wno-sign-compare\nbuild -c opt\nbuild:opt --copt=-march=native\nbuild:opt --host_copt=-march=native\nbuild:mkl_open_source_only --define=tensorflow_mkldnn_contraction_kernel=1\n\n# Sets the default Apple platform to macOS.\nbuild --apple_platform_type=macos\nbuild --macos_minimum_os=10.9\n\n# Make Bazel print out all options from rc files.\nbuild --announce_rc\n\n# Disable enabled-by-default TensorFlow features that we don't care about.\nbuild --define=no_aws_support=true\nbuild --define=no_gcp_support=true\nbuild --define=no_hdfs_support=true\nbuild --define=no_kafka_support=true\nbuild --define=no_ignite_support=true\nbuild --define=grpc_no_ares=true\n\nbuild:cuda --crosstool_top=@local_config_cuda//crosstool:toolchain\nbuild:cuda --define=using_cuda=true --define=using_cuda_nvcc=true\n\nbuild --spawn_strategy=standalone\nbuild --strategy=Genrule=standalone\n\nbuild --cxxopt=-std=c++14\nbuild --host_cxxopt=-std=c++14\n\"\"\"\n\n\n\ndef write_bazelrc(cuda_toolkit_path=None, cudnn_install_path=None, **kwargs):\n f = open(\"../.bazelrc\", \"w\")\n f.write(BAZELRC_TEMPLATE.format(**kwargs))\n if cuda_toolkit_path:\n f.write(\"build --action_env CUDA_TOOLKIT_PATH=\\\"{cuda_toolkit_path}\\\"\\n\"\n .format(cuda_toolkit_path=cuda_toolkit_path))\n if cudnn_install_path:\n f.write(\"build --action_env CUDNN_INSTALL_PATH=\\\"{cudnn_install_path}\\\"\\n\"\n .format(cudnn_install_path=cudnn_install_path))\n f.close()\n\n\nBANNER = r\"\"\"\n _ _ __ __\n | | / \\ \\ \\/ /\n _ | |/ _ \\ \\ /\n| |_| / ___ \\/ \\\n \\___/_/ \\/_/\\_\\\n\n\"\"\"\n\nEPILOG = \"\"\"\n\nFrom the 'build' directory in the JAX repository, run\n python build.py\nor\n python3 build.py\nto download and build JAX's XLA (jaxlib) dependency.\n\"\"\"\n\n\ndef _parse_string_as_bool(s):\n \"\"\"Parses a string as a boolean argument.\"\"\"\n lower = s.lower()\n if lower == \"true\":\n return True\n elif lower == \"false\":\n return False\n else:\n raise ValueError(\"Expected either 'true' or 'false'; got {}\".format(s))\n\n\ndef add_boolean_argument(parser, name, default=False, help_str=None):\n \"\"\"Creates a boolean flag.\"\"\"\n group = parser.add_mutually_exclusive_group()\n group.add_argument(\n \"--\" + name,\n nargs=\"?\",\n default=default,\n const=True,\n type=_parse_string_as_bool,\n help=help_str)\n group.add_argument(\"--no\" + name, dest=name, action=\"store_false\")\n\n\ndef main():\n parser = argparse.ArgumentParser(\n description=\"Builds libjax from source.\", epilog=EPILOG)\n parser.add_argument(\n \"--bazel_path\",\n help=\"Path to the Bazel binary to use. The default is to find bazel via \"\n \"the PATH; if none is found, downloads a fresh copy of bazel from \"\n \"GitHub.\")\n parser.add_argument(\n \"--python_bin_path\",\n help=\"Path to Python binary to use. The default is the Python \"\n \"interpreter used to run the build script.\")\n add_boolean_argument(\n parser,\n \"enable_march_native\",\n default=False,\n help_str=\"Generate code targeted to the current machine? This may \"\n \"increase performance, but may generate code that does not run on \"\n \"older machines.\")\n add_boolean_argument(\n parser,\n \"enable_mkl_dnn\",\n default=True,\n help_str=\"Should we build with MKL-DNN enabled?\")\n add_boolean_argument(\n parser,\n \"enable_cuda\",\n help_str=\"Should we build with CUDA enabled? Requires CUDA and CuDNN.\")\n parser.add_argument(\n \"--cuda_path\",\n default=None,\n help=\"Path to the CUDA toolkit.\")\n parser.add_argument(\n \"--cudnn_path\",\n default=None,\n help=\"Path to CUDNN libraries.\")\n parser.add_argument(\n \"--bazel_startup_options\",\n action=\"append\", default=[],\n help=\"Additional startup options to pass to bazel.\")\n parser.add_argument(\n \"--bazel_options\",\n action=\"append\", default=[],\n help=\"Additional options to pass to bazel.\")\n args = parser.parse_args()\n\n print(BANNER)\n os.chdir(os.path.dirname(__file__ or args.prog) or '.')\n\n # Find a working Bazel.\n bazel_path = get_bazel_path(args.bazel_path)\n check_bazel_version(bazel_path, min_version=\"0.24.0\", max_version=None)\n print(\"Bazel binary path: {}\".format(bazel_path))\n\n python_bin_path = get_python_bin_path(args.python_bin_path)\n print(\"Python binary path: {}\".format(python_bin_path))\n\n print(\"MKL-DNN enabled: {}\".format(\"yes\" if args.enable_mkl_dnn else \"no\"))\n print(\"-march=native: {}\".format(\"yes\" if args.enable_march_native else \"no\"))\n\n cuda_toolkit_path = args.cuda_path\n cudnn_install_path = args.cudnn_path\n print(\"CUDA enabled: {}\".format(\"yes\" if args.enable_cuda else \"no\"))\n if args.enable_cuda:\n if cuda_toolkit_path:\n print(\"CUDA toolkit path: {}\".format(cuda_toolkit_path))\n if cudnn_install_path:\n print(\"CUDNN library path: {}\".format(cudnn_install_path))\n write_bazelrc(\n python_bin_path=python_bin_path,\n tf_need_cuda=1 if args.enable_cuda else 0,\n cuda_toolkit_path=cuda_toolkit_path,\n cudnn_install_path=cudnn_install_path)\n\n print(\"\\nBuilding XLA and installing it in the jaxlib source tree...\")\n config_args = args.bazel_options\n if args.enable_march_native:\n config_args += [\"--config=opt\"]\n if args.enable_mkl_dnn:\n config_args += [\"--config=mkl_open_source_only\"]\n if args.enable_cuda:\n config_args += [\"--config=cuda\"]\n config_args += [\"--define=xla_python_enable_gpu=true\"]\n command = ([bazel_path] + args.bazel_startup_options +\n [\"run\", \"--verbose_failures=true\"] + config_args +\n [\":install_xla_in_source_tree\", os.getcwd()])\n print(\" \".join(command))\n shell(command)\n shell([bazel_path, \"shutdown\"])\n\n\nif __name__ == \"__main__\":\n main()\n", "path": "build/build.py" } ]
diff --git a/build/build.py b/build/build.py index 414135a6a825..64965ee21b47 100755 --- a/build/build.py +++ b/build/build.py @@ -176,6 +176,7 @@ def check_bazel_version(bazel_path, min_version, max_version): # Sets the default Apple platform to macOS. build --apple_platform_type=macos +build --macos_minimum_os=10.9 # Make Bazel print out all options from rc files. build --announce_rc
cltk__cltk-575
[ { "content": "\"\"\"Config for PyPI.\"\"\"\n\nfrom setuptools import find_packages\nfrom setuptools import setup\n\n\nsetup(\n author='Kyle P. Johnson',\n author_email='kyle@kyle-p-johnson.com',\n classifiers=[\n 'Intended Audience :: Education',\n 'Intended Audience :: Science/Research',\n 'License :: OSI Approved :: MIT License',\n 'Natural Language :: Chinese (Traditional)',\n 'Natural Language :: English',\n 'Natural Language :: Greek',\n 'Natural Language :: Latin',\n 'Operating System :: POSIX',\n 'Programming Language :: Python :: 3.6',\n 'Topic :: Scientific/Engineering :: Artificial Intelligence',\n 'Topic :: Text Processing',\n 'Topic :: Text Processing :: General',\n 'Topic :: Text Processing :: Linguistic',\n ],\n description='NLP for the ancient world',\n install_requires=['gitpython',\n 'nltk',\n 'python-crfsuite',\n 'pyuca',\n 'pyyaml',\n 'regex',\n 'whoosh'],\n keywords=['nlp', 'nltk', 'greek', 'latin', 'chinese', 'sanskrit', 'pali', 'tibetan'],\n license='MIT',\n long_description='The Classical Language Toolkit (CLTK) is a framework for natural language processing for Classical languages.', # pylint: disable=C0301,\n name='cltk',\n packages=find_packages(),\n url='https://github.com/cltk/cltk',\n version='0.1.63',\n zip_safe=True,\n test_suite='cltk.tests.test_cltk',\n)\n", "path": "setup.py" } ]
[ { "content": "\"\"\"Config for PyPI.\"\"\"\n\nfrom setuptools import find_packages\nfrom setuptools import setup\n\n\nsetup(\n author='Kyle P. Johnson',\n author_email='kyle@kyle-p-johnson.com',\n classifiers=[\n 'Intended Audience :: Education',\n 'Intended Audience :: Science/Research',\n 'License :: OSI Approved :: MIT License',\n 'Natural Language :: Chinese (Traditional)',\n 'Natural Language :: English',\n 'Natural Language :: Greek',\n 'Natural Language :: Latin',\n 'Operating System :: POSIX',\n 'Programming Language :: Python :: 3.6',\n 'Topic :: Scientific/Engineering :: Artificial Intelligence',\n 'Topic :: Text Processing',\n 'Topic :: Text Processing :: General',\n 'Topic :: Text Processing :: Linguistic',\n ],\n description='NLP for the ancient world',\n install_requires=['gitpython',\n 'nltk',\n 'python-crfsuite',\n 'pyuca',\n 'pyyaml',\n 'regex',\n 'whoosh'],\n keywords=['nlp', 'nltk', 'greek', 'latin', 'chinese', 'sanskrit', 'pali', 'tibetan'],\n license='MIT',\n long_description='The Classical Language Toolkit (CLTK) is a framework for natural language processing for Classical languages.', # pylint: disable=C0301,\n name='cltk',\n packages=find_packages(),\n url='https://github.com/cltk/cltk',\n version='0.1.64',\n zip_safe=True,\n test_suite='cltk.tests.test_cltk',\n)\n", "path": "setup.py" } ]
diff --git a/docs/french.rst b/docs/french.rst index 00d02f29f..27d84b0dc 100644 --- a/docs/french.rst +++ b/docs/french.rst @@ -11,9 +11,9 @@ The lemmatizer takes as its input a list of tokens, previously tokenized and mad .. It first seeks a match between each token and a list of potential lemmas taken from Godefroy (1901)’s Lexique, the Tobler-Lommatszch, and the DECT. If a match is not found, the lemmatizer then seeks a match between the forms different lemmas have been known to take and the token (this at present only applies to lemmas from A-D and W-Z). If no match is returned at this stage, a set of rules is applied to the token. These rules are similar to those applied by the stemmer but aim to bring forms in line with lemmas rather than truncating them. Finally, if no match is found between the modified token and the list of lemmas, a result of ‘None’ is returned. .. References: -..- Godefroy. 1901. Lexique de l'Ancien Français. Paris & Leipzig : Welter. -..- Tobler, Adolf and Erhard Lommatzsch. 1915. Altfranzösisches Wörterbuch. Adolf Toblers nachgelassene Materialen, bearbeitet und herausgegeben von Erhard Lommatzsch, wietergeführt von Hans Helmut Christmann. Stuttgart: Franz Steiner Verlag. -..- DÉCT : Dictionnaire Électronique de Chrétien de Troyes, http://www.atilf.fr/dect, LFA/Université d'Ottawa - ATILF/CNRS & Université de Lorraine. 2014. +.. Godefroy. 1901. Lexique de l'Ancien Français. Paris & Leipzig : Welter. +.. Tobler, Adolf and Erhard Lommatzsch. 1915. Altfranzösisches Wörterbuch. Adolf Toblers nachgelassene Materialen, bearbeitet und herausgegeben von Erhard Lommatzsch, wietergeführt von Hans Helmut Christmann. Stuttgart: Franz Steiner Verlag. +.. DÉCT : Dictionnaire Électronique de Chrétien de Troyes, http://www.atilf.fr/dect, LFA/Université d'Ottawa - ATILF/CNRS & Université de Lorraine. 2014. .. code-block:: python @@ -49,7 +49,7 @@ The line tokenizer takes a string as its input and returns a list of strings. In [3]: untokenized_text = """Ki de bone matire traite,\nmult li peise, se bien n’est faite.\nOëz, seignur, que dit Marie,\nki en sun tens pas ne s’oblie.""" In [4]: tokenizer.tokenize(untokenized_text) - Out[4]: ['Ki de bone matire traite,', 'mult li peise, se bien n’est faite.','Oëz, seignur, que dit Marie,', 'ki en sun tens pas ne s’oblie. '] + Out [4]: ['Ki de bone matire traite,', 'mult li peise, se bien n’est faite.','Oëz, seignur, que dit Marie,', 'ki en sun tens pas ne s’oblie. '] NAMED ENTITY RECOGNITION @@ -79,7 +79,7 @@ Categories are modeled on those found in (`Moisan, 1986 <https://books.google.fr In [3]: ner_replacer = NamedEntityReplacer() In [4]: ner_replacer.tag_ner_fr(text_str) - Out[4]: [[('Berte', 'entity', 'CHI')], ('fu',), ('mere',), [('Charlemaine', 'entity', 'CHI')], (',',), ('qui',), ('pukis',), ('tint',), [('France', 'entity', 'LOC')], ('et',), ('tot',), ('le',), [('Maine', 'entity', 'LOC')], ('.',)] + Out [4]: [[('Berte', 'entity', 'CHI')], ('fu',), ('mere',), [('Charlemaine', 'entity', 'CHI')], (',',), ('qui',), ('pukis',), ('tint',), [('France', 'entity', 'LOC')], ('et',), ('tot',), ('le',), [('Maine', 'entity', 'LOC')], ('.',)] .. Reference: Moisan, A. 1986. Répertoire des noms propres de personnes et de lieux cités dans les Chansons de Geste françaises et les œuvres étrangères dérivées. Publications romanes et françaises CLXXIII. Geneva: Droz. @@ -137,7 +137,9 @@ The stopword filterer removes the function words from a string of OF or MF text. In [6]: tokens = tokenizer.tokenize(text) In [7]: no_stops = [w for w in tokens if w not in FRENCH_STOPS] - Out [7]: ['pensé', 'talant', 'yonec', 'die', 'avant', 'dunt', 'nez', ',', 'pere', 'cum', 'primes', 'mere', '.'] + + In [8]: no_stops + Out [8]: ['pensé', 'talant', 'yonec', 'die', 'avant', 'dunt', 'nez', ',', 'pere', 'cum', 'primes', 'mere', '.'] @@ -152,7 +154,7 @@ WORD TOKENIZATION In [3]: text = "S'a table te veulz maintenir, Honnestement te dois tenir Et garder les enseignemens Dont cilz vers sont commancemens." In [4]: word_tokenizer.tokenize(text) - Out[4]: ["S'", 'a', 'table', 'te', 'veulz', 'maintenir', ',', 'Honnestement', 'te', 'dois', 'tenir', 'Et', 'garder', 'les', 'enseignemens', 'Dont', 'cilz', 'vers', 'sont', 'commancemens', '.'] + Out [4]: ["S'", 'a', 'table', 'te', 'veulz', 'maintenir', ',', 'Honnestement', 'te', 'dois', 'tenir', 'Et', 'garder', 'les', 'enseignemens', 'Dont', 'cilz', 'vers', 'sont', 'commancemens', '.'] Apostrophes are considered part of the first word of the two they separate. Apostrophes are also normalized from “’” to “'“. diff --git a/docs/index.rst b/docs/index.rst index e8093079d..35cbc0a60 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -23,6 +23,7 @@ Contents ancient_egyptian old_english middle_english + french greek hebrew hindi diff --git a/setup.py b/setup.py index 3000443fa..c374d6620 100644 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ name='cltk', packages=find_packages(), url='https://github.com/cltk/cltk', - version='0.1.63', + version='0.1.64', zip_safe=True, test_suite='cltk.tests.test_cltk', )
sopel-irc__sopel-949
[ { "content": "# coding=utf-8\n\"\"\"\nwikipedia.py - Sopel Wikipedia Module\nCopyright 2013 Edward Powell - embolalia.net\nLicensed under the Eiffel Forum License 2.\n\nhttp://sopel.chat\n\"\"\"\nfrom __future__ import unicode_literals, absolute_import, print_function, division\nfrom sopel import web, tools\nfrom sopel.config.types import StaticSection, ValidatedAttribute\nfrom sopel.module import NOLIMIT, commands, example, rule\nimport json\nimport re\n\nimport sys\nif sys.version_info.major < 3:\n from urlparse import unquote\nelse:\n from urllib.parse import unquote\n\nREDIRECT = re.compile(r'^REDIRECT (.*)')\n\n\nclass WikipediaSection(StaticSection):\n default_lang = ValidatedAttribute('default_lang', default='en')\n \"\"\"The default language to find articles from.\"\"\"\n lang_per_channel = ValidatedAttribute('lang_per_channel')\n\n\ndef setup(bot):\n bot.config.define_section('wikipedia', WikipediaSection)\n\n regex = re.compile('([a-z]+).(wikipedia.org/wiki/)([^ ]+)')\n if not bot.memory.contains('url_callbacks'):\n bot.memory['url_callbacks'] = tools.SopelMemory()\n bot.memory['url_callbacks'][regex] = mw_info\n\n\ndef configure(config):\n config.define_section('wikipedia', WikipediaSection)\n config.wikipedia.configure_setting(\n 'default_lang',\n \"Enter the default language to find articles from.\"\n )\n\n\ndef mw_search(server, query, num):\n \"\"\"\n Searches the specified MediaWiki server for the given query, and returns\n the specified number of results.\n \"\"\"\n search_url = ('http://%s/w/api.php?format=json&action=query'\n '&list=search&srlimit=%d&srprop=timestamp&srwhat=text'\n '&srsearch=') % (server, num)\n search_url += query\n query = json.loads(web.get(search_url))\n if 'query' in query:\n query = query['query']['search']\n return [r['title'] for r in query]\n else:\n return None\n\n\ndef say_snippet(bot, server, query, show_url=True):\n page_name = query.replace('_', ' ')\n query = query.replace(' ', '_')\n snippet = mw_snippet(server, query)\n msg = '[WIKIPEDIA] {} | \"{}\"'.format(page_name, snippet)\n if show_url:\n msg = msg + ' | https://{}/wiki/{}'.format(server, query)\n bot.say(msg)\n\n\ndef mw_snippet(server, query):\n \"\"\"\n Retrives a snippet of the specified length from the given page on the given\n server.\n \"\"\"\n snippet_url = ('https://' + server + '/w/api.php?format=json'\n '&action=query&prop=extracts&exintro&explaintext'\n '&exchars=300&redirects&titles=')\n snippet_url += query\n snippet = json.loads(web.get(snippet_url))\n snippet = snippet['query']['pages']\n\n # For some reason, the API gives the page *number* as the key, so we just\n # grab the first page number in the results.\n snippet = snippet[list(snippet.keys())[0]]\n\n return snippet['extract']\n\n\n@rule('.*/([a-z]+\\.wikipedia.org)/wiki/([^ ]+).*')\ndef mw_info(bot, trigger, found_match=None):\n \"\"\"\n Retrives a snippet of the specified length from the given page on the given\n server.\n \"\"\"\n match = found_match or trigger\n say_snippet(bot, match.group(1), unquote(match.group(2)), show_url=False)\n\n\n@commands('w', 'wiki', 'wik')\n@example('.w San Francisco')\ndef wikipedia(bot, trigger):\n lang = bot.config.wikipedia.default_lang\n\n #change lang if channel has custom language set\n if (trigger.sender and not trigger.sender.is_nick() and\n bot.config.wikipedia.lang_per_channel):\n customlang = re.search('(' + trigger.sender + '):(\\w+)',\n bot.config.wikipedia.lang_per_channel)\n if customlang is not None:\n lang = customlang.group(2)\n\n if trigger.group(2) is None:\n bot.reply(\"What do you want me to look up?\")\n return NOLIMIT\n\n query = trigger.group(2)\n args = re.search(r'^-([a-z]{2,12})\\s(.*)', query)\n if args is not None:\n lang = args.group(1)\n query = args.group(2)\n\n if not query:\n bot.reply('What do you want me to look up?')\n return NOLIMIT\n server = lang + '.wikipedia.org'\n query = mw_search(server, query, 1)\n if not query:\n bot.reply(\"I can't find any results for that.\")\n return NOLIMIT\n else:\n query = query[0]\n say_snippet(bot, server, query)\n", "path": "sopel/modules/wikipedia.py" } ]
[ { "content": "# coding=utf-8\n\"\"\"\nwikipedia.py - Sopel Wikipedia Module\nCopyright 2013 Edward Powell - embolalia.net\nLicensed under the Eiffel Forum License 2.\n\nhttp://sopel.chat\n\"\"\"\nfrom __future__ import unicode_literals, absolute_import, print_function, division\nfrom sopel import web, tools\nfrom sopel.config.types import StaticSection, ValidatedAttribute\nfrom sopel.module import NOLIMIT, commands, example, rule\nimport json\nimport re\n\nimport sys\nif sys.version_info.major < 3:\n from urlparse import unquote as _unquote\n unquote = lambda s: _unquote(s.encode('utf-8')).decode('utf-8')\nelse:\n from urllib.parse import unquote\n\nREDIRECT = re.compile(r'^REDIRECT (.*)')\n\n\nclass WikipediaSection(StaticSection):\n default_lang = ValidatedAttribute('default_lang', default='en')\n \"\"\"The default language to find articles from.\"\"\"\n lang_per_channel = ValidatedAttribute('lang_per_channel')\n\n\ndef setup(bot):\n bot.config.define_section('wikipedia', WikipediaSection)\n\n regex = re.compile('([a-z]+).(wikipedia.org/wiki/)([^ ]+)')\n if not bot.memory.contains('url_callbacks'):\n bot.memory['url_callbacks'] = tools.SopelMemory()\n bot.memory['url_callbacks'][regex] = mw_info\n\n\ndef configure(config):\n config.define_section('wikipedia', WikipediaSection)\n config.wikipedia.configure_setting(\n 'default_lang',\n \"Enter the default language to find articles from.\"\n )\n\n\ndef mw_search(server, query, num):\n \"\"\"\n Searches the specified MediaWiki server for the given query, and returns\n the specified number of results.\n \"\"\"\n search_url = ('http://%s/w/api.php?format=json&action=query'\n '&list=search&srlimit=%d&srprop=timestamp&srwhat=text'\n '&srsearch=') % (server, num)\n search_url += query\n query = json.loads(web.get(search_url))\n if 'query' in query:\n query = query['query']['search']\n return [r['title'] for r in query]\n else:\n return None\n\n\ndef say_snippet(bot, server, query, show_url=True):\n page_name = query.replace('_', ' ')\n query = query.replace(' ', '_')\n snippet = mw_snippet(server, query)\n msg = '[WIKIPEDIA] {} | \"{}\"'.format(page_name, snippet)\n if show_url:\n msg = msg + ' | https://{}/wiki/{}'.format(server, query)\n bot.say(msg)\n\n\ndef mw_snippet(server, query):\n \"\"\"\n Retrives a snippet of the specified length from the given page on the given\n server.\n \"\"\"\n snippet_url = ('https://' + server + '/w/api.php?format=json'\n '&action=query&prop=extracts&exintro&explaintext'\n '&exchars=300&redirects&titles=')\n snippet_url += query\n snippet = json.loads(web.get(snippet_url))\n snippet = snippet['query']['pages']\n\n # For some reason, the API gives the page *number* as the key, so we just\n # grab the first page number in the results.\n snippet = snippet[list(snippet.keys())[0]]\n\n return snippet['extract']\n\n\n@rule('.*/([a-z]+\\.wikipedia.org)/wiki/([^ ]+).*')\ndef mw_info(bot, trigger, found_match=None):\n \"\"\"\n Retrives a snippet of the specified length from the given page on the given\n server.\n \"\"\"\n match = found_match or trigger\n say_snippet(bot, match.group(1), unquote(match.group(2)), show_url=False)\n\n\n@commands('w', 'wiki', 'wik')\n@example('.w San Francisco')\ndef wikipedia(bot, trigger):\n lang = bot.config.wikipedia.default_lang\n\n #change lang if channel has custom language set\n if (trigger.sender and not trigger.sender.is_nick() and\n bot.config.wikipedia.lang_per_channel):\n customlang = re.search('(' + trigger.sender + '):(\\w+)',\n bot.config.wikipedia.lang_per_channel)\n if customlang is not None:\n lang = customlang.group(2)\n\n if trigger.group(2) is None:\n bot.reply(\"What do you want me to look up?\")\n return NOLIMIT\n\n query = trigger.group(2)\n args = re.search(r'^-([a-z]{2,12})\\s(.*)', query)\n if args is not None:\n lang = args.group(1)\n query = args.group(2)\n\n if not query:\n bot.reply('What do you want me to look up?')\n return NOLIMIT\n server = lang + '.wikipedia.org'\n query = mw_search(server, query, 1)\n if not query:\n bot.reply(\"I can't find any results for that.\")\n return NOLIMIT\n else:\n query = query[0]\n say_snippet(bot, server, query)\n", "path": "sopel/modules/wikipedia.py" } ]
diff --git a/sopel/modules/wikipedia.py b/sopel/modules/wikipedia.py index 064fca79e0..d19e8ac79b 100644 --- a/sopel/modules/wikipedia.py +++ b/sopel/modules/wikipedia.py @@ -15,7 +15,8 @@ import sys if sys.version_info.major < 3: - from urlparse import unquote + from urlparse import unquote as _unquote + unquote = lambda s: _unquote(s.encode('utf-8')).decode('utf-8') else: from urllib.parse import unquote
scrapy__scrapy-5754
[ { "content": "import logging\nimport sys\nimport warnings\nfrom logging.config import dictConfig\n\nfrom twisted.python import log as twisted_log\nfrom twisted.python.failure import Failure\n\nimport scrapy\nfrom scrapy.exceptions import ScrapyDeprecationWarning\nfrom scrapy.settings import Settings\nfrom scrapy.utils.versions import scrapy_components_versions\n\n\nlogger = logging.getLogger(__name__)\n\n\ndef failure_to_exc_info(failure):\n \"\"\"Extract exc_info from Failure instances\"\"\"\n if isinstance(failure, Failure):\n return (failure.type, failure.value, failure.getTracebackObject())\n\n\nclass TopLevelFormatter(logging.Filter):\n \"\"\"Keep only top level loggers's name (direct children from root) from\n records.\n\n This filter will replace Scrapy loggers' names with 'scrapy'. This mimics\n the old Scrapy log behaviour and helps shortening long names.\n\n Since it can't be set for just one logger (it won't propagate for its\n children), it's going to be set in the root handler, with a parametrized\n ``loggers`` list where it should act.\n \"\"\"\n\n def __init__(self, loggers=None):\n self.loggers = loggers or []\n\n def filter(self, record):\n if any(record.name.startswith(logger + '.') for logger in self.loggers):\n record.name = record.name.split('.', 1)[0]\n return True\n\n\nDEFAULT_LOGGING = {\n 'version': 1,\n 'disable_existing_loggers': False,\n 'loggers': {\n 'hpack': {\n 'level': 'ERROR',\n },\n 'scrapy': {\n 'level': 'DEBUG',\n },\n 'twisted': {\n 'level': 'ERROR',\n },\n }\n}\n\n\ndef configure_logging(settings=None, install_root_handler=True):\n \"\"\"\n Initialize logging defaults for Scrapy.\n\n :param settings: settings used to create and configure a handler for the\n root logger (default: None).\n :type settings: dict, :class:`~scrapy.settings.Settings` object or ``None``\n\n :param install_root_handler: whether to install root logging handler\n (default: True)\n :type install_root_handler: bool\n\n This function does:\n\n - Route warnings and twisted logging through Python standard logging\n - Assign DEBUG and ERROR level to Scrapy and Twisted loggers respectively\n - Route stdout to log if LOG_STDOUT setting is True\n\n When ``install_root_handler`` is True (default), this function also\n creates a handler for the root logger according to given settings\n (see :ref:`topics-logging-settings`). You can override default options\n using ``settings`` argument. When ``settings`` is empty or None, defaults\n are used.\n \"\"\"\n if not sys.warnoptions:\n # Route warnings through python logging\n logging.captureWarnings(True)\n\n observer = twisted_log.PythonLoggingObserver('twisted')\n observer.start()\n\n dictConfig(DEFAULT_LOGGING)\n\n if isinstance(settings, dict) or settings is None:\n settings = Settings(settings)\n\n if settings.getbool('LOG_STDOUT'):\n sys.stdout = StreamLogger(logging.getLogger('stdout'))\n\n if install_root_handler:\n install_scrapy_root_handler(settings)\n\n\ndef install_scrapy_root_handler(settings):\n global _scrapy_root_handler\n\n if (_scrapy_root_handler is not None\n and _scrapy_root_handler in logging.root.handlers):\n logging.root.removeHandler(_scrapy_root_handler)\n logging.root.setLevel(logging.NOTSET)\n _scrapy_root_handler = _get_handler(settings)\n logging.root.addHandler(_scrapy_root_handler)\n\n\ndef get_scrapy_root_handler():\n return _scrapy_root_handler\n\n\n_scrapy_root_handler = None\n\n\ndef _get_handler(settings):\n \"\"\" Return a log handler object according to settings \"\"\"\n filename = settings.get('LOG_FILE')\n if filename:\n mode = 'a' if settings.getbool('LOG_FILE_APPEND') else 'w'\n encoding = settings.get('LOG_ENCODING')\n handler = logging.FileHandler(filename, mode=mode, encoding=encoding)\n elif settings.getbool('LOG_ENABLED'):\n handler = logging.StreamHandler()\n else:\n handler = logging.NullHandler()\n\n formatter = logging.Formatter(\n fmt=settings.get('LOG_FORMAT'),\n datefmt=settings.get('LOG_DATEFORMAT')\n )\n handler.setFormatter(formatter)\n handler.setLevel(settings.get('LOG_LEVEL'))\n if settings.getbool('LOG_SHORT_NAMES'):\n handler.addFilter(TopLevelFormatter(['scrapy']))\n return handler\n\n\ndef log_scrapy_info(settings: Settings) -> None:\n logger.info(\"Scrapy %(version)s started (bot: %(bot)s)\",\n {'version': scrapy.__version__, 'bot': settings['BOT_NAME']})\n versions = [\n f\"{name} {version}\"\n for name, version in scrapy_components_versions()\n if name != \"Scrapy\"\n ]\n logger.info(\"Versions: %(versions)s\", {'versions': \", \".join(versions)})\n\n\ndef log_reactor_info() -> None:\n from twisted.internet import reactor\n logger.debug(\"Using reactor: %s.%s\", reactor.__module__, reactor.__class__.__name__)\n from twisted.internet import asyncioreactor\n if isinstance(reactor, asyncioreactor.AsyncioSelectorReactor):\n logger.debug(\n \"Using asyncio event loop: %s.%s\",\n reactor._asyncioEventloop.__module__,\n reactor._asyncioEventloop.__class__.__name__,\n )\n\n\nclass StreamLogger:\n \"\"\"Fake file-like stream object that redirects writes to a logger instance\n\n Taken from:\n https://www.electricmonk.nl/log/2011/08/14/redirect-stdout-and-stderr-to-a-logger-in-python/\n \"\"\"\n def __init__(self, logger, log_level=logging.INFO):\n self.logger = logger\n self.log_level = log_level\n self.linebuf = ''\n\n def write(self, buf):\n for line in buf.rstrip().splitlines():\n self.logger.log(self.log_level, line.rstrip())\n\n def flush(self):\n for h in self.logger.handlers:\n h.flush()\n\n\nclass LogCounterHandler(logging.Handler):\n \"\"\"Record log levels count into a crawler stats\"\"\"\n\n def __init__(self, crawler, *args, **kwargs):\n super().__init__(*args, **kwargs)\n self.crawler = crawler\n\n def emit(self, record):\n sname = f'log_count/{record.levelname}'\n self.crawler.stats.inc_value(sname)\n\n\ndef logformatter_adapter(logkws):\n \"\"\"\n Helper that takes the dictionary output from the methods in LogFormatter\n and adapts it into a tuple of positional arguments for logger.log calls,\n handling backward compatibility as well.\n \"\"\"\n if not {'level', 'msg', 'args'} <= set(logkws):\n warnings.warn('Missing keys in LogFormatter method',\n ScrapyDeprecationWarning)\n\n if 'format' in logkws:\n warnings.warn('`format` key in LogFormatter methods has been '\n 'deprecated, use `msg` instead',\n ScrapyDeprecationWarning)\n\n level = logkws.get('level', logging.INFO)\n message = logkws.get('format', logkws.get('msg'))\n # NOTE: This also handles 'args' being an empty dict, that case doesn't\n # play well in logger.log calls\n args = logkws if not logkws.get('args') else logkws['args']\n\n return (level, message, args)\n", "path": "scrapy/utils/log.py" } ]
[ { "content": "import logging\nimport sys\nimport warnings\nfrom logging.config import dictConfig\n\nfrom twisted.python import log as twisted_log\nfrom twisted.python.failure import Failure\n\nimport scrapy\nfrom scrapy.exceptions import ScrapyDeprecationWarning\nfrom scrapy.settings import Settings\nfrom scrapy.utils.versions import scrapy_components_versions\n\n\nlogger = logging.getLogger(__name__)\n\n\ndef failure_to_exc_info(failure):\n \"\"\"Extract exc_info from Failure instances\"\"\"\n if isinstance(failure, Failure):\n return (failure.type, failure.value, failure.getTracebackObject())\n\n\nclass TopLevelFormatter(logging.Filter):\n \"\"\"Keep only top level loggers's name (direct children from root) from\n records.\n\n This filter will replace Scrapy loggers' names with 'scrapy'. This mimics\n the old Scrapy log behaviour and helps shortening long names.\n\n Since it can't be set for just one logger (it won't propagate for its\n children), it's going to be set in the root handler, with a parametrized\n ``loggers`` list where it should act.\n \"\"\"\n\n def __init__(self, loggers=None):\n self.loggers = loggers or []\n\n def filter(self, record):\n if any(record.name.startswith(logger + '.') for logger in self.loggers):\n record.name = record.name.split('.', 1)[0]\n return True\n\n\nDEFAULT_LOGGING = {\n 'version': 1,\n 'disable_existing_loggers': False,\n 'loggers': {\n 'filelock': {\n 'level': 'ERROR',\n },\n 'hpack': {\n 'level': 'ERROR',\n },\n 'scrapy': {\n 'level': 'DEBUG',\n },\n 'twisted': {\n 'level': 'ERROR',\n },\n }\n}\n\n\ndef configure_logging(settings=None, install_root_handler=True):\n \"\"\"\n Initialize logging defaults for Scrapy.\n\n :param settings: settings used to create and configure a handler for the\n root logger (default: None).\n :type settings: dict, :class:`~scrapy.settings.Settings` object or ``None``\n\n :param install_root_handler: whether to install root logging handler\n (default: True)\n :type install_root_handler: bool\n\n This function does:\n\n - Route warnings and twisted logging through Python standard logging\n - Assign DEBUG and ERROR level to Scrapy and Twisted loggers respectively\n - Route stdout to log if LOG_STDOUT setting is True\n\n When ``install_root_handler`` is True (default), this function also\n creates a handler for the root logger according to given settings\n (see :ref:`topics-logging-settings`). You can override default options\n using ``settings`` argument. When ``settings`` is empty or None, defaults\n are used.\n \"\"\"\n if not sys.warnoptions:\n # Route warnings through python logging\n logging.captureWarnings(True)\n\n observer = twisted_log.PythonLoggingObserver('twisted')\n observer.start()\n\n dictConfig(DEFAULT_LOGGING)\n\n if isinstance(settings, dict) or settings is None:\n settings = Settings(settings)\n\n if settings.getbool('LOG_STDOUT'):\n sys.stdout = StreamLogger(logging.getLogger('stdout'))\n\n if install_root_handler:\n install_scrapy_root_handler(settings)\n\n\ndef install_scrapy_root_handler(settings):\n global _scrapy_root_handler\n\n if (_scrapy_root_handler is not None\n and _scrapy_root_handler in logging.root.handlers):\n logging.root.removeHandler(_scrapy_root_handler)\n logging.root.setLevel(logging.NOTSET)\n _scrapy_root_handler = _get_handler(settings)\n logging.root.addHandler(_scrapy_root_handler)\n\n\ndef get_scrapy_root_handler():\n return _scrapy_root_handler\n\n\n_scrapy_root_handler = None\n\n\ndef _get_handler(settings):\n \"\"\" Return a log handler object according to settings \"\"\"\n filename = settings.get('LOG_FILE')\n if filename:\n mode = 'a' if settings.getbool('LOG_FILE_APPEND') else 'w'\n encoding = settings.get('LOG_ENCODING')\n handler = logging.FileHandler(filename, mode=mode, encoding=encoding)\n elif settings.getbool('LOG_ENABLED'):\n handler = logging.StreamHandler()\n else:\n handler = logging.NullHandler()\n\n formatter = logging.Formatter(\n fmt=settings.get('LOG_FORMAT'),\n datefmt=settings.get('LOG_DATEFORMAT')\n )\n handler.setFormatter(formatter)\n handler.setLevel(settings.get('LOG_LEVEL'))\n if settings.getbool('LOG_SHORT_NAMES'):\n handler.addFilter(TopLevelFormatter(['scrapy']))\n return handler\n\n\ndef log_scrapy_info(settings: Settings) -> None:\n logger.info(\"Scrapy %(version)s started (bot: %(bot)s)\",\n {'version': scrapy.__version__, 'bot': settings['BOT_NAME']})\n versions = [\n f\"{name} {version}\"\n for name, version in scrapy_components_versions()\n if name != \"Scrapy\"\n ]\n logger.info(\"Versions: %(versions)s\", {'versions': \", \".join(versions)})\n\n\ndef log_reactor_info() -> None:\n from twisted.internet import reactor\n logger.debug(\"Using reactor: %s.%s\", reactor.__module__, reactor.__class__.__name__)\n from twisted.internet import asyncioreactor\n if isinstance(reactor, asyncioreactor.AsyncioSelectorReactor):\n logger.debug(\n \"Using asyncio event loop: %s.%s\",\n reactor._asyncioEventloop.__module__,\n reactor._asyncioEventloop.__class__.__name__,\n )\n\n\nclass StreamLogger:\n \"\"\"Fake file-like stream object that redirects writes to a logger instance\n\n Taken from:\n https://www.electricmonk.nl/log/2011/08/14/redirect-stdout-and-stderr-to-a-logger-in-python/\n \"\"\"\n def __init__(self, logger, log_level=logging.INFO):\n self.logger = logger\n self.log_level = log_level\n self.linebuf = ''\n\n def write(self, buf):\n for line in buf.rstrip().splitlines():\n self.logger.log(self.log_level, line.rstrip())\n\n def flush(self):\n for h in self.logger.handlers:\n h.flush()\n\n\nclass LogCounterHandler(logging.Handler):\n \"\"\"Record log levels count into a crawler stats\"\"\"\n\n def __init__(self, crawler, *args, **kwargs):\n super().__init__(*args, **kwargs)\n self.crawler = crawler\n\n def emit(self, record):\n sname = f'log_count/{record.levelname}'\n self.crawler.stats.inc_value(sname)\n\n\ndef logformatter_adapter(logkws):\n \"\"\"\n Helper that takes the dictionary output from the methods in LogFormatter\n and adapts it into a tuple of positional arguments for logger.log calls,\n handling backward compatibility as well.\n \"\"\"\n if not {'level', 'msg', 'args'} <= set(logkws):\n warnings.warn('Missing keys in LogFormatter method',\n ScrapyDeprecationWarning)\n\n if 'format' in logkws:\n warnings.warn('`format` key in LogFormatter methods has been '\n 'deprecated, use `msg` instead',\n ScrapyDeprecationWarning)\n\n level = logkws.get('level', logging.INFO)\n message = logkws.get('format', logkws.get('msg'))\n # NOTE: This also handles 'args' being an empty dict, that case doesn't\n # play well in logger.log calls\n args = logkws if not logkws.get('args') else logkws['args']\n\n return (level, message, args)\n", "path": "scrapy/utils/log.py" } ]
diff --git a/scrapy/utils/log.py b/scrapy/utils/log.py index 78e302d1956..c8b4936ac20 100644 --- a/scrapy/utils/log.py +++ b/scrapy/utils/log.py @@ -46,6 +46,9 @@ def filter(self, record): 'version': 1, 'disable_existing_loggers': False, 'loggers': { + 'filelock': { + 'level': 'ERROR', + }, 'hpack': { 'level': 'ERROR', },
sopel-irc__sopel-493
[ { "content": "#coding: utf8\n\"\"\"\nChannel logger\n\"\"\"\nfrom __future__ import unicode_literals\nimport os\nimport os.path\nimport threading\nfrom datetime import datetime\nimport willie.module\nimport willie.tools\nfrom willie.config import ConfigurationError\n\nMESSAGE_TPL = \"{datetime} <{origin.nick}> {message}\"\nACTION_TPL = \"{datetime} * {origin.nick} {message}\"\nNICK_TPL = \"{datetime} *** {origin.nick} is now known as {origin.sender}\"\nJOIN_TPL = \"{datetime} *** {origin.nick} has joined {trigger}\"\nPART_TPL = \"{datetime} *** {origin.nick} has left {trigger}\"\nQUIT_TPL = \"{datetime} *** {origin.nick} has quit IRC\"\n\n\ndef configure(config):\n if config.option(\"Configure channel logging\", False):\n config.add_section(\"chanlogs\")\n config.interactive_add(\n \"chanlogs\", \"dir\",\n \"Absolute path to channel log storage directory\",\n default=\"/home/willie/chanlogs\"\n )\n config.add_option(\"chanlogs\", \"by_day\", \"Split log files by day\", default=True)\n config.add_option(\"chanlogs\", \"privmsg\", \"Record private messages\", default=False)\n config.add_option(\"chanlogs\", \"microseconds\", \"Microsecond precision\", default=False)\n # could ask if user wants to customize message templates,\n # but that seems unnecessary\n\n\ndef get_fpath(bot, channel=None):\n \"\"\"\n Returns a string corresponding to the path to the file where the message\n currently being handled should be logged.\n \"\"\"\n basedir = os.path.expanduser(bot.config.chanlogs.dir)\n channel = channel or bot.origin.sender\n channel = channel.lstrip(\"#\")\n\n dt = datetime.utcnow()\n if not bot.config.chanlogs.microseconds:\n dt = dt.replace(microsecond=0)\n if bot.config.chanlogs.by_day:\n fname = \"{channel}-{date}.log\".format(channel=channel, date=dt.date().isoformat())\n else:\n fname = \"{channel}.log\".format(channel=channel)\n return os.path.join(basedir, fname)\n\n\ndef _format_template(tpl, bot, **kwargs):\n dt = datetime.utcnow()\n if not bot.config.chanlogs.microseconds:\n dt = dt.replace(microsecond=0)\n\n return tpl.format(\n origin=bot.origin, datetime=dt.isoformat(),\n date=dt.date().isoformat(), time=dt.time().isoformat(),\n **kwargs\n ) + \"\\n\"\n\n\ndef setup(bot):\n if not getattr(bot.config, \"chanlogs\", None):\n raise ConfigurationError(\"Channel logs are not configured\")\n if not getattr(bot.config.chanlogs, \"dir\", None):\n raise ConfigurationError(\"Channel log storage directory is not defined\")\n\n # ensure log directory exists\n basedir = os.path.expanduser(bot.config.chanlogs.dir)\n if not os.path.exists(basedir):\n os.makedirs(basedir)\n\n # locks for log files\n if not bot.memory.contains('chanlog_locks'):\n bot.memory['chanlog_locks'] = willie.tools.WillieMemoryWithDefault(threading.Lock)\n\n\n@willie.module.rule('.*')\n@willie.module.unblockable\ndef log_message(bot, message):\n \"Log every message in a channel\"\n # if this is a private message and we're not logging those, return early\n if not bot.origin.sender.startswith(\"#\") and not bot.config.chanlogs.privmsg:\n return\n\n # determine which template we want, message or action\n if message.startswith(\"\\001ACTION \") and message.endswith(\"\\001\"):\n tpl = bot.config.chanlogs.action_template or ACTION_TPL\n # strip off start and end\n message = message[8:-1]\n else:\n tpl = bot.config.chanlogs.message_template or MESSAGE_TPL\n\n logline = _format_template(tpl, bot, message=message)\n fpath = get_fpath(bot)\n with bot.memory['chanlog_locks'][fpath]:\n with open(fpath, \"a\") as f:\n f.write(logline.encode('utf-8'))\n\n\n@willie.module.rule('.*')\n@willie.module.event(\"JOIN\")\n@willie.module.unblockable\ndef log_join(bot, trigger):\n tpl = bot.config.chanlogs.join_template or JOIN_TPL\n logline = _format_template(tpl, bot, trigger=trigger)\n fpath = get_fpath(bot, channel=trigger)\n with bot.memory['chanlog_locks'][fpath]:\n with open(fpath, \"a\") as f:\n f.write(logline.encode('utf-8'))\n\n\n@willie.module.rule('.*')\n@willie.module.event(\"PART\")\n@willie.module.unblockable\ndef log_part(bot, trigger):\n tpl = bot.config.chanlogs.part_template or PART_TPL\n logline = _format_template(tpl, bot, trigger=trigger)\n fpath = get_fpath(bot, channel=trigger)\n with bot.memory['chanlog_locks'][fpath]:\n with open(fpath, \"a\") as f:\n f.write(logline.encode('utf-8'))\n\n\n@willie.module.rule('.*')\n@willie.module.event(\"QUIT\")\n@willie.module.unblockable\n@willie.module.thread(False)\n@willie.module.priority('high')\ndef log_quit(bot, trigger):\n tpl = bot.config.chanlogs.quit_template or QUIT_TPL\n logline = _format_template(tpl, bot, trigger=trigger)\n # make a copy of bot.privileges that we can safely iterate over\n privcopy = list(bot.privileges.items())\n # write logline to *all* channels that the user was present in\n for channel, privileges in privcopy:\n if bot.origin.nick in privileges:\n fpath = get_fpath(bot, channel)\n with bot.memory['chanlog_locks'][fpath]:\n with open(fpath, \"a\") as f:\n f.write(logline.encode('utf-8'))\n\n\n@willie.module.rule('.*')\n@willie.module.event(\"NICK\")\n@willie.module.unblockable\ndef log_nick_change(bot, trigger):\n tpl = bot.config.chanlogs.nick_template or NICK_TPL\n logline = _format_template(tpl, bot, trigger=trigger)\n old_nick = bot.origin.nick\n new_nick = bot.origin.sender\n # make a copy of bot.privileges that we can safely iterate over\n privcopy = list(bot.privileges.items())\n # write logline to *all* channels that the user is present in\n for channel, privileges in privcopy:\n if old_nick in privileges or new_nick in privileges:\n fpath = get_fpath(bot, channel)\n with bot.memory['chanlog_locks'][fpath]:\n with open(fpath, \"a\") as f:\n f.write(logline.encode('utf-8'))\n", "path": "willie/modules/chanlogs.py" } ]
[ { "content": "# coding=utf-8\n\"\"\"\nchanlogs.py - Willie Channel Logger module\nCopyright 2014, David Baumgold <david@davidbaumgold.com>\n\nLicensed under the Eiffel Forum License 2\n\nhttp://willie.dftba.net\n\"\"\"\nfrom __future__ import unicode_literals\nimport os\nimport os.path\nimport threading\nfrom datetime import datetime\nimport willie.module\nimport willie.tools\nfrom willie.config import ConfigurationError\n\nMESSAGE_TPL = \"{datetime} <{origin.nick}> {message}\"\nACTION_TPL = \"{datetime} * {origin.nick} {message}\"\nNICK_TPL = \"{datetime} *** {origin.nick} is now known as {origin.sender}\"\nJOIN_TPL = \"{datetime} *** {origin.nick} has joined {trigger}\"\nPART_TPL = \"{datetime} *** {origin.nick} has left {trigger}\"\nQUIT_TPL = \"{datetime} *** {origin.nick} has quit IRC\"\n\n\ndef configure(config):\n if config.option(\"Configure channel logging\", False):\n config.add_section(\"chanlogs\")\n config.interactive_add(\n \"chanlogs\", \"dir\",\n \"Absolute path to channel log storage directory\",\n default=\"/home/willie/chanlogs\"\n )\n config.add_option(\"chanlogs\", \"by_day\", \"Split log files by day\", default=True)\n config.add_option(\"chanlogs\", \"privmsg\", \"Record private messages\", default=False)\n config.add_option(\"chanlogs\", \"microseconds\", \"Microsecond precision\", default=False)\n # could ask if user wants to customize message templates,\n # but that seems unnecessary\n\n\ndef get_fpath(bot, channel=None):\n \"\"\"\n Returns a string corresponding to the path to the file where the message\n currently being handled should be logged.\n \"\"\"\n basedir = os.path.expanduser(bot.config.chanlogs.dir)\n channel = channel or bot.origin.sender\n channel = channel.lstrip(\"#\")\n\n dt = datetime.utcnow()\n if not bot.config.chanlogs.microseconds:\n dt = dt.replace(microsecond=0)\n if bot.config.chanlogs.by_day:\n fname = \"{channel}-{date}.log\".format(channel=channel, date=dt.date().isoformat())\n else:\n fname = \"{channel}.log\".format(channel=channel)\n return os.path.join(basedir, fname)\n\n\ndef _format_template(tpl, bot, **kwargs):\n dt = datetime.utcnow()\n if not bot.config.chanlogs.microseconds:\n dt = dt.replace(microsecond=0)\n\n return tpl.format(\n origin=bot.origin, datetime=dt.isoformat(),\n date=dt.date().isoformat(), time=dt.time().isoformat(),\n **kwargs\n ) + \"\\n\"\n\n\ndef setup(bot):\n if not getattr(bot.config, \"chanlogs\", None):\n raise ConfigurationError(\"Channel logs are not configured\")\n if not getattr(bot.config.chanlogs, \"dir\", None):\n raise ConfigurationError(\"Channel log storage directory is not defined\")\n\n # ensure log directory exists\n basedir = os.path.expanduser(bot.config.chanlogs.dir)\n if not os.path.exists(basedir):\n os.makedirs(basedir)\n\n # locks for log files\n if not bot.memory.contains('chanlog_locks'):\n bot.memory['chanlog_locks'] = willie.tools.WillieMemoryWithDefault(threading.Lock)\n\n\n@willie.module.rule('.*')\n@willie.module.unblockable\ndef log_message(bot, message):\n \"Log every message in a channel\"\n # if this is a private message and we're not logging those, return early\n if not bot.origin.sender.startswith(\"#\") and not bot.config.chanlogs.privmsg:\n return\n\n # determine which template we want, message or action\n if message.startswith(\"\\001ACTION \") and message.endswith(\"\\001\"):\n tpl = bot.config.chanlogs.action_template or ACTION_TPL\n # strip off start and end\n message = message[8:-1]\n else:\n tpl = bot.config.chanlogs.message_template or MESSAGE_TPL\n\n logline = _format_template(tpl, bot, message=message)\n fpath = get_fpath(bot)\n with bot.memory['chanlog_locks'][fpath]:\n with open(fpath, \"a\") as f:\n f.write(logline.encode('utf-8'))\n\n\n@willie.module.rule('.*')\n@willie.module.event(\"JOIN\")\n@willie.module.unblockable\ndef log_join(bot, trigger):\n tpl = bot.config.chanlogs.join_template or JOIN_TPL\n logline = _format_template(tpl, bot, trigger=trigger)\n fpath = get_fpath(bot, channel=trigger)\n with bot.memory['chanlog_locks'][fpath]:\n with open(fpath, \"a\") as f:\n f.write(logline.encode('utf-8'))\n\n\n@willie.module.rule('.*')\n@willie.module.event(\"PART\")\n@willie.module.unblockable\ndef log_part(bot, trigger):\n tpl = bot.config.chanlogs.part_template or PART_TPL\n logline = _format_template(tpl, bot, trigger=trigger)\n fpath = get_fpath(bot, channel=trigger)\n with bot.memory['chanlog_locks'][fpath]:\n with open(fpath, \"a\") as f:\n f.write(logline.encode('utf-8'))\n\n\n@willie.module.rule('.*')\n@willie.module.event(\"QUIT\")\n@willie.module.unblockable\n@willie.module.thread(False)\n@willie.module.priority('high')\ndef log_quit(bot, trigger):\n tpl = bot.config.chanlogs.quit_template or QUIT_TPL\n logline = _format_template(tpl, bot, trigger=trigger)\n # make a copy of bot.privileges that we can safely iterate over\n privcopy = list(bot.privileges.items())\n # write logline to *all* channels that the user was present in\n for channel, privileges in privcopy:\n if bot.origin.nick in privileges:\n fpath = get_fpath(bot, channel)\n with bot.memory['chanlog_locks'][fpath]:\n with open(fpath, \"a\") as f:\n f.write(logline.encode('utf-8'))\n\n\n@willie.module.rule('.*')\n@willie.module.event(\"NICK\")\n@willie.module.unblockable\ndef log_nick_change(bot, trigger):\n tpl = bot.config.chanlogs.nick_template or NICK_TPL\n logline = _format_template(tpl, bot, trigger=trigger)\n old_nick = bot.origin.nick\n new_nick = bot.origin.sender\n # make a copy of bot.privileges that we can safely iterate over\n privcopy = list(bot.privileges.items())\n # write logline to *all* channels that the user is present in\n for channel, privileges in privcopy:\n if old_nick in privileges or new_nick in privileges:\n fpath = get_fpath(bot, channel)\n with bot.memory['chanlog_locks'][fpath]:\n with open(fpath, \"a\") as f:\n f.write(logline.encode('utf-8'))\n", "path": "willie/modules/chanlogs.py" } ]
diff --git a/willie/modules/chanlogs.py b/willie/modules/chanlogs.py index e4455ac725..44cabddc91 100644 --- a/willie/modules/chanlogs.py +++ b/willie/modules/chanlogs.py @@ -1,6 +1,11 @@ -#coding: utf8 +# coding=utf-8 """ -Channel logger +chanlogs.py - Willie Channel Logger module +Copyright 2014, David Baumgold <david@davidbaumgold.com> + +Licensed under the Eiffel Forum License 2 + +http://willie.dftba.net """ from __future__ import unicode_literals import os
pypi__warehouse-1454
[ { "content": "# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nimport enum\n\nfrom collections import OrderedDict\n\nfrom citext import CIText\nfrom pyramid.security import Allow\nfrom pyramid.threadlocal import get_current_request\nfrom sqlalchemy import (\n CheckConstraint, Column, Enum, ForeignKey, ForeignKeyConstraint, Index,\n Boolean, DateTime, Integer, Table, Text,\n)\nfrom sqlalchemy import func, orm, sql\nfrom sqlalchemy.orm.exc import NoResultFound\nfrom sqlalchemy.ext.associationproxy import association_proxy\nfrom sqlalchemy.ext.declarative import declared_attr\nfrom sqlalchemy.ext.hybrid import hybrid_property\n\nfrom warehouse import db\nfrom warehouse.accounts.models import User\nfrom warehouse.classifiers.models import Classifier\nfrom warehouse.sitemap.models import SitemapMixin\nfrom warehouse.utils.attrs import make_repr\n\n\nclass Role(db.Model):\n\n __tablename__ = \"roles\"\n __table_args__ = (\n Index(\"roles_pack_name_idx\", \"package_name\"),\n Index(\"roles_user_name_idx\", \"user_name\"),\n )\n\n __repr__ = make_repr(\"role_name\", \"user_name\", \"package_name\")\n\n role_name = Column(Text)\n user_name = Column(\n CIText,\n ForeignKey(\"accounts_user.username\", onupdate=\"CASCADE\"),\n )\n package_name = Column(\n Text,\n ForeignKey(\"packages.name\", onupdate=\"CASCADE\"),\n )\n\n user = orm.relationship(User, lazy=False)\n project = orm.relationship(\"Project\", lazy=False)\n\n\nclass ProjectFactory:\n\n def __init__(self, request):\n self.request = request\n\n def __getitem__(self, project):\n try:\n return self.request.db.query(Project).filter(\n Project.normalized_name == func.normalize_pep426_name(project)\n ).one()\n except NoResultFound:\n raise KeyError from None\n\n\nclass Project(SitemapMixin, db.ModelBase):\n\n __tablename__ = \"packages\"\n __table_args__ = (\n CheckConstraint(\n \"name ~* '^([A-Z0-9]|[A-Z0-9][A-Z0-9._-]*[A-Z0-9])$'::text\",\n name=\"packages_valid_name\",\n ),\n )\n\n __repr__ = make_repr(\"name\")\n\n name = Column(Text, primary_key=True, nullable=False)\n normalized_name = orm.column_property(func.normalize_pep426_name(name))\n stable_version = Column(Text)\n autohide = Column(Boolean, server_default=sql.true())\n comments = Column(Boolean, server_default=sql.true())\n bugtrack_url = Column(Text)\n hosting_mode = Column(Text, nullable=False, server_default=\"pypi-only\")\n created = Column(\n DateTime(timezone=False),\n nullable=False,\n server_default=sql.func.now(),\n )\n has_docs = Column(Boolean)\n upload_limit = Column(Integer, nullable=True)\n last_serial = Column(Integer, nullable=False, server_default=sql.text(\"0\"))\n allow_legacy_files = Column(\n Boolean,\n nullable=False,\n server_default=sql.false(),\n )\n\n users = orm.relationship(\n User,\n secondary=Role.__table__,\n backref=\"projects\",\n )\n\n releases = orm.relationship(\n \"Release\",\n backref=\"project\",\n cascade=\"all, delete-orphan\",\n order_by=lambda: Release._pypi_ordering.desc(),\n )\n\n def __getitem__(self, version):\n session = orm.object_session(self)\n\n try:\n return (\n session.query(Release)\n .filter((Release.project == self) &\n (Release.version == version))\n .one()\n )\n except NoResultFound:\n raise KeyError from None\n\n def __acl__(self):\n session = orm.object_session(self)\n acls = []\n\n # Get all of the users for this project.\n query = session.query(Role).filter(Role.project == self)\n query = query.options(orm.lazyload(\"project\"))\n query = query.options(orm.joinedload(\"user\").lazyload(\"emails\"))\n for role in sorted(\n query.all(),\n key=lambda x: [\"Owner\", \"Maintainer\"].index(x.role_name)):\n acls.append((Allow, role.user.id, [\"upload\"]))\n\n return acls\n\n @property\n def documentation_url(self):\n # TODO: Move this into the database and elimnate the use of the\n # threadlocal here.\n request = get_current_request()\n\n # If the project doesn't have docs, then we'll just return a None here.\n if not self.has_docs:\n return\n\n return request.route_url(\"legacy.docs\", project=self.name)\n\n\nclass DependencyKind(enum.IntEnum):\n\n requires = 1\n provides = 2\n obsoletes = 3\n requires_dist = 4\n provides_dist = 5\n obsoletes_dist = 6\n requires_external = 7\n\n # TODO: Move project URLs into their own table, since they are not actually\n # a \"dependency\".\n project_url = 8\n\n\nclass Dependency(db.Model):\n\n __tablename__ = \"release_dependencies\"\n __table_args__ = (\n Index(\"rel_dep_name_idx\", \"name\"),\n Index(\"rel_dep_name_version_idx\", \"name\", \"version\"),\n Index(\"rel_dep_name_version_kind_idx\", \"name\", \"version\", \"kind\"),\n ForeignKeyConstraint(\n [\"name\", \"version\"],\n [\"releases.name\", \"releases.version\"],\n onupdate=\"CASCADE\",\n ),\n )\n __repr__ = make_repr(\"name\", \"version\", \"kind\", \"specifier\")\n\n name = Column(Text)\n version = Column(Text)\n kind = Column(Integer)\n specifier = Column(Text)\n\n\ndef _dependency_relation(kind):\n return orm.relationship(\n \"Dependency\",\n primaryjoin=lambda: sql.and_(\n Release.name == Dependency.name,\n Release.version == Dependency.version,\n Dependency.kind == kind.value,\n ),\n viewonly=True,\n )\n\n\nclass Release(db.ModelBase):\n\n __tablename__ = \"releases\"\n\n @declared_attr\n def __table_args__(cls): # noqa\n return (\n Index(\"release_created_idx\", cls.created.desc()),\n Index(\"release_name_created_idx\", cls.name, cls.created.desc()),\n Index(\"release_name_idx\", cls.name),\n Index(\"release_pypi_hidden_idx\", cls._pypi_hidden),\n Index(\"release_version_idx\", cls.version),\n )\n\n __repr__ = make_repr(\"name\", \"version\")\n\n name = Column(\n Text,\n ForeignKey(\"packages.name\", onupdate=\"CASCADE\"),\n primary_key=True,\n )\n version = Column(Text, primary_key=True)\n author = Column(Text)\n author_email = Column(Text)\n maintainer = Column(Text)\n maintainer_email = Column(Text)\n home_page = Column(Text)\n license = Column(Text)\n summary = Column(Text)\n description = Column(Text)\n keywords = Column(Text)\n platform = Column(Text)\n download_url = Column(Text)\n _pypi_ordering = Column(Integer)\n _pypi_hidden = Column(Boolean)\n cheesecake_installability_id = Column(\n Integer,\n ForeignKey(\"cheesecake_main_indices.id\"),\n )\n cheesecake_documentation_id = Column(\n Integer,\n ForeignKey(\"cheesecake_main_indices.id\"),\n )\n cheesecake_code_kwalitee_id = Column(\n Integer,\n ForeignKey(\"cheesecake_main_indices.id\"),\n )\n requires_python = Column(Text)\n description_from_readme = Column(Boolean)\n created = Column(\n DateTime(timezone=False),\n nullable=False,\n server_default=sql.func.now(),\n )\n\n _classifiers = orm.relationship(\n Classifier,\n backref=\"project_releases\",\n secondary=lambda: release_classifiers,\n order_by=Classifier.classifier,\n )\n classifiers = association_proxy(\"_classifiers\", \"classifier\")\n\n files = orm.relationship(\n \"File\",\n backref=\"release\",\n cascade=\"all, delete-orphan\",\n lazy=\"dynamic\",\n order_by=lambda: File.filename,\n )\n\n dependencies = orm.relationship(\"Dependency\")\n\n _requires = _dependency_relation(DependencyKind.requires)\n requires = association_proxy(\"_requires\", \"specifier\")\n\n _provides = _dependency_relation(DependencyKind.provides)\n provides = association_proxy(\"_provides\", \"specifier\")\n\n _obsoletes = _dependency_relation(DependencyKind.obsoletes)\n obsoletes = association_proxy(\"_obsoletes\", \"specifier\")\n\n _requires_dist = _dependency_relation(DependencyKind.requires_dist)\n requires_dist = association_proxy(\"_requires_dist\", \"specifier\")\n\n _provides_dist = _dependency_relation(DependencyKind.provides_dist)\n provides_dist = association_proxy(\"_provides_dist\", \"specifier\")\n\n _obsoletes_dist = _dependency_relation(DependencyKind.obsoletes_dist)\n obsoletes_dist = association_proxy(\"_obsoletes_dist\", \"specifier\")\n\n _requires_external = _dependency_relation(DependencyKind.requires_external)\n requires_external = association_proxy(\"_requires_external\", \"specifier\")\n\n _project_urls = _dependency_relation(DependencyKind.project_url)\n project_urls = association_proxy(\"_project_urls\", \"specifier\")\n\n uploader = orm.relationship(\n \"User\",\n secondary=lambda: JournalEntry.__table__,\n primaryjoin=lambda: (\n (JournalEntry.name == orm.foreign(Release.name)) &\n (JournalEntry.version == orm.foreign(Release.version)) &\n (JournalEntry.action == \"new release\")),\n secondaryjoin=lambda: (\n (User.username == orm.foreign(JournalEntry._submitted_by))\n ),\n order_by=lambda: JournalEntry.submitted_date.desc(),\n # TODO: We have uselist=False here which raises a warning because\n # multiple items were returned. This should only be temporary because\n # we should add a nullable FK to JournalEntry so we don't need to rely\n # on ordering and implicitly selecting the first object to make this\n # happen,\n uselist=False,\n viewonly=True,\n )\n\n @property\n def urls(self):\n _urls = OrderedDict()\n\n if self.home_page:\n _urls[\"Homepage\"] = self.home_page\n\n for urlspec in self.project_urls:\n name, url = urlspec.split(\",\", 1)\n _urls[name] = url\n\n if self.download_url and \"Download\" not in _urls:\n _urls[\"Download\"] = self.download_url\n\n return _urls\n\n @property\n def has_meta(self):\n return any([self.keywords])\n\n\nclass File(db.Model):\n\n __tablename__ = \"release_files\"\n __table_args__ = (\n ForeignKeyConstraint(\n [\"name\", \"version\"],\n [\"releases.name\", \"releases.version\"],\n onupdate=\"CASCADE\",\n ),\n\n CheckConstraint(\"sha256_digest ~* '^[A-F0-9]{64}$'\"),\n CheckConstraint(\"blake2_256_digest ~* '^[A-F0-9]{64}$'\"),\n\n Index(\"release_files_name_idx\", \"name\"),\n Index(\"release_files_name_version_idx\", \"name\", \"version\"),\n Index(\"release_files_packagetype_idx\", \"packagetype\"),\n Index(\"release_files_version_idx\", \"version\"),\n )\n\n name = Column(Text)\n version = Column(Text)\n python_version = Column(Text)\n packagetype = Column(\n Enum(\n \"bdist_dmg\", \"bdist_dumb\", \"bdist_egg\", \"bdist_msi\", \"bdist_rpm\",\n \"bdist_wheel\", \"bdist_wininst\", \"sdist\",\n ),\n )\n comment_text = Column(Text)\n filename = Column(Text, unique=True)\n path = Column(Text, unique=True, nullable=False)\n size = Column(Integer)\n has_signature = Column(Boolean)\n md5_digest = Column(Text, unique=True, nullable=False)\n sha256_digest = Column(CIText, unique=True, nullable=False)\n blake2_256_digest = Column(CIText, unique=True, nullable=False)\n downloads = Column(Integer, server_default=sql.text(\"0\"))\n upload_time = Column(DateTime(timezone=False), server_default=func.now())\n\n @hybrid_property\n def pgp_path(self):\n return self.path + \".asc\"\n\n @pgp_path.expression\n def pgp_path(self):\n return func.concat(self.path, \".asc\")\n\n\nclass Filename(db.ModelBase):\n\n __tablename__ = \"file_registry\"\n\n id = Column(Integer, primary_key=True, nullable=False)\n filename = Column(Text, unique=True, nullable=False)\n\n\nrelease_classifiers = Table(\n \"release_classifiers\",\n db.metadata,\n\n Column(\"name\", Text()),\n Column(\"version\", Text()),\n Column(\"trove_id\", Integer(), ForeignKey(\"trove_classifiers.id\")),\n\n ForeignKeyConstraint(\n [\"name\", \"version\"],\n [\"releases.name\", \"releases.version\"],\n onupdate=\"CASCADE\",\n ),\n\n Index(\"rel_class_name_idx\", \"name\"),\n Index(\"rel_class_name_version_idx\", \"name\", \"version\"),\n Index(\"rel_class_trove_id_idx\", \"trove_id\"),\n Index(\"rel_class_version_id_idx\", \"version\"),\n)\n\n\nclass JournalEntry(db.ModelBase):\n\n __tablename__ = \"journals\"\n\n @declared_attr\n def __table_args__(cls): # noqa\n return (\n Index(\n \"journals_changelog\",\n \"submitted_date\", \"name\", \"version\", \"action\",\n ),\n Index(\"journals_id_idx\", \"id\"),\n Index(\"journals_name_idx\", \"name\"),\n Index(\"journals_version_idx\", \"version\"),\n Index(\n \"journals_latest_releases\",\n \"submitted_date\", \"name\", \"version\",\n postgresql_where=(\n (cls.version != None) & (cls.action == \"new release\") # noqa\n ),\n ),\n )\n\n id = Column(Integer, primary_key=True, nullable=False)\n name = Column(Text)\n version = Column(Text)\n action = Column(Text)\n submitted_date = Column(\n DateTime(timezone=False),\n nullable=False,\n server_default=sql.func.now(),\n )\n _submitted_by = Column(\n \"submitted_by\",\n CIText,\n ForeignKey(\n \"accounts_user.username\",\n onupdate=\"CASCADE\",\n ),\n )\n submitted_by = orm.relationship(User)\n submitted_from = Column(Text)\n", "path": "warehouse/packaging/models.py" } ]
[ { "content": "# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nimport enum\n\nfrom collections import OrderedDict\n\nfrom citext import CIText\nfrom pyramid.security import Allow\nfrom pyramid.threadlocal import get_current_request\nfrom sqlalchemy import (\n CheckConstraint, Column, Enum, ForeignKey, ForeignKeyConstraint, Index,\n Boolean, DateTime, Integer, Table, Text,\n)\nfrom sqlalchemy import func, orm, sql\nfrom sqlalchemy.orm.exc import NoResultFound\nfrom sqlalchemy.ext.associationproxy import association_proxy\nfrom sqlalchemy.ext.declarative import declared_attr\nfrom sqlalchemy.ext.hybrid import hybrid_property\n\nfrom warehouse import db\nfrom warehouse.accounts.models import User\nfrom warehouse.classifiers.models import Classifier\nfrom warehouse.sitemap.models import SitemapMixin\nfrom warehouse.utils.attrs import make_repr\n\n\nclass Role(db.Model):\n\n __tablename__ = \"roles\"\n __table_args__ = (\n Index(\"roles_pack_name_idx\", \"package_name\"),\n Index(\"roles_user_name_idx\", \"user_name\"),\n )\n\n __repr__ = make_repr(\"role_name\", \"user_name\", \"package_name\")\n\n role_name = Column(Text)\n user_name = Column(\n CIText,\n ForeignKey(\"accounts_user.username\", onupdate=\"CASCADE\"),\n )\n package_name = Column(\n Text,\n ForeignKey(\"packages.name\", onupdate=\"CASCADE\"),\n )\n\n user = orm.relationship(User, lazy=False)\n project = orm.relationship(\"Project\", lazy=False)\n\n\nclass ProjectFactory:\n\n def __init__(self, request):\n self.request = request\n\n def __getitem__(self, project):\n try:\n return self.request.db.query(Project).filter(\n Project.normalized_name == func.normalize_pep426_name(project)\n ).one()\n except NoResultFound:\n raise KeyError from None\n\n\nclass Project(SitemapMixin, db.ModelBase):\n\n __tablename__ = \"packages\"\n __table_args__ = (\n CheckConstraint(\n \"name ~* '^([A-Z0-9]|[A-Z0-9][A-Z0-9._-]*[A-Z0-9])$'::text\",\n name=\"packages_valid_name\",\n ),\n )\n\n __repr__ = make_repr(\"name\")\n\n name = Column(Text, primary_key=True, nullable=False)\n normalized_name = orm.column_property(func.normalize_pep426_name(name))\n stable_version = Column(Text)\n autohide = Column(Boolean, server_default=sql.true())\n comments = Column(Boolean, server_default=sql.true())\n bugtrack_url = Column(Text)\n hosting_mode = Column(Text, nullable=False, server_default=\"pypi-only\")\n created = Column(\n DateTime(timezone=False),\n nullable=False,\n server_default=sql.func.now(),\n )\n has_docs = Column(Boolean)\n upload_limit = Column(Integer, nullable=True)\n last_serial = Column(Integer, nullable=False, server_default=sql.text(\"0\"))\n allow_legacy_files = Column(\n Boolean,\n nullable=False,\n server_default=sql.false(),\n )\n\n users = orm.relationship(\n User,\n secondary=Role.__table__,\n backref=\"projects\",\n )\n\n releases = orm.relationship(\n \"Release\",\n backref=\"project\",\n cascade=\"all, delete-orphan\",\n order_by=lambda: Release._pypi_ordering.desc(),\n )\n\n def __getitem__(self, version):\n session = orm.object_session(self)\n\n try:\n return (\n session.query(Release)\n .filter((Release.project == self) &\n (Release.version == version))\n .one()\n )\n except NoResultFound:\n raise KeyError from None\n\n def __acl__(self):\n session = orm.object_session(self)\n acls = []\n\n # Get all of the users for this project.\n query = session.query(Role).filter(Role.project == self)\n query = query.options(orm.lazyload(\"project\"))\n query = query.options(orm.joinedload(\"user\").lazyload(\"emails\"))\n for role in sorted(\n query.all(),\n key=lambda x: [\"Owner\", \"Maintainer\"].index(x.role_name)):\n acls.append((Allow, role.user.id, [\"upload\"]))\n\n return acls\n\n @property\n def documentation_url(self):\n # TODO: Move this into the database and elimnate the use of the\n # threadlocal here.\n request = get_current_request()\n\n # If the project doesn't have docs, then we'll just return a None here.\n if not self.has_docs:\n return\n\n return request.route_url(\"legacy.docs\", project=self.name)\n\n\nclass DependencyKind(enum.IntEnum):\n\n requires = 1\n provides = 2\n obsoletes = 3\n requires_dist = 4\n provides_dist = 5\n obsoletes_dist = 6\n requires_external = 7\n\n # TODO: Move project URLs into their own table, since they are not actually\n # a \"dependency\".\n project_url = 8\n\n\nclass Dependency(db.Model):\n\n __tablename__ = \"release_dependencies\"\n __table_args__ = (\n Index(\"rel_dep_name_idx\", \"name\"),\n Index(\"rel_dep_name_version_idx\", \"name\", \"version\"),\n Index(\"rel_dep_name_version_kind_idx\", \"name\", \"version\", \"kind\"),\n ForeignKeyConstraint(\n [\"name\", \"version\"],\n [\"releases.name\", \"releases.version\"],\n onupdate=\"CASCADE\",\n ),\n )\n __repr__ = make_repr(\"name\", \"version\", \"kind\", \"specifier\")\n\n name = Column(Text)\n version = Column(Text)\n kind = Column(Integer)\n specifier = Column(Text)\n\n\ndef _dependency_relation(kind):\n return orm.relationship(\n \"Dependency\",\n primaryjoin=lambda: sql.and_(\n Release.name == Dependency.name,\n Release.version == Dependency.version,\n Dependency.kind == kind.value,\n ),\n viewonly=True,\n )\n\n\nclass Release(db.ModelBase):\n\n __tablename__ = \"releases\"\n\n @declared_attr\n def __table_args__(cls): # noqa\n return (\n Index(\"release_created_idx\", cls.created.desc()),\n Index(\"release_name_created_idx\", cls.name, cls.created.desc()),\n Index(\"release_name_idx\", cls.name),\n Index(\"release_pypi_hidden_idx\", cls._pypi_hidden),\n Index(\"release_version_idx\", cls.version),\n )\n\n __repr__ = make_repr(\"name\", \"version\")\n\n name = Column(\n Text,\n ForeignKey(\"packages.name\", onupdate=\"CASCADE\"),\n primary_key=True,\n )\n version = Column(Text, primary_key=True)\n author = Column(Text)\n author_email = Column(Text)\n maintainer = Column(Text)\n maintainer_email = Column(Text)\n home_page = Column(Text)\n license = Column(Text)\n summary = Column(Text)\n description = Column(Text)\n keywords = Column(Text)\n platform = Column(Text)\n download_url = Column(Text)\n _pypi_ordering = Column(Integer)\n _pypi_hidden = Column(Boolean)\n cheesecake_installability_id = Column(\n Integer,\n ForeignKey(\"cheesecake_main_indices.id\"),\n )\n cheesecake_documentation_id = Column(\n Integer,\n ForeignKey(\"cheesecake_main_indices.id\"),\n )\n cheesecake_code_kwalitee_id = Column(\n Integer,\n ForeignKey(\"cheesecake_main_indices.id\"),\n )\n requires_python = Column(Text)\n description_from_readme = Column(Boolean)\n created = Column(\n DateTime(timezone=False),\n nullable=False,\n server_default=sql.func.now(),\n )\n\n _classifiers = orm.relationship(\n Classifier,\n backref=\"project_releases\",\n secondary=lambda: release_classifiers,\n order_by=Classifier.classifier,\n )\n classifiers = association_proxy(\"_classifiers\", \"classifier\")\n\n files = orm.relationship(\n \"File\",\n backref=\"release\",\n cascade=\"all, delete-orphan\",\n lazy=\"dynamic\",\n order_by=lambda: File.filename,\n )\n\n dependencies = orm.relationship(\"Dependency\")\n\n _requires = _dependency_relation(DependencyKind.requires)\n requires = association_proxy(\"_requires\", \"specifier\")\n\n _provides = _dependency_relation(DependencyKind.provides)\n provides = association_proxy(\"_provides\", \"specifier\")\n\n _obsoletes = _dependency_relation(DependencyKind.obsoletes)\n obsoletes = association_proxy(\"_obsoletes\", \"specifier\")\n\n _requires_dist = _dependency_relation(DependencyKind.requires_dist)\n requires_dist = association_proxy(\"_requires_dist\", \"specifier\")\n\n _provides_dist = _dependency_relation(DependencyKind.provides_dist)\n provides_dist = association_proxy(\"_provides_dist\", \"specifier\")\n\n _obsoletes_dist = _dependency_relation(DependencyKind.obsoletes_dist)\n obsoletes_dist = association_proxy(\"_obsoletes_dist\", \"specifier\")\n\n _requires_external = _dependency_relation(DependencyKind.requires_external)\n requires_external = association_proxy(\"_requires_external\", \"specifier\")\n\n _project_urls = _dependency_relation(DependencyKind.project_url)\n project_urls = association_proxy(\"_project_urls\", \"specifier\")\n\n uploader = orm.relationship(\n \"User\",\n secondary=lambda: JournalEntry.__table__,\n primaryjoin=lambda: (\n (JournalEntry.name == orm.foreign(Release.name)) &\n (JournalEntry.version == orm.foreign(Release.version)) &\n (JournalEntry.action == \"new release\")),\n secondaryjoin=lambda: (\n (User.username == orm.foreign(JournalEntry._submitted_by))\n ),\n order_by=lambda: JournalEntry.submitted_date.desc(),\n # TODO: We have uselist=False here which raises a warning because\n # multiple items were returned. This should only be temporary because\n # we should add a nullable FK to JournalEntry so we don't need to rely\n # on ordering and implicitly selecting the first object to make this\n # happen,\n uselist=False,\n viewonly=True,\n )\n\n @property\n def urls(self):\n _urls = OrderedDict()\n\n if self.home_page:\n _urls[\"Homepage\"] = self.home_page\n\n for urlspec in self.project_urls:\n name, url = urlspec.split(\",\", 1)\n _urls[name] = url\n\n if self.download_url and \"Download\" not in _urls:\n _urls[\"Download\"] = self.download_url\n\n return _urls\n\n @property\n def has_meta(self):\n return any([self.keywords,\n self.author, self.author_email,\n self.maintainer, self.maintainer_email])\n\n\nclass File(db.Model):\n\n __tablename__ = \"release_files\"\n __table_args__ = (\n ForeignKeyConstraint(\n [\"name\", \"version\"],\n [\"releases.name\", \"releases.version\"],\n onupdate=\"CASCADE\",\n ),\n\n CheckConstraint(\"sha256_digest ~* '^[A-F0-9]{64}$'\"),\n CheckConstraint(\"blake2_256_digest ~* '^[A-F0-9]{64}$'\"),\n\n Index(\"release_files_name_idx\", \"name\"),\n Index(\"release_files_name_version_idx\", \"name\", \"version\"),\n Index(\"release_files_packagetype_idx\", \"packagetype\"),\n Index(\"release_files_version_idx\", \"version\"),\n )\n\n name = Column(Text)\n version = Column(Text)\n python_version = Column(Text)\n packagetype = Column(\n Enum(\n \"bdist_dmg\", \"bdist_dumb\", \"bdist_egg\", \"bdist_msi\", \"bdist_rpm\",\n \"bdist_wheel\", \"bdist_wininst\", \"sdist\",\n ),\n )\n comment_text = Column(Text)\n filename = Column(Text, unique=True)\n path = Column(Text, unique=True, nullable=False)\n size = Column(Integer)\n has_signature = Column(Boolean)\n md5_digest = Column(Text, unique=True, nullable=False)\n sha256_digest = Column(CIText, unique=True, nullable=False)\n blake2_256_digest = Column(CIText, unique=True, nullable=False)\n downloads = Column(Integer, server_default=sql.text(\"0\"))\n upload_time = Column(DateTime(timezone=False), server_default=func.now())\n\n @hybrid_property\n def pgp_path(self):\n return self.path + \".asc\"\n\n @pgp_path.expression\n def pgp_path(self):\n return func.concat(self.path, \".asc\")\n\n\nclass Filename(db.ModelBase):\n\n __tablename__ = \"file_registry\"\n\n id = Column(Integer, primary_key=True, nullable=False)\n filename = Column(Text, unique=True, nullable=False)\n\n\nrelease_classifiers = Table(\n \"release_classifiers\",\n db.metadata,\n\n Column(\"name\", Text()),\n Column(\"version\", Text()),\n Column(\"trove_id\", Integer(), ForeignKey(\"trove_classifiers.id\")),\n\n ForeignKeyConstraint(\n [\"name\", \"version\"],\n [\"releases.name\", \"releases.version\"],\n onupdate=\"CASCADE\",\n ),\n\n Index(\"rel_class_name_idx\", \"name\"),\n Index(\"rel_class_name_version_idx\", \"name\", \"version\"),\n Index(\"rel_class_trove_id_idx\", \"trove_id\"),\n Index(\"rel_class_version_id_idx\", \"version\"),\n)\n\n\nclass JournalEntry(db.ModelBase):\n\n __tablename__ = \"journals\"\n\n @declared_attr\n def __table_args__(cls): # noqa\n return (\n Index(\n \"journals_changelog\",\n \"submitted_date\", \"name\", \"version\", \"action\",\n ),\n Index(\"journals_id_idx\", \"id\"),\n Index(\"journals_name_idx\", \"name\"),\n Index(\"journals_version_idx\", \"version\"),\n Index(\n \"journals_latest_releases\",\n \"submitted_date\", \"name\", \"version\",\n postgresql_where=(\n (cls.version != None) & (cls.action == \"new release\") # noqa\n ),\n ),\n )\n\n id = Column(Integer, primary_key=True, nullable=False)\n name = Column(Text)\n version = Column(Text)\n action = Column(Text)\n submitted_date = Column(\n DateTime(timezone=False),\n nullable=False,\n server_default=sql.func.now(),\n )\n _submitted_by = Column(\n \"submitted_by\",\n CIText,\n ForeignKey(\n \"accounts_user.username\",\n onupdate=\"CASCADE\",\n ),\n )\n submitted_by = orm.relationship(User)\n submitted_from = Column(Text)\n", "path": "warehouse/packaging/models.py" } ]
diff --git a/tests/unit/packaging/test_models.py b/tests/unit/packaging/test_models.py index 2daf8ca636f2..c102db48389f 100644 --- a/tests/unit/packaging/test_models.py +++ b/tests/unit/packaging/test_models.py @@ -107,6 +107,20 @@ def test_has_meta_true_with_keywords(self, db_session): release = DBReleaseFactory.create(keywords="foo, bar") assert release.has_meta + def test_has_meta_true_with_author(self, db_session): + release = DBReleaseFactory.create(author="Batman") + assert release.has_meta + + release = DBReleaseFactory.create(author_email="wayne@gotham.ny") + assert release.has_meta + + def test_has_meta_true_with_maintainer(self, db_session): + release = DBReleaseFactory.create(maintainer="Spiderman") + assert release.has_meta + + release = DBReleaseFactory.create(maintainer_email="peter@parker.mrvl") + assert release.has_meta + def test_has_meta_false(self, db_session): release = DBReleaseFactory.create() assert not release.has_meta diff --git a/warehouse/packaging/models.py b/warehouse/packaging/models.py index a91e2f2fdc10..21d5f53ba430 100644 --- a/warehouse/packaging/models.py +++ b/warehouse/packaging/models.py @@ -342,7 +342,9 @@ def urls(self): @property def has_meta(self): - return any([self.keywords]) + return any([self.keywords, + self.author, self.author_email, + self.maintainer, self.maintainer_email]) class File(db.Model): diff --git a/warehouse/templates/packaging/detail.html b/warehouse/templates/packaging/detail.html index 4f3eb2f26abc..c9d886679ab4 100644 --- a/warehouse/templates/packaging/detail.html +++ b/warehouse/templates/packaging/detail.html @@ -134,16 +134,19 @@ <h3 class="sidebar-section__title">Navigation</h3> {% endif %} </div> - <div class="sidebar-section sidebar-section--maintainers"> - <h3 class="sidebar-section__title">Maintainers</h3> - {% for maintainer in maintainers %} - <a href="{{ request.route_path('accounts.profile', username=maintainer.username) }}"><img src="{{ gravatar(maintainer.email, size=100) }}" height="50" width="50" alt="{{ maintainer.username}}"></a> - {% endfor %} - </div> - {% if release.has_meta %} <div class="sidebar-section"> <h3 class="sidebar-section__title">Meta</h3> + {% if release.author_email %} + <p>Author: <a href="mailto:{{ release.author_email }}">{{ release.author or release.author_email }}</a></p> + {% elif release.author %} + <p>Author: {{ release.author }}</p> + {% endif %} + {% if release.maintainer_email %} + <p>Maintainer: <a href="mailto:{{ release.maintainer_email }}">{{ release.maintainer or release.maintainer_email }}</a></p> + {% elif release.maintainer %} + <p>Maintainer: {{ release.maintainer }}</p> + {% endif %} {% if release.keywords %} <p class="tags"><i class="fa fa-tags"></i> {% for keyword in release.keywords | format_tags %} @@ -156,6 +159,13 @@ <h3 class="sidebar-section__title">Meta</h3> </div> {% endif %} + <div class="sidebar-section sidebar-section--maintainers"> + <h3 class="sidebar-section__title">Maintainers</h3> + {% for maintainer in maintainers %} + <a href="{{ request.route_path('accounts.profile', username=maintainer.username) }}"><img src="{{ gravatar(maintainer.email, size=50) }}" height="50" width="50" alt="{{ maintainer.username}}"></a> + {% endfor %} + </div> + {% if release.classifiers %} <div class="sidebar-section classifiers"> <h3>Classifiers</h3>
ivy-llc__ivy-17901
[ { "content": "# global\nimport ivy\nfrom ivy.func_wrapper import with_unsupported_dtypes, with_supported_dtypes\nfrom ivy.functional.frontends.paddle.func_wrapper import to_ivy_arrays_and_back\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef sin(x, name=None):\n return ivy.sin(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef cos(x, name=None):\n return ivy.cos(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef acos(x, name=None):\n return ivy.acos(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef cosh(x, name=None):\n return ivy.cosh(x)\n\n\n@with_supported_dtypes({\"2.5.0 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef tanh(x, name=None):\n return ivy.tanh(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef acosh(x, name=None):\n return ivy.acosh(x)\n\n\n@with_supported_dtypes({\"2.5.0 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef asin(x, name=None):\n return ivy.asin(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef log(x, name=None):\n return ivy.log(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef divide(x, y, name=None):\n return ivy.divide(x, y)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef abs(x, name=None):\n return ivy.abs(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef multiply(x, y, name=None):\n return ivy.multiply(x, y)\n\n\n@with_unsupported_dtypes(\n {\"2.5.0 and below\": (\"bool\", \"unsigned\", \"int8\", \"float16\", \"bfloat16\")}, \"paddle\"\n)\n@to_ivy_arrays_and_back\ndef add(x, y, name=None):\n return ivy.add(x, y)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef subtract(x, y, name=None):\n return ivy.subtract(x, y)\n\n\n@with_supported_dtypes({\"2.5.0 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef sqrt(x, name=None):\n return ivy.sqrt(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef atanh(x, name=None):\n return ivy.atanh(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef atan(x, name=None):\n return ivy.atan(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef round(x, name=None):\n return ivy.round(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef ceil(x, name=None):\n return ivy.ceil(x)\n\n\n@with_supported_dtypes({\"2.5.0 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef sinh(x, name=None):\n return ivy.sinh(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef pow(x, y, name=None):\n return ivy.pow(x, y)\n\n\n@with_unsupported_dtypes({\"2.4.2 and below\": (\"int16\", \"float16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef conj(x, name=None):\n return ivy.conj(x)\n\n\n@with_unsupported_dtypes({\"2.4.2 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef floor(x, name=None):\n return ivy.floor(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef remainder(x, y, name=None):\n return ivy.remainder(x, y)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef log2(x, name=None):\n return ivy.log2(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef log1p(x, name=None):\n return ivy.log1p(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef rad2deg(x, name=None):\n return ivy.rad2deg(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef deg2rad(x, name=None):\n return ivy.deg2rad(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef gcd(x, y, name=None):\n return ivy.gcd(x, y)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef tan(x, name=None):\n return ivy.tan(x)\n\n\n@with_unsupported_dtypes({\"2.4.2 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef atan2(x, y, name=None):\n return ivy.atan2(x, y)\n\n\n@with_supported_dtypes({\"2.5.0 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef square(x, name=None):\n return ivy.square(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef sign(x, name=None):\n return ivy.sign(x)\n\n\n@with_unsupported_dtypes({\"2.4.2 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef neg(x, name=None):\n return ivy.negative(x)\n\n\n@with_supported_dtypes({\"2.5.0 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef exp(x, name=None):\n return ivy.exp(x)\n\n\n@with_supported_dtypes(\n {\n \"2.4.2 and below\": (\n \"float32\",\n \"float64\",\n \"int32\",\n \"int64\",\n \"complex64\",\n \"complex128\",\n )\n },\n \"paddle\",\n)\n@to_ivy_arrays_and_back\ndef cumprod(x, dim=None, dtype=None, name=None):\n return ivy.cumprod(x, axis=dim, dtype=dtype)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef reciprocal(x, name=None):\n return ivy.reciprocal(x)\n", "path": "ivy/functional/frontends/paddle/tensor/math.py" } ]
[ { "content": "# global\nimport ivy\nfrom ivy.func_wrapper import with_unsupported_dtypes, with_supported_dtypes\nfrom ivy.functional.frontends.paddle.func_wrapper import to_ivy_arrays_and_back\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef sin(x, name=None):\n return ivy.sin(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef cos(x, name=None):\n return ivy.cos(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef acos(x, name=None):\n return ivy.acos(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef cosh(x, name=None):\n return ivy.cosh(x)\n\n\n@with_supported_dtypes({\"2.5.0 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef tanh(x, name=None):\n return ivy.tanh(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef acosh(x, name=None):\n return ivy.acosh(x)\n\n\n@with_supported_dtypes({\"2.5.0 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef asin(x, name=None):\n return ivy.asin(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef log(x, name=None):\n return ivy.log(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef divide(x, y, name=None):\n return ivy.divide(x, y)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef abs(x, name=None):\n return ivy.abs(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef multiply(x, y, name=None):\n return ivy.multiply(x, y)\n\n\n@with_unsupported_dtypes(\n {\"2.5.0 and below\": (\"bool\", \"unsigned\", \"int8\", \"float16\", \"bfloat16\")}, \"paddle\"\n)\n@to_ivy_arrays_and_back\ndef add(x, y, name=None):\n return ivy.add(x, y)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef subtract(x, y, name=None):\n return ivy.subtract(x, y)\n\n\n@with_supported_dtypes({\"2.5.0 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef sqrt(x, name=None):\n return ivy.sqrt(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef atanh(x, name=None):\n return ivy.atanh(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef atan(x, name=None):\n return ivy.atan(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef round(x, name=None):\n return ivy.round(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef ceil(x, name=None):\n return ivy.ceil(x)\n\n\n@with_supported_dtypes({\"2.5.0 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef sinh(x, name=None):\n return ivy.sinh(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef pow(x, y, name=None):\n return ivy.pow(x, y)\n\n\n@with_unsupported_dtypes({\"2.4.2 and below\": (\"int16\", \"float16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef conj(x, name=None):\n return ivy.conj(x)\n\n\n@with_unsupported_dtypes({\"2.4.2 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef floor(x, name=None):\n return ivy.floor(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef remainder(x, y, name=None):\n return ivy.remainder(x, y)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef log2(x, name=None):\n return ivy.log2(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef log1p(x, name=None):\n return ivy.log1p(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef rad2deg(x, name=None):\n return ivy.rad2deg(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef deg2rad(x, name=None):\n return ivy.deg2rad(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef gcd(x, y, name=None):\n return ivy.gcd(x, y)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef tan(x, name=None):\n return ivy.tan(x)\n\n\n@with_unsupported_dtypes({\"2.4.2 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef atan2(x, y, name=None):\n return ivy.atan2(x, y)\n\n\n@with_supported_dtypes({\"2.5.0 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef square(x, name=None):\n return ivy.square(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef sign(x, name=None):\n return ivy.sign(x)\n\n\n@with_unsupported_dtypes({\"2.4.2 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef neg(x, name=None):\n return ivy.negative(x)\n\n\n@with_supported_dtypes({\"2.5.0 and below\": (\"float32\", \"float64\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef exp(x, name=None):\n return ivy.exp(x)\n\n\n@with_supported_dtypes(\n {\n \"2.4.2 and below\": (\n \"float32\",\n \"float64\",\n \"int32\",\n \"int64\",\n \"complex64\",\n \"complex128\",\n )\n },\n \"paddle\",\n)\n@to_ivy_arrays_and_back\ndef cumprod(x, dim=None, dtype=None, name=None):\n return ivy.cumprod(x, axis=dim, dtype=dtype)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": (\"float16\", \"bfloat16\")}, \"paddle\")\n@to_ivy_arrays_and_back\ndef reciprocal(x, name=None):\n return ivy.reciprocal(x)\n\n\n@with_unsupported_dtypes({\"2.5.0 and below\": \"bfloat16\"}, \"paddle\")\n@to_ivy_arrays_and_back\ndef fmin(x, y, name=None):\n return ivy.fmin(x, y)\n", "path": "ivy/functional/frontends/paddle/tensor/math.py" } ]
diff --git a/ivy/functional/frontends/paddle/tensor/math.py b/ivy/functional/frontends/paddle/tensor/math.py index fed5e7fea40c7..8d55d66a1efda 100644 --- a/ivy/functional/frontends/paddle/tensor/math.py +++ b/ivy/functional/frontends/paddle/tensor/math.py @@ -232,3 +232,9 @@ def cumprod(x, dim=None, dtype=None, name=None): @to_ivy_arrays_and_back def reciprocal(x, name=None): return ivy.reciprocal(x) + + +@with_unsupported_dtypes({"2.5.0 and below": "bfloat16"}, "paddle") +@to_ivy_arrays_and_back +def fmin(x, y, name=None): + return ivy.fmin(x, y) diff --git a/ivy_tests/test_ivy/test_frontends/test_paddle/test_tensor/test_paddle_math.py b/ivy_tests/test_ivy/test_frontends/test_paddle/test_tensor/test_paddle_math.py index 3721af2910a82..4a15eaf442fbf 100644 --- a/ivy_tests/test_ivy/test_frontends/test_paddle/test_tensor/test_paddle_math.py +++ b/ivy_tests/test_ivy/test_frontends/test_paddle/test_tensor/test_paddle_math.py @@ -1001,3 +1001,29 @@ def test_paddle_gcd( x=x[0], y=x[1], ) + + +@handle_frontend_test( + fn_tree="paddle.fmin", + dtypes_and_x=helpers.dtype_and_values( + available_dtypes=helpers.get_dtypes("float"), num_arrays=2, shared_dtype=True + ), +) +def test_paddle_fmin( + *, + dtypes_and_x, + on_device, + fn_tree, + frontend, + test_flags, +): + input_dtype, x = dtypes_and_x + helpers.test_frontend_function( + input_dtypes=input_dtype, + frontend=frontend, + test_flags=test_flags, + fn_tree=fn_tree, + on_device=on_device, + x=x[0], + y=x[1], + )
celery__celery-6866
[ { "content": "\"\"\"The ``celery control``, ``. inspect`` and ``. status`` programs.\"\"\"\nfrom functools import partial\n\nimport click\nfrom kombu.utils.json import dumps\n\nfrom celery.bin.base import (COMMA_SEPARATED_LIST, CeleryCommand,\n CeleryOption, handle_preload_options)\nfrom celery.exceptions import CeleryCommandException\nfrom celery.platforms import EX_UNAVAILABLE\nfrom celery.utils import text\nfrom celery.worker.control import Panel\n\n\ndef _say_remote_command_reply(ctx, replies, show_reply=False):\n node = next(iter(replies)) # <-- take first.\n reply = replies[node]\n node = ctx.obj.style(f'{node}: ', fg='cyan', bold=True)\n status, preply = ctx.obj.pretty(reply)\n ctx.obj.say_chat('->', f'{node}{status}',\n text.indent(preply, 4) if show_reply else '',\n show_body=show_reply)\n\n\ndef _consume_arguments(meta, method, args):\n i = 0\n try:\n for i, arg in enumerate(args):\n try:\n name, typ = meta.args[i]\n except IndexError:\n if meta.variadic:\n break\n raise click.UsageError(\n 'Command {!r} takes arguments: {}'.format(\n method, meta.signature))\n else:\n yield name, typ(arg) if typ is not None else arg\n finally:\n args[:] = args[i:]\n\n\ndef _compile_arguments(action, args):\n meta = Panel.meta[action]\n arguments = {}\n if meta.args:\n arguments.update({\n k: v for k, v in _consume_arguments(meta, action, args)\n })\n if meta.variadic:\n arguments.update({meta.variadic: args})\n return arguments\n\n\n@click.command(cls=CeleryCommand)\n@click.option('-t',\n '--timeout',\n cls=CeleryOption,\n type=float,\n default=1.0,\n help_group='Remote Control Options',\n help='Timeout in seconds waiting for reply.')\n@click.option('-d',\n '--destination',\n cls=CeleryOption,\n type=COMMA_SEPARATED_LIST,\n help_group='Remote Control Options',\n help='Comma separated list of destination node names.')\n@click.option('-j',\n '--json',\n cls=CeleryOption,\n is_flag=True,\n help_group='Remote Control Options',\n help='Use json as output format.')\n@click.pass_context\n@handle_preload_options\ndef status(ctx, timeout, destination, json, **kwargs):\n \"\"\"Show list of workers that are online.\"\"\"\n callback = None if json else partial(_say_remote_command_reply, ctx)\n replies = ctx.obj.app.control.inspect(timeout=timeout,\n destination=destination,\n callback=callback).ping()\n\n if not replies:\n raise CeleryCommandException(\n message='No nodes replied within time constraint',\n exit_code=EX_UNAVAILABLE\n )\n\n if json:\n ctx.obj.echo(dumps(replies))\n nodecount = len(replies)\n if not kwargs.get('quiet', False):\n ctx.obj.echo('\\n{} {} online.'.format(\n nodecount, text.pluralize(nodecount, 'node')))\n\n\n@click.command(cls=CeleryCommand,\n context_settings={'allow_extra_args': True})\n@click.argument(\"action\", type=click.Choice([\n name for name, info in Panel.meta.items()\n if info.type == 'inspect' and info.visible\n]))\n@click.option('-t',\n '--timeout',\n cls=CeleryOption,\n type=float,\n default=1.0,\n help_group='Remote Control Options',\n help='Timeout in seconds waiting for reply.')\n@click.option('-d',\n '--destination',\n cls=CeleryOption,\n type=COMMA_SEPARATED_LIST,\n help_group='Remote Control Options',\n help='Comma separated list of destination node names.')\n@click.option('-j',\n '--json',\n cls=CeleryOption,\n is_flag=True,\n help_group='Remote Control Options',\n help='Use json as output format.')\n@click.pass_context\n@handle_preload_options\ndef inspect(ctx, action, timeout, destination, json, **kwargs):\n \"\"\"Inspect the worker at runtime.\n\n Availability: RabbitMQ (AMQP) and Redis transports.\n \"\"\"\n callback = None if json else partial(_say_remote_command_reply, ctx,\n show_reply=True)\n arguments = _compile_arguments(action, ctx.args)\n inspect = ctx.obj.app.control.inspect(timeout=timeout,\n destination=destination,\n callback=callback)\n replies = inspect._request(action,\n **arguments)\n\n if not replies:\n raise CeleryCommandException(\n message='No nodes replied within time constraint',\n exit_code=EX_UNAVAILABLE\n )\n\n if json:\n ctx.obj.echo(dumps(replies))\n nodecount = len(replies)\n if not ctx.obj.quiet:\n ctx.obj.echo('\\n{} {} online.'.format(\n nodecount, text.pluralize(nodecount, 'node')))\n\n\n@click.command(cls=CeleryCommand,\n context_settings={'allow_extra_args': True})\n@click.argument(\"action\", type=click.Choice([\n name for name, info in Panel.meta.items()\n if info.type == 'control' and info.visible\n]))\n@click.option('-t',\n '--timeout',\n cls=CeleryOption,\n type=float,\n default=1.0,\n help_group='Remote Control Options',\n help='Timeout in seconds waiting for reply.')\n@click.option('-d',\n '--destination',\n cls=CeleryOption,\n type=COMMA_SEPARATED_LIST,\n help_group='Remote Control Options',\n help='Comma separated list of destination node names.')\n@click.option('-j',\n '--json',\n cls=CeleryOption,\n is_flag=True,\n help_group='Remote Control Options',\n help='Use json as output format.')\n@click.pass_context\n@handle_preload_options\ndef control(ctx, action, timeout, destination, json):\n \"\"\"Workers remote control.\n\n Availability: RabbitMQ (AMQP), Redis, and MongoDB transports.\n \"\"\"\n callback = None if json else partial(_say_remote_command_reply, ctx,\n show_reply=True)\n args = ctx.args\n arguments = _compile_arguments(action, args)\n replies = ctx.obj.app.control.broadcast(action, timeout=timeout,\n destination=destination,\n callback=callback,\n reply=True,\n arguments=arguments)\n\n if not replies:\n raise CeleryCommandException(\n message='No nodes replied within time constraint',\n exit_code=EX_UNAVAILABLE\n )\n\n if json:\n ctx.obj.echo(dumps(replies))\n", "path": "celery/bin/control.py" } ]
[ { "content": "\"\"\"The ``celery control``, ``. inspect`` and ``. status`` programs.\"\"\"\nfrom functools import partial\n\nimport click\nfrom kombu.utils.json import dumps\n\nfrom celery.bin.base import (COMMA_SEPARATED_LIST, CeleryCommand,\n CeleryOption, handle_preload_options)\nfrom celery.exceptions import CeleryCommandException\nfrom celery.platforms import EX_UNAVAILABLE\nfrom celery.utils import text\nfrom celery.worker.control import Panel\n\n\ndef _say_remote_command_reply(ctx, replies, show_reply=False):\n node = next(iter(replies)) # <-- take first.\n reply = replies[node]\n node = ctx.obj.style(f'{node}: ', fg='cyan', bold=True)\n status, preply = ctx.obj.pretty(reply)\n ctx.obj.say_chat('->', f'{node}{status}',\n text.indent(preply, 4) if show_reply else '',\n show_body=show_reply)\n\n\ndef _consume_arguments(meta, method, args):\n i = 0\n try:\n for i, arg in enumerate(args):\n try:\n name, typ = meta.args[i]\n except IndexError:\n if meta.variadic:\n break\n raise click.UsageError(\n 'Command {!r} takes arguments: {}'.format(\n method, meta.signature))\n else:\n yield name, typ(arg) if typ is not None else arg\n finally:\n args[:] = args[i:]\n\n\ndef _compile_arguments(action, args):\n meta = Panel.meta[action]\n arguments = {}\n if meta.args:\n arguments.update({\n k: v for k, v in _consume_arguments(meta, action, args)\n })\n if meta.variadic:\n arguments.update({meta.variadic: args})\n return arguments\n\n\n@click.command(cls=CeleryCommand)\n@click.option('-t',\n '--timeout',\n cls=CeleryOption,\n type=float,\n default=1.0,\n help_group='Remote Control Options',\n help='Timeout in seconds waiting for reply.')\n@click.option('-d',\n '--destination',\n cls=CeleryOption,\n type=COMMA_SEPARATED_LIST,\n help_group='Remote Control Options',\n help='Comma separated list of destination node names.')\n@click.option('-j',\n '--json',\n cls=CeleryOption,\n is_flag=True,\n help_group='Remote Control Options',\n help='Use json as output format.')\n@click.pass_context\n@handle_preload_options\ndef status(ctx, timeout, destination, json, **kwargs):\n \"\"\"Show list of workers that are online.\"\"\"\n callback = None if json else partial(_say_remote_command_reply, ctx)\n replies = ctx.obj.app.control.inspect(timeout=timeout,\n destination=destination,\n callback=callback).ping()\n\n if not replies:\n raise CeleryCommandException(\n message='No nodes replied within time constraint',\n exit_code=EX_UNAVAILABLE\n )\n\n if json:\n ctx.obj.echo(dumps(replies))\n nodecount = len(replies)\n if not kwargs.get('quiet', False):\n ctx.obj.echo('\\n{} {} online.'.format(\n nodecount, text.pluralize(nodecount, 'node')))\n\n\n@click.command(cls=CeleryCommand,\n context_settings={'allow_extra_args': True})\n@click.argument(\"action\", type=click.Choice([\n name for name, info in Panel.meta.items()\n if info.type == 'inspect' and info.visible\n]))\n@click.option('-t',\n '--timeout',\n cls=CeleryOption,\n type=float,\n default=1.0,\n help_group='Remote Control Options',\n help='Timeout in seconds waiting for reply.')\n@click.option('-d',\n '--destination',\n cls=CeleryOption,\n type=COMMA_SEPARATED_LIST,\n help_group='Remote Control Options',\n help='Comma separated list of destination node names.')\n@click.option('-j',\n '--json',\n cls=CeleryOption,\n is_flag=True,\n help_group='Remote Control Options',\n help='Use json as output format.')\n@click.pass_context\n@handle_preload_options\ndef inspect(ctx, action, timeout, destination, json, **kwargs):\n \"\"\"Inspect the worker at runtime.\n\n Availability: RabbitMQ (AMQP) and Redis transports.\n \"\"\"\n callback = None if json else partial(_say_remote_command_reply, ctx,\n show_reply=True)\n arguments = _compile_arguments(action, ctx.args)\n inspect = ctx.obj.app.control.inspect(timeout=timeout,\n destination=destination,\n callback=callback)\n replies = inspect._request(action,\n **arguments)\n\n if not replies:\n raise CeleryCommandException(\n message='No nodes replied within time constraint',\n exit_code=EX_UNAVAILABLE\n )\n\n if json:\n ctx.obj.echo(dumps(replies))\n return\n\n nodecount = len(replies)\n if not ctx.obj.quiet:\n ctx.obj.echo('\\n{} {} online.'.format(\n nodecount, text.pluralize(nodecount, 'node')))\n\n\n@click.command(cls=CeleryCommand,\n context_settings={'allow_extra_args': True})\n@click.argument(\"action\", type=click.Choice([\n name for name, info in Panel.meta.items()\n if info.type == 'control' and info.visible\n]))\n@click.option('-t',\n '--timeout',\n cls=CeleryOption,\n type=float,\n default=1.0,\n help_group='Remote Control Options',\n help='Timeout in seconds waiting for reply.')\n@click.option('-d',\n '--destination',\n cls=CeleryOption,\n type=COMMA_SEPARATED_LIST,\n help_group='Remote Control Options',\n help='Comma separated list of destination node names.')\n@click.option('-j',\n '--json',\n cls=CeleryOption,\n is_flag=True,\n help_group='Remote Control Options',\n help='Use json as output format.')\n@click.pass_context\n@handle_preload_options\ndef control(ctx, action, timeout, destination, json):\n \"\"\"Workers remote control.\n\n Availability: RabbitMQ (AMQP), Redis, and MongoDB transports.\n \"\"\"\n callback = None if json else partial(_say_remote_command_reply, ctx,\n show_reply=True)\n args = ctx.args\n arguments = _compile_arguments(action, args)\n replies = ctx.obj.app.control.broadcast(action, timeout=timeout,\n destination=destination,\n callback=callback,\n reply=True,\n arguments=arguments)\n\n if not replies:\n raise CeleryCommandException(\n message='No nodes replied within time constraint',\n exit_code=EX_UNAVAILABLE\n )\n\n if json:\n ctx.obj.echo(dumps(replies))\n", "path": "celery/bin/control.py" } ]
diff --git a/celery/bin/control.py b/celery/bin/control.py index a13963a54b3..fbd3730c490 100644 --- a/celery/bin/control.py +++ b/celery/bin/control.py @@ -144,6 +144,8 @@ def inspect(ctx, action, timeout, destination, json, **kwargs): if json: ctx.obj.echo(dumps(replies)) + return + nodecount = len(replies) if not ctx.obj.quiet: ctx.obj.echo('\n{} {} online.'.format(
secdev__scapy-1402
[ { "content": "#! /usr/bin/env python\n\n\"\"\"\nDistutils setup file for Scapy.\n\"\"\"\n\n\nfrom distutils import archive_util\nfrom distutils import sysconfig\nfrom distutils.core import setup\nfrom distutils.command.sdist import sdist\nimport os\n\n\nEZIP_HEADER = \"\"\"#! /bin/sh\nPYTHONPATH=$0/%s exec python -m scapy\n\"\"\"\n\n\ndef make_ezipfile(base_name, base_dir, verbose=0, dry_run=0, **kwargs):\n fname = archive_util.make_zipfile(base_name, base_dir, verbose, dry_run)\n ofname = fname + \".old\"\n os.rename(fname, ofname)\n of = open(ofname)\n f = open(fname, \"w\")\n f.write(EZIP_HEADER % base_dir)\n while True:\n data = of.read(8192)\n if not data:\n break\n f.write(data)\n f.close()\n os.system(\"zip -A '%s'\" % fname)\n of.close()\n os.unlink(ofname)\n os.chmod(fname, 0o755)\n return fname\n\n\narchive_util.ARCHIVE_FORMATS[\"ezip\"] = (\n make_ezipfile, [], 'Executable ZIP file')\n\nSCRIPTS = ['bin/scapy', 'bin/UTscapy']\n# On Windows we also need additional batch files to run the above scripts\nif os.name == \"nt\":\n SCRIPTS += ['bin/scapy.bat', 'bin/UTscapy.bat']\n\nsetup(\n name='scapy',\n version=__import__('scapy').VERSION,\n packages=[\n 'scapy',\n 'scapy/arch',\n 'scapy/arch/bpf',\n 'scapy/arch/windows',\n 'scapy/contrib',\n 'scapy/layers',\n 'scapy/layers/tls',\n 'scapy/layers/tls/crypto',\n 'scapy/modules',\n 'scapy/modules/krack',\n 'scapy/asn1',\n 'scapy/tools',\n ],\n scripts=SCRIPTS,\n data_files=[('share/man/man1', [\"doc/scapy.1.gz\"])],\n package_data={\n 'scapy': ['VERSION'],\n },\n\n # Metadata\n author='Philippe BIONDI',\n author_email='phil(at)secdev.org',\n maintainer='Pierre LALET, Guillaume VALADON',\n description='Scapy: interactive packet manipulation tool',\n license='GPLv2',\n url='http://www.secdev.org/projects/scapy',\n download_url='https://github.com/secdev/scapy/tarball/master',\n keywords=[\"network\"],\n classifiers=[\n \"Development Status :: 5 - Production/Stable\",\n \"Environment :: Console\",\n \"Intended Audience :: Developers\",\n \"Intended Audience :: Information Technology\",\n \"Intended Audience :: Science/Research\",\n \"Intended Audience :: System Administrators\",\n \"Intended Audience :: Telecommunications Industry\",\n \"License :: OSI Approved :: GNU General Public License v2 (GPLv2)\",\n \"Programming Language :: Python :: 2\",\n \"Programming Language :: Python :: 2.7\",\n \"Programming Language :: Python :: 3\",\n \"Programming Language :: Python :: 3.4\",\n \"Programming Language :: Python :: 3.5\",\n \"Programming Language :: Python :: 3.6\",\n \"Topic :: Security\",\n \"Topic :: System :: Networking\",\n \"Topic :: System :: Networking :: Monitoring\",\n ]\n)\n", "path": "setup.py" } ]
[ { "content": "#! /usr/bin/env python\n\n\"\"\"\nDistutils setup file for Scapy.\n\"\"\"\n\n\nfrom distutils import archive_util\nfrom distutils import sysconfig\nfrom distutils.core import setup\nfrom distutils.command.sdist import sdist\nimport os\n\n\nEZIP_HEADER = \"\"\"#! /bin/sh\nPYTHONPATH=$0/%s exec python -m scapy\n\"\"\"\n\n\ndef make_ezipfile(base_name, base_dir, verbose=0, dry_run=0, **kwargs):\n fname = archive_util.make_zipfile(base_name, base_dir, verbose, dry_run)\n ofname = fname + \".old\"\n os.rename(fname, ofname)\n of = open(ofname)\n f = open(fname, \"w\")\n f.write(EZIP_HEADER % base_dir)\n while True:\n data = of.read(8192)\n if not data:\n break\n f.write(data)\n f.close()\n os.system(\"zip -A '%s'\" % fname)\n of.close()\n os.unlink(ofname)\n os.chmod(fname, 0o755)\n return fname\n\n\narchive_util.ARCHIVE_FORMATS[\"ezip\"] = (\n make_ezipfile, [], 'Executable ZIP file')\n\nSCRIPTS = ['bin/scapy', 'bin/UTscapy']\n# On Windows we also need additional batch files to run the above scripts\nif os.name == \"nt\":\n SCRIPTS += ['bin/scapy.bat', 'bin/UTscapy.bat']\n\nsetup(\n name='scapy',\n version=__import__('scapy').VERSION,\n packages=[\n 'scapy',\n 'scapy/arch',\n 'scapy/arch/bpf',\n 'scapy/arch/windows',\n 'scapy/contrib',\n 'scapy/layers',\n 'scapy/layers/tls',\n 'scapy/layers/tls/crypto',\n 'scapy/modules',\n 'scapy/modules/krack',\n 'scapy/asn1',\n 'scapy/tools',\n ],\n scripts=SCRIPTS,\n data_files=[('share/man/man1', [\"doc/scapy.1\"])],\n package_data={\n 'scapy': ['VERSION'],\n },\n\n # Metadata\n author='Philippe BIONDI',\n author_email='phil(at)secdev.org',\n maintainer='Pierre LALET, Guillaume VALADON',\n description='Scapy: interactive packet manipulation tool',\n license='GPLv2',\n url='http://www.secdev.org/projects/scapy',\n download_url='https://github.com/secdev/scapy/tarball/master',\n keywords=[\"network\"],\n classifiers=[\n \"Development Status :: 5 - Production/Stable\",\n \"Environment :: Console\",\n \"Intended Audience :: Developers\",\n \"Intended Audience :: Information Technology\",\n \"Intended Audience :: Science/Research\",\n \"Intended Audience :: System Administrators\",\n \"Intended Audience :: Telecommunications Industry\",\n \"License :: OSI Approved :: GNU General Public License v2 (GPLv2)\",\n \"Programming Language :: Python :: 2\",\n \"Programming Language :: Python :: 2.7\",\n \"Programming Language :: Python :: 3\",\n \"Programming Language :: Python :: 3.4\",\n \"Programming Language :: Python :: 3.5\",\n \"Programming Language :: Python :: 3.6\",\n \"Topic :: Security\",\n \"Topic :: System :: Networking\",\n \"Topic :: System :: Networking :: Monitoring\",\n ]\n)\n", "path": "setup.py" } ]
diff --git a/doc/scapy.1 b/doc/scapy.1 new file mode 100644 index 00000000000..6189a283542 --- /dev/null +++ b/doc/scapy.1 @@ -0,0 +1,199 @@ +.TH SCAPY 1 "May 8, 2018" +.SH NAME +scapy \- Interactive packet manipulation tool +.SH SYNOPSIS +.B scapy +.RI [ options ] +.SH DESCRIPTION +This manual page documents briefly the +.B Scapy +tool. +.PP +\fBScapy\fP is a powerful interactive packet manipulation tool, +packet generator, network scanner, network discovery, packet sniffer, +etc. It can for the moment replace hping, parts of nmap, arpspoof, arp-sk, +arping, tcpdump, tshark, p0f, ... +.PP +\fBScapy\fP uses the Python interpreter as a command board. That means that +you can use directly Python language (assign variables, use loops, +define functions, etc.) If you give a file a parameter when you run +\fBScapy\fP, your session (variables, functions, instances, ...) will be saved +when you leave the interpreter and restored the next time you launch +\fBScapy\fP. +.PP +The idea is simple. Those kinds of tools do two things : sending packets +and receiving answers. That's what \fBScapy\fP does : you define a set of +packets, it sends them, receives answers, matches requests with answers +and returns a list of packet couples (request, answer) and a list of +unmatched packets. This has the big advantage over tools like nmap or +hping that an answer is not reduced to (open/closed/filtered), but is +the whole packet. +.PP +On top of this can be used to build more high-level functions, for example, one +that does traceroutes and give as a result only the start TTL of the +request and the source IP of the answer. One that pings a whole network +and gives the list of machines answering. One that does a portscan and +returns a LaTeX report. + +.SH OPTIONS +Options for Scapy are: +.TP +\fB\-h\fR +display usage +.TP +\fB\-d\fR +increase log verbosity. Can be used many times. +.TP +\fB\-s\fR FILE +use FILE to save/load session values (variables, functions, instances, ...) +.TP +\fB\-p\fR PRESTART_FILE +use PRESTART_FILE instead of $HOME/.scapy_prestart.py as pre-startup file +.TP +\fB\-P\fR +do not run prestart file +.TP +\fB\-c\fR STARTUP_FILE +use STARTUP_FILE instead of $HOME/.scapy_startup.py as startup file +.TP +\fB\-C\fR +do not run startup file + +.SH COMMANDS +Only the vital commands to begin are listed here for the moment. +.TP +\fBls()\fR +lists supported protocol layers. If a protocol layer is given as parameter, lists its fields and types of fields. +.TP +\fBlsc()\fR +lists some user commands. If a command is given as parameter, its documentation is displayed. +.TP +\fBconf\fR +this object contains the configuration. + +.SH FILES +\fB$HOME/.scapy_prestart.py\fR +This file is run before Scapy core is loaded. Only the \fb\conf\fP object +is available. This file can be used to manipulate \fBconf.load_layers\fP +list to choose which layers will be loaded: + +.nf +conf.load_layers.remove("bluetooth") +conf.load_layers.append("new_layer") +.fi + +\fB$HOME/.scapy_startup.py\fR +This file is run after Scapy is loaded. It can be used to configure +some of the Scapy behaviors: + +.nf +conf.prog.pdfreader="xpdf" +split_layers(UDP,DNS) +.fi + +.SH EXAMPLES + +More verbose examples are available at +http://www.secdev.org/projects/scapy/demo.html +Just run \fBscapy\fP and try the following commands in the interpreter. + +.LP +Test the robustness of a network stack with invalid packets: +.nf +sr(IP(dst="172.16.1.1", ihl=2, options="\verb$\x02$", version=3)/ICMP()) +.fi + +.LP +Packet sniffing and dissection (with a bpf filter or tshark-like output): +.nf +a=sniff(filter="tcp port 110") +a=sniff(prn = lambda x: x.display) +.fi + +.LP +Sniffed packet re-emission: +.nf +a=sniff(filter="tcp port 110") +sendp(a) +.fi + +.LP +Pcap file packet re-emission: +.nf +sendp(rdpcap("file.cap")) +.fi + +.LP +Manual TCP traceroute: +.nf +sr(IP(dst="www.google.com", ttl=(1,30))/TCP(seq=RandInt(), sport=RandShort(), dport=dport) +.fi + +.LP +Protocol scan: +.nf +sr(IP(dst="172.16.1.28", proto=(1,254))) +.fi + +.LP +ARP ping: +.nf +srp(Ether(dst="ff:ff:ff:ff:ff:ff")/ARP(pdst="172.16.1.1/24")) +.fi + +.LP +ACK scan: +.nf +sr(IP(dst="172.16.1.28")/TCP(dport=(1,1024), flags="A")) +.fi + +.LP +Passive OS fingerprinting: +.nf +sniff(prn=prnp0f) +.fi + +.LP +Active OS fingerprinting: +.nf +nmap_fp("172.16.1.232") +.fi + + +.LP +ARP cache poisoning: +.nf +sendp(Ether(dst=tmac)/ARP(op="who-has", psrc=victim, pdst=target)) +.fi + +.LP +Reporting: +.nf +report_ports("192.168.2.34", (20,30)) +.fi + +.SH SEE ALSO + +.nf +https://scapy.net/ +https://github.com/secdev/scapy/ +https://scapy.readthedocs.io/en/latest/ +.fi + +.SH BUGS +Does not give the right source IP for routes that use interface aliases. + +May miss packets under heavy load. + +Session saving is limited by Python ability to marshal objects. As a +consequence, lambda functions and generators can't be saved, which seriously +reduce the usefulness of this feature. + +BPF filters don't work on Point-to-point interfaces. + + +.SH AUTHOR +Philippe Biondi <phil@secdev.org> +.PP +This manual page was written by Alberto Gonzalez Iniesta <agi@agi.as> +and Philippe Biondi. diff --git a/doc/scapy.1.gz b/doc/scapy.1.gz deleted file mode 100644 index 042526a5506..00000000000 Binary files a/doc/scapy.1.gz and /dev/null differ diff --git a/setup.py b/setup.py index fed2469193a..801a7aaf4d0 100755 --- a/setup.py +++ b/setup.py @@ -63,7 +63,7 @@ def make_ezipfile(base_name, base_dir, verbose=0, dry_run=0, **kwargs): 'scapy/tools', ], scripts=SCRIPTS, - data_files=[('share/man/man1', ["doc/scapy.1.gz"])], + data_files=[('share/man/man1', ["doc/scapy.1"])], package_data={ 'scapy': ['VERSION'], },
evennia__evennia-2900
[ { "content": "\"\"\"\nLogging facilities\n\nThese are thin wrappers on top of Twisted's logging facilities; logs\nare all directed either to stdout (if Evennia is running in\ninteractive mode) or to $GAME_DIR/server/logs.\n\nThe log_file() function uses its own threading system to log to\narbitrary files in $GAME_DIR/server/logs.\n\nNote: All logging functions have two aliases, log_type() and\nlog_typemsg(). This is for historical, back-compatible reasons.\n\n\"\"\"\n\n\nimport os\nimport time\nfrom datetime import datetime\nfrom traceback import format_exc\n\nfrom twisted import logger as twisted_logger\nfrom twisted.internet.threads import deferToThread\nfrom twisted.python import logfile\nfrom twisted.python import util as twisted_util\n\nlog = twisted_logger.Logger()\n\n_LOGDIR = None\n_LOG_ROTATE_SIZE = None\n_TIMEZONE = None\n_CHANNEL_LOG_NUM_TAIL_LINES = None\n\n_TIME_FORMAT = \"%Y-%m-%d %H:%M:%S\"\n\n\ndef _log(msg, logfunc, prefix=\"\", **kwargs):\n try:\n msg = str(msg)\n except Exception as err:\n msg = str(e)\n if kwargs:\n logfunc(msg, **kwargs)\n else:\n try:\n for line in msg.splitlines():\n logfunc(\"{line}\", prefix=prefix, line=line)\n except Exception as err:\n log.error(\"Log failure: {err}\", err=err)\n\n\n# log call functions (each has legacy aliases)\n\n\ndef log_info(msg, **kwargs):\n \"\"\"\n Logs any generic debugging/informative info that should appear in the log.\n\n Args:\n msg: (string) The message to be logged.\n **kwargs: If given, The `msg` is parsed as a format string with `{..}`\n formatting markers that should match the keywords.\n\n \"\"\"\n _log(msg, log.info, **kwargs)\n\n\ninfo = log_info\nlog_infomsg = log_info\nlog_msg = log_info\n\n\ndef log_warn(msg, **kwargs):\n \"\"\"\n Logs warnings that aren't critical but should be noted.\n\n Args:\n msg (str): The message to be logged.\n **kwargs: If given, The `msg` is parsed as a format string with `{..}`\n formatting markers that should match the keywords.\n\n \"\"\"\n _log(msg, log.warn, **kwargs)\n\n\nwarn = log_warn\nwarning = log_warn\nlog_warnmsg = log_warn\n\n\ndef log_err(msg, **kwargs):\n \"\"\"\n Logs an error message to the server log.\n\n Args:\n msg (str): The message to be logged.\n **kwargs: If given, The `msg` is parsed as a format string with `{..}`\n formatting markers that should match the keywords.\n\n \"\"\"\n _log(msg, log.error, **kwargs)\n\n\nerror = log_err\nerr = log_err\nlog_errmsg = log_err\n\n\ndef log_trace(msg=None, **kwargs):\n \"\"\"\n Log a traceback to the log. This should be called from within an\n exception.\n\n Args:\n msg (str, optional): Adds an extra line with added info\n at the end of the traceback in the log.\n **kwargs: If given, The `msg` is parsed as a format string with `{..}`\n formatting markers that should match the keywords.\n\n \"\"\"\n tracestring = format_exc()\n if tracestring:\n _log(tracestring, log.error, prefix=\"!!\", **kwargs)\n if msg:\n _log(msg, log.error, prefix=\"!!\", **kwargs)\n\n\nlog_tracemsg = log_trace\nexception = log_trace\ncritical = log_trace\ntrace = log_trace\n\n\ndef log_dep(msg, **kwargs):\n \"\"\"\n Prints a deprecation message.\n\n Args:\n msg (str): The deprecation message to log.\n **kwargs: If given, The `msg` is parsed as a format string with `{..}`\n formatting markers that should match the keywords.\n\n \"\"\"\n _log(msg, log.warn, prefix=\"DP\", **kwargs)\n\n\ndep = log_dep\ndeprecated = log_dep\nlog_depmsg = log_dep\n\n\ndef log_sec(msg, **kwargs):\n \"\"\"\n Prints a security-related message.\n\n Args:\n msg (str): The security message to log.\n **kwargs: If given, The `msg` is parsed as a format string with `{..}`\n formatting markers that should match the keywords.\n\n \"\"\"\n _log(msg, log.info, prefix=\"SS\", **kwargs)\n\n\nsec = log_sec\nsecurity = log_sec\nlog_secmsg = log_sec\n\n\ndef log_server(msg, **kwargs):\n \"\"\"\n This is for the Portal to log captured Server stdout messages (it's\n usually only used during startup, before Server log is open)\n\n Args:\n msg (str): The message to be logged.\n **kwargs: If given, The `msg` is parsed as a format string with `{..}`\n formatting markers that should match the keywords.\n \"\"\"\n _log(msg, log.info, prefix=\"Server\", **kwargs)\n\n\nclass GetLogObserver:\n \"\"\"\n Sets up how the system logs are formatted.\n\n \"\"\"\n\n component_prefix = \"\"\n event_levels = {\n twisted_logger.LogLevel.debug: \"??\",\n twisted_logger.LogLevel.info: \"..\",\n twisted_logger.LogLevel.warn: \"WW\",\n twisted_logger.LogLevel.error: \"EE\",\n twisted_logger.LogLevel.critical: \"!!\",\n }\n\n def format_log_event(self, event):\n \"\"\"\n By assigning log_system here, we skip the spammy display of namespace/level\n in the default log output.\n\n [component_prefix] [date] [system/lvl] [msg]\n\n \"\"\"\n # setting log_system fills the [..] block after the time stamp\n prefix = event.get(\"prefix\", \"\")\n if prefix:\n event[\"log_system\"] = prefix\n else:\n lvl = event.get(\"log_level\", twisted_logger.LogLevel.info)\n event[\"log_system\"] = self.event_levels.get(lvl, \"-\")\n event[\"log_format\"] = str(event.get(\"log_format\", \"\"))\n component_prefix = self.component_prefix or \"\"\n log_msg = twisted_logger.formatEventAsClassicLogText(\n event, formatTime=lambda e: twisted_logger.formatTime(e, _TIME_FORMAT)\n )\n return f\"{component_prefix}{log_msg}\"\n\n def __call__(self, outfile):\n return twisted_logger.FileLogObserver(outfile, self.format_log_event)\n\n\n# Called by server/portal on startup\n\n\nclass GetPortalLogObserver(GetLogObserver):\n component_prefix = \"|Portal| \"\n\n\nclass GetServerLogObserver(GetLogObserver):\n component_prefix = \"\"\n\n\n# logging overrides\n\n\ndef timeformat(when=None):\n \"\"\"\n This helper function will format the current time in the same\n way as the twisted logger does, including time zone info. Only\n difference from official logger is that we only use two digits\n for the year and don't show timezone for GMT times.\n\n Args:\n when (int, optional): This is a time in POSIX seconds on the form\n given by time.time(). If not given, this function will\n use the current time.\n\n Returns:\n timestring (str): A formatted string of the given time.\n\n \"\"\"\n when = when if when else time.time()\n\n # time zone offset: UTC - the actual offset\n tz_offset = datetime.utcfromtimestamp(when) - datetime.fromtimestamp(when)\n tz_offset = tz_offset.days * 86400 + tz_offset.seconds\n # correct given time to utc\n when = datetime.utcfromtimestamp(when - tz_offset)\n\n if tz_offset == 0:\n tz = \"\"\n else:\n tz_hour = abs(int(tz_offset // 3600))\n tz_mins = abs(int(tz_offset // 60 % 60))\n tz_sign = \"-\" if tz_offset >= 0 else \"+\"\n tz = \"%s%02d%s\" % (tz_sign, tz_hour, (\":%02d\" % tz_mins if tz_mins else \"\"))\n\n return \"%d-%02d-%02d %02d:%02d:%02d%s\" % (\n when.year - 2000,\n when.month,\n when.day,\n when.hour,\n when.minute,\n when.second,\n tz,\n )\n\n\nclass WeeklyLogFile(logfile.DailyLogFile):\n \"\"\"\n Log file that rotates once per week by default. Overrides key methods to change format.\n\n \"\"\"\n\n def __init__(self, name, directory, defaultMode=None, day_rotation=7, max_size=1000000):\n \"\"\"\n Args:\n name (str): Name of log file.\n directory (str): Directory holding the file.\n defaultMode (str): Permissions used to create file. Defaults to\n current permissions of this file if it exists.\n day_rotation (int): How often to rotate the file.\n max_size (int): Max size of log file before rotation (regardless of\n time). Defaults to 1M.\n\n \"\"\"\n self.day_rotation = day_rotation\n self.max_size = max_size\n self.size = 0\n logfile.DailyLogFile.__init__(self, name, directory, defaultMode=defaultMode)\n\n def _openFile(self):\n logfile.DailyLogFile._openFile(self)\n self.size = self._file.tell()\n\n def shouldRotate(self):\n \"\"\"Rotate when the date has changed since last write\"\"\"\n # all dates here are tuples (year, month, day)\n now = self.toDate()\n then = self.lastDate\n return (\n now[0] > then[0]\n or now[1] > then[1]\n or now[2] > (then[2] + self.day_rotation)\n or self.size >= self.max_size\n )\n\n def suffix(self, tupledate):\n \"\"\"Return the suffix given a (year, month, day) tuple or unixtime.\n Format changed to have 03 for march instead of 3 etc (retaining unix\n file order)\n\n If we get duplicate suffixes in location (due to hitting size limit),\n we append __1, __2 etc.\n\n Examples:\n server.log.2020_01_29\n server.log.2020_01_29__1\n server.log.2020_01_29__2\n\n \"\"\"\n suffix = \"\"\n copy_suffix = 0\n while True:\n try:\n suffix = \"_\".join([\"{:02d}\".format(part) for part in tupledate])\n except Exception:\n # try taking a float unixtime\n suffix = \"_\".join([\"{:02d}\".format(part) for part in self.toDate(tupledate)])\n\n suffix += f\"__{copy_suffix}\" if copy_suffix else \"\"\n\n if os.path.exists(f\"{self.path}.{suffix}\"):\n # Append a higher copy_suffix to try to break the tie (starting from 2)\n copy_suffix += 1\n else:\n break\n return suffix\n\n def rotate(self):\n try:\n self.rotate()\n except Exception:\n log_trace(f\"Could not rotate the log file {self.name}.\")\n\n def write(self, data):\n \"\"\"\n Write data to log file\n\n \"\"\"\n logfile.BaseLogFile.write(self, data)\n self.lastDate = max(self.lastDate, self.toDate())\n self.size += len(data)\n\n\n# Arbitrary file logger\n\n\nclass EvenniaLogFile(logfile.LogFile):\n \"\"\"\n A rotating logfile based off Twisted's LogFile. It overrides\n the LogFile's rotate method in order to append some of the last\n lines of the previous log to the start of the new log, in order\n to preserve a continuous chat history for channel log files.\n\n \"\"\"\n\n # we delay import of settings to keep logger module as free\n # from django as possible.\n global _CHANNEL_LOG_NUM_TAIL_LINES\n if _CHANNEL_LOG_NUM_TAIL_LINES is None:\n from django.conf import settings\n\n _CHANNEL_LOG_NUM_TAIL_LINES = settings.CHANNEL_LOG_NUM_TAIL_LINES\n num_lines_to_append = _CHANNEL_LOG_NUM_TAIL_LINES\n\n def rotate(self, num_lines_to_append=None):\n \"\"\"\n Rotates our log file and appends some number of lines from\n the previous log to the start of the new one.\n\n \"\"\"\n append_tail = (\n num_lines_to_append if num_lines_to_append is not None else self.num_lines_to_append\n )\n if not append_tail:\n logfile.LogFile.rotate(self)\n return\n lines = tail_log_file(self.path, 0, self.num_lines_to_append)\n super().rotate()\n for line in lines:\n self.write(line)\n\n def seek(self, *args, **kwargs):\n \"\"\"\n Convenience method for accessing our _file attribute's seek method,\n which is used in tail_log_function.\n\n Args:\n *args: Same args as file.seek\n **kwargs: Same kwargs as file.seek\n\n \"\"\"\n return self._file.seek(*args, **kwargs)\n\n def readlines(self, *args, **kwargs):\n \"\"\"\n Convenience method for accessing our _file attribute's readlines method,\n which is used in tail_log_function.\n\n Args:\n *args: same args as file.readlines\n **kwargs: same kwargs as file.readlines\n\n Returns:\n lines (list): lines from our _file attribute.\n\n \"\"\"\n lines = []\n for line in self._file.readlines(*args, **kwargs):\n try:\n lines.append(line.decode(\"utf-8\"))\n except UnicodeDecodeError:\n try:\n lines.append(str(line))\n except Exception:\n lines.append(\"\")\n return lines\n\n\n_LOG_FILE_HANDLES = {} # holds open log handles\n_LOG_FILE_HANDLE_COUNTS = {}\n_LOG_FILE_HANDLE_RESET = 500\n\n\ndef _open_log_file(filename):\n \"\"\"\n Helper to open the log file (always in the log dir) and cache its\n handle. Will create a new file in the log dir if one didn't\n exist.\n\n To avoid keeping the filehandle open indefinitely we reset it every\n _LOG_FILE_HANDLE_RESET accesses. This may help resolve issues for very\n long uptimes and heavy log use.\n\n \"\"\"\n # we delay import of settings to keep logger module as free\n # from django as possible.\n global _LOG_FILE_HANDLES, _LOG_FILE_HANDLE_COUNTS, _LOGDIR, _LOG_ROTATE_SIZE\n if not _LOGDIR:\n from django.conf import settings\n\n _LOGDIR = settings.LOG_DIR\n _LOG_ROTATE_SIZE = settings.CHANNEL_LOG_ROTATE_SIZE\n\n filename = os.path.join(_LOGDIR, filename)\n if filename in _LOG_FILE_HANDLES:\n _LOG_FILE_HANDLE_COUNTS[filename] += 1\n if _LOG_FILE_HANDLE_COUNTS[filename] > _LOG_FILE_HANDLE_RESET:\n # close/refresh handle\n _LOG_FILE_HANDLES[filename].close()\n del _LOG_FILE_HANDLES[filename]\n else:\n # return cached handle\n return _LOG_FILE_HANDLES[filename]\n try:\n filehandle = EvenniaLogFile.fromFullPath(filename, rotateLength=_LOG_ROTATE_SIZE)\n # filehandle = open(filename, \"a+\") # append mode + reading\n _LOG_FILE_HANDLES[filename] = filehandle\n _LOG_FILE_HANDLE_COUNTS[filename] = 0\n return filehandle\n except IOError:\n log_trace()\n return None\n\n\ndef log_file(msg, filename=\"game.log\"):\n \"\"\"\n Arbitrary file logger using threads.\n\n Args:\n msg (str): String to append to logfile.\n filename (str, optional): Defaults to 'game.log'. All logs\n will appear in the logs directory and log entries will start\n on new lines following datetime info.\n\n \"\"\"\n\n def callback(filehandle, msg):\n \"\"\"Writing to file and flushing result\"\"\"\n msg = \"\\n%s [-] %s\" % (timeformat(), msg.strip())\n filehandle.write(msg)\n # since we don't close the handle, we need to flush\n # manually or log file won't be written to until the\n # write buffer is full.\n filehandle.flush()\n\n def errback(failure):\n \"\"\"Catching errors to normal log\"\"\"\n log_trace()\n\n # save to server/logs/ directory\n filehandle = _open_log_file(filename)\n if filehandle:\n deferToThread(callback, filehandle, msg).addErrback(errback)\n\n\ndef log_file_exists(filename=\"game.log\"):\n \"\"\"\n Determine if a log-file already exists.\n\n Args:\n filename (str): The filename (within the log-dir).\n\n Returns:\n bool: If the log file exists or not.\n\n \"\"\"\n global _LOGDIR\n if not _LOGDIR:\n from django.conf import settings\n\n _LOGDIR = settings.LOG_DIR\n\n filename = os.path.join(_LOGDIR, filename)\n return os.path.exists(filename)\n\n\ndef rotate_log_file(filename=\"game.log\", num_lines_to_append=None):\n \"\"\"\n Force-rotate a log-file, without\n\n Args:\n filename (str): The log file, located in settings.LOG_DIR.\n num_lines_to_append (int, optional): Include N number of\n lines from previous file in new one. If `None`, use default.\n Set to 0 to include no lines.\n\n \"\"\"\n if log_file_exists(filename):\n file_handle = _open_log_file(filename)\n if file_handle:\n file_handle.rotate(num_lines_to_append=num_lines_to_append)\n\n\ndef tail_log_file(filename, offset, nlines, callback=None):\n \"\"\"\n Return the tail of the log file.\n\n Args:\n filename (str): The name of the log file, presumed to be in\n the Evennia log dir.\n offset (int): The line offset *from the end of the file* to start\n reading from. 0 means to start at the latest entry.\n nlines (int): How many lines to return, counting backwards\n from the offset. If file is shorter, will get all lines.\n callback (callable, optional): A function to manage the result of the\n asynchronous file access. This will get a list of lines. If unset,\n the tail will happen synchronously.\n\n Returns:\n lines (deferred or list): This will be a deferred if `callable` is given,\n otherwise it will be a list with The nline entries from the end of the file, or\n all if the file is shorter than nlines.\n\n \"\"\"\n\n def seek_file(filehandle, offset, nlines, callback):\n \"\"\"step backwards in chunks and stop only when we have enough lines\"\"\"\n lines_found = []\n buffer_size = 4098\n block_count = -1\n while len(lines_found) < (offset + nlines):\n try:\n # scan backwards in file, starting from the end\n filehandle.seek(block_count * buffer_size, os.SEEK_END)\n except IOError:\n # file too small for this seek, take what we've got\n filehandle.seek(0)\n lines_found = filehandle.readlines()\n break\n lines_found = filehandle.readlines()\n block_count -= 1\n # return the right number of lines\n lines_found = lines_found[-nlines - offset : -offset if offset else None]\n if callback:\n callback(lines_found)\n return None\n else:\n return lines_found\n\n def errback(failure):\n \"\"\"Catching errors to normal log\"\"\"\n log_trace()\n\n filehandle = _open_log_file(filename)\n if filehandle:\n if callback:\n return deferToThread(seek_file, filehandle, offset, nlines, callback).addErrback(\n errback\n )\n else:\n return seek_file(filehandle, offset, nlines, callback)\n else:\n return None\n", "path": "evennia/utils/logger.py" } ]
[ { "content": "\"\"\"\nLogging facilities\n\nThese are thin wrappers on top of Twisted's logging facilities; logs\nare all directed either to stdout (if Evennia is running in\ninteractive mode) or to $GAME_DIR/server/logs.\n\nThe log_file() function uses its own threading system to log to\narbitrary files in $GAME_DIR/server/logs.\n\nNote: All logging functions have two aliases, log_type() and\nlog_typemsg(). This is for historical, back-compatible reasons.\n\n\"\"\"\n\n\nimport os\nimport time\nfrom datetime import datetime\nfrom traceback import format_exc\n\nfrom twisted import logger as twisted_logger\nfrom twisted.internet.threads import deferToThread\nfrom twisted.python import logfile\nfrom twisted.python import util as twisted_util\n\nlog = twisted_logger.Logger()\n\n_LOGDIR = None\n_LOG_ROTATE_SIZE = None\n_TIMEZONE = None\n_CHANNEL_LOG_NUM_TAIL_LINES = None\n\n_TIME_FORMAT = \"%Y-%m-%d %H:%M:%S\"\n\n\ndef _log(msg, logfunc, prefix=\"\", **kwargs):\n try:\n msg = str(msg)\n except Exception as err:\n msg = str(e)\n if kwargs:\n logfunc(msg, **kwargs)\n else:\n try:\n for line in msg.splitlines():\n logfunc(\"{line}\", prefix=prefix, line=line)\n except Exception as err:\n log.error(\"Log failure: {err}\", err=err)\n\n\n# log call functions (each has legacy aliases)\n\n\ndef log_info(msg, **kwargs):\n \"\"\"\n Logs any generic debugging/informative info that should appear in the log.\n\n Args:\n msg: (string) The message to be logged.\n **kwargs: If given, The `msg` is parsed as a format string with `{..}`\n formatting markers that should match the keywords.\n\n \"\"\"\n _log(msg, log.info, **kwargs)\n\n\ninfo = log_info\nlog_infomsg = log_info\nlog_msg = log_info\n\n\ndef log_warn(msg, **kwargs):\n \"\"\"\n Logs warnings that aren't critical but should be noted.\n\n Args:\n msg (str): The message to be logged.\n **kwargs: If given, The `msg` is parsed as a format string with `{..}`\n formatting markers that should match the keywords.\n\n \"\"\"\n _log(msg, log.warn, **kwargs)\n\n\nwarn = log_warn\nwarning = log_warn\nlog_warnmsg = log_warn\n\n\ndef log_err(msg, **kwargs):\n \"\"\"\n Logs an error message to the server log.\n\n Args:\n msg (str): The message to be logged.\n **kwargs: If given, The `msg` is parsed as a format string with `{..}`\n formatting markers that should match the keywords.\n\n \"\"\"\n _log(msg, log.error, **kwargs)\n\n\nerror = log_err\nerr = log_err\nlog_errmsg = log_err\n\n\ndef log_trace(msg=None, **kwargs):\n \"\"\"\n Log a traceback to the log. This should be called from within an\n exception.\n\n Args:\n msg (str, optional): Adds an extra line with added info\n at the end of the traceback in the log.\n **kwargs: If given, The `msg` is parsed as a format string with `{..}`\n formatting markers that should match the keywords.\n\n \"\"\"\n tracestring = format_exc()\n if tracestring:\n _log(tracestring, log.error, prefix=\"!!\", **kwargs)\n if msg:\n _log(msg, log.error, prefix=\"!!\", **kwargs)\n\n\nlog_tracemsg = log_trace\nexception = log_trace\ncritical = log_trace\ntrace = log_trace\n\n\ndef log_dep(msg, **kwargs):\n \"\"\"\n Prints a deprecation message.\n\n Args:\n msg (str): The deprecation message to log.\n **kwargs: If given, The `msg` is parsed as a format string with `{..}`\n formatting markers that should match the keywords.\n\n \"\"\"\n _log(msg, log.warn, prefix=\"DP\", **kwargs)\n\n\ndep = log_dep\ndeprecated = log_dep\nlog_depmsg = log_dep\n\n\ndef log_sec(msg, **kwargs):\n \"\"\"\n Prints a security-related message.\n\n Args:\n msg (str): The security message to log.\n **kwargs: If given, The `msg` is parsed as a format string with `{..}`\n formatting markers that should match the keywords.\n\n \"\"\"\n _log(msg, log.info, prefix=\"SS\", **kwargs)\n\n\nsec = log_sec\nsecurity = log_sec\nlog_secmsg = log_sec\n\n\ndef log_server(msg, **kwargs):\n \"\"\"\n This is for the Portal to log captured Server stdout messages (it's\n usually only used during startup, before Server log is open)\n\n Args:\n msg (str): The message to be logged.\n **kwargs: If given, The `msg` is parsed as a format string with `{..}`\n formatting markers that should match the keywords.\n \"\"\"\n _log(msg, log.info, prefix=\"Server\", **kwargs)\n\n\nclass GetLogObserver:\n \"\"\"\n Sets up how the system logs are formatted.\n\n \"\"\"\n\n component_prefix = \"\"\n event_levels = {\n twisted_logger.LogLevel.debug: \"??\",\n twisted_logger.LogLevel.info: \"..\",\n twisted_logger.LogLevel.warn: \"WW\",\n twisted_logger.LogLevel.error: \"EE\",\n twisted_logger.LogLevel.critical: \"!!\",\n }\n\n def format_log_event(self, event):\n \"\"\"\n By assigning log_system here, we skip the spammy display of namespace/level\n in the default log output.\n\n [component_prefix] [date] [system/lvl] [msg]\n\n \"\"\"\n # setting log_system fills the [..] block after the time stamp\n prefix = event.get(\"prefix\", \"\")\n if prefix:\n event[\"log_system\"] = prefix\n else:\n lvl = event.get(\"log_level\", twisted_logger.LogLevel.info)\n event[\"log_system\"] = self.event_levels.get(lvl, \"-\")\n event[\"log_format\"] = str(event.get(\"log_format\", \"\"))\n component_prefix = self.component_prefix or \"\"\n log_msg = twisted_logger.formatEventAsClassicLogText(\n event, formatTime=lambda e: twisted_logger.formatTime(e, _TIME_FORMAT)\n )\n return f\"{component_prefix}{log_msg}\"\n\n def __call__(self, outfile):\n return twisted_logger.FileLogObserver(outfile, self.format_log_event)\n\n\n# Called by server/portal on startup\n\n\nclass GetPortalLogObserver(GetLogObserver):\n component_prefix = \"|Portal| \"\n\n\nclass GetServerLogObserver(GetLogObserver):\n component_prefix = \"\"\n\n\n# logging overrides\n\n\ndef timeformat(when=None):\n \"\"\"\n This helper function will format the current time in the same\n way as the twisted logger does, including time zone info. Only\n difference from official logger is that we only use two digits\n for the year and don't show timezone for GMT times.\n\n Args:\n when (int, optional): This is a time in POSIX seconds on the form\n given by time.time(). If not given, this function will\n use the current time.\n\n Returns:\n timestring (str): A formatted string of the given time.\n\n \"\"\"\n when = when if when else time.time()\n\n # time zone offset: UTC - the actual offset\n tz_offset = datetime.utcfromtimestamp(when) - datetime.fromtimestamp(when)\n tz_offset = tz_offset.days * 86400 + tz_offset.seconds\n # correct given time to utc\n when = datetime.utcfromtimestamp(when - tz_offset)\n\n if tz_offset == 0:\n tz = \"\"\n else:\n tz_hour = abs(int(tz_offset // 3600))\n tz_mins = abs(int(tz_offset // 60 % 60))\n tz_sign = \"-\" if tz_offset >= 0 else \"+\"\n tz = \"%s%02d%s\" % (tz_sign, tz_hour, (\":%02d\" % tz_mins if tz_mins else \"\"))\n\n return \"%d-%02d-%02d %02d:%02d:%02d%s\" % (\n when.year - 2000,\n when.month,\n when.day,\n when.hour,\n when.minute,\n when.second,\n tz,\n )\n\n\nclass WeeklyLogFile(logfile.DailyLogFile):\n \"\"\"\n Log file that rotates once per week by default. Overrides key methods to change format.\n\n \"\"\"\n\n def __init__(self, name, directory, defaultMode=None, day_rotation=7, max_size=1000000):\n \"\"\"\n Args:\n name (str): Name of log file.\n directory (str): Directory holding the file.\n defaultMode (str): Permissions used to create file. Defaults to\n current permissions of this file if it exists.\n day_rotation (int): How often to rotate the file.\n max_size (int): Max size of log file before rotation (regardless of\n time). Defaults to 1M.\n\n \"\"\"\n self.day_rotation = day_rotation\n self.max_size = max_size\n self.size = 0\n logfile.DailyLogFile.__init__(self, name, directory, defaultMode=defaultMode)\n\n def _openFile(self):\n logfile.DailyLogFile._openFile(self)\n self.size = self._file.tell()\n\n def shouldRotate(self):\n \"\"\"Rotate when the date has changed since last write\"\"\"\n # all dates here are tuples (year, month, day)\n now = self.toDate()\n then = self.lastDate\n return (\n now[0] > then[0]\n or now[1] > then[1]\n or now[2] > (then[2] + self.day_rotation)\n or self.size >= self.max_size\n )\n\n def suffix(self, tupledate):\n \"\"\"Return the suffix given a (year, month, day) tuple or unixtime.\n Format changed to have 03 for march instead of 3 etc (retaining unix\n file order)\n\n If we get duplicate suffixes in location (due to hitting size limit),\n we append __1, __2 etc.\n\n Examples:\n server.log.2020_01_29\n server.log.2020_01_29__1\n server.log.2020_01_29__2\n\n \"\"\"\n suffix = \"\"\n copy_suffix = 0\n while True:\n try:\n suffix = \"_\".join([\"{:02d}\".format(part) for part in tupledate])\n except Exception:\n # try taking a float unixtime\n suffix = \"_\".join([\"{:02d}\".format(part) for part in self.toDate(tupledate)])\n\n suffix += f\"__{copy_suffix}\" if copy_suffix else \"\"\n\n if os.path.exists(f\"{self.path}.{suffix}\"):\n # Append a higher copy_suffix to try to break the tie (starting from 2)\n copy_suffix += 1\n else:\n break\n return suffix\n\n def rotate(self):\n try:\n super().rotate()\n except Exception:\n log_trace(f\"Could not rotate the log file {self.name}.\")\n\n def write(self, data):\n \"\"\"\n Write data to log file\n\n \"\"\"\n logfile.BaseLogFile.write(self, data)\n self.lastDate = max(self.lastDate, self.toDate())\n self.size += len(data)\n\n\n# Arbitrary file logger\n\n\nclass EvenniaLogFile(logfile.LogFile):\n \"\"\"\n A rotating logfile based off Twisted's LogFile. It overrides\n the LogFile's rotate method in order to append some of the last\n lines of the previous log to the start of the new log, in order\n to preserve a continuous chat history for channel log files.\n\n \"\"\"\n\n # we delay import of settings to keep logger module as free\n # from django as possible.\n global _CHANNEL_LOG_NUM_TAIL_LINES\n if _CHANNEL_LOG_NUM_TAIL_LINES is None:\n from django.conf import settings\n\n _CHANNEL_LOG_NUM_TAIL_LINES = settings.CHANNEL_LOG_NUM_TAIL_LINES\n num_lines_to_append = _CHANNEL_LOG_NUM_TAIL_LINES\n\n def rotate(self, num_lines_to_append=None):\n \"\"\"\n Rotates our log file and appends some number of lines from\n the previous log to the start of the new one.\n\n \"\"\"\n append_tail = (\n num_lines_to_append if num_lines_to_append is not None else self.num_lines_to_append\n )\n if not append_tail:\n logfile.LogFile.rotate(self)\n return\n lines = tail_log_file(self.path, 0, self.num_lines_to_append)\n super().rotate()\n for line in lines:\n self.write(line)\n\n def seek(self, *args, **kwargs):\n \"\"\"\n Convenience method for accessing our _file attribute's seek method,\n which is used in tail_log_function.\n\n Args:\n *args: Same args as file.seek\n **kwargs: Same kwargs as file.seek\n\n \"\"\"\n return self._file.seek(*args, **kwargs)\n\n def readlines(self, *args, **kwargs):\n \"\"\"\n Convenience method for accessing our _file attribute's readlines method,\n which is used in tail_log_function.\n\n Args:\n *args: same args as file.readlines\n **kwargs: same kwargs as file.readlines\n\n Returns:\n lines (list): lines from our _file attribute.\n\n \"\"\"\n lines = []\n for line in self._file.readlines(*args, **kwargs):\n try:\n lines.append(line.decode(\"utf-8\"))\n except UnicodeDecodeError:\n try:\n lines.append(str(line))\n except Exception:\n lines.append(\"\")\n return lines\n\n\n_LOG_FILE_HANDLES = {} # holds open log handles\n_LOG_FILE_HANDLE_COUNTS = {}\n_LOG_FILE_HANDLE_RESET = 500\n\n\ndef _open_log_file(filename):\n \"\"\"\n Helper to open the log file (always in the log dir) and cache its\n handle. Will create a new file in the log dir if one didn't\n exist.\n\n To avoid keeping the filehandle open indefinitely we reset it every\n _LOG_FILE_HANDLE_RESET accesses. This may help resolve issues for very\n long uptimes and heavy log use.\n\n \"\"\"\n # we delay import of settings to keep logger module as free\n # from django as possible.\n global _LOG_FILE_HANDLES, _LOG_FILE_HANDLE_COUNTS, _LOGDIR, _LOG_ROTATE_SIZE\n if not _LOGDIR:\n from django.conf import settings\n\n _LOGDIR = settings.LOG_DIR\n _LOG_ROTATE_SIZE = settings.CHANNEL_LOG_ROTATE_SIZE\n\n filename = os.path.join(_LOGDIR, filename)\n if filename in _LOG_FILE_HANDLES:\n _LOG_FILE_HANDLE_COUNTS[filename] += 1\n if _LOG_FILE_HANDLE_COUNTS[filename] > _LOG_FILE_HANDLE_RESET:\n # close/refresh handle\n _LOG_FILE_HANDLES[filename].close()\n del _LOG_FILE_HANDLES[filename]\n else:\n # return cached handle\n return _LOG_FILE_HANDLES[filename]\n try:\n filehandle = EvenniaLogFile.fromFullPath(filename, rotateLength=_LOG_ROTATE_SIZE)\n # filehandle = open(filename, \"a+\") # append mode + reading\n _LOG_FILE_HANDLES[filename] = filehandle\n _LOG_FILE_HANDLE_COUNTS[filename] = 0\n return filehandle\n except IOError:\n log_trace()\n return None\n\n\ndef log_file(msg, filename=\"game.log\"):\n \"\"\"\n Arbitrary file logger using threads.\n\n Args:\n msg (str): String to append to logfile.\n filename (str, optional): Defaults to 'game.log'. All logs\n will appear in the logs directory and log entries will start\n on new lines following datetime info.\n\n \"\"\"\n\n def callback(filehandle, msg):\n \"\"\"Writing to file and flushing result\"\"\"\n msg = \"\\n%s [-] %s\" % (timeformat(), msg.strip())\n filehandle.write(msg)\n # since we don't close the handle, we need to flush\n # manually or log file won't be written to until the\n # write buffer is full.\n filehandle.flush()\n\n def errback(failure):\n \"\"\"Catching errors to normal log\"\"\"\n log_trace()\n\n # save to server/logs/ directory\n filehandle = _open_log_file(filename)\n if filehandle:\n deferToThread(callback, filehandle, msg).addErrback(errback)\n\n\ndef log_file_exists(filename=\"game.log\"):\n \"\"\"\n Determine if a log-file already exists.\n\n Args:\n filename (str): The filename (within the log-dir).\n\n Returns:\n bool: If the log file exists or not.\n\n \"\"\"\n global _LOGDIR\n if not _LOGDIR:\n from django.conf import settings\n\n _LOGDIR = settings.LOG_DIR\n\n filename = os.path.join(_LOGDIR, filename)\n return os.path.exists(filename)\n\n\ndef rotate_log_file(filename=\"game.log\", num_lines_to_append=None):\n \"\"\"\n Force-rotate a log-file, without\n\n Args:\n filename (str): The log file, located in settings.LOG_DIR.\n num_lines_to_append (int, optional): Include N number of\n lines from previous file in new one. If `None`, use default.\n Set to 0 to include no lines.\n\n \"\"\"\n if log_file_exists(filename):\n file_handle = _open_log_file(filename)\n if file_handle:\n file_handle.rotate(num_lines_to_append=num_lines_to_append)\n\n\ndef tail_log_file(filename, offset, nlines, callback=None):\n \"\"\"\n Return the tail of the log file.\n\n Args:\n filename (str): The name of the log file, presumed to be in\n the Evennia log dir.\n offset (int): The line offset *from the end of the file* to start\n reading from. 0 means to start at the latest entry.\n nlines (int): How many lines to return, counting backwards\n from the offset. If file is shorter, will get all lines.\n callback (callable, optional): A function to manage the result of the\n asynchronous file access. This will get a list of lines. If unset,\n the tail will happen synchronously.\n\n Returns:\n lines (deferred or list): This will be a deferred if `callable` is given,\n otherwise it will be a list with The nline entries from the end of the file, or\n all if the file is shorter than nlines.\n\n \"\"\"\n\n def seek_file(filehandle, offset, nlines, callback):\n \"\"\"step backwards in chunks and stop only when we have enough lines\"\"\"\n lines_found = []\n buffer_size = 4098\n block_count = -1\n while len(lines_found) < (offset + nlines):\n try:\n # scan backwards in file, starting from the end\n filehandle.seek(block_count * buffer_size, os.SEEK_END)\n except IOError:\n # file too small for this seek, take what we've got\n filehandle.seek(0)\n lines_found = filehandle.readlines()\n break\n lines_found = filehandle.readlines()\n block_count -= 1\n # return the right number of lines\n lines_found = lines_found[-nlines - offset : -offset if offset else None]\n if callback:\n callback(lines_found)\n return None\n else:\n return lines_found\n\n def errback(failure):\n \"\"\"Catching errors to normal log\"\"\"\n log_trace()\n\n filehandle = _open_log_file(filename)\n if filehandle:\n if callback:\n return deferToThread(seek_file, filehandle, offset, nlines, callback).addErrback(\n errback\n )\n else:\n return seek_file(filehandle, offset, nlines, callback)\n else:\n return None\n", "path": "evennia/utils/logger.py" } ]
diff --git a/evennia/utils/logger.py b/evennia/utils/logger.py index c08edd1fb88..9e81b2b5b0d 100644 --- a/evennia/utils/logger.py +++ b/evennia/utils/logger.py @@ -351,7 +351,7 @@ def suffix(self, tupledate): def rotate(self): try: - self.rotate() + super().rotate() except Exception: log_trace(f"Could not rotate the log file {self.name}.")
opsdroid__opsdroid-169
[ { "content": "#!/usr/bin/env python3\nimport os\nfrom setuptools import setup, find_packages\nfrom opsdroid.const import __version__\n\nPACKAGE_NAME = 'opsdroid'\nHERE = os.path.abspath(os.path.dirname(__file__))\n\nPACKAGES = find_packages(exclude=['tests', 'tests.*', 'modules',\n 'modules.*', 'docs', 'docs.*'])\n\nREQUIRES = [\n 'pyyaml>=3.11,<4',\n 'aiohttp>=1.2.0,<2',\n 'pycron>=0.40',\n]\n\nsetup(\n name=PACKAGE_NAME,\n version=__version__,\n license='GNU GENERAL PUBLIC LICENSE V3',\n url='',\n download_url='',\n author='Jacob Tomlinson',\n author_email='jacob@tom.linson.uk',\n description='An open source chat-ops bot.',\n packages=PACKAGES,\n include_package_data=True,\n zip_safe=False,\n platforms='any',\n install_requires=REQUIRES,\n test_suite='tests',\n keywords=['bot', 'chatops'],\n entry_points={\n 'console_scripts': [\n 'opsdroid = opsdroid.__main__:main'\n ]\n },\n)\n", "path": "setup.py" } ]
[ { "content": "#!/usr/bin/env python3\nimport os\nfrom setuptools import setup, find_packages\nfrom opsdroid.const import __version__\n\nPACKAGE_NAME = 'opsdroid'\nHERE = os.path.abspath(os.path.dirname(__file__))\n\nPACKAGES = find_packages(exclude=['tests', 'tests.*', 'modules',\n 'modules.*', 'docs', 'docs.*'])\n\nREQUIRES = [\n 'arrow==0.10.0',\n 'aiohttp==2.1.0',\n 'pycron==0.40',\n 'pyyaml==3.12'\n]\n\nsetup(\n name=PACKAGE_NAME,\n version=__version__,\n license='GNU GENERAL PUBLIC LICENSE V3',\n url='',\n download_url='',\n author='Jacob Tomlinson',\n author_email='jacob@tom.linson.uk',\n description='An open source chat-ops bot.',\n packages=PACKAGES,\n include_package_data=True,\n zip_safe=False,\n platforms='any',\n install_requires=REQUIRES,\n test_suite='tests',\n keywords=['bot', 'chatops'],\n entry_points={\n 'console_scripts': [\n 'opsdroid = opsdroid.__main__:main'\n ]\n },\n)\n", "path": "setup.py" } ]
diff --git a/setup.py b/setup.py index 93c131f01..fc1cae030 100644 --- a/setup.py +++ b/setup.py @@ -10,9 +10,10 @@ 'modules.*', 'docs', 'docs.*']) REQUIRES = [ - 'pyyaml>=3.11,<4', - 'aiohttp>=1.2.0,<2', - 'pycron>=0.40', + 'arrow==0.10.0', + 'aiohttp==2.1.0', + 'pycron==0.40', + 'pyyaml==3.12' ] setup(
nltk__nltk-1219
[ { "content": "# -*- coding: utf-8 -*-\n# Natural Language Toolkit: RIBES Score\n#\n# Copyright (C) 2001-2015 NLTK Project\n# Contributors: Katsuhito Sudoh, Liling Tan, Kasramvd, J.F.Sebastian, Mark Byers, ekhumoro, P. Ortiz\n# URL: <http://nltk.org/>\n# For license information, see LICENSE.TXT\n\"\"\" RIBES score implementation \"\"\"\n\nfrom itertools import islice\nimport math\n\nfrom nltk.util import ngrams, choose\n\n\ndef ribes(references, hypothesis, alpha=0.25, beta=0.10):\n \"\"\"\n The RIBES (Rank-based Intuitive Bilingual Evaluation Score) from \n Hideki Isozaki, Tsutomu Hirao, Kevin Duh, Katsuhito Sudoh and \n Hajime Tsukada. 2010. \"Automatic Evaluation of Translation Quality for \n Distant Language Pairs\". In Proceedings of EMNLP. \n http://www.aclweb.org/anthology/D/D10/D10-1092.pdf \n \n The generic RIBES scores used in shared task, e.g. Workshop for \n Asian Translation (WAT) uses the following RIBES calculations:\n \n RIBES = kendall_tau * (alpha**p1) * (beta**bp)\n \n Please note that this re-implementation differs from the official\n RIBES implementation and though it emulates the results as describe\n in the original paper, there are further optimization implemented \n in the official RIBES script.\n \n Users are encouraged to use the official RIBES script instead of this \n implementation when evaluating your machine translation system. Refer\n to http://www.kecl.ntt.co.jp/icl/lirg/ribes/ for the official script.\n \n :param references: a list of reference sentences\n :type reference: list(list(str))\n :param hypothesis: a hypothesis sentence\n :type hypothesis: list(str)\n :param alpha: hyperparameter used as a prior for the unigram precision.\n :type alpha: float\n :param beta: hyperparameter used as a prior for the brevity penalty.\n :type beta: float\n :return: The best ribes score from one of the references.\n :rtype: float\n \"\"\"\n best_ribes = -1.0\n # Calculates RIBES for each reference and returns the best score.\n for reference in references:\n # Collects the *worder* from the ranked correlation alignments.\n worder = word_rank_alignment(reference, hypothesis)\n nkt = kendall_tau(worder)\n \n # Calculates the brevity penalty\n bp = min(1.0, math.exp(1.0 - 1.0 * len(reference)/len(hypothesis)))\n \n # Calculates the unigram precision, *p1*\n p1 = 1.0 * len(worder) / len(hypothesis)\n \n _ribes = nkt * (p1 ** alpha) * (bp ** beta)\n \n if _ribes > best_ribes: # Keeps the best score.\n best_ribes = _ribes\n \n return best_ribes\n\n\ndef position_of_ngram(ngram, sentence):\n \"\"\"\n This function returns the position of the first instance of the ngram \n appearing in a sentence.\n \n Note that one could also use string as follows but the code is a little\n convoluted with type casting back and forth:\n \n char_pos = ' '.join(sent)[:' '.join(sent).index(' '.join(ngram))]\n word_pos = char_pos.count(' ')\n \n Another way to conceive this is:\n \n return next(i for i, ng in enumerate(ngrams(sentence, len(ngram))) \n if ng == ngram)\n \n :param ngram: The ngram that needs to be searched\n :type ngram: tuple\n :param sentence: The list of tokens to search from.\n :type sentence: list(str)\n \"\"\"\n # Iterates through the ngrams in sentence.\n for i,sublist in enumerate(ngrams(sentence, len(ngram))):\n # Returns the index of the word when ngram matches.\n if ngram == sublist:\n return i\n\n\ndef word_rank_alignment(reference, hypothesis, character_based=False):\n \"\"\" \n This is the word rank alignment algorithm described in the paper to produce\n the *worder* list, i.e. a list of word indices of the hypothesis word orders \n w.r.t. the list of reference words.\n \n Below is (H0, R0) example from the Isozaki et al. 2010 paper, \n note the examples are indexed from 1 but the results here are indexed from 0:\n \n >>> ref = str('he was interested in world history because he '\n ... 'read the book').split()\n >>> hyp = str('he read the book because he was interested in world '\n ... 'history').split()\n >>> word_rank_alignment(ref, hyp)\n [7, 8, 9, 10, 6, 0, 1, 2, 3, 4, 5]\n \n The (H1, R1) example from the paper, note the 0th index:\n \n >>> ref = 'John hit Bob yesterday'.split()\n >>> hyp = 'Bob hit John yesterday'.split()\n >>> word_rank_alignment(ref, hyp)\n [2, 1, 0, 3]\n\n Here is the (H2, R2) example from the paper, note the 0th index here too:\n \n >>> ref = 'the boy read the book'.split()\n >>> hyp = 'the book was read by the boy'.split()\n >>> word_rank_alignment(ref, hyp)\n [3, 4, 2, 0, 1]\n \n :param reference: a reference sentence\n :type reference: list(str)\n :param hypothesis: a hypothesis sentence\n :type hypothesis: list(str)\n \"\"\"\n worder = []\n hyp_len = len(hypothesis)\n # Stores a list of possible ngrams from the reference sentence.\n # This is used for matching context window later in the algorithm.\n ref_ngrams = []\n hyp_ngrams = []\n for n in range(1, len(reference)+1):\n for ng in ngrams(reference, n):\n ref_ngrams.append(ng)\n for ng in ngrams(hypothesis, n):\n hyp_ngrams.append(ng)\n for i, h_word in enumerate(hypothesis):\n # If word is not in the reference, continue.\n if h_word not in reference:\n continue\n # If we can determine one-to-one word correspondence for unigrams that \n # only appear once in both the reference and hypothesis.\n elif hypothesis.count(h_word) == reference.count(h_word) == 1:\n worder.append(reference.index(h_word))\n else:\n max_window_size = max(i, hyp_len-i+1)\n for window in range(1, max_window_size):\n if i+window < hyp_len: # If searching the right context is possible.\n # Retrieve the right context window.\n right_context_ngram = tuple(islice(hypothesis, i, i+window+1))\n num_times_in_ref = ref_ngrams.count(right_context_ngram)\n num_times_in_hyp = hyp_ngrams.count(right_context_ngram) \n # If ngram appears only once in both ref and hyp.\n if num_times_in_ref == num_times_in_hyp == 1:\n # Find the position of ngram that matched the reference.\n pos = position_of_ngram(right_context_ngram, reference)\n worder.append(pos) # Add the positions of the ngram.\n break\n if window <= i: # If searching the left context is possible.\n # Retrieve the left context window.\n left_context_ngram = tuple(islice(hypothesis, i-window, i+1))\n num_times_in_ref = ref_ngrams.count(left_context_ngram)\n num_times_in_hyp = hyp_ngrams.count(left_context_ngram)\n if num_times_in_ref == num_times_in_hyp == 1:\n # Find the position of ngram that matched the reference.\n pos = position_of_ngram(left_context_ngram, reference)\n # Add the positions of the ngram.\n worder.append(pos+ len(left_context_ngram) -1) \n break\n return worder\n\n \ndef find_increasing_sequences(worder):\n \"\"\"\n Given the *worder* list, this function groups monotonic +1 sequences. \n \n >>> worder = [7, 8, 9, 10, 6, 0, 1, 2, 3, 4, 5]\n >>> list(find_increasing_sequences(worder))\n [(7, 8, 9, 10), (0, 1, 2, 3, 4, 5)]\n \n :param worder: The worder list output from word_rank_alignment\n :param type: list(int)\n \"\"\"\n items = iter(worder)\n a, b = None, next(items, None)\n result = [b]\n while b is not None:\n a, b = b, next(items, None)\n if b is not None and a + 1 == b:\n result.append(b)\n else:\n if len(result) > 1:\n yield tuple(result)\n result = [b]\n\n\ndef kendall_tau(worder, normalize=True):\n \"\"\"\n Calculates the Kendall's Tau correlation coefficient given the *worder*\n list of word alignments from word_rank_alignment(), using the formula:\n \n tau = 2 * num_increasing_pairs / num_possible pairs -1\n \n Note that the no. of increasing pairs can be discontinuous in the *worder*\n list and each each increasing sequence can be tabulated as choose(len(seq), 2) \n no. of increasing pairs, e.g.\n \n >>> worder = [7, 8, 9, 10, 6, 0, 1, 2, 3, 4, 5]\n >>> number_possible_pairs = choose(len(worder), 2)\n >>> round(kendall_tau(worder, normalize=False),3)\n -0.236\n >>> round(kendall_tau(worder),3)\n 0.382\n \n :param worder: The worder list output from word_rank_alignment\n :type worder: list(int)\n :param normalize: Flag to indicate normalization\n :type normalize: boolean\n :return: The Kendall's Tau correlation coefficient.\n :rtype: float\n \"\"\"\n worder_len = len(worder)\n # Extract the groups of increasing/monotonic sequences.\n increasing_sequences = find_increasing_sequences(worder)\n # Calculate no. of increasing_pairs in *worder* list.\n num_increasing_pairs = sum(choose(len(seq),2) for seq in increasing_sequences) \n # Calculate no. of possible pairs.\n num_possible_pairs = choose(worder_len, 2)\n # Kendall's Tau computation.\n tau = 2 * num_increasing_pairs / num_possible_pairs -1\n if normalize: # If normalized, the tau output falls between 0.0 to 1.0\n return (tau + 1) /2\n else: # Otherwise, the tau outputs falls between -1.0 to +1.0\n return tau\n\n\ndef spearman_rho(worder, normalize=True):\n \"\"\"\n Calculates the Spearman's Rho correlation coefficient given the *worder* \n list of word alignment from word_rank_alignment(), using the formula:\n \n rho = 1 - sum(d**2) / choose(len(worder)+1, 3) \n \n Given that d is the sum of difference between the *worder* list of indices\n and the original word indices from the reference sentence.\n \n Using the (H0,R0) and (H5, R5) example from the paper\n \n >>> worder = [7, 8, 9, 10, 6, 0, 1, 2, 3, 4, 5]\n >>> round(spearman_rho(worder, normalize=False), 3)\n -0.591\n >>> round(spearman_rho(worder), 3)\n 0.205\n \n :param worder: The worder list output from word_rank_alignment\n :param type: list(int)\n \"\"\"\n worder_len = len(worder)\n sum_d_square = sum((wi - i)**2 for wi, i in zip(worder, range(worder_len)))\n rho = 1 - sum_d_square / choose(worder_len+1, 3)\n \n if normalize: # If normalized, the rho output falls between 0.0 to 1.0\n return (rho + 1) /2\n else: # Otherwise, the rho outputs falls between -1.0 to +1.0\n return rho\n", "path": "nltk/translate/ribes_score.py" } ]
[ { "content": "# -*- coding: utf-8 -*-\n# Natural Language Toolkit: RIBES Score\n#\n# Copyright (C) 2001-2015 NLTK Project\n# Contributors: Katsuhito Sudoh, Liling Tan, Kasramvd, J.F.Sebastian, Mark Byers, ekhumoro, P. Ortiz\n# URL: <http://nltk.org/>\n# For license information, see LICENSE.TXT\n\"\"\" RIBES score implementation \"\"\"\nfrom __future__ import division\nfrom itertools import islice\nimport math\n\nfrom nltk.util import ngrams, choose\n\n\ndef ribes(references, hypothesis, alpha=0.25, beta=0.10):\n \"\"\"\n The RIBES (Rank-based Intuitive Bilingual Evaluation Score) from \n Hideki Isozaki, Tsutomu Hirao, Kevin Duh, Katsuhito Sudoh and \n Hajime Tsukada. 2010. \"Automatic Evaluation of Translation Quality for \n Distant Language Pairs\". In Proceedings of EMNLP. \n http://www.aclweb.org/anthology/D/D10/D10-1092.pdf \n \n The generic RIBES scores used in shared task, e.g. Workshop for \n Asian Translation (WAT) uses the following RIBES calculations:\n \n RIBES = kendall_tau * (alpha**p1) * (beta**bp)\n \n Please note that this re-implementation differs from the official\n RIBES implementation and though it emulates the results as describe\n in the original paper, there are further optimization implemented \n in the official RIBES script.\n \n Users are encouraged to use the official RIBES script instead of this \n implementation when evaluating your machine translation system. Refer\n to http://www.kecl.ntt.co.jp/icl/lirg/ribes/ for the official script.\n \n :param references: a list of reference sentences\n :type reference: list(list(str))\n :param hypothesis: a hypothesis sentence\n :type hypothesis: list(str)\n :param alpha: hyperparameter used as a prior for the unigram precision.\n :type alpha: float\n :param beta: hyperparameter used as a prior for the brevity penalty.\n :type beta: float\n :return: The best ribes score from one of the references.\n :rtype: float\n \"\"\"\n best_ribes = -1.0\n # Calculates RIBES for each reference and returns the best score.\n for reference in references:\n # Collects the *worder* from the ranked correlation alignments.\n worder = word_rank_alignment(reference, hypothesis)\n nkt = kendall_tau(worder)\n \n # Calculates the brevity penalty\n bp = min(1.0, math.exp(1.0 - 1.0 * len(reference)/len(hypothesis)))\n \n # Calculates the unigram precision, *p1*\n p1 = 1.0 * len(worder) / len(hypothesis)\n \n _ribes = nkt * (p1 ** alpha) * (bp ** beta)\n \n if _ribes > best_ribes: # Keeps the best score.\n best_ribes = _ribes\n \n return best_ribes\n\n\ndef position_of_ngram(ngram, sentence):\n \"\"\"\n This function returns the position of the first instance of the ngram \n appearing in a sentence.\n \n Note that one could also use string as follows but the code is a little\n convoluted with type casting back and forth:\n \n char_pos = ' '.join(sent)[:' '.join(sent).index(' '.join(ngram))]\n word_pos = char_pos.count(' ')\n \n Another way to conceive this is:\n \n return next(i for i, ng in enumerate(ngrams(sentence, len(ngram))) \n if ng == ngram)\n \n :param ngram: The ngram that needs to be searched\n :type ngram: tuple\n :param sentence: The list of tokens to search from.\n :type sentence: list(str)\n \"\"\"\n # Iterates through the ngrams in sentence.\n for i,sublist in enumerate(ngrams(sentence, len(ngram))):\n # Returns the index of the word when ngram matches.\n if ngram == sublist:\n return i\n\n\ndef word_rank_alignment(reference, hypothesis, character_based=False):\n \"\"\" \n This is the word rank alignment algorithm described in the paper to produce\n the *worder* list, i.e. a list of word indices of the hypothesis word orders \n w.r.t. the list of reference words.\n \n Below is (H0, R0) example from the Isozaki et al. 2010 paper, \n note the examples are indexed from 1 but the results here are indexed from 0:\n \n >>> ref = str('he was interested in world history because he '\n ... 'read the book').split()\n >>> hyp = str('he read the book because he was interested in world '\n ... 'history').split()\n >>> word_rank_alignment(ref, hyp)\n [7, 8, 9, 10, 6, 0, 1, 2, 3, 4, 5]\n \n The (H1, R1) example from the paper, note the 0th index:\n \n >>> ref = 'John hit Bob yesterday'.split()\n >>> hyp = 'Bob hit John yesterday'.split()\n >>> word_rank_alignment(ref, hyp)\n [2, 1, 0, 3]\n\n Here is the (H2, R2) example from the paper, note the 0th index here too:\n \n >>> ref = 'the boy read the book'.split()\n >>> hyp = 'the book was read by the boy'.split()\n >>> word_rank_alignment(ref, hyp)\n [3, 4, 2, 0, 1]\n \n :param reference: a reference sentence\n :type reference: list(str)\n :param hypothesis: a hypothesis sentence\n :type hypothesis: list(str)\n \"\"\"\n worder = []\n hyp_len = len(hypothesis)\n # Stores a list of possible ngrams from the reference sentence.\n # This is used for matching context window later in the algorithm.\n ref_ngrams = []\n hyp_ngrams = []\n for n in range(1, len(reference)+1):\n for ng in ngrams(reference, n):\n ref_ngrams.append(ng)\n for ng in ngrams(hypothesis, n):\n hyp_ngrams.append(ng)\n for i, h_word in enumerate(hypothesis):\n # If word is not in the reference, continue.\n if h_word not in reference:\n continue\n # If we can determine one-to-one word correspondence for unigrams that \n # only appear once in both the reference and hypothesis.\n elif hypothesis.count(h_word) == reference.count(h_word) == 1:\n worder.append(reference.index(h_word))\n else:\n max_window_size = max(i, hyp_len-i+1)\n for window in range(1, max_window_size):\n if i+window < hyp_len: # If searching the right context is possible.\n # Retrieve the right context window.\n right_context_ngram = tuple(islice(hypothesis, i, i+window+1))\n num_times_in_ref = ref_ngrams.count(right_context_ngram)\n num_times_in_hyp = hyp_ngrams.count(right_context_ngram) \n # If ngram appears only once in both ref and hyp.\n if num_times_in_ref == num_times_in_hyp == 1:\n # Find the position of ngram that matched the reference.\n pos = position_of_ngram(right_context_ngram, reference)\n worder.append(pos) # Add the positions of the ngram.\n break\n if window <= i: # If searching the left context is possible.\n # Retrieve the left context window.\n left_context_ngram = tuple(islice(hypothesis, i-window, i+1))\n num_times_in_ref = ref_ngrams.count(left_context_ngram)\n num_times_in_hyp = hyp_ngrams.count(left_context_ngram)\n if num_times_in_ref == num_times_in_hyp == 1:\n # Find the position of ngram that matched the reference.\n pos = position_of_ngram(left_context_ngram, reference)\n # Add the positions of the ngram.\n worder.append(pos+ len(left_context_ngram) -1) \n break\n return worder\n\n \ndef find_increasing_sequences(worder):\n \"\"\"\n Given the *worder* list, this function groups monotonic +1 sequences. \n \n >>> worder = [7, 8, 9, 10, 6, 0, 1, 2, 3, 4, 5]\n >>> list(find_increasing_sequences(worder))\n [(7, 8, 9, 10), (0, 1, 2, 3, 4, 5)]\n \n :param worder: The worder list output from word_rank_alignment\n :param type: list(int)\n \"\"\"\n items = iter(worder)\n a, b = None, next(items, None)\n result = [b]\n while b is not None:\n a, b = b, next(items, None)\n if b is not None and a + 1 == b:\n result.append(b)\n else:\n if len(result) > 1:\n yield tuple(result)\n result = [b]\n\n\ndef kendall_tau(worder, normalize=True):\n \"\"\"\n Calculates the Kendall's Tau correlation coefficient given the *worder*\n list of word alignments from word_rank_alignment(), using the formula:\n \n tau = 2 * num_increasing_pairs / num_possible pairs -1\n \n Note that the no. of increasing pairs can be discontinuous in the *worder*\n list and each each increasing sequence can be tabulated as choose(len(seq), 2) \n no. of increasing pairs, e.g.\n \n >>> worder = [7, 8, 9, 10, 6, 0, 1, 2, 3, 4, 5]\n >>> number_possible_pairs = choose(len(worder), 2)\n >>> round(kendall_tau(worder, normalize=False),3)\n -0.236\n >>> round(kendall_tau(worder),3)\n 0.382\n \n :param worder: The worder list output from word_rank_alignment\n :type worder: list(int)\n :param normalize: Flag to indicate normalization\n :type normalize: boolean\n :return: The Kendall's Tau correlation coefficient.\n :rtype: float\n \"\"\"\n worder_len = len(worder)\n # Extract the groups of increasing/monotonic sequences.\n increasing_sequences = find_increasing_sequences(worder)\n # Calculate no. of increasing_pairs in *worder* list.\n num_increasing_pairs = sum(choose(len(seq),2) for seq in increasing_sequences) \n # Calculate no. of possible pairs.\n num_possible_pairs = choose(worder_len, 2)\n # Kendall's Tau computation.\n tau = 2 * num_increasing_pairs / num_possible_pairs -1\n if normalize: # If normalized, the tau output falls between 0.0 to 1.0\n return (tau + 1) /2\n else: # Otherwise, the tau outputs falls between -1.0 to +1.0\n return tau\n\n\ndef spearman_rho(worder, normalize=True):\n \"\"\"\n Calculates the Spearman's Rho correlation coefficient given the *worder* \n list of word alignment from word_rank_alignment(), using the formula:\n \n rho = 1 - sum(d**2) / choose(len(worder)+1, 3) \n \n Given that d is the sum of difference between the *worder* list of indices\n and the original word indices from the reference sentence.\n \n Using the (H0,R0) and (H5, R5) example from the paper\n \n >>> worder = [7, 8, 9, 10, 6, 0, 1, 2, 3, 4, 5]\n >>> round(spearman_rho(worder, normalize=False), 3)\n -0.591\n >>> round(spearman_rho(worder), 3)\n 0.205\n \n :param worder: The worder list output from word_rank_alignment\n :param type: list(int)\n \"\"\"\n worder_len = len(worder)\n sum_d_square = sum((wi - i)**2 for wi, i in zip(worder, range(worder_len)))\n rho = 1 - sum_d_square / choose(worder_len+1, 3)\n \n if normalize: # If normalized, the rho output falls between 0.0 to 1.0\n return (rho + 1) /2\n else: # Otherwise, the rho outputs falls between -1.0 to +1.0\n return rho\n", "path": "nltk/translate/ribes_score.py" } ]
diff --git a/nltk/translate/ribes_score.py b/nltk/translate/ribes_score.py index 055c58be85..17e9e48336 100644 --- a/nltk/translate/ribes_score.py +++ b/nltk/translate/ribes_score.py @@ -6,7 +6,7 @@ # URL: <http://nltk.org/> # For license information, see LICENSE.TXT """ RIBES score implementation """ - +from __future__ import division from itertools import islice import math
jupyterhub__zero-to-jupyterhub-k8s-373
[ { "content": "#!/usr/bin/env python3\nimport argparse\nimport os\nimport subprocess\nimport shutil\nfrom tempfile import TemporaryDirectory\n\nfrom ruamel.yaml import YAML\n\n# use safe roundtrip yaml loader\nyaml = YAML(typ='rt')\nyaml.indent(offset=2)\n\ndef last_modified_commit(*paths, **kwargs):\n return subprocess.check_output([\n 'git',\n 'log',\n '-n', '1',\n '--pretty=format:%h',\n *paths\n ], **kwargs).decode('utf-8')\n\ndef last_modified_date(*paths, **kwargs):\n return subprocess.check_output([\n 'git',\n 'log',\n '-n', '1',\n '--pretty=format:%cd',\n '--date=iso',\n *paths\n ], **kwargs).decode('utf-8')\n\ndef path_touched(*paths, commit_range):\n return subprocess.check_output([\n 'git', 'diff', '--name-only', commit_range, *paths\n ]).decode('utf-8').strip() != ''\n\n\ndef render_build_args(options, ns):\n \"\"\"Get docker build args dict, rendering any templated args.\"\"\"\n build_args = options.get('buildArgs', {})\n for key, value in build_args.items():\n build_args[key] = value.format(**ns)\n return build_args\n\ndef build_image(image_path, image_spec, build_args):\n cmd = ['docker', 'build', '-t', image_spec, image_path]\n\n for k, v in build_args.items():\n cmd += ['--build-arg', '{}={}'.format(k, v)]\n subprocess.check_call(cmd)\n\ndef build_images(prefix, images, tag=None, commit_range=None, push=False):\n value_modifications = {}\n for name, options in images.items():\n image_path = os.path.join('images', name)\n paths = options.get('paths', []) + [image_path]\n last_commit = last_modified_commit(*paths)\n if tag is None:\n tag = last_commit\n image_name = prefix + name\n image_spec = '{}:{}'.format(image_name, tag)\n value_modifications[options['valuesPath']] = {\n 'name': image_name,\n 'tag': tag\n }\n\n if commit_range and not path_touched(*paths, commit_range=commit_range):\n print(f\"Skipping {name}, not touched in {commit_range}\")\n continue\n\n template_namespace = {\n 'LAST_COMMIT': last_commit,\n 'TAG': tag,\n }\n\n build_args = render_build_args(options, template_namespace)\n build_image(image_path, image_spec, build_args)\n\n if push:\n subprocess.check_call([\n 'docker', 'push', image_spec\n ])\n return value_modifications\n\ndef build_values(name, values_mods):\n \"\"\"Update name/values.yaml with modifications\"\"\"\n\n values_file = os.path.join(name, 'values.yaml')\n\n with open(values_file) as f:\n values = yaml.load(f)\n\n for key, value in values_mods.items():\n parts = key.split('.')\n mod_obj = values\n for p in parts:\n mod_obj = mod_obj[p]\n mod_obj.update(value)\n\n\n with open(values_file, 'w') as f:\n yaml.dump(values, f)\n\n\ndef build_chart(name, version=None, paths=None):\n \"\"\"Update chart with specified version or last-modified commit in path(s)\"\"\"\n chart_file = os.path.join(name, 'Chart.yaml')\n with open(chart_file) as f:\n chart = yaml.load(f)\n\n if version is None:\n if paths is None:\n paths = ['.']\n commit = last_modified_commit(*paths)\n version = chart['version'].split('-')[0] + '-' + commit\n\n chart['version'] = version\n\n with open(chart_file, 'w') as f:\n yaml.dump(chart, f)\n\n\ndef publish_pages(name, paths, git_repo, published_repo):\n \"\"\"publish helm chart index to github pages\"\"\"\n version = last_modified_commit(*paths)\n checkout_dir = '{}-{}'.format(name, version)\n subprocess.check_call([\n 'git', 'clone', '--no-checkout',\n 'git@github.com:{}'.format(git_repo), checkout_dir],\n )\n subprocess.check_call(['git', 'checkout', 'gh-pages'], cwd=checkout_dir)\n\n # package the latest version into a temporary directory\n # and run helm repo index with --merge to update index.yaml\n # without refreshing all of the timestamps\n with TemporaryDirectory() as td:\n subprocess.check_call([\n 'helm', 'package', name,\n '--destination', td + '/',\n ])\n\n subprocess.check_call([\n 'helm', 'repo', 'index', td,\n '--url', published_repo,\n '--merge', os.path.join(checkout_dir, 'index.yaml'),\n ])\n\n # equivalent to `cp td/* checkout/`\n # copies new helm chart and updated index.yaml\n for f in os.listdir(td):\n shutil.copy2(\n os.path.join(td, f),\n os.path.join(checkout_dir, f)\n )\n subprocess.check_call(['git', 'add', '.'], cwd=checkout_dir)\n subprocess.check_call([\n 'git',\n 'commit',\n '-m', '[{}] Automatic update for commit {}'.format(name, version)\n ], cwd=checkout_dir)\n subprocess.check_call(\n ['git', 'push', 'origin', 'gh-pages'],\n cwd=checkout_dir,\n )\n\n\ndef main():\n with open('chartpress.yaml') as f:\n config = yaml.load(f)\n\n argparser = argparse.ArgumentParser()\n\n argparser.add_argument('--commit-range', help='Range of commits to consider when building images')\n argparser.add_argument('--push', action='store_true')\n argparser.add_argument('--publish-chart', action='store_true')\n argparser.add_argument('--tag', default=None, help='Use this tag for images & charts')\n\n args = argparser.parse_args()\n\n for chart in config['charts']:\n value_mods = build_images(chart['imagePrefix'], chart['images'], args.tag, args.commit_range, args.push)\n build_values(chart['name'], value_mods)\n chart_paths = ['.'] + chart.get('paths', [])\n build_chart(chart['name'], paths=chart_paths, version=args.tag)\n if args.publish_chart:\n publish_pages(chart['name'],\n paths=chart_paths,\n git_repo=chart['repo']['git'],\n published_repo=chart['repo']['published'],\n )\n\nmain()\n", "path": "build.py" } ]
[ { "content": "#!/usr/bin/env python3\nimport argparse\nimport os\nimport subprocess\nimport shutil\nfrom tempfile import TemporaryDirectory\n\nfrom ruamel.yaml import YAML\n\n# use safe roundtrip yaml loader\nyaml = YAML(typ='rt')\nyaml.indent(mapping=2, offset=2, sequence=4)\n\ndef last_modified_commit(*paths, **kwargs):\n return subprocess.check_output([\n 'git',\n 'log',\n '-n', '1',\n '--pretty=format:%h',\n *paths\n ], **kwargs).decode('utf-8')\n\ndef last_modified_date(*paths, **kwargs):\n return subprocess.check_output([\n 'git',\n 'log',\n '-n', '1',\n '--pretty=format:%cd',\n '--date=iso',\n *paths\n ], **kwargs).decode('utf-8')\n\ndef path_touched(*paths, commit_range):\n return subprocess.check_output([\n 'git', 'diff', '--name-only', commit_range, *paths\n ]).decode('utf-8').strip() != ''\n\n\ndef render_build_args(options, ns):\n \"\"\"Get docker build args dict, rendering any templated args.\"\"\"\n build_args = options.get('buildArgs', {})\n for key, value in build_args.items():\n build_args[key] = value.format(**ns)\n return build_args\n\ndef build_image(image_path, image_spec, build_args):\n cmd = ['docker', 'build', '-t', image_spec, image_path]\n\n for k, v in build_args.items():\n cmd += ['--build-arg', '{}={}'.format(k, v)]\n subprocess.check_call(cmd)\n\ndef build_images(prefix, images, tag=None, commit_range=None, push=False):\n value_modifications = {}\n for name, options in images.items():\n image_path = os.path.join('images', name)\n paths = options.get('paths', []) + [image_path]\n last_commit = last_modified_commit(*paths)\n if tag is None:\n tag = last_commit\n image_name = prefix + name\n image_spec = '{}:{}'.format(image_name, tag)\n value_modifications[options['valuesPath']] = {\n 'name': image_name,\n 'tag': tag\n }\n\n if commit_range and not path_touched(*paths, commit_range=commit_range):\n print(f\"Skipping {name}, not touched in {commit_range}\")\n continue\n\n template_namespace = {\n 'LAST_COMMIT': last_commit,\n 'TAG': tag,\n }\n\n build_args = render_build_args(options, template_namespace)\n build_image(image_path, image_spec, build_args)\n\n if push:\n subprocess.check_call([\n 'docker', 'push', image_spec\n ])\n return value_modifications\n\ndef build_values(name, values_mods):\n \"\"\"Update name/values.yaml with modifications\"\"\"\n\n values_file = os.path.join(name, 'values.yaml')\n\n with open(values_file) as f:\n values = yaml.load(f)\n\n for key, value in values_mods.items():\n parts = key.split('.')\n mod_obj = values\n for p in parts:\n mod_obj = mod_obj[p]\n mod_obj.update(value)\n\n\n with open(values_file, 'w') as f:\n yaml.dump(values, f)\n\n\ndef build_chart(name, version=None, paths=None):\n \"\"\"Update chart with specified version or last-modified commit in path(s)\"\"\"\n chart_file = os.path.join(name, 'Chart.yaml')\n with open(chart_file) as f:\n chart = yaml.load(f)\n\n if version is None:\n if paths is None:\n paths = ['.']\n commit = last_modified_commit(*paths)\n version = chart['version'].split('-')[0] + '-' + commit\n\n chart['version'] = version\n\n with open(chart_file, 'w') as f:\n yaml.dump(chart, f)\n\n\ndef publish_pages(name, paths, git_repo, published_repo):\n \"\"\"publish helm chart index to github pages\"\"\"\n version = last_modified_commit(*paths)\n checkout_dir = '{}-{}'.format(name, version)\n subprocess.check_call([\n 'git', 'clone', '--no-checkout',\n 'git@github.com:{}'.format(git_repo), checkout_dir],\n )\n subprocess.check_call(['git', 'checkout', 'gh-pages'], cwd=checkout_dir)\n\n # package the latest version into a temporary directory\n # and run helm repo index with --merge to update index.yaml\n # without refreshing all of the timestamps\n with TemporaryDirectory() as td:\n subprocess.check_call([\n 'helm', 'package', name,\n '--destination', td + '/',\n ])\n\n subprocess.check_call([\n 'helm', 'repo', 'index', td,\n '--url', published_repo,\n '--merge', os.path.join(checkout_dir, 'index.yaml'),\n ])\n\n # equivalent to `cp td/* checkout/`\n # copies new helm chart and updated index.yaml\n for f in os.listdir(td):\n shutil.copy2(\n os.path.join(td, f),\n os.path.join(checkout_dir, f)\n )\n subprocess.check_call(['git', 'add', '.'], cwd=checkout_dir)\n subprocess.check_call([\n 'git',\n 'commit',\n '-m', '[{}] Automatic update for commit {}'.format(name, version)\n ], cwd=checkout_dir)\n subprocess.check_call(\n ['git', 'push', 'origin', 'gh-pages'],\n cwd=checkout_dir,\n )\n\n\ndef main():\n with open('chartpress.yaml') as f:\n config = yaml.load(f)\n\n argparser = argparse.ArgumentParser()\n\n argparser.add_argument('--commit-range', help='Range of commits to consider when building images')\n argparser.add_argument('--push', action='store_true')\n argparser.add_argument('--publish-chart', action='store_true')\n argparser.add_argument('--tag', default=None, help='Use this tag for images & charts')\n\n args = argparser.parse_args()\n\n for chart in config['charts']:\n value_mods = build_images(chart['imagePrefix'], chart['images'], args.tag, args.commit_range, args.push)\n build_values(chart['name'], value_mods)\n chart_paths = ['.'] + chart.get('paths', [])\n build_chart(chart['name'], paths=chart_paths, version=args.tag)\n if args.publish_chart:\n publish_pages(chart['name'],\n paths=chart_paths,\n git_repo=chart['repo']['git'],\n published_repo=chart['repo']['published'],\n )\n\nmain()\n", "path": "build.py" } ]
diff --git a/build.py b/build.py index 859cb2b0f5..66f0c43437 100755 --- a/build.py +++ b/build.py @@ -9,7 +9,7 @@ # use safe roundtrip yaml loader yaml = YAML(typ='rt') -yaml.indent(offset=2) +yaml.indent(mapping=2, offset=2, sequence=4) def last_modified_commit(*paths, **kwargs): return subprocess.check_output([
arviz-devs__arviz-1403
[ { "content": "\"\"\"Bokeh Densityplot.\"\"\"\nfrom collections import defaultdict\nfrom itertools import cycle\n\nimport matplotlib.pyplot as plt\nimport numpy as np\nfrom bokeh.models.annotations import Legend, Title\n\nfrom ....stats import hdi\nfrom ....stats.density_utils import get_bins, histogram, kde\nfrom ...plot_utils import _scale_fig_size, calculate_point_estimate, make_label, vectorized_to_hex\nfrom .. import show_layout\nfrom . import backend_kwarg_defaults, create_axes_grid\n\n\ndef plot_density(\n ax,\n all_labels,\n to_plot,\n colors,\n bw,\n circular,\n figsize,\n length_plotters,\n rows,\n cols,\n textsize,\n hdi_prob,\n point_estimate,\n hdi_markers,\n outline,\n shade,\n n_data,\n data_labels,\n backend_kwargs,\n show,\n):\n \"\"\"Bokeh density plot.\"\"\"\n if backend_kwargs is None:\n backend_kwargs = {}\n\n backend_kwargs = {\n **backend_kwarg_defaults(),\n **backend_kwargs,\n }\n\n if colors == \"cycle\":\n colors = [\n prop\n for _, prop in zip(\n range(n_data), cycle(plt.rcParams[\"axes.prop_cycle\"].by_key()[\"color\"])\n )\n ]\n elif isinstance(colors, str):\n colors = [colors for _ in range(n_data)]\n colors = vectorized_to_hex(colors)\n\n (figsize, _, _, _, line_width, markersize) = _scale_fig_size(figsize, textsize, rows, cols)\n\n if ax is None:\n ax = create_axes_grid(\n length_plotters,\n rows,\n cols,\n figsize=figsize,\n squeeze=True,\n backend_kwargs=backend_kwargs,\n )\n else:\n ax = np.atleast_2d(ax)\n\n axis_map = {\n label: ax_\n for label, ax_ in zip(all_labels, (item for item in ax.flatten() if item is not None))\n }\n if data_labels is None:\n data_labels = {}\n\n legend_items = defaultdict(list)\n for m_idx, plotters in enumerate(to_plot):\n for var_name, selection, values in plotters:\n label = make_label(var_name, selection)\n\n if data_labels:\n data_label = data_labels[m_idx]\n else:\n data_label = None\n\n plotted = _d_helper(\n values.flatten(),\n label,\n colors[m_idx],\n bw,\n circular,\n line_width,\n markersize,\n hdi_prob,\n point_estimate,\n hdi_markers,\n outline,\n shade,\n axis_map[label],\n )\n if data_label is not None:\n legend_items[axis_map[label]].append((data_label, plotted))\n\n for ax1, legend in legend_items.items():\n legend = Legend(\n items=legend,\n location=\"center_right\",\n orientation=\"horizontal\",\n )\n ax1.add_layout(legend, \"above\")\n ax1.legend.click_policy = \"hide\"\n\n show_layout(ax, show)\n\n return ax\n\n\ndef _d_helper(\n vec,\n vname,\n color,\n bw,\n circular,\n line_width,\n markersize,\n hdi_prob,\n point_estimate,\n hdi_markers,\n outline,\n shade,\n ax,\n):\n\n extra = dict()\n plotted = []\n\n if vec.dtype.kind == \"f\":\n if hdi_prob != 1:\n hdi_ = hdi(vec, hdi_prob, multimodal=False)\n new_vec = vec[(vec >= hdi_[0]) & (vec <= hdi_[1])]\n else:\n new_vec = vec\n\n x, density = kde(new_vec, circular=circular, bw=bw)\n density *= hdi_prob\n xmin, xmax = x[0], x[-1]\n ymin, ymax = density[0], density[-1]\n\n if outline:\n plotted.append(ax.line(x, density, line_color=color, line_width=line_width, **extra))\n plotted.append(\n ax.line(\n [xmin, xmin],\n [-ymin / 100, ymin],\n line_color=color,\n line_dash=\"solid\",\n line_width=line_width,\n muted_color=color,\n muted_alpha=0.2,\n )\n )\n plotted.append(\n ax.line(\n [xmax, xmax],\n [-ymax / 100, ymax],\n line_color=color,\n line_dash=\"solid\",\n line_width=line_width,\n muted_color=color,\n muted_alpha=0.2,\n )\n )\n\n if shade:\n plotted.append(\n ax.patch(\n np.r_[x[::-1], x, x[-1:]],\n np.r_[np.zeros_like(x), density, [0]],\n fill_color=color,\n fill_alpha=shade,\n muted_color=color,\n muted_alpha=0.2,\n **extra\n )\n )\n\n else:\n xmin, xmax = hdi(vec, hdi_prob, multimodal=False)\n bins = get_bins(vec)\n\n _, hist, edges = histogram(vec, bins=bins)\n\n if outline:\n plotted.append(\n ax.quad(\n top=hist,\n bottom=0,\n left=edges[:-1],\n right=edges[1:],\n line_color=color,\n fill_color=None,\n muted_color=color,\n muted_alpha=0.2,\n **extra\n )\n )\n else:\n plotted.append(\n ax.quad(\n top=hist,\n bottom=0,\n left=edges[:-1],\n right=edges[1:],\n line_color=color,\n fill_color=color,\n fill_alpha=shade,\n muted_color=color,\n muted_alpha=0.2,\n **extra\n )\n )\n\n if hdi_markers:\n plotted.append(ax.diamond(xmin, 0, line_color=\"black\", fill_color=color, size=markersize))\n plotted.append(ax.diamond(xmax, 0, line_color=\"black\", fill_color=color, size=markersize))\n\n if point_estimate is not None:\n est = calculate_point_estimate(point_estimate, vec, bw, circular)\n plotted.append(ax.circle(est, 0, fill_color=color, line_color=\"black\", size=markersize))\n\n _title = Title()\n _title.text = vname\n ax.title = _title\n ax.title.text_font_size = \"13pt\"\n\n return plotted\n", "path": "arviz/plots/backends/bokeh/densityplot.py" } ]
[ { "content": "\"\"\"Bokeh Densityplot.\"\"\"\nfrom collections import defaultdict\nfrom itertools import cycle\n\nimport matplotlib.pyplot as plt\nimport numpy as np\nfrom bokeh.models.annotations import Legend, Title\n\nfrom ....stats import hdi\nfrom ....stats.density_utils import get_bins, histogram, kde\nfrom ...plot_utils import _scale_fig_size, calculate_point_estimate, make_label, vectorized_to_hex\nfrom .. import show_layout\nfrom . import backend_kwarg_defaults, create_axes_grid\n\n\ndef plot_density(\n ax,\n all_labels,\n to_plot,\n colors,\n bw,\n circular,\n figsize,\n length_plotters,\n rows,\n cols,\n textsize,\n hdi_prob,\n point_estimate,\n hdi_markers,\n outline,\n shade,\n n_data,\n data_labels,\n backend_kwargs,\n show,\n):\n \"\"\"Bokeh density plot.\"\"\"\n if backend_kwargs is None:\n backend_kwargs = {}\n\n backend_kwargs = {\n **backend_kwarg_defaults(),\n **backend_kwargs,\n }\n\n if colors == \"cycle\":\n colors = [\n prop\n for _, prop in zip(\n range(n_data), cycle(plt.rcParams[\"axes.prop_cycle\"].by_key()[\"color\"])\n )\n ]\n elif isinstance(colors, str):\n colors = [colors for _ in range(n_data)]\n colors = vectorized_to_hex(colors)\n\n (figsize, _, _, _, line_width, markersize) = _scale_fig_size(figsize, textsize, rows, cols)\n\n if ax is None:\n ax = create_axes_grid(\n length_plotters,\n rows,\n cols,\n figsize=figsize,\n squeeze=False,\n backend_kwargs=backend_kwargs,\n )\n else:\n ax = np.atleast_2d(ax)\n\n axis_map = {\n label: ax_\n for label, ax_ in zip(all_labels, (item for item in ax.flatten() if item is not None))\n }\n if data_labels is None:\n data_labels = {}\n\n legend_items = defaultdict(list)\n for m_idx, plotters in enumerate(to_plot):\n for var_name, selection, values in plotters:\n label = make_label(var_name, selection)\n\n if data_labels:\n data_label = data_labels[m_idx]\n else:\n data_label = None\n\n plotted = _d_helper(\n values.flatten(),\n label,\n colors[m_idx],\n bw,\n circular,\n line_width,\n markersize,\n hdi_prob,\n point_estimate,\n hdi_markers,\n outline,\n shade,\n axis_map[label],\n )\n if data_label is not None:\n legend_items[axis_map[label]].append((data_label, plotted))\n\n for ax1, legend in legend_items.items():\n legend = Legend(\n items=legend,\n location=\"center_right\",\n orientation=\"horizontal\",\n )\n ax1.add_layout(legend, \"above\")\n ax1.legend.click_policy = \"hide\"\n\n show_layout(ax, show)\n\n return ax\n\n\ndef _d_helper(\n vec,\n vname,\n color,\n bw,\n circular,\n line_width,\n markersize,\n hdi_prob,\n point_estimate,\n hdi_markers,\n outline,\n shade,\n ax,\n):\n\n extra = dict()\n plotted = []\n\n if vec.dtype.kind == \"f\":\n if hdi_prob != 1:\n hdi_ = hdi(vec, hdi_prob, multimodal=False)\n new_vec = vec[(vec >= hdi_[0]) & (vec <= hdi_[1])]\n else:\n new_vec = vec\n\n x, density = kde(new_vec, circular=circular, bw=bw)\n density *= hdi_prob\n xmin, xmax = x[0], x[-1]\n ymin, ymax = density[0], density[-1]\n\n if outline:\n plotted.append(ax.line(x, density, line_color=color, line_width=line_width, **extra))\n plotted.append(\n ax.line(\n [xmin, xmin],\n [-ymin / 100, ymin],\n line_color=color,\n line_dash=\"solid\",\n line_width=line_width,\n muted_color=color,\n muted_alpha=0.2,\n )\n )\n plotted.append(\n ax.line(\n [xmax, xmax],\n [-ymax / 100, ymax],\n line_color=color,\n line_dash=\"solid\",\n line_width=line_width,\n muted_color=color,\n muted_alpha=0.2,\n )\n )\n\n if shade:\n plotted.append(\n ax.patch(\n np.r_[x[::-1], x, x[-1:]],\n np.r_[np.zeros_like(x), density, [0]],\n fill_color=color,\n fill_alpha=shade,\n muted_color=color,\n muted_alpha=0.2,\n **extra\n )\n )\n\n else:\n xmin, xmax = hdi(vec, hdi_prob, multimodal=False)\n bins = get_bins(vec)\n\n _, hist, edges = histogram(vec, bins=bins)\n\n if outline:\n plotted.append(\n ax.quad(\n top=hist,\n bottom=0,\n left=edges[:-1],\n right=edges[1:],\n line_color=color,\n fill_color=None,\n muted_color=color,\n muted_alpha=0.2,\n **extra\n )\n )\n else:\n plotted.append(\n ax.quad(\n top=hist,\n bottom=0,\n left=edges[:-1],\n right=edges[1:],\n line_color=color,\n fill_color=color,\n fill_alpha=shade,\n muted_color=color,\n muted_alpha=0.2,\n **extra\n )\n )\n\n if hdi_markers:\n plotted.append(ax.diamond(xmin, 0, line_color=\"black\", fill_color=color, size=markersize))\n plotted.append(ax.diamond(xmax, 0, line_color=\"black\", fill_color=color, size=markersize))\n\n if point_estimate is not None:\n est = calculate_point_estimate(point_estimate, vec, bw, circular)\n plotted.append(ax.circle(est, 0, fill_color=color, line_color=\"black\", size=markersize))\n\n _title = Title()\n _title.text = vname\n ax.title = _title\n ax.title.text_font_size = \"13pt\"\n\n return plotted\n", "path": "arviz/plots/backends/bokeh/densityplot.py" } ]
diff --git a/arviz/plots/backends/bokeh/densityplot.py b/arviz/plots/backends/bokeh/densityplot.py index 7ede6ce479..eb8dcec100 100644 --- a/arviz/plots/backends/bokeh/densityplot.py +++ b/arviz/plots/backends/bokeh/densityplot.py @@ -63,7 +63,7 @@ def plot_density( rows, cols, figsize=figsize, - squeeze=True, + squeeze=False, backend_kwargs=backend_kwargs, ) else: diff --git a/arviz/tests/base_tests/test_plots_bokeh.py b/arviz/tests/base_tests/test_plots_bokeh.py index 7b5bb21461..4fbb31e4c0 100644 --- a/arviz/tests/base_tests/test_plots_bokeh.py +++ b/arviz/tests/base_tests/test_plots_bokeh.py @@ -112,10 +112,26 @@ def test_plot_density_no_subset(): "c": np.random.normal(size=200), } ) - axes = plot_density([model_ab, model_bc]) + axes = plot_density([model_ab, model_bc], backend="bokeh", show=False) assert axes.size == 3 +def test_plot_density_one_var(): + """Test plot_density works when there is only one variable (#1401).""" + model_ab = from_dict( + { + "a": np.random.normal(size=200), + } + ) + model_bc = from_dict( + { + "a": np.random.normal(size=200), + } + ) + axes = plot_density([model_ab, model_bc], backend="bokeh", show=False) + assert axes.size == 1 + + def test_plot_density_bad_kwargs(models): obj = [getattr(models, model_fit) for model_fit in ["model_1", "model_2"]] with pytest.raises(ValueError):
pytorch__ignite-773
[ { "content": "# -*- coding: utf-8 -*-\nimport warnings\n\nimport torch\n\nfrom ignite.engine import Events\nfrom ignite.engine.engine import EventWithFilter\nfrom ignite.contrib.handlers.base_logger import BaseLogger, BaseOutputHandler\n\n\nclass ProgressBar(BaseLogger):\n \"\"\"\n TQDM progress bar handler to log training progress and computed metrics.\n\n Args:\n persist (bool, optional): set to ``True`` to persist the progress bar after completion (default = ``False``)\n bar_format (str, optional): Specify a custom bar string formatting. May impact performance.\n [default: '{desc}[{n_fmt}/{total_fmt}] {percentage:3.0f}%|{bar}{postfix} [{elapsed}<{remaining}]'].\n Set to ``None`` to use ``tqdm`` default bar formatting: '{l_bar}{bar}{r_bar}', where\n l_bar='{desc}: {percentage:3.0f}%|' and\n r_bar='| {n_fmt}/{total_fmt} [{elapsed}<{remaining}, {rate_fmt}{postfix}]'. For more details on the\n formatting, see `tqdm docs <https://tqdm.github.io/docs/tqdm/>`_.\n **tqdm_kwargs: kwargs passed to tqdm progress bar.\n By default, progress bar description displays \"Epoch [5/10]\" where 5 is the current epoch and 10 is the\n number of epochs. If tqdm_kwargs defines `desc`, e.g. \"Predictions\", than the description is\n \"Predictions [5/10]\" if number of epochs is more than one otherwise it is simply \"Predictions\".\n\n Examples:\n\n Simple progress bar\n\n .. code-block:: python\n\n trainer = create_supervised_trainer(model, optimizer, loss)\n\n pbar = ProgressBar()\n pbar.attach(trainer)\n\n # Progress bar will looks like\n # Epoch [2/50]: [64/128] 50%|█████ [06:17<12:34]\n\n Log output to a file instead of stderr (tqdm's default output)\n\n .. code-block:: python\n\n trainer = create_supervised_trainer(model, optimizer, loss)\n\n log_file = open(\"output.log\", \"w\")\n pbar = ProgressBar(file=log_file)\n pbar.attach(trainer)\n\n Attach metrics that already have been computed at :attr:`~ignite.engine.Events.ITERATION_COMPLETED`\n (such as :class:`~ignite.metrics.RunningAverage`)\n\n .. code-block:: python\n\n trainer = create_supervised_trainer(model, optimizer, loss)\n\n RunningAverage(output_transform=lambda x: x).attach(trainer, 'loss')\n\n pbar = ProgressBar()\n pbar.attach(trainer, ['loss'])\n\n # Progress bar will looks like\n # Epoch [2/50]: [64/128] 50%|█████ , loss=0.123 [06:17<12:34]\n\n Directly attach the engine's output\n\n .. code-block:: python\n\n trainer = create_supervised_trainer(model, optimizer, loss)\n\n pbar = ProgressBar()\n pbar.attach(trainer, output_transform=lambda x: {'loss': x})\n\n # Progress bar will looks like\n # Epoch [2/50]: [64/128] 50%|█████ , loss=0.123 [06:17<12:34]\n\n Note:\n When adding attaching the progress bar to an engine, it is recommend that you replace\n every print operation in the engine's handlers triggered every iteration with\n ``pbar.log_message`` to guarantee the correct format of the stdout.\n\n Note:\n When using inside jupyter notebook, `ProgressBar` automatically uses `tqdm_notebook`. For correct rendering,\n please install `ipywidgets <https://ipywidgets.readthedocs.io/en/stable/user_install.html#installation>`_.\n Due to `tqdm notebook bugs <https://github.com/tqdm/tqdm/issues/594>`_, bar format may be needed to be set\n to an empty string value.\n\n \"\"\"\n\n _events_order = [\n Events.STARTED,\n Events.EPOCH_STARTED,\n Events.ITERATION_STARTED,\n Events.ITERATION_COMPLETED,\n Events.EPOCH_COMPLETED,\n Events.COMPLETED\n ]\n\n def __init__(self, persist=False,\n bar_format='{desc}[{n_fmt}/{total_fmt}] {percentage:3.0f}%|{bar}{postfix} [{elapsed}<{remaining}]',\n **tqdm_kwargs):\n\n try:\n from tqdm.autonotebook import tqdm\n except ImportError:\n raise RuntimeError(\"This contrib module requires tqdm to be installed. \"\n \"Please install it with command: \\n pip install tqdm\")\n\n self.pbar_cls = tqdm\n self.pbar = None\n self.persist = persist\n self.bar_format = bar_format\n self.tqdm_kwargs = tqdm_kwargs\n\n def _reset(self, pbar_total):\n self.pbar = self.pbar_cls(\n total=pbar_total,\n leave=self.persist,\n bar_format=self.bar_format,\n **self.tqdm_kwargs\n )\n\n def _close(self, engine):\n if self.pbar:\n self.pbar.close()\n self.pbar = None\n\n @staticmethod\n def _compare_lt(event1, event2):\n if isinstance(event1, EventWithFilter):\n event1 = event1.event\n if isinstance(event2, EventWithFilter):\n event2 = event2.event\n i1 = ProgressBar._events_order.index(event1)\n i2 = ProgressBar._events_order.index(event2)\n return i1 < i2\n\n def log_message(self, message):\n \"\"\"\n Logs a message, preserving the progress bar correct output format.\n\n Args:\n message (str): string you wish to log.\n \"\"\"\n from tqdm import tqdm\n tqdm.write(message, **self.tqdm_kwargs)\n\n def attach(self, engine, metric_names=None, output_transform=None,\n event_name=Events.ITERATION_COMPLETED,\n closing_event_name=Events.EPOCH_COMPLETED):\n \"\"\"\n Attaches the progress bar to an engine object.\n\n Args:\n engine (Engine): engine object.\n metric_names (list of str, optional): list of metric names to plot or a string \"all\" to plot all available\n metrics.\n output_transform (callable, optional): a function to select what you want to print from the engine's\n output. This function may return either a dictionary with entries in the format of ``{name: value}``,\n or a single scalar, which will be displayed with the default name `output`.\n event_name: event's name on which the progress bar advances. Valid events are from\n :class:`~ignite.engine.Events`.\n closing_event_name: event's name on which the progress bar is closed. Valid events are from\n :class:`~ignite.engine.Events`.\n\n Note: accepted output value types are numbers, 0d and 1d torch tensors and strings\n\n \"\"\"\n desc = self.tqdm_kwargs.get(\"desc\", \"Epoch\")\n\n if not isinstance(event_name, (Events, EventWithFilter)):\n raise ValueError(\"Logging event should be only `ignite.engine.Events`\")\n\n if isinstance(closing_event_name, EventWithFilter):\n raise ValueError(\"Closing event should not use any event filter\")\n\n if not self._compare_lt(event_name, closing_event_name):\n raise ValueError(\"Logging event {} should be called before closing event {}\"\n .format(event_name, closing_event_name))\n\n log_handler = _OutputHandler(desc, metric_names, output_transform,\n closing_event_name=closing_event_name)\n # if event_name is EventWithFilter, filter is passed here\n super(ProgressBar, self).attach(engine, log_handler, event_name)\n engine.add_event_handler(closing_event_name, self._close)\n\n\nclass _OutputHandler(BaseOutputHandler):\n \"\"\"Helper handler to log engine's output and/or metrics\n\n Args:\n description (str): progress bar description.\n metric_names (list of str, optional): list of metric names to plot or a string \"all\" to plot all available\n metrics.\n output_transform (callable, optional): output transform function to prepare `engine.state.output` as a number.\n For example, `output_transform = lambda output: output`\n This function can also return a dictionary, e.g `{'loss': loss1, 'another_loss': loss2}` to label the plot\n with corresponding keys.\n closing_event_name: event's name on which the progress bar is closed. Valid events are from\n :class:`~ignite.engine.Events` or any `event_name` added by\n :meth:`~ignite.engine.Engine.register_events`.\n\n \"\"\"\n\n def __init__(self, description, metric_names=None, output_transform=None,\n closing_event_name=Events.EPOCH_COMPLETED):\n if metric_names is None and output_transform is None:\n # This helps to avoid 'Either metric_names or output_transform should be defined' of BaseOutputHandler\n metric_names = []\n super(_OutputHandler, self).__init__(description, metric_names, output_transform,\n another_engine=None, global_step_transform=None)\n self.closing_event_name = closing_event_name\n\n @staticmethod\n def get_max_number_events(event_name, engine):\n if event_name in (Events.ITERATION_STARTED, Events.ITERATION_COMPLETED):\n return len(engine.state.dataloader)\n if event_name in (Events.EPOCH_STARTED, Events.EPOCH_COMPLETED):\n return engine.state.max_epochs\n return 1\n\n def __call__(self, engine, logger, event_name):\n\n pbar_total = self.get_max_number_events(event_name, engine)\n if logger.pbar is None:\n logger._reset(pbar_total=pbar_total)\n\n desc = self.tag\n max_num_of_closing_events = self.get_max_number_events(self.closing_event_name, engine)\n if max_num_of_closing_events > 1:\n global_step = engine.state.get_event_attrib_value(self.closing_event_name)\n desc += \" [{}/{}]\".format(global_step, max_num_of_closing_events)\n logger.pbar.set_description(desc)\n\n metrics = self._setup_output_metrics(engine)\n\n rendered_metrics = {}\n for key, value in metrics.items():\n if isinstance(value, torch.Tensor):\n if value.ndimension() == 0:\n rendered_metrics[key] = value.item()\n elif value.ndimension() == 1:\n for i, v in enumerate(value):\n k = \"{}_{}\".format(key, i)\n rendered_metrics[k] = v.item()\n else:\n warnings.warn(\"ProgressBar can not log \"\n \"tensor with {} dimensions\".format(value.ndimension()))\n else:\n rendered_metrics[key] = value\n\n if rendered_metrics:\n logger.pbar.set_postfix(**rendered_metrics)\n\n global_step = engine.state.get_event_attrib_value(event_name)\n global_step = (global_step - 1) % pbar_total + 1\n logger.pbar.update(global_step - logger.pbar.n)\n", "path": "ignite/contrib/handlers/tqdm_logger.py" } ]
[ { "content": "# -*- coding: utf-8 -*-\nimport warnings\n\nimport torch\n\nfrom ignite.engine import Events\nfrom ignite.engine.engine import EventWithFilter\nfrom ignite.contrib.handlers.base_logger import BaseLogger, BaseOutputHandler\n\n\nclass ProgressBar(BaseLogger):\n \"\"\"\n TQDM progress bar handler to log training progress and computed metrics.\n\n Args:\n persist (bool, optional): set to ``True`` to persist the progress bar after completion (default = ``False``)\n bar_format (str, optional): Specify a custom bar string formatting. May impact performance.\n [default: '{desc}[{n_fmt}/{total_fmt}] {percentage:3.0f}%|{bar}{postfix} [{elapsed}<{remaining}]'].\n Set to ``None`` to use ``tqdm`` default bar formatting: '{l_bar}{bar}{r_bar}', where\n l_bar='{desc}: {percentage:3.0f}%|' and\n r_bar='| {n_fmt}/{total_fmt} [{elapsed}<{remaining}, {rate_fmt}{postfix}]'. For more details on the\n formatting, see `tqdm docs <https://tqdm.github.io/docs/tqdm/>`_.\n **tqdm_kwargs: kwargs passed to tqdm progress bar.\n By default, progress bar description displays \"Epoch [5/10]\" where 5 is the current epoch and 10 is the\n number of epochs. If tqdm_kwargs defines `desc`, e.g. \"Predictions\", than the description is\n \"Predictions [5/10]\" if number of epochs is more than one otherwise it is simply \"Predictions\".\n\n Examples:\n\n Simple progress bar\n\n .. code-block:: python\n\n trainer = create_supervised_trainer(model, optimizer, loss)\n\n pbar = ProgressBar()\n pbar.attach(trainer)\n\n # Progress bar will looks like\n # Epoch [2/50]: [64/128] 50%|█████ [06:17<12:34]\n\n Log output to a file instead of stderr (tqdm's default output)\n\n .. code-block:: python\n\n trainer = create_supervised_trainer(model, optimizer, loss)\n\n log_file = open(\"output.log\", \"w\")\n pbar = ProgressBar(file=log_file)\n pbar.attach(trainer)\n\n Attach metrics that already have been computed at :attr:`~ignite.engine.Events.ITERATION_COMPLETED`\n (such as :class:`~ignite.metrics.RunningAverage`)\n\n .. code-block:: python\n\n trainer = create_supervised_trainer(model, optimizer, loss)\n\n RunningAverage(output_transform=lambda x: x).attach(trainer, 'loss')\n\n pbar = ProgressBar()\n pbar.attach(trainer, ['loss'])\n\n # Progress bar will looks like\n # Epoch [2/50]: [64/128] 50%|█████ , loss=0.123 [06:17<12:34]\n\n Directly attach the engine's output\n\n .. code-block:: python\n\n trainer = create_supervised_trainer(model, optimizer, loss)\n\n pbar = ProgressBar()\n pbar.attach(trainer, output_transform=lambda x: {'loss': x})\n\n # Progress bar will looks like\n # Epoch [2/50]: [64/128] 50%|█████ , loss=0.123 [06:17<12:34]\n\n Note:\n When adding attaching the progress bar to an engine, it is recommend that you replace\n every print operation in the engine's handlers triggered every iteration with\n ``pbar.log_message`` to guarantee the correct format of the stdout.\n\n Note:\n When using inside jupyter notebook, `ProgressBar` automatically uses `tqdm_notebook`. For correct rendering,\n please install `ipywidgets <https://ipywidgets.readthedocs.io/en/stable/user_install.html#installation>`_.\n Due to `tqdm notebook bugs <https://github.com/tqdm/tqdm/issues/594>`_, bar format may be needed to be set\n to an empty string value.\n\n \"\"\"\n\n _events_order = [\n Events.STARTED,\n Events.EPOCH_STARTED,\n Events.ITERATION_STARTED,\n Events.ITERATION_COMPLETED,\n Events.EPOCH_COMPLETED,\n Events.COMPLETED\n ]\n\n def __init__(self, persist=False,\n bar_format='{desc}[{n_fmt}/{total_fmt}] {percentage:3.0f}%|{bar}{postfix} [{elapsed}<{remaining}]',\n **tqdm_kwargs):\n\n try:\n from tqdm.autonotebook import tqdm\n except ImportError:\n raise RuntimeError(\"This contrib module requires tqdm to be installed. \"\n \"Please install it with command: \\n pip install tqdm\")\n\n self.pbar_cls = tqdm\n self.pbar = None\n self.persist = persist\n self.bar_format = bar_format\n self.tqdm_kwargs = tqdm_kwargs\n\n def _reset(self, pbar_total):\n self.pbar = self.pbar_cls(\n total=pbar_total,\n leave=self.persist,\n bar_format=self.bar_format,\n initial=1,\n **self.tqdm_kwargs\n )\n\n def _close(self, engine):\n if self.pbar:\n self.pbar.close()\n self.pbar = None\n\n @staticmethod\n def _compare_lt(event1, event2):\n if isinstance(event1, EventWithFilter):\n event1 = event1.event\n if isinstance(event2, EventWithFilter):\n event2 = event2.event\n i1 = ProgressBar._events_order.index(event1)\n i2 = ProgressBar._events_order.index(event2)\n return i1 < i2\n\n def log_message(self, message):\n \"\"\"\n Logs a message, preserving the progress bar correct output format.\n\n Args:\n message (str): string you wish to log.\n \"\"\"\n from tqdm import tqdm\n tqdm.write(message, **self.tqdm_kwargs)\n\n def attach(self, engine, metric_names=None, output_transform=None,\n event_name=Events.ITERATION_COMPLETED,\n closing_event_name=Events.EPOCH_COMPLETED):\n \"\"\"\n Attaches the progress bar to an engine object.\n\n Args:\n engine (Engine): engine object.\n metric_names (list of str, optional): list of metric names to plot or a string \"all\" to plot all available\n metrics.\n output_transform (callable, optional): a function to select what you want to print from the engine's\n output. This function may return either a dictionary with entries in the format of ``{name: value}``,\n or a single scalar, which will be displayed with the default name `output`.\n event_name: event's name on which the progress bar advances. Valid events are from\n :class:`~ignite.engine.Events`.\n closing_event_name: event's name on which the progress bar is closed. Valid events are from\n :class:`~ignite.engine.Events`.\n\n Note: accepted output value types are numbers, 0d and 1d torch tensors and strings\n\n \"\"\"\n desc = self.tqdm_kwargs.get(\"desc\", \"Epoch\")\n\n if not isinstance(event_name, (Events, EventWithFilter)):\n raise ValueError(\"Logging event should be only `ignite.engine.Events`\")\n\n if isinstance(closing_event_name, EventWithFilter):\n raise ValueError(\"Closing event should not use any event filter\")\n\n if not self._compare_lt(event_name, closing_event_name):\n raise ValueError(\"Logging event {} should be called before closing event {}\"\n .format(event_name, closing_event_name))\n\n log_handler = _OutputHandler(desc, metric_names, output_transform,\n closing_event_name=closing_event_name)\n # if event_name is EventWithFilter, filter is passed here\n super(ProgressBar, self).attach(engine, log_handler, event_name)\n engine.add_event_handler(closing_event_name, self._close)\n\n\nclass _OutputHandler(BaseOutputHandler):\n \"\"\"Helper handler to log engine's output and/or metrics\n\n Args:\n description (str): progress bar description.\n metric_names (list of str, optional): list of metric names to plot or a string \"all\" to plot all available\n metrics.\n output_transform (callable, optional): output transform function to prepare `engine.state.output` as a number.\n For example, `output_transform = lambda output: output`\n This function can also return a dictionary, e.g `{'loss': loss1, 'another_loss': loss2}` to label the plot\n with corresponding keys.\n closing_event_name: event's name on which the progress bar is closed. Valid events are from\n :class:`~ignite.engine.Events` or any `event_name` added by\n :meth:`~ignite.engine.Engine.register_events`.\n\n \"\"\"\n\n def __init__(self, description, metric_names=None, output_transform=None,\n closing_event_name=Events.EPOCH_COMPLETED):\n if metric_names is None and output_transform is None:\n # This helps to avoid 'Either metric_names or output_transform should be defined' of BaseOutputHandler\n metric_names = []\n super(_OutputHandler, self).__init__(description, metric_names, output_transform,\n another_engine=None, global_step_transform=None)\n self.closing_event_name = closing_event_name\n\n @staticmethod\n def get_max_number_events(event_name, engine):\n if event_name in (Events.ITERATION_STARTED, Events.ITERATION_COMPLETED):\n return len(engine.state.dataloader)\n if event_name in (Events.EPOCH_STARTED, Events.EPOCH_COMPLETED):\n return engine.state.max_epochs\n return 1\n\n def __call__(self, engine, logger, event_name):\n\n pbar_total = self.get_max_number_events(event_name, engine)\n if logger.pbar is None:\n logger._reset(pbar_total=pbar_total)\n\n desc = self.tag\n max_num_of_closing_events = self.get_max_number_events(self.closing_event_name, engine)\n if max_num_of_closing_events > 1:\n global_step = engine.state.get_event_attrib_value(self.closing_event_name)\n desc += \" [{}/{}]\".format(global_step, max_num_of_closing_events)\n logger.pbar.set_description(desc)\n\n metrics = self._setup_output_metrics(engine)\n\n rendered_metrics = {}\n for key, value in metrics.items():\n if isinstance(value, torch.Tensor):\n if value.ndimension() == 0:\n rendered_metrics[key] = value.item()\n elif value.ndimension() == 1:\n for i, v in enumerate(value):\n k = \"{}_{}\".format(key, i)\n rendered_metrics[k] = v.item()\n else:\n warnings.warn(\"ProgressBar can not log \"\n \"tensor with {} dimensions\".format(value.ndimension()))\n else:\n rendered_metrics[key] = value\n\n if rendered_metrics:\n logger.pbar.set_postfix(**rendered_metrics)\n\n global_step = engine.state.get_event_attrib_value(event_name)\n global_step = (global_step - 1) % pbar_total + 1\n logger.pbar.update(global_step - logger.pbar.n)\n", "path": "ignite/contrib/handlers/tqdm_logger.py" } ]
diff --git a/ignite/contrib/handlers/tqdm_logger.py b/ignite/contrib/handlers/tqdm_logger.py index 7600372e6d33..bc921eb7131b 100644 --- a/ignite/contrib/handlers/tqdm_logger.py +++ b/ignite/contrib/handlers/tqdm_logger.py @@ -119,6 +119,7 @@ def _reset(self, pbar_total): total=pbar_total, leave=self.persist, bar_format=self.bar_format, + initial=1, **self.tqdm_kwargs ) diff --git a/tests/ignite/contrib/handlers/test_tqdm_logger.py b/tests/ignite/contrib/handlers/test_tqdm_logger.py index 003db31f8b5e..76c6b318aa4f 100644 --- a/tests/ignite/contrib/handlers/test_tqdm_logger.py +++ b/tests/ignite/contrib/handlers/test_tqdm_logger.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +import time import numpy as np import pytest import torch @@ -56,6 +57,24 @@ def test_attach_fail_with_string(): pbar.attach(engine, 'a') +def test_pbar_batch_indeces(capsys): + engine = Engine(lambda e, b: time.sleep(0.1)) + @engine.on(Events.ITERATION_STARTED) + def print_iter(_): + print("iteration: ", engine.state.iteration) + + ProgressBar(persist=True).attach(engine) + engine.run(list(range(4)), max_epochs=1) + + captured = capsys.readouterr() + err = captured.err.split('\r') + err = list(map(lambda x: x.strip(), err)) + err = list(filter(None, err)) + printed_batch_indeces = set(map(lambda x: int(x.split('/')[0][-1]), err)) + expected_batch_indeces = list(range(1, 5)) + assert sorted(list(printed_batch_indeces)) == expected_batch_indeces + + def test_pbar_with_metric(capsys): n_iters = 2
scikit-hep__pyhf-1283
[ { "content": "#\n# pyhf documentation build configuration file, created by\n# sphinx-quickstart on Fri Feb 9 11:58:49 2018.\n#\n# This file is execfile()d with the current directory set to its\n# containing dir.\n#\n# Note that not all possible configuration values are present in this\n# autogenerated file.\n#\n# All configuration values have a default; values that are commented out\n# serve to show the default.\n\n# If extensions (or modules to document with autodoc) are in another directory,\n# add these directories to sys.path here. If the directory is relative to the\n# documentation root, use Path('../relative_path_to_dir').resolve() to make it absolute, like shown here.\n\nfrom pathlib import Path\nimport sys\nfrom pkg_resources import get_distribution\n\nsys.path.insert(0, str(Path('../src').resolve()))\nsys.path.insert(1, str(Path('./exts').resolve()))\n\n\ndef setup(app):\n app.add_css_file(\n 'https://cdnjs.cloudflare.com/ajax/libs/github-fork-ribbon-css/0.2.2/gh-fork-ribbon.min.css'\n )\n\n\n# -- General configuration ------------------------------------------------\n\n# If your documentation needs a minimal Sphinx version, state it here.\n#\n# needs_sphinx = '1.0'\n\n# Add any Sphinx extension module names here, as strings. They can be\n# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom\n# ones.\nextensions = [\n 'sphinx.ext.autodoc',\n 'sphinx.ext.autosummary',\n 'sphinx.ext.coverage',\n 'sphinx.ext.mathjax',\n 'sphinx.ext.ifconfig',\n 'sphinx.ext.viewcode',\n 'sphinx.ext.githubpages',\n 'sphinx.ext.intersphinx',\n 'sphinxcontrib.bibtex',\n 'sphinx.ext.napoleon',\n 'sphinx_click.ext',\n 'nbsphinx',\n 'sphinx_issues',\n 'sphinx_copybutton',\n 'xref',\n]\nbibtex_bibfiles = [\n \"bib/docs.bib\",\n \"bib/HEPData_likelihoods.bib\",\n \"bib/media.bib\",\n \"bib/posters.bib\",\n \"bib/preferred.bib\",\n \"bib/talks.bib\",\n \"bib/tutorials.bib\",\n \"bib/use_citations.bib\",\n]\n\n# external links\nxref_links = {\"arXiv:1007.1727\": (\"[1007.1727]\", \"https://arxiv.org/abs/1007.1727\")}\n\nintersphinx_mapping = {\n 'python': ('https://docs.python.org/3', None),\n 'numpy': ('http://docs.scipy.org/doc/numpy/', None),\n 'scipy': ('https://docs.scipy.org/doc/scipy/reference/', None),\n 'iminuit': ('https://iminuit.readthedocs.io/en/stable/', None),\n 'uproot': ('https://uproot.readthedocs.io/en/latest/', None),\n}\n\n# Github repo\nissues_github_path = 'scikit-hep/pyhf'\n\n# Generate the API documentation when building\nautosummary_generate = True\nnumpydoc_show_class_members = False\n\n# Add any paths that contain templates here, relative to this directory.\ntemplates_path = ['_templates']\n\n# The suffix(es) of source filenames.\n# You can specify multiple suffix as a list of string:\n#\nsource_suffix = ['.rst', '.md']\n# source_suffix = '.rst'\n\n# The encoding of source files.\n#\n# source_encoding = 'utf-8-sig'\n\n# The master toctree document.\nmaster_doc = 'index'\n\n# General information about the project.\nproject = 'pyhf'\ncopyright = '2018, Lukas Heinrich, Matthew Feickert, Giordon Stark'\nauthor = 'Lukas Heinrich, Matthew Feickert, Giordon Stark'\n\n# The version info for the project you're documenting, acts as replacement for\n# |version| and |release|, also used in various other places throughout the\n# built documents.\n# The full version, including alpha/beta/rc tags.\nrelease = get_distribution('pyhf').version\n# for example take major/minor/patch\nversion = '.'.join(release.split('.')[:3])\n\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n#\n# This is also used if you do content translation via gettext catalogs.\n# Usually you set \"language\" from the command line for these cases.\nlanguage = None\n\n# There are two options for replacing |today|: either, you set today to some\n# non-false value, then it is used:\n#\n# today = ''\n#\n# Else, today_fmt is used as the format for a strftime call.\n#\n# today_fmt = '%B %d, %Y'\n\nautodoc_mock_imports = [\n 'tensorflow',\n 'torch',\n 'jax',\n 'iminuit',\n 'tensorflow_probability',\n]\n\n# List of patterns, relative to source directory, that match files and\n# directories to ignore when looking for source files.\n# This patterns also effect to html_static_path and html_extra_path\nexclude_patterns = [\n '_build',\n 'JOSS',\n '**.ipynb_checkpoints',\n 'examples/experiments/edwardpyhf.ipynb',\n 'examples/notebooks/ImpactPlot.ipynb',\n 'examples/notebooks/Recast.ipynb',\n 'examples/notebooks/StatError.ipynb',\n 'examples/notebooks/example-tensorflow.ipynb',\n 'examples/notebooks/histogrammar.ipynb',\n 'examples/notebooks/histosys.ipynb',\n 'examples/notebooks/histosys-pytorch.ipynb',\n 'examples/notebooks/importxml.ipynb',\n 'examples/notebooks/multichannel-coupled-normsys.ipynb',\n 'examples/notebooks/multichannel-normsys.ipynb',\n 'examples/notebooks/normsys.ipynb',\n 'examples/notebooks/pullplot.ipynb',\n 'examples/notebooks/pytorch_tests_onoff.ipynb',\n 'examples/notebooks/tensorflow-limit.ipynb',\n]\n\n# The reST default role (used for this markup: `text`) to use for all\n# documents.\n#\n# default_role = None\n\n# If true, '()' will be appended to :func: etc. cross-reference text.\n#\n# add_function_parentheses = True\n\n# If true, the current module name will be prepended to all description\n# unit titles (such as .. function::).\n#\n# add_module_names = True\n\n# If true, sectionauthor and moduleauthor directives will be shown in the\n# output. They are ignored by default.\n#\n# show_authors = False\n\n# The name of the Pygments (syntax highlighting) style to use.\npygments_style = 'sphinx'\n\n# A list of ignored prefixes for module index sorting.\n# modindex_common_prefix = []\n\n# If true, keep warnings as \"system message\" paragraphs in the built documents.\n# keep_warnings = False\n\n# If true, `todo` and `todoList` produce output, else they produce nothing.\ntodo_include_todos = False\n\n\n# -- Options for HTML output ----------------------------------------------\n\n# The theme to use for HTML and HTML Help pages. See the documentation for\n# a list of builtin themes.\n#\nhtml_theme = 'sphinx_rtd_theme'\n\n# Theme options are theme-specific and customize the look and feel of a theme\n# further. For a list of options available for each theme, see the\n# documentation.\n#\nhtml_theme_options = {}\n\n# Add any paths that contain custom themes here, relative to this directory.\nhtml_theme_path = []\n\n# The name for this set of Sphinx documents.\n# \"<project> v<release> documentation\" by default.\n#\n# html_title = u'pyhf v0.3.0'\n\n# A shorter title for the navigation bar. Default is the same as html_title.\n#\n# html_short_title = None\n\n# The name of an image file (relative to this directory) to place at the top\n# of the sidebar.\n#\n# html_logo = None\n\n# The name of an image file (relative to this directory) to use as a favicon of\n# the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32\n# pixels large.\n#\n# html_favicon = None\n\n# Add any paths that contain custom static files (such as style sheets) here,\n# relative to this directory. They are copied after the builtin static files,\n# so a file named \"default.css\" will overwrite the builtin \"default.css\".\nhtml_static_path = ['_static']\n\n# Add any extra paths that contain custom files (such as robots.txt or\n# .htaccess) here, relative to this directory. These files are copied\n# directly to the root of the documentation.\n#\nhtml_extra_path = ['_extras']\n\n# If not None, a 'Last updated on:' timestamp is inserted at every page\n# bottom, using the given strftime format.\n# The empty string is equivalent to '%b %d, %Y'.\n#\n# html_last_updated_fmt = None\n\n# If true, SmartyPants will be used to convert quotes and dashes to\n# typographically correct entities.\n#\n# html_use_smartypants = True\n\n# Custom sidebar templates, maps document names to template names.\n#\n# html_sidebars = {}\n\n# Additional templates that should be rendered to pages, maps page names to\n# template names.\n#\n# html_additional_pages = {}\n\n# If false, no module index is generated.\n#\n# html_domain_indices = True\n\n# If false, no index is generated.\n#\n# html_use_index = True\n\n# If true, the index is split into individual pages for each letter.\n#\n# html_split_index = False\n\n# If true, links to the reST sources are added to the pages.\n#\n# html_show_sourcelink = True\n\n# If true, \"Created using Sphinx\" is shown in the HTML footer. Default is True.\n#\n# html_show_sphinx = True\n\n# If true, \"(C) Copyright ...\" is shown in the HTML footer. Default is True.\n#\n# html_show_copyright = True\n\n# If true, an OpenSearch description file will be output, and all pages will\n# contain a <link> tag referring to it. The value of this option must be the\n# base URL from which the finished HTML is served.\n#\n# html_use_opensearch = ''\n\n# This is the file name suffix for HTML files (e.g. \".xhtml\").\n# html_file_suffix = None\n\n# Language to be used for generating the HTML full-text search index.\n# Sphinx supports the following languages:\n# 'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'\n# 'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr', 'zh'\n#\n# html_search_language = 'en'\n\n# A dictionary with options for the search language support, empty by default.\n# 'ja' uses this config value.\n# 'zh' user can custom change `jieba` dictionary path.\n#\n# html_search_options = {'type': 'default'}\n\n# The name of a javascript file (relative to the configuration directory) that\n# implements a search results scorer. If empty, the default will be used.\n#\n# html_search_scorer = 'scorer.js'\n\n# Output file base name for HTML help builder.\nhtmlhelp_basename = 'pyhfdoc'\n\n# sphinx-copybutton configuration\ncopybutton_prompt_text = \">>> \"\n\n# -- Options for LaTeX output ---------------------------------------------\n\nlatex_elements = {\n # The paper size ('letterpaper' or 'a4paper').\n #\n # 'papersize': 'letterpaper',\n # The font size ('10pt', '11pt' or '12pt').\n #\n # 'pointsize': '10pt',\n # Additional stuff for the LaTeX preamble.\n #\n # 'preamble': '',\n # Latex figure (float) alignment\n #\n # 'figure_align': 'htbp',\n}\n\n# Grouping the document tree into LaTeX files. List of tuples\n# (source start file, target name, title,\n# author, documentclass [howto, manual, or own class]).\nlatex_documents = [\n (\n master_doc,\n 'pyhf.tex',\n 'pyhf Documentation',\n 'Lukas Heinrich, Matthew Feickert, Giordon Stark',\n 'manual',\n )\n]\n\n# The name of an image file (relative to this directory) to place at the top of\n# the title page.\n#\n# latex_logo = None\n\n# For \"manual\" documents, if this is true, then toplevel headings are parts,\n# not chapters.\n#\n# latex_use_parts = False\n\n# If true, show page references after internal links.\n#\n# latex_show_pagerefs = False\n\n# If true, show URL addresses after external links.\n#\n# latex_show_urls = False\n\n# Documents to append as an appendix to all manuals.\n#\n# latex_appendices = []\n\n# It false, will not define \\strong, \\code, \titleref, \\crossref ... but only\n# \\sphinxstrong, ..., \\sphinxtitleref, ... To help avoid clash with user added\n# packages.\n#\n# latex_keep_old_macro_names = True\n\n# If false, no module index is generated.\n#\n# latex_domain_indices = True\n\n\n# -- Options for manual page output ---------------------------------------\n\n# One entry per manual page. List of tuples\n# (source start file, name, description, authors, manual section).\nman_pages = [(master_doc, 'pyhf', 'pyhf Documentation', [author], 1)]\n\n# If true, show URL addresses after external links.\n#\n# man_show_urls = False\n\n\n# -- Options for Texinfo output -------------------------------------------\n\n# Grouping the document tree into Texinfo files. List of tuples\n# (source start file, target name, title, author,\n# dir menu entry, description, category)\ntexinfo_documents = [\n (\n master_doc,\n 'pyhf',\n 'pyhf Documentation',\n author,\n 'pyhf',\n 'One line description of project.',\n 'Miscellaneous',\n )\n]\n\n# Documents to append as an appendix to all manuals.\n#\n# texinfo_appendices = []\n\n# If false, no module index is generated.\n#\n# texinfo_domain_indices = True\n\n# How to display URL addresses: 'footnote', 'no', or 'inline'.\n#\n# texinfo_show_urls = 'footnote'\n\n# If true, do not generate a @detailmenu in the \"Top\" node's menu.\n#\n# texinfo_no_detailmenu = False\n\nmathjax_config = {\n 'tex2jax': {'inlineMath': [['$', '$'], ['\\\\(', '\\\\)']]},\n 'TeX': {\n 'Macros': {\n 'bm': [\"\\\\boldsymbol{#1}\", 1], # \\usepackage{bm}, see mathjax/MathJax#1219\n 'HiFa': r'\\texttt{HistFactory}',\n 'Root': r'\\texttt{ROOT}',\n 'RooStats': r'\\texttt{RooStats}',\n 'RooFit': r'\\texttt{RooFit}',\n 'pyhf': r'\\texttt{pyhf}',\n 'CLs': r'\\mathrm{CL}_{s}',\n 'freeset': r'\\bm{\\eta}',\n 'constrset': r'\\bm{\\chi}',\n 'singleconstr': r'\\chi',\n 'channelcounts': r'\\bm{n}',\n 'auxdata': r'\\bm{a}',\n 'poiset': r'\\bm{\\psi}',\n 'nuisset': r'\\bm{\\theta}',\n 'fullset': r'\\bm{\\phi}',\n 'singlefull': r'\\phi',\n 'TeV': r'\\textrm{TeV}',\n }\n },\n}\n", "path": "docs/conf.py" } ]
[ { "content": "#\n# pyhf documentation build configuration file, created by\n# sphinx-quickstart on Fri Feb 9 11:58:49 2018.\n#\n# This file is execfile()d with the current directory set to its\n# containing dir.\n#\n# Note that not all possible configuration values are present in this\n# autogenerated file.\n#\n# All configuration values have a default; values that are commented out\n# serve to show the default.\n\n# If extensions (or modules to document with autodoc) are in another directory,\n# add these directories to sys.path here. If the directory is relative to the\n# documentation root, use Path('../relative_path_to_dir').resolve() to make it absolute, like shown here.\n\nfrom pathlib import Path\nimport sys\nfrom pkg_resources import get_distribution\n\nsys.path.insert(0, str(Path('../src').resolve()))\nsys.path.insert(1, str(Path('./exts').resolve()))\n\n\ndef setup(app):\n app.add_css_file(\n 'https://cdnjs.cloudflare.com/ajax/libs/github-fork-ribbon-css/0.2.2/gh-fork-ribbon.min.css'\n )\n\n\n# -- General configuration ------------------------------------------------\n\n# If your documentation needs a minimal Sphinx version, state it here.\n#\n# needs_sphinx = '1.0'\n\n# Add any Sphinx extension module names here, as strings. They can be\n# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom\n# ones.\nextensions = [\n 'sphinx.ext.autodoc',\n 'sphinx.ext.autosummary',\n 'sphinx.ext.coverage',\n 'sphinx.ext.mathjax',\n 'sphinx.ext.ifconfig',\n 'sphinx.ext.viewcode',\n 'sphinx.ext.githubpages',\n 'sphinx.ext.intersphinx',\n 'sphinxcontrib.bibtex',\n 'sphinx.ext.napoleon',\n 'sphinx_click.ext',\n 'nbsphinx',\n 'sphinx_issues',\n 'sphinx_copybutton',\n 'xref',\n]\nbibtex_bibfiles = [\n \"bib/docs.bib\",\n \"bib/HEPData_likelihoods.bib\",\n \"bib/media.bib\",\n \"bib/posters.bib\",\n \"bib/preferred.bib\",\n \"bib/talks.bib\",\n \"bib/tutorials.bib\",\n \"bib/use_citations.bib\",\n]\n\n# external links\nxref_links = {\"arXiv:1007.1727\": (\"[1007.1727]\", \"https://arxiv.org/abs/1007.1727\")}\n\nintersphinx_mapping = {\n 'python': ('https://docs.python.org/3', None),\n 'numpy': ('http://docs.scipy.org/doc/numpy/', None),\n 'scipy': ('https://docs.scipy.org/doc/scipy/reference/', None),\n 'iminuit': ('https://iminuit.readthedocs.io/en/stable/', None),\n 'uproot': ('https://uproot.readthedocs.io/en/latest/', None),\n}\n\n# GitHub repo\nissues_github_path = 'scikit-hep/pyhf'\n\n# Generate the API documentation when building\nautosummary_generate = True\nnumpydoc_show_class_members = False\n\n# Add any paths that contain templates here, relative to this directory.\ntemplates_path = ['_templates']\n\n# The suffix(es) of source filenames.\n# You can specify multiple suffix as a list of string:\n#\nsource_suffix = ['.rst', '.md']\n# source_suffix = '.rst'\n\n# The encoding of source files.\n#\n# source_encoding = 'utf-8-sig'\n\n# The master toctree document.\nmaster_doc = 'index'\n\n# General information about the project.\nproject = 'pyhf'\ncopyright = '2018, Lukas Heinrich, Matthew Feickert, Giordon Stark'\nauthor = 'Lukas Heinrich, Matthew Feickert, Giordon Stark'\n\n# The version info for the project you're documenting, acts as replacement for\n# |version| and |release|, also used in various other places throughout the\n# built documents.\n# The full version, including alpha/beta/rc tags.\nrelease = get_distribution('pyhf').version\n# for example take major/minor/patch\nversion = '.'.join(release.split('.')[:3])\n\n# The language for content autogenerated by Sphinx. Refer to documentation\n# for a list of supported languages.\n#\n# This is also used if you do content translation via gettext catalogs.\n# Usually you set \"language\" from the command line for these cases.\nlanguage = None\n\n# There are two options for replacing |today|: either, you set today to some\n# non-false value, then it is used:\n#\n# today = ''\n#\n# Else, today_fmt is used as the format for a strftime call.\n#\n# today_fmt = '%B %d, %Y'\n\nautodoc_mock_imports = [\n 'tensorflow',\n 'torch',\n 'jax',\n 'iminuit',\n 'tensorflow_probability',\n]\n\n# List of patterns, relative to source directory, that match files and\n# directories to ignore when looking for source files.\n# This patterns also effect to html_static_path and html_extra_path\nexclude_patterns = [\n '_build',\n 'JOSS',\n '**.ipynb_checkpoints',\n 'examples/experiments/edwardpyhf.ipynb',\n 'examples/notebooks/ImpactPlot.ipynb',\n 'examples/notebooks/Recast.ipynb',\n 'examples/notebooks/StatError.ipynb',\n 'examples/notebooks/example-tensorflow.ipynb',\n 'examples/notebooks/histogrammar.ipynb',\n 'examples/notebooks/histosys.ipynb',\n 'examples/notebooks/histosys-pytorch.ipynb',\n 'examples/notebooks/importxml.ipynb',\n 'examples/notebooks/multichannel-coupled-normsys.ipynb',\n 'examples/notebooks/multichannel-normsys.ipynb',\n 'examples/notebooks/normsys.ipynb',\n 'examples/notebooks/pullplot.ipynb',\n 'examples/notebooks/pytorch_tests_onoff.ipynb',\n 'examples/notebooks/tensorflow-limit.ipynb',\n]\n\n# The reST default role (used for this markup: `text`) to use for all\n# documents.\n#\n# default_role = None\n\n# If true, '()' will be appended to :func: etc. cross-reference text.\n#\n# add_function_parentheses = True\n\n# If true, the current module name will be prepended to all description\n# unit titles (such as .. function::).\n#\n# add_module_names = True\n\n# If true, sectionauthor and moduleauthor directives will be shown in the\n# output. They are ignored by default.\n#\n# show_authors = False\n\n# The name of the Pygments (syntax highlighting) style to use.\npygments_style = 'sphinx'\n\n# A list of ignored prefixes for module index sorting.\n# modindex_common_prefix = []\n\n# If true, keep warnings as \"system message\" paragraphs in the built documents.\n# keep_warnings = False\n\n# If true, `todo` and `todoList` produce output, else they produce nothing.\ntodo_include_todos = False\n\n\n# -- Options for HTML output ----------------------------------------------\n\n# The theme to use for HTML and HTML Help pages. See the documentation for\n# a list of builtin themes.\n#\nhtml_theme = 'sphinx_rtd_theme'\n\n# Theme options are theme-specific and customize the look and feel of a theme\n# further. For a list of options available for each theme, see the\n# documentation.\n#\nhtml_theme_options = {}\n\n# Add any paths that contain custom themes here, relative to this directory.\nhtml_theme_path = []\n\n# The name for this set of Sphinx documents.\n# \"<project> v<release> documentation\" by default.\n#\n# html_title = u'pyhf v0.3.0'\n\n# A shorter title for the navigation bar. Default is the same as html_title.\n#\n# html_short_title = None\n\n# The name of an image file (relative to this directory) to place at the top\n# of the sidebar.\n#\n# html_logo = None\n\n# The name of an image file (relative to this directory) to use as a favicon of\n# the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32\n# pixels large.\n#\n# html_favicon = None\n\n# Add any paths that contain custom static files (such as style sheets) here,\n# relative to this directory. They are copied after the builtin static files,\n# so a file named \"default.css\" will overwrite the builtin \"default.css\".\nhtml_static_path = ['_static']\n\n# Add any extra paths that contain custom files (such as robots.txt or\n# .htaccess) here, relative to this directory. These files are copied\n# directly to the root of the documentation.\n#\nhtml_extra_path = ['_extras']\n\n# If not None, a 'Last updated on:' timestamp is inserted at every page\n# bottom, using the given strftime format.\n# The empty string is equivalent to '%b %d, %Y'.\n#\n# html_last_updated_fmt = None\n\n# If true, SmartyPants will be used to convert quotes and dashes to\n# typographically correct entities.\n#\n# html_use_smartypants = True\n\n# Custom sidebar templates, maps document names to template names.\n#\n# html_sidebars = {}\n\n# Additional templates that should be rendered to pages, maps page names to\n# template names.\n#\n# html_additional_pages = {}\n\n# If false, no module index is generated.\n#\n# html_domain_indices = True\n\n# If false, no index is generated.\n#\n# html_use_index = True\n\n# If true, the index is split into individual pages for each letter.\n#\n# html_split_index = False\n\n# If true, links to the reST sources are added to the pages.\n#\n# html_show_sourcelink = True\n\n# If true, \"Created using Sphinx\" is shown in the HTML footer. Default is True.\n#\n# html_show_sphinx = True\n\n# If true, \"(C) Copyright ...\" is shown in the HTML footer. Default is True.\n#\n# html_show_copyright = True\n\n# If true, an OpenSearch description file will be output, and all pages will\n# contain a <link> tag referring to it. The value of this option must be the\n# base URL from which the finished HTML is served.\n#\n# html_use_opensearch = ''\n\n# This is the file name suffix for HTML files (e.g. \".xhtml\").\n# html_file_suffix = None\n\n# Language to be used for generating the HTML full-text search index.\n# Sphinx supports the following languages:\n# 'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'\n# 'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr', 'zh'\n#\n# html_search_language = 'en'\n\n# A dictionary with options for the search language support, empty by default.\n# 'ja' uses this config value.\n# 'zh' user can custom change `jieba` dictionary path.\n#\n# html_search_options = {'type': 'default'}\n\n# The name of a javascript file (relative to the configuration directory) that\n# implements a search results scorer. If empty, the default will be used.\n#\n# html_search_scorer = 'scorer.js'\n\n# Output file base name for HTML help builder.\nhtmlhelp_basename = 'pyhfdoc'\n\n# sphinx-copybutton configuration\ncopybutton_prompt_text = \">>> \"\n\n# -- Options for LaTeX output ---------------------------------------------\n\nlatex_elements = {\n # The paper size ('letterpaper' or 'a4paper').\n #\n # 'papersize': 'letterpaper',\n # The font size ('10pt', '11pt' or '12pt').\n #\n # 'pointsize': '10pt',\n # Additional stuff for the LaTeX preamble.\n #\n # 'preamble': '',\n # Latex figure (float) alignment\n #\n # 'figure_align': 'htbp',\n}\n\n# Grouping the document tree into LaTeX files. List of tuples\n# (source start file, target name, title,\n# author, documentclass [howto, manual, or own class]).\nlatex_documents = [\n (\n master_doc,\n 'pyhf.tex',\n 'pyhf Documentation',\n 'Lukas Heinrich, Matthew Feickert, Giordon Stark',\n 'manual',\n )\n]\n\n# The name of an image file (relative to this directory) to place at the top of\n# the title page.\n#\n# latex_logo = None\n\n# For \"manual\" documents, if this is true, then toplevel headings are parts,\n# not chapters.\n#\n# latex_use_parts = False\n\n# If true, show page references after internal links.\n#\n# latex_show_pagerefs = False\n\n# If true, show URL addresses after external links.\n#\n# latex_show_urls = False\n\n# Documents to append as an appendix to all manuals.\n#\n# latex_appendices = []\n\n# It false, will not define \\strong, \\code, \titleref, \\crossref ... but only\n# \\sphinxstrong, ..., \\sphinxtitleref, ... To help avoid clash with user added\n# packages.\n#\n# latex_keep_old_macro_names = True\n\n# If false, no module index is generated.\n#\n# latex_domain_indices = True\n\n\n# -- Options for manual page output ---------------------------------------\n\n# One entry per manual page. List of tuples\n# (source start file, name, description, authors, manual section).\nman_pages = [(master_doc, 'pyhf', 'pyhf Documentation', [author], 1)]\n\n# If true, show URL addresses after external links.\n#\n# man_show_urls = False\n\n\n# -- Options for Texinfo output -------------------------------------------\n\n# Grouping the document tree into Texinfo files. List of tuples\n# (source start file, target name, title, author,\n# dir menu entry, description, category)\ntexinfo_documents = [\n (\n master_doc,\n 'pyhf',\n 'pyhf Documentation',\n author,\n 'pyhf',\n 'One line description of project.',\n 'Miscellaneous',\n )\n]\n\n# Documents to append as an appendix to all manuals.\n#\n# texinfo_appendices = []\n\n# If false, no module index is generated.\n#\n# texinfo_domain_indices = True\n\n# How to display URL addresses: 'footnote', 'no', or 'inline'.\n#\n# texinfo_show_urls = 'footnote'\n\n# If true, do not generate a @detailmenu in the \"Top\" node's menu.\n#\n# texinfo_no_detailmenu = False\n\nmathjax_config = {\n 'tex2jax': {'inlineMath': [['$', '$'], ['\\\\(', '\\\\)']]},\n 'TeX': {\n 'Macros': {\n 'bm': [\"\\\\boldsymbol{#1}\", 1], # \\usepackage{bm}, see mathjax/MathJax#1219\n 'HiFa': r'\\texttt{HistFactory}',\n 'Root': r'\\texttt{ROOT}',\n 'RooStats': r'\\texttt{RooStats}',\n 'RooFit': r'\\texttt{RooFit}',\n 'pyhf': r'\\texttt{pyhf}',\n 'CLs': r'\\mathrm{CL}_{s}',\n 'freeset': r'\\bm{\\eta}',\n 'constrset': r'\\bm{\\chi}',\n 'singleconstr': r'\\chi',\n 'channelcounts': r'\\bm{n}',\n 'auxdata': r'\\bm{a}',\n 'poiset': r'\\bm{\\psi}',\n 'nuisset': r'\\bm{\\theta}',\n 'fullset': r'\\bm{\\phi}',\n 'singlefull': r'\\phi',\n 'TeV': r'\\textrm{TeV}',\n }\n },\n}\n", "path": "docs/conf.py" } ]
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5d448e2be3..0ceced45f7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,7 +6,7 @@ To get started fork the repo. ## Issues Making Issues is very helpful to the project &mdash; they help the dev team form the development roadmap and are where most important discussion takes place. -If you have suggestions, questions that you can't find answers to on the [documentation website](https://scikit-hep.org/pyhf/) or on the [Stack Overflow tag](https://stackoverflow.com/questions/tagged/pyhf), or have found a bug please [open an Issue](https://github.com/scikit-hep/pyhf/issues/new/choose)! +If you have suggestions, questions that you can't find answers to on the [documentation website](https://scikit-hep.org/pyhf/) or on the [GitHub Discussions](https://github.com/scikit-hep/pyhf/discussions), or have found a bug please [open an Issue](https://github.com/scikit-hep/pyhf/issues/new/choose)! ## Pull Requests diff --git a/README.rst b/README.rst index f54538540a..3e492a025c 100644 --- a/README.rst +++ b/README.rst @@ -262,15 +262,7 @@ Questions If you have a question about the use of ``pyhf`` not covered in `the documentation <https://scikit-hep.org/pyhf/>`__, please ask a question -on `Stack Overflow <https://stackoverflow.com/questions/tagged/pyhf>`__ -with the ``[pyhf]`` tag, which the ``pyhf`` dev team -`watches <https://stackoverflow.com/questions/tagged/pyhf?sort=Newest&filters=NoAcceptedAnswer&edited=true>`__. - -.. image:: https://cdn.sstatic.net/Sites/stackoverflow/company/img/logos/so/so-logo.png - :alt: Stack Overflow pyhf tag - :width: 50 % - :target: https://stackoverflow.com/questions/tagged/pyhf - :align: center +on the `GitHub Discussions <https://github.com/scikit-hep/pyhf/discussions>`__. If you believe you have found a bug in ``pyhf``, please report it in the `GitHub diff --git a/docs/conf.py b/docs/conf.py index 05453ab023..655ef6b3da 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -77,7 +77,7 @@ def setup(app): 'uproot': ('https://uproot.readthedocs.io/en/latest/', None), } -# Github repo +# GitHub repo issues_github_path = 'scikit-hep/pyhf' # Generate the API documentation when building diff --git a/docs/contributors.rst b/docs/contributors.rst index 6c5bf2f02e..d1b19b09a1 100644 --- a/docs/contributors.rst +++ b/docs/contributors.rst @@ -20,3 +20,4 @@ Contributors include: - Karthikeyan Singaravelan - Marco Gorelli - Pradyumna Rahul K +- Eric Schanet diff --git a/docs/faq.rst b/docs/faq.rst index 1571403d95..6ed31d530a 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -8,15 +8,7 @@ Questions Where can I ask questions about ``pyhf`` use? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -If you have a question about the use of ``pyhf`` not covered in the `documentation <https://scikit-hep.org/pyhf/>`__, please ask a question on `Stack Overflow <https://stackoverflow.com/questions/tagged/pyhf>`__ with the ``[pyhf]`` tag, which the ``pyhf`` dev team `watches <https://stackoverflow.com/questions/tagged/pyhf?sort=Newest&filters=NoAcceptedAnswer&edited=true>`__. - -.. raw:: html - - <p align="center"> - <a href="https://stackoverflow.com/questions/tagged/pyhf"> - <img src="https://cdn.sstatic.net/Sites/stackoverflow/company/img/logos/so/so-logo.png" alt="Stack Overflow pyhf tag" width="50%"/> - </a> - </p> +If you have a question about the use of ``pyhf`` not covered in the `documentation <https://scikit-hep.org/pyhf/>`__, please ask a question on the `GitHub Discussions <https://github.com/scikit-hep/pyhf/discussions>`__. If you believe you have found a bug in ``pyhf``, please report it in the `GitHub Issues <https://github.com/scikit-hep/pyhf/issues/new?template=Bug-Report.md&labels=bug&title=Bug+Report+:+Title+Here>`__.
huggingface__trl-154
[ { "content": "# Copyright 2022 The HuggingFace Team. All rights reserved.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\nimport inspect\nimport logging\nimport os\nimport random\nimport time\nimport warnings\nfrom typing import List, Optional, Union\n\nimport datasets\nimport torch\nfrom accelerate import Accelerator\nfrom datasets import Dataset\nfrom huggingface_hub import whoami\nfrom packaging import version\nfrom torch.optim import Adam\nfrom transformers import DataCollatorForLanguageModeling, PreTrainedTokenizer, PreTrainedTokenizerFast\n\nfrom ..core import (\n WANDB_PADDING,\n clip_by_value,\n convert_to_scalar,\n entropy_from_logits,\n flatten_dict,\n logprobs_from_logits,\n set_seed,\n stack_dicts,\n stats_to_np,\n whiten,\n)\nfrom ..models import SUPPORTED_ARCHITECTURES, PreTrainedModelWrapper, create_reference_model\nfrom . import AdaptiveKLController, BaseTrainer, FixedKLController, PPOConfig\n\n\nMODEL_CARD_TEMPLATE = \"\"\"---\nlicense: apache-2.0\ntags:\n- trl\n- transformers\n- reinforcement-learning\n---\n\n# {model_name}\n\nThis is a [TRL language model](https://github.com/lvwerra/trl) that has been fine-tuned with reinforcement learning to\n guide the model outputs according to a value, function, or human feedback. The model can be used for text generation.\n\n## Usage\n\nTo use this model for inference, first install the TRL library:\n\n```bash\npython -m pip install trl\n```\n\nYou can then generate text as follows:\n\n```python\nfrom transformers import pipeline\n\ngenerator = pipeline(\"text-generation\", model=\"{model_id}\")\noutputs = generator(\"Hello, my llama is cute\")\n```\n\nIf you want to use the model for training or to obtain the outputs from the value head, load the model as follows:\n\n```python\nfrom transformers import AutoTokenizer\nfrom trl import AutoModelForCausalLMWithValueHead\n\ntokenizer = AutoTokenizer.from_pretrained(\"{model_id}\")\nmodel = AutoModelForCausalLMWithValueHead.from_pretrained(\"{model_id}\")\n\ninputs = tokenizer(\"Hello, my llama is cute\", return_tensors=\"pt\")\noutputs = model(**inputs, labels=inputs[\"input_ids\"])\n```\n\"\"\"\n\n\nclass PPOTrainer(BaseTrainer):\n \"\"\"\n The PPOTrainer uses Proximal Policy Optimization to optimise language models.\n Note, this trainer is heavily inspired by the original OpenAI learning to summarize work here:\n https://github.com/openai/summarize-from-feedback\n\n Attributes:\n **config** (`PPOConfig`) -- Configuration object for PPOTrainer. Check the documentation of `PPOConfig` for more\n details.\n **model** (`PreTrainedModelWrapper`) -- Model to be optimized, Hugging Face transformer model with a value head.\n Check the documentation of `PreTrainedModelWrapper` for more details.\n **ref_model** (`PreTrainedModelWrapper`, *optional*) -- Reference model to be used for KL penalty, Hugging Face\n transformer model with a casual language modelling head. Check the documentation of `PreTrainedModelWrapper`\n for more details. If no reference model is provided, the trainer will create a reference model with the same\n architecture as the model to be optimized with shared layers.\n **tokenizer** (`Union[PreTrainedTokenizer, PreTrainedTokenizerFast]`) -- Tokenizer to be used for encoding the\n data. Check the documentation of `transformers.PreTrainedTokenizer` and\n `transformers.PreTrainedTokenizerFast` for more details.\n **dataset** (Union[`torch.utils.data.Dataset`, `datasets.Dataset`], *optional*) -- PyTorch dataset or Hugging\n Face dataset. This is used to create a PyTorch dataloader. If no dataset is provided, the dataloader must be\n created outside the trainer users needs to design their own dataloader and make sure the batch\n size that is used is the same as the one specified in the configuration object.\n **optimizer** (`torch.optim.Optimizer`, *optional*) -- Optimizer to be used for training. If no optimizer is\n provided, the trainer will create an Adam optimizer with the learning rate specified in the configuration\n object.\n **data_collator** (DataCollatorForLanguageModeling, *optional*) -- Data collator to be used for training and\n passed along the dataloader\n **num_shared_layers** (int, *optional*) -- Number of layers to be shared between the model and the reference\n model, if no reference model is passed. If no number is provided, all the layers will be shared.\n **lr_scheduler** (`torch.optim.lr_scheduler`, *optional*) -- Learning rate scheduler to be used for training.\n \"\"\"\n\n def __init__(\n self,\n config: PPOConfig = None,\n model: PreTrainedModelWrapper = None,\n ref_model: PreTrainedModelWrapper = None,\n tokenizer: Union[PreTrainedTokenizer, PreTrainedTokenizerFast] = None,\n dataset: Optional[Union[torch.utils.data.Dataset, Dataset]] = None,\n optimizer: Optional[torch.optim.Optimizer] = None,\n data_collator=None,\n num_shared_layers: Optional[int] = None,\n lr_scheduler: Optional[torch.optim.lr_scheduler._LRScheduler] = None,\n ):\n \"\"\"\n Initialize PPOTrainer.\n\n Args:\n config (`PPOConfig`):\n Configuration object for PPOTrainer. Check the documentation of `PPOConfig` for more details.\n model (`PreTrainedModelWrapper`):\n Hugging Face transformer model with a value head.\n ref_model (`PreTrainedModelWrapper`):\n Hugging Face transformer model with a casual language modelling head. Used for KL penalty\n tokenizer (`transformers.PreTrainedTokenizer`):\n Hugging Face tokenizer\n dataset (Union[`torch.utils.data.Dataset`, `datasets.Dataset`], *optional*):\n PyTorch dataset or Hugging Face dataset. If a Hugging Face dataset is passed, the dataset\n will be preprocessed by removing the columns that are not used by the model. If none is passed,\n a warning will be raised in a multi-GPU setting.\n optimizer (Optional[`torch.optim.Optimizer`]):\n Optimizer used for training. If `None`, the `Adam` is used as default.\n data_collator (Optional[function]):\n Data collator function.\n num_shared_layers (Optional[int]):\n Number of shared layers between the model and the reference model. If `None`, all layers are shared.\n used only if `ref_model` is `None`.\n lr_scheduler (Optional[`torch.optim.lr_scheduler`]):\n Learning rate scheduler used for training.\n \"\"\"\n super().__init__(config)\n\n # initial seed for reproducible experiments\n set_seed(config.seed)\n\n # Step 0: check positional arguments validity\n if not isinstance(config, PPOConfig):\n raise ValueError(f\"config must be a PPOConfig, got {type(config)}\")\n if not isinstance(tokenizer, (PreTrainedTokenizer, PreTrainedTokenizerFast)):\n raise ValueError(\n f\"tokenizer must be a PreTrainedTokenizer or PreTrainedTokenizerFast, got {type(tokenizer)}\"\n )\n if not isinstance(model, PreTrainedModelWrapper):\n raise ValueError(\n f\"model must be a PreTrainedModelWrapper, got {type(model)} - supported architectures are: {SUPPORTED_ARCHITECTURES}\"\n )\n # Step 1: Initialize Accelerator\n self.accelerator = Accelerator(log_with=config.log_with, **config.accelerator_kwargs)\n self.accelerator.init_trackers(config.tracker_project_name, config=config.to_dict(), **config.tracker_kwargs)\n\n self.model = model\n self.is_encoder_decoder = hasattr(self.model, \"is_encoder_decoder\")\n\n if isinstance(ref_model, PreTrainedModelWrapper):\n self.ref_model = ref_model\n if num_shared_layers is not None:\n warnings.warn(\n \"num_shared_layers is ignored when ref_model is provided. Two different models are used for the \"\n \"model and the reference model and no layers are shared.\",\n UserWarning,\n )\n elif ref_model is None:\n self.ref_model = create_reference_model(self.model, num_shared_layers=num_shared_layers)\n else:\n raise ValueError(\n f\"ref_model must be a PreTrainedModelWrapper or `None`, got {type(ref_model)} - supported \"\n f\"architectures are: {SUPPORTED_ARCHITECTURES} \"\n )\n\n if not (isinstance(tokenizer, PreTrainedTokenizer) or isinstance(tokenizer, PreTrainedTokenizerFast)):\n raise ValueError(\n \"tokenizer must be a transformers.PreTrainedTokenizer or transformers.PreTrainedTokenizerFast\"\n )\n self.tokenizer = tokenizer\n\n if dataset is not None and not (isinstance(dataset, torch.utils.data.Dataset) or isinstance(dataset, Dataset)):\n raise ValueError(\"dataloader must be a torch.utils.data.Dataset or datasets.Dataset\")\n elif dataset is None:\n warnings.warn(\n \"No dataset is provided. Make sure to set config.batch_size to the correct value before training.\",\n UserWarning,\n )\n self.dataset = dataset\n self._signature_columns = None\n if self.dataset is not None:\n self.dataloader = self.prepare_dataloader(self.dataset, data_collator)\n elif self.dataset is None and self.accelerator.num_processes > 1:\n warnings.warn(\n \"No dataset is provided. In a multi-GPU setting, this will lead to an error. You should\",\n \" prepare your dataloader yourself with `dataloader = ppo_trainer.accelerator.prepare(dataloader)`\",\n \" and using `torch.utils.data.DataLoader`, or pass a dataset to the `PPOTrainer`. Please \",\n \" refer to the documentation for more details.\",\n UserWarning,\n )\n self.dataloader = None\n else:\n self.dataloader = None\n\n # Step 3: Initialize optimizer and data collator\n self.data_collator = DataCollatorForLanguageModeling(self.tokenizer, mlm=False)\n if optimizer is None:\n self.optimizer = Adam(self.model.parameters(), lr=self.config.learning_rate)\n else:\n self.optimizer = optimizer\n\n self.lr_scheduler = lr_scheduler\n if self.lr_scheduler is not None:\n if not isinstance(self.lr_scheduler, torch.optim.lr_scheduler._LRScheduler):\n raise ValueError(\"lr_scheduler must be a torch.optim.lr_scheduler._LRScheduler\")\n\n if self.config.adap_kl_ctrl:\n self.kl_ctl = AdaptiveKLController(self.config.init_kl_coef, self.config.target, self.config.horizon)\n else:\n self.kl_ctl = FixedKLController(self.config.init_kl_coef)\n\n (\n self.model,\n self.ref_model,\n self.optimizer,\n self.data_collator,\n self.dataloader,\n self.lr_scheduler,\n ) = self.accelerator.prepare(\n self.model, self.ref_model, self.optimizer, self.data_collator, self.dataloader, self.lr_scheduler\n )\n\n # In a distributed setup, only logging needs to be performed on the main process\n # check: https://pytorch.org/docs/stable/generated/torch.nn.parallel.DistributedDataParallel.html\n # or: https://discuss.pytorch.org/t/use-distributed-data-parallel-correctly/82500/11\n self.is_distributed = self.accelerator.distributed_type == \"MULTI_GPU\"\n\n # init the current step\n self.current_step = 0\n\n # init wandb on the main process:\n if self.accelerator.is_main_process and self.config.log_with == \"wandb\":\n import wandb\n\n wandb.watch(self.model, log=\"all\")\n\n if self.config.forward_batch_size > 1 and (self.is_encoder_decoder or self.tokenizer.padding_side == \"left\"):\n # warn users that this is not well supported yet\n logging.warning(\n \"Forward batch size > 1 is not well supported yet for encoder-decoder models and when using `tokenizer.padding_side='left'`. This can lead to unexpected behaviour.\"\n \" therefore, we recommend using forward_batch_size=1.\"\n )\n\n def _filter_kwargs(self, kwargs, target_func):\n \"\"\"\n filter the keyword arguments that are supported by the target function.\n\n Args:\n kwargs (dict):\n Keyword arguments\n target_func (function):\n Target function\n \"\"\"\n return {k: v for k, v in kwargs.items() if k in inspect.signature(target_func).parameters.keys()}\n\n def prepare_dataloader(self, dataset: Union[torch.utils.data.Dataset, Dataset], data_collator=None):\n \"\"\"\n Prepare the dataloader for training.\n\n Args:\n dataset (Union[`torch.utils.data.Dataset`, `datasets.Dataset`]):\n PyTorch dataset or Hugging Face dataset. If a Hugging Face dataset is passed, the dataset\n will be preprocessed by removing the columns that are not used by the model.\n data_collator (Optional[function]):\n Data collator function.\n\n Returns:\n `torch.utils.data.DataLoader`: PyTorch dataloader\n \"\"\"\n if isinstance(dataset, Dataset):\n dataset = self._remove_unused_columns(dataset)\n dataloader = torch.utils.data.DataLoader(\n dataset,\n batch_size=self.config.batch_size,\n collate_fn=data_collator,\n shuffle=True,\n )\n return dataloader\n\n # Adapted from transformers.Trainer._set_signature_columns_if_needed\n def _set_signature_columns_if_needed(self):\n if self._signature_columns is None:\n # Inspect model forward signature to keep only the arguments it accepts.\n signature = inspect.signature(self.model.forward)\n self._signature_columns = list(signature.parameters.keys())\n # label => sentiment | we need query and response for logging purpose\n self._signature_columns += list(set([\"label\", \"query\", \"response\"]))\n\n # Adapted from transformers.Trainer._remove_unused_columns\n def _remove_unused_columns(self, dataset: \"Dataset\"):\n if not self.config.remove_unused_columns:\n return dataset\n self._set_signature_columns_if_needed()\n signature_columns = self._signature_columns\n\n ignored_columns = list(set(dataset.column_names) - set(signature_columns))\n\n columns = [k for k in signature_columns if k in dataset.column_names]\n\n if version.parse(datasets.__version__) < version.parse(\"1.4.0\"):\n dataset.set_format(\n type=dataset.format[\"type\"], columns=columns, format_kwargs=dataset.format[\"format_kwargs\"]\n )\n return dataset\n else:\n return dataset.remove_columns(ignored_columns)\n\n def generate(self, query_tensor: torch.Tensor, **generation_kwargs):\n \"\"\"\n Generate response with the model given the query tensor.\n call the `generate` method of the model.\n\n Args:\n query_tensor (`torch.LongTensor`):\n A tensor of shape (`batch_size`, `seq_len`) containing query tokens.\n generation_kwargs (dict[str, Any]):\n Keyword arguments for generation.\n\n Returns:\n `torch.LongTensor`: A tensor of shape (`batch_size`, `gen_len`) containing response tokens.\n \"\"\"\n response = self.accelerator.unwrap_model(self.model).generate(\n query_tensor.unsqueeze(dim=0), **generation_kwargs\n )\n\n return response\n\n def _step_safety_checker(\n self,\n batch_size: int,\n queries: List[torch.LongTensor],\n responses: List[torch.LongTensor],\n scores: List[torch.FloatTensor],\n ):\n \"\"\"\n Check if the input data is valid for training.\n\n Args:\n batch_size (int):\n Batch size from the config file.\n queries (List[`torch.LongTensor`]):\n List of tensors containing the encoded queries of shape (`query_length`)\n responses (List[`torch.LongTensor`]):\n List of tensors containing the encoded responses of shape (`response_length`)\n scores (List[`torch.FloatTensor`]):\n List of tensors containing the scores.\n Returns:\n `tuple`: The input processed data.\n \"\"\"\n for name, tensor_list in zip([\"queries\", \"responses\", \"scores\"], [queries, responses, scores]):\n if not isinstance(tensor_list, list):\n raise ValueError(f\"{name} must be a list of tensors - got {type(tensor_list)}\")\n if not isinstance(tensor_list[0], torch.Tensor):\n raise ValueError(f\"Elements in {name} must tensors - got {type(tensor_list[0])}\")\n if batch_size is not None and len(tensor_list) != batch_size:\n raise ValueError(\n f\"Batch size ({batch_size}) does not match number of examples - but got {len(tensor_list)} for: {name}\"\n )\n\n # add queries, scores and responses on the correct device\n queries = [tensor.to(self.accelerator.device) for tensor in queries]\n responses = [tensor.to(self.accelerator.device) for tensor in responses]\n scores = [tensor.to(self.accelerator.device) for tensor in scores]\n\n # squeeze scores if needed\n for i, score in enumerate(scores):\n if score.dim() > 1:\n raise ValueError(f\"Scores must be 1-dimensional - got {score.dim()} for {score}\")\n elif score.dim() == 1:\n scores[i] = score.squeeze()\n\n return queries, responses, scores\n\n def step(\n self,\n queries: List[torch.LongTensor],\n responses: List[torch.LongTensor],\n scores: List[torch.FloatTensor],\n ):\n \"\"\"\n Run a PPO optimisation step given a list of queries, model responses, and rewards.\n\n Args:\n queries (List[`torch.LongTensor`]):\n List of tensors containing the encoded queries of shape (`query_length`)\n responses (List[`torch.LongTensor`]):\n List of tensors containing the encoded responses of shape (`response_length`)\n scores (List[`torch.FloatTensor`]):\n List of tensors containing the scores.\n\n Returns:\n `dict[str, Any]`: A summary of the training statistics\n \"\"\"\n bs = self.config.batch_size\n\n queries, responses, scores = self._step_safety_checker(bs, queries, responses, scores)\n\n timing = dict()\n t0 = time.time()\n\n t = time.time()\n\n logprobs, ref_logprobs, values = self.batched_forward_pass(queries, responses)\n timing[\"time/ppo/forward_pass\"] = time.time() - t\n\n t = time.time()\n rewards, non_score_reward = self.compute_rewards(scores, logprobs, ref_logprobs)\n timing[\"time/ppo/compute_rewards\"] = time.time() - t\n\n t = time.time()\n all_stats = []\n idxs = list(range(bs))\n for _ in range(self.config.ppo_epochs):\n random.shuffle(idxs)\n for i in range(bs):\n idx = idxs[i]\n train_stats = self.train_minibatch(\n logprobs[idx].unsqueeze(0),\n values[idx].unsqueeze(0),\n rewards[idx].unsqueeze(0),\n queries[idx].unsqueeze(0),\n responses[idx].unsqueeze(0),\n torch.cat([queries[idx], responses[idx]]).unsqueeze(0),\n )\n all_stats.append(train_stats)\n timing[\"time/ppo/optimize_step\"] = time.time() - t\n\n t = time.time()\n train_stats = stack_dicts(all_stats)\n\n # reshape advantages/ratios such that they are not averaged.\n train_stats[\"policy/advantages\"] = torch.flatten(train_stats[\"policy/advantages\"]).unsqueeze(0)\n train_stats[\"policy/advantages\"] = torch.nan_to_num(train_stats[\"policy/advantages\"], WANDB_PADDING)\n train_stats[\"policy/ratio\"] = torch.flatten(train_stats[\"policy/ratio\"]).unsqueeze(0)\n\n stats = self.record_step_stats(\n scores=scores,\n logprobs=logprobs,\n ref_logprobs=ref_logprobs,\n non_score_reward=non_score_reward,\n train_stats=train_stats,\n kl_coef=self.kl_ctl.value,\n )\n # Gather/Reduce stats from all processes\n if self.is_distributed:\n stats = self.gather_stats(stats)\n stats = stats_to_np(stats)\n timing[\"time/ppo/calc_stats\"] = time.time() - t\n stats[\"ppo/learning_rate\"] = self.optimizer.param_groups[0][\"lr\"]\n\n # Update the KL control - multiply the batch_size by the number of processes\n self.kl_ctl.update(stats[\"objective/kl\"], self.config.batch_size * self.accelerator.num_processes)\n\n # Log the total ppo time\n timing[\"time/ppo/total\"] = time.time() - t0\n stats.update(timing)\n\n # post-process stats for tensorboard and other loggers\n if self.config.log_with != \"wandb\":\n stats = convert_to_scalar(stats)\n\n if self.lr_scheduler is not None:\n self.lr_scheduler.step()\n\n return stats\n\n def gather_stats(self, stats):\n \"\"\"\n Gather stats from all processes. Useful in the context of distributed training.\n\n Args:\n stats (dict[str, Any]):\n a dictionary of stats to be gathered. The stats should contain torch tensors.\n\n Returns:\n `dict[str, Any]`: A dictionary of stats with the tensors gathered.\n \"\"\"\n import torch.distributed as dist\n\n # Wait for all processes to finish\n dist.barrier()\n\n for k, v in stats.items():\n if isinstance(v, torch.Tensor):\n dist.all_reduce(v, dist.ReduceOp.SUM)\n v /= self.accelerator.num_processes\n stats[k] = v\n return stats\n\n def batched_forward_pass(\n self,\n queries: torch.Tensor,\n responses: torch.Tensor,\n ):\n \"\"\"\n Calculate model outputs in multiple batches.\n\n Args:\n queries (`torch.LongTensor`):\n List of tensors containing the encoded queries, shape (`batch_size`, `query_length`)\n responses (`torch.LongTensor`):\n List of tensors containing the encoded responses, shape (`batch_size`, `response_length`)\n Returns:\n (tuple):\n - all_logprobs (`torch.FloatTensor`): Log probabilities of the responses,\n shape (`batch_size`, `response_length`)\n - all_ref_logprobs (`torch.FloatTensor`): Log probabilities of the responses,\n shape (`batch_size`, `response_length`)\n - all_values (`torch.FloatTensor`): Values of the responses, shape (`batch_size`, `response_length`)\n \"\"\"\n bs = self.config.batch_size\n fbs = self.config.forward_batch_size\n all_logprobs = []\n all_ref_logprobs = []\n all_values = []\n\n # attention_masks are create with the same shape as inputs and are\n # automatically padded by the datacollator to indicate padding tokens\n if self.is_encoder_decoder:\n input_data = self.data_collator(\n [{\"input_ids\": q, \"attention_mask\": torch.ones_like(q)} for q in queries]\n ).to(self.accelerator.device)\n\n decoder_inputs = self.data_collator(\n [{\"input_ids\": r, \"attention_mask\": torch.ones_like(r)} for r in responses]\n ).to(self.accelerator.device)\n\n input_data[\"decoder_input_ids\"] = decoder_inputs[\"input_ids\"]\n input_data[\"decoder_attention_mask\"] = decoder_inputs[\"attention_mask\"]\n\n input_data.pop(\"labels\") # we don't want to compute LM losses\n\n else:\n input_ids = [torch.cat([q, r]) for q, r in zip(queries, responses)]\n input_data = self.data_collator(\n [{\"input_ids\": ids, \"attention_mask\": torch.ones_like(ids)} for ids in input_ids]\n ).to(self.accelerator.device)\n\n for i in range(int(bs / fbs)):\n input_kwargs = {key: value[i * fbs : (i + 1) * fbs] for key, value in input_data.items()}\n query_batch = queries[i * fbs : (i + 1) * fbs]\n response_batch = responses[i * fbs : (i + 1) * fbs]\n\n with torch.no_grad():\n logits, _, v = self.model(**input_kwargs)\n ref_logits, _, _ = self.ref_model(**input_kwargs)\n\n if self.is_encoder_decoder:\n input_ids = input_kwargs[\"decoder_input_ids\"]\n attention_mask = input_kwargs[\"decoder_attention_mask\"]\n else:\n input_ids = input_kwargs[\"input_ids\"]\n attention_mask = input_kwargs[\"attention_mask\"]\n\n logprobs = logprobs_from_logits(logits[:, :-1, :], input_ids[:, 1:])\n ref_logprobs = logprobs_from_logits(ref_logits[:, :-1, :], input_ids[:, 1:])\n\n for j in range(fbs):\n if self.is_encoder_decoder:\n # Decoder sentence starts always in the index 1 after padding in the Enc-Dec Models\n start = 1\n end = attention_mask[j, :].sum() - 1\n else:\n start = len(query_batch[j]) - 1\n if attention_mask[j, 0] == 0: # offset left padding\n start += attention_mask[j, :].nonzero()[0]\n end = start + len(response_batch[j])\n\n if len(logprobs[j, start:end]) < 2:\n raise ValueError(\"Responses are too short. Make sure they are at least 4 tokens long.\")\n\n all_values.append(v[j, start:end])\n all_logprobs.append(logprobs[j, start:end])\n all_ref_logprobs.append(ref_logprobs[j, start:end])\n\n return all_logprobs, all_ref_logprobs, all_values\n\n def train_minibatch(\n self,\n old_logprobs: torch.FloatTensor,\n values: torch.FloatTensor,\n rewards: torch.FloatTensor,\n query: torch.LongTensor,\n response: torch.LongTensor,\n model_input: torch.LongTensor,\n ):\n \"\"\"\n Train one PPO minibatch\n\n Args:\n logprobs (`torch.FloatTensor`):\n Log probabilities of the model, shape [batch_size, response_length]\n values (`torch.FloatTensor`):\n Values of the value head, shape [batch_size, response_length]\n rewards (`torch.FloatTensor`):\n Rewards from the reward model, shape [batch_size, response_length]\n query (`torch.LongTensor`):\n Encoded queries, shape [batch_size, query_length]\n response (`torch.LongTensor`):\n Encoded responses, shape [batch_size, response_length]\n model_input (`torch.LongTensor`):\n Concatenated queries and responses, shape [batch_size, query_length+response_length]\n\n Returns:\n train_stats (dict[str, `torch.Tensor`]):\n Dictionary of training statistics\n \"\"\"\n logprobs, vpred, logits = self.compute_logits_vpred(model_input, query, response, rewards)\n\n loss_p, loss_v, train_stats = self.loss(old_logprobs, values, rewards, logits, vpred, logprobs)\n loss = loss_p + loss_v\n self.optimizer.zero_grad()\n self.accelerator.backward(loss)\n t = time.time()\n self.optimizer.step()\n train_stats[\"time/ppo/optimizer_step\"] = torch.Tensor([time.time() - t]).to(self.accelerator.device)\n return train_stats\n\n def compute_rewards(self, scores: torch.FloatTensor, logprobs: torch.FloatTensor, ref_logprobs: torch.FloatTensor):\n \"\"\"\n Compute per token rewards from scores and KL-penalty.\n\n Args:\n scores (`torch.FloatTensor`):\n Scores from the reward model, shape (`batch_size`)\n logprobs (`torch.FloatTensor`):\n Log probabilities of the model, shape (`batch_size`, `response_length`)\n ref_logprobs (`torch.FloatTensor`):\n Log probabilities of the reference model, shape (`batch_size`, `response_length`)\n \"\"\"\n rewards, non_score_rewards = [], []\n for score, logprob, ref_logprob in zip(scores, logprobs, ref_logprobs):\n kl = logprob - ref_logprob\n non_score_reward = -self.kl_ctl.value * kl\n non_score_rewards.append(non_score_reward)\n reward = non_score_reward.clone()\n reward[-1] += score\n rewards.append(reward)\n return rewards, non_score_rewards\n\n def compute_logits_vpred(\n self,\n model_input,\n query: torch.LongTensor,\n response: torch.LongTensor,\n rewards,\n ):\n input_kwargs = {\n \"input_ids\": model_input,\n }\n\n if self.is_encoder_decoder:\n input_kwargs[\"input_ids\"] = query\n input_kwargs[\"decoder_input_ids\"] = response\n model_input = response\n\n logits, _, vpred = self.model(**input_kwargs)\n gen_len = rewards.shape[-1]\n\n if self.is_encoder_decoder:\n logprob = logprobs_from_logits(logits[:, :-1, :], model_input[:, 1:])\n start, end = 1, response.shape[-1] - 1\n vpred = vpred[:, start:end]\n logprob = logprob[:, start:end]\n else:\n logprob = logprobs_from_logits(logits[:, :-1, :], model_input[:, 1:])\n logprob, vpred = logprob[:, -gen_len:], vpred[:, -gen_len:]\n\n return logprob, vpred, logits\n\n def loss(\n self,\n old_logprobs: torch.FloatTensor,\n values: torch.FloatTensor,\n rewards: torch.FloatTensor,\n logits: torch.FloatTensor,\n vpred: torch.FloatTensor,\n logprob: torch.FloatTensor,\n ):\n \"\"\"\n Calculate policy and value losses.\n\n Args:\n old_logprobs (`torch.FloatTensor`):\n Log probabilities of the model, shape (`batch_size`, `response_length`)\n values (`torch.FloatTensor`):\n Values of the value head, shape (`batch_size`, `hidden_dim`)\n rewards (`torch.FloatTensor`):\n Rewards from the reward model, shape (`batch_size`)\n logits (`torch.FloatTensor`):\n Logits of the model, shape (`batch_size`, `response_length`, `vocab_size`)\n v_pred (`torch.FloatTensor`):\n Values of the value head, shape (`batch_size`, `response_length`)\n logprobs (`torch.FloatTensor`):\n Log probabilities of the model, shape (`batch_size`, `response_length`)\n \"\"\"\n lastgaelam = 0\n advantages_reversed = []\n gen_len = rewards.shape[-1]\n\n for t in reversed(range(gen_len)):\n nextvalues = values[:, t + 1] if t < gen_len - 1 else 0.0\n delta = rewards[:, t] + self.config.gamma * nextvalues - values[:, t]\n lastgaelam = delta + self.config.gamma * self.config.lam * lastgaelam\n advantages_reversed.append(lastgaelam)\n advantages = torch.stack(advantages_reversed[::-1]).transpose(0, 1)\n\n returns = advantages + values\n advantages = whiten(advantages)\n advantages = advantages.detach()\n\n vpredclipped = clip_by_value(vpred, values - self.config.cliprange_value, values + self.config.cliprange_value)\n\n vf_losses1 = (vpred - returns) ** 2\n vf_losses2 = (vpredclipped - returns) ** 2\n vf_loss = 0.5 * torch.mean(torch.max(vf_losses1, vf_losses2))\n vf_clipfrac = torch.mean(torch.gt(vf_losses2, vf_losses1).double())\n\n ratio = torch.exp(logprob - old_logprobs)\n pg_losses = -advantages * ratio\n pg_losses2 = -advantages * torch.clamp(ratio, 1.0 - self.config.cliprange, 1.0 + self.config.cliprange)\n\n pg_loss = torch.mean(torch.max(pg_losses, pg_losses2))\n pg_clipfrac = torch.mean(torch.gt(pg_losses2, pg_losses).double())\n\n loss = pg_loss + self.config.vf_coef * vf_loss\n\n entropy = torch.mean(entropy_from_logits(logits))\n approxkl = 0.5 * torch.mean((logprob - old_logprobs) ** 2)\n policykl = torch.mean(logprob - old_logprobs)\n return_mean, return_var = torch.mean(returns), torch.var(returns)\n value_mean, value_var = torch.mean(values), torch.var(values)\n\n stats = dict(\n loss=dict(policy=pg_loss, value=vf_loss, total=loss),\n policy=dict(\n entropy=entropy,\n approxkl=approxkl,\n policykl=policykl,\n clipfrac=pg_clipfrac,\n advantages=advantages,\n advantages_mean=torch.mean(advantages),\n ratio=ratio,\n ),\n returns=dict(mean=return_mean, var=return_var),\n val=dict(\n vpred=torch.mean(vpred),\n error=torch.mean((vpred - returns) ** 2),\n clipfrac=vf_clipfrac,\n mean=value_mean,\n var=value_var,\n ),\n )\n return pg_loss, self.config.vf_coef * vf_loss, flatten_dict(stats)\n\n def record_step_stats(self, kl_coef: float, **data):\n \"\"\"\n Record training step statistics.\n\n\n Args:\n kl_coef (`float`):\n KL coefficient\n data (`dict`):\n Dictionary of training step data\n\n Returns:\n stats (`dict`):\n Dictionary of training step statistics\n \"\"\"\n kl_list = [logprobs - ref_logprobs for logprobs, ref_logprobs in zip(data[\"logprobs\"], data[\"ref_logprobs\"])]\n mean_kl = torch.mean(torch.stack([torch.sum(kl) for kl in kl_list]))\n mean_entropy = torch.mean(torch.stack([torch.sum(-log_probs) for log_probs in data[\"logprobs\"]]))\n mean_non_score_reward = torch.mean(\n torch.stack([torch.sum(non_score_reward) for non_score_reward in data[\"non_score_reward\"]])\n )\n stats = {\n \"objective/kl\": mean_kl,\n \"objective/kl_dist\": kl_list,\n \"objective/logprobs\": data[\"logprobs\"],\n \"objective/ref_logprobs\": data[\"ref_logprobs\"],\n \"objective/kl_coef\": kl_coef,\n \"objective/entropy\": mean_entropy,\n \"ppo/mean_non_score_reward\": mean_non_score_reward,\n }\n\n for k, v in data[\"train_stats\"].items():\n stats[f\"ppo/{k}\"] = torch.mean(v, axis=0)\n stats[\"ppo/val/var_explained\"] = 1 - stats[\"ppo/val/error\"] / stats[\"ppo/returns/var\"]\n return stats\n\n def log_stats(\n self,\n stats: dict,\n batch: dict,\n rewards: List[torch.FloatTensor],\n ):\n \"\"\"\n A function that logs all the training stats. Call it at the end of each epoch.\n\n Args:\n stats (dict[str, Any]):\n A dictionary of training stats.\n batch (dict[str, Any]):\n A dictionary of batch data, this contains the queries and responses.\n rewards (`List[torch.FloatTensor]`):\n A tensor of rewards.\n \"\"\"\n # Log only if we are in the main process\n if self.accelerator.is_main_process:\n logs = {}\n\n # Log stats\n if not isinstance(rewards, torch.Tensor):\n rewards = torch.tensor(rewards).to(self.accelerator.device)\n\n if \"query\" not in batch.keys() and \"response\" not in batch.keys():\n # warn the user that the game logs will not be logged\n warnings.warn(\n \"The game logs will not be logged because the batch does not contain the keys 'query' and \"\n \"'response'. \"\n )\n elif self.config.log_with == \"wandb\":\n import wandb\n\n table_rows = [list(r) for r in zip(batch[\"query\"], batch[\"response\"], rewards.cpu().tolist())]\n logs.update({\"game_log\": wandb.Table(columns=[\"query\", \"response\", \"reward\"], rows=table_rows)})\n # All reduce rewards if distributed\n if self.is_distributed:\n import torch.distributed as dist\n\n dist.barrier()\n\n dist.all_reduce(rewards, op=torch.distributed.ReduceOp.SUM)\n rewards /= self.accelerator.num_processes\n\n logs.update(stats)\n logs[\"env/reward_mean\"] = torch.mean(rewards).cpu().numpy().item()\n logs[\"env/reward_std\"] = torch.std(rewards).cpu().numpy().item()\n logs[\"env/reward_dist\"] = rewards.cpu().numpy()\n\n if self.config.log_with == \"tensorboard\":\n # update the current step\n self.current_step += 1\n\n self.accelerator.log(logs, step=self.current_step if self.config.log_with == \"tensorboard\" else None)\n\n else:\n if self.is_distributed:\n import torch.distributed as dist\n\n if not isinstance(rewards, torch.Tensor):\n rewards = torch.tensor(rewards).to(self.accelerator.device)\n\n dist.barrier()\n dist.all_reduce(rewards, op=torch.distributed.ReduceOp.SUM)\n\n def create_model_card(self, path: str, model_name: Optional[str] = \"TRL Model\") -> None:\n \"\"\"Creates and saves a model card for a TRL model.\n\n Args:\n path (`str`): The path to save the model card to.\n model_name (`str`, *optional*): The name of the model, defaults to `TRL Model`.\n \"\"\"\n if not os.path.exists(path):\n os.makedirs(path)\n\n user = whoami()[\"name\"]\n model_card_content = MODEL_CARD_TEMPLATE.format(model_name=model_name, model_id=f\"{user}/{path}\")\n with open(os.path.join(path, \"README.md\"), \"w\", encoding=\"utf-8\") as f:\n f.write(model_card_content)\n\n def _save_pretrained(self, save_directory: str) -> None:\n self.model.save_pretrained(save_directory)\n self.tokenizer.save_pretrained(save_directory)\n self.create_model_card(save_directory)\n", "path": "trl/trainer/ppo_trainer.py" } ]
[ { "content": "# Copyright 2022 The HuggingFace Team. All rights reserved.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\nimport inspect\nimport logging\nimport os\nimport random\nimport time\nimport warnings\nfrom typing import List, Optional, Union\n\nimport datasets\nimport torch\nfrom accelerate import Accelerator\nfrom datasets import Dataset\nfrom huggingface_hub import whoami\nfrom packaging import version\nfrom torch.optim import Adam\nfrom transformers import DataCollatorForLanguageModeling, PreTrainedTokenizer, PreTrainedTokenizerFast\n\nfrom ..core import (\n WANDB_PADDING,\n clip_by_value,\n convert_to_scalar,\n entropy_from_logits,\n flatten_dict,\n logprobs_from_logits,\n set_seed,\n stack_dicts,\n stats_to_np,\n whiten,\n)\nfrom ..models import SUPPORTED_ARCHITECTURES, PreTrainedModelWrapper, create_reference_model\nfrom . import AdaptiveKLController, BaseTrainer, FixedKLController, PPOConfig\n\n\nMODEL_CARD_TEMPLATE = \"\"\"---\nlicense: apache-2.0\ntags:\n- trl\n- transformers\n- reinforcement-learning\n---\n\n# {model_name}\n\nThis is a [TRL language model](https://github.com/lvwerra/trl) that has been fine-tuned with reinforcement learning to\n guide the model outputs according to a value, function, or human feedback. The model can be used for text generation.\n\n## Usage\n\nTo use this model for inference, first install the TRL library:\n\n```bash\npython -m pip install trl\n```\n\nYou can then generate text as follows:\n\n```python\nfrom transformers import pipeline\n\ngenerator = pipeline(\"text-generation\", model=\"{model_id}\")\noutputs = generator(\"Hello, my llama is cute\")\n```\n\nIf you want to use the model for training or to obtain the outputs from the value head, load the model as follows:\n\n```python\nfrom transformers import AutoTokenizer\nfrom trl import AutoModelForCausalLMWithValueHead\n\ntokenizer = AutoTokenizer.from_pretrained(\"{model_id}\")\nmodel = AutoModelForCausalLMWithValueHead.from_pretrained(\"{model_id}\")\n\ninputs = tokenizer(\"Hello, my llama is cute\", return_tensors=\"pt\")\noutputs = model(**inputs, labels=inputs[\"input_ids\"])\n```\n\"\"\"\n\n\nclass PPOTrainer(BaseTrainer):\n \"\"\"\n The PPOTrainer uses Proximal Policy Optimization to optimise language models.\n Note, this trainer is heavily inspired by the original OpenAI learning to summarize work here:\n https://github.com/openai/summarize-from-feedback\n\n Attributes:\n **config** (`PPOConfig`) -- Configuration object for PPOTrainer. Check the documentation of `PPOConfig` for more\n details.\n **model** (`PreTrainedModelWrapper`) -- Model to be optimized, Hugging Face transformer model with a value head.\n Check the documentation of `PreTrainedModelWrapper` for more details.\n **ref_model** (`PreTrainedModelWrapper`, *optional*) -- Reference model to be used for KL penalty, Hugging Face\n transformer model with a casual language modelling head. Check the documentation of `PreTrainedModelWrapper`\n for more details. If no reference model is provided, the trainer will create a reference model with the same\n architecture as the model to be optimized with shared layers.\n **tokenizer** (`Union[PreTrainedTokenizer, PreTrainedTokenizerFast]`) -- Tokenizer to be used for encoding the\n data. Check the documentation of `transformers.PreTrainedTokenizer` and\n `transformers.PreTrainedTokenizerFast` for more details.\n **dataset** (Union[`torch.utils.data.Dataset`, `datasets.Dataset`], *optional*) -- PyTorch dataset or Hugging\n Face dataset. This is used to create a PyTorch dataloader. If no dataset is provided, the dataloader must be\n created outside the trainer users needs to design their own dataloader and make sure the batch\n size that is used is the same as the one specified in the configuration object.\n **optimizer** (`torch.optim.Optimizer`, *optional*) -- Optimizer to be used for training. If no optimizer is\n provided, the trainer will create an Adam optimizer with the learning rate specified in the configuration\n object.\n **data_collator** (DataCollatorForLanguageModeling, *optional*) -- Data collator to be used for training and\n passed along the dataloader\n **num_shared_layers** (int, *optional*) -- Number of layers to be shared between the model and the reference\n model, if no reference model is passed. If no number is provided, all the layers will be shared.\n **lr_scheduler** (`torch.optim.lr_scheduler`, *optional*) -- Learning rate scheduler to be used for training.\n \"\"\"\n\n def __init__(\n self,\n config: PPOConfig = None,\n model: PreTrainedModelWrapper = None,\n ref_model: PreTrainedModelWrapper = None,\n tokenizer: Union[PreTrainedTokenizer, PreTrainedTokenizerFast] = None,\n dataset: Optional[Union[torch.utils.data.Dataset, Dataset]] = None,\n optimizer: Optional[torch.optim.Optimizer] = None,\n data_collator=None,\n num_shared_layers: Optional[int] = None,\n lr_scheduler: Optional[torch.optim.lr_scheduler._LRScheduler] = None,\n ):\n \"\"\"\n Initialize PPOTrainer.\n\n Args:\n config (`PPOConfig`):\n Configuration object for PPOTrainer. Check the documentation of `PPOConfig` for more details.\n model (`PreTrainedModelWrapper`):\n Hugging Face transformer model with a value head.\n ref_model (`PreTrainedModelWrapper`):\n Hugging Face transformer model with a casual language modelling head. Used for KL penalty\n tokenizer (`transformers.PreTrainedTokenizer`):\n Hugging Face tokenizer\n dataset (Union[`torch.utils.data.Dataset`, `datasets.Dataset`], *optional*):\n PyTorch dataset or Hugging Face dataset. If a Hugging Face dataset is passed, the dataset\n will be preprocessed by removing the columns that are not used by the model. If none is passed,\n a warning will be raised in a multi-GPU setting.\n optimizer (Optional[`torch.optim.Optimizer`]):\n Optimizer used for training. If `None`, the `Adam` is used as default.\n data_collator (Optional[function]):\n Data collator function.\n num_shared_layers (Optional[int]):\n Number of shared layers between the model and the reference model. If `None`, all layers are shared.\n used only if `ref_model` is `None`.\n lr_scheduler (Optional[`torch.optim.lr_scheduler`]):\n Learning rate scheduler used for training.\n \"\"\"\n super().__init__(config)\n\n # initial seed for reproducible experiments\n set_seed(config.seed)\n\n # Step 0: check positional arguments validity\n if not isinstance(config, PPOConfig):\n raise ValueError(f\"config must be a PPOConfig, got {type(config)}\")\n if not isinstance(tokenizer, (PreTrainedTokenizer, PreTrainedTokenizerFast)):\n raise ValueError(\n f\"tokenizer must be a PreTrainedTokenizer or PreTrainedTokenizerFast, got {type(tokenizer)}\"\n )\n if not isinstance(model, PreTrainedModelWrapper):\n raise ValueError(\n f\"model must be a PreTrainedModelWrapper, got {type(model)} - supported architectures are: {SUPPORTED_ARCHITECTURES}\"\n )\n # Step 1: Initialize Accelerator\n self.accelerator = Accelerator(log_with=config.log_with, **config.accelerator_kwargs)\n self.accelerator.init_trackers(config.tracker_project_name, config=config.to_dict(), **config.tracker_kwargs)\n\n self.model = model\n self.is_encoder_decoder = hasattr(self.model, \"is_encoder_decoder\")\n\n if isinstance(ref_model, PreTrainedModelWrapper):\n self.ref_model = ref_model\n if num_shared_layers is not None:\n warnings.warn(\n \"num_shared_layers is ignored when ref_model is provided. Two different models are used for the \"\n \"model and the reference model and no layers are shared.\",\n UserWarning,\n )\n elif ref_model is None:\n self.ref_model = create_reference_model(self.model, num_shared_layers=num_shared_layers)\n else:\n raise ValueError(\n f\"ref_model must be a PreTrainedModelWrapper or `None`, got {type(ref_model)} - supported \"\n f\"architectures are: {SUPPORTED_ARCHITECTURES} \"\n )\n\n if not (isinstance(tokenizer, PreTrainedTokenizer) or isinstance(tokenizer, PreTrainedTokenizerFast)):\n raise ValueError(\n \"tokenizer must be a transformers.PreTrainedTokenizer or transformers.PreTrainedTokenizerFast\"\n )\n self.tokenizer = tokenizer\n\n if dataset is not None and not (isinstance(dataset, torch.utils.data.Dataset) or isinstance(dataset, Dataset)):\n raise ValueError(\"dataloader must be a torch.utils.data.Dataset or datasets.Dataset\")\n elif dataset is None:\n warnings.warn(\n \"No dataset is provided. Make sure to set config.batch_size to the correct value before training.\",\n UserWarning,\n )\n self.dataset = dataset\n self._signature_columns = None\n if self.dataset is not None:\n self.dataloader = self.prepare_dataloader(self.dataset, data_collator)\n elif self.dataset is None and self.accelerator.num_processes > 1:\n warnings.warn(\n \"No dataset is provided. In a multi-GPU setting, this will lead to an error. You should\",\n \" prepare your dataloader yourself with `dataloader = ppo_trainer.accelerator.prepare(dataloader)`\",\n \" and using `torch.utils.data.DataLoader`, or pass a dataset to the `PPOTrainer`. Please \",\n \" refer to the documentation for more details.\",\n UserWarning,\n )\n self.dataloader = None\n else:\n self.dataloader = None\n\n # Step 3: Initialize optimizer and data collator\n self.data_collator = DataCollatorForLanguageModeling(self.tokenizer, mlm=False)\n if optimizer is None:\n self.optimizer = Adam(self.model.parameters(), lr=self.config.learning_rate)\n else:\n self.optimizer = optimizer\n\n self.lr_scheduler = lr_scheduler\n if self.lr_scheduler is not None:\n if not isinstance(self.lr_scheduler, torch.optim.lr_scheduler._LRScheduler):\n raise ValueError(\"lr_scheduler must be a torch.optim.lr_scheduler._LRScheduler\")\n\n if self.config.adap_kl_ctrl:\n self.kl_ctl = AdaptiveKLController(self.config.init_kl_coef, self.config.target, self.config.horizon)\n else:\n self.kl_ctl = FixedKLController(self.config.init_kl_coef)\n\n (\n self.model,\n self.ref_model,\n self.optimizer,\n self.data_collator,\n self.dataloader,\n self.lr_scheduler,\n ) = self.accelerator.prepare(\n self.model, self.ref_model, self.optimizer, self.data_collator, self.dataloader, self.lr_scheduler\n )\n\n # In a distributed setup, only logging needs to be performed on the main process\n # check: https://pytorch.org/docs/stable/generated/torch.nn.parallel.DistributedDataParallel.html\n # or: https://discuss.pytorch.org/t/use-distributed-data-parallel-correctly/82500/11\n self.is_distributed = self.accelerator.distributed_type == \"MULTI_GPU\"\n\n # init the current step\n self.current_step = 0\n\n # init wandb on the main process:\n if self.accelerator.is_main_process and self.config.log_with == \"wandb\":\n import wandb\n\n wandb.watch(self.model, log=\"all\")\n\n if self.config.forward_batch_size > 1 and (self.is_encoder_decoder or self.tokenizer.padding_side == \"left\"):\n # warn users that this is not well supported yet\n logging.warning(\n \"Forward batch size > 1 is not well supported yet for encoder-decoder models and when using `tokenizer.padding_side='left'`. This can lead to unexpected behaviour.\"\n \" therefore, we recommend using forward_batch_size=1.\"\n )\n\n def _filter_kwargs(self, kwargs, target_func):\n \"\"\"\n filter the keyword arguments that are supported by the target function.\n\n Args:\n kwargs (dict):\n Keyword arguments\n target_func (function):\n Target function\n \"\"\"\n return {k: v for k, v in kwargs.items() if k in inspect.signature(target_func).parameters.keys()}\n\n def prepare_dataloader(self, dataset: Union[torch.utils.data.Dataset, Dataset], data_collator=None):\n \"\"\"\n Prepare the dataloader for training.\n\n Args:\n dataset (Union[`torch.utils.data.Dataset`, `datasets.Dataset`]):\n PyTorch dataset or Hugging Face dataset. If a Hugging Face dataset is passed, the dataset\n will be preprocessed by removing the columns that are not used by the model.\n data_collator (Optional[function]):\n Data collator function.\n\n Returns:\n `torch.utils.data.DataLoader`: PyTorch dataloader\n \"\"\"\n if isinstance(dataset, Dataset):\n dataset = self._remove_unused_columns(dataset)\n dataloader = torch.utils.data.DataLoader(\n dataset,\n batch_size=self.config.batch_size,\n collate_fn=data_collator,\n shuffle=True,\n drop_last=True,\n )\n return dataloader\n\n # Adapted from transformers.Trainer._set_signature_columns_if_needed\n def _set_signature_columns_if_needed(self):\n if self._signature_columns is None:\n # Inspect model forward signature to keep only the arguments it accepts.\n signature = inspect.signature(self.model.forward)\n self._signature_columns = list(signature.parameters.keys())\n # label => sentiment | we need query and response for logging purpose\n self._signature_columns += list(set([\"label\", \"query\", \"response\"]))\n\n # Adapted from transformers.Trainer._remove_unused_columns\n def _remove_unused_columns(self, dataset: \"Dataset\"):\n if not self.config.remove_unused_columns:\n return dataset\n self._set_signature_columns_if_needed()\n signature_columns = self._signature_columns\n\n ignored_columns = list(set(dataset.column_names) - set(signature_columns))\n\n columns = [k for k in signature_columns if k in dataset.column_names]\n\n if version.parse(datasets.__version__) < version.parse(\"1.4.0\"):\n dataset.set_format(\n type=dataset.format[\"type\"], columns=columns, format_kwargs=dataset.format[\"format_kwargs\"]\n )\n return dataset\n else:\n return dataset.remove_columns(ignored_columns)\n\n def generate(self, query_tensor: torch.Tensor, **generation_kwargs):\n \"\"\"\n Generate response with the model given the query tensor.\n call the `generate` method of the model.\n\n Args:\n query_tensor (`torch.LongTensor`):\n A tensor of shape (`batch_size`, `seq_len`) containing query tokens.\n generation_kwargs (dict[str, Any]):\n Keyword arguments for generation.\n\n Returns:\n `torch.LongTensor`: A tensor of shape (`batch_size`, `gen_len`) containing response tokens.\n \"\"\"\n response = self.accelerator.unwrap_model(self.model).generate(\n query_tensor.unsqueeze(dim=0), **generation_kwargs\n )\n\n return response\n\n def _step_safety_checker(\n self,\n batch_size: int,\n queries: List[torch.LongTensor],\n responses: List[torch.LongTensor],\n scores: List[torch.FloatTensor],\n ):\n \"\"\"\n Check if the input data is valid for training.\n\n Args:\n batch_size (int):\n Batch size from the config file.\n queries (List[`torch.LongTensor`]):\n List of tensors containing the encoded queries of shape (`query_length`)\n responses (List[`torch.LongTensor`]):\n List of tensors containing the encoded responses of shape (`response_length`)\n scores (List[`torch.FloatTensor`]):\n List of tensors containing the scores.\n Returns:\n `tuple`: The input processed data.\n \"\"\"\n for name, tensor_list in zip([\"queries\", \"responses\", \"scores\"], [queries, responses, scores]):\n if not isinstance(tensor_list, list):\n raise ValueError(f\"{name} must be a list of tensors - got {type(tensor_list)}\")\n if not isinstance(tensor_list[0], torch.Tensor):\n raise ValueError(f\"Elements in {name} must tensors - got {type(tensor_list[0])}\")\n if batch_size is not None and len(tensor_list) != batch_size:\n raise ValueError(\n f\"Batch size ({batch_size}) does not match number of examples - but got {len(tensor_list)} for: {name}\"\n )\n\n # add queries, scores and responses on the correct device\n queries = [tensor.to(self.accelerator.device) for tensor in queries]\n responses = [tensor.to(self.accelerator.device) for tensor in responses]\n scores = [tensor.to(self.accelerator.device) for tensor in scores]\n\n # squeeze scores if needed\n for i, score in enumerate(scores):\n if score.dim() > 1:\n raise ValueError(f\"Scores must be 1-dimensional - got {score.dim()} for {score}\")\n elif score.dim() == 1:\n scores[i] = score.squeeze()\n\n return queries, responses, scores\n\n def step(\n self,\n queries: List[torch.LongTensor],\n responses: List[torch.LongTensor],\n scores: List[torch.FloatTensor],\n ):\n \"\"\"\n Run a PPO optimisation step given a list of queries, model responses, and rewards.\n\n Args:\n queries (List[`torch.LongTensor`]):\n List of tensors containing the encoded queries of shape (`query_length`)\n responses (List[`torch.LongTensor`]):\n List of tensors containing the encoded responses of shape (`response_length`)\n scores (List[`torch.FloatTensor`]):\n List of tensors containing the scores.\n\n Returns:\n `dict[str, Any]`: A summary of the training statistics\n \"\"\"\n bs = self.config.batch_size\n\n queries, responses, scores = self._step_safety_checker(bs, queries, responses, scores)\n\n timing = dict()\n t0 = time.time()\n\n t = time.time()\n\n logprobs, ref_logprobs, values = self.batched_forward_pass(queries, responses)\n timing[\"time/ppo/forward_pass\"] = time.time() - t\n\n t = time.time()\n rewards, non_score_reward = self.compute_rewards(scores, logprobs, ref_logprobs)\n timing[\"time/ppo/compute_rewards\"] = time.time() - t\n\n t = time.time()\n all_stats = []\n idxs = list(range(bs))\n for _ in range(self.config.ppo_epochs):\n random.shuffle(idxs)\n for i in range(bs):\n idx = idxs[i]\n train_stats = self.train_minibatch(\n logprobs[idx].unsqueeze(0),\n values[idx].unsqueeze(0),\n rewards[idx].unsqueeze(0),\n queries[idx].unsqueeze(0),\n responses[idx].unsqueeze(0),\n torch.cat([queries[idx], responses[idx]]).unsqueeze(0),\n )\n all_stats.append(train_stats)\n timing[\"time/ppo/optimize_step\"] = time.time() - t\n\n t = time.time()\n train_stats = stack_dicts(all_stats)\n\n # reshape advantages/ratios such that they are not averaged.\n train_stats[\"policy/advantages\"] = torch.flatten(train_stats[\"policy/advantages\"]).unsqueeze(0)\n train_stats[\"policy/advantages\"] = torch.nan_to_num(train_stats[\"policy/advantages\"], WANDB_PADDING)\n train_stats[\"policy/ratio\"] = torch.flatten(train_stats[\"policy/ratio\"]).unsqueeze(0)\n\n stats = self.record_step_stats(\n scores=scores,\n logprobs=logprobs,\n ref_logprobs=ref_logprobs,\n non_score_reward=non_score_reward,\n train_stats=train_stats,\n kl_coef=self.kl_ctl.value,\n )\n # Gather/Reduce stats from all processes\n if self.is_distributed:\n stats = self.gather_stats(stats)\n stats = stats_to_np(stats)\n timing[\"time/ppo/calc_stats\"] = time.time() - t\n stats[\"ppo/learning_rate\"] = self.optimizer.param_groups[0][\"lr\"]\n\n # Update the KL control - multiply the batch_size by the number of processes\n self.kl_ctl.update(stats[\"objective/kl\"], self.config.batch_size * self.accelerator.num_processes)\n\n # Log the total ppo time\n timing[\"time/ppo/total\"] = time.time() - t0\n stats.update(timing)\n\n # post-process stats for tensorboard and other loggers\n if self.config.log_with != \"wandb\":\n stats = convert_to_scalar(stats)\n\n if self.lr_scheduler is not None:\n self.lr_scheduler.step()\n\n return stats\n\n def gather_stats(self, stats):\n \"\"\"\n Gather stats from all processes. Useful in the context of distributed training.\n\n Args:\n stats (dict[str, Any]):\n a dictionary of stats to be gathered. The stats should contain torch tensors.\n\n Returns:\n `dict[str, Any]`: A dictionary of stats with the tensors gathered.\n \"\"\"\n import torch.distributed as dist\n\n # Wait for all processes to finish\n dist.barrier()\n\n for k, v in stats.items():\n if isinstance(v, torch.Tensor):\n dist.all_reduce(v, dist.ReduceOp.SUM)\n v /= self.accelerator.num_processes\n stats[k] = v\n return stats\n\n def batched_forward_pass(\n self,\n queries: torch.Tensor,\n responses: torch.Tensor,\n ):\n \"\"\"\n Calculate model outputs in multiple batches.\n\n Args:\n queries (`torch.LongTensor`):\n List of tensors containing the encoded queries, shape (`batch_size`, `query_length`)\n responses (`torch.LongTensor`):\n List of tensors containing the encoded responses, shape (`batch_size`, `response_length`)\n Returns:\n (tuple):\n - all_logprobs (`torch.FloatTensor`): Log probabilities of the responses,\n shape (`batch_size`, `response_length`)\n - all_ref_logprobs (`torch.FloatTensor`): Log probabilities of the responses,\n shape (`batch_size`, `response_length`)\n - all_values (`torch.FloatTensor`): Values of the responses, shape (`batch_size`, `response_length`)\n \"\"\"\n bs = self.config.batch_size\n fbs = self.config.forward_batch_size\n all_logprobs = []\n all_ref_logprobs = []\n all_values = []\n\n # attention_masks are create with the same shape as inputs and are\n # automatically padded by the datacollator to indicate padding tokens\n if self.is_encoder_decoder:\n input_data = self.data_collator(\n [{\"input_ids\": q, \"attention_mask\": torch.ones_like(q)} for q in queries]\n ).to(self.accelerator.device)\n\n decoder_inputs = self.data_collator(\n [{\"input_ids\": r, \"attention_mask\": torch.ones_like(r)} for r in responses]\n ).to(self.accelerator.device)\n\n input_data[\"decoder_input_ids\"] = decoder_inputs[\"input_ids\"]\n input_data[\"decoder_attention_mask\"] = decoder_inputs[\"attention_mask\"]\n\n input_data.pop(\"labels\") # we don't want to compute LM losses\n\n else:\n input_ids = [torch.cat([q, r]) for q, r in zip(queries, responses)]\n input_data = self.data_collator(\n [{\"input_ids\": ids, \"attention_mask\": torch.ones_like(ids)} for ids in input_ids]\n ).to(self.accelerator.device)\n\n for i in range(int(bs / fbs)):\n input_kwargs = {key: value[i * fbs : (i + 1) * fbs] for key, value in input_data.items()}\n query_batch = queries[i * fbs : (i + 1) * fbs]\n response_batch = responses[i * fbs : (i + 1) * fbs]\n\n with torch.no_grad():\n logits, _, v = self.model(**input_kwargs)\n ref_logits, _, _ = self.ref_model(**input_kwargs)\n\n if self.is_encoder_decoder:\n input_ids = input_kwargs[\"decoder_input_ids\"]\n attention_mask = input_kwargs[\"decoder_attention_mask\"]\n else:\n input_ids = input_kwargs[\"input_ids\"]\n attention_mask = input_kwargs[\"attention_mask\"]\n\n logprobs = logprobs_from_logits(logits[:, :-1, :], input_ids[:, 1:])\n ref_logprobs = logprobs_from_logits(ref_logits[:, :-1, :], input_ids[:, 1:])\n\n for j in range(fbs):\n if self.is_encoder_decoder:\n # Decoder sentence starts always in the index 1 after padding in the Enc-Dec Models\n start = 1\n end = attention_mask[j, :].sum() - 1\n else:\n start = len(query_batch[j]) - 1\n if attention_mask[j, 0] == 0: # offset left padding\n start += attention_mask[j, :].nonzero()[0]\n end = start + len(response_batch[j])\n\n if len(logprobs[j, start:end]) < 2:\n raise ValueError(\"Responses are too short. Make sure they are at least 4 tokens long.\")\n\n all_values.append(v[j, start:end])\n all_logprobs.append(logprobs[j, start:end])\n all_ref_logprobs.append(ref_logprobs[j, start:end])\n\n return all_logprobs, all_ref_logprobs, all_values\n\n def train_minibatch(\n self,\n old_logprobs: torch.FloatTensor,\n values: torch.FloatTensor,\n rewards: torch.FloatTensor,\n query: torch.LongTensor,\n response: torch.LongTensor,\n model_input: torch.LongTensor,\n ):\n \"\"\"\n Train one PPO minibatch\n\n Args:\n logprobs (`torch.FloatTensor`):\n Log probabilities of the model, shape [batch_size, response_length]\n values (`torch.FloatTensor`):\n Values of the value head, shape [batch_size, response_length]\n rewards (`torch.FloatTensor`):\n Rewards from the reward model, shape [batch_size, response_length]\n query (`torch.LongTensor`):\n Encoded queries, shape [batch_size, query_length]\n response (`torch.LongTensor`):\n Encoded responses, shape [batch_size, response_length]\n model_input (`torch.LongTensor`):\n Concatenated queries and responses, shape [batch_size, query_length+response_length]\n\n Returns:\n train_stats (dict[str, `torch.Tensor`]):\n Dictionary of training statistics\n \"\"\"\n logprobs, vpred, logits = self.compute_logits_vpred(model_input, query, response, rewards)\n\n loss_p, loss_v, train_stats = self.loss(old_logprobs, values, rewards, logits, vpred, logprobs)\n loss = loss_p + loss_v\n self.optimizer.zero_grad()\n self.accelerator.backward(loss)\n t = time.time()\n self.optimizer.step()\n train_stats[\"time/ppo/optimizer_step\"] = torch.Tensor([time.time() - t]).to(self.accelerator.device)\n return train_stats\n\n def compute_rewards(self, scores: torch.FloatTensor, logprobs: torch.FloatTensor, ref_logprobs: torch.FloatTensor):\n \"\"\"\n Compute per token rewards from scores and KL-penalty.\n\n Args:\n scores (`torch.FloatTensor`):\n Scores from the reward model, shape (`batch_size`)\n logprobs (`torch.FloatTensor`):\n Log probabilities of the model, shape (`batch_size`, `response_length`)\n ref_logprobs (`torch.FloatTensor`):\n Log probabilities of the reference model, shape (`batch_size`, `response_length`)\n \"\"\"\n rewards, non_score_rewards = [], []\n for score, logprob, ref_logprob in zip(scores, logprobs, ref_logprobs):\n kl = logprob - ref_logprob\n non_score_reward = -self.kl_ctl.value * kl\n non_score_rewards.append(non_score_reward)\n reward = non_score_reward.clone()\n reward[-1] += score\n rewards.append(reward)\n return rewards, non_score_rewards\n\n def compute_logits_vpred(\n self,\n model_input,\n query: torch.LongTensor,\n response: torch.LongTensor,\n rewards,\n ):\n input_kwargs = {\n \"input_ids\": model_input,\n }\n\n if self.is_encoder_decoder:\n input_kwargs[\"input_ids\"] = query\n input_kwargs[\"decoder_input_ids\"] = response\n model_input = response\n\n logits, _, vpred = self.model(**input_kwargs)\n gen_len = rewards.shape[-1]\n\n if self.is_encoder_decoder:\n logprob = logprobs_from_logits(logits[:, :-1, :], model_input[:, 1:])\n start, end = 1, response.shape[-1] - 1\n vpred = vpred[:, start:end]\n logprob = logprob[:, start:end]\n else:\n logprob = logprobs_from_logits(logits[:, :-1, :], model_input[:, 1:])\n logprob, vpred = logprob[:, -gen_len:], vpred[:, -gen_len:]\n\n return logprob, vpred, logits\n\n def loss(\n self,\n old_logprobs: torch.FloatTensor,\n values: torch.FloatTensor,\n rewards: torch.FloatTensor,\n logits: torch.FloatTensor,\n vpred: torch.FloatTensor,\n logprob: torch.FloatTensor,\n ):\n \"\"\"\n Calculate policy and value losses.\n\n Args:\n old_logprobs (`torch.FloatTensor`):\n Log probabilities of the model, shape (`batch_size`, `response_length`)\n values (`torch.FloatTensor`):\n Values of the value head, shape (`batch_size`, `hidden_dim`)\n rewards (`torch.FloatTensor`):\n Rewards from the reward model, shape (`batch_size`)\n logits (`torch.FloatTensor`):\n Logits of the model, shape (`batch_size`, `response_length`, `vocab_size`)\n v_pred (`torch.FloatTensor`):\n Values of the value head, shape (`batch_size`, `response_length`)\n logprobs (`torch.FloatTensor`):\n Log probabilities of the model, shape (`batch_size`, `response_length`)\n \"\"\"\n lastgaelam = 0\n advantages_reversed = []\n gen_len = rewards.shape[-1]\n\n for t in reversed(range(gen_len)):\n nextvalues = values[:, t + 1] if t < gen_len - 1 else 0.0\n delta = rewards[:, t] + self.config.gamma * nextvalues - values[:, t]\n lastgaelam = delta + self.config.gamma * self.config.lam * lastgaelam\n advantages_reversed.append(lastgaelam)\n advantages = torch.stack(advantages_reversed[::-1]).transpose(0, 1)\n\n returns = advantages + values\n advantages = whiten(advantages)\n advantages = advantages.detach()\n\n vpredclipped = clip_by_value(vpred, values - self.config.cliprange_value, values + self.config.cliprange_value)\n\n vf_losses1 = (vpred - returns) ** 2\n vf_losses2 = (vpredclipped - returns) ** 2\n vf_loss = 0.5 * torch.mean(torch.max(vf_losses1, vf_losses2))\n vf_clipfrac = torch.mean(torch.gt(vf_losses2, vf_losses1).double())\n\n ratio = torch.exp(logprob - old_logprobs)\n pg_losses = -advantages * ratio\n pg_losses2 = -advantages * torch.clamp(ratio, 1.0 - self.config.cliprange, 1.0 + self.config.cliprange)\n\n pg_loss = torch.mean(torch.max(pg_losses, pg_losses2))\n pg_clipfrac = torch.mean(torch.gt(pg_losses2, pg_losses).double())\n\n loss = pg_loss + self.config.vf_coef * vf_loss\n\n entropy = torch.mean(entropy_from_logits(logits))\n approxkl = 0.5 * torch.mean((logprob - old_logprobs) ** 2)\n policykl = torch.mean(logprob - old_logprobs)\n return_mean, return_var = torch.mean(returns), torch.var(returns)\n value_mean, value_var = torch.mean(values), torch.var(values)\n\n stats = dict(\n loss=dict(policy=pg_loss, value=vf_loss, total=loss),\n policy=dict(\n entropy=entropy,\n approxkl=approxkl,\n policykl=policykl,\n clipfrac=pg_clipfrac,\n advantages=advantages,\n advantages_mean=torch.mean(advantages),\n ratio=ratio,\n ),\n returns=dict(mean=return_mean, var=return_var),\n val=dict(\n vpred=torch.mean(vpred),\n error=torch.mean((vpred - returns) ** 2),\n clipfrac=vf_clipfrac,\n mean=value_mean,\n var=value_var,\n ),\n )\n return pg_loss, self.config.vf_coef * vf_loss, flatten_dict(stats)\n\n def record_step_stats(self, kl_coef: float, **data):\n \"\"\"\n Record training step statistics.\n\n\n Args:\n kl_coef (`float`):\n KL coefficient\n data (`dict`):\n Dictionary of training step data\n\n Returns:\n stats (`dict`):\n Dictionary of training step statistics\n \"\"\"\n kl_list = [logprobs - ref_logprobs for logprobs, ref_logprobs in zip(data[\"logprobs\"], data[\"ref_logprobs\"])]\n mean_kl = torch.mean(torch.stack([torch.sum(kl) for kl in kl_list]))\n mean_entropy = torch.mean(torch.stack([torch.sum(-log_probs) for log_probs in data[\"logprobs\"]]))\n mean_non_score_reward = torch.mean(\n torch.stack([torch.sum(non_score_reward) for non_score_reward in data[\"non_score_reward\"]])\n )\n stats = {\n \"objective/kl\": mean_kl,\n \"objective/kl_dist\": kl_list,\n \"objective/logprobs\": data[\"logprobs\"],\n \"objective/ref_logprobs\": data[\"ref_logprobs\"],\n \"objective/kl_coef\": kl_coef,\n \"objective/entropy\": mean_entropy,\n \"ppo/mean_non_score_reward\": mean_non_score_reward,\n }\n\n for k, v in data[\"train_stats\"].items():\n stats[f\"ppo/{k}\"] = torch.mean(v, axis=0)\n stats[\"ppo/val/var_explained\"] = 1 - stats[\"ppo/val/error\"] / stats[\"ppo/returns/var\"]\n return stats\n\n def log_stats(\n self,\n stats: dict,\n batch: dict,\n rewards: List[torch.FloatTensor],\n ):\n \"\"\"\n A function that logs all the training stats. Call it at the end of each epoch.\n\n Args:\n stats (dict[str, Any]):\n A dictionary of training stats.\n batch (dict[str, Any]):\n A dictionary of batch data, this contains the queries and responses.\n rewards (`List[torch.FloatTensor]`):\n A tensor of rewards.\n \"\"\"\n # Log only if we are in the main process\n if self.accelerator.is_main_process:\n logs = {}\n\n # Log stats\n if not isinstance(rewards, torch.Tensor):\n rewards = torch.tensor(rewards).to(self.accelerator.device)\n\n if \"query\" not in batch.keys() and \"response\" not in batch.keys():\n # warn the user that the game logs will not be logged\n warnings.warn(\n \"The game logs will not be logged because the batch does not contain the keys 'query' and \"\n \"'response'. \"\n )\n elif self.config.log_with == \"wandb\":\n import wandb\n\n table_rows = [list(r) for r in zip(batch[\"query\"], batch[\"response\"], rewards.cpu().tolist())]\n logs.update({\"game_log\": wandb.Table(columns=[\"query\", \"response\", \"reward\"], rows=table_rows)})\n # All reduce rewards if distributed\n if self.is_distributed:\n import torch.distributed as dist\n\n dist.barrier()\n\n dist.all_reduce(rewards, op=torch.distributed.ReduceOp.SUM)\n rewards /= self.accelerator.num_processes\n\n logs.update(stats)\n logs[\"env/reward_mean\"] = torch.mean(rewards).cpu().numpy().item()\n logs[\"env/reward_std\"] = torch.std(rewards).cpu().numpy().item()\n logs[\"env/reward_dist\"] = rewards.cpu().numpy()\n\n if self.config.log_with == \"tensorboard\":\n # update the current step\n self.current_step += 1\n\n self.accelerator.log(logs, step=self.current_step if self.config.log_with == \"tensorboard\" else None)\n\n else:\n if self.is_distributed:\n import torch.distributed as dist\n\n if not isinstance(rewards, torch.Tensor):\n rewards = torch.tensor(rewards).to(self.accelerator.device)\n\n dist.barrier()\n dist.all_reduce(rewards, op=torch.distributed.ReduceOp.SUM)\n\n def create_model_card(self, path: str, model_name: Optional[str] = \"TRL Model\") -> None:\n \"\"\"Creates and saves a model card for a TRL model.\n\n Args:\n path (`str`): The path to save the model card to.\n model_name (`str`, *optional*): The name of the model, defaults to `TRL Model`.\n \"\"\"\n if not os.path.exists(path):\n os.makedirs(path)\n\n user = whoami()[\"name\"]\n model_card_content = MODEL_CARD_TEMPLATE.format(model_name=model_name, model_id=f\"{user}/{path}\")\n with open(os.path.join(path, \"README.md\"), \"w\", encoding=\"utf-8\") as f:\n f.write(model_card_content)\n\n def _save_pretrained(self, save_directory: str) -> None:\n self.model.save_pretrained(save_directory)\n self.tokenizer.save_pretrained(save_directory)\n self.create_model_card(save_directory)\n", "path": "trl/trainer/ppo_trainer.py" } ]
diff --git a/tests/trainer/test_ppo_trainer.py b/tests/trainer/test_ppo_trainer.py index 02dab2628e..61bb668057 100644 --- a/tests/trainer/test_ppo_trainer.py +++ b/tests/trainer/test_ppo_trainer.py @@ -147,6 +147,22 @@ def _init_dummy_dataset(self): return dummy_dataset + def test_drop_last_dataloader(self): + self.ppo_config = PPOConfig(batch_size=3, forward_batch_size=1, log_with=None) + + dummy_dataset = self._init_dummy_dataset() + + ppo_trainer = PPOTrainer( + config=self.ppo_config, + model=self.gpt2_model, + ref_model=self.gpt2_model_ref, + tokenizer=self.gpt2_tokenizer, + dataset=dummy_dataset, + ) + dummy_dataloader = ppo_trainer.dataloader + + self.assertEqual(len(dummy_dataloader), 0) + def test_ppo_step(self): # initialize dataset dummy_dataset = self._init_dummy_dataset() diff --git a/trl/trainer/ppo_trainer.py b/trl/trainer/ppo_trainer.py index 466f0d4865..3aedc1538b 100644 --- a/trl/trainer/ppo_trainer.py +++ b/trl/trainer/ppo_trainer.py @@ -309,6 +309,7 @@ def prepare_dataloader(self, dataset: Union[torch.utils.data.Dataset, Dataset], batch_size=self.config.batch_size, collate_fn=data_collator, shuffle=True, + drop_last=True, ) return dataloader
google__flax-270
[ { "content": "# Copyright 2020 The Flax Authors.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\n\"\"\"setup.py for Flax.\"\"\"\n\nimport os\nfrom setuptools import find_packages\nfrom setuptools import setup\n\nversion = \"0.1.0\"\n\nhere = os.path.abspath(os.path.dirname(__file__))\ntry:\n README = open(os.path.join(here, \"README.md\"), encoding='utf-8').read()\nexcept IOError:\n README = \"\"\n\ninstall_requires = [\n \"numpy>=1.12\",\n \"jax>=0.1.59\",\n \"matplotlib\", # only needed for tensorboard export\n \"dataclasses\", # will only install on py3.6\n \"msgpack\",\n]\n\ntests_require = [\n \"jaxlib\",\n \"pytest\",\n \"pytest-cov\",\n \"pytest-xdist\",\n \"tensorflow\",\n \"tensorflow_datasets\",\n]\n\nsetup(\n name=\"flax\",\n version=version,\n description=\"Flax: A neural network library for JAX designed for flexibility\",\n long_description=\"\\n\\n\".join([README]),\n long_description_content_type='text/markdown',\n classifiers=[\n \"Development Status :: 3 - Alpha\",\n \"Intended Audience :: Developers\",\n \"Intended Audience :: Science/Research\",\n \"License :: OSI Approved :: MIT License\",\n \"Programming Language :: Python :: 3.7\",\n \"Topic :: Scientific/Engineering :: Artificial Intelligence\",\n ],\n keywords=\"\",\n author=\"Flax team\",\n author_email=\"flax-dev@google.com\",\n url=\"https://github.com/google/flax\",\n license=\"Apache\",\n packages=find_packages(),\n include_package_data=False,\n zip_safe=False,\n install_requires=install_requires,\n extras_require={\n \"testing\": tests_require,\n },\n )\n", "path": "setup.py" } ]
[ { "content": "# Copyright 2020 The Flax Authors.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\n\"\"\"setup.py for Flax.\"\"\"\n\nimport os\nfrom setuptools import find_packages\nfrom setuptools import setup\n\nversion = \"0.1.0\"\n\nhere = os.path.abspath(os.path.dirname(__file__))\ntry:\n README = open(os.path.join(here, \"README.md\"), encoding='utf-8').read()\nexcept IOError:\n README = \"\"\n\ninstall_requires = [\n \"numpy>=1.12\",\n \"jax>=0.1.59\",\n \"matplotlib\", # only needed for tensorboard export\n \"dataclasses;python_version<'3.7'\", # will only install on py3.6\n \"msgpack\",\n]\n\ntests_require = [\n \"jaxlib\",\n \"pytest\",\n \"pytest-cov\",\n \"pytest-xdist\",\n \"tensorflow\",\n \"tensorflow_datasets\",\n]\n\nsetup(\n name=\"flax\",\n version=version,\n description=\"Flax: A neural network library for JAX designed for flexibility\",\n long_description=\"\\n\\n\".join([README]),\n long_description_content_type='text/markdown',\n classifiers=[\n \"Development Status :: 3 - Alpha\",\n \"Intended Audience :: Developers\",\n \"Intended Audience :: Science/Research\",\n \"License :: OSI Approved :: MIT License\",\n \"Programming Language :: Python :: 3.7\",\n \"Topic :: Scientific/Engineering :: Artificial Intelligence\",\n ],\n keywords=\"\",\n author=\"Flax team\",\n author_email=\"flax-dev@google.com\",\n url=\"https://github.com/google/flax\",\n license=\"Apache\",\n packages=find_packages(),\n include_package_data=False,\n zip_safe=False,\n install_requires=install_requires,\n extras_require={\n \"testing\": tests_require,\n },\n )\n", "path": "setup.py" } ]
diff --git a/setup.py b/setup.py index 442ef0f76..25a9b112a 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ "numpy>=1.12", "jax>=0.1.59", "matplotlib", # only needed for tensorboard export - "dataclasses", # will only install on py3.6 + "dataclasses;python_version<'3.7'", # will only install on py3.6 "msgpack", ]
fossasia__open-event-server-2599
[ { "content": "import os\nfrom base64 import b64encode\nfrom shutil import copyfile, rmtree\n\nfrom boto.gs.connection import GSConnection\nfrom flask.ext.scrypt import generate_password_hash\nfrom boto.s3.connection import S3Connection\nfrom boto.s3.key import Key\nfrom werkzeug.utils import secure_filename\nimport magic\n\nfrom app.settings import get_settings\n\n#################\n# STORAGE SCHEMA\n#################\n\nUPLOAD_PATHS = {\n 'sessions': {\n 'video': 'events/{event_id}/sessions/{id}/video',\n 'audio': 'events/{event_id}/audios/{id}/audio',\n 'slides': 'events/{event_id}/slides/{id}/slides'\n },\n 'speakers': {\n 'photo': 'events/{event_id}/speakers/{id}/photo',\n 'thumbnail': 'events/{event_id}/speakers/{id}/thumbnail',\n 'small': 'events/{event_id}/speakers/{id}/small',\n 'icon': 'events/{event_id}/speakers/{id}/icon'\n },\n 'event': {\n 'logo': 'events/{event_id}/logo',\n 'background_url': 'events/{event_id}/background',\n 'thumbnail': 'events/{event_id}/thumbnail',\n 'large': 'events/{event_id}/large',\n 'icon': 'events/{event_id}/icon'\n },\n 'sponsors': {\n 'logo': 'events/{event_id}/sponsors/{id}/logo'\n },\n 'tracks': {\n 'track_image_url': 'events/{event_id}/tracks/{id}/track_image'\n },\n 'user': {\n 'avatar': 'users/{user_id}/avatar',\n 'thumbnail': 'users/{user_id}/thumbnail',\n 'small': 'users/{user_id}/small',\n 'icon': 'users/{user_id}/icon'\n },\n 'temp': {\n 'event': 'events/temp/{uuid}'\n }\n}\n\n\n################\n# HELPER CLASSES\n################\n\nclass UploadedFile(object):\n \"\"\"\n Helper for a disk-file to replicate request.files[ITEM] class\n \"\"\"\n def __init__(self, file_path, filename):\n self.file_path = file_path\n self.filename = filename\n self.file = open(file_path)\n\n def save(self, new_path):\n copyfile(self.file_path, new_path)\n\n def read(self):\n return self.file.read()\n\n def __exit__(self, *args, **kwargs):\n self.file.close()\n\n\nclass UploadedMemory(object):\n \"\"\"\n Helper for a memory file to replicate request.files[ITEM] class\n \"\"\"\n def __init__(self, data, filename):\n self.data = data\n self.filename = filename\n\n def read(self):\n return self.data\n\n def save(self, path):\n f = open(path, 'w')\n f.write(self.data)\n f.close()\n\n\n#########\n# MAIN\n#########\n\ndef upload(uploaded_file, key, **kwargs):\n \"\"\"\n Upload handler\n \"\"\"\n # refresh settings\n aws_bucket_name = get_settings()['aws_bucket_name']\n aws_key = get_settings()['aws_key']\n aws_secret = get_settings()['aws_secret']\n\n gs_bucket_name = get_settings()['gs_bucket_name']\n gs_key = get_settings()['gs_key']\n gs_secret = get_settings()['gs_secret']\n\n storage_place = get_settings()['storage_place']\n\n # upload\n if aws_bucket_name and aws_key and aws_secret and storage_place == 's3':\n return upload_to_aws(aws_bucket_name, aws_key, aws_secret, uploaded_file, key, **kwargs)\n elif gs_bucket_name and gs_key and gs_secret and storage_place == 'gs':\n return upload_to_gs(gs_bucket_name, gs_key, gs_secret, uploaded_file, key, **kwargs)\n else:\n return upload_local(uploaded_file, key, **kwargs)\n\n\ndef upload_local(uploaded_file, key, **kwargs):\n \"\"\"\n Uploads file locally. Base dir - static/media/\n \"\"\"\n filename = secure_filename(uploaded_file.filename)\n file_path = 'static/media/' + key + '/' + generate_hash(key) + '/' + filename\n dir_path = file_path.rsplit('/', 1)[0]\n # delete current\n try:\n rmtree(dir_path)\n except OSError:\n pass\n # create dirs\n if not os.path.isdir(dir_path):\n os.makedirs(dir_path)\n uploaded_file.save(file_path)\n return '/serve_' + file_path\n\n\ndef upload_to_aws(bucket_name, aws_key, aws_secret, file, key, acl='public-read'):\n \"\"\"\n Uploads to AWS at key\n http://{bucket}.s3.amazonaws.com/{key}\n \"\"\"\n conn = S3Connection(aws_key, aws_secret)\n bucket = conn.get_bucket(bucket_name)\n k = Key(bucket)\n # generate key\n filename = secure_filename(file.filename)\n key_dir = key + '/' + generate_hash(key) + '/'\n k.key = key_dir + filename\n # delete old data\n for item in bucket.list(prefix='/' + key_dir):\n item.delete()\n # set object settings\n\n file_data = file.read()\n file_mime = magic.from_buffer(file_data, mime=True)\n size = len(file_data)\n sent = k.set_contents_from_string(\n file_data,\n headers={\n 'Content-Disposition': 'attachment; filename=%s' % filename,\n 'Content-Type': '%s' % file_mime\n }\n )\n k.set_acl(acl)\n s3_url = 'https://%s.s3.amazonaws.com/' % bucket_name\n if sent == size:\n return s3_url + k.key\n return False\n\n\ndef upload_to_gs(bucket_name, client_id, client_secret, file, key, acl='public-read'):\n conn = GSConnection(client_id, client_secret)\n bucket = conn.get_bucket(bucket_name)\n k = Key(bucket)\n # generate key\n filename = secure_filename(file.filename)\n key_dir = key + '/' + generate_hash(key) + '/'\n k.key = key_dir + filename\n # delete old data\n for item in bucket.list(prefix='/' + key_dir):\n item.delete()\n # set object settings\n\n file_data = file.read()\n file_mime = magic.from_buffer(file_data, mime=True)\n size = len(file_data)\n sent = k.set_contents_from_string(\n file_data,\n headers={\n 'Content-Disposition': 'attachment; filename=%s' % filename,\n 'Content-Type': '%s' % file_mime\n }\n )\n k.set_acl(acl)\n gs_url = 'https://storage.googleapis.com/%s/' % bucket_name\n if sent == size:\n return gs_url + key\n return False\n\n# ########\n# HELPERS\n# ########\n\n\ndef generate_hash(key):\n \"\"\"\n Generate hash for key\n \"\"\"\n phash = generate_password_hash(key, get_settings()['secret'])\n return b64encode(phash)[:10] # limit len to 10, is sufficient\n", "path": "app/helpers/storage.py" } ]
[ { "content": "import os\nfrom base64 import b64encode\nfrom shutil import copyfile, rmtree\n\nfrom boto.gs.connection import GSConnection\nfrom flask.ext.scrypt import generate_password_hash\nfrom boto.s3.connection import S3Connection\nfrom boto.s3.key import Key\nfrom werkzeug.utils import secure_filename\nimport magic\n\nfrom app.settings import get_settings\n\n#################\n# STORAGE SCHEMA\n#################\n\nUPLOAD_PATHS = {\n 'sessions': {\n 'video': 'events/{event_id}/sessions/{id}/video',\n 'audio': 'events/{event_id}/audios/{id}/audio',\n 'slides': 'events/{event_id}/slides/{id}/slides'\n },\n 'speakers': {\n 'photo': 'events/{event_id}/speakers/{id}/photo',\n 'thumbnail': 'events/{event_id}/speakers/{id}/thumbnail',\n 'small': 'events/{event_id}/speakers/{id}/small',\n 'icon': 'events/{event_id}/speakers/{id}/icon'\n },\n 'event': {\n 'logo': 'events/{event_id}/logo',\n 'background_url': 'events/{event_id}/background',\n 'thumbnail': 'events/{event_id}/thumbnail',\n 'large': 'events/{event_id}/large',\n 'icon': 'events/{event_id}/icon'\n },\n 'sponsors': {\n 'logo': 'events/{event_id}/sponsors/{id}/logo'\n },\n 'tracks': {\n 'track_image_url': 'events/{event_id}/tracks/{id}/track_image'\n },\n 'user': {\n 'avatar': 'users/{user_id}/avatar',\n 'thumbnail': 'users/{user_id}/thumbnail',\n 'small': 'users/{user_id}/small',\n 'icon': 'users/{user_id}/icon'\n },\n 'temp': {\n 'event': 'events/temp/{uuid}'\n }\n}\n\n\n################\n# HELPER CLASSES\n################\n\nclass UploadedFile(object):\n \"\"\"\n Helper for a disk-file to replicate request.files[ITEM] class\n \"\"\"\n def __init__(self, file_path, filename):\n self.file_path = file_path\n self.filename = filename\n self.file = open(file_path)\n\n def save(self, new_path):\n copyfile(self.file_path, new_path)\n\n def read(self):\n return self.file.read()\n\n def __exit__(self, *args, **kwargs):\n self.file.close()\n\n\nclass UploadedMemory(object):\n \"\"\"\n Helper for a memory file to replicate request.files[ITEM] class\n \"\"\"\n def __init__(self, data, filename):\n self.data = data\n self.filename = filename\n\n def read(self):\n return self.data\n\n def save(self, path):\n f = open(path, 'w')\n f.write(self.data)\n f.close()\n\n\n#########\n# MAIN\n#########\n\ndef upload(uploaded_file, key, **kwargs):\n \"\"\"\n Upload handler\n \"\"\"\n # refresh settings\n aws_bucket_name = get_settings()['aws_bucket_name']\n aws_key = get_settings()['aws_key']\n aws_secret = get_settings()['aws_secret']\n\n gs_bucket_name = get_settings()['gs_bucket_name']\n gs_key = get_settings()['gs_key']\n gs_secret = get_settings()['gs_secret']\n\n storage_place = get_settings()['storage_place']\n\n # upload\n if aws_bucket_name and aws_key and aws_secret and storage_place == 's3':\n return upload_to_aws(aws_bucket_name, aws_key, aws_secret, uploaded_file, key, **kwargs)\n elif gs_bucket_name and gs_key and gs_secret and storage_place == 'gs':\n return upload_to_gs(gs_bucket_name, gs_key, gs_secret, uploaded_file, key, **kwargs)\n else:\n return upload_local(uploaded_file, key, **kwargs)\n\n\ndef upload_local(uploaded_file, key, **kwargs):\n \"\"\"\n Uploads file locally. Base dir - static/media/\n \"\"\"\n filename = secure_filename(uploaded_file.filename)\n file_path = 'static/media/' + key + '/' + generate_hash(key) + '/' + filename\n dir_path = file_path.rsplit('/', 1)[0]\n # delete current\n try:\n rmtree(dir_path)\n except OSError:\n pass\n # create dirs\n if not os.path.isdir(dir_path):\n os.makedirs(dir_path)\n uploaded_file.save(file_path)\n return '/serve_' + file_path\n\n\ndef upload_to_aws(bucket_name, aws_key, aws_secret, file, key, acl='public-read'):\n \"\"\"\n Uploads to AWS at key\n http://{bucket}.s3.amazonaws.com/{key}\n \"\"\"\n conn = S3Connection(aws_key, aws_secret)\n bucket = conn.get_bucket(bucket_name)\n k = Key(bucket)\n # generate key\n filename = secure_filename(file.filename)\n key_dir = key + '/' + generate_hash(key) + '/'\n k.key = key_dir + filename\n # delete old data\n for item in bucket.list(prefix='/' + key_dir):\n item.delete()\n # set object settings\n\n file_data = file.read()\n file_mime = magic.from_buffer(file_data, mime=True)\n size = len(file_data)\n sent = k.set_contents_from_string(\n file_data,\n headers={\n 'Content-Disposition': 'attachment; filename=%s' % filename,\n 'Content-Type': '%s' % file_mime\n }\n )\n k.set_acl(acl)\n s3_url = 'https://%s.s3.amazonaws.com/' % bucket_name\n if sent == size:\n return s3_url + k.key\n return False\n\n\ndef upload_to_gs(bucket_name, client_id, client_secret, file, key, acl='public-read'):\n conn = GSConnection(client_id, client_secret)\n bucket = conn.get_bucket(bucket_name)\n k = Key(bucket)\n # generate key\n filename = secure_filename(file.filename)\n key_dir = key + '/' + generate_hash(key) + '/'\n k.key = key_dir + filename\n # delete old data\n for item in bucket.list(prefix='/' + key_dir):\n item.delete()\n # set object settings\n\n file_data = file.read()\n file_mime = magic.from_buffer(file_data, mime=True)\n size = len(file_data)\n sent = k.set_contents_from_string(\n file_data,\n headers={\n 'Content-Disposition': 'attachment; filename=%s' % filename,\n 'Content-Type': '%s' % file_mime\n }\n )\n k.set_acl(acl)\n gs_url = 'https://storage.googleapis.com/%s/' % bucket_name\n if sent == size:\n return gs_url + k.key\n return False\n\n# ########\n# HELPERS\n# ########\n\n\ndef generate_hash(key):\n \"\"\"\n Generate hash for key\n \"\"\"\n phash = generate_password_hash(key, get_settings()['secret'])\n return b64encode(phash)[:10] # limit len to 10, is sufficient\n", "path": "app/helpers/storage.py" } ]
diff --git a/.travis.yml b/.travis.yml index 16619c635c..4e42d8e01a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ after_success: - bash <(curl -s https://codecov.io/bash) - coveralls - codeclimate-test-reporter - - bash kubernetes/deployment/deploy.sh + - bash kubernetes/travis/deploy.sh - bash scripts/push_api_docs.sh addons: code_climate: diff --git a/app/helpers/storage.py b/app/helpers/storage.py index 74ea80c49d..cd1b14e2cd 100644 --- a/app/helpers/storage.py +++ b/app/helpers/storage.py @@ -199,7 +199,7 @@ def upload_to_gs(bucket_name, client_id, client_secret, file, key, acl='public-r k.set_acl(acl) gs_url = 'https://storage.googleapis.com/%s/' % bucket_name if sent == size: - return gs_url + key + return gs_url + k.key return False # ######## diff --git a/docs/INSTALLATION_GCE_KUBERNETES.md b/docs/INSTALLATION_GCE_KUBERNETES.md index a2a897e524..f73fd9f388 100644 --- a/docs/INSTALLATION_GCE_KUBERNETES.md +++ b/docs/INSTALLATION_GCE_KUBERNETES.md @@ -90,7 +90,7 @@ _You can delete the instance if your not planning to use it for anything else. B - Create a cluster via the `gcloud` command line tool: ``` - gcloud container clusters create opev-cluster + gcloud container clusters create opev-cluster --image-type=container_vm ``` - Get the credentials for `kubectl` to use. diff --git a/kubernetes/deploy.sh b/kubernetes/deploy.sh new file mode 100755 index 0000000000..53dab01330 --- /dev/null +++ b/kubernetes/deploy.sh @@ -0,0 +1,40 @@ +#!/bin/bash +echo "Deploying the project to kubernetes cluster" +export DIR=${BASH_SOURCE%/*} +# Start KubeLego deployment +kubectl create -f ${DIR}/yamls/lego +# Start nginx deployment, ingress & service +kubectl create -f ${DIR}/yamls/nginx +# Start postgres persistent volume, deployment & service +kubectl create -f ${DIR}/yamls/postgres +# Start the redirector deployment & service +kubectl create -f ${DIR}/yamls/redirector +# Start Redis deployment & service +kubectl create -f ${DIR}/yamls/redis +# Starting nfs deployment for persistent storage. Tricky. So, we'll go file by file. +# create the persistent volume using a GCE persistent disk +kubectl create -f ${DIR}/yamls/persistent-store/nfs-data-disk-pv.yml +sleep 10 +# create the persistent volume claim +kubectl create -f ${DIR}/yamls/persistent-store/nfs-data-disk-pv-claim.yml +echo "Waiting for the NFS disk to initialize" +sleep 40 +# create the NFS Server deployment +kubectl create -f ${DIR}/yamls/persistent-store/nfs-server.yml +# Let us give the NFS server ample amount of time to start up +echo "Waiting for NFS server to start up" +sleep 60 +# create the NFS deployment service to expose ports +kubectl create -f ${DIR}/yamls/persistent-store/nfs-server-service.yml +# create the persistent volume entry for the NFS Server with a ReadWriteMany access mode +kubectl create -f ${DIR}/yamls/persistent-store/nfs-pv.yml +# create the required claim for the NFS Server persistent volume +kubectl create -f ${DIR}/yamls/persistent-store/nfs-pv-claim.yml +echo "Waiting longer for NFS server to start up" +# I found the sometimes NFS required a little bit longer to start up after all this. So, let's just give it some more time. +sleep 30 +# Start celery deployment +kubectl create -f ${DIR}/yamls/celery +# Start web deployment & service +kubectl create -f ${DIR}/yamls/web +echo "Done. The project was deployed to kubernetes. :)" diff --git a/kubernetes/images/nfs-server/Dockerfile b/kubernetes/images/nfs-server/Dockerfile new file mode 100644 index 0000000000..873423e56b --- /dev/null +++ b/kubernetes/images/nfs-server/Dockerfile @@ -0,0 +1,23 @@ +# Copyright 2016 The Kubernetes Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM centos +MAINTAINER Niranjan Rajendran <niranjan94@yahoo.com> +RUN yum -y install /usr/bin/ps nfs-utils && yum clean all +RUN mkdir -p /data +ADD run_nfs.sh /usr/local/bin/ + +EXPOSE 2049/tcp 20048/tcp 111/tcp 111/udp + +ENTRYPOINT ["/usr/local/bin/run_nfs.sh", "/data"] diff --git a/kubernetes/images/nfs-server/run_nfs.sh b/kubernetes/images/nfs-server/run_nfs.sh new file mode 100755 index 0000000000..e6eb8f9462 --- /dev/null +++ b/kubernetes/images/nfs-server/run_nfs.sh @@ -0,0 +1,72 @@ +#!/bin/bash + +# Copyright 2015 The Kubernetes Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +function start() +{ + + # prepare /etc/exports + for i in "$@"; do + # fsid=0: needed for NFSv4 + echo "$i *(rw,fsid=0,insecure,no_root_squash)" >> /etc/exports + # move index.html to here + /bin/cp /tmp/index.html $i/ + chmod 644 $i/index.html + echo "Serving $i" + done + + # start rpcbind if it is not started yet + /usr/sbin/rpcinfo 127.0.0.1 > /dev/null; s=$? + if [ $s -ne 0 ]; then + echo "Starting rpcbind" + /usr/sbin/rpcbind -w + fi + + mount -t nfsd nfds /proc/fs/nfsd + + # -N 4.x: disable NFSv4 + # -V 3: enable NFSv3 + /usr/sbin/rpc.mountd -N 2 -V 3 -N 4 -N 4.1 + + /usr/sbin/exportfs -r + # -G 10 to reduce grace time to 10 seconds (the lowest allowed) + /usr/sbin/rpc.nfsd -G 10 -N 2 -V 3 -N 4 -N 4.1 2 + /usr/sbin/rpc.statd --no-notify + echo "NFS started" +} + +function stop() +{ + echo "Stopping NFS" + + /usr/sbin/rpc.nfsd 0 + /usr/sbin/exportfs -au + /usr/sbin/exportfs -f + + kill $( pidof rpc.mountd ) + umount /proc/fs/nfsd + echo > /etc/exports + exit 0 +} + + +trap stop TERM + +start "$@" + +# Ugly hack to do nothing and wait for SIGTERM +while true; do + sleep 5 +done diff --git a/kubernetes/image/Dockerfile b/kubernetes/images/web/Dockerfile similarity index 100% rename from kubernetes/image/Dockerfile rename to kubernetes/images/web/Dockerfile diff --git a/kubernetes/image/setup.sh b/kubernetes/images/web/setup.sh similarity index 100% rename from kubernetes/image/setup.sh rename to kubernetes/images/web/setup.sh diff --git a/kubernetes/run.sh b/kubernetes/run.sh old mode 100644 new mode 100755 diff --git a/kubernetes/deployment/deploy.sh b/kubernetes/travis/deploy.sh similarity index 98% rename from kubernetes/deployment/deploy.sh rename to kubernetes/travis/deploy.sh index 05b7416967..72651fc6c2 100755 --- a/kubernetes/deployment/deploy.sh +++ b/kubernetes/travis/deploy.sh @@ -26,7 +26,7 @@ gcloud auth activate-service-account --key-file eventyay-8245fde7ab8a.json export GOOGLE_APPLICATION_CREDENTIALS=$(pwd)/eventyay-8245fde7ab8a.json gcloud config set project eventyay gcloud container clusters get-credentials eventyay-cluster -cd kubernetes/image +cd kubernetes/images/web docker build --build-arg COMMIT_HASH=$TRAVIS_COMMIT --build-arg BRANCH=$DEPLOY_BRANCH --build-arg REPOSITORY=$REPOSITORY --no-cache -t gcr.io/eventyay/web:$TRAVIS_COMMIT . docker tag gcr.io/eventyay/web:$TRAVIS_COMMIT gcr.io/eventyay/web:latest gcloud docker -- push gcr.io/eventyay/web diff --git a/kubernetes/yamls/celery/celery-deployment.yml b/kubernetes/yamls/celery/celery-deployment.yml index 47acdbec6b..cf5ba6c08c 100644 --- a/kubernetes/yamls/celery/celery-deployment.yml +++ b/kubernetes/yamls/celery/celery-deployment.yml @@ -2,7 +2,6 @@ kind: Deployment apiVersion: extensions/v1beta1 metadata: name: celery - creationTimestamp: spec: replicas: 1 template: @@ -20,5 +19,11 @@ spec: value: 'true' - name: DEPLOYMENT value: 'celery' - resources: {} + volumeMounts: + - mountPath: /opev/open_event/static/uploads/ + name: nfs-storage restartPolicy: Always + volumes: + - name: nfs-storage + persistentVolumeClaim: + claimName: nfs-claim diff --git a/kubernetes/yamls/debug/busybox.yml b/kubernetes/yamls/debug/busybox.yml new file mode 100644 index 0000000000..babb7652f5 --- /dev/null +++ b/kubernetes/yamls/debug/busybox.yml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: Pod +metadata: + name: busybox + namespace: default +spec: + containers: + - image: busybox + command: + - sleep + - "3600" + imagePullPolicy: IfNotPresent + name: busybox + restartPolicy: Always diff --git a/kubernetes/yamls/persistent-store/nfs-data-disk-pv-claim.yml b/kubernetes/yamls/persistent-store/nfs-data-disk-pv-claim.yml new file mode 100644 index 0000000000..0127847b61 --- /dev/null +++ b/kubernetes/yamls/persistent-store/nfs-data-disk-pv-claim.yml @@ -0,0 +1,11 @@ +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: nfs-data-claim +spec: + volumeName: nfs-data-disk + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 10Gi diff --git a/kubernetes/yamls/persistent-store/nfs-data-disk-pv.yml b/kubernetes/yamls/persistent-store/nfs-data-disk-pv.yml new file mode 100644 index 0000000000..574a96b80e --- /dev/null +++ b/kubernetes/yamls/persistent-store/nfs-data-disk-pv.yml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: PersistentVolume +metadata: + name: nfs-data-disk + labels: + name: nfs-data-disk +spec: + capacity: + storage: 10Gi + accessModes: + - ReadWriteOnce + gcePersistentDisk: + pdName: "nfs-data-disk" + fsType: "ext4" diff --git a/kubernetes/yamls/persistent-store/nfs-pv-claim.yml b/kubernetes/yamls/persistent-store/nfs-pv-claim.yml new file mode 100644 index 0000000000..3b53ab240d --- /dev/null +++ b/kubernetes/yamls/persistent-store/nfs-pv-claim.yml @@ -0,0 +1,11 @@ +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: nfs-claim +spec: + volumeName: nfs + accessModes: + - ReadWriteMany + resources: + requests: + storage: 10Gi diff --git a/kubernetes/yamls/persistent-store/nfs-pv.yml b/kubernetes/yamls/persistent-store/nfs-pv.yml new file mode 100644 index 0000000000..d33c25185b --- /dev/null +++ b/kubernetes/yamls/persistent-store/nfs-pv.yml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: PersistentVolume +metadata: + name: nfs + labels: + name: nfs +spec: + capacity: + storage: 10Gi + accessModes: + - ReadWriteMany + nfs: + server: 10.3.244.20 + path: "/data" diff --git a/kubernetes/yamls/persistent-store/nfs-server-service.yml b/kubernetes/yamls/persistent-store/nfs-server-service.yml new file mode 100644 index 0000000000..a1945464f3 --- /dev/null +++ b/kubernetes/yamls/persistent-store/nfs-server-service.yml @@ -0,0 +1,15 @@ +kind: Service +apiVersion: v1 +metadata: + name: nfs-server +spec: + ports: + - name: nfs + port: 2049 + - name: mountd + port: 20048 + - name: rpcbind + port: 111 + selector: + role: nfs-server + clusterIP: 10.3.244.20 diff --git a/kubernetes/yamls/persistent-store/nfs-server.yml b/kubernetes/yamls/persistent-store/nfs-server.yml new file mode 100644 index 0000000000..af0ca80430 --- /dev/null +++ b/kubernetes/yamls/persistent-store/nfs-server.yml @@ -0,0 +1,31 @@ +kind: Deployment +apiVersion: extensions/v1beta1 +metadata: + name: nfs-server +spec: + replicas: 1 + template: + metadata: + labels: + role: nfs-server + spec: + hostname: nfs-server + containers: + - name: nfs-server + image: gcr.io/eventyay/nfs-server:latest + ports: + - name: nfs + containerPort: 2049 + - name: mountd + containerPort: 20048 + - name: rpcbind + containerPort: 111 + securityContext: + privileged: true + volumeMounts: + - mountPath: /data + name: data-pvc + volumes: + - name: data-pvc + persistentVolumeClaim: + claimName: nfs-data-claim diff --git a/kubernetes/yamls/postgres/postgres-persistence.yml b/kubernetes/yamls/postgres/postgres-persistence.yml index 711064b042..852b29f8b2 100644 --- a/kubernetes/yamls/postgres/postgres-persistence.yml +++ b/kubernetes/yamls/postgres/postgres-persistence.yml @@ -6,7 +6,7 @@ metadata: name: pg-data-disk spec: capacity: - storage: 1Gi + storage: 10Gi accessModes: - ReadWriteOnce gcePersistentDisk: diff --git a/kubernetes/yamls/web/web-deployment.yml b/kubernetes/yamls/web/web-deployment.yml index 90ece84d7b..2f86a94927 100644 --- a/kubernetes/yamls/web/web-deployment.yml +++ b/kubernetes/yamls/web/web-deployment.yml @@ -32,4 +32,11 @@ spec: value: 'web' - name: FORCE_SSL value: 'yes' + volumeMounts: + - mountPath: /opev/open_event/static/uploads/ + name: nfs-storage restartPolicy: Always + volumes: + - name: nfs-storage + persistentVolumeClaim: + claimName: nfs-claim
kivy__python-for-android-615
[ { "content": "from functools import partial\n\nfrom pythonforandroid.toolchain import Recipe, shprint, current_directory\nimport sh\n\n\nclass OpenSSLRecipe(Recipe):\n version = '1.0.2e'\n url = 'https://www.openssl.org/source/openssl-{version}.tar.gz'\n\n def should_build(self, arch):\n return not self.has_libs(arch, 'libssl.so', 'libcrypto.so')\n\n def check_symbol(self, env, sofile, symbol):\n nm = env.get('NM', 'nm')\n syms = sh.sh('-c', \"{} -gp {} | cut -d' ' -f3\".format(\n nm, sofile), _env=env).splitlines()\n if symbol in syms:\n return True\n print('{} missing symbol {}; rebuilding'.format(sofile, symbol))\n return False\n\n def get_recipe_env(self, arch=None):\n env = super(OpenSSLRecipe, self).get_recipe_env(arch)\n env['CFLAGS'] += ' ' + env['LDFLAGS']\n env['CC'] += ' ' + env['LDFLAGS']\n return env\n\n def select_build_arch(self, arch):\n aname = arch.arch\n if 'arm64' in aname:\n return 'linux-aarch64'\n if 'v7a' in aname:\n return 'android-armv7'\n if 'arm' in aname:\n return 'android'\n return 'linux-armv4'\n\n def build_arch(self, arch):\n env = self.get_recipe_env(arch)\n with current_directory(self.get_build_dir(arch.arch)):\n # sh fails with code 255 trying to execute ./Configure\n # so instead we manually run perl passing in Configure\n perl = sh.Command('perl')\n buildarch = self.select_build_arch(arch)\n shprint(perl, 'Configure', 'shared', 'no-dso', 'no-krb5', buildarch, _env=env)\n self.apply_patch('disable-sover.patch', arch.arch)\n\n check_crypto = partial(self.check_symbol, env, 'libcrypto.so')\n # check_ssl = partial(self.check_symbol, env, 'libssl.so')\n while True:\n shprint(sh.make, 'build_libs', _env=env)\n if all(map(check_crypto, ('SSLeay', 'MD5_Transform', 'MD4_Init'))):\n break\n shprint(sh.make, 'clean', _env=env)\n\n self.install_libs(arch, 'libssl.so', 'libcrypto.so')\n\nrecipe = OpenSSLRecipe()\n", "path": "pythonforandroid/recipes/openssl/__init__.py" } ]
[ { "content": "from functools import partial\n\nfrom pythonforandroid.toolchain import Recipe, shprint, current_directory\nimport sh\n\n\nclass OpenSSLRecipe(Recipe):\n version = '1.0.2f'\n url = 'https://www.openssl.org/source/openssl-{version}.tar.gz'\n\n def should_build(self, arch):\n return not self.has_libs(arch, 'libssl.so', 'libcrypto.so')\n\n def check_symbol(self, env, sofile, symbol):\n nm = env.get('NM', 'nm')\n syms = sh.sh('-c', \"{} -gp {} | cut -d' ' -f3\".format(\n nm, sofile), _env=env).splitlines()\n if symbol in syms:\n return True\n print('{} missing symbol {}; rebuilding'.format(sofile, symbol))\n return False\n\n def get_recipe_env(self, arch=None):\n env = super(OpenSSLRecipe, self).get_recipe_env(arch)\n env['CFLAGS'] += ' ' + env['LDFLAGS']\n env['CC'] += ' ' + env['LDFLAGS']\n return env\n\n def select_build_arch(self, arch):\n aname = arch.arch\n if 'arm64' in aname:\n return 'linux-aarch64'\n if 'v7a' in aname:\n return 'android-armv7'\n if 'arm' in aname:\n return 'android'\n return 'linux-armv4'\n\n def build_arch(self, arch):\n env = self.get_recipe_env(arch)\n with current_directory(self.get_build_dir(arch.arch)):\n # sh fails with code 255 trying to execute ./Configure\n # so instead we manually run perl passing in Configure\n perl = sh.Command('perl')\n buildarch = self.select_build_arch(arch)\n shprint(perl, 'Configure', 'shared', 'no-dso', 'no-krb5', buildarch, _env=env)\n self.apply_patch('disable-sover.patch', arch.arch)\n\n check_crypto = partial(self.check_symbol, env, 'libcrypto.so')\n # check_ssl = partial(self.check_symbol, env, 'libssl.so')\n while True:\n shprint(sh.make, 'build_libs', _env=env)\n if all(map(check_crypto, ('SSLeay', 'MD5_Transform', 'MD4_Init'))):\n break\n shprint(sh.make, 'clean', _env=env)\n\n self.install_libs(arch, 'libssl.so', 'libcrypto.so')\n\nrecipe = OpenSSLRecipe()\n", "path": "pythonforandroid/recipes/openssl/__init__.py" } ]
diff --git a/pythonforandroid/recipes/openssl/__init__.py b/pythonforandroid/recipes/openssl/__init__.py index f3df432a2a..8348f8d552 100644 --- a/pythonforandroid/recipes/openssl/__init__.py +++ b/pythonforandroid/recipes/openssl/__init__.py @@ -5,7 +5,7 @@ class OpenSSLRecipe(Recipe): - version = '1.0.2e' + version = '1.0.2f' url = 'https://www.openssl.org/source/openssl-{version}.tar.gz' def should_build(self, arch): diff --git a/pythonforandroid/recipes/openssl/disable-sover.patch b/pythonforandroid/recipes/openssl/disable-sover.patch index 12020a494b..6099fadcef 100644 --- a/pythonforandroid/recipes/openssl/disable-sover.patch +++ b/pythonforandroid/recipes/openssl/disable-sover.patch @@ -1,6 +1,6 @@ ---- openssl/Makefile 2015-12-28 16:48:49.159522273 -0600 -+++ b/Makefile 2015-12-29 10:31:54.358438402 -0600 -@@ -343,7 +343,7 @@ +--- openssl/Makefile 2016-01-28 17:26:49.159522273 +0100 ++++ b/Makefile 2016-01-28 17:26:54.358438402 +0100 +@@ -342,7 +342,7 @@ link-shared: @ set -e; for i in $(SHLIBDIRS); do \ $(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \ @@ -9,7 +9,7 @@ LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \ symlink.$(SHLIB_TARGET); \ libs="$$libs -l$$i"; \ -@@ -357,7 +357,7 @@ +@@ -356,7 +356,7 @@ libs="$(LIBKRB5) $$libs"; \ fi; \ $(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \
chainer__chainer-5463
[ { "content": "import warnings\n\nimport numpy\nimport six\n\nfrom chainer import configuration\nfrom chainer import functions\nfrom chainer import initializer\nfrom chainer import link\nfrom chainer.links.caffe.protobuf3 import caffe_pb2 as caffe_pb\nfrom chainer.links.connection import convolution_2d\nfrom chainer.links.connection import deconvolution_2d\nfrom chainer.links.connection import linear\nfrom chainer.links.connection import scale\nfrom chainer.links.normalization import batch_normalization\nfrom chainer.utils import argument\nfrom chainer.utils import collections_abc\n\n\ntry:\n # This method is undocumented, but is required to read large size of\n # model files when a user uses cpp-implementation.\n from google.protobuf.pyext import _message\n _message.SetAllowOversizeProtos(True)\nexcept ImportError:\n pass\n\n_type_to_method = {}\n_oldname_to_method = {}\n\n\ndef _layer(typ, oldname):\n def decorator(meth):\n global _type_to_method\n _type_to_method[typ] = meth\n if oldname is not None:\n typevalue = getattr(caffe_pb.V1LayerParameter, oldname)\n _oldname_to_method[typevalue] = meth\n return meth\n return decorator\n\n\nclass _Blob(initializer.Initializer):\n\n chunk_size = 1024 * 1024\n\n def __init__(self, blob):\n super(_Blob, self).__init__()\n self.data = blob.data\n\n def __call__(self, array):\n array = array.ravel()\n size = len(array)\n indices = list(range(0, size, self.chunk_size))\n\n # Rather than accessing Protobuf's RepeatedScalar fields directly,\n # creating a intermediate list by indexing is more efficifent due to\n # the implementation of the Python extension of Protobuf.\n # To avoid allocating excessively large lists, we limit the length\n # of lists by `chunk_size`.\n for start, end in zip(indices, indices[1:] + [size]):\n array[start:end] = self.data[start:end]\n\n\nclass _ConvolutionBlob(_Blob):\n\n def __init__(self, blob, group):\n super(_ConvolutionBlob, self).__init__(blob)\n self.group = group\n\n def __call__(self, array):\n n_out, n_in = array.shape[:2]\n\n part_out = n_out // self.group\n part_in = n_in // self.group\n\n array[...] = 0\n\n part_size = len(self.data) // self.group\n for i in six.moves.range(self.group):\n out_slice = slice(i * part_out, (i + 1) * part_out)\n in_slice = slice(i * part_in, (i + 1) * part_in)\n w = array[out_slice, in_slice]\n\n data = numpy.array(self.data[i * part_size:(i + 1) * part_size])\n w[:] = data.reshape(w.shape)\n\n\nclass CaffeFunction(link.Chain):\n\n \"\"\"Caffe emulator based on the model file of Caffe.\n\n Given a protocol buffers file of a Caffe model, this class loads and\n emulates it on :class:`~chainer.Variable` objects. It supports the official\n reference models provided by BVLC.\n\n .. note::\n\n CaffeFunction ignores the following layers:\n\n - Layers that CaffeFunction does not support (including data layers)\n - Layers that have no top blobs\n - Layers whose bottom blobs are incomplete (i.e., some or all of them\n are not given nor computed)\n\n .. warning::\n\n It does not support full compatibility against Caffe. Some layers and\n configurations are not implemented in Chainer yet, though the reference\n models provided by the BVLC team are supported except data layers.\n\n .. admonition:: Example\n\n Consider we want to extract the (unnormalized) log class probability\n of given images using BVLC reference CaffeNet. The model can be\n downloaded from:\n\n http://dl.caffe.berkeleyvision.org/bvlc_reference_caffenet.caffemodel\n\n We want to compute the ``fc8`` blob from the ``data`` blob. It is simply\n written as follows::\n\n # Load the model\n func = CaffeFunction('path/to/bvlc_reference_caffenet.caffemodel')\n\n # Minibatch of size 10\n x_data = numpy.ndarray((10, 3, 227, 227), dtype=numpy.float32)\n ... # (Fill the minibatch here)\n\n # Forward the pre-trained net\n x = Variable(x_data)\n y, = func(inputs={'data': x}, outputs=['fc8'])\n\n The result ``y`` contains the Variable corresponding to the ``fc8``\n blob. The computational graph is memorized as a usual forward\n computation in Chainer, so we can run backprop through this pre-trained\n net.\n\n Args:\n model_path (str): Path to the binary-proto model file of Caffe.\n\n Attributes:\n forwards (dict): A mapping from layer names to corresponding functions.\n\n \"\"\"\n\n def __init__(self, model_path):\n super(CaffeFunction, self).__init__()\n\n net = caffe_pb.NetParameter()\n with open(model_path, 'rb') as model_file:\n net.MergeFromString(model_file.read())\n\n self.forwards = {}\n self.split_map = {}\n self.layers = []\n\n if net.layer:\n for layer in net.layer:\n meth = _type_to_method.get(layer.type)\n if meth:\n meth(self, layer)\n else:\n warnings.warn(\n 'Skip the layer \"%s\", since CaffeFunction does not'\n 'support %s layer' % (layer.name, layer.type))\n else: # v1 format\n for layer in net.layers:\n meth = _oldname_to_method.get(layer.type)\n if meth:\n meth(self, layer)\n else:\n warnings.warn(\n 'Skip the layer \"%s\", since CaffeFunction does not'\n 'support it' % layer.name)\n\n def forward(self, inputs, outputs, disable=(), **kwargs):\n \"\"\"forward(self, inputs, outputs, disable=())\n\n Executes a sub-network of the network.\n\n This function acts as an interpreter of the network definition for\n Caffe. On execution, it interprets each layer one by one, and if the\n bottom blobs are already computed, then emulates the layer and stores\n output blobs as :class:`~chainer.Variable` objects.\n\n .. warning::\n\n ``train`` argument is not supported anymore since v2.\n Instead, use ``chainer.using_config('train', train)``.\n See :func:`chainer.using_config`.\n\n Args:\n inputs (dict): A dictionary whose key-value pairs indicate initial\n correspondences between blob names and\n :class:`~chainer.Variable` objects.\n outputs (Iterable): A list of blob names whose corresponding\n :class:`~chainer.Variable` objects are returned.\n disable (Iterable): A list of layer names that will be ignored\n during the forward computation.\n\n Returns:\n tuple: A tuple of output :class:`~chainer.Variable` objects\n corresponding to elements of the `outputs` argument.\n\n \"\"\"\n if kwargs:\n argument.check_unexpected_kwargs(\n kwargs, train='train argument is not supported anymore. '\n 'Use chainer.using_config')\n argument.assert_kwargs_empty(kwargs)\n\n variables = dict(inputs)\n disable = set(disable)\n for func_name, bottom, top in self.layers:\n if (func_name in disable or\n func_name not in self.forwards or\n any(blob not in variables for blob in bottom)):\n continue\n\n func = self.forwards[func_name]\n input_vars = tuple(variables[blob] for blob in bottom)\n output_vars = func(*input_vars)\n if not isinstance(output_vars, collections_abc.Iterable):\n output_vars = output_vars,\n for var, name in zip(output_vars, top):\n variables[name] = var\n\n self.variables = variables\n return tuple(variables[blob] for blob in outputs)\n\n def _add_layer(self, layer):\n bottom = []\n for blob_name in layer.bottom:\n bottom.append(self.split_map.get(blob_name, blob_name))\n self.layers.append((layer.name, bottom, list(layer.top)))\n\n @_layer('Concat', 'CONCAT')\n def _setup_concat(self, layer):\n param = layer.concat_param\n axis = param.axis\n if axis == 1 and param.concat_dim != 1:\n axis = param.concat_dim\n\n self.forwards[layer.name] = _ListArgumentFcuntion(\n functions.concat, axis=axis)\n self._add_layer(layer)\n\n @_layer('Convolution', 'CONVOLUTION')\n def _setup_convolution(self, layer):\n blobs = layer.blobs\n param = layer.convolution_param\n ksize = _get_ksize(param)\n stride = _get_stride(param)\n pad = _get_pad(param)\n num = _get_num(blobs[0])\n channels = _get_channels(blobs[0])\n bias_term = param.bias_term\n\n n_in = channels * param.group\n n_out = num\n\n func = convolution_2d.Convolution2D(\n n_in, n_out, ksize, stride, pad, nobias=not bias_term,\n initialW=_ConvolutionBlob(blobs[0], param.group),\n initial_bias=_Blob(blobs[1]) if bias_term else None)\n\n with self.init_scope():\n setattr(self, layer.name, func)\n self.forwards[layer.name] = _CallChildLink(self, layer.name)\n self._add_layer(layer)\n\n @_layer('Deconvolution', 'DECONVOLUTION')\n def _setup_deconvolution(self, layer):\n blobs = layer.blobs\n param = layer.convolution_param\n ksize = _get_ksize(param)\n stride = _get_stride(param)\n pad = _get_pad(param)\n num = _get_num(blobs[0])\n channels = _get_channels(blobs[0])\n bias_term = param.bias_term\n\n n_in = num\n n_out = channels * param.group\n\n func = deconvolution_2d.Deconvolution2D(\n n_in, n_out, ksize, stride, pad, nobias=not bias_term,\n initialW=_ConvolutionBlob(blobs[0], param.group),\n initial_bias=_Blob(blobs[1]) if bias_term else None)\n\n with self.init_scope():\n setattr(self, layer.name, func)\n self.forwards[layer.name] = _CallChildLink(self, layer.name)\n self._add_layer(layer)\n\n @_layer('Data', 'DATA')\n def _setup_data(self, layer):\n # We silently skip the data layer.\n pass\n\n @_layer('Dropout', 'DROPOUT')\n def _setup_dropout(self, layer):\n param = layer.dropout_param\n\n self.forwards[layer.name] = _SingleArgumentFunction(\n functions.dropout, ratio=param.dropout_ratio)\n self._add_layer(layer)\n\n @_layer('InnerProduct', 'INNER_PRODUCT')\n def _setup_inner_product(self, layer):\n param = layer.inner_product_param\n bias_term = param.bias_term\n if param.axis != 1:\n raise RuntimeError(\n 'Non-default axis in InnerProduct is not supported')\n\n blobs = layer.blobs\n width, height = _get_width(blobs[0]), _get_height(blobs[0])\n\n func = linear.Linear(\n width, height, nobias=not bias_term,\n initialW=_Blob(blobs[0]),\n initial_bias=_Blob(blobs[1]) if bias_term else None)\n\n with self.init_scope():\n setattr(self, layer.name, func)\n self.forwards[layer.name] = _CallChildLink(self, layer.name)\n self._add_layer(layer)\n\n @_layer('LRN', 'LRN')\n def _setup_lrn(self, layer):\n param = layer.lrn_param\n if param.norm_region != param.ACROSS_CHANNELS:\n raise RuntimeError('Within-channel LRN is not supported')\n\n fwd = _SingleArgumentFunction(\n functions.local_response_normalization,\n n=param.local_size, k=param.k,\n alpha=param.alpha / param.local_size, beta=param.beta)\n self.forwards[layer.name] = fwd\n self._add_layer(layer)\n\n @_layer('Pooling', 'POOLING')\n def _setup_pooling(self, layer):\n param = layer.pooling_param\n ksize = _get_ksize(param)\n stride = _get_stride(param)\n pad = _get_pad(param)\n\n if param.pool == param.MAX:\n func = functions.max_pooling_2d\n elif param.pool == param.AVE:\n func = functions.average_pooling_2d\n else:\n raise RuntimeError('Stochastic pooling is not supported')\n\n if param.global_pooling and not ksize:\n # if global_pooling is set but no kernel size, the kernel size\n # is computed dynamically to cover the whole input feature map\n def _func(x, stride, pad):\n return func(x, x.shape[2:], stride=stride, pad=pad)\n fw = _SingleArgumentFunction(_func, stride=stride, pad=pad)\n else:\n fw = _SingleArgumentFunction(func, ksize, stride=stride, pad=pad)\n self.forwards[layer.name] = fw\n self._add_layer(layer)\n\n @_layer('ReLU', 'RELU')\n def _setup_relu(self, layer):\n slope = layer.relu_param.negative_slope\n\n if slope != 0:\n fw = _SingleArgumentFunction(functions.leaky_relu, slope=slope)\n else:\n fw = functions.relu\n\n self.forwards[layer.name] = fw\n self._add_layer(layer)\n\n @_layer('Reshape', None)\n def _setup_reshape(self, layer):\n shape = layer.reshape_param.shape.dim\n\n fw = _SingleArgumentFunction(functions.reshape, shape=shape)\n\n self.forwards[layer.name] = fw\n self._add_layer(layer)\n\n @_layer('BatchNorm', None)\n def _setup_batchnorm(self, layer):\n # Get layer parameters.\n blobs = layer.blobs\n param = layer.batch_norm_param\n use_global_stats = param.use_global_stats\n decay = param.moving_average_fraction\n eps = param.eps\n size = int(blobs[0].shape.dim[0]) # Get channel dim from mean blob.\n\n # Make BatchNormalization link.\n func = batch_normalization.BatchNormalization(\n size, decay=decay, eps=eps, use_gamma=False, use_beta=False)\n\n _Blob(blobs[0])(func.avg_mean)\n _Blob(blobs[1])(func.avg_var)\n\n # Scale the means and variances if a scaling factor is appended to the\n # blobs to correctly mimic to the behavior of Caffe. See\n # https://github.com/BVLC/caffe/issues/4885\n if len(blobs) >= 3:\n scaling_factor = blobs[2].data\n func.avg_mean /= scaling_factor[0]\n func.avg_var /= scaling_factor[0]\n\n with self.init_scope():\n setattr(self, layer.name, func)\n\n # Add layer.\n if use_global_stats:\n func_class = _SingleArgumentFunctionTestMode\n else:\n func_class = _SingleArgumentFunction\n fwd = func_class(_CallChildLink(self, layer.name), finetune=False)\n self.forwards[layer.name] = fwd\n self._add_layer(layer)\n\n @_layer('Eltwise', 'ELTWISE')\n def _setup_eltwise(self, layer):\n # stable_prod_grad parameter is not supported now.\n operation = layer.eltwise_param.operation\n coeffs = layer.eltwise_param.coeff or None\n self.forwards[layer.name] = _EltwiseFunction(operation, coeffs)\n self._add_layer(layer)\n\n @_layer('Scale', None)\n def _setup_scale(self, layer):\n # Following parameters are not supported now:\n # - negative axis\n # - num_axes\n # - filler\n # - bias_filler\n\n # Get layer parameters.\n bottom = layer.bottom\n blobs = layer.blobs\n axis = layer.scale_param.axis\n bias_term = layer.scale_param.bias_term\n\n # Case of only one bottom where W is learnt parameter.\n if len(bottom) == 1:\n W_shape = blobs[0].shape.dim\n func = scale.Scale(axis, W_shape, bias_term)\n _Blob(blobs[0])(func.W.data)\n if bias_term:\n _Blob(blobs[1])(func.bias.b.data)\n # Case of two bottoms where W is given as a bottom.\n else:\n shape = blobs[0].shape.dim if bias_term else None\n func = scale.Scale(\n axis, bias_term=bias_term, bias_shape=shape)\n if bias_term:\n _Blob(blobs[0])(func.bias.b.data)\n\n # Add layer.\n with self.init_scope():\n setattr(self, layer.name, func)\n self.forwards[layer.name] = _CallChildLink(self, layer.name)\n self._add_layer(layer)\n\n @_layer('Slice', 'SLICE')\n def _setup_slice(self, layer):\n if layer.slice_param.HasField('axis'):\n axis = layer.slice_param.axis\n elif layer.slice_param.HasField('slice_dim'):\n axis = layer.slice_param.slice_dim\n else:\n axis = 1\n\n if layer.slice_param.slice_point:\n indices_or_sections = list(layer.slice_param.slice_point)\n else:\n indices_or_sections = len(list(layer.top))\n\n self.forwards[layer.name] = _SingleArgumentFunction(\n functions.split_axis,\n indices_or_sections=indices_or_sections,\n axis=axis\n )\n\n self._add_layer(layer)\n\n @_layer('Softmax', 'SOFTMAX')\n def _setup_softmax(self, layer):\n if layer.softmax_param.axis != 1:\n raise RuntimeError(\n 'Softmax along non-channel axis is not supported')\n\n if layer.softmax_param.engine == 0: # DEFAULT\n fw = functions.softmax\n elif layer.softmax_param.engine == 1: # CAFFE\n fw = _SingleArgumentFunctionWithCudnn(False, functions.softmax)\n elif layer.softmax_param.engine == 2: # CUDNN\n fw = _SingleArgumentFunctionWithCudnn(True, functions.softmax)\n\n self.forwards[layer.name] = fw\n self._add_layer(layer)\n\n @_layer('SoftmaxWithLoss', 'SOFTMAX_LOSS')\n def _setup_softmax_with_loss(self, layer):\n if layer.softmax_param.axis != 1:\n raise RuntimeError(\n 'Softmax along non-channel axis is not supported')\n\n self.forwards[layer.name] = functions.softmax_cross_entropy\n self._add_layer(layer)\n\n @_layer('Split', 'SPLIT')\n def _setup_split(self, layer):\n for top in layer.top:\n self.split_map[top] = layer.bottom[0]\n\n\n# Internal functions\n\ndef _get_ksize(param):\n if param.kernel_h > 0:\n return param.kernel_h, param.kernel_w\n elif type(param.kernel_size) == int:\n return param.kernel_size\n elif len(param.kernel_size) == 1:\n return param.kernel_size[0]\n else:\n return param.kernel_size\n\n\ndef _get_stride(param):\n if param.stride_h > 0:\n return param.stride_h, param.stride_w\n elif type(param.stride) == int:\n return param.stride\n elif len(param.stride) == 0:\n return 1\n elif len(param.stride) == 1:\n return param.stride[0]\n else:\n return param.stride\n\n\ndef _get_pad(param):\n if param.pad_h > 0:\n return param.pad_h, param.pad_w\n elif type(param.pad) == int:\n return param.pad\n elif len(param.pad) == 0:\n return 0\n elif len(param.pad) == 1:\n return param.pad[0]\n else:\n return param.pad\n\n\ndef _get_num(blob):\n if blob.num > 0:\n return blob.num\n else:\n return blob.shape.dim[0]\n\n\ndef _get_channels(blob):\n if blob.channels > 0:\n return blob.channels\n else:\n return blob.shape.dim[1]\n\n\ndef _get_height(blob):\n if blob.height > 0:\n return blob.height\n elif len(blob.shape.dim) == 2:\n return blob.shape.dim[0]\n elif len(blob.shape.dim) == 4:\n return blob.shape.dim[2]\n else:\n raise RuntimeError(\n '{}-dimentional array is not supported'.format(\n len(blob.shape.dim)))\n\n\ndef _get_width(blob):\n if blob.width > 0:\n return blob.width\n elif len(blob.shape.dim) == 2:\n return blob.shape.dim[1]\n elif len(blob.shape.dim) == 4:\n return blob.shape.dim[3]\n else:\n raise RuntimeError(\n '{}-dimentional array is not supported'.format(\n len(blob.shape.dim)))\n\n\n# Internal class\n\nclass _SingleArgumentFunction(object):\n\n def __init__(self, func, *args, **kwargs):\n self.func = func\n self.args = args\n self.kwargs = kwargs\n\n def __call__(self, x):\n return self.func(x, *self.args, **self.kwargs)\n\n\nclass _SingleArgumentFunctionTestMode(_SingleArgumentFunction):\n\n def __call__(self, x):\n with configuration.using_config('train', False):\n return super(_SingleArgumentFunctionTestMode, self).__call__(x)\n\n\nclass _ListArgumentFcuntion(object):\n\n def __init__(self, func, **kwargs):\n self.func = func\n self.kwargs = kwargs\n\n def __call__(self, *xs):\n return self.func(xs, **self.kwargs)\n\n\nclass _SingleArgumentFunctionWithCudnn(_SingleArgumentFunction):\n\n def __init__(self, use_cudnn, func, *args, **kwargs):\n super(_SingleArgumentFunctionWithCudnn, self).__init__(\n func, *args, **kwargs)\n self.use_cudnn = use_cudnn\n\n def __call__(self, x):\n with configuration.using_config('use_cudnn', self.use_cudnn):\n return super(_SingleArgumentFunctionWithCudnn, self).__call__(x)\n\n\nclass _CallChildLink(object):\n\n def __init__(self, caffe_func, name):\n self.name = name\n self.caffe_func = caffe_func\n\n def __call__(self, *xs, **kwargs):\n return self.caffe_func[self.name](*xs, **kwargs)\n\n\nclass _EltwiseFunction(object):\n\n def __init__(self, operation, coeffs=None):\n if coeffs is not None:\n assert len(coeffs) > 0\n self.operation = operation\n self.coeffs = coeffs\n\n def __call__(self, *xs):\n operation = self.operation\n\n if operation == 0: # PROD\n return six.moves.reduce(lambda x, y: x * y, xs),\n\n elif operation == 1: # SUM\n coeffs = self.coeffs\n if coeffs is not None:\n assert len(xs) == len(coeffs)\n xs = [x * coeff for x, coeff in zip(xs, coeffs)]\n return six.moves.reduce(lambda x, y: x + y, xs),\n\n elif operation == 2: # MAX\n return six.moves.reduce(lambda x, y: functions.maximum(x, y), xs),\n\n else:\n raise ValueError('Invalid EltwiseParameter.EltwiseOp value.')\n", "path": "chainer/links/caffe/caffe_function.py" } ]
[ { "content": "import warnings\n\nimport numpy\nimport six\n\nfrom chainer import configuration\nfrom chainer import functions\nfrom chainer import initializer\nfrom chainer import link\nfrom chainer.links.caffe.protobuf3 import caffe_pb2 as caffe_pb\nfrom chainer.links.connection import convolution_2d\nfrom chainer.links.connection import deconvolution_2d\nfrom chainer.links.connection import linear\nfrom chainer.links.connection import scale\nfrom chainer.links.normalization import batch_normalization\nfrom chainer.utils import argument\nfrom chainer.utils import collections_abc\n\n\ntry:\n # This method is undocumented, but is required to read large size of\n # model files when a user uses cpp-implementation.\n from google.protobuf.pyext import _message\n _message.SetAllowOversizeProtos(True)\nexcept ImportError:\n pass\n\n_type_to_method = {}\n_oldname_to_method = {}\n\n\ndef _layer(typ, oldname):\n def decorator(meth):\n global _type_to_method\n _type_to_method[typ] = meth\n if oldname is not None:\n typevalue = getattr(caffe_pb.V1LayerParameter, oldname)\n _oldname_to_method[typevalue] = meth\n return meth\n return decorator\n\n\nclass _Blob(initializer.Initializer):\n\n chunk_size = 1024 * 1024\n\n def __init__(self, blob):\n super(_Blob, self).__init__()\n self.data = blob.data\n\n def __call__(self, array):\n array = array.ravel()\n size = len(array)\n indices = list(range(0, size, self.chunk_size))\n\n # Rather than accessing Protobuf's RepeatedScalar fields directly,\n # creating a intermediate list by indexing is more efficifent due to\n # the implementation of the Python extension of Protobuf.\n # To avoid allocating excessively large lists, we limit the length\n # of lists by `chunk_size`.\n for start, end in zip(indices, indices[1:] + [size]):\n array[start:end] = self.data[start:end]\n\n\nclass _ConvolutionBlob(_Blob):\n\n def __init__(self, blob, group):\n super(_ConvolutionBlob, self).__init__(blob)\n self.group = group\n\n def __call__(self, array):\n n_out, n_in = array.shape[:2]\n\n part_out = n_out // self.group\n part_in = n_in // self.group\n\n array[...] = 0\n\n part_size = len(self.data) // self.group\n for i in six.moves.range(self.group):\n out_slice = slice(i * part_out, (i + 1) * part_out)\n in_slice = slice(i * part_in, (i + 1) * part_in)\n w = array[out_slice, in_slice]\n\n data = numpy.array(self.data[i * part_size:(i + 1) * part_size])\n w[:] = data.reshape(w.shape)\n\n\nclass CaffeFunction(link.Chain):\n\n \"\"\"Caffe emulator based on the model file of Caffe.\n\n Given a protocol buffers file of a Caffe model, this class loads and\n emulates it on :class:`~chainer.Variable` objects. It supports the official\n reference models provided by BVLC.\n\n .. note::\n\n CaffeFunction ignores the following layers:\n\n - Layers that CaffeFunction does not support (including data layers)\n - Layers that have no top blobs\n - Layers whose bottom blobs are incomplete (i.e., some or all of them\n are not given nor computed)\n\n .. warning::\n\n It does not support full compatibility against Caffe. Some layers and\n configurations are not implemented in Chainer yet, though the reference\n models provided by the BVLC team are supported except data layers.\n\n .. admonition:: Example\n\n Consider we want to extract the (unnormalized) log class probability\n of given images using BVLC reference CaffeNet. The model can be\n downloaded from:\n\n http://dl.caffe.berkeleyvision.org/bvlc_reference_caffenet.caffemodel\n\n We want to compute the ``fc8`` blob from the ``data`` blob. It is simply\n written as follows::\n\n # Load the model\n func = CaffeFunction('path/to/bvlc_reference_caffenet.caffemodel')\n\n # Minibatch of size 10\n x_data = numpy.ndarray((10, 3, 227, 227), dtype=numpy.float32)\n ... # (Fill the minibatch here)\n\n # Forward the pre-trained net\n x = Variable(x_data)\n y, = func(inputs={'data': x}, outputs=['fc8'])\n\n The result ``y`` contains the Variable corresponding to the ``fc8``\n blob. The computational graph is memorized as a usual forward\n computation in Chainer, so we can run backprop through this pre-trained\n net.\n\n Args:\n model_path (str): Path to the binary-proto model file of Caffe.\n\n Attributes:\n forwards (dict): A mapping from layer names to corresponding functions.\n\n \"\"\"\n\n def __init__(self, model_path):\n super(CaffeFunction, self).__init__()\n\n net = caffe_pb.NetParameter()\n with open(model_path, 'rb') as model_file:\n net.MergeFromString(model_file.read())\n\n self.forwards = {}\n self.split_map = {}\n self.layers = []\n\n if net.layer:\n for layer in net.layer:\n meth = _type_to_method.get(layer.type)\n if meth:\n meth(self, layer)\n else:\n warnings.warn(\n 'Skip the layer \"%s\", since CaffeFunction does not'\n 'support %s layer' % (layer.name, layer.type))\n else: # v1 format\n for layer in net.layers:\n meth = _oldname_to_method.get(layer.type)\n if meth:\n meth(self, layer)\n else:\n warnings.warn(\n 'Skip the layer \"%s\", since CaffeFunction does not'\n 'support it' % layer.name)\n\n def forward(self, inputs, outputs, disable=(), **kwargs):\n \"\"\"forward(self, inputs, outputs, disable=())\n\n Executes a sub-network of the network.\n\n This function acts as an interpreter of the network definition for\n Caffe. On execution, it interprets each layer one by one, and if the\n bottom blobs are already computed, then emulates the layer and stores\n output blobs as :class:`~chainer.Variable` objects.\n\n .. warning::\n\n ``train`` argument is not supported anymore since v2.\n Instead, use ``chainer.using_config('train', train)``.\n See :func:`chainer.using_config`.\n\n Args:\n inputs (dict): A dictionary whose key-value pairs indicate initial\n correspondences between blob names and\n :class:`~chainer.Variable` objects.\n outputs (Iterable): A list of blob names whose corresponding\n :class:`~chainer.Variable` objects are returned.\n disable (Iterable): A list of layer names that will be ignored\n during the forward computation.\n\n Returns:\n tuple: A tuple of output :class:`~chainer.Variable` objects\n corresponding to elements of the `outputs` argument.\n\n \"\"\"\n if kwargs:\n argument.check_unexpected_kwargs(\n kwargs, train='train argument is not supported anymore. '\n 'Use chainer.using_config')\n argument.assert_kwargs_empty(kwargs)\n\n variables = dict(inputs)\n disable = set(disable)\n for func_name, bottom, top in self.layers:\n if (func_name in disable or\n func_name not in self.forwards or\n any(blob not in variables for blob in bottom)):\n continue\n\n func = self.forwards[func_name]\n input_vars = tuple(variables[blob] for blob in bottom)\n output_vars = func(*input_vars)\n if not isinstance(output_vars, collections_abc.Iterable):\n output_vars = output_vars,\n for var, name in zip(output_vars, top):\n variables[name] = var\n\n self.variables = variables\n return tuple(variables[blob] for blob in outputs)\n\n def _add_layer(self, layer):\n bottom = []\n for blob_name in layer.bottom:\n bottom.append(self.split_map.get(blob_name, blob_name))\n self.layers.append((layer.name, bottom, list(layer.top)))\n\n @_layer('Concat', 'CONCAT')\n def _setup_concat(self, layer):\n param = layer.concat_param\n axis = param.axis\n if axis == 1 and param.concat_dim != 1:\n axis = param.concat_dim\n\n self.forwards[layer.name] = _ListArgumentFcuntion(\n functions.concat, axis=axis)\n self._add_layer(layer)\n\n @_layer('Convolution', 'CONVOLUTION')\n def _setup_convolution(self, layer):\n blobs = layer.blobs\n param = layer.convolution_param\n ksize = _get_ksize(param)\n stride = _get_stride(param)\n pad = _get_pad(param)\n num = _get_num(blobs[0])\n channels = _get_channels(blobs[0])\n bias_term = param.bias_term\n\n n_in = channels * param.group\n n_out = num\n\n func = convolution_2d.Convolution2D(\n n_in, n_out, ksize, stride, pad, nobias=not bias_term,\n initialW=_ConvolutionBlob(blobs[0], param.group),\n initial_bias=_Blob(blobs[1]) if bias_term else None)\n\n with self.init_scope():\n setattr(self, layer.name, func)\n self.forwards[layer.name] = _CallChildLink(self, layer.name)\n self._add_layer(layer)\n\n @_layer('Deconvolution', 'DECONVOLUTION')\n def _setup_deconvolution(self, layer):\n blobs = layer.blobs\n param = layer.convolution_param\n ksize = _get_ksize(param)\n stride = _get_stride(param)\n pad = _get_pad(param)\n num = _get_num(blobs[0])\n channels = _get_channels(blobs[0])\n bias_term = param.bias_term\n\n n_in = num\n n_out = channels * param.group\n\n func = deconvolution_2d.Deconvolution2D(\n n_in, n_out, ksize, stride, pad, nobias=not bias_term,\n initialW=_ConvolutionBlob(blobs[0], param.group),\n initial_bias=_Blob(blobs[1]) if bias_term else None)\n\n with self.init_scope():\n setattr(self, layer.name, func)\n self.forwards[layer.name] = _CallChildLink(self, layer.name)\n self._add_layer(layer)\n\n @_layer('Data', 'DATA')\n def _setup_data(self, layer):\n # We silently skip the data layer.\n pass\n\n @_layer('Dropout', 'DROPOUT')\n def _setup_dropout(self, layer):\n param = layer.dropout_param\n\n self.forwards[layer.name] = _SingleArgumentFunction(\n functions.dropout, ratio=param.dropout_ratio)\n self._add_layer(layer)\n\n @_layer('InnerProduct', 'INNER_PRODUCT')\n def _setup_inner_product(self, layer):\n param = layer.inner_product_param\n bias_term = param.bias_term\n if param.axis != 1:\n raise RuntimeError(\n 'Non-default axis in InnerProduct is not supported')\n\n blobs = layer.blobs\n width, height = _get_width(blobs[0]), _get_height(blobs[0])\n\n func = linear.Linear(\n width, height, nobias=not bias_term,\n initialW=_Blob(blobs[0]),\n initial_bias=_Blob(blobs[1]) if bias_term else None)\n\n with self.init_scope():\n setattr(self, layer.name, func)\n self.forwards[layer.name] = _CallChildLink(self, layer.name)\n self._add_layer(layer)\n\n @_layer('LRN', 'LRN')\n def _setup_lrn(self, layer):\n param = layer.lrn_param\n if param.norm_region != param.ACROSS_CHANNELS:\n raise RuntimeError('Within-channel LRN is not supported')\n\n fwd = _SingleArgumentFunction(\n functions.local_response_normalization,\n n=param.local_size, k=param.k,\n alpha=param.alpha / param.local_size, beta=param.beta)\n self.forwards[layer.name] = fwd\n self._add_layer(layer)\n\n @_layer('Pooling', 'POOLING')\n def _setup_pooling(self, layer):\n param = layer.pooling_param\n ksize = _get_ksize(param)\n stride = _get_stride(param)\n pad = _get_pad(param)\n\n if param.pool == param.MAX:\n func = functions.max_pooling_2d\n elif param.pool == param.AVE:\n func = functions.average_pooling_2d\n else:\n raise RuntimeError('Stochastic pooling is not supported')\n\n if param.global_pooling and not ksize:\n # if global_pooling is set but no kernel size, the kernel size\n # is computed dynamically to cover the whole input feature map\n def _func(x, stride, pad):\n return func(x, x.shape[2:], stride=stride, pad=pad)\n fw = _SingleArgumentFunction(_func, stride=stride, pad=pad)\n else:\n fw = _SingleArgumentFunction(func, ksize, stride=stride, pad=pad)\n self.forwards[layer.name] = fw\n self._add_layer(layer)\n\n @_layer('ReLU', 'RELU')\n def _setup_relu(self, layer):\n slope = layer.relu_param.negative_slope\n\n if slope != 0:\n fw = _SingleArgumentFunction(functions.leaky_relu, slope=slope)\n else:\n fw = functions.relu\n\n self.forwards[layer.name] = fw\n self._add_layer(layer)\n\n @_layer('Reshape', None)\n def _setup_reshape(self, layer):\n shape = layer.reshape_param.shape.dim\n\n fw = _SingleArgumentFunction(functions.reshape, shape=shape)\n\n self.forwards[layer.name] = fw\n self._add_layer(layer)\n\n @_layer('BatchNorm', None)\n def _setup_batchnorm(self, layer):\n # Get layer parameters.\n blobs = layer.blobs\n param = layer.batch_norm_param\n use_global_stats = param.use_global_stats\n decay = param.moving_average_fraction\n eps = param.eps\n size = int(blobs[0].shape.dim[0]) # Get channel dim from mean blob.\n\n # Make BatchNormalization link.\n func = batch_normalization.BatchNormalization(\n size, decay=decay, eps=eps, use_gamma=False, use_beta=False)\n\n _Blob(blobs[0])(func.avg_mean)\n _Blob(blobs[1])(func.avg_var)\n\n # Scale the means and variances if a scaling factor is appended to the\n # blobs to correctly mimic to the behavior of Caffe. See\n # https://github.com/BVLC/caffe/issues/4885\n if len(blobs) >= 3:\n scaling_factor = blobs[2].data\n func.avg_mean /= scaling_factor[0]\n func.avg_var /= scaling_factor[0]\n\n with self.init_scope():\n setattr(self, layer.name, func)\n\n # Add layer.\n if use_global_stats:\n func_class = _SingleArgumentFunctionTestMode\n else:\n func_class = _SingleArgumentFunction\n fwd = func_class(_CallChildLink(self, layer.name), finetune=False)\n self.forwards[layer.name] = fwd\n self._add_layer(layer)\n\n @_layer('Eltwise', 'ELTWISE')\n def _setup_eltwise(self, layer):\n # stable_prod_grad parameter is not supported now.\n operation = layer.eltwise_param.operation\n coeffs = layer.eltwise_param.coeff or None\n self.forwards[layer.name] = _EltwiseFunction(operation, coeffs)\n self._add_layer(layer)\n\n @_layer('Scale', None)\n def _setup_scale(self, layer):\n # Following parameters are not supported now:\n # - negative axis\n # - num_axes\n # - filler\n # - bias_filler\n\n # Get layer parameters.\n bottom = layer.bottom\n blobs = layer.blobs\n axis = layer.scale_param.axis\n bias_term = layer.scale_param.bias_term\n\n # Case of only one bottom where W is learnt parameter.\n if len(bottom) == 1:\n W_shape = blobs[0].shape.dim\n func = scale.Scale(axis, W_shape, bias_term)\n _Blob(blobs[0])(func.W.data)\n if bias_term:\n _Blob(blobs[1])(func.bias.b.data)\n # Case of two bottoms where W is given as a bottom.\n else:\n shape = blobs[0].shape.dim if bias_term else None\n func = scale.Scale(\n axis, bias_term=bias_term, bias_shape=shape)\n if bias_term:\n _Blob(blobs[0])(func.bias.b.data)\n\n # Add layer.\n with self.init_scope():\n setattr(self, layer.name, func)\n self.forwards[layer.name] = _CallChildLink(self, layer.name)\n self._add_layer(layer)\n\n @_layer('Slice', 'SLICE')\n def _setup_slice(self, layer):\n if layer.slice_param.HasField('axis'):\n axis = layer.slice_param.axis\n elif layer.slice_param.HasField('slice_dim'):\n axis = layer.slice_param.slice_dim\n else:\n axis = 1\n\n if layer.slice_param.slice_point:\n indices_or_sections = list(layer.slice_param.slice_point)\n else:\n indices_or_sections = len(list(layer.top))\n\n self.forwards[layer.name] = _SingleArgumentFunction(\n functions.split_axis,\n indices_or_sections=indices_or_sections,\n axis=axis\n )\n\n self._add_layer(layer)\n\n @_layer('Softmax', 'SOFTMAX')\n def _setup_softmax(self, layer):\n if layer.softmax_param.axis != 1:\n raise RuntimeError(\n 'Softmax along non-channel axis is not supported')\n\n if layer.softmax_param.engine == 0: # DEFAULT\n fw = functions.softmax\n elif layer.softmax_param.engine == 1: # CAFFE\n fw = _SingleArgumentFunctionWithCudnn(False, functions.softmax)\n elif layer.softmax_param.engine == 2: # CUDNN\n fw = _SingleArgumentFunctionWithCudnn(True, functions.softmax)\n\n self.forwards[layer.name] = fw\n self._add_layer(layer)\n\n @_layer('SoftmaxWithLoss', 'SOFTMAX_LOSS')\n def _setup_softmax_with_loss(self, layer):\n if layer.softmax_param.axis != 1:\n raise RuntimeError(\n 'Softmax along non-channel axis is not supported')\n\n self.forwards[layer.name] = functions.softmax_cross_entropy\n self._add_layer(layer)\n\n @_layer('Split', 'SPLIT')\n def _setup_split(self, layer):\n for top in layer.top:\n self.split_map[top] = layer.bottom[0]\n\n\n# Internal functions\n\ndef _get_ksize(param):\n if param.kernel_h > 0:\n return param.kernel_h, param.kernel_w\n elif type(param.kernel_size) == int:\n return param.kernel_size\n elif len(param.kernel_size) == 1:\n return param.kernel_size[0]\n else:\n return param.kernel_size\n\n\ndef _get_stride(param):\n if param.stride_h > 0:\n return param.stride_h, param.stride_w\n elif type(param.stride) == int:\n return param.stride\n elif len(param.stride) == 0:\n return 1\n elif len(param.stride) == 1:\n return param.stride[0]\n else:\n return param.stride\n\n\ndef _get_pad(param):\n if param.pad_h > 0 or param.pad_w > 0:\n return param.pad_h, param.pad_w\n elif type(param.pad) == int:\n return param.pad\n elif len(param.pad) == 0:\n return 0\n elif len(param.pad) == 1:\n return param.pad[0]\n else:\n return param.pad\n\n\ndef _get_num(blob):\n if blob.num > 0:\n return blob.num\n else:\n return blob.shape.dim[0]\n\n\ndef _get_channels(blob):\n if blob.channels > 0:\n return blob.channels\n else:\n return blob.shape.dim[1]\n\n\ndef _get_height(blob):\n if blob.height > 0:\n return blob.height\n elif len(blob.shape.dim) == 2:\n return blob.shape.dim[0]\n elif len(blob.shape.dim) == 4:\n return blob.shape.dim[2]\n else:\n raise RuntimeError(\n '{}-dimentional array is not supported'.format(\n len(blob.shape.dim)))\n\n\ndef _get_width(blob):\n if blob.width > 0:\n return blob.width\n elif len(blob.shape.dim) == 2:\n return blob.shape.dim[1]\n elif len(blob.shape.dim) == 4:\n return blob.shape.dim[3]\n else:\n raise RuntimeError(\n '{}-dimentional array is not supported'.format(\n len(blob.shape.dim)))\n\n\n# Internal class\n\nclass _SingleArgumentFunction(object):\n\n def __init__(self, func, *args, **kwargs):\n self.func = func\n self.args = args\n self.kwargs = kwargs\n\n def __call__(self, x):\n return self.func(x, *self.args, **self.kwargs)\n\n\nclass _SingleArgumentFunctionTestMode(_SingleArgumentFunction):\n\n def __call__(self, x):\n with configuration.using_config('train', False):\n return super(_SingleArgumentFunctionTestMode, self).__call__(x)\n\n\nclass _ListArgumentFcuntion(object):\n\n def __init__(self, func, **kwargs):\n self.func = func\n self.kwargs = kwargs\n\n def __call__(self, *xs):\n return self.func(xs, **self.kwargs)\n\n\nclass _SingleArgumentFunctionWithCudnn(_SingleArgumentFunction):\n\n def __init__(self, use_cudnn, func, *args, **kwargs):\n super(_SingleArgumentFunctionWithCudnn, self).__init__(\n func, *args, **kwargs)\n self.use_cudnn = use_cudnn\n\n def __call__(self, x):\n with configuration.using_config('use_cudnn', self.use_cudnn):\n return super(_SingleArgumentFunctionWithCudnn, self).__call__(x)\n\n\nclass _CallChildLink(object):\n\n def __init__(self, caffe_func, name):\n self.name = name\n self.caffe_func = caffe_func\n\n def __call__(self, *xs, **kwargs):\n return self.caffe_func[self.name](*xs, **kwargs)\n\n\nclass _EltwiseFunction(object):\n\n def __init__(self, operation, coeffs=None):\n if coeffs is not None:\n assert len(coeffs) > 0\n self.operation = operation\n self.coeffs = coeffs\n\n def __call__(self, *xs):\n operation = self.operation\n\n if operation == 0: # PROD\n return six.moves.reduce(lambda x, y: x * y, xs),\n\n elif operation == 1: # SUM\n coeffs = self.coeffs\n if coeffs is not None:\n assert len(xs) == len(coeffs)\n xs = [x * coeff for x, coeff in zip(xs, coeffs)]\n return six.moves.reduce(lambda x, y: x + y, xs),\n\n elif operation == 2: # MAX\n return six.moves.reduce(lambda x, y: functions.maximum(x, y), xs),\n\n else:\n raise ValueError('Invalid EltwiseParameter.EltwiseOp value.')\n", "path": "chainer/links/caffe/caffe_function.py" } ]
diff --git a/chainer/links/caffe/caffe_function.py b/chainer/links/caffe/caffe_function.py index 2004e9d27c14..64385a20823c 100644 --- a/chainer/links/caffe/caffe_function.py +++ b/chainer/links/caffe/caffe_function.py @@ -547,7 +547,7 @@ def _get_stride(param): def _get_pad(param): - if param.pad_h > 0: + if param.pad_h > 0 or param.pad_w > 0: return param.pad_h, param.pad_w elif type(param.pad) == int: return param.pad
kivy__kivy-5627
[ { "content": "#\n# Kivy - Cross-platform UI framework\n# https://kivy.org/\n#\nfrom __future__ import print_function\n\nimport sys\nbuild_examples = False\nif \"--build_examples\" in sys.argv:\n build_examples = True\n sys.argv.remove(\"--build_examples\")\n\nfrom copy import deepcopy\nimport os\nfrom os.path import join, dirname, sep, exists, basename, isdir\nfrom os import walk, environ\nfrom distutils.version import LooseVersion\nfrom distutils.sysconfig import get_python_inc\nfrom collections import OrderedDict\nfrom time import sleep\nfrom subprocess import check_output, CalledProcessError\nfrom datetime import datetime\n\nif environ.get('KIVY_USE_SETUPTOOLS'):\n from setuptools import setup, Extension\n print('Using setuptools')\nelse:\n from distutils.core import setup\n from distutils.extension import Extension\n print('Using distutils')\n\n\nPY3 = sys.version > '3'\n\nif PY3: # fix error with py3's LooseVersion comparisons\n def ver_equal(self, other):\n return self.version == other\n\n LooseVersion.__eq__ = ver_equal\n\n\ndef get_version(filename='kivy/version.py'):\n VERSION = kivy.__version__\n DATE = datetime.utcnow().strftime('%Y%m%d')\n try:\n GIT_REVISION = check_output(\n ['git', 'rev-parse', 'HEAD']\n ).strip().decode('ascii')\n except (CalledProcessError, OSError, IOError) as e:\n # CalledProcessError has no errno\n errno = getattr(e, 'errno', None)\n if errno != 2 and 'CalledProcessError' not in repr(e):\n raise\n GIT_REVISION = \"Unknown\"\n\n cnt = (\n \"# THIS FILE IS GENERATED FROM KIVY SETUP.PY\\n\"\n \"__version__ = '%(version)s'\\n\"\n \"__hash__ = '%(hash)s'\\n\"\n \"__date__ = '%(date)s'\\n\"\n )\n\n with open(filename, 'w') as f:\n f.write(cnt % {\n 'version': VERSION,\n 'hash': GIT_REVISION,\n 'date': DATE\n })\n return VERSION\n\n\nMIN_CYTHON_STRING = '0.23'\nMIN_CYTHON_VERSION = LooseVersion(MIN_CYTHON_STRING)\nMAX_CYTHON_STRING = '0.27.3'\nMAX_CYTHON_VERSION = LooseVersion(MAX_CYTHON_STRING)\nCYTHON_UNSUPPORTED = (\n # ref https://github.com/cython/cython/issues/1968\n '0.27', '0.27.2'\n)\n\n\ndef getoutput(cmd, env=None):\n import subprocess\n p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE,\n stderr=subprocess.PIPE, env=env)\n p.wait()\n if p.returncode: # if not returncode == 0\n print('WARNING: A problem occurred while running {0} (code {1})\\n'\n .format(cmd, p.returncode))\n stderr_content = p.stderr.read()\n if stderr_content:\n print('{0}\\n'.format(stderr_content))\n return \"\"\n return p.stdout.read()\n\n\ndef pkgconfig(*packages, **kw):\n flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'}\n lenviron = None\n pconfig = join(sys.prefix, 'libs', 'pkgconfig')\n\n if isdir(pconfig):\n lenviron = environ.copy()\n lenviron['PKG_CONFIG_PATH'] = '{};{}'.format(\n environ.get('PKG_CONFIG_PATH', ''), pconfig)\n cmd = 'pkg-config --libs --cflags {}'.format(' '.join(packages))\n results = getoutput(cmd, lenviron).split()\n for token in results:\n ext = token[:2].decode('utf-8')\n flag = flag_map.get(ext)\n if not flag:\n continue\n kw.setdefault(flag, []).append(token[2:].decode('utf-8'))\n return kw\n\n\n# -----------------------------------------------------------------------------\n# Determine on which platform we are\n\nplatform = sys.platform\n\n# Detect 32/64bit for OSX (http://stackoverflow.com/a/1405971/798575)\nif sys.platform == 'darwin':\n if sys.maxsize > 2 ** 32:\n osx_arch = 'x86_64'\n else:\n osx_arch = 'i386'\n\n# Detect Python for android project (http://github.com/kivy/python-for-android)\nndkplatform = environ.get('NDKPLATFORM')\nif ndkplatform is not None and environ.get('LIBLINK'):\n platform = 'android'\nkivy_ios_root = environ.get('KIVYIOSROOT', None)\nif kivy_ios_root is not None:\n platform = 'ios'\nif exists('/opt/vc/include/bcm_host.h'):\n platform = 'rpi'\nif exists('/usr/lib/arm-linux-gnueabihf/libMali.so'):\n platform = 'mali'\n\n# -----------------------------------------------------------------------------\n# Detect options\n#\nc_options = OrderedDict()\nc_options['use_rpi'] = platform == 'rpi'\nc_options['use_mali'] = platform == 'mali'\nc_options['use_egl'] = False\nc_options['use_opengl_es2'] = None\nc_options['use_opengl_mock'] = environ.get('READTHEDOCS', None) == 'True'\nc_options['use_sdl2'] = None\nc_options['use_ios'] = False\nc_options['use_mesagl'] = False\nc_options['use_x11'] = False\nc_options['use_wayland'] = False\nc_options['use_gstreamer'] = None\nc_options['use_avfoundation'] = platform == 'darwin'\nc_options['use_osx_frameworks'] = platform == 'darwin'\nc_options['debug_gl'] = False\n\n# now check if environ is changing the default values\nfor key in list(c_options.keys()):\n ukey = key.upper()\n if ukey in environ:\n value = bool(int(environ[ukey]))\n print('Environ change {0} -> {1}'.format(key, value))\n c_options[key] = value\n\n\n# -----------------------------------------------------------------------------\n# Cython check\n# on python-for-android and kivy-ios, cython usage is external\n\ncython_unsupported_append = '''\n\n Please note that the following versions of Cython are not supported\n at all: {}\n'''.format(', '.join(map(str, CYTHON_UNSUPPORTED)))\n\ncython_min = '''\\\n This version of Cython is not compatible with Kivy. Please upgrade to\n at least version {0}, preferably the newest supported version {1}.\n\n If your platform provides a Cython package, make sure you have upgraded\n to the newest version. If the newest version available is still too low,\n please remove it and install the newest supported Cython via pip:\n\n pip install -I Cython=={1}{2}\\\n'''.format(MIN_CYTHON_STRING, MAX_CYTHON_STRING,\n cython_unsupported_append if CYTHON_UNSUPPORTED else '')\n\ncython_max = '''\\\n This version of Cython is untested with Kivy. While this version may\n work perfectly fine, it is possible that you may experience issues. If\n you do have issues, please downgrade to a supported version. It is\n best to use the newest supported version, {1}, but the minimum\n supported version is {0}.\n\n If your platform provides a Cython package, check if you can downgrade\n to a supported version. Otherwise, uninstall the platform package and\n install Cython via pip:\n\n pip install -I Cython=={1}{2}\\\n'''.format(MIN_CYTHON_STRING, MAX_CYTHON_STRING,\n cython_unsupported_append if CYTHON_UNSUPPORTED else '')\n\ncython_unsupported = '''\\\n This version of Cython suffers from known bugs and is unsupported.\n Please install the newest supported version, {1}, if possible, but\n the minimum supported version is {0}.\n\n If your platform provides a Cython package, check if you can install\n a supported version. Otherwise, uninstall the platform package and\n install Cython via pip:\n\n pip install -I Cython=={1}{2}\\\n'''.format(MIN_CYTHON_STRING, MAX_CYTHON_STRING,\n cython_unsupported_append)\n\nhave_cython = False\nskip_cython = False\nif platform in ('ios', 'android'):\n print('\\nCython check avoided.')\n skip_cython = True\nelse:\n try:\n # check for cython\n from Cython.Distutils import build_ext\n have_cython = True\n import Cython\n cy_version_str = Cython.__version__\n cy_ver = LooseVersion(cy_version_str)\n print('\\nDetected Cython version {}'.format(cy_version_str))\n if cy_ver < MIN_CYTHON_VERSION:\n print(cython_min)\n raise ImportError('Incompatible Cython Version')\n if cy_ver in CYTHON_UNSUPPORTED:\n print(cython_unsupported)\n raise ImportError('Incompatible Cython Version')\n if cy_ver > MAX_CYTHON_VERSION:\n print(cython_max)\n sleep(1)\n except ImportError:\n print(\"\\nCython is missing, it's required for compiling kivy !\\n\\n\")\n raise\n\nif not have_cython:\n from distutils.command.build_ext import build_ext\n\n# -----------------------------------------------------------------------------\n# Setup classes\n\n# the build path where kivy is being compiled\nsrc_path = build_path = dirname(__file__)\n\n\nclass KivyBuildExt(build_ext):\n\n def finalize_options(self):\n retval = build_ext.finalize_options(self)\n global build_path\n if (self.build_lib is not None and exists(self.build_lib) and\n not self.inplace):\n build_path = self.build_lib\n return retval\n\n def build_extensions(self):\n # build files\n config_h_fn = ('include', 'config.h')\n config_pxi_fn = ('include', 'config.pxi')\n config_py_fn = ('setupconfig.py', )\n\n # generate headers\n config_h = '// Autogenerated file for Kivy C configuration\\n'\n config_h += '#define __PY3 {0}\\n'.format(int(PY3))\n config_pxi = '# Autogenerated file for Kivy Cython configuration\\n'\n config_pxi += 'DEF PY3 = {0}\\n'.format(int(PY3))\n config_py = '# Autogenerated file for Kivy configuration\\n'\n config_py += 'PY3 = {0}\\n'.format(int(PY3))\n config_py += 'CYTHON_MIN = {0}\\nCYTHON_MAX = {1}\\n'.format(\n repr(MIN_CYTHON_STRING), repr(MAX_CYTHON_STRING))\n config_py += 'CYTHON_BAD = {0}\\n'.format(repr(', '.join(map(\n str, CYTHON_UNSUPPORTED))))\n\n # generate content\n print('Build configuration is:')\n for opt, value in c_options.items():\n value = int(bool(value))\n print(' * {0} = {1}'.format(opt, value))\n opt = opt.upper()\n config_h += '#define __{0} {1}\\n'.format(opt, value)\n config_pxi += 'DEF {0} = {1}\\n'.format(opt, value)\n config_py += '{0} = {1}\\n'.format(opt, value)\n debug = bool(self.debug)\n print(' * debug = {0}'.format(debug))\n\n config_pxi += 'DEF DEBUG = {0}\\n'.format(debug)\n config_py += 'DEBUG = {0}\\n'.format(debug)\n config_pxi += 'DEF PLATFORM = \"{0}\"\\n'.format(platform)\n config_py += 'PLATFORM = \"{0}\"\\n'.format(platform)\n for fn, content in (\n (config_h_fn, config_h), (config_pxi_fn, config_pxi),\n (config_py_fn, config_py)):\n build_fn = expand(build_path, *fn)\n if self.update_if_changed(build_fn, content):\n print('Updated {}'.format(build_fn))\n src_fn = expand(src_path, *fn)\n if src_fn != build_fn and self.update_if_changed(src_fn, content):\n print('Updated {}'.format(src_fn))\n\n c = self.compiler.compiler_type\n print('Detected compiler is {}'.format(c))\n if c != 'msvc':\n for e in self.extensions:\n e.extra_link_args += ['-lm']\n\n build_ext.build_extensions(self)\n\n def update_if_changed(self, fn, content):\n need_update = True\n if exists(fn):\n with open(fn) as fd:\n need_update = fd.read() != content\n if need_update:\n with open(fn, 'w') as fd:\n fd.write(content)\n return need_update\n\n\ndef _check_and_fix_sdl2_mixer(f_path):\n print(\"Check if SDL2_mixer smpeg2 have an @executable_path\")\n rpath_from = (\"@executable_path/../Frameworks/SDL2.framework\"\n \"/Versions/A/SDL2\")\n rpath_to = \"@rpath/../../../../SDL2.framework/Versions/A/SDL2\"\n smpeg2_path = (\"{}/Versions/A/Frameworks/smpeg2.framework\"\n \"/Versions/A/smpeg2\").format(f_path)\n output = getoutput((\"otool -L '{}'\").format(smpeg2_path)).decode('utf-8')\n if \"@executable_path\" not in output:\n return\n\n print(\"WARNING: Your SDL2_mixer version is invalid\")\n print(\"WARNING: The smpeg2 framework embedded in SDL2_mixer contains a\")\n print(\"WARNING: reference to @executable_path that will fail the\")\n print(\"WARNING: execution of your application.\")\n print(\"WARNING: We are going to change:\")\n print(\"WARNING: from: {}\".format(rpath_from))\n print(\"WARNING: to: {}\".format(rpath_to))\n getoutput(\"install_name_tool -change {} {} {}\".format(\n rpath_from, rpath_to, smpeg2_path))\n\n output = getoutput((\"otool -L '{}'\").format(smpeg2_path))\n if b\"@executable_path\" not in output:\n print(\"WARNING: Change successfully applied!\")\n print(\"WARNING: You'll never see this message again.\")\n else:\n print(\"WARNING: Unable to apply the changes, sorry.\")\n\n\n# -----------------------------------------------------------------------------\n# extract version (simulate doc generation, kivy will be not imported)\nenviron['KIVY_DOC_INCLUDE'] = '1'\nimport kivy\n\n# extra build commands go in the cmdclass dict {'command-name': CommandClass}\n# see tools.packaging.{platform}.build.py for custom build commands for\n# portable packages. Also e.g. we use build_ext command from cython if its\n# installed for c extensions.\nfrom kivy.tools.packaging.factory import FactoryBuild\ncmdclass = {\n 'build_factory': FactoryBuild,\n 'build_ext': KivyBuildExt}\n\ntry:\n # add build rules for portable packages to cmdclass\n if platform == 'win32':\n from kivy.tools.packaging.win32.build import WindowsPortableBuild\n cmdclass['build_portable'] = WindowsPortableBuild\n elif platform == 'darwin':\n from kivy.tools.packaging.osx.build import OSXPortableBuild\n cmdclass['build_portable'] = OSXPortableBuild\nexcept ImportError:\n print('User distribution detected, avoid portable command.')\n\n# Detect which opengl version headers to use\nif platform in ('android', 'darwin', 'ios', 'rpi', 'mali'):\n c_options['use_opengl_es2'] = True\nelif c_options['use_opengl_es2'] is None:\n c_options['use_opengl_es2'] = \\\n environ.get('KIVY_GRAPHICS', '').lower() == 'gles'\n\nprint('Using this graphics system: {}'.format(\n ['OpenGL', 'OpenGL ES 2'][int(c_options['use_opengl_es2'] or False)]))\n\n# check if we are in a kivy-ios build\nif platform == 'ios':\n print('Kivy-IOS project environment detect, use it.')\n print('Kivy-IOS project located at {0}'.format(kivy_ios_root))\n c_options['use_ios'] = True\n c_options['use_sdl2'] = True\n\nelif platform == 'darwin':\n if c_options['use_osx_frameworks']:\n if osx_arch == \"i386\":\n print(\"Warning: building with frameworks fail on i386\")\n else:\n print(\"OSX framework used, force to x86_64 only\")\n environ[\"ARCHFLAGS\"] = environ.get(\"ARCHFLAGS\", \"-arch x86_64\")\n print(\"OSX ARCHFLAGS are: {}\".format(environ[\"ARCHFLAGS\"]))\n\n# detect gstreamer, only on desktop\n# works if we forced the options or in autodetection\nif platform not in ('ios', 'android') and (c_options['use_gstreamer']\n in (None, True)):\n gstreamer_valid = False\n if c_options['use_osx_frameworks'] and platform == 'darwin':\n # check the existence of frameworks\n f_path = '/Library/Frameworks/GStreamer.framework'\n if not exists(f_path):\n c_options['use_gstreamer'] = False\n print('GStreamer framework not found, fallback on pkg-config')\n else:\n print('GStreamer framework found')\n gstreamer_valid = True\n c_options['use_gstreamer'] = True\n gst_flags = {\n 'extra_link_args': [\n '-F/Library/Frameworks',\n '-Xlinker', '-rpath',\n '-Xlinker', '/Library/Frameworks',\n '-Xlinker', '-headerpad',\n '-Xlinker', '190',\n '-framework', 'GStreamer'],\n 'include_dirs': [join(f_path, 'Headers')]}\n\n if not gstreamer_valid:\n # use pkg-config approach instead\n gst_flags = pkgconfig('gstreamer-1.0')\n if 'libraries' in gst_flags:\n print('GStreamer found via pkg-config')\n c_options['use_gstreamer'] = True\n\n\n# detect SDL2, only on desktop and iOS, or android if explicitly enabled\n# works if we forced the options or in autodetection\nsdl2_flags = {}\nif c_options['use_sdl2'] or (\n platform not in ('android',) and c_options['use_sdl2'] is None):\n\n sdl2_valid = False\n if c_options['use_osx_frameworks'] and platform == 'darwin':\n # check the existence of frameworks\n sdl2_valid = True\n sdl2_flags = {\n 'extra_link_args': [\n '-F/Library/Frameworks',\n '-Xlinker', '-rpath',\n '-Xlinker', '/Library/Frameworks',\n '-Xlinker', '-headerpad',\n '-Xlinker', '190'],\n 'include_dirs': [],\n 'extra_compile_args': ['-F/Library/Frameworks']\n }\n for name in ('SDL2', 'SDL2_ttf', 'SDL2_image', 'SDL2_mixer'):\n f_path = '/Library/Frameworks/{}.framework'.format(name)\n if not exists(f_path):\n print('Missing framework {}'.format(f_path))\n sdl2_valid = False\n continue\n sdl2_flags['extra_link_args'] += ['-framework', name]\n sdl2_flags['include_dirs'] += [join(f_path, 'Headers')]\n print('Found sdl2 frameworks: {}'.format(f_path))\n if name == 'SDL2_mixer':\n _check_and_fix_sdl2_mixer(f_path)\n\n if not sdl2_valid:\n c_options['use_sdl2'] = False\n print('SDL2 frameworks not found, fallback on pkg-config')\n else:\n c_options['use_sdl2'] = True\n print('Activate SDL2 compilation')\n\n if not sdl2_valid and platform != \"ios\":\n # use pkg-config approach instead\n sdl2_flags = pkgconfig('sdl2', 'SDL2_ttf', 'SDL2_image', 'SDL2_mixer')\n if 'libraries' in sdl2_flags:\n print('SDL2 found via pkg-config')\n c_options['use_sdl2'] = True\n\n\n# -----------------------------------------------------------------------------\n# declare flags\n\n\ndef get_modulename_from_file(filename):\n filename = filename.replace(sep, '/')\n pyx = '.'.join(filename.split('.')[:-1])\n pyxl = pyx.split('/')\n while pyxl[0] != 'kivy':\n pyxl.pop(0)\n if pyxl[1] == 'kivy':\n pyxl.pop(0)\n return '.'.join(pyxl)\n\n\ndef expand(root, *args):\n return join(root, 'kivy', *args)\n\n\nclass CythonExtension(Extension):\n\n def __init__(self, *args, **kwargs):\n Extension.__init__(self, *args, **kwargs)\n self.cython_directives = {\n 'c_string_encoding': 'utf-8',\n 'profile': 'USE_PROFILE' in environ,\n 'embedsignature': 'USE_EMBEDSIGNATURE' in environ}\n # XXX with pip, setuptools is imported before distutils, and change\n # our pyx to c, then, cythonize doesn't happen. So force again our\n # sources\n self.sources = args[1]\n\n\ndef merge(d1, *args):\n d1 = deepcopy(d1)\n for d2 in args:\n for key, value in d2.items():\n value = deepcopy(value)\n if key in d1:\n d1[key].extend(value)\n else:\n d1[key] = value\n return d1\n\n\ndef determine_base_flags():\n flags = {\n 'libraries': [],\n 'include_dirs': [join(src_path, 'kivy', 'include')],\n 'library_dirs': [],\n 'extra_link_args': [],\n 'extra_compile_args': []}\n if c_options['use_ios']:\n sysroot = environ.get('IOSSDKROOT', environ.get('SDKROOT'))\n if not sysroot:\n raise Exception('IOSSDKROOT is not set')\n flags['include_dirs'] += [sysroot]\n flags['extra_compile_args'] += ['-isysroot', sysroot]\n flags['extra_link_args'] += ['-isysroot', sysroot]\n elif platform.startswith('freebsd'):\n flags['include_dirs'] += [join(\n environ.get('LOCALBASE', '/usr/local'), 'include')]\n flags['library_dirs'] += [join(\n environ.get('LOCALBASE', '/usr/local'), 'lib')]\n elif platform == 'darwin':\n v = os.uname()\n if v[2] >= '13.0.0':\n # use xcode-select to search on the right Xcode path\n # XXX use the best SDK available instead of a specific one\n import platform as _platform\n xcode_dev = getoutput('xcode-select -p').splitlines()[0]\n sdk_mac_ver = '.'.join(_platform.mac_ver()[0].split('.')[:2])\n print('Xcode detected at {}, and using OS X{} sdk'.format(\n xcode_dev, sdk_mac_ver))\n sysroot = join(\n xcode_dev.decode('utf-8'),\n 'Platforms/MacOSX.platform/Developer/SDKs',\n 'MacOSX{}.sdk'.format(sdk_mac_ver),\n 'System/Library/Frameworks')\n else:\n sysroot = ('/System/Library/Frameworks/'\n 'ApplicationServices.framework/Frameworks')\n flags['extra_compile_args'] += ['-F%s' % sysroot]\n flags['extra_link_args'] += ['-F%s' % sysroot]\n elif platform == 'win32':\n flags['include_dirs'] += [get_python_inc(prefix=sys.prefix)]\n flags['library_dirs'] += [join(sys.prefix, \"libs\")]\n return flags\n\n\ndef determine_gl_flags():\n kivy_graphics_include = join(src_path, 'kivy', 'include')\n flags = {'include_dirs': [kivy_graphics_include], 'libraries': []}\n base_flags = {'include_dirs': [kivy_graphics_include], 'libraries': []}\n if c_options['use_opengl_mock']:\n return flags, base_flags\n if platform == 'win32':\n flags['libraries'] = ['opengl32', 'glew32']\n elif platform == 'ios':\n flags['libraries'] = ['GLESv2']\n flags['extra_link_args'] = ['-framework', 'OpenGLES']\n elif platform == 'darwin':\n flags['extra_link_args'] = ['-framework', 'OpenGL', '-arch', osx_arch]\n flags['extra_compile_args'] = ['-arch', osx_arch]\n elif platform.startswith('freebsd'):\n flags['libraries'] = ['GL']\n elif platform.startswith('openbsd'):\n flags['include_dirs'] = ['/usr/X11R6/include']\n flags['library_dirs'] = ['/usr/X11R6/lib']\n flags['libraries'] = ['GL']\n elif platform == 'android':\n flags['include_dirs'] = [join(ndkplatform, 'usr', 'include')]\n flags['library_dirs'] = [join(ndkplatform, 'usr', 'lib')]\n flags['libraries'] = ['GLESv2']\n elif platform == 'rpi':\n flags['include_dirs'] = [\n '/opt/vc/include',\n '/opt/vc/include/interface/vcos/pthreads',\n '/opt/vc/include/interface/vmcs_host/linux']\n flags['library_dirs'] = ['/opt/vc/lib']\n brcm_lib_files = (\n '/opt/vc/lib/libbrcmEGL.so',\n '/opt/vc/lib/libbrcmGLESv2.so')\n if all((exists(lib) for lib in brcm_lib_files)):\n print(\n 'Found brcmEGL and brcmGLES library files'\n 'for rpi platform at /opt/vc/lib/')\n gl_libs = ['brcmEGL', 'brcmGLESv2']\n else:\n print(\n 'Failed to find brcmEGL and brcmGLESv2 library files'\n 'for rpi platform, falling back to EGL and GLESv2.')\n gl_libs = ['EGL', 'GLESv2']\n flags['libraries'] = ['bcm_host'] + gl_libs\n elif platform == 'mali':\n flags['include_dirs'] = ['/usr/include/']\n flags['library_dirs'] = ['/usr/lib/arm-linux-gnueabihf']\n flags['libraries'] = ['GLESv2']\n c_options['use_x11'] = True\n c_options['use_egl'] = True\n else:\n flags['libraries'] = ['GL']\n return flags, base_flags\n\n\ndef determine_sdl2():\n flags = {}\n if not c_options['use_sdl2']:\n return flags\n\n sdl2_path = environ.get('KIVY_SDL2_PATH', None)\n\n if sdl2_flags and not sdl2_path and platform == 'darwin':\n return sdl2_flags\n\n # no pkgconfig info, or we want to use a specific sdl2 path, so perform\n # manual configuration\n flags['libraries'] = ['SDL2', 'SDL2_ttf', 'SDL2_image', 'SDL2_mixer']\n split_chr = ';' if platform == 'win32' else ':'\n sdl2_paths = sdl2_path.split(split_chr) if sdl2_path else []\n\n if not sdl2_paths:\n sdl_inc = join(sys.prefix, 'include', 'SDL2')\n if isdir(sdl_inc):\n sdl2_paths = [sdl_inc]\n sdl2_paths.extend(['/usr/local/include/SDL2', '/usr/include/SDL2'])\n\n flags['include_dirs'] = sdl2_paths\n flags['extra_link_args'] = []\n flags['extra_compile_args'] = []\n flags['library_dirs'] = (\n sdl2_paths if sdl2_paths else\n ['/usr/local/lib/'])\n\n if sdl2_flags:\n flags = merge(flags, sdl2_flags)\n\n # ensure headers for all the SDL2 and sub libraries are available\n libs_to_check = ['SDL', 'SDL_mixer', 'SDL_ttf', 'SDL_image']\n can_compile = True\n for lib in libs_to_check:\n found = False\n for d in flags['include_dirs']:\n fn = join(d, '{}.h'.format(lib))\n if exists(fn):\n found = True\n print('SDL2: found {} header at {}'.format(lib, fn))\n break\n\n if not found:\n print('SDL2: missing sub library {}'.format(lib))\n can_compile = False\n\n if not can_compile:\n c_options['use_sdl2'] = False\n return {}\n\n return flags\n\n\nbase_flags = determine_base_flags()\ngl_flags, gl_flags_base = determine_gl_flags()\n\n# -----------------------------------------------------------------------------\n# sources to compile\n# all the dependencies have been found manually with:\n# grep -inr -E '(cimport|include)' kivy/graphics/context_instructions.{pxd,pyx}\ngraphics_dependencies = {\n 'buffer.pyx': ['common.pxi'],\n 'context.pxd': ['instructions.pxd', 'texture.pxd', 'vbo.pxd', 'cgl.pxd'],\n 'cgl.pxd': ['common.pxi', 'config.pxi', 'gl_redirect.h'],\n 'compiler.pxd': ['instructions.pxd'],\n 'compiler.pyx': ['context_instructions.pxd'],\n 'cgl.pyx': ['cgl.pxd'],\n 'cgl_mock.pyx': ['cgl.pxd'],\n 'cgl_sdl2.pyx': ['cgl.pxd'],\n 'cgl_gl.pyx': ['cgl.pxd'],\n 'cgl_glew.pyx': ['cgl.pxd'],\n 'context_instructions.pxd': [\n 'transformation.pxd', 'instructions.pxd', 'texture.pxd'],\n 'fbo.pxd': ['cgl.pxd', 'instructions.pxd', 'texture.pxd'],\n 'fbo.pyx': [\n 'config.pxi', 'opcodes.pxi', 'transformation.pxd', 'context.pxd'],\n 'gl_instructions.pyx': [\n 'config.pxi', 'opcodes.pxi', 'cgl.pxd', 'instructions.pxd'],\n 'instructions.pxd': [\n 'vbo.pxd', 'context_instructions.pxd', 'compiler.pxd', 'shader.pxd',\n 'texture.pxd', '../_event.pxd'],\n 'instructions.pyx': [\n 'config.pxi', 'opcodes.pxi', 'cgl.pxd',\n 'context.pxd', 'common.pxi', 'vertex.pxd', 'transformation.pxd'],\n 'opengl.pyx': [\n 'config.pxi', 'common.pxi', 'cgl.pxd', 'gl_redirect.h'],\n 'opengl_utils.pyx': [\n 'opengl_utils_def.pxi', 'cgl.pxd', ],\n 'shader.pxd': ['cgl.pxd', 'transformation.pxd', 'vertex.pxd'],\n 'shader.pyx': [\n 'config.pxi', 'common.pxi', 'cgl.pxd',\n 'vertex.pxd', 'transformation.pxd', 'context.pxd',\n 'gl_debug_logger.pxi'],\n 'stencil_instructions.pxd': ['instructions.pxd'],\n 'stencil_instructions.pyx': [\n 'config.pxi', 'opcodes.pxi', 'cgl.pxd',\n 'gl_debug_logger.pxi'],\n 'scissor_instructions.pyx': [\n 'config.pxi', 'opcodes.pxi', 'cgl.pxd'],\n 'svg.pyx': ['config.pxi', 'common.pxi', 'texture.pxd', 'instructions.pxd',\n 'vertex_instructions.pxd', 'tesselator.pxd'],\n 'texture.pxd': ['cgl.pxd'],\n 'texture.pyx': [\n 'config.pxi', 'common.pxi', 'opengl_utils_def.pxi', 'context.pxd',\n 'cgl.pxd', 'opengl_utils.pxd',\n 'img_tools.pxi', 'gl_debug_logger.pxi'],\n 'vbo.pxd': ['buffer.pxd', 'cgl.pxd', 'vertex.pxd'],\n 'vbo.pyx': [\n 'config.pxi', 'common.pxi', 'context.pxd',\n 'instructions.pxd', 'shader.pxd', 'gl_debug_logger.pxi'],\n 'vertex.pxd': ['cgl.pxd'],\n 'vertex.pyx': ['config.pxi', 'common.pxi'],\n 'vertex_instructions.pyx': [\n 'config.pxi', 'common.pxi', 'vbo.pxd', 'vertex.pxd',\n 'instructions.pxd', 'vertex_instructions.pxd',\n 'cgl.pxd', 'texture.pxd', 'vertex_instructions_line.pxi'],\n 'vertex_instructions_line.pxi': ['stencil_instructions.pxd']}\n\nsources = {\n '_event.pyx': merge(base_flags, {'depends': ['properties.pxd']}),\n '_clock.pyx': {},\n 'weakproxy.pyx': {},\n 'properties.pyx': merge(base_flags, {'depends': ['_event.pxd']}),\n 'graphics/buffer.pyx': merge(base_flags, gl_flags_base),\n 'graphics/context.pyx': merge(base_flags, gl_flags_base),\n 'graphics/compiler.pyx': merge(base_flags, gl_flags_base),\n 'graphics/context_instructions.pyx': merge(base_flags, gl_flags_base),\n 'graphics/fbo.pyx': merge(base_flags, gl_flags_base),\n 'graphics/gl_instructions.pyx': merge(base_flags, gl_flags_base),\n 'graphics/instructions.pyx': merge(base_flags, gl_flags_base),\n 'graphics/opengl.pyx': merge(base_flags, gl_flags_base),\n 'graphics/opengl_utils.pyx': merge(base_flags, gl_flags_base),\n 'graphics/shader.pyx': merge(base_flags, gl_flags_base),\n 'graphics/stencil_instructions.pyx': merge(base_flags, gl_flags_base),\n 'graphics/scissor_instructions.pyx': merge(base_flags, gl_flags_base),\n 'graphics/texture.pyx': merge(base_flags, gl_flags_base),\n 'graphics/transformation.pyx': merge(base_flags, gl_flags_base),\n 'graphics/vbo.pyx': merge(base_flags, gl_flags_base),\n 'graphics/vertex.pyx': merge(base_flags, gl_flags_base),\n 'graphics/vertex_instructions.pyx': merge(base_flags, gl_flags_base),\n 'graphics/cgl.pyx': merge(base_flags, gl_flags_base),\n 'graphics/cgl_backend/cgl_mock.pyx': merge(base_flags, gl_flags_base),\n 'graphics/cgl_backend/cgl_gl.pyx': merge(base_flags, gl_flags),\n 'graphics/cgl_backend/cgl_glew.pyx': merge(base_flags, gl_flags),\n 'graphics/cgl_backend/cgl_sdl2.pyx': merge(base_flags, gl_flags_base),\n 'graphics/cgl_backend/cgl_debug.pyx': merge(base_flags, gl_flags_base),\n 'core/text/text_layout.pyx': base_flags,\n 'core/window/window_info.pyx': base_flags,\n 'graphics/tesselator.pyx': merge(base_flags, {\n 'include_dirs': ['kivy/lib/libtess2/Include'],\n 'c_depends': [\n 'lib/libtess2/Source/bucketalloc.c',\n 'lib/libtess2/Source/dict.c',\n 'lib/libtess2/Source/geom.c',\n 'lib/libtess2/Source/mesh.c',\n 'lib/libtess2/Source/priorityq.c',\n 'lib/libtess2/Source/sweep.c',\n 'lib/libtess2/Source/tess.c'\n ]\n }),\n 'graphics/svg.pyx': merge(base_flags, gl_flags_base)\n}\n\nif c_options[\"use_sdl2\"]:\n sdl2_flags = determine_sdl2()\n\nif c_options['use_sdl2'] and sdl2_flags:\n sources['graphics/cgl_backend/cgl_sdl2.pyx'] = merge(\n sources['graphics/cgl_backend/cgl_sdl2.pyx'], sdl2_flags)\n sdl2_depends = {'depends': ['lib/sdl2.pxi']}\n for source_file in ('core/window/_window_sdl2.pyx',\n 'core/image/_img_sdl2.pyx',\n 'core/text/_text_sdl2.pyx',\n 'core/audio/audio_sdl2.pyx',\n 'core/clipboard/_clipboard_sdl2.pyx'):\n sources[source_file] = merge(\n base_flags, sdl2_flags, sdl2_depends)\n\nif platform in ('darwin', 'ios'):\n # activate ImageIO provider for our core image\n if platform == 'ios':\n osx_flags = {'extra_link_args': [\n '-framework', 'Foundation',\n '-framework', 'UIKit',\n '-framework', 'AudioToolbox',\n '-framework', 'CoreGraphics',\n '-framework', 'QuartzCore',\n '-framework', 'ImageIO',\n '-framework', 'Accelerate']}\n else:\n osx_flags = {'extra_link_args': [\n '-framework', 'ApplicationServices']}\n sources['core/image/img_imageio.pyx'] = merge(\n base_flags, osx_flags)\n\nif c_options['use_avfoundation']:\n import platform as _platform\n mac_ver = [int(x) for x in _platform.mac_ver()[0].split('.')[:2]]\n if mac_ver >= [10, 7]:\n osx_flags = {\n 'extra_link_args': ['-framework', 'AVFoundation'],\n 'extra_compile_args': ['-ObjC++'],\n 'depends': ['core/camera/camera_avfoundation_implem.m']}\n sources['core/camera/camera_avfoundation.pyx'] = merge(\n base_flags, osx_flags)\n else:\n print('AVFoundation cannot be used, OSX >= 10.7 is required')\n\nif c_options['use_rpi']:\n sources['lib/vidcore_lite/egl.pyx'] = merge(\n base_flags, gl_flags)\n sources['lib/vidcore_lite/bcm.pyx'] = merge(\n base_flags, gl_flags)\n\nif c_options['use_x11']:\n libs = ['Xrender', 'X11']\n if c_options['use_egl']:\n libs += ['EGL']\n else:\n libs += ['GL']\n sources['core/window/window_x11.pyx'] = merge(\n base_flags, gl_flags, {\n # FIXME add an option to depend on them but not compile them\n # cause keytab is included in core, and core is included in\n # window_x11\n #\n # 'depends': [\n # 'core/window/window_x11_keytab.c',\n # 'core/window/window_x11_core.c'],\n 'libraries': libs})\n\nif c_options['use_gstreamer']:\n sources['lib/gstplayer/_gstplayer.pyx'] = merge(\n base_flags, gst_flags, {\n 'depends': ['lib/gstplayer/_gstplayer.h']})\n\n\n# -----------------------------------------------------------------------------\n# extension modules\n\ndef get_dependencies(name, deps=None):\n if deps is None:\n deps = []\n for dep in graphics_dependencies.get(name, []):\n if dep not in deps:\n deps.append(dep)\n get_dependencies(dep, deps)\n return deps\n\n\ndef resolve_dependencies(fn, depends):\n fn = basename(fn)\n deps = []\n get_dependencies(fn, deps)\n get_dependencies(fn.replace('.pyx', '.pxd'), deps)\n\n deps_final = []\n paths_to_test = ['graphics', 'include']\n for dep in deps:\n found = False\n for path in paths_to_test:\n filename = expand(src_path, path, dep)\n if exists(filename):\n deps_final.append(filename)\n found = True\n break\n if not found:\n print('ERROR: Dependency for {} not resolved: {}'.format(\n fn, dep\n ))\n\n return deps_final\n\n\ndef get_extensions_from_sources(sources):\n ext_modules = []\n if environ.get('KIVY_FAKE_BUILDEXT'):\n print('Fake build_ext asked, will generate only .h/.c')\n return ext_modules\n for pyx, flags in sources.items():\n is_graphics = pyx.startswith('graphics')\n pyx = expand(src_path, pyx)\n depends = [expand(src_path, x) for x in flags.pop('depends', [])]\n c_depends = [expand(src_path, x) for x in flags.pop('c_depends', [])]\n if not have_cython:\n pyx = '%s.c' % pyx[:-4]\n if is_graphics:\n depends = resolve_dependencies(pyx, depends)\n f_depends = [x for x in depends if x.rsplit('.', 1)[-1] in (\n 'c', 'cpp', 'm')]\n module_name = get_modulename_from_file(pyx)\n flags_clean = {'depends': depends}\n for key, value in flags.items():\n if len(value):\n flags_clean[key] = value\n ext_modules.append(CythonExtension(\n module_name, [pyx] + f_depends + c_depends, **flags_clean))\n return ext_modules\n\n\next_modules = get_extensions_from_sources(sources)\n\n\n# -----------------------------------------------------------------------------\n# automatically detect data files\nsplit_examples = int(environ.get('KIVY_SPLIT_EXAMPLES', '0'))\ndata_file_prefix = 'share/kivy-'\nexamples = {}\nexamples_allowed_ext = ('readme', 'py', 'wav', 'png', 'jpg', 'svg', 'json',\n 'avi', 'gif', 'txt', 'ttf', 'obj', 'mtl', 'kv', 'mpg',\n 'glsl', 'zip')\nfor root, subFolders, files in walk('examples'):\n for fn in files:\n ext = fn.split('.')[-1].lower()\n if ext not in examples_allowed_ext:\n continue\n filename = join(root, fn)\n directory = '%s%s' % (data_file_prefix, dirname(filename))\n if directory not in examples:\n examples[directory] = []\n examples[directory].append(filename)\n\nbinary_deps = []\nbinary_deps_path = join(src_path, 'kivy', 'binary_deps')\nif isdir(binary_deps_path):\n for root, dirnames, filenames in walk(binary_deps_path):\n for fname in filenames:\n binary_deps.append(\n join(root.replace(binary_deps_path, 'binary_deps'), fname))\n\n# -----------------------------------------------------------------------------\n# setup !\nif not build_examples:\n setup(\n name='Kivy',\n version=get_version(),\n author='Kivy Team and other contributors',\n author_email='kivy-dev@googlegroups.com',\n url='http://kivy.org',\n license='MIT',\n description=(\n 'A software library for rapid development of '\n 'hardware-accelerated multitouch applications.'),\n ext_modules=ext_modules,\n cmdclass=cmdclass,\n packages=[\n 'kivy',\n 'kivy.adapters',\n 'kivy.core',\n 'kivy.core.audio',\n 'kivy.core.camera',\n 'kivy.core.clipboard',\n 'kivy.core.image',\n 'kivy.core.gl',\n 'kivy.core.spelling',\n 'kivy.core.text',\n 'kivy.core.video',\n 'kivy.core.window',\n 'kivy.deps',\n 'kivy.effects',\n 'kivy.graphics',\n 'kivy.graphics.cgl_backend',\n 'kivy.garden',\n 'kivy.input',\n 'kivy.input.postproc',\n 'kivy.input.providers',\n 'kivy.lang',\n 'kivy.lib',\n 'kivy.lib.osc',\n 'kivy.lib.gstplayer',\n 'kivy.lib.vidcore_lite',\n 'kivy.modules',\n 'kivy.network',\n 'kivy.storage',\n 'kivy.tests',\n 'kivy.tools',\n 'kivy.tools.packaging',\n 'kivy.tools.packaging.pyinstaller_hooks',\n 'kivy.tools.highlight',\n 'kivy.extras',\n 'kivy.uix',\n 'kivy.uix.behaviors',\n 'kivy.uix.recycleview',\n ],\n package_dir={'kivy': 'kivy'},\n package_data={'kivy': [\n '*.pxd',\n '*.pxi',\n 'core/text/*.pxd',\n 'core/text/*.pxi',\n 'core/window/*.pxi',\n 'core/window/*.pxd',\n 'graphics/*.pxd',\n 'graphics/*.pxi',\n 'graphics/*.h',\n 'include/*',\n 'lib/vidcore_lite/*.pxd',\n 'lib/vidcore_lite/*.pxi',\n 'data/*.kv',\n 'data/*.json',\n 'data/fonts/*.ttf',\n 'data/images/*.png',\n 'data/images/*.jpg',\n 'data/images/*.gif',\n 'data/images/*.atlas',\n 'data/keyboards/*.json',\n 'data/logo/*.png',\n 'data/glsl/*.png',\n 'data/glsl/*.vs',\n 'data/glsl/*.fs',\n 'tests/*.zip',\n 'tests/*.kv',\n 'tests/*.png',\n 'tests/*.ttf',\n 'tests/*.ogg',\n 'tools/gles_compat/*',\n 'tools/highlight/*',\n 'tools/packaging/README.txt',\n 'tools/packaging/win32/kivy.bat',\n 'tools/packaging/win32/kivyenv.sh',\n 'tools/packaging/win32/README.txt',\n 'tools/packaging/osx/Info.plist',\n 'tools/packaging/osx/InfoPlist.strings',\n 'tools/packaging/osx/kivy.sh',\n 'tools/pep8checker/*',\n 'tools/theming/defaulttheme/*',\n ] + binary_deps},\n data_files=[] if split_examples else list(examples.items()),\n classifiers=[\n 'Development Status :: 5 - Production/Stable',\n 'Environment :: MacOS X',\n 'Environment :: Win32 (MS Windows)',\n 'Environment :: X11 Applications',\n 'Intended Audience :: Developers',\n 'Intended Audience :: End Users/Desktop',\n 'Intended Audience :: Information Technology',\n 'Intended Audience :: Science/Research',\n 'License :: OSI Approved :: MIT License',\n 'Natural Language :: English',\n 'Operating System :: MacOS :: MacOS X',\n 'Operating System :: Microsoft :: Windows',\n 'Operating System :: POSIX :: BSD :: FreeBSD',\n 'Operating System :: POSIX :: Linux',\n 'Programming Language :: Python :: 2.7',\n 'Programming Language :: Python :: 3.3',\n 'Programming Language :: Python :: 3.4',\n 'Programming Language :: Python :: 3.5',\n 'Programming Language :: Python :: 3.6',\n 'Topic :: Artistic Software',\n 'Topic :: Games/Entertainment',\n 'Topic :: Multimedia :: Graphics :: 3D Rendering',\n 'Topic :: Multimedia :: Graphics :: Capture :: Digital Camera',\n 'Topic :: Multimedia :: Graphics :: Presentation',\n 'Topic :: Multimedia :: Graphics :: Viewers',\n 'Topic :: Multimedia :: Sound/Audio :: Players :: MP3',\n 'Topic :: Multimedia :: Video :: Display',\n 'Topic :: Scientific/Engineering :: Human Machine Interfaces',\n 'Topic :: Scientific/Engineering :: Visualization',\n ('Topic :: Software Development :: Libraries :: '\n 'Application Frameworks'),\n 'Topic :: Software Development :: User Interfaces'],\n dependency_links=[\n 'https://github.com/kivy-garden/garden/archive/master.zip'],\n install_requires=['Kivy-Garden>=0.1.4', 'docutils', 'pygments'],\n setup_requires=[\n 'cython>=' + MIN_CYTHON_STRING\n ] if not skip_cython else [])\nelse:\n setup(\n name='Kivy-examples',\n version=get_version(),\n author='Kivy Team and other contributors',\n author_email='kivy-dev@googlegroups.com',\n url='http://kivy.org',\n license='MIT',\n description=('Kivy examples.'),\n data_files=list(examples.items()))\n", "path": "setup.py" } ]
[ { "content": "#\n# Kivy - Cross-platform UI framework\n# https://kivy.org/\n#\nfrom __future__ import print_function\n\nimport sys\nbuild_examples = False\nif \"--build_examples\" in sys.argv:\n build_examples = True\n sys.argv.remove(\"--build_examples\")\n\nfrom copy import deepcopy\nimport os\nfrom os.path import join, dirname, sep, exists, basename, isdir\nfrom os import walk, environ\nfrom distutils.version import LooseVersion\nfrom distutils.sysconfig import get_python_inc\nfrom collections import OrderedDict\nfrom time import sleep\nfrom subprocess import check_output, CalledProcessError\nfrom datetime import datetime\n\nif environ.get('KIVY_USE_SETUPTOOLS'):\n from setuptools import setup, Extension\n print('Using setuptools')\nelse:\n from distutils.core import setup\n from distutils.extension import Extension\n print('Using distutils')\n\n\nPY3 = sys.version > '3'\n\nif PY3: # fix error with py3's LooseVersion comparisons\n def ver_equal(self, other):\n return self.version == other\n\n LooseVersion.__eq__ = ver_equal\n\n\ndef get_version(filename='kivy/version.py'):\n VERSION = kivy.__version__\n DATE = datetime.utcnow().strftime('%Y%m%d')\n try:\n GIT_REVISION = check_output(\n ['git', 'rev-parse', 'HEAD']\n ).strip().decode('ascii')\n except (CalledProcessError, OSError, IOError) as e:\n # CalledProcessError has no errno\n errno = getattr(e, 'errno', None)\n if errno != 2 and 'CalledProcessError' not in repr(e):\n raise\n GIT_REVISION = \"Unknown\"\n\n cnt = (\n \"# THIS FILE IS GENERATED FROM KIVY SETUP.PY\\n\"\n \"__version__ = '%(version)s'\\n\"\n \"__hash__ = '%(hash)s'\\n\"\n \"__date__ = '%(date)s'\\n\"\n )\n\n with open(filename, 'w') as f:\n f.write(cnt % {\n 'version': VERSION,\n 'hash': GIT_REVISION,\n 'date': DATE\n })\n return VERSION\n\n\nMIN_CYTHON_STRING = '0.23'\nMIN_CYTHON_VERSION = LooseVersion(MIN_CYTHON_STRING)\nMAX_CYTHON_STRING = '0.27.3'\nMAX_CYTHON_VERSION = LooseVersion(MAX_CYTHON_STRING)\nCYTHON_UNSUPPORTED = (\n # ref https://github.com/cython/cython/issues/1968\n '0.27', '0.27.2'\n)\n\n\ndef getoutput(cmd, env=None):\n import subprocess\n p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE,\n stderr=subprocess.PIPE, env=env)\n p.wait()\n if p.returncode: # if not returncode == 0\n print('WARNING: A problem occurred while running {0} (code {1})\\n'\n .format(cmd, p.returncode))\n stderr_content = p.stderr.read()\n if stderr_content:\n print('{0}\\n'.format(stderr_content))\n return \"\"\n return p.stdout.read()\n\n\ndef pkgconfig(*packages, **kw):\n flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'}\n lenviron = None\n pconfig = join(sys.prefix, 'libs', 'pkgconfig')\n\n if isdir(pconfig):\n lenviron = environ.copy()\n lenviron['PKG_CONFIG_PATH'] = '{};{}'.format(\n environ.get('PKG_CONFIG_PATH', ''), pconfig)\n cmd = 'pkg-config --libs --cflags {}'.format(' '.join(packages))\n results = getoutput(cmd, lenviron).split()\n for token in results:\n ext = token[:2].decode('utf-8')\n flag = flag_map.get(ext)\n if not flag:\n continue\n kw.setdefault(flag, []).append(token[2:].decode('utf-8'))\n return kw\n\n\n# -----------------------------------------------------------------------------\n# Determine on which platform we are\n\nplatform = sys.platform\n\n# Detect 32/64bit for OSX (http://stackoverflow.com/a/1405971/798575)\nif sys.platform == 'darwin':\n if sys.maxsize > 2 ** 32:\n osx_arch = 'x86_64'\n else:\n osx_arch = 'i386'\n\n# Detect Python for android project (http://github.com/kivy/python-for-android)\nndkplatform = environ.get('NDKPLATFORM')\nif ndkplatform is not None and environ.get('LIBLINK'):\n platform = 'android'\nkivy_ios_root = environ.get('KIVYIOSROOT', None)\nif kivy_ios_root is not None:\n platform = 'ios'\nif exists('/opt/vc/include/bcm_host.h'):\n platform = 'rpi'\nif exists('/usr/lib/arm-linux-gnueabihf/libMali.so'):\n platform = 'mali'\n\n# -----------------------------------------------------------------------------\n# Detect options\n#\nc_options = OrderedDict()\nc_options['use_rpi'] = platform == 'rpi'\nc_options['use_mali'] = platform == 'mali'\nc_options['use_egl'] = False\nc_options['use_opengl_es2'] = None\nc_options['use_opengl_mock'] = environ.get('READTHEDOCS', None) == 'True'\nc_options['use_sdl2'] = None\nc_options['use_ios'] = False\nc_options['use_mesagl'] = False\nc_options['use_x11'] = False\nc_options['use_wayland'] = False\nc_options['use_gstreamer'] = None\nc_options['use_avfoundation'] = platform == 'darwin'\nc_options['use_osx_frameworks'] = platform == 'darwin'\nc_options['debug_gl'] = False\n\n# now check if environ is changing the default values\nfor key in list(c_options.keys()):\n ukey = key.upper()\n if ukey in environ:\n value = bool(int(environ[ukey]))\n print('Environ change {0} -> {1}'.format(key, value))\n c_options[key] = value\n\n\n# -----------------------------------------------------------------------------\n# Cython check\n# on python-for-android and kivy-ios, cython usage is external\n\ncython_unsupported_append = '''\n\n Please note that the following versions of Cython are not supported\n at all: {}\n'''.format(', '.join(map(str, CYTHON_UNSUPPORTED)))\n\ncython_min = '''\\\n This version of Cython is not compatible with Kivy. Please upgrade to\n at least version {0}, preferably the newest supported version {1}.\n\n If your platform provides a Cython package, make sure you have upgraded\n to the newest version. If the newest version available is still too low,\n please remove it and install the newest supported Cython via pip:\n\n pip install -I Cython=={1}{2}\\\n'''.format(MIN_CYTHON_STRING, MAX_CYTHON_STRING,\n cython_unsupported_append if CYTHON_UNSUPPORTED else '')\n\ncython_max = '''\\\n This version of Cython is untested with Kivy. While this version may\n work perfectly fine, it is possible that you may experience issues. If\n you do have issues, please downgrade to a supported version. It is\n best to use the newest supported version, {1}, but the minimum\n supported version is {0}.\n\n If your platform provides a Cython package, check if you can downgrade\n to a supported version. Otherwise, uninstall the platform package and\n install Cython via pip:\n\n pip install -I Cython=={1}{2}\\\n'''.format(MIN_CYTHON_STRING, MAX_CYTHON_STRING,\n cython_unsupported_append if CYTHON_UNSUPPORTED else '')\n\ncython_unsupported = '''\\\n This version of Cython suffers from known bugs and is unsupported.\n Please install the newest supported version, {1}, if possible, but\n the minimum supported version is {0}.\n\n If your platform provides a Cython package, check if you can install\n a supported version. Otherwise, uninstall the platform package and\n install Cython via pip:\n\n pip install -I Cython=={1}{2}\\\n'''.format(MIN_CYTHON_STRING, MAX_CYTHON_STRING,\n cython_unsupported_append)\n\nhave_cython = False\nskip_cython = False\nif platform in ('ios', 'android'):\n print('\\nCython check avoided.')\n skip_cython = True\nelse:\n try:\n # check for cython\n from Cython.Distutils import build_ext\n have_cython = True\n import Cython\n cy_version_str = Cython.__version__\n cy_ver = LooseVersion(cy_version_str)\n print('\\nDetected Cython version {}'.format(cy_version_str))\n if cy_ver < MIN_CYTHON_VERSION:\n print(cython_min)\n raise ImportError('Incompatible Cython Version')\n if cy_ver in CYTHON_UNSUPPORTED:\n print(cython_unsupported)\n raise ImportError('Incompatible Cython Version')\n if cy_ver > MAX_CYTHON_VERSION:\n print(cython_max)\n sleep(1)\n except ImportError:\n print(\"\\nCython is missing, it's required for compiling kivy !\\n\\n\")\n raise\n\nif not have_cython:\n from distutils.command.build_ext import build_ext\n\n# -----------------------------------------------------------------------------\n# Setup classes\n\n# the build path where kivy is being compiled\nsrc_path = build_path = dirname(__file__)\n\n\nclass KivyBuildExt(build_ext):\n\n def finalize_options(self):\n retval = build_ext.finalize_options(self)\n global build_path\n if (self.build_lib is not None and exists(self.build_lib) and\n not self.inplace):\n build_path = self.build_lib\n return retval\n\n def build_extensions(self):\n # build files\n config_h_fn = ('include', 'config.h')\n config_pxi_fn = ('include', 'config.pxi')\n config_py_fn = ('setupconfig.py', )\n\n # generate headers\n config_h = '// Autogenerated file for Kivy C configuration\\n'\n config_h += '#define __PY3 {0}\\n'.format(int(PY3))\n config_pxi = '# Autogenerated file for Kivy Cython configuration\\n'\n config_pxi += 'DEF PY3 = {0}\\n'.format(int(PY3))\n config_py = '# Autogenerated file for Kivy configuration\\n'\n config_py += 'PY3 = {0}\\n'.format(int(PY3))\n config_py += 'CYTHON_MIN = {0}\\nCYTHON_MAX = {1}\\n'.format(\n repr(MIN_CYTHON_STRING), repr(MAX_CYTHON_STRING))\n config_py += 'CYTHON_BAD = {0}\\n'.format(repr(', '.join(map(\n str, CYTHON_UNSUPPORTED))))\n\n # generate content\n print('Build configuration is:')\n for opt, value in c_options.items():\n value = int(bool(value))\n print(' * {0} = {1}'.format(opt, value))\n opt = opt.upper()\n config_h += '#define __{0} {1}\\n'.format(opt, value)\n config_pxi += 'DEF {0} = {1}\\n'.format(opt, value)\n config_py += '{0} = {1}\\n'.format(opt, value)\n debug = bool(self.debug)\n print(' * debug = {0}'.format(debug))\n\n config_pxi += 'DEF DEBUG = {0}\\n'.format(debug)\n config_py += 'DEBUG = {0}\\n'.format(debug)\n config_pxi += 'DEF PLATFORM = \"{0}\"\\n'.format(platform)\n config_py += 'PLATFORM = \"{0}\"\\n'.format(platform)\n for fn, content in (\n (config_h_fn, config_h), (config_pxi_fn, config_pxi),\n (config_py_fn, config_py)):\n build_fn = expand(build_path, *fn)\n if self.update_if_changed(build_fn, content):\n print('Updated {}'.format(build_fn))\n src_fn = expand(src_path, *fn)\n if src_fn != build_fn and self.update_if_changed(src_fn, content):\n print('Updated {}'.format(src_fn))\n\n c = self.compiler.compiler_type\n print('Detected compiler is {}'.format(c))\n if c != 'msvc':\n for e in self.extensions:\n e.extra_link_args += ['-lm']\n\n build_ext.build_extensions(self)\n\n def update_if_changed(self, fn, content):\n need_update = True\n if exists(fn):\n with open(fn) as fd:\n need_update = fd.read() != content\n if need_update:\n with open(fn, 'w') as fd:\n fd.write(content)\n return need_update\n\n\ndef _check_and_fix_sdl2_mixer(f_path):\n print(\"Check if SDL2_mixer smpeg2 have an @executable_path\")\n rpath_from = (\"@executable_path/../Frameworks/SDL2.framework\"\n \"/Versions/A/SDL2\")\n rpath_to = \"@rpath/../../../../SDL2.framework/Versions/A/SDL2\"\n smpeg2_path = (\"{}/Versions/A/Frameworks/smpeg2.framework\"\n \"/Versions/A/smpeg2\").format(f_path)\n output = getoutput((\"otool -L '{}'\").format(smpeg2_path)).decode('utf-8')\n if \"@executable_path\" not in output:\n return\n\n print(\"WARNING: Your SDL2_mixer version is invalid\")\n print(\"WARNING: The smpeg2 framework embedded in SDL2_mixer contains a\")\n print(\"WARNING: reference to @executable_path that will fail the\")\n print(\"WARNING: execution of your application.\")\n print(\"WARNING: We are going to change:\")\n print(\"WARNING: from: {}\".format(rpath_from))\n print(\"WARNING: to: {}\".format(rpath_to))\n getoutput(\"install_name_tool -change {} {} {}\".format(\n rpath_from, rpath_to, smpeg2_path))\n\n output = getoutput((\"otool -L '{}'\").format(smpeg2_path))\n if b\"@executable_path\" not in output:\n print(\"WARNING: Change successfully applied!\")\n print(\"WARNING: You'll never see this message again.\")\n else:\n print(\"WARNING: Unable to apply the changes, sorry.\")\n\n\n# -----------------------------------------------------------------------------\n# extract version (simulate doc generation, kivy will be not imported)\nenviron['KIVY_DOC_INCLUDE'] = '1'\nimport kivy\n\n# extra build commands go in the cmdclass dict {'command-name': CommandClass}\n# see tools.packaging.{platform}.build.py for custom build commands for\n# portable packages. Also e.g. we use build_ext command from cython if its\n# installed for c extensions.\nfrom kivy.tools.packaging.factory import FactoryBuild\ncmdclass = {\n 'build_factory': FactoryBuild,\n 'build_ext': KivyBuildExt}\n\ntry:\n # add build rules for portable packages to cmdclass\n if platform == 'win32':\n from kivy.tools.packaging.win32.build import WindowsPortableBuild\n cmdclass['build_portable'] = WindowsPortableBuild\n elif platform == 'darwin':\n from kivy.tools.packaging.osx.build import OSXPortableBuild\n cmdclass['build_portable'] = OSXPortableBuild\nexcept ImportError:\n print('User distribution detected, avoid portable command.')\n\n# Detect which opengl version headers to use\nif platform in ('android', 'darwin', 'ios', 'rpi', 'mali'):\n c_options['use_opengl_es2'] = True\nelif c_options['use_opengl_es2'] is None:\n c_options['use_opengl_es2'] = \\\n environ.get('KIVY_GRAPHICS', '').lower() == 'gles'\n\nprint('Using this graphics system: {}'.format(\n ['OpenGL', 'OpenGL ES 2'][int(c_options['use_opengl_es2'] or False)]))\n\n# check if we are in a kivy-ios build\nif platform == 'ios':\n print('Kivy-IOS project environment detect, use it.')\n print('Kivy-IOS project located at {0}'.format(kivy_ios_root))\n c_options['use_ios'] = True\n c_options['use_sdl2'] = True\n\nelif platform == 'darwin':\n if c_options['use_osx_frameworks']:\n if osx_arch == \"i386\":\n print(\"Warning: building with frameworks fail on i386\")\n else:\n print(\"OSX framework used, force to x86_64 only\")\n environ[\"ARCHFLAGS\"] = environ.get(\"ARCHFLAGS\", \"-arch x86_64\")\n print(\"OSX ARCHFLAGS are: {}\".format(environ[\"ARCHFLAGS\"]))\n\n# detect gstreamer, only on desktop\n# works if we forced the options or in autodetection\nif platform not in ('ios', 'android') and (c_options['use_gstreamer']\n in (None, True)):\n gstreamer_valid = False\n if c_options['use_osx_frameworks'] and platform == 'darwin':\n # check the existence of frameworks\n f_path = '/Library/Frameworks/GStreamer.framework'\n if not exists(f_path):\n c_options['use_gstreamer'] = False\n print('GStreamer framework not found, fallback on pkg-config')\n else:\n print('GStreamer framework found')\n gstreamer_valid = True\n c_options['use_gstreamer'] = True\n gst_flags = {\n 'extra_link_args': [\n '-F/Library/Frameworks',\n '-Xlinker', '-rpath',\n '-Xlinker', '/Library/Frameworks',\n '-Xlinker', '-headerpad',\n '-Xlinker', '190',\n '-framework', 'GStreamer'],\n 'include_dirs': [join(f_path, 'Headers')]}\n\n if not gstreamer_valid:\n # use pkg-config approach instead\n gst_flags = pkgconfig('gstreamer-1.0')\n if 'libraries' in gst_flags:\n print('GStreamer found via pkg-config')\n c_options['use_gstreamer'] = True\n\n\n# detect SDL2, only on desktop and iOS, or android if explicitly enabled\n# works if we forced the options or in autodetection\nsdl2_flags = {}\nif c_options['use_sdl2'] or (\n platform not in ('android',) and c_options['use_sdl2'] is None):\n\n sdl2_valid = False\n if c_options['use_osx_frameworks'] and platform == 'darwin':\n # check the existence of frameworks\n sdl2_valid = True\n sdl2_flags = {\n 'extra_link_args': [\n '-F/Library/Frameworks',\n '-Xlinker', '-rpath',\n '-Xlinker', '/Library/Frameworks',\n '-Xlinker', '-headerpad',\n '-Xlinker', '190'],\n 'include_dirs': [],\n 'extra_compile_args': ['-F/Library/Frameworks']\n }\n for name in ('SDL2', 'SDL2_ttf', 'SDL2_image', 'SDL2_mixer'):\n f_path = '/Library/Frameworks/{}.framework'.format(name)\n if not exists(f_path):\n print('Missing framework {}'.format(f_path))\n sdl2_valid = False\n continue\n sdl2_flags['extra_link_args'] += ['-framework', name]\n sdl2_flags['include_dirs'] += [join(f_path, 'Headers')]\n print('Found sdl2 frameworks: {}'.format(f_path))\n if name == 'SDL2_mixer':\n _check_and_fix_sdl2_mixer(f_path)\n\n if not sdl2_valid:\n c_options['use_sdl2'] = False\n print('SDL2 frameworks not found, fallback on pkg-config')\n else:\n c_options['use_sdl2'] = True\n print('Activate SDL2 compilation')\n\n if not sdl2_valid and platform != \"ios\":\n # use pkg-config approach instead\n sdl2_flags = pkgconfig('sdl2', 'SDL2_ttf', 'SDL2_image', 'SDL2_mixer')\n if 'libraries' in sdl2_flags:\n print('SDL2 found via pkg-config')\n c_options['use_sdl2'] = True\n\n\n# -----------------------------------------------------------------------------\n# declare flags\n\n\ndef get_modulename_from_file(filename):\n filename = filename.replace(sep, '/')\n pyx = '.'.join(filename.split('.')[:-1])\n pyxl = pyx.split('/')\n while pyxl[0] != 'kivy':\n pyxl.pop(0)\n if pyxl[1] == 'kivy':\n pyxl.pop(0)\n return '.'.join(pyxl)\n\n\ndef expand(root, *args):\n return join(root, 'kivy', *args)\n\n\nclass CythonExtension(Extension):\n\n def __init__(self, *args, **kwargs):\n Extension.__init__(self, *args, **kwargs)\n self.cython_directives = {\n 'c_string_encoding': 'utf-8',\n 'profile': 'USE_PROFILE' in environ,\n 'embedsignature': 'USE_EMBEDSIGNATURE' in environ}\n # XXX with pip, setuptools is imported before distutils, and change\n # our pyx to c, then, cythonize doesn't happen. So force again our\n # sources\n self.sources = args[1]\n\n\ndef merge(d1, *args):\n d1 = deepcopy(d1)\n for d2 in args:\n for key, value in d2.items():\n value = deepcopy(value)\n if key in d1:\n d1[key].extend(value)\n else:\n d1[key] = value\n return d1\n\n\ndef determine_base_flags():\n flags = {\n 'libraries': [],\n 'include_dirs': [join(src_path, 'kivy', 'include')],\n 'library_dirs': [],\n 'extra_link_args': [],\n 'extra_compile_args': []}\n if c_options['use_ios']:\n sysroot = environ.get('IOSSDKROOT', environ.get('SDKROOT'))\n if not sysroot:\n raise Exception('IOSSDKROOT is not set')\n flags['include_dirs'] += [sysroot]\n flags['extra_compile_args'] += ['-isysroot', sysroot]\n flags['extra_link_args'] += ['-isysroot', sysroot]\n elif platform.startswith('freebsd'):\n flags['include_dirs'] += [join(\n environ.get('LOCALBASE', '/usr/local'), 'include')]\n flags['library_dirs'] += [join(\n environ.get('LOCALBASE', '/usr/local'), 'lib')]\n elif platform == 'darwin':\n v = os.uname()\n if v[2] >= '13.0.0':\n # use xcode-select to search on the right Xcode path\n # XXX use the best SDK available instead of a specific one\n import platform as _platform\n xcode_dev = getoutput('xcode-select -p').splitlines()[0]\n sdk_mac_ver = '.'.join(_platform.mac_ver()[0].split('.')[:2])\n print('Xcode detected at {}, and using OS X{} sdk'.format(\n xcode_dev, sdk_mac_ver))\n sysroot = join(\n xcode_dev.decode('utf-8'),\n 'Platforms/MacOSX.platform/Developer/SDKs',\n 'MacOSX{}.sdk'.format(sdk_mac_ver),\n 'System/Library/Frameworks')\n else:\n sysroot = ('/System/Library/Frameworks/'\n 'ApplicationServices.framework/Frameworks')\n flags['extra_compile_args'] += ['-F%s' % sysroot]\n flags['extra_link_args'] += ['-F%s' % sysroot]\n elif platform == 'win32':\n flags['include_dirs'] += [get_python_inc(prefix=sys.prefix)]\n flags['library_dirs'] += [join(sys.prefix, \"libs\")]\n return flags\n\n\ndef determine_gl_flags():\n kivy_graphics_include = join(src_path, 'kivy', 'include')\n flags = {'include_dirs': [kivy_graphics_include], 'libraries': []}\n base_flags = {'include_dirs': [kivy_graphics_include], 'libraries': []}\n if c_options['use_opengl_mock']:\n return flags, base_flags\n if platform == 'win32':\n flags['libraries'] = ['opengl32', 'glew32']\n elif platform == 'ios':\n flags['libraries'] = ['GLESv2']\n flags['extra_link_args'] = ['-framework', 'OpenGLES']\n elif platform == 'darwin':\n flags['extra_link_args'] = ['-framework', 'OpenGL', '-arch', osx_arch]\n flags['extra_compile_args'] = ['-arch', osx_arch]\n elif platform.startswith('freebsd'):\n flags['libraries'] = ['GL']\n elif platform.startswith('openbsd'):\n flags['include_dirs'] = ['/usr/X11R6/include']\n flags['library_dirs'] = ['/usr/X11R6/lib']\n flags['libraries'] = ['GL']\n elif platform == 'android':\n flags['include_dirs'] = [join(ndkplatform, 'usr', 'include')]\n flags['library_dirs'] = [join(ndkplatform, 'usr', 'lib')]\n flags['libraries'] = ['GLESv2']\n elif platform == 'rpi':\n flags['include_dirs'] = [\n '/opt/vc/include',\n '/opt/vc/include/interface/vcos/pthreads',\n '/opt/vc/include/interface/vmcs_host/linux']\n flags['library_dirs'] = ['/opt/vc/lib']\n brcm_lib_files = (\n '/opt/vc/lib/libbrcmEGL.so',\n '/opt/vc/lib/libbrcmGLESv2.so')\n if all((exists(lib) for lib in brcm_lib_files)):\n print(\n 'Found brcmEGL and brcmGLES library files'\n 'for rpi platform at /opt/vc/lib/')\n gl_libs = ['brcmEGL', 'brcmGLESv2']\n else:\n print(\n 'Failed to find brcmEGL and brcmGLESv2 library files'\n 'for rpi platform, falling back to EGL and GLESv2.')\n gl_libs = ['EGL', 'GLESv2']\n flags['libraries'] = ['bcm_host'] + gl_libs\n elif platform == 'mali':\n flags['include_dirs'] = ['/usr/include/']\n flags['library_dirs'] = ['/usr/lib/arm-linux-gnueabihf']\n flags['libraries'] = ['GLESv2']\n c_options['use_x11'] = True\n c_options['use_egl'] = True\n else:\n flags['libraries'] = ['GL']\n return flags, base_flags\n\n\ndef determine_sdl2():\n flags = {}\n if not c_options['use_sdl2']:\n return flags\n\n sdl2_path = environ.get('KIVY_SDL2_PATH', None)\n\n if sdl2_flags and not sdl2_path and platform == 'darwin':\n return sdl2_flags\n\n # no pkgconfig info, or we want to use a specific sdl2 path, so perform\n # manual configuration\n flags['libraries'] = ['SDL2', 'SDL2_ttf', 'SDL2_image', 'SDL2_mixer']\n split_chr = ';' if platform == 'win32' else ':'\n sdl2_paths = sdl2_path.split(split_chr) if sdl2_path else []\n\n if not sdl2_paths:\n sdl_inc = join(sys.prefix, 'include', 'SDL2')\n if isdir(sdl_inc):\n sdl2_paths = [sdl_inc]\n sdl2_paths.extend(['/usr/local/include/SDL2', '/usr/include/SDL2'])\n\n flags['include_dirs'] = sdl2_paths\n flags['extra_link_args'] = []\n flags['extra_compile_args'] = []\n flags['library_dirs'] = (\n sdl2_paths if sdl2_paths else\n ['/usr/local/lib/'])\n\n if sdl2_flags:\n flags = merge(flags, sdl2_flags)\n\n # ensure headers for all the SDL2 and sub libraries are available\n libs_to_check = ['SDL', 'SDL_mixer', 'SDL_ttf', 'SDL_image']\n can_compile = True\n for lib in libs_to_check:\n found = False\n for d in flags['include_dirs']:\n fn = join(d, '{}.h'.format(lib))\n if exists(fn):\n found = True\n print('SDL2: found {} header at {}'.format(lib, fn))\n break\n\n if not found:\n print('SDL2: missing sub library {}'.format(lib))\n can_compile = False\n\n if not can_compile:\n c_options['use_sdl2'] = False\n return {}\n\n return flags\n\n\nbase_flags = determine_base_flags()\ngl_flags, gl_flags_base = determine_gl_flags()\n\n# -----------------------------------------------------------------------------\n# sources to compile\n# all the dependencies have been found manually with:\n# grep -inr -E '(cimport|include)' kivy/graphics/context_instructions.{pxd,pyx}\ngraphics_dependencies = {\n 'buffer.pyx': ['common.pxi'],\n 'context.pxd': ['instructions.pxd', 'texture.pxd', 'vbo.pxd', 'cgl.pxd'],\n 'cgl.pxd': ['common.pxi', 'config.pxi', 'gl_redirect.h'],\n 'compiler.pxd': ['instructions.pxd'],\n 'compiler.pyx': ['context_instructions.pxd'],\n 'cgl.pyx': ['cgl.pxd'],\n 'cgl_mock.pyx': ['cgl.pxd'],\n 'cgl_sdl2.pyx': ['cgl.pxd'],\n 'cgl_gl.pyx': ['cgl.pxd'],\n 'cgl_glew.pyx': ['cgl.pxd'],\n 'context_instructions.pxd': [\n 'transformation.pxd', 'instructions.pxd', 'texture.pxd'],\n 'fbo.pxd': ['cgl.pxd', 'instructions.pxd', 'texture.pxd'],\n 'fbo.pyx': [\n 'config.pxi', 'opcodes.pxi', 'transformation.pxd', 'context.pxd'],\n 'gl_instructions.pyx': [\n 'config.pxi', 'opcodes.pxi', 'cgl.pxd', 'instructions.pxd'],\n 'instructions.pxd': [\n 'vbo.pxd', 'context_instructions.pxd', 'compiler.pxd', 'shader.pxd',\n 'texture.pxd', '../_event.pxd'],\n 'instructions.pyx': [\n 'config.pxi', 'opcodes.pxi', 'cgl.pxd',\n 'context.pxd', 'common.pxi', 'vertex.pxd', 'transformation.pxd'],\n 'opengl.pyx': [\n 'config.pxi', 'common.pxi', 'cgl.pxd', 'gl_redirect.h'],\n 'opengl_utils.pyx': [\n 'opengl_utils_def.pxi', 'cgl.pxd', ],\n 'shader.pxd': ['cgl.pxd', 'transformation.pxd', 'vertex.pxd'],\n 'shader.pyx': [\n 'config.pxi', 'common.pxi', 'cgl.pxd',\n 'vertex.pxd', 'transformation.pxd', 'context.pxd',\n 'gl_debug_logger.pxi'],\n 'stencil_instructions.pxd': ['instructions.pxd'],\n 'stencil_instructions.pyx': [\n 'config.pxi', 'opcodes.pxi', 'cgl.pxd',\n 'gl_debug_logger.pxi'],\n 'scissor_instructions.pyx': [\n 'config.pxi', 'opcodes.pxi', 'cgl.pxd'],\n 'svg.pyx': ['config.pxi', 'common.pxi', 'texture.pxd', 'instructions.pxd',\n 'vertex_instructions.pxd', 'tesselator.pxd'],\n 'texture.pxd': ['cgl.pxd'],\n 'texture.pyx': [\n 'config.pxi', 'common.pxi', 'opengl_utils_def.pxi', 'context.pxd',\n 'cgl.pxd', 'opengl_utils.pxd',\n 'img_tools.pxi', 'gl_debug_logger.pxi'],\n 'vbo.pxd': ['buffer.pxd', 'cgl.pxd', 'vertex.pxd'],\n 'vbo.pyx': [\n 'config.pxi', 'common.pxi', 'context.pxd',\n 'instructions.pxd', 'shader.pxd', 'gl_debug_logger.pxi'],\n 'vertex.pxd': ['cgl.pxd'],\n 'vertex.pyx': ['config.pxi', 'common.pxi'],\n 'vertex_instructions.pyx': [\n 'config.pxi', 'common.pxi', 'vbo.pxd', 'vertex.pxd',\n 'instructions.pxd', 'vertex_instructions.pxd',\n 'cgl.pxd', 'texture.pxd', 'vertex_instructions_line.pxi'],\n 'vertex_instructions_line.pxi': ['stencil_instructions.pxd']}\n\nsources = {\n '_event.pyx': merge(base_flags, {'depends': ['properties.pxd']}),\n '_clock.pyx': {},\n 'weakproxy.pyx': {},\n 'properties.pyx': merge(base_flags, {'depends': ['_event.pxd']}),\n 'graphics/buffer.pyx': merge(base_flags, gl_flags_base),\n 'graphics/context.pyx': merge(base_flags, gl_flags_base),\n 'graphics/compiler.pyx': merge(base_flags, gl_flags_base),\n 'graphics/context_instructions.pyx': merge(base_flags, gl_flags_base),\n 'graphics/fbo.pyx': merge(base_flags, gl_flags_base),\n 'graphics/gl_instructions.pyx': merge(base_flags, gl_flags_base),\n 'graphics/instructions.pyx': merge(base_flags, gl_flags_base),\n 'graphics/opengl.pyx': merge(base_flags, gl_flags_base),\n 'graphics/opengl_utils.pyx': merge(base_flags, gl_flags_base),\n 'graphics/shader.pyx': merge(base_flags, gl_flags_base),\n 'graphics/stencil_instructions.pyx': merge(base_flags, gl_flags_base),\n 'graphics/scissor_instructions.pyx': merge(base_flags, gl_flags_base),\n 'graphics/texture.pyx': merge(base_flags, gl_flags_base),\n 'graphics/transformation.pyx': merge(base_flags, gl_flags_base),\n 'graphics/vbo.pyx': merge(base_flags, gl_flags_base),\n 'graphics/vertex.pyx': merge(base_flags, gl_flags_base),\n 'graphics/vertex_instructions.pyx': merge(base_flags, gl_flags_base),\n 'graphics/cgl.pyx': merge(base_flags, gl_flags_base),\n 'graphics/cgl_backend/cgl_mock.pyx': merge(base_flags, gl_flags_base),\n 'graphics/cgl_backend/cgl_gl.pyx': merge(base_flags, gl_flags),\n 'graphics/cgl_backend/cgl_glew.pyx': merge(base_flags, gl_flags),\n 'graphics/cgl_backend/cgl_sdl2.pyx': merge(base_flags, gl_flags_base),\n 'graphics/cgl_backend/cgl_debug.pyx': merge(base_flags, gl_flags_base),\n 'core/text/text_layout.pyx': base_flags,\n 'core/window/window_info.pyx': base_flags,\n 'graphics/tesselator.pyx': merge(base_flags, {\n 'include_dirs': ['kivy/lib/libtess2/Include'],\n 'c_depends': [\n 'lib/libtess2/Source/bucketalloc.c',\n 'lib/libtess2/Source/dict.c',\n 'lib/libtess2/Source/geom.c',\n 'lib/libtess2/Source/mesh.c',\n 'lib/libtess2/Source/priorityq.c',\n 'lib/libtess2/Source/sweep.c',\n 'lib/libtess2/Source/tess.c'\n ]\n }),\n 'graphics/svg.pyx': merge(base_flags, gl_flags_base)\n}\n\nif c_options[\"use_sdl2\"]:\n sdl2_flags = determine_sdl2()\n\nif c_options['use_sdl2'] and sdl2_flags:\n sources['graphics/cgl_backend/cgl_sdl2.pyx'] = merge(\n sources['graphics/cgl_backend/cgl_sdl2.pyx'], sdl2_flags)\n sdl2_depends = {'depends': ['lib/sdl2.pxi']}\n for source_file in ('core/window/_window_sdl2.pyx',\n 'core/image/_img_sdl2.pyx',\n 'core/text/_text_sdl2.pyx',\n 'core/audio/audio_sdl2.pyx',\n 'core/clipboard/_clipboard_sdl2.pyx'):\n sources[source_file] = merge(\n base_flags, sdl2_flags, sdl2_depends)\n\nif platform in ('darwin', 'ios'):\n # activate ImageIO provider for our core image\n if platform == 'ios':\n osx_flags = {'extra_link_args': [\n '-framework', 'Foundation',\n '-framework', 'UIKit',\n '-framework', 'AudioToolbox',\n '-framework', 'CoreGraphics',\n '-framework', 'QuartzCore',\n '-framework', 'ImageIO',\n '-framework', 'Accelerate']}\n else:\n osx_flags = {'extra_link_args': [\n '-framework', 'ApplicationServices']}\n sources['core/image/img_imageio.pyx'] = merge(\n base_flags, osx_flags)\n\nif c_options['use_avfoundation']:\n import platform as _platform\n mac_ver = [int(x) for x in _platform.mac_ver()[0].split('.')[:2]]\n if mac_ver >= [10, 7]:\n osx_flags = {\n 'extra_link_args': ['-framework', 'AVFoundation'],\n 'extra_compile_args': ['-ObjC++'],\n 'depends': ['core/camera/camera_avfoundation_implem.m']}\n sources['core/camera/camera_avfoundation.pyx'] = merge(\n base_flags, osx_flags)\n else:\n print('AVFoundation cannot be used, OSX >= 10.7 is required')\n\nif c_options['use_rpi']:\n sources['lib/vidcore_lite/egl.pyx'] = merge(\n base_flags, gl_flags)\n sources['lib/vidcore_lite/bcm.pyx'] = merge(\n base_flags, gl_flags)\n\nif c_options['use_x11']:\n libs = ['Xrender', 'X11']\n if c_options['use_egl']:\n libs += ['EGL']\n else:\n libs += ['GL']\n sources['core/window/window_x11.pyx'] = merge(\n base_flags, gl_flags, {\n # FIXME add an option to depend on them but not compile them\n # cause keytab is included in core, and core is included in\n # window_x11\n #\n # 'depends': [\n # 'core/window/window_x11_keytab.c',\n # 'core/window/window_x11_core.c'],\n 'libraries': libs})\n\nif c_options['use_gstreamer']:\n sources['lib/gstplayer/_gstplayer.pyx'] = merge(\n base_flags, gst_flags, {\n 'depends': ['lib/gstplayer/_gstplayer.h']})\n\n\n# -----------------------------------------------------------------------------\n# extension modules\n\ndef get_dependencies(name, deps=None):\n if deps is None:\n deps = []\n for dep in graphics_dependencies.get(name, []):\n if dep not in deps:\n deps.append(dep)\n get_dependencies(dep, deps)\n return deps\n\n\ndef resolve_dependencies(fn, depends):\n fn = basename(fn)\n deps = []\n get_dependencies(fn, deps)\n get_dependencies(fn.replace('.pyx', '.pxd'), deps)\n\n deps_final = []\n paths_to_test = ['graphics', 'include']\n for dep in deps:\n found = False\n for path in paths_to_test:\n filename = expand(src_path, path, dep)\n if exists(filename):\n deps_final.append(filename)\n found = True\n break\n if not found:\n print('ERROR: Dependency for {} not resolved: {}'.format(\n fn, dep\n ))\n\n return deps_final\n\n\ndef get_extensions_from_sources(sources):\n ext_modules = []\n if environ.get('KIVY_FAKE_BUILDEXT'):\n print('Fake build_ext asked, will generate only .h/.c')\n return ext_modules\n for pyx, flags in sources.items():\n is_graphics = pyx.startswith('graphics')\n pyx = expand(src_path, pyx)\n depends = [expand(src_path, x) for x in flags.pop('depends', [])]\n c_depends = [expand(src_path, x) for x in flags.pop('c_depends', [])]\n if not have_cython:\n pyx = '%s.c' % pyx[:-4]\n if is_graphics:\n depends = resolve_dependencies(pyx, depends)\n f_depends = [x for x in depends if x.rsplit('.', 1)[-1] in (\n 'c', 'cpp', 'm')]\n module_name = get_modulename_from_file(pyx)\n flags_clean = {'depends': depends}\n for key, value in flags.items():\n if len(value):\n flags_clean[key] = value\n ext_modules.append(CythonExtension(\n module_name, [pyx] + f_depends + c_depends, **flags_clean))\n return ext_modules\n\n\next_modules = get_extensions_from_sources(sources)\n\n\n# -----------------------------------------------------------------------------\n# automatically detect data files\nsplit_examples = int(environ.get('KIVY_SPLIT_EXAMPLES', '0'))\ndata_file_prefix = 'share/kivy-'\nexamples = {}\nexamples_allowed_ext = ('readme', 'py', 'wav', 'png', 'jpg', 'svg', 'json',\n 'avi', 'gif', 'txt', 'ttf', 'obj', 'mtl', 'kv', 'mpg',\n 'glsl', 'zip')\nfor root, subFolders, files in walk('examples'):\n for fn in files:\n ext = fn.split('.')[-1].lower()\n if ext not in examples_allowed_ext:\n continue\n filename = join(root, fn)\n directory = '%s%s' % (data_file_prefix, dirname(filename))\n if directory not in examples:\n examples[directory] = []\n examples[directory].append(filename)\n\nbinary_deps = []\nbinary_deps_path = join(src_path, 'kivy', 'binary_deps')\nif isdir(binary_deps_path):\n for root, dirnames, filenames in walk(binary_deps_path):\n for fname in filenames:\n binary_deps.append(\n join(root.replace(binary_deps_path, 'binary_deps'), fname))\n\n# -----------------------------------------------------------------------------\n# setup !\nif not build_examples:\n setup(\n name='Kivy',\n version=get_version(),\n author='Kivy Team and other contributors',\n author_email='kivy-dev@googlegroups.com',\n url='http://kivy.org',\n license='MIT',\n description=(\n 'A software library for rapid development of '\n 'hardware-accelerated multitouch applications.'),\n ext_modules=ext_modules,\n cmdclass=cmdclass,\n packages=[\n 'kivy',\n 'kivy.adapters',\n 'kivy.core',\n 'kivy.core.audio',\n 'kivy.core.camera',\n 'kivy.core.clipboard',\n 'kivy.core.image',\n 'kivy.core.gl',\n 'kivy.core.spelling',\n 'kivy.core.text',\n 'kivy.core.video',\n 'kivy.core.window',\n 'kivy.deps',\n 'kivy.effects',\n 'kivy.graphics',\n 'kivy.graphics.cgl_backend',\n 'kivy.garden',\n 'kivy.input',\n 'kivy.input.postproc',\n 'kivy.input.providers',\n 'kivy.lang',\n 'kivy.lib',\n 'kivy.lib.osc',\n 'kivy.lib.gstplayer',\n 'kivy.lib.vidcore_lite',\n 'kivy.modules',\n 'kivy.network',\n 'kivy.storage',\n 'kivy.tests',\n 'kivy.tools',\n 'kivy.tools.packaging',\n 'kivy.tools.packaging.pyinstaller_hooks',\n 'kivy.tools.highlight',\n 'kivy.extras',\n 'kivy.uix',\n 'kivy.uix.behaviors',\n 'kivy.uix.recycleview',\n ],\n package_dir={'kivy': 'kivy'},\n package_data={'kivy': [\n 'setupconfig.py'\n '*.pxd',\n '*.pxi',\n 'core/text/*.pxd',\n 'core/text/*.pxi',\n 'core/window/*.pxi',\n 'core/window/*.pxd',\n 'graphics/*.pxd',\n 'graphics/*.pxi',\n 'graphics/*.h',\n 'include/*',\n 'lib/vidcore_lite/*.pxd',\n 'lib/vidcore_lite/*.pxi',\n 'data/*.kv',\n 'data/*.json',\n 'data/fonts/*.ttf',\n 'data/images/*.png',\n 'data/images/*.jpg',\n 'data/images/*.gif',\n 'data/images/*.atlas',\n 'data/keyboards/*.json',\n 'data/logo/*.png',\n 'data/glsl/*.png',\n 'data/glsl/*.vs',\n 'data/glsl/*.fs',\n 'tests/*.zip',\n 'tests/*.kv',\n 'tests/*.png',\n 'tests/*.ttf',\n 'tests/*.ogg',\n 'tools/gles_compat/*',\n 'tools/highlight/*',\n 'tools/packaging/README.txt',\n 'tools/packaging/win32/kivy.bat',\n 'tools/packaging/win32/kivyenv.sh',\n 'tools/packaging/win32/README.txt',\n 'tools/packaging/osx/Info.plist',\n 'tools/packaging/osx/InfoPlist.strings',\n 'tools/packaging/osx/kivy.sh',\n 'tools/pep8checker/*',\n 'tools/theming/defaulttheme/*',\n ] + binary_deps},\n data_files=[] if split_examples else list(examples.items()),\n classifiers=[\n 'Development Status :: 5 - Production/Stable',\n 'Environment :: MacOS X',\n 'Environment :: Win32 (MS Windows)',\n 'Environment :: X11 Applications',\n 'Intended Audience :: Developers',\n 'Intended Audience :: End Users/Desktop',\n 'Intended Audience :: Information Technology',\n 'Intended Audience :: Science/Research',\n 'License :: OSI Approved :: MIT License',\n 'Natural Language :: English',\n 'Operating System :: MacOS :: MacOS X',\n 'Operating System :: Microsoft :: Windows',\n 'Operating System :: POSIX :: BSD :: FreeBSD',\n 'Operating System :: POSIX :: Linux',\n 'Programming Language :: Python :: 2.7',\n 'Programming Language :: Python :: 3.3',\n 'Programming Language :: Python :: 3.4',\n 'Programming Language :: Python :: 3.5',\n 'Programming Language :: Python :: 3.6',\n 'Topic :: Artistic Software',\n 'Topic :: Games/Entertainment',\n 'Topic :: Multimedia :: Graphics :: 3D Rendering',\n 'Topic :: Multimedia :: Graphics :: Capture :: Digital Camera',\n 'Topic :: Multimedia :: Graphics :: Presentation',\n 'Topic :: Multimedia :: Graphics :: Viewers',\n 'Topic :: Multimedia :: Sound/Audio :: Players :: MP3',\n 'Topic :: Multimedia :: Video :: Display',\n 'Topic :: Scientific/Engineering :: Human Machine Interfaces',\n 'Topic :: Scientific/Engineering :: Visualization',\n ('Topic :: Software Development :: Libraries :: '\n 'Application Frameworks'),\n 'Topic :: Software Development :: User Interfaces'],\n dependency_links=[\n 'https://github.com/kivy-garden/garden/archive/master.zip'],\n install_requires=['Kivy-Garden>=0.1.4', 'docutils', 'pygments'],\n setup_requires=[\n 'cython>=' + MIN_CYTHON_STRING\n ] if not skip_cython else [])\nelse:\n setup(\n name='Kivy-examples',\n version=get_version(),\n author='Kivy Team and other contributors',\n author_email='kivy-dev@googlegroups.com',\n url='http://kivy.org',\n license='MIT',\n description=('Kivy examples.'),\n data_files=list(examples.items()))\n", "path": "setup.py" } ]
diff --git a/setup.py b/setup.py index de71c5f198..3c8f34de28 100644 --- a/setup.py +++ b/setup.py @@ -1019,6 +1019,7 @@ def get_extensions_from_sources(sources): ], package_dir={'kivy': 'kivy'}, package_data={'kivy': [ + 'setupconfig.py' '*.pxd', '*.pxi', 'core/text/*.pxd',
DDMAL__CantusDB-1043
[ { "content": "from django.contrib import admin\nfrom main_app.models import *\nfrom main_app.forms import (\n AdminCenturyForm,\n AdminChantForm,\n AdminFeastForm,\n AdminGenreForm,\n AdminNotationForm,\n AdminOfficeForm,\n AdminProvenanceForm,\n AdminRismSiglumForm,\n AdminSegmentForm,\n AdminSequenceForm,\n AdminSourceForm,\n)\n\n# these fields should not be editable by all classes\nEXCLUDE = (\n \"created_by\",\n \"last_updated_by\",\n \"json_info\",\n)\n\n\nclass BaseModelAdmin(admin.ModelAdmin):\n exclude = EXCLUDE\n\n # if an object is created in the admin interface, assign the user to the created_by field\n # else if an object is updated in the admin interface, assign the user to the last_updated_by field\n def save_model(self, request, obj, form, change):\n if change:\n obj.last_updated_by = request.user\n else:\n obj.created_by = request.user\n super().save_model(request, obj, form, change)\n\n\nclass CenturyAdmin(BaseModelAdmin):\n search_fields = (\"name\",)\n form = AdminCenturyForm\n\n\nclass ChantAdmin(BaseModelAdmin):\n @admin.display(description=\"Source Siglum\")\n def get_source_siglum(self, obj):\n if obj.source:\n return obj.source.siglum\n\n list_display = (\n \"incipit\",\n \"get_source_siglum\",\n \"genre\",\n )\n search_fields = (\n \"title\",\n \"incipit\",\n \"cantus_id\",\n \"id\",\n )\n\n readonly_fields = (\n \"date_created\",\n \"date_updated\",\n )\n\n list_filter = (\n \"genre\",\n \"office\",\n )\n exclude = EXCLUDE + (\n \"col1\",\n \"col2\",\n \"col3\",\n \"next_chant\",\n \"s_sequence\",\n \"is_last_chant_in_feast\",\n \"visible_status\",\n \"date\",\n )\n form = AdminChantForm\n raw_id_fields = (\n \"source\",\n \"feast\",\n )\n ordering = (\"source__siglum\",)\n\n\nclass FeastAdmin(BaseModelAdmin):\n search_fields = (\n \"name\",\n \"feast_code\",\n )\n list_display = (\n \"name\",\n \"month\",\n \"day\",\n \"feast_code\",\n )\n form = AdminFeastForm\n\n\nclass GenreAdmin(BaseModelAdmin):\n search_fields = (\"name\",)\n form = AdminGenreForm\n\n\nclass NotationAdmin(BaseModelAdmin):\n search_fields = (\"name\",)\n form = AdminNotationForm\n\n\nclass OfficeAdmin(BaseModelAdmin):\n search_fields = (\"name\",)\n form = AdminOfficeForm\n\n\nclass ProvenanceAdmin(BaseModelAdmin):\n search_fields = (\"name\",)\n form = AdminProvenanceForm\n\n\nclass RismSiglumAdmin(BaseModelAdmin):\n search_fields = (\"name\",)\n form = AdminRismSiglumForm\n\n\nclass SegmentAdmin(BaseModelAdmin):\n search_fields = (\"name\",)\n form = AdminSegmentForm\n\n\nclass SequenceAdmin(BaseModelAdmin):\n @admin.display(description=\"Source Siglum\")\n def get_source_siglum(self, obj):\n if obj.source:\n return obj.source.siglum\n\n search_fields = (\n \"title\",\n \"incipit\",\n \"cantus_id\",\n \"id\",\n )\n exclude = EXCLUDE + (\n \"c_sequence\",\n \"next_chant\",\n \"is_last_chant_in_feast\",\n \"visible_status\",\n )\n list_display = (\"incipit\", \"get_source_siglum\", \"genre\")\n list_filter = (\n \"genre\",\n \"office\",\n )\n raw_id_fields = (\n \"source\",\n \"feast\",\n )\n ordering = (\"source__siglum\",)\n form = AdminSequenceForm\n\n\nclass SourceAdmin(BaseModelAdmin):\n # These search fields are also available on the user-source inline relationship in the user admin page\n search_fields = (\n \"siglum\",\n \"title\",\n \"id\",\n )\n readonly_fields = (\n \"number_of_chants\",\n \"number_of_melodies\",\n \"date_created\",\n \"date_updated\",\n )\n # from the Django docs:\n # Adding a ManyToManyField to this list will instead use a nifty unobtrusive JavaScript “filter” interface\n # that allows searching within the options. The unselected and selected options appear in two boxes side by side.\n filter_horizontal = (\n \"century\",\n \"notation\",\n \"current_editors\",\n \"inventoried_by\",\n \"full_text_entered_by\",\n \"melodies_entered_by\",\n \"proofreaders\",\n \"other_editors\",\n )\n\n list_display = (\n \"title\",\n \"siglum\",\n \"id\",\n )\n\n list_filter = (\n \"full_source\",\n \"segment\",\n \"source_status\",\n \"published\",\n \"century\",\n )\n\n ordering = (\"siglum\",)\n\n form = AdminSourceForm\n\n\nadmin.site.register(Century, CenturyAdmin)\nadmin.site.register(Chant, ChantAdmin)\nadmin.site.register(Feast, FeastAdmin)\nadmin.site.register(Genre, GenreAdmin)\nadmin.site.register(Notation, NotationAdmin)\nadmin.site.register(Office, OfficeAdmin)\nadmin.site.register(Provenance, ProvenanceAdmin)\nadmin.site.register(RismSiglum, RismSiglumAdmin)\nadmin.site.register(Segment, SegmentAdmin)\nadmin.site.register(Sequence, SequenceAdmin)\nadmin.site.register(Source, SourceAdmin)\n", "path": "django/cantusdb_project/main_app/admin.py" } ]
[ { "content": "from django.contrib import admin\nfrom main_app.models import *\nfrom main_app.forms import (\n AdminCenturyForm,\n AdminChantForm,\n AdminFeastForm,\n AdminGenreForm,\n AdminNotationForm,\n AdminOfficeForm,\n AdminProvenanceForm,\n AdminRismSiglumForm,\n AdminSegmentForm,\n AdminSequenceForm,\n AdminSourceForm,\n)\n\n# these fields should not be editable by all classes\nEXCLUDE = (\n \"created_by\",\n \"last_updated_by\",\n \"json_info\",\n)\n\n\nclass BaseModelAdmin(admin.ModelAdmin):\n exclude = EXCLUDE\n\n # if an object is created in the admin interface, assign the user to the created_by field\n # else if an object is updated in the admin interface, assign the user to the last_updated_by field\n def save_model(self, request, obj, form, change):\n if change:\n obj.last_updated_by = request.user\n else:\n obj.created_by = request.user\n super().save_model(request, obj, form, change)\n\n\nclass CenturyAdmin(BaseModelAdmin):\n search_fields = (\"name\",)\n form = AdminCenturyForm\n\n\nclass ChantAdmin(BaseModelAdmin):\n @admin.display(description=\"Source Siglum\")\n def get_source_siglum(self, obj):\n if obj.source:\n return obj.source.siglum\n\n list_display = (\n \"incipit\",\n \"get_source_siglum\",\n \"genre\",\n )\n search_fields = (\n \"title\",\n \"incipit\",\n \"cantus_id\",\n \"id\",\n )\n\n readonly_fields = (\n \"date_created\",\n \"date_updated\",\n )\n\n list_filter = (\n \"genre\",\n \"office\",\n )\n exclude = EXCLUDE + (\n \"col1\",\n \"col2\",\n \"col3\",\n \"next_chant\",\n \"s_sequence\",\n \"is_last_chant_in_feast\",\n \"visible_status\",\n \"date\",\n \"volpiano_notes\",\n \"volpiano_intervals\",\n )\n form = AdminChantForm\n raw_id_fields = (\n \"source\",\n \"feast\",\n )\n ordering = (\"source__siglum\",)\n\n\nclass FeastAdmin(BaseModelAdmin):\n search_fields = (\n \"name\",\n \"feast_code\",\n )\n list_display = (\n \"name\",\n \"month\",\n \"day\",\n \"feast_code\",\n )\n form = AdminFeastForm\n\n\nclass GenreAdmin(BaseModelAdmin):\n search_fields = (\"name\",)\n form = AdminGenreForm\n\n\nclass NotationAdmin(BaseModelAdmin):\n search_fields = (\"name\",)\n form = AdminNotationForm\n\n\nclass OfficeAdmin(BaseModelAdmin):\n search_fields = (\"name\",)\n form = AdminOfficeForm\n\n\nclass ProvenanceAdmin(BaseModelAdmin):\n search_fields = (\"name\",)\n form = AdminProvenanceForm\n\n\nclass RismSiglumAdmin(BaseModelAdmin):\n search_fields = (\"name\",)\n form = AdminRismSiglumForm\n\n\nclass SegmentAdmin(BaseModelAdmin):\n search_fields = (\"name\",)\n form = AdminSegmentForm\n\n\nclass SequenceAdmin(BaseModelAdmin):\n @admin.display(description=\"Source Siglum\")\n def get_source_siglum(self, obj):\n if obj.source:\n return obj.source.siglum\n\n search_fields = (\n \"title\",\n \"incipit\",\n \"cantus_id\",\n \"id\",\n )\n exclude = EXCLUDE + (\n \"c_sequence\",\n \"next_chant\",\n \"is_last_chant_in_feast\",\n \"visible_status\",\n )\n list_display = (\"incipit\", \"get_source_siglum\", \"genre\")\n list_filter = (\n \"genre\",\n \"office\",\n )\n raw_id_fields = (\n \"source\",\n \"feast\",\n )\n ordering = (\"source__siglum\",)\n form = AdminSequenceForm\n\n\nclass SourceAdmin(BaseModelAdmin):\n # These search fields are also available on the user-source inline relationship in the user admin page\n search_fields = (\n \"siglum\",\n \"title\",\n \"id\",\n )\n readonly_fields = (\n \"number_of_chants\",\n \"number_of_melodies\",\n \"date_created\",\n \"date_updated\",\n )\n # from the Django docs:\n # Adding a ManyToManyField to this list will instead use a nifty unobtrusive JavaScript “filter” interface\n # that allows searching within the options. The unselected and selected options appear in two boxes side by side.\n filter_horizontal = (\n \"century\",\n \"notation\",\n \"current_editors\",\n \"inventoried_by\",\n \"full_text_entered_by\",\n \"melodies_entered_by\",\n \"proofreaders\",\n \"other_editors\",\n )\n\n list_display = (\n \"title\",\n \"siglum\",\n \"id\",\n )\n\n list_filter = (\n \"full_source\",\n \"segment\",\n \"source_status\",\n \"published\",\n \"century\",\n )\n\n ordering = (\"siglum\",)\n\n form = AdminSourceForm\n\n\nadmin.site.register(Century, CenturyAdmin)\nadmin.site.register(Chant, ChantAdmin)\nadmin.site.register(Feast, FeastAdmin)\nadmin.site.register(Genre, GenreAdmin)\nadmin.site.register(Notation, NotationAdmin)\nadmin.site.register(Office, OfficeAdmin)\nadmin.site.register(Provenance, ProvenanceAdmin)\nadmin.site.register(RismSiglum, RismSiglumAdmin)\nadmin.site.register(Segment, SegmentAdmin)\nadmin.site.register(Sequence, SequenceAdmin)\nadmin.site.register(Source, SourceAdmin)\n", "path": "django/cantusdb_project/main_app/admin.py" } ]
diff --git a/django/cantusdb_project/main_app/admin.py b/django/cantusdb_project/main_app/admin.py index 9dd61e38f..1885bbffd 100644 --- a/django/cantusdb_project/main_app/admin.py +++ b/django/cantusdb_project/main_app/admin.py @@ -76,6 +76,8 @@ def get_source_siglum(self, obj): "is_last_chant_in_feast", "visible_status", "date", + "volpiano_notes", + "volpiano_intervals", ) form = AdminChantForm raw_id_fields = (
streamlit__streamlit-7257
[ { "content": "# Copyright (c) Streamlit Inc. (2018-2022) Snowflake Inc. (2022)\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nimport requests\n\nimport streamlit as st\n\nurl = \"https://www.w3schools.com/html/mov_bbb.mp4\"\nfile = requests.get(url).content\nst.video(file)\n", "path": "e2e/scripts/st_video.py" } ]
[ { "content": "# Copyright (c) Streamlit Inc. (2018-2022) Snowflake Inc. (2022)\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nimport requests\n\nimport streamlit as st\n\nurl = \"https://www.w3schools.com/html/mov_bbb.mp4\"\nfile = requests.get(url).content\nst.video(file)\n\n# Test start time with widget\ntimestamp = st.number_input(\"Start Time (in seconds)\", min_value=0, value=6)\nst.video(url, start_time=int(timestamp))\n", "path": "e2e/scripts/st_video.py" } ]
diff --git a/e2e/scripts/st_video.py b/e2e/scripts/st_video.py index 376155d892b9..0d93fe4ff58c 100644 --- a/e2e/scripts/st_video.py +++ b/e2e/scripts/st_video.py @@ -19,3 +19,7 @@ url = "https://www.w3schools.com/html/mov_bbb.mp4" file = requests.get(url).content st.video(file) + +# Test start time with widget +timestamp = st.number_input("Start Time (in seconds)", min_value=0, value=6) +st.video(url, start_time=int(timestamp)) diff --git a/e2e/specs/st_video.spec.js b/e2e/specs/st_video.spec.js index 003cb7b44cc7..7c1545609b93 100644 --- a/e2e/specs/st_video.spec.js +++ b/e2e/specs/st_video.spec.js @@ -22,6 +22,21 @@ describe("st.video", () => { }); it("displays a video player", () => { - cy.get(".element-container .stVideo").should("have.attr", "src"); + cy.getIndexed(".element-container .stVideo", 0).should("have.attr", "src"); + }); + + it("handles a start time", () => { + cy.getIndexed(".element-container .stVideo", 1).should("have.attr", "src"); + }); + + it("handles changes in start time", () => { + // Change the start time from 6 to 5 + cy.get(".element-container .stNumberInput .step-down").click(); + + // Wait for the video start time to update + cy.wait(3000); + + // Confirm video updated + cy.getIndexed(".element-container .stVideo", 1).matchImageSnapshot("video-updated-start"); }); }); diff --git a/frontend/cypress/snapshots/linux/2x/st_video.spec.js/video-updated-start.snap.png b/frontend/cypress/snapshots/linux/2x/st_video.spec.js/video-updated-start.snap.png new file mode 100644 index 000000000000..5b863b082689 Binary files /dev/null and b/frontend/cypress/snapshots/linux/2x/st_video.spec.js/video-updated-start.snap.png differ diff --git a/frontend/lib/src/components/elements/Video/Video.tsx b/frontend/lib/src/components/elements/Video/Video.tsx index 67d9ebe74be6..b028922d1096 100644 --- a/frontend/lib/src/components/elements/Video/Video.tsx +++ b/frontend/lib/src/components/elements/Video/Video.tsx @@ -35,7 +35,14 @@ export default function Video({ /* Element may contain "url" or "data" property. */ - const { type, url } = element + const { type, url, startTime } = element + + // Handle startTime changes + useEffect(() => { + if (videoRef.current) { + videoRef.current.currentTime = startTime + } + }, [startTime]) useEffect(() => { const videoNode = videoRef.current
aio-libs__aiohttp-7245
[ { "content": "\"\"\"HTTP Client for asyncio.\"\"\"\n\nimport asyncio\nimport base64\nimport hashlib\nimport json\nimport os\nimport sys\nimport traceback\nimport warnings\nfrom contextlib import suppress\nfrom types import SimpleNamespace, TracebackType\nfrom typing import (\n Any,\n Awaitable,\n Callable,\n Coroutine,\n FrozenSet,\n Generator,\n Generic,\n Iterable,\n List,\n Mapping,\n Optional,\n Set,\n Tuple,\n Type,\n TypeVar,\n Union,\n)\n\nimport attr\nfrom multidict import CIMultiDict, MultiDict, MultiDictProxy, istr\nfrom yarl import URL\n\nfrom . import hdrs, http, payload\nfrom .abc import AbstractCookieJar\nfrom .client_exceptions import (\n ClientConnectionError as ClientConnectionError,\n ClientConnectorCertificateError as ClientConnectorCertificateError,\n ClientConnectorError as ClientConnectorError,\n ClientConnectorSSLError as ClientConnectorSSLError,\n ClientError as ClientError,\n ClientHttpProxyError as ClientHttpProxyError,\n ClientOSError as ClientOSError,\n ClientPayloadError as ClientPayloadError,\n ClientProxyConnectionError as ClientProxyConnectionError,\n ClientResponseError as ClientResponseError,\n ClientSSLError as ClientSSLError,\n ContentTypeError as ContentTypeError,\n InvalidURL as InvalidURL,\n ServerConnectionError as ServerConnectionError,\n ServerDisconnectedError as ServerDisconnectedError,\n ServerFingerprintMismatch as ServerFingerprintMismatch,\n ServerTimeoutError as ServerTimeoutError,\n TooManyRedirects as TooManyRedirects,\n WSServerHandshakeError as WSServerHandshakeError,\n)\nfrom .client_reqrep import (\n ClientRequest as ClientRequest,\n ClientResponse as ClientResponse,\n Fingerprint as Fingerprint,\n RequestInfo as RequestInfo,\n _merge_ssl_params,\n)\nfrom .client_ws import ClientWebSocketResponse as ClientWebSocketResponse\nfrom .connector import (\n BaseConnector as BaseConnector,\n NamedPipeConnector as NamedPipeConnector,\n TCPConnector as TCPConnector,\n UnixConnector as UnixConnector,\n)\nfrom .cookiejar import CookieJar\nfrom .helpers import (\n _SENTINEL,\n DEBUG,\n BasicAuth,\n TimeoutHandle,\n ceil_timeout,\n get_env_proxy_for_url,\n get_running_loop,\n sentinel,\n strip_auth_from_url,\n)\nfrom .http import WS_KEY, HttpVersion, WebSocketReader, WebSocketWriter\nfrom .http_websocket import WSHandshakeError, WSMessage, ws_ext_gen, ws_ext_parse\nfrom .streams import FlowControlDataQueue\nfrom .tracing import Trace, TraceConfig\nfrom .typedefs import Final, JSONEncoder, LooseCookies, LooseHeaders, StrOrURL\n\n__all__ = (\n # client_exceptions\n \"ClientConnectionError\",\n \"ClientConnectorCertificateError\",\n \"ClientConnectorError\",\n \"ClientConnectorSSLError\",\n \"ClientError\",\n \"ClientHttpProxyError\",\n \"ClientOSError\",\n \"ClientPayloadError\",\n \"ClientProxyConnectionError\",\n \"ClientResponseError\",\n \"ClientSSLError\",\n \"ContentTypeError\",\n \"InvalidURL\",\n \"ServerConnectionError\",\n \"ServerDisconnectedError\",\n \"ServerFingerprintMismatch\",\n \"ServerTimeoutError\",\n \"TooManyRedirects\",\n \"WSServerHandshakeError\",\n # client_reqrep\n \"ClientRequest\",\n \"ClientResponse\",\n \"Fingerprint\",\n \"RequestInfo\",\n # connector\n \"BaseConnector\",\n \"TCPConnector\",\n \"UnixConnector\",\n \"NamedPipeConnector\",\n # client_ws\n \"ClientWebSocketResponse\",\n # client\n \"ClientSession\",\n \"ClientTimeout\",\n \"request\",\n)\n\n\ntry:\n from ssl import SSLContext\nexcept ImportError: # pragma: no cover\n SSLContext = object # type: ignore[misc,assignment]\n\n\n@attr.s(auto_attribs=True, frozen=True, slots=True)\nclass ClientTimeout:\n total: Optional[float] = None\n connect: Optional[float] = None\n sock_read: Optional[float] = None\n sock_connect: Optional[float] = None\n ceil_threshold: float = 5\n\n # pool_queue_timeout: Optional[float] = None\n # dns_resolution_timeout: Optional[float] = None\n # socket_connect_timeout: Optional[float] = None\n # connection_acquiring_timeout: Optional[float] = None\n # new_connection_timeout: Optional[float] = None\n # http_header_timeout: Optional[float] = None\n # response_body_timeout: Optional[float] = None\n\n # to create a timeout specific for a single request, either\n # - create a completely new one to overwrite the default\n # - or use http://www.attrs.org/en/stable/api.html#attr.evolve\n # to overwrite the defaults\n\n\n# 5 Minute default read timeout\nDEFAULT_TIMEOUT: Final[ClientTimeout] = ClientTimeout(total=5 * 60)\n\n_RetType = TypeVar(\"_RetType\")\n\n\nclass ClientSession:\n \"\"\"First-class interface for making HTTP requests.\"\"\"\n\n ATTRS = frozenset(\n [\n \"_base_url\",\n \"_source_traceback\",\n \"_connector\",\n \"requote_redirect_url\",\n \"_loop\",\n \"_cookie_jar\",\n \"_connector_owner\",\n \"_default_auth\",\n \"_version\",\n \"_json_serialize\",\n \"_requote_redirect_url\",\n \"_timeout\",\n \"_raise_for_status\",\n \"_auto_decompress\",\n \"_trust_env\",\n \"_default_headers\",\n \"_skip_auto_headers\",\n \"_request_class\",\n \"_response_class\",\n \"_ws_response_class\",\n \"_trace_configs\",\n \"_read_bufsize\",\n ]\n )\n\n _source_traceback: Optional[traceback.StackSummary] = None\n _connector: Optional[BaseConnector] = None\n\n def __init__(\n self,\n base_url: Optional[StrOrURL] = None,\n *,\n connector: Optional[BaseConnector] = None,\n loop: Optional[asyncio.AbstractEventLoop] = None,\n cookies: Optional[LooseCookies] = None,\n headers: Optional[LooseHeaders] = None,\n skip_auto_headers: Optional[Iterable[str]] = None,\n auth: Optional[BasicAuth] = None,\n json_serialize: JSONEncoder = json.dumps,\n request_class: Type[ClientRequest] = ClientRequest,\n response_class: Type[ClientResponse] = ClientResponse,\n ws_response_class: Type[ClientWebSocketResponse] = ClientWebSocketResponse,\n version: HttpVersion = http.HttpVersion11,\n cookie_jar: Optional[AbstractCookieJar] = None,\n connector_owner: bool = True,\n raise_for_status: Union[\n bool, Callable[[ClientResponse], Awaitable[None]]\n ] = False,\n read_timeout: Union[float, object] = sentinel,\n conn_timeout: Optional[float] = None,\n timeout: Union[object, ClientTimeout] = sentinel,\n auto_decompress: bool = True,\n trust_env: bool = False,\n requote_redirect_url: bool = True,\n trace_configs: Optional[List[TraceConfig]] = None,\n read_bufsize: int = 2**16,\n ) -> None:\n if loop is None:\n if connector is not None:\n loop = connector._loop\n\n loop = get_running_loop(loop)\n\n if base_url is None or isinstance(base_url, URL):\n self._base_url: Optional[URL] = base_url\n else:\n self._base_url = URL(base_url)\n assert (\n self._base_url.origin() == self._base_url\n ), \"Only absolute URLs without path part are supported\"\n\n if connector is None:\n connector = TCPConnector(loop=loop)\n\n if connector._loop is not loop:\n raise RuntimeError(\"Session and connector has to use same event loop\")\n\n self._loop = loop\n\n if loop.get_debug():\n self._source_traceback = traceback.extract_stack(sys._getframe(1))\n\n if cookie_jar is None:\n cookie_jar = CookieJar(loop=loop)\n self._cookie_jar = cookie_jar\n\n if cookies is not None:\n self._cookie_jar.update_cookies(cookies)\n\n self._connector = connector\n self._connector_owner = connector_owner\n self._default_auth = auth\n self._version = version\n self._json_serialize = json_serialize\n if timeout is sentinel:\n self._timeout = DEFAULT_TIMEOUT\n if read_timeout is not sentinel:\n warnings.warn(\n \"read_timeout is deprecated, \" \"use timeout argument instead\",\n DeprecationWarning,\n stacklevel=2,\n )\n self._timeout = attr.evolve(self._timeout, total=read_timeout)\n if conn_timeout is not None:\n self._timeout = attr.evolve(self._timeout, connect=conn_timeout)\n warnings.warn(\n \"conn_timeout is deprecated, \" \"use timeout argument instead\",\n DeprecationWarning,\n stacklevel=2,\n )\n else:\n self._timeout = timeout # type: ignore[assignment]\n if read_timeout is not sentinel:\n raise ValueError(\n \"read_timeout and timeout parameters \"\n \"conflict, please setup \"\n \"timeout.read\"\n )\n if conn_timeout is not None:\n raise ValueError(\n \"conn_timeout and timeout parameters \"\n \"conflict, please setup \"\n \"timeout.connect\"\n )\n self._raise_for_status = raise_for_status\n self._auto_decompress = auto_decompress\n self._trust_env = trust_env\n self._requote_redirect_url = requote_redirect_url\n self._read_bufsize = read_bufsize\n\n # Convert to list of tuples\n if headers:\n real_headers: CIMultiDict[str] = CIMultiDict(headers)\n else:\n real_headers = CIMultiDict()\n self._default_headers: CIMultiDict[str] = real_headers\n if skip_auto_headers is not None:\n self._skip_auto_headers = frozenset(istr(i) for i in skip_auto_headers)\n else:\n self._skip_auto_headers = frozenset()\n\n self._request_class = request_class\n self._response_class = response_class\n self._ws_response_class = ws_response_class\n\n self._trace_configs = trace_configs or []\n for trace_config in self._trace_configs:\n trace_config.freeze()\n\n def __init_subclass__(cls: Type[\"ClientSession\"]) -> None:\n warnings.warn(\n \"Inheritance class {} from ClientSession \"\n \"is discouraged\".format(cls.__name__),\n DeprecationWarning,\n stacklevel=2,\n )\n\n if DEBUG:\n\n def __setattr__(self, name: str, val: Any) -> None:\n if name not in self.ATTRS:\n warnings.warn(\n \"Setting custom ClientSession.{} attribute \"\n \"is discouraged\".format(name),\n DeprecationWarning,\n stacklevel=2,\n )\n super().__setattr__(name, val)\n\n def __del__(self, _warnings: Any = warnings) -> None:\n if not self.closed:\n kwargs = {\"source\": self}\n _warnings.warn(\n f\"Unclosed client session {self!r}\", ResourceWarning, **kwargs\n )\n context = {\"client_session\": self, \"message\": \"Unclosed client session\"}\n if self._source_traceback is not None:\n context[\"source_traceback\"] = self._source_traceback\n self._loop.call_exception_handler(context)\n\n def request(\n self, method: str, url: StrOrURL, **kwargs: Any\n ) -> \"_RequestContextManager\":\n \"\"\"Perform HTTP request.\"\"\"\n return _RequestContextManager(self._request(method, url, **kwargs))\n\n def _build_url(self, str_or_url: StrOrURL) -> URL:\n url = URL(str_or_url)\n if self._base_url is None:\n return url\n else:\n assert not url.is_absolute() and url.path.startswith(\"/\")\n return self._base_url.join(url)\n\n async def _request(\n self,\n method: str,\n str_or_url: StrOrURL,\n *,\n params: Optional[Mapping[str, str]] = None,\n data: Any = None,\n json: Any = None,\n cookies: Optional[LooseCookies] = None,\n headers: Optional[LooseHeaders] = None,\n skip_auto_headers: Optional[Iterable[str]] = None,\n auth: Optional[BasicAuth] = None,\n allow_redirects: bool = True,\n max_redirects: int = 10,\n compress: Optional[str] = None,\n chunked: Optional[bool] = None,\n expect100: bool = False,\n raise_for_status: Union[\n None, bool, Callable[[ClientResponse], Awaitable[None]]\n ] = None,\n read_until_eof: bool = True,\n proxy: Optional[StrOrURL] = None,\n proxy_auth: Optional[BasicAuth] = None,\n timeout: Union[ClientTimeout, _SENTINEL] = sentinel,\n verify_ssl: Optional[bool] = None,\n fingerprint: Optional[bytes] = None,\n ssl_context: Optional[SSLContext] = None,\n ssl: Optional[Union[SSLContext, bool, Fingerprint]] = None,\n proxy_headers: Optional[LooseHeaders] = None,\n trace_request_ctx: Optional[SimpleNamespace] = None,\n read_bufsize: Optional[int] = None,\n auto_decompress: Optional[bool] = None,\n ) -> ClientResponse:\n\n # NOTE: timeout clamps existing connect and read timeouts. We cannot\n # set the default to None because we need to detect if the user wants\n # to use the existing timeouts by setting timeout to None.\n\n if self.closed:\n raise RuntimeError(\"Session is closed\")\n\n ssl = _merge_ssl_params(ssl, verify_ssl, ssl_context, fingerprint)\n\n if data is not None and json is not None:\n raise ValueError(\n \"data and json parameters can not be used at the same time\"\n )\n elif json is not None:\n data = payload.JsonPayload(json, dumps=self._json_serialize)\n\n if not isinstance(chunked, bool) and chunked is not None:\n warnings.warn(\"Chunk size is deprecated #1615\", DeprecationWarning)\n\n redirects = 0\n history = []\n version = self._version\n\n # Merge with default headers and transform to CIMultiDict\n headers = self._prepare_headers(headers)\n proxy_headers = self._prepare_headers(proxy_headers)\n\n try:\n url = self._build_url(str_or_url)\n except ValueError as e:\n raise InvalidURL(str_or_url) from e\n\n skip_headers = set(self._skip_auto_headers)\n if skip_auto_headers is not None:\n for i in skip_auto_headers:\n skip_headers.add(istr(i))\n\n if proxy is not None:\n try:\n proxy = URL(proxy)\n except ValueError as e:\n raise InvalidURL(proxy) from e\n\n if timeout is sentinel:\n real_timeout: ClientTimeout = self._timeout\n else:\n if not isinstance(timeout, ClientTimeout):\n real_timeout = ClientTimeout(total=timeout)\n else:\n real_timeout = timeout\n # timeout is cumulative for all request operations\n # (request, redirects, responses, data consuming)\n tm = TimeoutHandle(\n self._loop, real_timeout.total, ceil_threshold=real_timeout.ceil_threshold\n )\n handle = tm.start()\n\n if read_bufsize is None:\n read_bufsize = self._read_bufsize\n\n if auto_decompress is None:\n auto_decompress = self._auto_decompress\n\n traces = [\n Trace(\n self,\n trace_config,\n trace_config.trace_config_ctx(trace_request_ctx=trace_request_ctx),\n )\n for trace_config in self._trace_configs\n ]\n\n for trace in traces:\n await trace.send_request_start(method, url.update_query(params), headers)\n\n timer = tm.timer()\n try:\n with timer:\n while True:\n url, auth_from_url = strip_auth_from_url(url)\n if auth and auth_from_url:\n raise ValueError(\n \"Cannot combine AUTH argument with \"\n \"credentials encoded in URL\"\n )\n\n if auth is None:\n auth = auth_from_url\n if auth is None:\n auth = self._default_auth\n # It would be confusing if we support explicit\n # Authorization header with auth argument\n if (\n headers is not None\n and auth is not None\n and hdrs.AUTHORIZATION in headers\n ):\n raise ValueError(\n \"Cannot combine AUTHORIZATION header \"\n \"with AUTH argument or credentials \"\n \"encoded in URL\"\n )\n\n all_cookies = self._cookie_jar.filter_cookies(url)\n\n if cookies is not None:\n tmp_cookie_jar = CookieJar()\n tmp_cookie_jar.update_cookies(cookies)\n req_cookies = tmp_cookie_jar.filter_cookies(url)\n if req_cookies:\n all_cookies.load(req_cookies)\n\n if proxy is not None:\n proxy = URL(proxy)\n elif self._trust_env:\n with suppress(LookupError):\n proxy, proxy_auth = get_env_proxy_for_url(url)\n\n req = self._request_class(\n method,\n url,\n params=params,\n headers=headers,\n skip_auto_headers=skip_headers,\n data=data,\n cookies=all_cookies,\n auth=auth,\n version=version,\n compress=compress,\n chunked=chunked,\n expect100=expect100,\n loop=self._loop,\n response_class=self._response_class,\n proxy=proxy,\n proxy_auth=proxy_auth,\n timer=timer,\n session=self,\n ssl=ssl,\n proxy_headers=proxy_headers,\n traces=traces,\n )\n\n # connection timeout\n try:\n async with ceil_timeout(\n real_timeout.connect,\n ceil_threshold=real_timeout.ceil_threshold,\n ):\n assert self._connector is not None\n conn = await self._connector.connect(\n req, traces=traces, timeout=real_timeout\n )\n except asyncio.TimeoutError as exc:\n raise ServerTimeoutError(\n \"Connection timeout \" \"to host {}\".format(url)\n ) from exc\n\n assert conn.transport is not None\n\n assert conn.protocol is not None\n conn.protocol.set_response_params(\n timer=timer,\n skip_payload=method.upper() == \"HEAD\",\n read_until_eof=read_until_eof,\n auto_decompress=auto_decompress,\n read_timeout=real_timeout.sock_read,\n read_bufsize=read_bufsize,\n timeout_ceil_threshold=self._connector._timeout_ceil_threshold,\n )\n\n try:\n try:\n resp = await req.send(conn)\n try:\n await resp.start(conn)\n except BaseException:\n resp.close()\n raise\n except BaseException:\n conn.close()\n raise\n except ClientError:\n raise\n except OSError as exc:\n if exc.errno is None and isinstance(exc, asyncio.TimeoutError):\n raise\n raise ClientOSError(*exc.args) from exc\n\n self._cookie_jar.update_cookies(resp.cookies, resp.url)\n\n # redirects\n if resp.status in (301, 302, 303, 307, 308) and allow_redirects:\n\n for trace in traces:\n await trace.send_request_redirect(\n method, url.update_query(params), headers, resp\n )\n\n redirects += 1\n history.append(resp)\n if max_redirects and redirects >= max_redirects:\n resp.close()\n raise TooManyRedirects(\n history[0].request_info, tuple(history)\n )\n\n # For 301 and 302, mimic IE, now changed in RFC\n # https://github.com/kennethreitz/requests/pull/269\n if (resp.status == 303 and resp.method != hdrs.METH_HEAD) or (\n resp.status in (301, 302) and resp.method == hdrs.METH_POST\n ):\n method = hdrs.METH_GET\n data = None\n if headers.get(hdrs.CONTENT_LENGTH):\n headers.pop(hdrs.CONTENT_LENGTH)\n\n r_url = resp.headers.get(hdrs.LOCATION) or resp.headers.get(\n hdrs.URI\n )\n if r_url is None:\n # see github.com/aio-libs/aiohttp/issues/2022\n break\n else:\n # reading from correct redirection\n # response is forbidden\n resp.release()\n\n try:\n parsed_url = URL(\n r_url, encoded=not self._requote_redirect_url\n )\n\n except ValueError as e:\n raise InvalidURL(r_url) from e\n\n scheme = parsed_url.scheme\n if scheme not in (\"http\", \"https\", \"\"):\n resp.close()\n raise ValueError(\"Can redirect only to http or https\")\n elif not scheme:\n parsed_url = url.join(parsed_url)\n\n if url.origin() != parsed_url.origin():\n auth = None\n headers.pop(hdrs.AUTHORIZATION, None)\n\n url = parsed_url\n params = None\n resp.release()\n continue\n\n break\n\n # check response status\n if raise_for_status is None:\n raise_for_status = self._raise_for_status\n\n if raise_for_status is None:\n pass\n elif callable(raise_for_status):\n await raise_for_status(resp)\n elif raise_for_status:\n resp.raise_for_status()\n\n # register connection\n if handle is not None:\n if resp.connection is not None:\n resp.connection.add_callback(handle.cancel)\n else:\n handle.cancel()\n\n resp._history = tuple(history)\n\n for trace in traces:\n await trace.send_request_end(\n method, url.update_query(params), headers, resp\n )\n return resp\n\n except BaseException as e:\n # cleanup timer\n tm.close()\n if handle:\n handle.cancel()\n handle = None\n\n for trace in traces:\n await trace.send_request_exception(\n method, url.update_query(params), headers, e\n )\n raise\n\n def ws_connect(\n self,\n url: StrOrURL,\n *,\n method: str = hdrs.METH_GET,\n protocols: Iterable[str] = (),\n timeout: float = 10.0,\n receive_timeout: Optional[float] = None,\n autoclose: bool = True,\n autoping: bool = True,\n heartbeat: Optional[float] = None,\n auth: Optional[BasicAuth] = None,\n origin: Optional[str] = None,\n params: Optional[Mapping[str, str]] = None,\n headers: Optional[LooseHeaders] = None,\n proxy: Optional[StrOrURL] = None,\n proxy_auth: Optional[BasicAuth] = None,\n ssl: Union[SSLContext, bool, None, Fingerprint] = None,\n verify_ssl: Optional[bool] = None,\n fingerprint: Optional[bytes] = None,\n ssl_context: Optional[SSLContext] = None,\n proxy_headers: Optional[LooseHeaders] = None,\n compress: int = 0,\n max_msg_size: int = 4 * 1024 * 1024,\n ) -> \"_WSRequestContextManager\":\n \"\"\"Initiate websocket connection.\"\"\"\n return _WSRequestContextManager(\n self._ws_connect(\n url,\n method=method,\n protocols=protocols,\n timeout=timeout,\n receive_timeout=receive_timeout,\n autoclose=autoclose,\n autoping=autoping,\n heartbeat=heartbeat,\n auth=auth,\n origin=origin,\n params=params,\n headers=headers,\n proxy=proxy,\n proxy_auth=proxy_auth,\n ssl=ssl,\n verify_ssl=verify_ssl,\n fingerprint=fingerprint,\n ssl_context=ssl_context,\n proxy_headers=proxy_headers,\n compress=compress,\n max_msg_size=max_msg_size,\n )\n )\n\n async def _ws_connect(\n self,\n url: StrOrURL,\n *,\n method: str = hdrs.METH_GET,\n protocols: Iterable[str] = (),\n timeout: float = 10.0,\n receive_timeout: Optional[float] = None,\n autoclose: bool = True,\n autoping: bool = True,\n heartbeat: Optional[float] = None,\n auth: Optional[BasicAuth] = None,\n origin: Optional[str] = None,\n params: Optional[Mapping[str, str]] = None,\n headers: Optional[LooseHeaders] = None,\n proxy: Optional[StrOrURL] = None,\n proxy_auth: Optional[BasicAuth] = None,\n ssl: Union[SSLContext, bool, None, Fingerprint] = None,\n verify_ssl: Optional[bool] = None,\n fingerprint: Optional[bytes] = None,\n ssl_context: Optional[SSLContext] = None,\n proxy_headers: Optional[LooseHeaders] = None,\n compress: int = 0,\n max_msg_size: int = 4 * 1024 * 1024,\n ) -> ClientWebSocketResponse:\n\n if headers is None:\n real_headers: CIMultiDict[str] = CIMultiDict()\n else:\n real_headers = CIMultiDict(headers)\n\n default_headers = {\n hdrs.UPGRADE: \"websocket\",\n hdrs.CONNECTION: \"upgrade\",\n hdrs.SEC_WEBSOCKET_VERSION: \"13\",\n }\n\n for key, value in default_headers.items():\n real_headers.setdefault(key, value)\n\n sec_key = base64.b64encode(os.urandom(16))\n real_headers[hdrs.SEC_WEBSOCKET_KEY] = sec_key.decode()\n\n if protocols:\n real_headers[hdrs.SEC_WEBSOCKET_PROTOCOL] = \",\".join(protocols)\n if origin is not None:\n real_headers[hdrs.ORIGIN] = origin\n if compress:\n extstr = ws_ext_gen(compress=compress)\n real_headers[hdrs.SEC_WEBSOCKET_EXTENSIONS] = extstr\n\n ssl = _merge_ssl_params(ssl, verify_ssl, ssl_context, fingerprint)\n\n # send request\n resp = await self.request(\n method,\n url,\n params=params,\n headers=real_headers,\n read_until_eof=False,\n auth=auth,\n proxy=proxy,\n proxy_auth=proxy_auth,\n ssl=ssl,\n proxy_headers=proxy_headers,\n )\n\n try:\n # check handshake\n if resp.status != 101:\n raise WSServerHandshakeError(\n resp.request_info,\n resp.history,\n message=\"Invalid response status\",\n status=resp.status,\n headers=resp.headers,\n )\n\n if resp.headers.get(hdrs.UPGRADE, \"\").lower() != \"websocket\":\n raise WSServerHandshakeError(\n resp.request_info,\n resp.history,\n message=\"Invalid upgrade header\",\n status=resp.status,\n headers=resp.headers,\n )\n\n if resp.headers.get(hdrs.CONNECTION, \"\").lower() != \"upgrade\":\n raise WSServerHandshakeError(\n resp.request_info,\n resp.history,\n message=\"Invalid connection header\",\n status=resp.status,\n headers=resp.headers,\n )\n\n # key calculation\n r_key = resp.headers.get(hdrs.SEC_WEBSOCKET_ACCEPT, \"\")\n match = base64.b64encode(hashlib.sha1(sec_key + WS_KEY).digest()).decode()\n if r_key != match:\n raise WSServerHandshakeError(\n resp.request_info,\n resp.history,\n message=\"Invalid challenge response\",\n status=resp.status,\n headers=resp.headers,\n )\n\n # websocket protocol\n protocol = None\n if protocols and hdrs.SEC_WEBSOCKET_PROTOCOL in resp.headers:\n resp_protocols = [\n proto.strip()\n for proto in resp.headers[hdrs.SEC_WEBSOCKET_PROTOCOL].split(\",\")\n ]\n\n for proto in resp_protocols:\n if proto in protocols:\n protocol = proto\n break\n\n # websocket compress\n notakeover = False\n if compress:\n compress_hdrs = resp.headers.get(hdrs.SEC_WEBSOCKET_EXTENSIONS)\n if compress_hdrs:\n try:\n compress, notakeover = ws_ext_parse(compress_hdrs)\n except WSHandshakeError as exc:\n raise WSServerHandshakeError(\n resp.request_info,\n resp.history,\n message=exc.args[0],\n status=resp.status,\n headers=resp.headers,\n ) from exc\n else:\n compress = 0\n notakeover = False\n\n conn = resp.connection\n assert conn is not None\n conn_proto = conn.protocol\n assert conn_proto is not None\n transport = conn.transport\n assert transport is not None\n reader: FlowControlDataQueue[WSMessage] = FlowControlDataQueue(\n conn_proto, 2**16, loop=self._loop\n )\n conn_proto.set_parser(WebSocketReader(reader, max_msg_size), reader)\n writer = WebSocketWriter(\n conn_proto,\n transport,\n use_mask=True,\n compress=compress,\n notakeover=notakeover,\n )\n except BaseException:\n resp.close()\n raise\n else:\n return self._ws_response_class(\n reader,\n writer,\n protocol,\n resp,\n timeout,\n autoclose,\n autoping,\n self._loop,\n receive_timeout=receive_timeout,\n heartbeat=heartbeat,\n compress=compress,\n client_notakeover=notakeover,\n )\n\n def _prepare_headers(self, headers: Optional[LooseHeaders]) -> \"CIMultiDict[str]\":\n \"\"\"Add default headers and transform it to CIMultiDict\"\"\"\n # Convert headers to MultiDict\n result = CIMultiDict(self._default_headers)\n if headers:\n if not isinstance(headers, (MultiDictProxy, MultiDict)):\n headers = CIMultiDict(headers)\n added_names: Set[str] = set()\n for key, value in headers.items():\n if key in added_names:\n result.add(key, value)\n else:\n result[key] = value\n added_names.add(key)\n return result\n\n def get(\n self, url: StrOrURL, *, allow_redirects: bool = True, **kwargs: Any\n ) -> \"_RequestContextManager\":\n \"\"\"Perform HTTP GET request.\"\"\"\n return _RequestContextManager(\n self._request(hdrs.METH_GET, url, allow_redirects=allow_redirects, **kwargs)\n )\n\n def options(\n self, url: StrOrURL, *, allow_redirects: bool = True, **kwargs: Any\n ) -> \"_RequestContextManager\":\n \"\"\"Perform HTTP OPTIONS request.\"\"\"\n return _RequestContextManager(\n self._request(\n hdrs.METH_OPTIONS, url, allow_redirects=allow_redirects, **kwargs\n )\n )\n\n def head(\n self, url: StrOrURL, *, allow_redirects: bool = False, **kwargs: Any\n ) -> \"_RequestContextManager\":\n \"\"\"Perform HTTP HEAD request.\"\"\"\n return _RequestContextManager(\n self._request(\n hdrs.METH_HEAD, url, allow_redirects=allow_redirects, **kwargs\n )\n )\n\n def post(\n self, url: StrOrURL, *, data: Any = None, **kwargs: Any\n ) -> \"_RequestContextManager\":\n \"\"\"Perform HTTP POST request.\"\"\"\n return _RequestContextManager(\n self._request(hdrs.METH_POST, url, data=data, **kwargs)\n )\n\n def put(\n self, url: StrOrURL, *, data: Any = None, **kwargs: Any\n ) -> \"_RequestContextManager\":\n \"\"\"Perform HTTP PUT request.\"\"\"\n return _RequestContextManager(\n self._request(hdrs.METH_PUT, url, data=data, **kwargs)\n )\n\n def patch(\n self, url: StrOrURL, *, data: Any = None, **kwargs: Any\n ) -> \"_RequestContextManager\":\n \"\"\"Perform HTTP PATCH request.\"\"\"\n return _RequestContextManager(\n self._request(hdrs.METH_PATCH, url, data=data, **kwargs)\n )\n\n def delete(self, url: StrOrURL, **kwargs: Any) -> \"_RequestContextManager\":\n \"\"\"Perform HTTP DELETE request.\"\"\"\n return _RequestContextManager(self._request(hdrs.METH_DELETE, url, **kwargs))\n\n async def close(self) -> None:\n \"\"\"Close underlying connector.\n\n Release all acquired resources.\n \"\"\"\n if not self.closed:\n if self._connector is not None and self._connector_owner:\n await self._connector.close()\n self._connector = None\n\n @property\n def closed(self) -> bool:\n \"\"\"Is client session closed.\n\n A readonly property.\n \"\"\"\n return self._connector is None or self._connector.closed\n\n @property\n def connector(self) -> Optional[BaseConnector]:\n \"\"\"Connector instance used for the session.\"\"\"\n return self._connector\n\n @property\n def cookie_jar(self) -> AbstractCookieJar:\n \"\"\"The session cookies.\"\"\"\n return self._cookie_jar\n\n @property\n def version(self) -> Tuple[int, int]:\n \"\"\"The session HTTP protocol version.\"\"\"\n return self._version\n\n @property\n def requote_redirect_url(self) -> bool:\n \"\"\"Do URL requoting on redirection handling.\"\"\"\n return self._requote_redirect_url\n\n @requote_redirect_url.setter\n def requote_redirect_url(self, val: bool) -> None:\n \"\"\"Do URL requoting on redirection handling.\"\"\"\n warnings.warn(\n \"session.requote_redirect_url modification \" \"is deprecated #2778\",\n DeprecationWarning,\n stacklevel=2,\n )\n self._requote_redirect_url = val\n\n @property\n def loop(self) -> asyncio.AbstractEventLoop:\n \"\"\"Session's loop.\"\"\"\n warnings.warn(\n \"client.loop property is deprecated\", DeprecationWarning, stacklevel=2\n )\n return self._loop\n\n @property\n def timeout(self) -> ClientTimeout:\n \"\"\"Timeout for the session.\"\"\"\n return self._timeout\n\n @property\n def headers(self) -> \"CIMultiDict[str]\":\n \"\"\"The default headers of the client session.\"\"\"\n return self._default_headers\n\n @property\n def skip_auto_headers(self) -> FrozenSet[istr]:\n \"\"\"Headers for which autogeneration should be skipped\"\"\"\n return self._skip_auto_headers\n\n @property\n def auth(self) -> Optional[BasicAuth]:\n \"\"\"An object that represents HTTP Basic Authorization\"\"\"\n return self._default_auth\n\n @property\n def json_serialize(self) -> JSONEncoder:\n \"\"\"Json serializer callable\"\"\"\n return self._json_serialize\n\n @property\n def connector_owner(self) -> bool:\n \"\"\"Should connector be closed on session closing\"\"\"\n return self._connector_owner\n\n @property\n def raise_for_status(\n self,\n ) -> Union[bool, Callable[[ClientResponse], Awaitable[None]]]:\n \"\"\"Should `ClientResponse.raise_for_status()` be called for each response.\"\"\"\n return self._raise_for_status\n\n @property\n def auto_decompress(self) -> bool:\n \"\"\"Should the body response be automatically decompressed.\"\"\"\n return self._auto_decompress\n\n @property\n def trust_env(self) -> bool:\n \"\"\"\n Should proxies information from environment or netrc be trusted.\n\n Information is from HTTP_PROXY / HTTPS_PROXY environment variables\n or ~/.netrc file if present.\n \"\"\"\n return self._trust_env\n\n @property\n def trace_configs(self) -> List[TraceConfig]:\n \"\"\"A list of TraceConfig instances used for client tracing\"\"\"\n return self._trace_configs\n\n def detach(self) -> None:\n \"\"\"Detach connector from session without closing the former.\n\n Session is switched to closed state anyway.\n \"\"\"\n self._connector = None\n\n def __enter__(self) -> None:\n raise TypeError(\"Use async with instead\")\n\n def __exit__(\n self,\n exc_type: Optional[Type[BaseException]],\n exc_val: Optional[BaseException],\n exc_tb: Optional[TracebackType],\n ) -> None:\n # __exit__ should exist in pair with __enter__ but never executed\n pass # pragma: no cover\n\n async def __aenter__(self) -> \"ClientSession\":\n return self\n\n async def __aexit__(\n self,\n exc_type: Optional[Type[BaseException]],\n exc_val: Optional[BaseException],\n exc_tb: Optional[TracebackType],\n ) -> None:\n await self.close()\n\n\nclass _BaseRequestContextManager(Coroutine[Any, Any, _RetType], Generic[_RetType]):\n\n __slots__ = (\"_coro\", \"_resp\")\n\n def __init__(self, coro: Coroutine[\"asyncio.Future[Any]\", None, _RetType]) -> None:\n self._coro = coro\n\n def send(self, arg: None) -> \"asyncio.Future[Any]\":\n return self._coro.send(arg)\n\n def throw(self, arg: BaseException) -> None: # type: ignore[override]\n self._coro.throw(arg)\n\n def close(self) -> None:\n return self._coro.close()\n\n def __await__(self) -> Generator[Any, None, _RetType]:\n ret = self._coro.__await__()\n return ret\n\n def __iter__(self) -> Generator[Any, None, _RetType]:\n return self.__await__()\n\n async def __aenter__(self) -> _RetType:\n self._resp = await self._coro\n return self._resp\n\n\nclass _RequestContextManager(_BaseRequestContextManager[ClientResponse]):\n __slots__ = ()\n\n async def __aexit__(\n self,\n exc_type: Optional[Type[BaseException]],\n exc: Optional[BaseException],\n tb: Optional[TracebackType],\n ) -> None:\n # We're basing behavior on the exception as it can be caused by\n # user code unrelated to the status of the connection. If you\n # would like to close a connection you must do that\n # explicitly. Otherwise connection error handling should kick in\n # and close/recycle the connection as required.\n self._resp.release()\n\n\nclass _WSRequestContextManager(_BaseRequestContextManager[ClientWebSocketResponse]):\n __slots__ = ()\n\n async def __aexit__(\n self,\n exc_type: Optional[Type[BaseException]],\n exc: Optional[BaseException],\n tb: Optional[TracebackType],\n ) -> None:\n await self._resp.close()\n\n\nclass _SessionRequestContextManager:\n\n __slots__ = (\"_coro\", \"_resp\", \"_session\")\n\n def __init__(\n self,\n coro: Coroutine[\"asyncio.Future[Any]\", None, ClientResponse],\n session: ClientSession,\n ) -> None:\n self._coro = coro\n self._resp: Optional[ClientResponse] = None\n self._session = session\n\n async def __aenter__(self) -> ClientResponse:\n try:\n self._resp = await self._coro\n except BaseException:\n await self._session.close()\n raise\n else:\n return self._resp\n\n async def __aexit__(\n self,\n exc_type: Optional[Type[BaseException]],\n exc: Optional[BaseException],\n tb: Optional[TracebackType],\n ) -> None:\n assert self._resp is not None\n self._resp.close()\n await self._session.close()\n\n\ndef request(\n method: str,\n url: StrOrURL,\n *,\n params: Optional[Mapping[str, str]] = None,\n data: Any = None,\n json: Any = None,\n headers: Optional[LooseHeaders] = None,\n skip_auto_headers: Optional[Iterable[str]] = None,\n auth: Optional[BasicAuth] = None,\n allow_redirects: bool = True,\n max_redirects: int = 10,\n compress: Optional[str] = None,\n chunked: Optional[bool] = None,\n expect100: bool = False,\n raise_for_status: Optional[bool] = None,\n read_until_eof: bool = True,\n proxy: Optional[StrOrURL] = None,\n proxy_auth: Optional[BasicAuth] = None,\n timeout: Union[ClientTimeout, object] = sentinel,\n cookies: Optional[LooseCookies] = None,\n version: HttpVersion = http.HttpVersion11,\n connector: Optional[BaseConnector] = None,\n read_bufsize: Optional[int] = None,\n loop: Optional[asyncio.AbstractEventLoop] = None,\n) -> _SessionRequestContextManager:\n \"\"\"Constructs and sends a request.\n\n Returns response object.\n method - HTTP method\n url - request url\n params - (optional) Dictionary or bytes to be sent in the query\n string of the new request\n data - (optional) Dictionary, bytes, or file-like object to\n send in the body of the request\n json - (optional) Any json compatible python object\n headers - (optional) Dictionary of HTTP Headers to send with\n the request\n cookies - (optional) Dict object to send with the request\n auth - (optional) BasicAuth named tuple represent HTTP Basic Auth\n auth - aiohttp.helpers.BasicAuth\n allow_redirects - (optional) If set to False, do not follow\n redirects\n version - Request HTTP version.\n compress - Set to True if request has to be compressed\n with deflate encoding.\n chunked - Set to chunk size for chunked transfer encoding.\n expect100 - Expect 100-continue response from server.\n connector - BaseConnector sub-class instance to support\n connection pooling.\n read_until_eof - Read response until eof if response\n does not have Content-Length header.\n loop - Optional event loop.\n timeout - Optional ClientTimeout settings structure, 5min\n total timeout by default.\n Usage::\n >>> import aiohttp\n >>> resp = await aiohttp.request('GET', 'http://python.org/')\n >>> resp\n <ClientResponse(python.org/) [200]>\n >>> data = await resp.read()\n \"\"\"\n connector_owner = False\n if connector is None:\n connector_owner = True\n connector = TCPConnector(loop=loop, force_close=True)\n\n session = ClientSession(\n loop=loop,\n cookies=cookies,\n version=version,\n timeout=timeout,\n connector=connector,\n connector_owner=connector_owner,\n )\n\n return _SessionRequestContextManager(\n session._request(\n method,\n url,\n params=params,\n data=data,\n json=json,\n headers=headers,\n skip_auto_headers=skip_auto_headers,\n auth=auth,\n allow_redirects=allow_redirects,\n max_redirects=max_redirects,\n compress=compress,\n chunked=chunked,\n expect100=expect100,\n raise_for_status=raise_for_status,\n read_until_eof=read_until_eof,\n proxy=proxy,\n proxy_auth=proxy_auth,\n read_bufsize=read_bufsize,\n ),\n session,\n )\n", "path": "aiohttp/client.py" } ]
[ { "content": "\"\"\"HTTP Client for asyncio.\"\"\"\n\nimport asyncio\nimport base64\nimport hashlib\nimport json\nimport os\nimport sys\nimport traceback\nimport warnings\nfrom contextlib import suppress\nfrom types import SimpleNamespace, TracebackType\nfrom typing import (\n Any,\n Awaitable,\n Callable,\n Coroutine,\n FrozenSet,\n Generator,\n Generic,\n Iterable,\n List,\n Mapping,\n Optional,\n Set,\n Tuple,\n Type,\n TypeVar,\n Union,\n)\n\nimport attr\nfrom multidict import CIMultiDict, MultiDict, MultiDictProxy, istr\nfrom yarl import URL\n\nfrom . import hdrs, http, payload\nfrom .abc import AbstractCookieJar\nfrom .client_exceptions import (\n ClientConnectionError as ClientConnectionError,\n ClientConnectorCertificateError as ClientConnectorCertificateError,\n ClientConnectorError as ClientConnectorError,\n ClientConnectorSSLError as ClientConnectorSSLError,\n ClientError as ClientError,\n ClientHttpProxyError as ClientHttpProxyError,\n ClientOSError as ClientOSError,\n ClientPayloadError as ClientPayloadError,\n ClientProxyConnectionError as ClientProxyConnectionError,\n ClientResponseError as ClientResponseError,\n ClientSSLError as ClientSSLError,\n ContentTypeError as ContentTypeError,\n InvalidURL as InvalidURL,\n ServerConnectionError as ServerConnectionError,\n ServerDisconnectedError as ServerDisconnectedError,\n ServerFingerprintMismatch as ServerFingerprintMismatch,\n ServerTimeoutError as ServerTimeoutError,\n TooManyRedirects as TooManyRedirects,\n WSServerHandshakeError as WSServerHandshakeError,\n)\nfrom .client_reqrep import (\n ClientRequest as ClientRequest,\n ClientResponse as ClientResponse,\n Fingerprint as Fingerprint,\n RequestInfo as RequestInfo,\n _merge_ssl_params,\n)\nfrom .client_ws import ClientWebSocketResponse as ClientWebSocketResponse\nfrom .connector import (\n BaseConnector as BaseConnector,\n NamedPipeConnector as NamedPipeConnector,\n TCPConnector as TCPConnector,\n UnixConnector as UnixConnector,\n)\nfrom .cookiejar import CookieJar\nfrom .helpers import (\n _SENTINEL,\n DEBUG,\n BasicAuth,\n TimeoutHandle,\n ceil_timeout,\n get_env_proxy_for_url,\n get_running_loop,\n sentinel,\n strip_auth_from_url,\n)\nfrom .http import WS_KEY, HttpVersion, WebSocketReader, WebSocketWriter\nfrom .http_websocket import WSHandshakeError, WSMessage, ws_ext_gen, ws_ext_parse\nfrom .streams import FlowControlDataQueue\nfrom .tracing import Trace, TraceConfig\nfrom .typedefs import Final, JSONEncoder, LooseCookies, LooseHeaders, StrOrURL\n\n__all__ = (\n # client_exceptions\n \"ClientConnectionError\",\n \"ClientConnectorCertificateError\",\n \"ClientConnectorError\",\n \"ClientConnectorSSLError\",\n \"ClientError\",\n \"ClientHttpProxyError\",\n \"ClientOSError\",\n \"ClientPayloadError\",\n \"ClientProxyConnectionError\",\n \"ClientResponseError\",\n \"ClientSSLError\",\n \"ContentTypeError\",\n \"InvalidURL\",\n \"ServerConnectionError\",\n \"ServerDisconnectedError\",\n \"ServerFingerprintMismatch\",\n \"ServerTimeoutError\",\n \"TooManyRedirects\",\n \"WSServerHandshakeError\",\n # client_reqrep\n \"ClientRequest\",\n \"ClientResponse\",\n \"Fingerprint\",\n \"RequestInfo\",\n # connector\n \"BaseConnector\",\n \"TCPConnector\",\n \"UnixConnector\",\n \"NamedPipeConnector\",\n # client_ws\n \"ClientWebSocketResponse\",\n # client\n \"ClientSession\",\n \"ClientTimeout\",\n \"request\",\n)\n\n\ntry:\n from ssl import SSLContext\nexcept ImportError: # pragma: no cover\n SSLContext = object # type: ignore[misc,assignment]\n\n\n@attr.s(auto_attribs=True, frozen=True, slots=True)\nclass ClientTimeout:\n total: Optional[float] = None\n connect: Optional[float] = None\n sock_read: Optional[float] = None\n sock_connect: Optional[float] = None\n ceil_threshold: float = 5\n\n # pool_queue_timeout: Optional[float] = None\n # dns_resolution_timeout: Optional[float] = None\n # socket_connect_timeout: Optional[float] = None\n # connection_acquiring_timeout: Optional[float] = None\n # new_connection_timeout: Optional[float] = None\n # http_header_timeout: Optional[float] = None\n # response_body_timeout: Optional[float] = None\n\n # to create a timeout specific for a single request, either\n # - create a completely new one to overwrite the default\n # - or use http://www.attrs.org/en/stable/api.html#attr.evolve\n # to overwrite the defaults\n\n\n# 5 Minute default read timeout\nDEFAULT_TIMEOUT: Final[ClientTimeout] = ClientTimeout(total=5 * 60)\n\n_RetType = TypeVar(\"_RetType\")\n\n\nclass ClientSession:\n \"\"\"First-class interface for making HTTP requests.\"\"\"\n\n ATTRS = frozenset(\n [\n \"_base_url\",\n \"_source_traceback\",\n \"_connector\",\n \"requote_redirect_url\",\n \"_loop\",\n \"_cookie_jar\",\n \"_connector_owner\",\n \"_default_auth\",\n \"_version\",\n \"_json_serialize\",\n \"_requote_redirect_url\",\n \"_timeout\",\n \"_raise_for_status\",\n \"_auto_decompress\",\n \"_trust_env\",\n \"_default_headers\",\n \"_skip_auto_headers\",\n \"_request_class\",\n \"_response_class\",\n \"_ws_response_class\",\n \"_trace_configs\",\n \"_read_bufsize\",\n ]\n )\n\n _source_traceback: Optional[traceback.StackSummary] = None\n _connector: Optional[BaseConnector] = None\n\n def __init__(\n self,\n base_url: Optional[StrOrURL] = None,\n *,\n connector: Optional[BaseConnector] = None,\n loop: Optional[asyncio.AbstractEventLoop] = None,\n cookies: Optional[LooseCookies] = None,\n headers: Optional[LooseHeaders] = None,\n skip_auto_headers: Optional[Iterable[str]] = None,\n auth: Optional[BasicAuth] = None,\n json_serialize: JSONEncoder = json.dumps,\n request_class: Type[ClientRequest] = ClientRequest,\n response_class: Type[ClientResponse] = ClientResponse,\n ws_response_class: Type[ClientWebSocketResponse] = ClientWebSocketResponse,\n version: HttpVersion = http.HttpVersion11,\n cookie_jar: Optional[AbstractCookieJar] = None,\n connector_owner: bool = True,\n raise_for_status: Union[\n bool, Callable[[ClientResponse], Awaitable[None]]\n ] = False,\n read_timeout: Union[float, object] = sentinel,\n conn_timeout: Optional[float] = None,\n timeout: Union[object, ClientTimeout] = sentinel,\n auto_decompress: bool = True,\n trust_env: bool = False,\n requote_redirect_url: bool = True,\n trace_configs: Optional[List[TraceConfig]] = None,\n read_bufsize: int = 2**16,\n ) -> None:\n if loop is None:\n if connector is not None:\n loop = connector._loop\n\n loop = get_running_loop(loop)\n\n if base_url is None or isinstance(base_url, URL):\n self._base_url: Optional[URL] = base_url\n else:\n self._base_url = URL(base_url)\n assert (\n self._base_url.origin() == self._base_url\n ), \"Only absolute URLs without path part are supported\"\n\n if connector is None:\n connector = TCPConnector(loop=loop)\n\n if connector._loop is not loop:\n raise RuntimeError(\"Session and connector has to use same event loop\")\n\n self._loop = loop\n\n if loop.get_debug():\n self._source_traceback = traceback.extract_stack(sys._getframe(1))\n\n if cookie_jar is None:\n cookie_jar = CookieJar(loop=loop)\n self._cookie_jar = cookie_jar\n\n if cookies is not None:\n self._cookie_jar.update_cookies(cookies)\n\n self._connector = connector\n self._connector_owner = connector_owner\n self._default_auth = auth\n self._version = version\n self._json_serialize = json_serialize\n if timeout is sentinel:\n self._timeout = DEFAULT_TIMEOUT\n if read_timeout is not sentinel:\n warnings.warn(\n \"read_timeout is deprecated, \" \"use timeout argument instead\",\n DeprecationWarning,\n stacklevel=2,\n )\n self._timeout = attr.evolve(self._timeout, total=read_timeout)\n if conn_timeout is not None:\n self._timeout = attr.evolve(self._timeout, connect=conn_timeout)\n warnings.warn(\n \"conn_timeout is deprecated, \" \"use timeout argument instead\",\n DeprecationWarning,\n stacklevel=2,\n )\n else:\n self._timeout = timeout # type: ignore[assignment]\n if read_timeout is not sentinel:\n raise ValueError(\n \"read_timeout and timeout parameters \"\n \"conflict, please setup \"\n \"timeout.read\"\n )\n if conn_timeout is not None:\n raise ValueError(\n \"conn_timeout and timeout parameters \"\n \"conflict, please setup \"\n \"timeout.connect\"\n )\n self._raise_for_status = raise_for_status\n self._auto_decompress = auto_decompress\n self._trust_env = trust_env\n self._requote_redirect_url = requote_redirect_url\n self._read_bufsize = read_bufsize\n\n # Convert to list of tuples\n if headers:\n real_headers: CIMultiDict[str] = CIMultiDict(headers)\n else:\n real_headers = CIMultiDict()\n self._default_headers: CIMultiDict[str] = real_headers\n if skip_auto_headers is not None:\n self._skip_auto_headers = frozenset(istr(i) for i in skip_auto_headers)\n else:\n self._skip_auto_headers = frozenset()\n\n self._request_class = request_class\n self._response_class = response_class\n self._ws_response_class = ws_response_class\n\n self._trace_configs = trace_configs or []\n for trace_config in self._trace_configs:\n trace_config.freeze()\n\n def __init_subclass__(cls: Type[\"ClientSession\"]) -> None:\n warnings.warn(\n \"Inheritance class {} from ClientSession \"\n \"is discouraged\".format(cls.__name__),\n DeprecationWarning,\n stacklevel=2,\n )\n\n if DEBUG:\n\n def __setattr__(self, name: str, val: Any) -> None:\n if name not in self.ATTRS:\n warnings.warn(\n \"Setting custom ClientSession.{} attribute \"\n \"is discouraged\".format(name),\n DeprecationWarning,\n stacklevel=2,\n )\n super().__setattr__(name, val)\n\n def __del__(self, _warnings: Any = warnings) -> None:\n if not self.closed:\n kwargs = {\"source\": self}\n _warnings.warn(\n f\"Unclosed client session {self!r}\", ResourceWarning, **kwargs\n )\n context = {\"client_session\": self, \"message\": \"Unclosed client session\"}\n if self._source_traceback is not None:\n context[\"source_traceback\"] = self._source_traceback\n self._loop.call_exception_handler(context)\n\n def request(\n self, method: str, url: StrOrURL, **kwargs: Any\n ) -> \"_RequestContextManager\":\n \"\"\"Perform HTTP request.\"\"\"\n return _RequestContextManager(self._request(method, url, **kwargs))\n\n def _build_url(self, str_or_url: StrOrURL) -> URL:\n url = URL(str_or_url)\n if self._base_url is None:\n return url\n else:\n assert not url.is_absolute() and url.path.startswith(\"/\")\n return self._base_url.join(url)\n\n async def _request(\n self,\n method: str,\n str_or_url: StrOrURL,\n *,\n params: Optional[Mapping[str, str]] = None,\n data: Any = None,\n json: Any = None,\n cookies: Optional[LooseCookies] = None,\n headers: Optional[LooseHeaders] = None,\n skip_auto_headers: Optional[Iterable[str]] = None,\n auth: Optional[BasicAuth] = None,\n allow_redirects: bool = True,\n max_redirects: int = 10,\n compress: Optional[str] = None,\n chunked: Optional[bool] = None,\n expect100: bool = False,\n raise_for_status: Union[\n None, bool, Callable[[ClientResponse], Awaitable[None]]\n ] = None,\n read_until_eof: bool = True,\n proxy: Optional[StrOrURL] = None,\n proxy_auth: Optional[BasicAuth] = None,\n timeout: Union[ClientTimeout, _SENTINEL] = sentinel,\n verify_ssl: Optional[bool] = None,\n fingerprint: Optional[bytes] = None,\n ssl_context: Optional[SSLContext] = None,\n ssl: Optional[Union[SSLContext, bool, Fingerprint]] = None,\n proxy_headers: Optional[LooseHeaders] = None,\n trace_request_ctx: Optional[SimpleNamespace] = None,\n read_bufsize: Optional[int] = None,\n auto_decompress: Optional[bool] = None,\n ) -> ClientResponse:\n\n # NOTE: timeout clamps existing connect and read timeouts. We cannot\n # set the default to None because we need to detect if the user wants\n # to use the existing timeouts by setting timeout to None.\n\n if self.closed:\n raise RuntimeError(\"Session is closed\")\n\n ssl = _merge_ssl_params(ssl, verify_ssl, ssl_context, fingerprint)\n\n if data is not None and json is not None:\n raise ValueError(\n \"data and json parameters can not be used at the same time\"\n )\n elif json is not None:\n data = payload.JsonPayload(json, dumps=self._json_serialize)\n\n if not isinstance(chunked, bool) and chunked is not None:\n warnings.warn(\"Chunk size is deprecated #1615\", DeprecationWarning)\n\n redirects = 0\n history = []\n version = self._version\n\n # Merge with default headers and transform to CIMultiDict\n headers = self._prepare_headers(headers)\n proxy_headers = self._prepare_headers(proxy_headers)\n\n try:\n url = self._build_url(str_or_url)\n except ValueError as e:\n raise InvalidURL(str_or_url) from e\n\n skip_headers = set(self._skip_auto_headers)\n if skip_auto_headers is not None:\n for i in skip_auto_headers:\n skip_headers.add(istr(i))\n\n if proxy is not None:\n try:\n proxy = URL(proxy)\n except ValueError as e:\n raise InvalidURL(proxy) from e\n\n if timeout is sentinel:\n real_timeout: ClientTimeout = self._timeout\n else:\n if not isinstance(timeout, ClientTimeout):\n real_timeout = ClientTimeout(total=timeout)\n else:\n real_timeout = timeout\n # timeout is cumulative for all request operations\n # (request, redirects, responses, data consuming)\n tm = TimeoutHandle(\n self._loop, real_timeout.total, ceil_threshold=real_timeout.ceil_threshold\n )\n handle = tm.start()\n\n if read_bufsize is None:\n read_bufsize = self._read_bufsize\n\n if auto_decompress is None:\n auto_decompress = self._auto_decompress\n\n traces = [\n Trace(\n self,\n trace_config,\n trace_config.trace_config_ctx(trace_request_ctx=trace_request_ctx),\n )\n for trace_config in self._trace_configs\n ]\n\n for trace in traces:\n await trace.send_request_start(method, url.update_query(params), headers)\n\n timer = tm.timer()\n try:\n with timer:\n while True:\n url, auth_from_url = strip_auth_from_url(url)\n if auth and auth_from_url:\n raise ValueError(\n \"Cannot combine AUTH argument with \"\n \"credentials encoded in URL\"\n )\n\n if auth is None:\n auth = auth_from_url\n if auth is None:\n auth = self._default_auth\n # It would be confusing if we support explicit\n # Authorization header with auth argument\n if (\n headers is not None\n and auth is not None\n and hdrs.AUTHORIZATION in headers\n ):\n raise ValueError(\n \"Cannot combine AUTHORIZATION header \"\n \"with AUTH argument or credentials \"\n \"encoded in URL\"\n )\n\n all_cookies = self._cookie_jar.filter_cookies(url)\n\n if cookies is not None:\n tmp_cookie_jar = CookieJar()\n tmp_cookie_jar.update_cookies(cookies)\n req_cookies = tmp_cookie_jar.filter_cookies(url)\n if req_cookies:\n all_cookies.load(req_cookies)\n\n if proxy is not None:\n proxy = URL(proxy)\n elif self._trust_env:\n with suppress(LookupError):\n proxy, proxy_auth = get_env_proxy_for_url(url)\n\n req = self._request_class(\n method,\n url,\n params=params,\n headers=headers,\n skip_auto_headers=skip_headers,\n data=data,\n cookies=all_cookies,\n auth=auth,\n version=version,\n compress=compress,\n chunked=chunked,\n expect100=expect100,\n loop=self._loop,\n response_class=self._response_class,\n proxy=proxy,\n proxy_auth=proxy_auth,\n timer=timer,\n session=self,\n ssl=ssl,\n proxy_headers=proxy_headers,\n traces=traces,\n )\n\n # connection timeout\n try:\n async with ceil_timeout(\n real_timeout.connect,\n ceil_threshold=real_timeout.ceil_threshold,\n ):\n assert self._connector is not None\n conn = await self._connector.connect(\n req, traces=traces, timeout=real_timeout\n )\n except asyncio.TimeoutError as exc:\n raise ServerTimeoutError(\n \"Connection timeout \" \"to host {}\".format(url)\n ) from exc\n\n assert conn.transport is not None\n\n assert conn.protocol is not None\n conn.protocol.set_response_params(\n timer=timer,\n skip_payload=method.upper() == \"HEAD\",\n read_until_eof=read_until_eof,\n auto_decompress=auto_decompress,\n read_timeout=real_timeout.sock_read,\n read_bufsize=read_bufsize,\n timeout_ceil_threshold=self._connector._timeout_ceil_threshold,\n )\n\n try:\n try:\n resp = await req.send(conn)\n try:\n await resp.start(conn)\n except BaseException:\n resp.close()\n raise\n except BaseException:\n conn.close()\n raise\n except ClientError:\n raise\n except OSError as exc:\n if exc.errno is None and isinstance(exc, asyncio.TimeoutError):\n raise\n raise ClientOSError(*exc.args) from exc\n\n self._cookie_jar.update_cookies(resp.cookies, resp.url)\n\n # redirects\n if resp.status in (301, 302, 303, 307, 308) and allow_redirects:\n\n for trace in traces:\n await trace.send_request_redirect(\n method, url.update_query(params), headers, resp\n )\n\n redirects += 1\n history.append(resp)\n if max_redirects and redirects >= max_redirects:\n resp.close()\n raise TooManyRedirects(\n history[0].request_info, tuple(history)\n )\n\n # For 301 and 302, mimic IE, now changed in RFC\n # https://github.com/kennethreitz/requests/pull/269\n if (resp.status == 303 and resp.method != hdrs.METH_HEAD) or (\n resp.status in (301, 302) and resp.method == hdrs.METH_POST\n ):\n method = hdrs.METH_GET\n data = None\n if headers.get(hdrs.CONTENT_LENGTH):\n headers.pop(hdrs.CONTENT_LENGTH)\n\n r_url = resp.headers.get(hdrs.LOCATION) or resp.headers.get(\n hdrs.URI\n )\n if r_url is None:\n # see github.com/aio-libs/aiohttp/issues/2022\n break\n else:\n # reading from correct redirection\n # response is forbidden\n resp.release()\n\n try:\n parsed_url = URL(\n r_url, encoded=not self._requote_redirect_url\n )\n\n except ValueError as e:\n raise InvalidURL(r_url) from e\n\n scheme = parsed_url.scheme\n if scheme not in (\"http\", \"https\", \"\"):\n resp.close()\n raise ValueError(\"Can redirect only to http or https\")\n elif not scheme:\n parsed_url = url.join(parsed_url)\n\n if url.origin() != parsed_url.origin():\n auth = None\n headers.pop(hdrs.AUTHORIZATION, None)\n\n url = parsed_url\n params = None\n resp.release()\n continue\n\n break\n\n # check response status\n if raise_for_status is None:\n raise_for_status = self._raise_for_status\n\n if raise_for_status is None:\n pass\n elif callable(raise_for_status):\n await raise_for_status(resp)\n elif raise_for_status:\n resp.raise_for_status()\n\n # register connection\n if handle is not None:\n if resp.connection is not None:\n resp.connection.add_callback(handle.cancel)\n else:\n handle.cancel()\n\n resp._history = tuple(history)\n\n for trace in traces:\n await trace.send_request_end(\n method, url.update_query(params), headers, resp\n )\n return resp\n\n except BaseException as e:\n # cleanup timer\n tm.close()\n if handle:\n handle.cancel()\n handle = None\n\n for trace in traces:\n await trace.send_request_exception(\n method, url.update_query(params), headers, e\n )\n raise\n\n def ws_connect(\n self,\n url: StrOrURL,\n *,\n method: str = hdrs.METH_GET,\n protocols: Iterable[str] = (),\n timeout: float = 10.0,\n receive_timeout: Optional[float] = None,\n autoclose: bool = True,\n autoping: bool = True,\n heartbeat: Optional[float] = None,\n auth: Optional[BasicAuth] = None,\n origin: Optional[str] = None,\n params: Optional[Mapping[str, str]] = None,\n headers: Optional[LooseHeaders] = None,\n proxy: Optional[StrOrURL] = None,\n proxy_auth: Optional[BasicAuth] = None,\n ssl: Union[SSLContext, bool, None, Fingerprint] = None,\n verify_ssl: Optional[bool] = None,\n fingerprint: Optional[bytes] = None,\n ssl_context: Optional[SSLContext] = None,\n proxy_headers: Optional[LooseHeaders] = None,\n compress: int = 0,\n max_msg_size: int = 4 * 1024 * 1024,\n ) -> \"_WSRequestContextManager\":\n \"\"\"Initiate websocket connection.\"\"\"\n return _WSRequestContextManager(\n self._ws_connect(\n url,\n method=method,\n protocols=protocols,\n timeout=timeout,\n receive_timeout=receive_timeout,\n autoclose=autoclose,\n autoping=autoping,\n heartbeat=heartbeat,\n auth=auth,\n origin=origin,\n params=params,\n headers=headers,\n proxy=proxy,\n proxy_auth=proxy_auth,\n ssl=ssl,\n verify_ssl=verify_ssl,\n fingerprint=fingerprint,\n ssl_context=ssl_context,\n proxy_headers=proxy_headers,\n compress=compress,\n max_msg_size=max_msg_size,\n )\n )\n\n async def _ws_connect(\n self,\n url: StrOrURL,\n *,\n method: str = hdrs.METH_GET,\n protocols: Iterable[str] = (),\n timeout: float = 10.0,\n receive_timeout: Optional[float] = None,\n autoclose: bool = True,\n autoping: bool = True,\n heartbeat: Optional[float] = None,\n auth: Optional[BasicAuth] = None,\n origin: Optional[str] = None,\n params: Optional[Mapping[str, str]] = None,\n headers: Optional[LooseHeaders] = None,\n proxy: Optional[StrOrURL] = None,\n proxy_auth: Optional[BasicAuth] = None,\n ssl: Union[SSLContext, bool, None, Fingerprint] = None,\n verify_ssl: Optional[bool] = None,\n fingerprint: Optional[bytes] = None,\n ssl_context: Optional[SSLContext] = None,\n proxy_headers: Optional[LooseHeaders] = None,\n compress: int = 0,\n max_msg_size: int = 4 * 1024 * 1024,\n ) -> ClientWebSocketResponse:\n\n if headers is None:\n real_headers: CIMultiDict[str] = CIMultiDict()\n else:\n real_headers = CIMultiDict(headers)\n\n default_headers = {\n hdrs.UPGRADE: \"websocket\",\n hdrs.CONNECTION: \"Upgrade\",\n hdrs.SEC_WEBSOCKET_VERSION: \"13\",\n }\n\n for key, value in default_headers.items():\n real_headers.setdefault(key, value)\n\n sec_key = base64.b64encode(os.urandom(16))\n real_headers[hdrs.SEC_WEBSOCKET_KEY] = sec_key.decode()\n\n if protocols:\n real_headers[hdrs.SEC_WEBSOCKET_PROTOCOL] = \",\".join(protocols)\n if origin is not None:\n real_headers[hdrs.ORIGIN] = origin\n if compress:\n extstr = ws_ext_gen(compress=compress)\n real_headers[hdrs.SEC_WEBSOCKET_EXTENSIONS] = extstr\n\n ssl = _merge_ssl_params(ssl, verify_ssl, ssl_context, fingerprint)\n\n # send request\n resp = await self.request(\n method,\n url,\n params=params,\n headers=real_headers,\n read_until_eof=False,\n auth=auth,\n proxy=proxy,\n proxy_auth=proxy_auth,\n ssl=ssl,\n proxy_headers=proxy_headers,\n )\n\n try:\n # check handshake\n if resp.status != 101:\n raise WSServerHandshakeError(\n resp.request_info,\n resp.history,\n message=\"Invalid response status\",\n status=resp.status,\n headers=resp.headers,\n )\n\n if resp.headers.get(hdrs.UPGRADE, \"\").lower() != \"websocket\":\n raise WSServerHandshakeError(\n resp.request_info,\n resp.history,\n message=\"Invalid upgrade header\",\n status=resp.status,\n headers=resp.headers,\n )\n\n if resp.headers.get(hdrs.CONNECTION, \"\").lower() != \"upgrade\":\n raise WSServerHandshakeError(\n resp.request_info,\n resp.history,\n message=\"Invalid connection header\",\n status=resp.status,\n headers=resp.headers,\n )\n\n # key calculation\n r_key = resp.headers.get(hdrs.SEC_WEBSOCKET_ACCEPT, \"\")\n match = base64.b64encode(hashlib.sha1(sec_key + WS_KEY).digest()).decode()\n if r_key != match:\n raise WSServerHandshakeError(\n resp.request_info,\n resp.history,\n message=\"Invalid challenge response\",\n status=resp.status,\n headers=resp.headers,\n )\n\n # websocket protocol\n protocol = None\n if protocols and hdrs.SEC_WEBSOCKET_PROTOCOL in resp.headers:\n resp_protocols = [\n proto.strip()\n for proto in resp.headers[hdrs.SEC_WEBSOCKET_PROTOCOL].split(\",\")\n ]\n\n for proto in resp_protocols:\n if proto in protocols:\n protocol = proto\n break\n\n # websocket compress\n notakeover = False\n if compress:\n compress_hdrs = resp.headers.get(hdrs.SEC_WEBSOCKET_EXTENSIONS)\n if compress_hdrs:\n try:\n compress, notakeover = ws_ext_parse(compress_hdrs)\n except WSHandshakeError as exc:\n raise WSServerHandshakeError(\n resp.request_info,\n resp.history,\n message=exc.args[0],\n status=resp.status,\n headers=resp.headers,\n ) from exc\n else:\n compress = 0\n notakeover = False\n\n conn = resp.connection\n assert conn is not None\n conn_proto = conn.protocol\n assert conn_proto is not None\n transport = conn.transport\n assert transport is not None\n reader: FlowControlDataQueue[WSMessage] = FlowControlDataQueue(\n conn_proto, 2**16, loop=self._loop\n )\n conn_proto.set_parser(WebSocketReader(reader, max_msg_size), reader)\n writer = WebSocketWriter(\n conn_proto,\n transport,\n use_mask=True,\n compress=compress,\n notakeover=notakeover,\n )\n except BaseException:\n resp.close()\n raise\n else:\n return self._ws_response_class(\n reader,\n writer,\n protocol,\n resp,\n timeout,\n autoclose,\n autoping,\n self._loop,\n receive_timeout=receive_timeout,\n heartbeat=heartbeat,\n compress=compress,\n client_notakeover=notakeover,\n )\n\n def _prepare_headers(self, headers: Optional[LooseHeaders]) -> \"CIMultiDict[str]\":\n \"\"\"Add default headers and transform it to CIMultiDict\"\"\"\n # Convert headers to MultiDict\n result = CIMultiDict(self._default_headers)\n if headers:\n if not isinstance(headers, (MultiDictProxy, MultiDict)):\n headers = CIMultiDict(headers)\n added_names: Set[str] = set()\n for key, value in headers.items():\n if key in added_names:\n result.add(key, value)\n else:\n result[key] = value\n added_names.add(key)\n return result\n\n def get(\n self, url: StrOrURL, *, allow_redirects: bool = True, **kwargs: Any\n ) -> \"_RequestContextManager\":\n \"\"\"Perform HTTP GET request.\"\"\"\n return _RequestContextManager(\n self._request(hdrs.METH_GET, url, allow_redirects=allow_redirects, **kwargs)\n )\n\n def options(\n self, url: StrOrURL, *, allow_redirects: bool = True, **kwargs: Any\n ) -> \"_RequestContextManager\":\n \"\"\"Perform HTTP OPTIONS request.\"\"\"\n return _RequestContextManager(\n self._request(\n hdrs.METH_OPTIONS, url, allow_redirects=allow_redirects, **kwargs\n )\n )\n\n def head(\n self, url: StrOrURL, *, allow_redirects: bool = False, **kwargs: Any\n ) -> \"_RequestContextManager\":\n \"\"\"Perform HTTP HEAD request.\"\"\"\n return _RequestContextManager(\n self._request(\n hdrs.METH_HEAD, url, allow_redirects=allow_redirects, **kwargs\n )\n )\n\n def post(\n self, url: StrOrURL, *, data: Any = None, **kwargs: Any\n ) -> \"_RequestContextManager\":\n \"\"\"Perform HTTP POST request.\"\"\"\n return _RequestContextManager(\n self._request(hdrs.METH_POST, url, data=data, **kwargs)\n )\n\n def put(\n self, url: StrOrURL, *, data: Any = None, **kwargs: Any\n ) -> \"_RequestContextManager\":\n \"\"\"Perform HTTP PUT request.\"\"\"\n return _RequestContextManager(\n self._request(hdrs.METH_PUT, url, data=data, **kwargs)\n )\n\n def patch(\n self, url: StrOrURL, *, data: Any = None, **kwargs: Any\n ) -> \"_RequestContextManager\":\n \"\"\"Perform HTTP PATCH request.\"\"\"\n return _RequestContextManager(\n self._request(hdrs.METH_PATCH, url, data=data, **kwargs)\n )\n\n def delete(self, url: StrOrURL, **kwargs: Any) -> \"_RequestContextManager\":\n \"\"\"Perform HTTP DELETE request.\"\"\"\n return _RequestContextManager(self._request(hdrs.METH_DELETE, url, **kwargs))\n\n async def close(self) -> None:\n \"\"\"Close underlying connector.\n\n Release all acquired resources.\n \"\"\"\n if not self.closed:\n if self._connector is not None and self._connector_owner:\n await self._connector.close()\n self._connector = None\n\n @property\n def closed(self) -> bool:\n \"\"\"Is client session closed.\n\n A readonly property.\n \"\"\"\n return self._connector is None or self._connector.closed\n\n @property\n def connector(self) -> Optional[BaseConnector]:\n \"\"\"Connector instance used for the session.\"\"\"\n return self._connector\n\n @property\n def cookie_jar(self) -> AbstractCookieJar:\n \"\"\"The session cookies.\"\"\"\n return self._cookie_jar\n\n @property\n def version(self) -> Tuple[int, int]:\n \"\"\"The session HTTP protocol version.\"\"\"\n return self._version\n\n @property\n def requote_redirect_url(self) -> bool:\n \"\"\"Do URL requoting on redirection handling.\"\"\"\n return self._requote_redirect_url\n\n @requote_redirect_url.setter\n def requote_redirect_url(self, val: bool) -> None:\n \"\"\"Do URL requoting on redirection handling.\"\"\"\n warnings.warn(\n \"session.requote_redirect_url modification \" \"is deprecated #2778\",\n DeprecationWarning,\n stacklevel=2,\n )\n self._requote_redirect_url = val\n\n @property\n def loop(self) -> asyncio.AbstractEventLoop:\n \"\"\"Session's loop.\"\"\"\n warnings.warn(\n \"client.loop property is deprecated\", DeprecationWarning, stacklevel=2\n )\n return self._loop\n\n @property\n def timeout(self) -> ClientTimeout:\n \"\"\"Timeout for the session.\"\"\"\n return self._timeout\n\n @property\n def headers(self) -> \"CIMultiDict[str]\":\n \"\"\"The default headers of the client session.\"\"\"\n return self._default_headers\n\n @property\n def skip_auto_headers(self) -> FrozenSet[istr]:\n \"\"\"Headers for which autogeneration should be skipped\"\"\"\n return self._skip_auto_headers\n\n @property\n def auth(self) -> Optional[BasicAuth]:\n \"\"\"An object that represents HTTP Basic Authorization\"\"\"\n return self._default_auth\n\n @property\n def json_serialize(self) -> JSONEncoder:\n \"\"\"Json serializer callable\"\"\"\n return self._json_serialize\n\n @property\n def connector_owner(self) -> bool:\n \"\"\"Should connector be closed on session closing\"\"\"\n return self._connector_owner\n\n @property\n def raise_for_status(\n self,\n ) -> Union[bool, Callable[[ClientResponse], Awaitable[None]]]:\n \"\"\"Should `ClientResponse.raise_for_status()` be called for each response.\"\"\"\n return self._raise_for_status\n\n @property\n def auto_decompress(self) -> bool:\n \"\"\"Should the body response be automatically decompressed.\"\"\"\n return self._auto_decompress\n\n @property\n def trust_env(self) -> bool:\n \"\"\"\n Should proxies information from environment or netrc be trusted.\n\n Information is from HTTP_PROXY / HTTPS_PROXY environment variables\n or ~/.netrc file if present.\n \"\"\"\n return self._trust_env\n\n @property\n def trace_configs(self) -> List[TraceConfig]:\n \"\"\"A list of TraceConfig instances used for client tracing\"\"\"\n return self._trace_configs\n\n def detach(self) -> None:\n \"\"\"Detach connector from session without closing the former.\n\n Session is switched to closed state anyway.\n \"\"\"\n self._connector = None\n\n def __enter__(self) -> None:\n raise TypeError(\"Use async with instead\")\n\n def __exit__(\n self,\n exc_type: Optional[Type[BaseException]],\n exc_val: Optional[BaseException],\n exc_tb: Optional[TracebackType],\n ) -> None:\n # __exit__ should exist in pair with __enter__ but never executed\n pass # pragma: no cover\n\n async def __aenter__(self) -> \"ClientSession\":\n return self\n\n async def __aexit__(\n self,\n exc_type: Optional[Type[BaseException]],\n exc_val: Optional[BaseException],\n exc_tb: Optional[TracebackType],\n ) -> None:\n await self.close()\n\n\nclass _BaseRequestContextManager(Coroutine[Any, Any, _RetType], Generic[_RetType]):\n\n __slots__ = (\"_coro\", \"_resp\")\n\n def __init__(self, coro: Coroutine[\"asyncio.Future[Any]\", None, _RetType]) -> None:\n self._coro = coro\n\n def send(self, arg: None) -> \"asyncio.Future[Any]\":\n return self._coro.send(arg)\n\n def throw(self, arg: BaseException) -> None: # type: ignore[override]\n self._coro.throw(arg)\n\n def close(self) -> None:\n return self._coro.close()\n\n def __await__(self) -> Generator[Any, None, _RetType]:\n ret = self._coro.__await__()\n return ret\n\n def __iter__(self) -> Generator[Any, None, _RetType]:\n return self.__await__()\n\n async def __aenter__(self) -> _RetType:\n self._resp = await self._coro\n return self._resp\n\n\nclass _RequestContextManager(_BaseRequestContextManager[ClientResponse]):\n __slots__ = ()\n\n async def __aexit__(\n self,\n exc_type: Optional[Type[BaseException]],\n exc: Optional[BaseException],\n tb: Optional[TracebackType],\n ) -> None:\n # We're basing behavior on the exception as it can be caused by\n # user code unrelated to the status of the connection. If you\n # would like to close a connection you must do that\n # explicitly. Otherwise connection error handling should kick in\n # and close/recycle the connection as required.\n self._resp.release()\n\n\nclass _WSRequestContextManager(_BaseRequestContextManager[ClientWebSocketResponse]):\n __slots__ = ()\n\n async def __aexit__(\n self,\n exc_type: Optional[Type[BaseException]],\n exc: Optional[BaseException],\n tb: Optional[TracebackType],\n ) -> None:\n await self._resp.close()\n\n\nclass _SessionRequestContextManager:\n\n __slots__ = (\"_coro\", \"_resp\", \"_session\")\n\n def __init__(\n self,\n coro: Coroutine[\"asyncio.Future[Any]\", None, ClientResponse],\n session: ClientSession,\n ) -> None:\n self._coro = coro\n self._resp: Optional[ClientResponse] = None\n self._session = session\n\n async def __aenter__(self) -> ClientResponse:\n try:\n self._resp = await self._coro\n except BaseException:\n await self._session.close()\n raise\n else:\n return self._resp\n\n async def __aexit__(\n self,\n exc_type: Optional[Type[BaseException]],\n exc: Optional[BaseException],\n tb: Optional[TracebackType],\n ) -> None:\n assert self._resp is not None\n self._resp.close()\n await self._session.close()\n\n\ndef request(\n method: str,\n url: StrOrURL,\n *,\n params: Optional[Mapping[str, str]] = None,\n data: Any = None,\n json: Any = None,\n headers: Optional[LooseHeaders] = None,\n skip_auto_headers: Optional[Iterable[str]] = None,\n auth: Optional[BasicAuth] = None,\n allow_redirects: bool = True,\n max_redirects: int = 10,\n compress: Optional[str] = None,\n chunked: Optional[bool] = None,\n expect100: bool = False,\n raise_for_status: Optional[bool] = None,\n read_until_eof: bool = True,\n proxy: Optional[StrOrURL] = None,\n proxy_auth: Optional[BasicAuth] = None,\n timeout: Union[ClientTimeout, object] = sentinel,\n cookies: Optional[LooseCookies] = None,\n version: HttpVersion = http.HttpVersion11,\n connector: Optional[BaseConnector] = None,\n read_bufsize: Optional[int] = None,\n loop: Optional[asyncio.AbstractEventLoop] = None,\n) -> _SessionRequestContextManager:\n \"\"\"Constructs and sends a request.\n\n Returns response object.\n method - HTTP method\n url - request url\n params - (optional) Dictionary or bytes to be sent in the query\n string of the new request\n data - (optional) Dictionary, bytes, or file-like object to\n send in the body of the request\n json - (optional) Any json compatible python object\n headers - (optional) Dictionary of HTTP Headers to send with\n the request\n cookies - (optional) Dict object to send with the request\n auth - (optional) BasicAuth named tuple represent HTTP Basic Auth\n auth - aiohttp.helpers.BasicAuth\n allow_redirects - (optional) If set to False, do not follow\n redirects\n version - Request HTTP version.\n compress - Set to True if request has to be compressed\n with deflate encoding.\n chunked - Set to chunk size for chunked transfer encoding.\n expect100 - Expect 100-continue response from server.\n connector - BaseConnector sub-class instance to support\n connection pooling.\n read_until_eof - Read response until eof if response\n does not have Content-Length header.\n loop - Optional event loop.\n timeout - Optional ClientTimeout settings structure, 5min\n total timeout by default.\n Usage::\n >>> import aiohttp\n >>> resp = await aiohttp.request('GET', 'http://python.org/')\n >>> resp\n <ClientResponse(python.org/) [200]>\n >>> data = await resp.read()\n \"\"\"\n connector_owner = False\n if connector is None:\n connector_owner = True\n connector = TCPConnector(loop=loop, force_close=True)\n\n session = ClientSession(\n loop=loop,\n cookies=cookies,\n version=version,\n timeout=timeout,\n connector=connector,\n connector_owner=connector_owner,\n )\n\n return _SessionRequestContextManager(\n session._request(\n method,\n url,\n params=params,\n data=data,\n json=json,\n headers=headers,\n skip_auto_headers=skip_auto_headers,\n auth=auth,\n allow_redirects=allow_redirects,\n max_redirects=max_redirects,\n compress=compress,\n chunked=chunked,\n expect100=expect100,\n raise_for_status=raise_for_status,\n read_until_eof=read_until_eof,\n proxy=proxy,\n proxy_auth=proxy_auth,\n read_bufsize=read_bufsize,\n ),\n session,\n )\n", "path": "aiohttp/client.py" } ]
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index bdb579ac5d2..237cd505b77 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -196,6 +196,7 @@ Krzysztof Blazewicz Kyrylo Perevozchikov Kyungmin Lee Lars P. Søndergaard +Lee LieWhite Liu Hua Louis-Philippe Huberdeau Loïc Lajeanne diff --git a/aiohttp/client.py b/aiohttp/client.py index fbb0bbc2840..a2fe63570a8 100644 --- a/aiohttp/client.py +++ b/aiohttp/client.py @@ -772,7 +772,7 @@ async def _ws_connect( default_headers = { hdrs.UPGRADE: "websocket", - hdrs.CONNECTION: "upgrade", + hdrs.CONNECTION: "Upgrade", hdrs.SEC_WEBSOCKET_VERSION: "13", }
python__mypy-11823
[ { "content": "\"\"\"Semantic analysis of call-based Enum definitions.\n\nThis is conceptually part of mypy.semanal (semantic analyzer pass 2).\n\"\"\"\n\nfrom typing import List, Tuple, Optional, Union, cast\nfrom typing_extensions import Final\n\nfrom mypy.nodes import (\n Expression, Context, TypeInfo, AssignmentStmt, NameExpr, CallExpr, RefExpr, StrExpr,\n UnicodeExpr, TupleExpr, ListExpr, DictExpr, Var, SymbolTableNode, MDEF, ARG_POS,\n ARG_NAMED, EnumCallExpr, MemberExpr\n)\nfrom mypy.semanal_shared import SemanticAnalyzerInterface\nfrom mypy.options import Options\n\n# Note: 'enum.EnumMeta' is deliberately excluded from this list. Classes that directly use\n# enum.EnumMeta do not necessarily automatically have the 'name' and 'value' attributes.\nENUM_BASES: Final = frozenset((\n 'enum.Enum', 'enum.IntEnum', 'enum.Flag', 'enum.IntFlag',\n))\nENUM_SPECIAL_PROPS: Final = frozenset((\n 'name', 'value', '_name_', '_value_', '_order_', '__order__',\n))\n\n\nclass EnumCallAnalyzer:\n def __init__(self, options: Options, api: SemanticAnalyzerInterface) -> None:\n self.options = options\n self.api = api\n\n def process_enum_call(self, s: AssignmentStmt, is_func_scope: bool) -> bool:\n \"\"\"Check if s defines an Enum; if yes, store the definition in symbol table.\n\n Return True if this looks like an Enum definition (but maybe with errors),\n otherwise return False.\n \"\"\"\n if len(s.lvalues) != 1 or not isinstance(s.lvalues[0], (NameExpr, MemberExpr)):\n return False\n lvalue = s.lvalues[0]\n name = lvalue.name\n enum_call = self.check_enum_call(s.rvalue, name, is_func_scope)\n if enum_call is None:\n return False\n if isinstance(lvalue, MemberExpr):\n self.fail(\"Enum type as attribute is not supported\", lvalue)\n return False\n # Yes, it's a valid Enum definition. Add it to the symbol table.\n self.api.add_symbol(name, enum_call, s)\n return True\n\n def check_enum_call(self,\n node: Expression,\n var_name: str,\n is_func_scope: bool) -> Optional[TypeInfo]:\n \"\"\"Check if a call defines an Enum.\n\n Example:\n\n A = enum.Enum('A', 'foo bar')\n\n is equivalent to:\n\n class A(enum.Enum):\n foo = 1\n bar = 2\n \"\"\"\n if not isinstance(node, CallExpr):\n return None\n call = node\n callee = call.callee\n if not isinstance(callee, RefExpr):\n return None\n fullname = callee.fullname\n if fullname not in ENUM_BASES:\n return None\n items, values, ok = self.parse_enum_call_args(call, fullname.split('.')[-1])\n if not ok:\n # Error. Construct dummy return value.\n info = self.build_enum_call_typeinfo(var_name, [], fullname, node.line)\n else:\n name = cast(Union[StrExpr, UnicodeExpr], call.args[0]).value\n if name != var_name or is_func_scope:\n # Give it a unique name derived from the line number.\n name += '@' + str(call.line)\n info = self.build_enum_call_typeinfo(name, items, fullname, call.line)\n # Store generated TypeInfo under both names, see semanal_namedtuple for more details.\n if name != var_name or is_func_scope:\n self.api.add_symbol_skip_local(name, info)\n call.analyzed = EnumCallExpr(info, items, values)\n call.analyzed.set_line(call.line, call.column)\n info.line = node.line\n return info\n\n def build_enum_call_typeinfo(self, name: str, items: List[str], fullname: str,\n line: int) -> TypeInfo:\n base = self.api.named_type_or_none(fullname)\n assert base is not None\n info = self.api.basic_new_typeinfo(name, base, line)\n info.metaclass_type = info.calculate_metaclass_type()\n info.is_enum = True\n for item in items:\n var = Var(item)\n var.info = info\n var.is_property = True\n var._fullname = '{}.{}'.format(info.fullname, item)\n info.names[item] = SymbolTableNode(MDEF, var)\n return info\n\n def parse_enum_call_args(self, call: CallExpr,\n class_name: str) -> Tuple[List[str],\n List[Optional[Expression]], bool]:\n \"\"\"Parse arguments of an Enum call.\n\n Return a tuple of fields, values, was there an error.\n \"\"\"\n args = call.args\n if not all([arg_kind in [ARG_POS, ARG_NAMED] for arg_kind in call.arg_kinds]):\n return self.fail_enum_call_arg(\"Unexpected arguments to %s()\" % class_name, call)\n if len(args) < 2:\n return self.fail_enum_call_arg(\"Too few arguments for %s()\" % class_name, call)\n if len(args) > 6:\n return self.fail_enum_call_arg(\"Too many arguments for %s()\" % class_name, call)\n valid_name = [None, 'value', 'names', 'module', 'qualname', 'type', 'start']\n for arg_name in call.arg_names:\n if arg_name not in valid_name:\n self.fail_enum_call_arg('Unexpected keyword argument \"{}\"'.format(arg_name), call)\n value, names = None, None\n for arg_name, arg in zip(call.arg_names, args):\n if arg_name == 'value':\n value = arg\n if arg_name == 'names':\n names = arg\n if value is None:\n value = args[0]\n if names is None:\n names = args[1]\n if not isinstance(value, (StrExpr, UnicodeExpr)):\n return self.fail_enum_call_arg(\n \"%s() expects a string literal as the first argument\" % class_name, call)\n items = []\n values: List[Optional[Expression]] = []\n if isinstance(names, (StrExpr, UnicodeExpr)):\n fields = names.value\n for field in fields.replace(',', ' ').split():\n items.append(field)\n elif isinstance(names, (TupleExpr, ListExpr)):\n seq_items = names.items\n if all(isinstance(seq_item, (StrExpr, UnicodeExpr)) for seq_item in seq_items):\n items = [cast(Union[StrExpr, UnicodeExpr], seq_item).value\n for seq_item in seq_items]\n elif all(isinstance(seq_item, (TupleExpr, ListExpr))\n and len(seq_item.items) == 2\n and isinstance(seq_item.items[0], (StrExpr, UnicodeExpr))\n for seq_item in seq_items):\n for seq_item in seq_items:\n assert isinstance(seq_item, (TupleExpr, ListExpr))\n name, value = seq_item.items\n assert isinstance(name, (StrExpr, UnicodeExpr))\n items.append(name.value)\n values.append(value)\n else:\n return self.fail_enum_call_arg(\n \"%s() with tuple or list expects strings or (name, value) pairs\" %\n class_name,\n call)\n elif isinstance(names, DictExpr):\n for key, value in names.items:\n if not isinstance(key, (StrExpr, UnicodeExpr)):\n return self.fail_enum_call_arg(\n \"%s() with dict literal requires string literals\" % class_name, call)\n items.append(key.value)\n values.append(value)\n else:\n # TODO: Allow dict(x=1, y=2) as a substitute for {'x': 1, 'y': 2}?\n return self.fail_enum_call_arg(\n \"%s() expects a string, tuple, list or dict literal as the second argument\" %\n class_name,\n call)\n if len(items) == 0:\n return self.fail_enum_call_arg(\"%s() needs at least one item\" % class_name, call)\n if not values:\n values = [None] * len(items)\n assert len(items) == len(values)\n return items, values, True\n\n def fail_enum_call_arg(self, message: str,\n context: Context) -> Tuple[List[str],\n List[Optional[Expression]], bool]:\n self.fail(message, context)\n return [], [], False\n\n # Helpers\n\n def fail(self, msg: str, ctx: Context) -> None:\n self.api.fail(msg, ctx)\n", "path": "mypy/semanal_enum.py" } ]
[ { "content": "\"\"\"Semantic analysis of call-based Enum definitions.\n\nThis is conceptually part of mypy.semanal (semantic analyzer pass 2).\n\"\"\"\n\nfrom typing import List, Tuple, Optional, Union, cast\nfrom typing_extensions import Final\n\nfrom mypy.nodes import (\n Expression, Context, TypeInfo, AssignmentStmt, NameExpr, CallExpr, RefExpr, StrExpr,\n UnicodeExpr, TupleExpr, ListExpr, DictExpr, Var, SymbolTableNode, MDEF, ARG_POS,\n ARG_NAMED, EnumCallExpr, MemberExpr\n)\nfrom mypy.semanal_shared import SemanticAnalyzerInterface\nfrom mypy.options import Options\n\n# Note: 'enum.EnumMeta' is deliberately excluded from this list. Classes that directly use\n# enum.EnumMeta do not necessarily automatically have the 'name' and 'value' attributes.\nENUM_BASES: Final = frozenset((\n 'enum.Enum', 'enum.IntEnum', 'enum.Flag', 'enum.IntFlag',\n))\nENUM_SPECIAL_PROPS: Final = frozenset((\n 'name', 'value', '_name_', '_value_', '_order_', '__order__',\n # Also attributes from `object`:\n '__module__', '__annotations__', '__doc__', '__slots__', '__dict__',\n))\n\n\nclass EnumCallAnalyzer:\n def __init__(self, options: Options, api: SemanticAnalyzerInterface) -> None:\n self.options = options\n self.api = api\n\n def process_enum_call(self, s: AssignmentStmt, is_func_scope: bool) -> bool:\n \"\"\"Check if s defines an Enum; if yes, store the definition in symbol table.\n\n Return True if this looks like an Enum definition (but maybe with errors),\n otherwise return False.\n \"\"\"\n if len(s.lvalues) != 1 or not isinstance(s.lvalues[0], (NameExpr, MemberExpr)):\n return False\n lvalue = s.lvalues[0]\n name = lvalue.name\n enum_call = self.check_enum_call(s.rvalue, name, is_func_scope)\n if enum_call is None:\n return False\n if isinstance(lvalue, MemberExpr):\n self.fail(\"Enum type as attribute is not supported\", lvalue)\n return False\n # Yes, it's a valid Enum definition. Add it to the symbol table.\n self.api.add_symbol(name, enum_call, s)\n return True\n\n def check_enum_call(self,\n node: Expression,\n var_name: str,\n is_func_scope: bool) -> Optional[TypeInfo]:\n \"\"\"Check if a call defines an Enum.\n\n Example:\n\n A = enum.Enum('A', 'foo bar')\n\n is equivalent to:\n\n class A(enum.Enum):\n foo = 1\n bar = 2\n \"\"\"\n if not isinstance(node, CallExpr):\n return None\n call = node\n callee = call.callee\n if not isinstance(callee, RefExpr):\n return None\n fullname = callee.fullname\n if fullname not in ENUM_BASES:\n return None\n items, values, ok = self.parse_enum_call_args(call, fullname.split('.')[-1])\n if not ok:\n # Error. Construct dummy return value.\n info = self.build_enum_call_typeinfo(var_name, [], fullname, node.line)\n else:\n name = cast(Union[StrExpr, UnicodeExpr], call.args[0]).value\n if name != var_name or is_func_scope:\n # Give it a unique name derived from the line number.\n name += '@' + str(call.line)\n info = self.build_enum_call_typeinfo(name, items, fullname, call.line)\n # Store generated TypeInfo under both names, see semanal_namedtuple for more details.\n if name != var_name or is_func_scope:\n self.api.add_symbol_skip_local(name, info)\n call.analyzed = EnumCallExpr(info, items, values)\n call.analyzed.set_line(call.line, call.column)\n info.line = node.line\n return info\n\n def build_enum_call_typeinfo(self, name: str, items: List[str], fullname: str,\n line: int) -> TypeInfo:\n base = self.api.named_type_or_none(fullname)\n assert base is not None\n info = self.api.basic_new_typeinfo(name, base, line)\n info.metaclass_type = info.calculate_metaclass_type()\n info.is_enum = True\n for item in items:\n var = Var(item)\n var.info = info\n var.is_property = True\n var._fullname = '{}.{}'.format(info.fullname, item)\n info.names[item] = SymbolTableNode(MDEF, var)\n return info\n\n def parse_enum_call_args(self, call: CallExpr,\n class_name: str) -> Tuple[List[str],\n List[Optional[Expression]], bool]:\n \"\"\"Parse arguments of an Enum call.\n\n Return a tuple of fields, values, was there an error.\n \"\"\"\n args = call.args\n if not all([arg_kind in [ARG_POS, ARG_NAMED] for arg_kind in call.arg_kinds]):\n return self.fail_enum_call_arg(\"Unexpected arguments to %s()\" % class_name, call)\n if len(args) < 2:\n return self.fail_enum_call_arg(\"Too few arguments for %s()\" % class_name, call)\n if len(args) > 6:\n return self.fail_enum_call_arg(\"Too many arguments for %s()\" % class_name, call)\n valid_name = [None, 'value', 'names', 'module', 'qualname', 'type', 'start']\n for arg_name in call.arg_names:\n if arg_name not in valid_name:\n self.fail_enum_call_arg('Unexpected keyword argument \"{}\"'.format(arg_name), call)\n value, names = None, None\n for arg_name, arg in zip(call.arg_names, args):\n if arg_name == 'value':\n value = arg\n if arg_name == 'names':\n names = arg\n if value is None:\n value = args[0]\n if names is None:\n names = args[1]\n if not isinstance(value, (StrExpr, UnicodeExpr)):\n return self.fail_enum_call_arg(\n \"%s() expects a string literal as the first argument\" % class_name, call)\n items = []\n values: List[Optional[Expression]] = []\n if isinstance(names, (StrExpr, UnicodeExpr)):\n fields = names.value\n for field in fields.replace(',', ' ').split():\n items.append(field)\n elif isinstance(names, (TupleExpr, ListExpr)):\n seq_items = names.items\n if all(isinstance(seq_item, (StrExpr, UnicodeExpr)) for seq_item in seq_items):\n items = [cast(Union[StrExpr, UnicodeExpr], seq_item).value\n for seq_item in seq_items]\n elif all(isinstance(seq_item, (TupleExpr, ListExpr))\n and len(seq_item.items) == 2\n and isinstance(seq_item.items[0], (StrExpr, UnicodeExpr))\n for seq_item in seq_items):\n for seq_item in seq_items:\n assert isinstance(seq_item, (TupleExpr, ListExpr))\n name, value = seq_item.items\n assert isinstance(name, (StrExpr, UnicodeExpr))\n items.append(name.value)\n values.append(value)\n else:\n return self.fail_enum_call_arg(\n \"%s() with tuple or list expects strings or (name, value) pairs\" %\n class_name,\n call)\n elif isinstance(names, DictExpr):\n for key, value in names.items:\n if not isinstance(key, (StrExpr, UnicodeExpr)):\n return self.fail_enum_call_arg(\n \"%s() with dict literal requires string literals\" % class_name, call)\n items.append(key.value)\n values.append(value)\n else:\n # TODO: Allow dict(x=1, y=2) as a substitute for {'x': 1, 'y': 2}?\n return self.fail_enum_call_arg(\n \"%s() expects a string, tuple, list or dict literal as the second argument\" %\n class_name,\n call)\n if len(items) == 0:\n return self.fail_enum_call_arg(\"%s() needs at least one item\" % class_name, call)\n if not values:\n values = [None] * len(items)\n assert len(items) == len(values)\n return items, values, True\n\n def fail_enum_call_arg(self, message: str,\n context: Context) -> Tuple[List[str],\n List[Optional[Expression]], bool]:\n self.fail(message, context)\n return [], [], False\n\n # Helpers\n\n def fail(self, msg: str, ctx: Context) -> None:\n self.api.fail(msg, ctx)\n", "path": "mypy/semanal_enum.py" } ]
diff --git a/mypy/semanal_enum.py b/mypy/semanal_enum.py index 5682f66298f6..c900c5fa790f 100644 --- a/mypy/semanal_enum.py +++ b/mypy/semanal_enum.py @@ -21,6 +21,8 @@ )) ENUM_SPECIAL_PROPS: Final = frozenset(( 'name', 'value', '_name_', '_value_', '_order_', '__order__', + # Also attributes from `object`: + '__module__', '__annotations__', '__doc__', '__slots__', '__dict__', )) diff --git a/test-data/unit/check-enum.test b/test-data/unit/check-enum.test index a393df079730..c29ee7b24cf3 100644 --- a/test-data/unit/check-enum.test +++ b/test-data/unit/check-enum.test @@ -1689,6 +1689,11 @@ class E(Enum): _value_ = 'b2' _order_ = 'X Y' __order__ = 'X Y' + __slots__ = () + __doc__ = 'doc' + __module__ = 'module' + __annotations__ = {'a': int} + __dict__ = {'a': 1} class EI(IntEnum): name = 'a' @@ -1697,10 +1702,15 @@ class EI(IntEnum): _value_ = 2 _order_ = 'X Y' __order__ = 'X Y' + __slots__ = () + __doc__ = 'doc' + __module__ = 'module' + __annotations__ = {'a': int} + __dict__ = {'a': 1} E._order_ = 'a' # E: Cannot assign to final attribute "_order_" EI.value = 2 # E: Cannot assign to final attribute "value" -[builtins fixtures/bool.pyi] +[builtins fixtures/dict.pyi] [case testEnumNotFinalWithMethodsAndUninitializedValues] # https://github.com/python/mypy/issues/11578
psf__black-3276
[ { "content": "import io\nimport os\nimport sys\nfrom functools import lru_cache\nfrom pathlib import Path\nfrom typing import (\n TYPE_CHECKING,\n Any,\n Dict,\n Iterable,\n Iterator,\n List,\n Optional,\n Pattern,\n Sequence,\n Tuple,\n Union,\n)\n\nfrom mypy_extensions import mypyc_attr\nfrom pathspec import PathSpec\nfrom pathspec.patterns.gitwildmatch import GitWildMatchPatternError\n\nif sys.version_info >= (3, 11):\n try:\n import tomllib\n except ImportError:\n # Help users on older alphas\n import tomli as tomllib\nelse:\n import tomli as tomllib\n\nfrom black.handle_ipynb_magics import jupyter_dependencies_are_installed\nfrom black.output import err\nfrom black.report import Report\n\nif TYPE_CHECKING:\n import colorama # noqa: F401\n\n\n@lru_cache()\ndef find_project_root(\n srcs: Sequence[str], stdin_filename: Optional[str] = None\n) -> Tuple[Path, str]:\n \"\"\"Return a directory containing .git, .hg, or pyproject.toml.\n\n That directory will be a common parent of all files and directories\n passed in `srcs`.\n\n If no directory in the tree contains a marker that would specify it's the\n project root, the root of the file system is returned.\n\n Returns a two-tuple with the first element as the project root path and\n the second element as a string describing the method by which the\n project root was discovered.\n \"\"\"\n if stdin_filename is not None:\n srcs = tuple(stdin_filename if s == \"-\" else s for s in srcs)\n if not srcs:\n srcs = [str(Path.cwd().resolve())]\n\n path_srcs = [Path(Path.cwd(), src).resolve() for src in srcs]\n\n # A list of lists of parents for each 'src'. 'src' is included as a\n # \"parent\" of itself if it is a directory\n src_parents = [\n list(path.parents) + ([path] if path.is_dir() else []) for path in path_srcs\n ]\n\n common_base = max(\n set.intersection(*(set(parents) for parents in src_parents)),\n key=lambda path: path.parts,\n )\n\n for directory in (common_base, *common_base.parents):\n if (directory / \".git\").exists():\n return directory, \".git directory\"\n\n if (directory / \".hg\").is_dir():\n return directory, \".hg directory\"\n\n if (directory / \"pyproject.toml\").is_file():\n return directory, \"pyproject.toml\"\n\n return directory, \"file system root\"\n\n\ndef find_pyproject_toml(path_search_start: Tuple[str, ...]) -> Optional[str]:\n \"\"\"Find the absolute filepath to a pyproject.toml if it exists\"\"\"\n path_project_root, _ = find_project_root(path_search_start)\n path_pyproject_toml = path_project_root / \"pyproject.toml\"\n if path_pyproject_toml.is_file():\n return str(path_pyproject_toml)\n\n try:\n path_user_pyproject_toml = find_user_pyproject_toml()\n return (\n str(path_user_pyproject_toml)\n if path_user_pyproject_toml.is_file()\n else None\n )\n except (PermissionError, RuntimeError) as e:\n # We do not have access to the user-level config directory, so ignore it.\n err(f\"Ignoring user configuration directory due to {e!r}\")\n return None\n\n\n@mypyc_attr(patchable=True)\ndef parse_pyproject_toml(path_config: str) -> Dict[str, Any]:\n \"\"\"Parse a pyproject toml file, pulling out relevant parts for Black\n\n If parsing fails, will raise a tomllib.TOMLDecodeError\n \"\"\"\n with open(path_config, \"rb\") as f:\n pyproject_toml = tomllib.load(f)\n config = pyproject_toml.get(\"tool\", {}).get(\"black\", {})\n return {k.replace(\"--\", \"\").replace(\"-\", \"_\"): v for k, v in config.items()}\n\n\n@lru_cache()\ndef find_user_pyproject_toml() -> Path:\n r\"\"\"Return the path to the top-level user configuration for black.\n\n This looks for ~\\.black on Windows and ~/.config/black on Linux and other\n Unix systems.\n\n May raise:\n - RuntimeError: if the current user has no homedir\n - PermissionError: if the current process cannot access the user's homedir\n \"\"\"\n if sys.platform == \"win32\":\n # Windows\n user_config_path = Path.home() / \".black\"\n else:\n config_root = os.environ.get(\"XDG_CONFIG_HOME\", \"~/.config\")\n user_config_path = Path(config_root).expanduser() / \"black\"\n return user_config_path.resolve()\n\n\n@lru_cache()\ndef get_gitignore(root: Path) -> PathSpec:\n \"\"\"Return a PathSpec matching gitignore content if present.\"\"\"\n gitignore = root / \".gitignore\"\n lines: List[str] = []\n if gitignore.is_file():\n with gitignore.open(encoding=\"utf-8\") as gf:\n lines = gf.readlines()\n try:\n return PathSpec.from_lines(\"gitwildmatch\", lines)\n except GitWildMatchPatternError as e:\n err(f\"Could not parse {gitignore}: {e}\")\n raise\n\n\ndef normalize_path_maybe_ignore(\n path: Path,\n root: Path,\n report: Optional[Report] = None,\n) -> Optional[str]:\n \"\"\"Normalize `path`. May return `None` if `path` was ignored.\n\n `report` is where \"path ignored\" output goes.\n \"\"\"\n try:\n abspath = path if path.is_absolute() else Path.cwd() / path\n normalized_path = abspath.resolve()\n try:\n root_relative_path = normalized_path.relative_to(root).as_posix()\n except ValueError:\n if report:\n report.path_ignored(\n path, f\"is a symbolic link that points outside {root}\"\n )\n return None\n\n except OSError as e:\n if report:\n report.path_ignored(path, f\"cannot be read because {e}\")\n return None\n\n return root_relative_path\n\n\ndef path_is_excluded(\n normalized_path: str,\n pattern: Optional[Pattern[str]],\n) -> bool:\n match = pattern.search(normalized_path) if pattern else None\n return bool(match and match.group(0))\n\n\ndef gen_python_files(\n paths: Iterable[Path],\n root: Path,\n include: Pattern[str],\n exclude: Pattern[str],\n extend_exclude: Optional[Pattern[str]],\n force_exclude: Optional[Pattern[str]],\n report: Report,\n gitignore: Optional[PathSpec],\n *,\n verbose: bool,\n quiet: bool,\n) -> Iterator[Path]:\n \"\"\"Generate all files under `path` whose paths are not excluded by the\n `exclude_regex`, `extend_exclude`, or `force_exclude` regexes,\n but are included by the `include` regex.\n\n Symbolic links pointing outside of the `root` directory are ignored.\n\n `report` is where output about exclusions goes.\n \"\"\"\n assert root.is_absolute(), f\"INTERNAL ERROR: `root` must be absolute but is {root}\"\n for child in paths:\n normalized_path = normalize_path_maybe_ignore(child, root, report)\n if normalized_path is None:\n continue\n\n # First ignore files matching .gitignore, if passed\n if gitignore is not None and gitignore.match_file(normalized_path):\n report.path_ignored(child, \"matches the .gitignore file content\")\n continue\n\n # Then ignore with `--exclude` `--extend-exclude` and `--force-exclude` options.\n normalized_path = \"/\" + normalized_path\n if child.is_dir():\n normalized_path += \"/\"\n\n if path_is_excluded(normalized_path, exclude):\n report.path_ignored(child, \"matches the --exclude regular expression\")\n continue\n\n if path_is_excluded(normalized_path, extend_exclude):\n report.path_ignored(\n child, \"matches the --extend-exclude regular expression\"\n )\n continue\n\n if path_is_excluded(normalized_path, force_exclude):\n report.path_ignored(child, \"matches the --force-exclude regular expression\")\n continue\n\n if child.is_dir():\n # If gitignore is None, gitignore usage is disabled, while a Falsey\n # gitignore is when the directory doesn't have a .gitignore file.\n yield from gen_python_files(\n child.iterdir(),\n root,\n include,\n exclude,\n extend_exclude,\n force_exclude,\n report,\n gitignore + get_gitignore(child) if gitignore is not None else None,\n verbose=verbose,\n quiet=quiet,\n )\n\n elif child.is_file():\n if child.suffix == \".ipynb\" and not jupyter_dependencies_are_installed(\n verbose=verbose, quiet=quiet\n ):\n continue\n include_match = include.search(normalized_path) if include else True\n if include_match:\n yield child\n\n\ndef wrap_stream_for_windows(\n f: io.TextIOWrapper,\n) -> Union[io.TextIOWrapper, \"colorama.AnsiToWin32\"]:\n \"\"\"\n Wrap stream with colorama's wrap_stream so colors are shown on Windows.\n\n If `colorama` is unavailable, the original stream is returned unmodified.\n Otherwise, the `wrap_stream()` function determines whether the stream needs\n to be wrapped for a Windows environment and will accordingly either return\n an `AnsiToWin32` wrapper or the original stream.\n \"\"\"\n try:\n from colorama.initialise import wrap_stream\n except ImportError:\n return f\n else:\n # Set `strip=False` to avoid needing to modify test_express_diff_with_color.\n return wrap_stream(f, convert=None, strip=False, autoreset=False, wrap=True)\n", "path": "src/black/files.py" } ]
[ { "content": "import io\nimport os\nimport sys\nfrom functools import lru_cache\nfrom pathlib import Path\nfrom typing import (\n TYPE_CHECKING,\n Any,\n Dict,\n Iterable,\n Iterator,\n List,\n Optional,\n Pattern,\n Sequence,\n Tuple,\n Union,\n)\n\nfrom mypy_extensions import mypyc_attr\nfrom pathspec import PathSpec\nfrom pathspec.patterns.gitwildmatch import GitWildMatchPatternError\n\nif sys.version_info >= (3, 11):\n try:\n import tomllib\n except ImportError:\n # Help users on older alphas\n if not TYPE_CHECKING:\n import tomli as tomllib\nelse:\n import tomli as tomllib\n\nfrom black.handle_ipynb_magics import jupyter_dependencies_are_installed\nfrom black.output import err\nfrom black.report import Report\n\nif TYPE_CHECKING:\n import colorama # noqa: F401\n\n\n@lru_cache()\ndef find_project_root(\n srcs: Sequence[str], stdin_filename: Optional[str] = None\n) -> Tuple[Path, str]:\n \"\"\"Return a directory containing .git, .hg, or pyproject.toml.\n\n That directory will be a common parent of all files and directories\n passed in `srcs`.\n\n If no directory in the tree contains a marker that would specify it's the\n project root, the root of the file system is returned.\n\n Returns a two-tuple with the first element as the project root path and\n the second element as a string describing the method by which the\n project root was discovered.\n \"\"\"\n if stdin_filename is not None:\n srcs = tuple(stdin_filename if s == \"-\" else s for s in srcs)\n if not srcs:\n srcs = [str(Path.cwd().resolve())]\n\n path_srcs = [Path(Path.cwd(), src).resolve() for src in srcs]\n\n # A list of lists of parents for each 'src'. 'src' is included as a\n # \"parent\" of itself if it is a directory\n src_parents = [\n list(path.parents) + ([path] if path.is_dir() else []) for path in path_srcs\n ]\n\n common_base = max(\n set.intersection(*(set(parents) for parents in src_parents)),\n key=lambda path: path.parts,\n )\n\n for directory in (common_base, *common_base.parents):\n if (directory / \".git\").exists():\n return directory, \".git directory\"\n\n if (directory / \".hg\").is_dir():\n return directory, \".hg directory\"\n\n if (directory / \"pyproject.toml\").is_file():\n return directory, \"pyproject.toml\"\n\n return directory, \"file system root\"\n\n\ndef find_pyproject_toml(path_search_start: Tuple[str, ...]) -> Optional[str]:\n \"\"\"Find the absolute filepath to a pyproject.toml if it exists\"\"\"\n path_project_root, _ = find_project_root(path_search_start)\n path_pyproject_toml = path_project_root / \"pyproject.toml\"\n if path_pyproject_toml.is_file():\n return str(path_pyproject_toml)\n\n try:\n path_user_pyproject_toml = find_user_pyproject_toml()\n return (\n str(path_user_pyproject_toml)\n if path_user_pyproject_toml.is_file()\n else None\n )\n except (PermissionError, RuntimeError) as e:\n # We do not have access to the user-level config directory, so ignore it.\n err(f\"Ignoring user configuration directory due to {e!r}\")\n return None\n\n\n@mypyc_attr(patchable=True)\ndef parse_pyproject_toml(path_config: str) -> Dict[str, Any]:\n \"\"\"Parse a pyproject toml file, pulling out relevant parts for Black\n\n If parsing fails, will raise a tomllib.TOMLDecodeError\n \"\"\"\n with open(path_config, \"rb\") as f:\n pyproject_toml = tomllib.load(f)\n config = pyproject_toml.get(\"tool\", {}).get(\"black\", {})\n return {k.replace(\"--\", \"\").replace(\"-\", \"_\"): v for k, v in config.items()}\n\n\n@lru_cache()\ndef find_user_pyproject_toml() -> Path:\n r\"\"\"Return the path to the top-level user configuration for black.\n\n This looks for ~\\.black on Windows and ~/.config/black on Linux and other\n Unix systems.\n\n May raise:\n - RuntimeError: if the current user has no homedir\n - PermissionError: if the current process cannot access the user's homedir\n \"\"\"\n if sys.platform == \"win32\":\n # Windows\n user_config_path = Path.home() / \".black\"\n else:\n config_root = os.environ.get(\"XDG_CONFIG_HOME\", \"~/.config\")\n user_config_path = Path(config_root).expanduser() / \"black\"\n return user_config_path.resolve()\n\n\n@lru_cache()\ndef get_gitignore(root: Path) -> PathSpec:\n \"\"\"Return a PathSpec matching gitignore content if present.\"\"\"\n gitignore = root / \".gitignore\"\n lines: List[str] = []\n if gitignore.is_file():\n with gitignore.open(encoding=\"utf-8\") as gf:\n lines = gf.readlines()\n try:\n return PathSpec.from_lines(\"gitwildmatch\", lines)\n except GitWildMatchPatternError as e:\n err(f\"Could not parse {gitignore}: {e}\")\n raise\n\n\ndef normalize_path_maybe_ignore(\n path: Path,\n root: Path,\n report: Optional[Report] = None,\n) -> Optional[str]:\n \"\"\"Normalize `path`. May return `None` if `path` was ignored.\n\n `report` is where \"path ignored\" output goes.\n \"\"\"\n try:\n abspath = path if path.is_absolute() else Path.cwd() / path\n normalized_path = abspath.resolve()\n try:\n root_relative_path = normalized_path.relative_to(root).as_posix()\n except ValueError:\n if report:\n report.path_ignored(\n path, f\"is a symbolic link that points outside {root}\"\n )\n return None\n\n except OSError as e:\n if report:\n report.path_ignored(path, f\"cannot be read because {e}\")\n return None\n\n return root_relative_path\n\n\ndef path_is_excluded(\n normalized_path: str,\n pattern: Optional[Pattern[str]],\n) -> bool:\n match = pattern.search(normalized_path) if pattern else None\n return bool(match and match.group(0))\n\n\ndef gen_python_files(\n paths: Iterable[Path],\n root: Path,\n include: Pattern[str],\n exclude: Pattern[str],\n extend_exclude: Optional[Pattern[str]],\n force_exclude: Optional[Pattern[str]],\n report: Report,\n gitignore: Optional[PathSpec],\n *,\n verbose: bool,\n quiet: bool,\n) -> Iterator[Path]:\n \"\"\"Generate all files under `path` whose paths are not excluded by the\n `exclude_regex`, `extend_exclude`, or `force_exclude` regexes,\n but are included by the `include` regex.\n\n Symbolic links pointing outside of the `root` directory are ignored.\n\n `report` is where output about exclusions goes.\n \"\"\"\n assert root.is_absolute(), f\"INTERNAL ERROR: `root` must be absolute but is {root}\"\n for child in paths:\n normalized_path = normalize_path_maybe_ignore(child, root, report)\n if normalized_path is None:\n continue\n\n # First ignore files matching .gitignore, if passed\n if gitignore is not None and gitignore.match_file(normalized_path):\n report.path_ignored(child, \"matches the .gitignore file content\")\n continue\n\n # Then ignore with `--exclude` `--extend-exclude` and `--force-exclude` options.\n normalized_path = \"/\" + normalized_path\n if child.is_dir():\n normalized_path += \"/\"\n\n if path_is_excluded(normalized_path, exclude):\n report.path_ignored(child, \"matches the --exclude regular expression\")\n continue\n\n if path_is_excluded(normalized_path, extend_exclude):\n report.path_ignored(\n child, \"matches the --extend-exclude regular expression\"\n )\n continue\n\n if path_is_excluded(normalized_path, force_exclude):\n report.path_ignored(child, \"matches the --force-exclude regular expression\")\n continue\n\n if child.is_dir():\n # If gitignore is None, gitignore usage is disabled, while a Falsey\n # gitignore is when the directory doesn't have a .gitignore file.\n yield from gen_python_files(\n child.iterdir(),\n root,\n include,\n exclude,\n extend_exclude,\n force_exclude,\n report,\n gitignore + get_gitignore(child) if gitignore is not None else None,\n verbose=verbose,\n quiet=quiet,\n )\n\n elif child.is_file():\n if child.suffix == \".ipynb\" and not jupyter_dependencies_are_installed(\n verbose=verbose, quiet=quiet\n ):\n continue\n include_match = include.search(normalized_path) if include else True\n if include_match:\n yield child\n\n\ndef wrap_stream_for_windows(\n f: io.TextIOWrapper,\n) -> Union[io.TextIOWrapper, \"colorama.AnsiToWin32\"]:\n \"\"\"\n Wrap stream with colorama's wrap_stream so colors are shown on Windows.\n\n If `colorama` is unavailable, the original stream is returned unmodified.\n Otherwise, the `wrap_stream()` function determines whether the stream needs\n to be wrapped for a Windows environment and will accordingly either return\n an `AnsiToWin32` wrapper or the original stream.\n \"\"\"\n try:\n from colorama.initialise import wrap_stream\n except ImportError:\n return f\n else:\n # Set `strip=False` to avoid needing to modify test_express_diff_with_color.\n return wrap_stream(f, convert=None, strip=False, autoreset=False, wrap=True)\n", "path": "src/black/files.py" } ]
diff --git a/.github/workflows/pypi_upload.yml b/.github/workflows/pypi_upload.yml index d52f41a4939..ae26a814c9e 100644 --- a/.github/workflows/pypi_upload.yml +++ b/.github/workflows/pypi_upload.yml @@ -58,7 +58,7 @@ jobs: - uses: actions/checkout@v3 - name: Build wheels via cibuildwheel - uses: pypa/cibuildwheel@v2.8.1 + uses: pypa/cibuildwheel@v2.10.0 env: CIBW_ARCHS_MACOS: "${{ matrix.macos_arch }}" # This isn't supported in pyproject.toml which makes sense (but is annoying). diff --git a/CHANGES.md b/CHANGES.md index 147100c3012..0fa80ad8124 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -25,6 +25,8 @@ <!-- Changes to how Black is packaged, such as dependency requirements --> +- Faster compiled wheels are now available for CPython 3.11 (#3276) + ### Parser <!-- Changes to the parser or to version autodetection --> diff --git a/pyproject.toml b/pyproject.toml index a4c9c692085..122a49e004b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -55,6 +55,9 @@ MYPYC_DEBUG_LEVEL = "0" # The dependencies required to build wheels with mypyc aren't specified in # [build-system].requires so we'll have to manage the build environment ourselves. PIP_NO_BUILD_ISOLATION = "no" +# CPython 3.11 wheels aren't available for aiohttp and building a Cython extension +# from source also doesn't work. +AIOHTTP_NO_EXTENSIONS = "1" [tool.cibuildwheel.linux] before-build = [ @@ -69,6 +72,7 @@ MYPYC_DEBUG_LEVEL = "0" PIP_NO_BUILD_ISOLATION = "no" # Black needs Clang to compile successfully on Linux. CC = "clang" +AIOHTTP_NO_EXTENSIONS = "1" [tool.cibuildwheel.windows] # For some reason, (compiled) mypyc is failing to start up with "ImportError: DLL load diff --git a/src/black/files.py b/src/black/files.py index d51c1bc7a90..ed503f5fec7 100644 --- a/src/black/files.py +++ b/src/black/files.py @@ -26,7 +26,8 @@ import tomllib except ImportError: # Help users on older alphas - import tomli as tomllib + if not TYPE_CHECKING: + import tomli as tomllib else: import tomli as tomllib
gratipay__gratipay.com-1975
[ { "content": "from __future__ import division\n\nfrom importlib import import_module\nimport os\nimport sys\nimport threading\nimport time\nimport traceback\n\nimport gittip\nimport gittip.wireup\nfrom gittip import canonize, configure_payments\nfrom gittip.security import authentication, csrf, x_frame_options\nfrom gittip.utils import cache_static, timer\nfrom gittip.elsewhere import platform_classes\n\n\nfrom aspen import log_dammit\n\n# Wireup Algorithm\n# ================\n\nversion_file = os.path.join(website.www_root, 'version.txt')\n__version__ = open(version_file).read().strip()\nwebsite.version = os.environ['__VERSION__'] = __version__\n\n\nwebsite.renderer_default = \"jinja2\"\nwebsite.default_renderers_by_media_type['application/json'] = 'stdlib_format'\n\nwebsite.renderer_factories['jinja2'].Renderer.global_context = {\n 'range': range,\n 'unicode': unicode,\n 'enumerate': enumerate,\n 'len': len,\n 'float': float,\n 'type': type,\n 'str': str\n}\n\n\ngittip.wireup.canonical()\nwebsite.db = gittip.wireup.db()\ngittip.wireup.billing()\ngittip.wireup.username_restrictions(website)\ngittip.wireup.nanswers()\ngittip.wireup.envvars(website)\ntell_sentry = gittip.wireup.make_sentry_teller(website)\n\n# this serves two purposes:\n# 1) ensure all platform classes are created (and thus added to platform_classes)\n# 2) keep the platform modules around to be added to the context below\nplatform_modules = {platform: import_module(\"gittip.elsewhere.%s\" % platform)\n for platform in platform_classes}\n\n# The homepage wants expensive queries. Let's periodically select into an\n# intermediate table.\n\nUPDATE_HOMEPAGE_EVERY = int(os.environ['UPDATE_HOMEPAGE_EVERY'])\ndef update_homepage_queries():\n from gittip import utils\n while 1:\n try:\n utils.update_global_stats(website)\n utils.update_homepage_queries_once(website.db)\n website.db.self_check()\n except:\n exception = sys.exc_info()[0]\n tell_sentry(exception)\n tb = traceback.format_exc().strip()\n log_dammit(tb)\n time.sleep(UPDATE_HOMEPAGE_EVERY)\n\nif UPDATE_HOMEPAGE_EVERY > 0:\n homepage_updater = threading.Thread(target=update_homepage_queries)\n homepage_updater.daemon = True\n homepage_updater.start()\nelse:\n from gittip import utils\n utils.update_global_stats(website)\n\n\n# Server Algorithm\n# ================\n\ndef up_minthreads(website):\n # https://github.com/gittip/www.gittip.com/issues/1098\n # Discovered the following API by inspecting in pdb and browsing source.\n # This requires network_engine.bind to have already been called.\n request_queue = website.network_engine.cheroot_server.requests\n request_queue.min = website.min_threads\n\n\ndef setup_busy_threads_logging(website):\n # https://github.com/gittip/www.gittip.com/issues/1572\n log_every = website.log_busy_threads_every\n if log_every == 0:\n return\n\n pool = website.network_engine.cheroot_server.requests\n def log_busy_threads():\n time.sleep(0.5) # without this we get a single log message where all threads are busy\n while 1:\n\n # Use pool.min and not pool.max because of the semantics of these\n # inside of Cheroot. (Max is a hard limit used only when pool.grow\n # is called, and it's never called except when the pool starts up,\n # when it's called with pool.min.)\n\n nbusy_threads = pool.min - pool.idle\n print(\"sample#aspen.busy_threads={}\".format(nbusy_threads))\n time.sleep(log_every)\n\n thread = threading.Thread(target=log_busy_threads)\n thread.daemon = True\n thread.start()\n\n\nwebsite.server_algorithm.insert_before('start', up_minthreads)\nwebsite.server_algorithm.insert_before('start', setup_busy_threads_logging)\n\n\n# Website Algorithm\n# =================\n\ndef add_stuff_to_context(request):\n request.context['username'] = None\n request.context.update(platform_modules)\n\ndef scab_body_onto_response(response):\n\n # This is a workaround for a Cheroot bug, where the connection is closed\n # too early if there is no body:\n #\n # https://bitbucket.org/cherrypy/cheroot/issue/1/fail-if-passed-zero-bytes\n #\n # This Cheroot bug is manifesting because of a change in Aspen's behavior\n # with the algorithm.py refactor in 0.27+: Aspen no longer sets a body for\n # 302s as it used to. This means that all redirects are breaking\n # intermittently (sometimes the client seems not to care that the\n # connection is closed too early, so I guess there's some timing\n # involved?), which is affecting a number of parts of Gittip, notably\n # around logging in (#1859).\n\n if not response.body:\n response.body = '*sigh*'\n\n\nalgorithm = website.algorithm\nalgorithm.functions = [ timer.start\n , algorithm['parse_environ_into_request']\n , algorithm['tack_website_onto_request']\n , algorithm['raise_200_for_OPTIONS']\n\n , canonize\n , configure_payments\n , authentication.inbound\n , csrf.inbound\n , add_stuff_to_context\n\n , algorithm['dispatch_request_to_filesystem']\n , algorithm['apply_typecasters_to_path']\n\n , cache_static.inbound\n\n , algorithm['get_response_for_socket']\n , algorithm['get_resource_for_request']\n , algorithm['get_response_for_resource']\n\n , tell_sentry\n , algorithm['get_response_for_exception']\n\n , gittip.outbound\n , authentication.outbound\n , csrf.outbound\n , cache_static.outbound\n , x_frame_options\n\n , algorithm['log_traceback_for_5xx']\n , algorithm['delegate_error_to_simplate']\n , tell_sentry\n , algorithm['log_traceback_for_exception']\n , algorithm['log_result_of_request']\n\n , scab_body_onto_response\n , timer.end\n , tell_sentry\n ]\n", "path": "configure-aspen.py" } ]
[ { "content": "from __future__ import division\n\nfrom importlib import import_module\nimport os\nimport sys\nimport threading\nimport time\nimport traceback\n\nimport gittip\nimport gittip.wireup\nfrom gittip import canonize, configure_payments\nfrom gittip.security import authentication, csrf, x_frame_options\nfrom gittip.utils import cache_static, timer\nfrom gittip.elsewhere import platform_classes\n\n\nfrom aspen import log_dammit\n\n# Wireup Algorithm\n# ================\n\nversion_file = os.path.join(website.www_root, 'version.txt')\n__version__ = open(version_file).read().strip()\nwebsite.version = os.environ['__VERSION__'] = __version__\n\n\nwebsite.renderer_default = \"jinja2\"\n\nwebsite.renderer_factories['jinja2'].Renderer.global_context = {\n 'range': range,\n 'unicode': unicode,\n 'enumerate': enumerate,\n 'len': len,\n 'float': float,\n 'type': type,\n 'str': str\n}\n\n\ngittip.wireup.canonical()\nwebsite.db = gittip.wireup.db()\ngittip.wireup.billing()\ngittip.wireup.username_restrictions(website)\ngittip.wireup.nanswers()\ngittip.wireup.envvars(website)\ntell_sentry = gittip.wireup.make_sentry_teller(website)\n\n# this serves two purposes:\n# 1) ensure all platform classes are created (and thus added to platform_classes)\n# 2) keep the platform modules around to be added to the context below\nplatform_modules = {platform: import_module(\"gittip.elsewhere.%s\" % platform)\n for platform in platform_classes}\n\n# The homepage wants expensive queries. Let's periodically select into an\n# intermediate table.\n\nUPDATE_HOMEPAGE_EVERY = int(os.environ['UPDATE_HOMEPAGE_EVERY'])\ndef update_homepage_queries():\n from gittip import utils\n while 1:\n try:\n utils.update_global_stats(website)\n utils.update_homepage_queries_once(website.db)\n website.db.self_check()\n except:\n exception = sys.exc_info()[0]\n tell_sentry(exception)\n tb = traceback.format_exc().strip()\n log_dammit(tb)\n time.sleep(UPDATE_HOMEPAGE_EVERY)\n\nif UPDATE_HOMEPAGE_EVERY > 0:\n homepage_updater = threading.Thread(target=update_homepage_queries)\n homepage_updater.daemon = True\n homepage_updater.start()\nelse:\n from gittip import utils\n utils.update_global_stats(website)\n\n\n# Server Algorithm\n# ================\n\ndef up_minthreads(website):\n # https://github.com/gittip/www.gittip.com/issues/1098\n # Discovered the following API by inspecting in pdb and browsing source.\n # This requires network_engine.bind to have already been called.\n request_queue = website.network_engine.cheroot_server.requests\n request_queue.min = website.min_threads\n\n\ndef setup_busy_threads_logging(website):\n # https://github.com/gittip/www.gittip.com/issues/1572\n log_every = website.log_busy_threads_every\n if log_every == 0:\n return\n\n pool = website.network_engine.cheroot_server.requests\n def log_busy_threads():\n time.sleep(0.5) # without this we get a single log message where all threads are busy\n while 1:\n\n # Use pool.min and not pool.max because of the semantics of these\n # inside of Cheroot. (Max is a hard limit used only when pool.grow\n # is called, and it's never called except when the pool starts up,\n # when it's called with pool.min.)\n\n nbusy_threads = pool.min - pool.idle\n print(\"sample#aspen.busy_threads={}\".format(nbusy_threads))\n time.sleep(log_every)\n\n thread = threading.Thread(target=log_busy_threads)\n thread.daemon = True\n thread.start()\n\n\nwebsite.server_algorithm.insert_before('start', up_minthreads)\nwebsite.server_algorithm.insert_before('start', setup_busy_threads_logging)\n\n\n# Website Algorithm\n# =================\n\ndef add_stuff_to_context(request):\n request.context['username'] = None\n request.context.update(platform_modules)\n\ndef scab_body_onto_response(response):\n\n # This is a workaround for a Cheroot bug, where the connection is closed\n # too early if there is no body:\n #\n # https://bitbucket.org/cherrypy/cheroot/issue/1/fail-if-passed-zero-bytes\n #\n # This Cheroot bug is manifesting because of a change in Aspen's behavior\n # with the algorithm.py refactor in 0.27+: Aspen no longer sets a body for\n # 302s as it used to. This means that all redirects are breaking\n # intermittently (sometimes the client seems not to care that the\n # connection is closed too early, so I guess there's some timing\n # involved?), which is affecting a number of parts of Gittip, notably\n # around logging in (#1859).\n\n if not response.body:\n response.body = '*sigh*'\n\n\nalgorithm = website.algorithm\nalgorithm.functions = [ timer.start\n , algorithm['parse_environ_into_request']\n , algorithm['tack_website_onto_request']\n , algorithm['raise_200_for_OPTIONS']\n\n , canonize\n , configure_payments\n , authentication.inbound\n , csrf.inbound\n , add_stuff_to_context\n\n , algorithm['dispatch_request_to_filesystem']\n , algorithm['apply_typecasters_to_path']\n\n , cache_static.inbound\n\n , algorithm['get_response_for_socket']\n , algorithm['get_resource_for_request']\n , algorithm['get_response_for_resource']\n\n , tell_sentry\n , algorithm['get_response_for_exception']\n\n , gittip.outbound\n , authentication.outbound\n , csrf.outbound\n , cache_static.outbound\n , x_frame_options\n\n , algorithm['log_traceback_for_5xx']\n , algorithm['delegate_error_to_simplate']\n , tell_sentry\n , algorithm['log_traceback_for_exception']\n , algorithm['log_result_of_request']\n\n , scab_body_onto_response\n , timer.end\n , tell_sentry\n ]\n", "path": "configure-aspen.py" } ]
diff --git a/configure-aspen.py b/configure-aspen.py index 0d335a4d60..f9f8f7f299 100644 --- a/configure-aspen.py +++ b/configure-aspen.py @@ -26,7 +26,6 @@ website.renderer_default = "jinja2" -website.default_renderers_by_media_type['application/json'] = 'stdlib_format' website.renderer_factories['jinja2'].Renderer.global_context = { 'range': range, diff --git a/tests/test_stats.py b/tests/test_stats.py index 13dcf64ec9..1b66e473c3 100644 --- a/tests/test_stats.py +++ b/tests/test_stats.py @@ -2,6 +2,7 @@ import datetime from decimal import Decimal +import json from mock import patch @@ -74,6 +75,13 @@ def test_get_tip_distribution_ignores_missing_cc(self): actual = Participant.from_username('bob').get_tip_distribution() assert actual == expected +class TestJson(Harness): + + def test_200(self): + response = self.client.GET('/about/stats.json') + assert response.code == 200 + body = json.loads(response.body) + assert len(body) > 0 class TestRenderingStatsPage(Harness): def get_stats_page(self): diff --git a/www/about/stats.spt b/www/about/stats.spt index 3630b7f30a..db2e47bf8d 100644 --- a/www/about/stats.spt +++ b/www/about/stats.spt @@ -124,7 +124,7 @@ def part(s): now = datetime.datetime.utcnow() -last_payday = db.one("select ts_start, ts_end from paydays order by ts_end desc limit 1", +last_payday = db.one("select ts_start, ts_end from paydays order by ts_end desc limit 1", back_as="dict", default={'ts_start':now, 'ts_end':now}) ngivers = db.one("select count(distinct tipper) from transfers " "where timestamp > %(ts_start)s and timestamp < %(ts_end)s", last_payday) @@ -195,9 +195,10 @@ names = ['ncc', 'pcc', 'statements', 'transfer_volume', 'tip_distribution_json', 'tip_n', 'nach', 'escrow', 'ngivers', 'nreceivers', 'noverlap', 'nactive'] -json = json.dumps({name: globals()[name] for name in names}) +json_dump = lambda: json.dumps({name: globals()[name] for name in names}) + [----------------------------------------------------------] application/json -%json +{{ json_dump() }} [----------------------------------------------------------] text/html {% extends "templates/about.html" %}
kivy__kivy-5951
[ { "content": "'''\nEnchant Spelling: Implements spelling backend based on enchant.\n'''\n\n\nimport enchant\n\nfrom kivy.core.spelling import SpellingBase, NoSuchLangError\nfrom kivy.compat import PY2\n\n\nclass SpellingEnchant(SpellingBase):\n '''\n Spelling backend based on the enchant library.\n '''\n\n def __init__(self, language=None):\n self._language = None\n super(SpellingEnchant, self).__init__(language)\n\n def select_language(self, language):\n try:\n self._language = enchant.Dict(language)\n except enchant.DictNotFoundError:\n err = 'Enchant Backend: No language for \"%s\"' % (language, )\n raise NoSuchLangError(err)\n\n def list_languages(self):\n # Note: We do NOT return enchant.list_dicts because that also returns\n # the enchant dict objects and not only the language identifiers.\n return enchant.list_languages()\n\n def check(self, word):\n if not word:\n return None\n return self._language.check(word)\n\n def suggest(self, fragment):\n suggestions = self._language.suggest(fragment)\n # Don't show suggestions that are invalid\n suggestions = [s for s in suggestions if self.check(s)]\n if PY2:\n suggestions = [s.decode('utf-8') for s in suggestions]\n return suggestions\n", "path": "kivy/core/spelling/spelling_enchant.py" } ]
[ { "content": "'''\nEnchant Spelling\n================\n\nImplementation spelling backend based on enchant.\n\n.. warning:: pyenchant doesn't have dedicated build anymore for Windows/x64.\n See https://github.com/kivy/kivy/issues/5816 for more informations\n'''\n\n\nimport enchant\n\nfrom kivy.core.spelling import SpellingBase, NoSuchLangError\nfrom kivy.compat import PY2\n\n\nclass SpellingEnchant(SpellingBase):\n '''\n Spelling backend based on the enchant library.\n '''\n\n def __init__(self, language=None):\n self._language = None\n super(SpellingEnchant, self).__init__(language)\n\n def select_language(self, language):\n try:\n self._language = enchant.Dict(language)\n except enchant.DictNotFoundError:\n err = 'Enchant Backend: No language for \"%s\"' % (language, )\n raise NoSuchLangError(err)\n\n def list_languages(self):\n # Note: We do NOT return enchant.list_dicts because that also returns\n # the enchant dict objects and not only the language identifiers.\n return enchant.list_languages()\n\n def check(self, word):\n if not word:\n return None\n return self._language.check(word)\n\n def suggest(self, fragment):\n suggestions = self._language.suggest(fragment)\n # Don't show suggestions that are invalid\n suggestions = [s for s in suggestions if self.check(s)]\n if PY2:\n suggestions = [s.decode('utf-8') for s in suggestions]\n return suggestions\n", "path": "kivy/core/spelling/spelling_enchant.py" } ]
diff --git a/kivy/core/spelling/spelling_enchant.py b/kivy/core/spelling/spelling_enchant.py index 6c408fbb59..7fe8f230f5 100644 --- a/kivy/core/spelling/spelling_enchant.py +++ b/kivy/core/spelling/spelling_enchant.py @@ -1,5 +1,11 @@ ''' -Enchant Spelling: Implements spelling backend based on enchant. +Enchant Spelling +================ + +Implementation spelling backend based on enchant. + +.. warning:: pyenchant doesn't have dedicated build anymore for Windows/x64. + See https://github.com/kivy/kivy/issues/5816 for more informations '''
Cloud-CV__EvalAI-697
[ { "content": "\"\"\"\nDjango settings for evalai project.\n\nGenerated by 'django-admin startproject' using Django 1.10.2.\n\nFor more information on this file, see\nhttps://docs.djangoproject.com/en/1.10/topics/settings/\n\nFor the full list of settings and their values, see\nhttps://docs.djangoproject.com/en/1.10/ref/settings/\n\"\"\"\n\nimport datetime\nimport os\nimport sys\n\n# Build paths inside the project like this: os.path.join(BASE_DIR, ...)\nBASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))\nAPPS_DIR = os.path.join(BASE_DIR, 'apps')\n\nsys.path.append(APPS_DIR)\n\n# Quick-start development settings - unsuitable for production\n# See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/\n\n# SECURITY WARNING: keep the secret key used in production secret!\nSECRET_KEY = os.environ.get('SECRET_KEY', 'random_secret_key')\n\n# SECURITY WARNING: don't run with debug turned on in production!\nDEBUG = True\n\nALLOWED_HOSTS = []\n\n\n# Application definition\n\nDEFAULT_APPS = [\n 'django.contrib.admin',\n 'django.contrib.auth',\n 'django.contrib.contenttypes',\n 'django.contrib.sessions',\n 'django.contrib.messages',\n 'django.contrib.staticfiles',\n 'django.contrib.sites',\n]\n\nOUR_APPS = [\n 'accounts',\n 'analytics',\n 'base',\n 'challenges',\n 'hosts',\n 'jobs',\n 'participants',\n 'submissions',\n 'web',\n]\n\nTHIRD_PARTY_APPS = [\n 'allauth',\n 'allauth.account',\n 'corsheaders',\n 'rest_auth',\n 'rest_auth.registration',\n 'rest_framework.authtoken',\n 'rest_framework',\n 'rest_framework_docs',\n 'rest_framework_expiring_authtoken',\n]\n\nINSTALLED_APPS = DEFAULT_APPS + OUR_APPS + THIRD_PARTY_APPS\n\nMIDDLEWARE = [\n 'corsheaders.middleware.CorsMiddleware',\n 'django.middleware.security.SecurityMiddleware',\n 'django.contrib.sessions.middleware.SessionMiddleware',\n 'django.middleware.common.CommonMiddleware',\n 'django.middleware.csrf.CsrfViewMiddleware',\n 'django.contrib.auth.middleware.AuthenticationMiddleware',\n 'django.contrib.messages.middleware.MessageMiddleware',\n 'django.middleware.clickjacking.XFrameOptionsMiddleware',\n]\n\nROOT_URLCONF = 'evalai.urls'\n\n\nTEMPLATES = [\n {\n 'BACKEND': 'django.template.backends.django.DjangoTemplates',\n 'DIRS': [],\n 'APP_DIRS': True,\n 'OPTIONS': {\n 'context_processors': [\n 'django.template.context_processors.debug',\n 'django.template.context_processors.request',\n 'django.contrib.auth.context_processors.auth',\n 'django.contrib.messages.context_processors.messages',\n ],\n },\n },\n]\n\nWSGI_APPLICATION = 'evalai.wsgi.application'\n\n\n# Password validation\n# https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators\n\nAUTH_PASSWORD_VALIDATORS = [\n {\n 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', # noqa\n },\n {\n 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', # noqa\n },\n {\n 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', # noqa\n },\n {\n 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', # noqa\n },\n]\n\n\n# Internationalization\n# https://docs.djangoproject.com/en/1.10/topics/i18n/\n\nLANGUAGE_CODE = 'en-us'\n\nTIME_ZONE = 'UTC'\n\nUSE_I18N = True\n\nUSE_L10N = True\n\nUSE_TZ = True\n\n# Static files (CSS, JavaScript, Images)\n# https://docs.djangoproject.com/en/1.10/howto/static-files/\n\nSTATIC_URL = '/static/'\n\nMEDIA_ROOT = os.path.join(BASE_DIR, 'media')\nMEDIA_URL = \"/media/\"\n\nSITE_ID = 1\n\nREST_FRAMEWORK = {\n 'DEFAULT_PAGINATION_CLASS': (\n 'rest_framework.pagination.LimitOffsetPagination'),\n 'PAGE_SIZE': 10,\n 'DEFAULT_PERMISSION_CLASSES': [\n 'rest_framework.permissions.IsAuthenticatedOrReadOnly'\n ],\n 'DEFAULT_AUTHENTICATION_CLASSES': [\n 'rest_framework_expiring_authtoken.authentication.ExpiringTokenAuthentication',\n ],\n 'TEST_REQUEST_DEFAULT_FORMAT': 'json',\n 'DEFAULT_THROTTLE_CLASSES': (\n 'rest_framework.throttling.AnonRateThrottle',\n 'rest_framework.throttling.UserRateThrottle'\n ),\n 'DEFAULT_THROTTLE_RATES': {\n 'anon': '100/minute',\n 'user': '100/minute'\n }\n}\n\n# ALLAUTH SETTINGS\nACCOUNT_EMAIL_REQUIRED = True\nOLD_PASSWORD_FIELD_ENABLED = True\n\nAUTHENTICATION_BACKENDS = (\n # Needed to login by username in Django admin, regardless of `allauth`\n 'django.contrib.auth.backends.ModelBackend',\n # `allauth` specific authentication methods, such as login by e-mail\n 'allauth.account.auth_backends.AuthenticationBackend',\n)\n\n# CORS Settings\nCORS_ORIGIN_ALLOW_ALL = True\n\n# REST Framework Expiring Tokens Configuration\nEXPIRING_TOKEN_LIFESPAN = datetime.timedelta(days=7)\n\n# Logging\nLOGGING = {\n 'version': 1,\n 'disable_existing_loggers': False,\n 'root': {\n 'level': 'INFO',\n 'handlers': ['console'],\n },\n 'filters': {\n 'require_debug_false': {\n '()': 'django.utils.log.RequireDebugFalse',\n },\n 'require_debug_true': {\n '()': 'django.utils.log.RequireDebugTrue',\n }\n },\n 'formatters': {\n 'simple': {\n 'format': '[%(asctime)s] %(levelname)s %(message)s',\n 'datefmt': '%Y-%m-%d %H:%M:%S'\n },\n 'verbose': {\n 'format': '[%(asctime)s] %(levelname)s %(module)s %(message)s',\n 'datefmt': '%Y-%m-%d %H:%M:%S'\n }\n },\n 'handlers': {\n 'console': {\n 'level': 'INFO',\n 'filters': ['require_debug_true'],\n 'class': 'logging.StreamHandler',\n 'formatter': 'simple'\n },\n 'logfile': {\n 'level': 'DEBUG',\n 'class': 'logging.handlers.RotatingFileHandler',\n 'filename': \"/tmp/logfile\",\n 'maxBytes': 50000,\n 'backupCount': 10,\n 'formatter': 'verbose'\n },\n 'mail_admins': {\n 'level': 'ERROR',\n 'class': 'django.utils.log.AdminEmailHandler',\n 'filters': ['require_debug_false'],\n }\n },\n 'loggers': {\n 'django': {\n 'handlers': ['console'],\n 'propagate': True,\n },\n 'django.request': {\n 'handlers': ['mail_admins'],\n 'level': 'ERROR',\n 'propagate': False,\n },\n 'django.security': {\n 'handlers': ['mail_admins'],\n 'level': 'ERROR',\n 'propagate': False,\n },\n 'django.db.backends': {\n 'handlers': ['mail_admins'],\n 'level': 'ERROR',\n 'propagate': False,\n }\n }\n}\n\nCACHES = {\n 'default': {\n 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',\n }\n}\n", "path": "settings/common.py" } ]
[ { "content": "\"\"\"\nDjango settings for evalai project.\n\nGenerated by 'django-admin startproject' using Django 1.10.2.\n\nFor more information on this file, see\nhttps://docs.djangoproject.com/en/1.10/topics/settings/\n\nFor the full list of settings and their values, see\nhttps://docs.djangoproject.com/en/1.10/ref/settings/\n\"\"\"\n\nimport datetime\nimport os\nimport sys\n\n# Build paths inside the project like this: os.path.join(BASE_DIR, ...)\nBASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))\nAPPS_DIR = os.path.join(BASE_DIR, 'apps')\n\nsys.path.append(APPS_DIR)\n\n# Quick-start development settings - unsuitable for production\n# See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/\n\n# SECURITY WARNING: keep the secret key used in production secret!\nSECRET_KEY = os.environ.get('SECRET_KEY', 'random_secret_key')\n\n# SECURITY WARNING: don't run with debug turned on in production!\nDEBUG = True\n\nALLOWED_HOSTS = []\n\n\n# Application definition\n\nDEFAULT_APPS = [\n 'django.contrib.admin',\n 'django.contrib.auth',\n 'django.contrib.contenttypes',\n 'django.contrib.sessions',\n 'django.contrib.messages',\n 'django.contrib.staticfiles',\n 'django.contrib.sites',\n]\n\nOUR_APPS = [\n 'accounts',\n 'analytics',\n 'base',\n 'challenges',\n 'hosts',\n 'jobs',\n 'participants',\n 'submissions',\n 'web',\n]\n\nTHIRD_PARTY_APPS = [\n 'allauth',\n 'allauth.account',\n 'corsheaders',\n 'rest_auth',\n 'rest_auth.registration',\n 'rest_framework.authtoken',\n 'rest_framework',\n 'rest_framework_docs',\n 'rest_framework_expiring_authtoken',\n]\n\nINSTALLED_APPS = DEFAULT_APPS + OUR_APPS + THIRD_PARTY_APPS\n\nMIDDLEWARE = [\n 'corsheaders.middleware.CorsMiddleware',\n 'django.middleware.security.SecurityMiddleware',\n 'django.contrib.sessions.middleware.SessionMiddleware',\n 'django.middleware.common.CommonMiddleware',\n 'django.middleware.csrf.CsrfViewMiddleware',\n 'django.contrib.auth.middleware.AuthenticationMiddleware',\n 'django.contrib.messages.middleware.MessageMiddleware',\n 'django.middleware.clickjacking.XFrameOptionsMiddleware',\n]\n\nROOT_URLCONF = 'evalai.urls'\n\n\nTEMPLATES = [\n {\n 'BACKEND': 'django.template.backends.django.DjangoTemplates',\n 'DIRS': [],\n 'APP_DIRS': True,\n 'OPTIONS': {\n 'context_processors': [\n 'django.template.context_processors.debug',\n 'django.template.context_processors.request',\n 'django.contrib.auth.context_processors.auth',\n 'django.contrib.messages.context_processors.messages',\n ],\n },\n },\n]\n\nWSGI_APPLICATION = 'evalai.wsgi.application'\n\n\n# Password validation\n# https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators\n\nAUTH_PASSWORD_VALIDATORS = [\n {\n 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', # noqa\n },\n {\n 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', # noqa\n },\n {\n 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', # noqa\n },\n {\n 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', # noqa\n },\n]\n\n\n# Internationalization\n# https://docs.djangoproject.com/en/1.10/topics/i18n/\n\nLANGUAGE_CODE = 'en-us'\n\nTIME_ZONE = 'UTC'\n\nUSE_I18N = True\n\nUSE_L10N = True\n\nUSE_TZ = True\n\n# Static files (CSS, JavaScript, Images)\n# https://docs.djangoproject.com/en/1.10/howto/static-files/\n\nSTATIC_URL = '/static/'\n\nMEDIA_ROOT = os.path.join(BASE_DIR, 'media')\nMEDIA_URL = \"/media/\"\n\nSITE_ID = 1\n\nREST_FRAMEWORK = {\n 'DEFAULT_PAGINATION_CLASS': (\n 'rest_framework.pagination.LimitOffsetPagination'),\n 'PAGE_SIZE': 10,\n 'DEFAULT_PERMISSION_CLASSES': [\n 'rest_framework.permissions.IsAuthenticatedOrReadOnly'\n ],\n 'DEFAULT_AUTHENTICATION_CLASSES': [\n 'rest_framework_expiring_authtoken.authentication.ExpiringTokenAuthentication',\n ],\n 'TEST_REQUEST_DEFAULT_FORMAT': 'json',\n 'DEFAULT_THROTTLE_CLASSES': (\n 'rest_framework.throttling.AnonRateThrottle',\n 'rest_framework.throttling.UserRateThrottle'\n ),\n 'DEFAULT_THROTTLE_RATES': {\n 'anon': '100/minute',\n 'user': '100/minute'\n },\n 'DEFAULT_RENDERER_CLASSES': (\n 'rest_framework.renderers.JSONRenderer',\n )\n}\n\n# ALLAUTH SETTINGS\nACCOUNT_EMAIL_REQUIRED = True\nOLD_PASSWORD_FIELD_ENABLED = True\n\nAUTHENTICATION_BACKENDS = (\n # Needed to login by username in Django admin, regardless of `allauth`\n 'django.contrib.auth.backends.ModelBackend',\n # `allauth` specific authentication methods, such as login by e-mail\n 'allauth.account.auth_backends.AuthenticationBackend',\n)\n\n# CORS Settings\nCORS_ORIGIN_ALLOW_ALL = True\n\n# REST Framework Expiring Tokens Configuration\nEXPIRING_TOKEN_LIFESPAN = datetime.timedelta(days=7)\n\n# Logging\nLOGGING = {\n 'version': 1,\n 'disable_existing_loggers': False,\n 'root': {\n 'level': 'INFO',\n 'handlers': ['console'],\n },\n 'filters': {\n 'require_debug_false': {\n '()': 'django.utils.log.RequireDebugFalse',\n },\n 'require_debug_true': {\n '()': 'django.utils.log.RequireDebugTrue',\n }\n },\n 'formatters': {\n 'simple': {\n 'format': '[%(asctime)s] %(levelname)s %(message)s',\n 'datefmt': '%Y-%m-%d %H:%M:%S'\n },\n 'verbose': {\n 'format': '[%(asctime)s] %(levelname)s %(module)s %(message)s',\n 'datefmt': '%Y-%m-%d %H:%M:%S'\n }\n },\n 'handlers': {\n 'console': {\n 'level': 'INFO',\n 'filters': ['require_debug_true'],\n 'class': 'logging.StreamHandler',\n 'formatter': 'simple'\n },\n 'logfile': {\n 'level': 'DEBUG',\n 'class': 'logging.handlers.RotatingFileHandler',\n 'filename': \"/tmp/logfile\",\n 'maxBytes': 50000,\n 'backupCount': 10,\n 'formatter': 'verbose'\n },\n 'mail_admins': {\n 'level': 'ERROR',\n 'class': 'django.utils.log.AdminEmailHandler',\n 'filters': ['require_debug_false'],\n }\n },\n 'loggers': {\n 'django': {\n 'handlers': ['console'],\n 'propagate': True,\n },\n 'django.request': {\n 'handlers': ['mail_admins'],\n 'level': 'ERROR',\n 'propagate': False,\n },\n 'django.security': {\n 'handlers': ['mail_admins'],\n 'level': 'ERROR',\n 'propagate': False,\n },\n 'django.db.backends': {\n 'handlers': ['mail_admins'],\n 'level': 'ERROR',\n 'propagate': False,\n }\n }\n}\n\nCACHES = {\n 'default': {\n 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',\n }\n}\n", "path": "settings/common.py" } ]
diff --git a/settings/common.py b/settings/common.py index 4e93177541..dbb31ad48b 100755 --- a/settings/common.py +++ b/settings/common.py @@ -163,7 +163,10 @@ 'DEFAULT_THROTTLE_RATES': { 'anon': '100/minute', 'user': '100/minute' - } + }, + 'DEFAULT_RENDERER_CLASSES': ( + 'rest_framework.renderers.JSONRenderer', + ) } # ALLAUTH SETTINGS
deis__deis-2001
[ { "content": "import cStringIO\nimport base64\nimport copy\nimport functools\nimport json\nimport httplib\nimport paramiko\nimport socket\nimport re\nimport time\n\n\nMATCH = re.compile(\n '(?P<app>[a-z0-9-]+)_?(?P<version>v[0-9]+)?\\.?(?P<c_type>[a-z]+)?.(?P<c_num>[0-9]+)')\n\n\nclass UHTTPConnection(httplib.HTTPConnection):\n \"\"\"Subclass of Python library HTTPConnection that uses a Unix domain socket.\n \"\"\"\n\n def __init__(self, path):\n httplib.HTTPConnection.__init__(self, 'localhost')\n self.path = path\n\n def connect(self):\n sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)\n sock.connect(self.path)\n self.sock = sock\n\n\nclass FleetHTTPClient(object):\n\n def __init__(self, cluster_name, hosts, auth, domain, options):\n self.name = cluster_name\n self.hosts = hosts\n self.auth = auth\n self.domain = domain\n self.options = options\n # single global connection\n self.conn = UHTTPConnection('/var/run/fleet.sock')\n\n # scheduler setup / teardown\n\n def setUp(self):\n pass\n\n def tearDown(self):\n pass\n\n # connection helpers\n\n def _put_unit(self, name, body):\n headers = {'Content-Type': 'application/json'}\n self.conn.request('PUT', '/v1-alpha/units/{name}.service'.format(**locals()),\n headers=headers, body=json.dumps(body))\n resp = self.conn.getresponse()\n data = resp.read()\n if resp.status != 204:\n errmsg = \"Failed to create unit: {} {} - {}\".format(\n resp.status, resp.reason, data)\n raise RuntimeError(errmsg)\n return data\n\n def _delete_unit(self, name):\n headers = {'Content-Type': 'application/json'}\n self.conn.request('DELETE', '/v1-alpha/units/{name}.service'.format(**locals()),\n headers=headers)\n resp = self.conn.getresponse()\n data = resp.read()\n if resp.status not in (404, 204):\n errmsg = \"Failed to delete unit: {} {} - {}\".format(\n resp.status, resp.reason, data)\n raise RuntimeError(errmsg)\n return data\n\n def _get_state(self, name=None):\n headers = {'Content-Type': 'application/json'}\n url = '/v1-alpha/state'\n if name:\n url += '?unitName={name}.service'.format(**locals())\n self.conn.request('GET', url, headers=headers)\n resp = self.conn.getresponse()\n data = resp.read()\n if resp.status not in (200,):\n errmsg = \"Failed to retrieve state: {} {} - {}\".format(\n resp.status, resp.reason, data)\n raise RuntimeError(errmsg)\n return json.loads(data)\n\n def _get_machines(self):\n headers = {'Content-Type': 'application/json'}\n url = '/v1-alpha/machines'\n self.conn.request('GET', url, headers=headers)\n resp = self.conn.getresponse()\n data = resp.read()\n if resp.status not in (200,):\n errmsg = \"Failed to retrieve machines: {} {} - {}\".format(\n resp.status, resp.reason, data)\n raise RuntimeError(errmsg)\n return json.loads(data)\n\n # container api\n\n def create(self, name, image, command='', template=None, **kwargs):\n \"\"\"Create a container\"\"\"\n self._create_container(name, image, command,\n template or copy.deepcopy(CONTAINER_TEMPLATE), **kwargs)\n self._create_log(name, image, command, copy.deepcopy(LOG_TEMPLATE))\n\n def _create_container(self, name, image, command, unit, **kwargs):\n l = locals().copy()\n l.update(re.match(MATCH, name).groupdict())\n # prepare memory limit for the container type\n mem = kwargs.get('memory', {}).get(l['c_type'], None)\n if mem:\n l.update({'memory': '-m {}'.format(mem.lower())})\n else:\n l.update({'memory': ''})\n # prepare memory limit for the container type\n cpu = kwargs.get('cpu', {}).get(l['c_type'], None)\n if cpu:\n l.update({'cpu': '-c {}'.format(cpu)})\n else:\n l.update({'cpu': ''})\n # construct unit from template\n for f in unit:\n f['value'] = f['value'].format(**l)\n # prepare tags only if one was provided\n tags = kwargs.get('tags', {})\n if tags:\n tagset = ' '.join(['\"{}={}\"'.format(k, v) for k, v in tags.items()])\n unit.append({\"section\": \"X-Fleet\", \"name\": \"MachineMetadata\",\n \"value\": tagset})\n # post unit to fleet\n self._put_unit(name, {\"desiredState\": \"launched\", \"options\": unit})\n\n def _create_log(self, name, image, command, unit):\n l = locals().copy()\n l.update(re.match(MATCH, name).groupdict())\n # construct unit from template\n for f in unit:\n f['value'] = f['value'].format(**l)\n # post unit to fleet\n self._put_unit(name+'-log', {\"desiredState\": \"launched\", \"options\": unit})\n\n def start(self, name):\n \"\"\"Start a container\"\"\"\n self._wait_for_container(name)\n\n def _wait_for_container(self, name):\n # we bump to 20 minutes here to match the timeout on the router and in the app unit files\n for _ in range(1200):\n states = self._get_state(name)\n if states and len(states.get('states', [])) == 1:\n state = states.get('states')[0]\n subState = state.get('systemdSubState')\n if subState == 'running' or subState == 'exited':\n break\n elif subState == 'failed':\n raise RuntimeError('container failed to start')\n time.sleep(1)\n else:\n raise RuntimeError('container failed to start')\n\n def _wait_for_destroy(self, name):\n for _ in range(30):\n states = self._get_state(name)\n if not states:\n break\n time.sleep(1)\n else:\n raise RuntimeError('timeout on container destroy')\n\n def stop(self, name):\n \"\"\"Stop a container\"\"\"\n raise NotImplementedError\n\n def destroy(self, name):\n \"\"\"Destroy a container\"\"\"\n funcs = []\n funcs.append(functools.partial(self._destroy_container, name))\n funcs.append(functools.partial(self._destroy_log, name))\n # call all destroy functions, ignoring any errors\n for f in funcs:\n try:\n f()\n except:\n pass\n self._wait_for_destroy(name)\n\n def _destroy_container(self, name):\n return self._delete_unit(name)\n\n def _destroy_log(self, name):\n return self._delete_unit(name+'-log')\n\n def run(self, name, image, command): # noqa\n \"\"\"Run a one-off command\"\"\"\n self._create_container(name, image, command, copy.deepcopy(RUN_TEMPLATE))\n\n # wait for the container to get scheduled\n for _ in range(30):\n states = self._get_state(name)\n if states and len(states.get('states', [])) == 1:\n state = states.get('states')[0]\n break\n time.sleep(1)\n else:\n raise RuntimeError('container did not report state')\n machineID = state.get('machineID')\n\n # find the machine\n machines = self._get_machines()\n if not machines:\n raise RuntimeError('no available hosts to run command')\n\n # find the machine's primaryIP\n primaryIP = None\n for m in machines.get('machines', []):\n if m['id'] == machineID:\n primaryIP = m['primaryIP']\n if not primaryIP:\n raise RuntimeError('could not find host')\n\n # prepare ssh key\n file_obj = cStringIO.StringIO(base64.b64decode(self.auth))\n pkey = paramiko.RSAKey(file_obj=file_obj)\n\n # grab output via docker logs over SSH\n ssh = paramiko.SSHClient()\n ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())\n ssh.connect(primaryIP, username=\"core\", pkey=pkey)\n # share a transport\n tran = ssh.get_transport()\n\n def _do_ssh(cmd):\n chan = tran.open_session()\n # get a pty so stdout/stderr look right\n chan.get_pty()\n out = chan.makefile()\n chan.exec_command(cmd)\n rc, output = chan.recv_exit_status(), out.read()\n return rc, output\n\n # wait for container to start\n for _ in range(1200):\n rc, _ = _do_ssh('docker inspect {name}'.format(**locals()))\n if rc == 0:\n break\n time.sleep(1)\n else:\n raise RuntimeError('container failed to start on host')\n\n # wait for container to complete\n for _ in range(1200):\n _rc, _output = _do_ssh('docker inspect {name}'.format(**locals()))\n if _rc != 0:\n raise RuntimeError('failed to inspect container')\n _container = json.loads(_output)\n finished_at = _container[0][\"State\"][\"FinishedAt\"]\n if not finished_at.startswith('0001'):\n break\n time.sleep(1)\n else:\n raise RuntimeError('container timed out')\n\n # gather container output\n _rc, output = _do_ssh('docker logs {name}'.format(**locals()))\n if _rc != 0:\n raise RuntimeError('could not attach to container')\n\n # determine container exit code\n _rc, _output = _do_ssh('docker inspect {name}'.format(**locals()))\n if _rc != 0:\n raise RuntimeError('could not determine exit code')\n container = json.loads(_output)\n rc = container[0][\"State\"][\"ExitCode\"]\n\n # cleanup\n self._destroy_container(name)\n self._wait_for_destroy(name)\n\n # return rc and output\n return rc, output\n\n def attach(self, name):\n \"\"\"\n Attach to a job's stdin, stdout and stderr\n \"\"\"\n raise NotImplementedError\n\nSchedulerClient = FleetHTTPClient\n\n\nCONTAINER_TEMPLATE = [\n {\"section\": \"Unit\", \"name\": \"Description\", \"value\": \"{name}\"},\n {\"section\": \"Service\", \"name\": \"ExecStartPre\", \"value\": '''/bin/sh -c \"IMAGE=$(etcdctl get /deis/registry/host 2>&1):$(etcdctl get /deis/registry/port 2>&1)/{image}; docker pull $IMAGE\"'''}, # noqa\n {\"section\": \"Service\", \"name\": \"ExecStartPre\", \"value\": '''/bin/sh -c \"docker inspect {name} >/dev/null 2>&1 && docker rm -f {name} || true\"'''}, # noqa\n {\"section\": \"Service\", \"name\": \"ExecStart\", \"value\": '''/bin/sh -c \"IMAGE=$(etcdctl get /deis/registry/host 2>&1):$(etcdctl get /deis/registry/port 2>&1)/{image}; port=$(docker inspect -f '{{{{range $k, $v := .ContainerConfig.ExposedPorts }}}}{{{{$k}}}}{{{{end}}}}' $IMAGE | cut -d/ -f1) ; docker run --name {name} {memory} {cpu} -P -e PORT=$port $IMAGE {command}\"'''}, # noqa\n {\"section\": \"Service\", \"name\": \"ExecStop\", \"value\": '''/usr/bin/docker rm -f {name}'''},\n {\"section\": \"Service\", \"name\": \"TimeoutStartSec\", \"value\": \"20m\"},\n]\n\n\nLOG_TEMPLATE = [\n {\"section\": \"Unit\", \"name\": \"Description\", \"value\": \"{name} log\"},\n {\"section\": \"Unit\", \"name\": \"BindsTo\", \"value\": \"{name}.service\"},\n {\"section\": \"Service\", \"name\": \"ExecStartPre\", \"value\": '''/bin/sh -c \"until docker inspect {name} >/dev/null 2>&1; do sleep 1; done\"'''}, # noqa\n {\"section\": \"Service\", \"name\": \"ExecStart\", \"value\": '''/bin/sh -c \"docker logs -f {name} 2>&1 | logger -p local0.info -t {app}[{c_type}.{c_num}] --udp --server $(etcdctl get /deis/logs/host) --port $(etcdctl get /deis/logs/port)\"'''}, # noqa\n {\"section\": \"Service\", \"name\": \"TimeoutStartSec\", \"value\": \"20m\"},\n {\"section\": \"X-Fleet\", \"name\": \"MachineOf\", \"value\": \"{name}.service\"},\n]\n\n\nRUN_TEMPLATE = [\n {\"section\": \"Unit\", \"name\": \"Description\", \"value\": \"{name} admin command\"},\n {\"section\": \"Service\", \"name\": \"ExecStartPre\", \"value\": '''/bin/sh -c \"IMAGE=$(etcdctl get /deis/registry/host 2>&1):$(etcdctl get /deis/registry/port 2>&1)/{image}; docker pull $IMAGE\"'''}, # noqa\n {\"section\": \"Service\", \"name\": \"ExecStartPre\", \"value\": '''/bin/sh -c \"docker inspect {name} >/dev/null 2>&1 && docker rm -f {name} || true\"'''}, # noqa\n {\"section\": \"Service\", \"name\": \"ExecStart\", \"value\": '''/bin/sh -c \"IMAGE=$(etcdctl get /deis/registry/host 2>&1):$(etcdctl get /deis/registry/port 2>&1)/{image}; docker run --name {name} --entrypoint=/bin/bash -a stdout -a stderr $IMAGE -c '{command}'\"'''}, # noqa\n {\"section\": \"Service\", \"name\": \"TimeoutStartSec\", \"value\": \"20m\"},\n]\n", "path": "controller/scheduler/coreos.py" } ]
[ { "content": "import cStringIO\nimport base64\nimport copy\nimport functools\nimport json\nimport httplib\nimport paramiko\nimport socket\nimport re\nimport time\n\n\nMATCH = re.compile(\n '(?P<app>[a-z0-9-]+)_?(?P<version>v[0-9]+)?\\.?(?P<c_type>[a-z-_]+)?.(?P<c_num>[0-9]+)')\n\n\nclass UHTTPConnection(httplib.HTTPConnection):\n \"\"\"Subclass of Python library HTTPConnection that uses a Unix domain socket.\n \"\"\"\n\n def __init__(self, path):\n httplib.HTTPConnection.__init__(self, 'localhost')\n self.path = path\n\n def connect(self):\n sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)\n sock.connect(self.path)\n self.sock = sock\n\n\nclass FleetHTTPClient(object):\n\n def __init__(self, cluster_name, hosts, auth, domain, options):\n self.name = cluster_name\n self.hosts = hosts\n self.auth = auth\n self.domain = domain\n self.options = options\n # single global connection\n self.conn = UHTTPConnection('/var/run/fleet.sock')\n\n # scheduler setup / teardown\n\n def setUp(self):\n pass\n\n def tearDown(self):\n pass\n\n # connection helpers\n\n def _put_unit(self, name, body):\n headers = {'Content-Type': 'application/json'}\n self.conn.request('PUT', '/v1-alpha/units/{name}.service'.format(**locals()),\n headers=headers, body=json.dumps(body))\n resp = self.conn.getresponse()\n data = resp.read()\n if resp.status != 204:\n errmsg = \"Failed to create unit: {} {} - {}\".format(\n resp.status, resp.reason, data)\n raise RuntimeError(errmsg)\n return data\n\n def _delete_unit(self, name):\n headers = {'Content-Type': 'application/json'}\n self.conn.request('DELETE', '/v1-alpha/units/{name}.service'.format(**locals()),\n headers=headers)\n resp = self.conn.getresponse()\n data = resp.read()\n if resp.status not in (404, 204):\n errmsg = \"Failed to delete unit: {} {} - {}\".format(\n resp.status, resp.reason, data)\n raise RuntimeError(errmsg)\n return data\n\n def _get_state(self, name=None):\n headers = {'Content-Type': 'application/json'}\n url = '/v1-alpha/state'\n if name:\n url += '?unitName={name}.service'.format(**locals())\n self.conn.request('GET', url, headers=headers)\n resp = self.conn.getresponse()\n data = resp.read()\n if resp.status not in (200,):\n errmsg = \"Failed to retrieve state: {} {} - {}\".format(\n resp.status, resp.reason, data)\n raise RuntimeError(errmsg)\n return json.loads(data)\n\n def _get_machines(self):\n headers = {'Content-Type': 'application/json'}\n url = '/v1-alpha/machines'\n self.conn.request('GET', url, headers=headers)\n resp = self.conn.getresponse()\n data = resp.read()\n if resp.status not in (200,):\n errmsg = \"Failed to retrieve machines: {} {} - {}\".format(\n resp.status, resp.reason, data)\n raise RuntimeError(errmsg)\n return json.loads(data)\n\n # container api\n\n def create(self, name, image, command='', template=None, **kwargs):\n \"\"\"Create a container\"\"\"\n self._create_container(name, image, command,\n template or copy.deepcopy(CONTAINER_TEMPLATE), **kwargs)\n self._create_log(name, image, command, copy.deepcopy(LOG_TEMPLATE))\n\n def _create_container(self, name, image, command, unit, **kwargs):\n l = locals().copy()\n l.update(re.match(MATCH, name).groupdict())\n # prepare memory limit for the container type\n mem = kwargs.get('memory', {}).get(l['c_type'], None)\n if mem:\n l.update({'memory': '-m {}'.format(mem.lower())})\n else:\n l.update({'memory': ''})\n # prepare memory limit for the container type\n cpu = kwargs.get('cpu', {}).get(l['c_type'], None)\n if cpu:\n l.update({'cpu': '-c {}'.format(cpu)})\n else:\n l.update({'cpu': ''})\n # construct unit from template\n for f in unit:\n f['value'] = f['value'].format(**l)\n # prepare tags only if one was provided\n tags = kwargs.get('tags', {})\n if tags:\n tagset = ' '.join(['\"{}={}\"'.format(k, v) for k, v in tags.items()])\n unit.append({\"section\": \"X-Fleet\", \"name\": \"MachineMetadata\",\n \"value\": tagset})\n # post unit to fleet\n self._put_unit(name, {\"desiredState\": \"launched\", \"options\": unit})\n\n def _create_log(self, name, image, command, unit):\n l = locals().copy()\n l.update(re.match(MATCH, name).groupdict())\n # construct unit from template\n for f in unit:\n f['value'] = f['value'].format(**l)\n # post unit to fleet\n self._put_unit(name+'-log', {\"desiredState\": \"launched\", \"options\": unit})\n\n def start(self, name):\n \"\"\"Start a container\"\"\"\n self._wait_for_container(name)\n\n def _wait_for_container(self, name):\n # we bump to 20 minutes here to match the timeout on the router and in the app unit files\n for _ in range(1200):\n states = self._get_state(name)\n if states and len(states.get('states', [])) == 1:\n state = states.get('states')[0]\n subState = state.get('systemdSubState')\n if subState == 'running' or subState == 'exited':\n break\n elif subState == 'failed':\n raise RuntimeError('container failed to start')\n time.sleep(1)\n else:\n raise RuntimeError('container failed to start')\n\n def _wait_for_destroy(self, name):\n for _ in range(30):\n states = self._get_state(name)\n if not states:\n break\n time.sleep(1)\n else:\n raise RuntimeError('timeout on container destroy')\n\n def stop(self, name):\n \"\"\"Stop a container\"\"\"\n raise NotImplementedError\n\n def destroy(self, name):\n \"\"\"Destroy a container\"\"\"\n funcs = []\n funcs.append(functools.partial(self._destroy_container, name))\n funcs.append(functools.partial(self._destroy_log, name))\n # call all destroy functions, ignoring any errors\n for f in funcs:\n try:\n f()\n except:\n pass\n self._wait_for_destroy(name)\n\n def _destroy_container(self, name):\n return self._delete_unit(name)\n\n def _destroy_log(self, name):\n return self._delete_unit(name+'-log')\n\n def run(self, name, image, command): # noqa\n \"\"\"Run a one-off command\"\"\"\n self._create_container(name, image, command, copy.deepcopy(RUN_TEMPLATE))\n\n # wait for the container to get scheduled\n for _ in range(30):\n states = self._get_state(name)\n if states and len(states.get('states', [])) == 1:\n state = states.get('states')[0]\n break\n time.sleep(1)\n else:\n raise RuntimeError('container did not report state')\n machineID = state.get('machineID')\n\n # find the machine\n machines = self._get_machines()\n if not machines:\n raise RuntimeError('no available hosts to run command')\n\n # find the machine's primaryIP\n primaryIP = None\n for m in machines.get('machines', []):\n if m['id'] == machineID:\n primaryIP = m['primaryIP']\n if not primaryIP:\n raise RuntimeError('could not find host')\n\n # prepare ssh key\n file_obj = cStringIO.StringIO(base64.b64decode(self.auth))\n pkey = paramiko.RSAKey(file_obj=file_obj)\n\n # grab output via docker logs over SSH\n ssh = paramiko.SSHClient()\n ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())\n ssh.connect(primaryIP, username=\"core\", pkey=pkey)\n # share a transport\n tran = ssh.get_transport()\n\n def _do_ssh(cmd):\n chan = tran.open_session()\n # get a pty so stdout/stderr look right\n chan.get_pty()\n out = chan.makefile()\n chan.exec_command(cmd)\n rc, output = chan.recv_exit_status(), out.read()\n return rc, output\n\n # wait for container to start\n for _ in range(1200):\n rc, _ = _do_ssh('docker inspect {name}'.format(**locals()))\n if rc == 0:\n break\n time.sleep(1)\n else:\n raise RuntimeError('container failed to start on host')\n\n # wait for container to complete\n for _ in range(1200):\n _rc, _output = _do_ssh('docker inspect {name}'.format(**locals()))\n if _rc != 0:\n raise RuntimeError('failed to inspect container')\n _container = json.loads(_output)\n finished_at = _container[0][\"State\"][\"FinishedAt\"]\n if not finished_at.startswith('0001'):\n break\n time.sleep(1)\n else:\n raise RuntimeError('container timed out')\n\n # gather container output\n _rc, output = _do_ssh('docker logs {name}'.format(**locals()))\n if _rc != 0:\n raise RuntimeError('could not attach to container')\n\n # determine container exit code\n _rc, _output = _do_ssh('docker inspect {name}'.format(**locals()))\n if _rc != 0:\n raise RuntimeError('could not determine exit code')\n container = json.loads(_output)\n rc = container[0][\"State\"][\"ExitCode\"]\n\n # cleanup\n self._destroy_container(name)\n self._wait_for_destroy(name)\n\n # return rc and output\n return rc, output\n\n def attach(self, name):\n \"\"\"\n Attach to a job's stdin, stdout and stderr\n \"\"\"\n raise NotImplementedError\n\nSchedulerClient = FleetHTTPClient\n\n\nCONTAINER_TEMPLATE = [\n {\"section\": \"Unit\", \"name\": \"Description\", \"value\": \"{name}\"},\n {\"section\": \"Service\", \"name\": \"ExecStartPre\", \"value\": '''/bin/sh -c \"IMAGE=$(etcdctl get /deis/registry/host 2>&1):$(etcdctl get /deis/registry/port 2>&1)/{image}; docker pull $IMAGE\"'''}, # noqa\n {\"section\": \"Service\", \"name\": \"ExecStartPre\", \"value\": '''/bin/sh -c \"docker inspect {name} >/dev/null 2>&1 && docker rm -f {name} || true\"'''}, # noqa\n {\"section\": \"Service\", \"name\": \"ExecStart\", \"value\": '''/bin/sh -c \"IMAGE=$(etcdctl get /deis/registry/host 2>&1):$(etcdctl get /deis/registry/port 2>&1)/{image}; port=$(docker inspect -f '{{{{range $k, $v := .ContainerConfig.ExposedPorts }}}}{{{{$k}}}}{{{{end}}}}' $IMAGE | cut -d/ -f1) ; docker run --name {name} {memory} {cpu} -P -e PORT=$port $IMAGE {command}\"'''}, # noqa\n {\"section\": \"Service\", \"name\": \"ExecStop\", \"value\": '''/usr/bin/docker rm -f {name}'''},\n {\"section\": \"Service\", \"name\": \"TimeoutStartSec\", \"value\": \"20m\"},\n]\n\n\nLOG_TEMPLATE = [\n {\"section\": \"Unit\", \"name\": \"Description\", \"value\": \"{name} log\"},\n {\"section\": \"Unit\", \"name\": \"BindsTo\", \"value\": \"{name}.service\"},\n {\"section\": \"Service\", \"name\": \"ExecStartPre\", \"value\": '''/bin/sh -c \"until docker inspect {name} >/dev/null 2>&1; do sleep 1; done\"'''}, # noqa\n {\"section\": \"Service\", \"name\": \"ExecStart\", \"value\": '''/bin/sh -c \"docker logs -f {name} 2>&1 | logger -p local0.info -t {app}[{c_type}.{c_num}] --udp --server $(etcdctl get /deis/logs/host) --port $(etcdctl get /deis/logs/port)\"'''}, # noqa\n {\"section\": \"Service\", \"name\": \"TimeoutStartSec\", \"value\": \"20m\"},\n {\"section\": \"X-Fleet\", \"name\": \"MachineOf\", \"value\": \"{name}.service\"},\n]\n\n\nRUN_TEMPLATE = [\n {\"section\": \"Unit\", \"name\": \"Description\", \"value\": \"{name} admin command\"},\n {\"section\": \"Service\", \"name\": \"ExecStartPre\", \"value\": '''/bin/sh -c \"IMAGE=$(etcdctl get /deis/registry/host 2>&1):$(etcdctl get /deis/registry/port 2>&1)/{image}; docker pull $IMAGE\"'''}, # noqa\n {\"section\": \"Service\", \"name\": \"ExecStartPre\", \"value\": '''/bin/sh -c \"docker inspect {name} >/dev/null 2>&1 && docker rm -f {name} || true\"'''}, # noqa\n {\"section\": \"Service\", \"name\": \"ExecStart\", \"value\": '''/bin/sh -c \"IMAGE=$(etcdctl get /deis/registry/host 2>&1):$(etcdctl get /deis/registry/port 2>&1)/{image}; docker run --name {name} --entrypoint=/bin/bash -a stdout -a stderr $IMAGE -c '{command}'\"'''}, # noqa\n {\"section\": \"Service\", \"name\": \"TimeoutStartSec\", \"value\": \"20m\"},\n]\n", "path": "controller/scheduler/coreos.py" } ]
diff --git a/controller/scheduler/coreos.py b/controller/scheduler/coreos.py index 06e224b313..afedb4246d 100644 --- a/controller/scheduler/coreos.py +++ b/controller/scheduler/coreos.py @@ -11,7 +11,7 @@ MATCH = re.compile( - '(?P<app>[a-z0-9-]+)_?(?P<version>v[0-9]+)?\.?(?P<c_type>[a-z]+)?.(?P<c_num>[0-9]+)') + '(?P<app>[a-z0-9-]+)_?(?P<version>v[0-9]+)?\.?(?P<c_type>[a-z-_]+)?.(?P<c_num>[0-9]+)') class UHTTPConnection(httplib.HTTPConnection): diff --git a/logger/syslogd/syslogd.go b/logger/syslogd/syslogd.go index a09c8bbeeb..1486c51ca0 100644 --- a/logger/syslogd/syslogd.go +++ b/logger/syslogd/syslogd.go @@ -1,15 +1,16 @@ package main import ( - "errors" "fmt" - "github.com/deis/deis/logger/syslog" "io" + "log" "os" "os/signal" "path" "regexp" "syscall" + + "github.com/deis/deis/logger/syslog" ) const logRoot = "/var/log/deis" @@ -45,10 +46,10 @@ func fileExists(path string) (bool, error) { } func getLogFile(m *syslog.Message) (io.Writer, error) { - r := regexp.MustCompile(`^.* ([-a-z0-9]+)\[[a-z0-9\.]+\].*`) + r := regexp.MustCompile(`^.* ([-a-z0-9]+)\[[a-z0-9-_\.]+\].*`) match := r.FindStringSubmatch(m.String()) if match == nil { - return nil, errors.New("Could not find app name in message") + return nil, fmt.Errorf("Could not find app name in message: %s", m) } appName := match[1] filePath := path.Join(logRoot, appName+".log") @@ -84,13 +85,11 @@ func (h *handler) mainLoop() { if m == nil { break } - fmt.Println(m) err := writeToDisk(m) if err != nil { - panic(err) + log.Println(err) } } - fmt.Println("Exit handler") h.End() } @@ -106,7 +105,6 @@ func main() { <-sc // Shutdown the server - fmt.Println("Shutdown the server...") + fmt.Println("Shutting down...") s.Shutdown() - fmt.Println("Server is down") }
getredash__redash-3877
[ { "content": "import hashlib\nimport hmac\nimport logging\nimport time\nfrom urlparse import urlsplit, urlunsplit\n\nfrom flask import jsonify, redirect, request, url_for\nfrom flask_login import LoginManager, login_user, logout_user, user_logged_in\nfrom redash import models, settings\nfrom redash.authentication import jwt_auth\nfrom redash.authentication.org_resolving import current_org\nfrom redash.settings.organization import settings as org_settings\nfrom redash.tasks import record_event\nfrom sqlalchemy.orm.exc import NoResultFound\nfrom werkzeug.exceptions import Unauthorized\n\nlogin_manager = LoginManager()\nlogger = logging.getLogger('authentication')\n\n\ndef get_login_url(external=False, next=\"/\"):\n if settings.MULTI_ORG and current_org == None:\n login_url = '/'\n elif settings.MULTI_ORG:\n login_url = url_for('redash.login', org_slug=current_org.slug, next=next, _external=external)\n else:\n login_url = url_for('redash.login', next=next, _external=external)\n\n return login_url\n\n\ndef sign(key, path, expires):\n if not key:\n return None\n\n h = hmac.new(str(key), msg=path, digestmod=hashlib.sha1)\n h.update(str(expires))\n\n return h.hexdigest()\n\n\n@login_manager.user_loader\ndef load_user(user_id_with_identity):\n org = current_org._get_current_object()\n\n try:\n user_id, _ = user_id_with_identity.split(\"-\")\n user = models.User.get_by_id_and_org(user_id, org)\n if user.is_disabled or user.get_id() != user_id_with_identity:\n return None\n\n return user\n except (models.NoResultFound, ValueError, AttributeError):\n return None\n\n\ndef request_loader(request):\n user = None\n if settings.AUTH_TYPE == 'hmac':\n user = hmac_load_user_from_request(request)\n elif settings.AUTH_TYPE == 'api_key':\n user = api_key_load_user_from_request(request)\n else:\n logger.warning(\"Unknown authentication type ({}). Using default (HMAC).\".format(settings.AUTH_TYPE))\n user = hmac_load_user_from_request(request)\n\n if org_settings['auth_jwt_login_enabled'] and user is None:\n user = jwt_token_load_user_from_request(request)\n return user\n\n\ndef hmac_load_user_from_request(request):\n signature = request.args.get('signature')\n expires = float(request.args.get('expires') or 0)\n query_id = request.view_args.get('query_id', None)\n user_id = request.args.get('user_id', None)\n\n # TODO: 3600 should be a setting\n if signature and time.time() < expires <= time.time() + 3600:\n if user_id:\n user = models.User.query.get(user_id)\n calculated_signature = sign(user.api_key, request.path, expires)\n\n if user.api_key and signature == calculated_signature:\n return user\n\n if query_id:\n query = models.Query.query.filter(models.Query.id == query_id).one()\n calculated_signature = sign(query.api_key, request.path, expires)\n\n if query.api_key and signature == calculated_signature:\n return models.ApiUser(query.api_key, query.org, query.groups.keys(), name=\"ApiKey: Query {}\".format(query.id))\n\n return None\n\n\ndef get_user_from_api_key(api_key, query_id):\n if not api_key:\n return None\n\n user = None\n\n # TODO: once we switch all api key storage into the ApiKey model, this code will be much simplified\n org = current_org._get_current_object()\n try:\n user = models.User.get_by_api_key_and_org(api_key, org)\n if user.is_disabled:\n user = None\n except models.NoResultFound:\n try:\n api_key = models.ApiKey.get_by_api_key(api_key)\n user = models.ApiUser(api_key, api_key.org, [])\n except models.NoResultFound:\n if query_id:\n query = models.Query.get_by_id_and_org(query_id, org)\n if query and query.api_key == api_key:\n user = models.ApiUser(api_key, query.org, query.groups.keys(), name=\"ApiKey: Query {}\".format(query.id))\n\n return user\n\n\ndef get_api_key_from_request(request):\n api_key = request.args.get('api_key', None)\n\n if api_key is not None:\n return api_key\n\n if request.headers.get('Authorization'):\n auth_header = request.headers.get('Authorization')\n api_key = auth_header.replace('Key ', '', 1)\n elif request.view_args is not None and request.view_args.get('token'):\n api_key = request.view_args['token']\n\n return api_key\n\n\ndef api_key_load_user_from_request(request):\n api_key = get_api_key_from_request(request)\n if request.view_args is not None:\n query_id = request.view_args.get('query_id', None)\n user = get_user_from_api_key(api_key, query_id)\n else:\n user = None\n\n return user\n\n\ndef jwt_token_load_user_from_request(request):\n org = current_org._get_current_object()\n\n payload = None\n\n if org_settings['auth_jwt_auth_cookie_name']:\n jwt_token = request.cookies.get(org_settings['auth_jwt_auth_cookie_name'], None)\n elif org_settings['auth_jwt_auth_header_name']:\n jwt_token = request.headers.get(org_settings['auth_jwt_auth_header_name'], None)\n else:\n return None\n\n if jwt_token:\n payload, token_is_valid = jwt_auth.verify_jwt_token(\n jwt_token,\n expected_issuer=org_settings['auth_jwt_auth_issuer'],\n expected_audience=org_settings['auth_jwt_auth_audience'],\n algorithms=org_settings['auth_jwt_auth_algorithms'],\n public_certs_url=org_settings['auth_jwt_auth_public_certs_url'],\n )\n if not token_is_valid:\n raise Unauthorized('Invalid JWT token')\n\n if not payload:\n return\n\n try:\n user = models.User.get_by_email_and_org(payload['email'], org)\n except models.NoResultFound:\n user = create_and_login_user(current_org, payload['email'], payload['email'])\n\n return user\n\n\ndef log_user_logged_in(app, user):\n event = {\n 'org_id': user.org_id,\n 'user_id': user.id,\n 'action': 'login',\n 'object_type': 'redash',\n 'timestamp': int(time.time()),\n 'user_agent': request.user_agent.string,\n 'ip': request.remote_addr\n }\n\n record_event.delay(event)\n\n\n@login_manager.unauthorized_handler\ndef redirect_to_login():\n if request.is_xhr or '/api/' in request.path:\n response = jsonify({'message': \"Couldn't find resource. Please login and try again.\"})\n response.status_code = 404\n return response\n\n login_url = get_login_url(next=request.url, external=False)\n\n return redirect(login_url)\n\n\ndef logout_and_redirect_to_index():\n logout_user()\n\n if settings.MULTI_ORG and current_org == None:\n index_url = '/'\n elif settings.MULTI_ORG:\n index_url = url_for('redash.index', org_slug=current_org.slug, _external=False)\n else:\n index_url = url_for('redash.index', _external=False)\n\n return redirect(index_url)\n\n\ndef init_app(app):\n from redash.authentication import google_oauth, saml_auth, remote_user_auth, ldap_auth\n\n login_manager.init_app(app)\n login_manager.anonymous_user = models.AnonymousUser\n\n app.register_blueprint(google_oauth.blueprint)\n app.register_blueprint(saml_auth.blueprint)\n app.register_blueprint(remote_user_auth.blueprint)\n app.register_blueprint(ldap_auth.blueprint)\n\n user_logged_in.connect(log_user_logged_in)\n login_manager.request_loader(request_loader)\n\n\ndef create_and_login_user(org, name, email, picture=None):\n try:\n user_object = models.User.get_by_email_and_org(email, org)\n if user_object.is_disabled:\n return None\n if user_object.is_invitation_pending:\n user_object.is_invitation_pending = False\n models.db.session.commit()\n if user_object.name != name:\n logger.debug(\"Updating user name (%r -> %r)\", user_object.name, name)\n user_object.name = name\n models.db.session.commit()\n except NoResultFound:\n logger.debug(\"Creating user object (%r)\", name)\n user_object = models.User(org=org, name=name, email=email, is_invitation_pending=False,\n _profile_image_url=picture, group_ids=[org.default_group.id])\n models.db.session.add(user_object)\n models.db.session.commit()\n\n login_user(user_object, remember=True)\n\n return user_object\n\n\ndef get_next_path(unsafe_next_path):\n if not unsafe_next_path:\n return ''\n\n # Preventing open redirection attacks\n parts = list(urlsplit(unsafe_next_path))\n parts[0] = '' # clear scheme\n parts[1] = '' # clear netloc\n safe_next_path = urlunsplit(parts)\n\n return safe_next_path\n", "path": "redash/authentication/__init__.py" } ]
[ { "content": "import hashlib\nimport hmac\nimport logging\nimport time\nfrom urlparse import urlsplit, urlunsplit\n\nfrom flask import jsonify, redirect, request, url_for\nfrom flask_login import LoginManager, login_user, logout_user, user_logged_in\nfrom redash import models, settings\nfrom redash.authentication import jwt_auth\nfrom redash.authentication.org_resolving import current_org\nfrom redash.settings.organization import settings as org_settings\nfrom redash.tasks import record_event\nfrom sqlalchemy.orm.exc import NoResultFound\nfrom werkzeug.exceptions import Unauthorized\n\nlogin_manager = LoginManager()\nlogger = logging.getLogger('authentication')\n\n\ndef get_login_url(external=False, next=\"/\"):\n if settings.MULTI_ORG and current_org == None:\n login_url = '/'\n elif settings.MULTI_ORG:\n login_url = url_for('redash.login', org_slug=current_org.slug, next=next, _external=external)\n else:\n login_url = url_for('redash.login', next=next, _external=external)\n\n return login_url\n\n\ndef sign(key, path, expires):\n if not key:\n return None\n\n h = hmac.new(str(key), msg=path, digestmod=hashlib.sha1)\n h.update(str(expires))\n\n return h.hexdigest()\n\n\n@login_manager.user_loader\ndef load_user(user_id_with_identity):\n user = api_key_load_user_from_request(request)\n if user:\n return user\n\n org = current_org._get_current_object()\n\n try:\n user_id, _ = user_id_with_identity.split(\"-\")\n user = models.User.get_by_id_and_org(user_id, org)\n if user.is_disabled or user.get_id() != user_id_with_identity:\n return None\n\n return user\n except (models.NoResultFound, ValueError, AttributeError):\n return None\n\n\ndef request_loader(request):\n user = None\n if settings.AUTH_TYPE == 'hmac':\n user = hmac_load_user_from_request(request)\n elif settings.AUTH_TYPE == 'api_key':\n user = api_key_load_user_from_request(request)\n else:\n logger.warning(\"Unknown authentication type ({}). Using default (HMAC).\".format(settings.AUTH_TYPE))\n user = hmac_load_user_from_request(request)\n\n if org_settings['auth_jwt_login_enabled'] and user is None:\n user = jwt_token_load_user_from_request(request)\n return user\n\n\ndef hmac_load_user_from_request(request):\n signature = request.args.get('signature')\n expires = float(request.args.get('expires') or 0)\n query_id = request.view_args.get('query_id', None)\n user_id = request.args.get('user_id', None)\n\n # TODO: 3600 should be a setting\n if signature and time.time() < expires <= time.time() + 3600:\n if user_id:\n user = models.User.query.get(user_id)\n calculated_signature = sign(user.api_key, request.path, expires)\n\n if user.api_key and signature == calculated_signature:\n return user\n\n if query_id:\n query = models.Query.query.filter(models.Query.id == query_id).one()\n calculated_signature = sign(query.api_key, request.path, expires)\n\n if query.api_key and signature == calculated_signature:\n return models.ApiUser(query.api_key, query.org, query.groups.keys(), name=\"ApiKey: Query {}\".format(query.id))\n\n return None\n\n\ndef get_user_from_api_key(api_key, query_id):\n if not api_key:\n return None\n\n user = None\n\n # TODO: once we switch all api key storage into the ApiKey model, this code will be much simplified\n org = current_org._get_current_object()\n try:\n user = models.User.get_by_api_key_and_org(api_key, org)\n if user.is_disabled:\n user = None\n except models.NoResultFound:\n try:\n api_key = models.ApiKey.get_by_api_key(api_key)\n user = models.ApiUser(api_key, api_key.org, [])\n except models.NoResultFound:\n if query_id:\n query = models.Query.get_by_id_and_org(query_id, org)\n if query and query.api_key == api_key:\n user = models.ApiUser(api_key, query.org, query.groups.keys(), name=\"ApiKey: Query {}\".format(query.id))\n\n return user\n\n\ndef get_api_key_from_request(request):\n api_key = request.args.get('api_key', None)\n\n if api_key is not None:\n return api_key\n\n if request.headers.get('Authorization'):\n auth_header = request.headers.get('Authorization')\n api_key = auth_header.replace('Key ', '', 1)\n elif request.view_args is not None and request.view_args.get('token'):\n api_key = request.view_args['token']\n\n return api_key\n\n\ndef api_key_load_user_from_request(request):\n api_key = get_api_key_from_request(request)\n if request.view_args is not None:\n query_id = request.view_args.get('query_id', None)\n user = get_user_from_api_key(api_key, query_id)\n else:\n user = None\n\n return user\n\n\ndef jwt_token_load_user_from_request(request):\n org = current_org._get_current_object()\n\n payload = None\n\n if org_settings['auth_jwt_auth_cookie_name']:\n jwt_token = request.cookies.get(org_settings['auth_jwt_auth_cookie_name'], None)\n elif org_settings['auth_jwt_auth_header_name']:\n jwt_token = request.headers.get(org_settings['auth_jwt_auth_header_name'], None)\n else:\n return None\n\n if jwt_token:\n payload, token_is_valid = jwt_auth.verify_jwt_token(\n jwt_token,\n expected_issuer=org_settings['auth_jwt_auth_issuer'],\n expected_audience=org_settings['auth_jwt_auth_audience'],\n algorithms=org_settings['auth_jwt_auth_algorithms'],\n public_certs_url=org_settings['auth_jwt_auth_public_certs_url'],\n )\n if not token_is_valid:\n raise Unauthorized('Invalid JWT token')\n\n if not payload:\n return\n\n try:\n user = models.User.get_by_email_and_org(payload['email'], org)\n except models.NoResultFound:\n user = create_and_login_user(current_org, payload['email'], payload['email'])\n\n return user\n\n\ndef log_user_logged_in(app, user):\n event = {\n 'org_id': user.org_id,\n 'user_id': user.id,\n 'action': 'login',\n 'object_type': 'redash',\n 'timestamp': int(time.time()),\n 'user_agent': request.user_agent.string,\n 'ip': request.remote_addr\n }\n\n record_event.delay(event)\n\n\n@login_manager.unauthorized_handler\ndef redirect_to_login():\n if request.is_xhr or '/api/' in request.path:\n response = jsonify({'message': \"Couldn't find resource. Please login and try again.\"})\n response.status_code = 404\n return response\n\n login_url = get_login_url(next=request.url, external=False)\n\n return redirect(login_url)\n\n\ndef logout_and_redirect_to_index():\n logout_user()\n\n if settings.MULTI_ORG and current_org == None:\n index_url = '/'\n elif settings.MULTI_ORG:\n index_url = url_for('redash.index', org_slug=current_org.slug, _external=False)\n else:\n index_url = url_for('redash.index', _external=False)\n\n return redirect(index_url)\n\n\ndef init_app(app):\n from redash.authentication import google_oauth, saml_auth, remote_user_auth, ldap_auth\n\n login_manager.init_app(app)\n login_manager.anonymous_user = models.AnonymousUser\n\n app.register_blueprint(google_oauth.blueprint)\n app.register_blueprint(saml_auth.blueprint)\n app.register_blueprint(remote_user_auth.blueprint)\n app.register_blueprint(ldap_auth.blueprint)\n\n user_logged_in.connect(log_user_logged_in)\n login_manager.request_loader(request_loader)\n\n\ndef create_and_login_user(org, name, email, picture=None):\n try:\n user_object = models.User.get_by_email_and_org(email, org)\n if user_object.is_disabled:\n return None\n if user_object.is_invitation_pending:\n user_object.is_invitation_pending = False\n models.db.session.commit()\n if user_object.name != name:\n logger.debug(\"Updating user name (%r -> %r)\", user_object.name, name)\n user_object.name = name\n models.db.session.commit()\n except NoResultFound:\n logger.debug(\"Creating user object (%r)\", name)\n user_object = models.User(org=org, name=name, email=email, is_invitation_pending=False,\n _profile_image_url=picture, group_ids=[org.default_group.id])\n models.db.session.add(user_object)\n models.db.session.commit()\n\n login_user(user_object, remember=True)\n\n return user_object\n\n\ndef get_next_path(unsafe_next_path):\n if not unsafe_next_path:\n return ''\n\n # Preventing open redirection attacks\n parts = list(urlsplit(unsafe_next_path))\n parts[0] = '' # clear scheme\n parts[1] = '' # clear netloc\n safe_next_path = urlunsplit(parts)\n\n return safe_next_path\n", "path": "redash/authentication/__init__.py" } ]
diff --git a/redash/authentication/__init__.py b/redash/authentication/__init__.py index 04af7a29ac..989ed52b11 100644 --- a/redash/authentication/__init__.py +++ b/redash/authentication/__init__.py @@ -41,6 +41,10 @@ def sign(key, path, expires): @login_manager.user_loader def load_user(user_id_with_identity): + user = api_key_load_user_from_request(request) + if user: + return user + org = current_org._get_current_object() try: diff --git a/tests/test_authentication.py b/tests/test_authentication.py index 3cf1d8b1f2..192bb53316 100644 --- a/tests/test_authentication.py +++ b/tests/test_authentication.py @@ -127,6 +127,19 @@ def test_user_api_key(self): self.assertEqual(user.id, hmac_load_user_from_request(request).id) +class TestSessionAuthentication(BaseTestCase): + def test_prefers_api_key_over_session_user_id(self): + user = self.factory.create_user() + query = self.factory.create_query(user=user) + + other_org = self.factory.create_org() + other_user = self.factory.create_user(org=other_org) + models.db.session.flush() + + rv = self.make_request('get', '/api/queries/{}?api_key={}'.format(query.id, query.api_key), user=other_user) + self.assertEqual(rv.status_code, 200) + + class TestCreateAndLoginUser(BaseTestCase): def test_logins_valid_user(self): user = self.factory.create_user(email=u'test@example.com')
readthedocs__readthedocs.org-5470
[ { "content": "# -*- coding: utf-8 -*-\n\n\"\"\"Views for builds app.\"\"\"\n\nimport logging\nimport textwrap\n\nfrom django.contrib import messages\nfrom django.contrib.auth.decorators import login_required\nfrom django.http import (\n HttpResponseForbidden,\n HttpResponsePermanentRedirect,\n HttpResponseRedirect,\n)\nfrom django.shortcuts import get_object_or_404\nfrom django.urls import reverse\nfrom django.utils.decorators import method_decorator\nfrom django.views.generic import DetailView, ListView\nfrom requests.utils import quote\nfrom urllib.parse import urlparse\n\nfrom readthedocs.doc_builder.exceptions import BuildEnvironmentError\nfrom readthedocs.builds.models import Build, Version\nfrom readthedocs.core.permissions import AdminPermission\nfrom readthedocs.core.utils import trigger_build\nfrom readthedocs.projects.models import Project\n\n\nlog = logging.getLogger(__name__)\n\n\nclass BuildBase:\n model = Build\n\n def get_queryset(self):\n self.project_slug = self.kwargs.get('project_slug', None)\n self.project = get_object_or_404(\n Project.objects.protected(self.request.user),\n slug=self.project_slug,\n )\n queryset = Build.objects.public(\n user=self.request.user,\n project=self.project,\n )\n\n return queryset\n\n\nclass BuildTriggerMixin:\n\n @method_decorator(login_required)\n def post(self, request, project_slug):\n project = get_object_or_404(Project, slug=project_slug)\n\n if not AdminPermission.is_admin(request.user, project):\n return HttpResponseForbidden()\n\n version_slug = request.POST.get('version_slug')\n version = get_object_or_404(\n Version,\n project=project,\n slug=version_slug,\n )\n\n update_docs_task, build = trigger_build(\n project=project,\n version=version,\n )\n if (update_docs_task, build) == (None, None):\n # Build was skipped\n messages.add_message(\n request,\n messages.WARNING,\n \"This project is currently disabled and can't trigger new builds.\",\n )\n return HttpResponseRedirect(\n reverse('builds_project_list', args=[project.slug]),\n )\n\n return HttpResponseRedirect(\n reverse('builds_detail', args=[project.slug, build.pk]),\n )\n\n\nclass BuildList(BuildBase, BuildTriggerMixin, ListView):\n\n def get_context_data(self, **kwargs):\n context = super().get_context_data(**kwargs)\n\n active_builds = self.get_queryset().exclude(\n state='finished',\n ).values('id')\n\n context['project'] = self.project\n context['active_builds'] = active_builds\n context['versions'] = Version.objects.public(\n user=self.request.user,\n project=self.project,\n )\n context['build_qs'] = self.get_queryset()\n\n return context\n\n\nclass BuildDetail(BuildBase, DetailView):\n pk_url_kwarg = 'build_pk'\n\n def get_context_data(self, **kwargs):\n context = super().get_context_data(**kwargs)\n context['project'] = self.project\n\n build = self.get_object()\n if build.error != BuildEnvironmentError.GENERIC_WITH_BUILD_ID.format(build_id=build.pk):\n # Do not suggest to open an issue if the error is not generic\n return context\n\n scheme = (\n 'https://github.com/rtfd/readthedocs.org/issues/new'\n '?title={title}{build_id}'\n '&body={body}'\n )\n\n # TODO: we could use ``.github/ISSUE_TEMPLATE.md`` here, but we would\n # need to add some variables to it which could impact in the UX when\n # filling an issue from the web\n body = \"\"\"\n ## Details:\n\n * Project URL: https://readthedocs.org/projects/{project_slug}/\n * Build URL(if applicable): https://readthedocs.org{build_path}\n * Read the Docs username(if applicable): {username}\n\n ## Expected Result\n\n *A description of what you wanted to happen*\n\n ## Actual Result\n\n *A description of what actually happened*\"\"\".format(\n project_slug=self.project,\n build_path=self.request.path,\n username=self.request.user,\n )\n\n scheme_dict = {\n 'title': quote('Build error with build id #'),\n 'build_id': context['build'].id,\n 'body': quote(textwrap.dedent(body)),\n }\n\n issue_url = scheme.format(**scheme_dict)\n issue_url = urlparse(issue_url).geturl()\n context['issue_url'] = issue_url\n return context\n\n\n# Old build view redirects\n\n\ndef builds_redirect_list(request, project_slug): # pylint: disable=unused-argument\n return HttpResponsePermanentRedirect(\n reverse('builds_project_list', args=[project_slug]),\n )\n\n\ndef builds_redirect_detail(request, project_slug, pk): # pylint: disable=unused-argument\n return HttpResponsePermanentRedirect(\n reverse('builds_detail', args=[project_slug, pk]),\n )\n", "path": "readthedocs/builds/views.py" } ]
[ { "content": "# -*- coding: utf-8 -*-\n\n\"\"\"Views for builds app.\"\"\"\n\nimport logging\nimport textwrap\n\nfrom django.contrib import messages\nfrom django.contrib.auth.decorators import login_required\nfrom django.http import (\n HttpResponseForbidden,\n HttpResponsePermanentRedirect,\n HttpResponseRedirect,\n)\nfrom django.shortcuts import get_object_or_404\nfrom django.urls import reverse\nfrom django.utils.decorators import method_decorator\nfrom django.views.generic import DetailView, ListView\nfrom requests.utils import quote\nfrom urllib.parse import urlparse\n\nfrom readthedocs.doc_builder.exceptions import BuildEnvironmentError\nfrom readthedocs.builds.models import Build, Version\nfrom readthedocs.core.permissions import AdminPermission\nfrom readthedocs.core.utils import trigger_build\nfrom readthedocs.projects.models import Project\n\n\nlog = logging.getLogger(__name__)\n\n\nclass BuildBase:\n model = Build\n\n def get_queryset(self):\n self.project_slug = self.kwargs.get('project_slug', None)\n self.project = get_object_or_404(\n Project.objects.protected(self.request.user),\n slug=self.project_slug,\n )\n queryset = Build.objects.public(\n user=self.request.user,\n project=self.project,\n ).select_related('project', 'version')\n\n return queryset\n\n\nclass BuildTriggerMixin:\n\n @method_decorator(login_required)\n def post(self, request, project_slug):\n project = get_object_or_404(Project, slug=project_slug)\n\n if not AdminPermission.is_admin(request.user, project):\n return HttpResponseForbidden()\n\n version_slug = request.POST.get('version_slug')\n version = get_object_or_404(\n Version,\n project=project,\n slug=version_slug,\n )\n\n update_docs_task, build = trigger_build(\n project=project,\n version=version,\n )\n if (update_docs_task, build) == (None, None):\n # Build was skipped\n messages.add_message(\n request,\n messages.WARNING,\n \"This project is currently disabled and can't trigger new builds.\",\n )\n return HttpResponseRedirect(\n reverse('builds_project_list', args=[project.slug]),\n )\n\n return HttpResponseRedirect(\n reverse('builds_detail', args=[project.slug, build.pk]),\n )\n\n\nclass BuildList(BuildBase, BuildTriggerMixin, ListView):\n\n def get_context_data(self, **kwargs):\n context = super().get_context_data(**kwargs)\n\n active_builds = self.get_queryset().exclude(\n state='finished',\n ).values('id')\n\n context['project'] = self.project\n context['active_builds'] = active_builds\n context['versions'] = Version.objects.public(\n user=self.request.user,\n project=self.project,\n )\n context['build_qs'] = self.get_queryset()\n\n return context\n\n\nclass BuildDetail(BuildBase, DetailView):\n pk_url_kwarg = 'build_pk'\n\n def get_context_data(self, **kwargs):\n context = super().get_context_data(**kwargs)\n context['project'] = self.project\n\n build = self.get_object()\n if build.error != BuildEnvironmentError.GENERIC_WITH_BUILD_ID.format(build_id=build.pk):\n # Do not suggest to open an issue if the error is not generic\n return context\n\n scheme = (\n 'https://github.com/rtfd/readthedocs.org/issues/new'\n '?title={title}{build_id}'\n '&body={body}'\n )\n\n # TODO: we could use ``.github/ISSUE_TEMPLATE.md`` here, but we would\n # need to add some variables to it which could impact in the UX when\n # filling an issue from the web\n body = \"\"\"\n ## Details:\n\n * Project URL: https://readthedocs.org/projects/{project_slug}/\n * Build URL(if applicable): https://readthedocs.org{build_path}\n * Read the Docs username(if applicable): {username}\n\n ## Expected Result\n\n *A description of what you wanted to happen*\n\n ## Actual Result\n\n *A description of what actually happened*\"\"\".format(\n project_slug=self.project,\n build_path=self.request.path,\n username=self.request.user,\n )\n\n scheme_dict = {\n 'title': quote('Build error with build id #'),\n 'build_id': context['build'].id,\n 'body': quote(textwrap.dedent(body)),\n }\n\n issue_url = scheme.format(**scheme_dict)\n issue_url = urlparse(issue_url).geturl()\n context['issue_url'] = issue_url\n return context\n\n\n# Old build view redirects\n\n\ndef builds_redirect_list(request, project_slug): # pylint: disable=unused-argument\n return HttpResponsePermanentRedirect(\n reverse('builds_project_list', args=[project_slug]),\n )\n\n\ndef builds_redirect_detail(request, project_slug, pk): # pylint: disable=unused-argument\n return HttpResponsePermanentRedirect(\n reverse('builds_detail', args=[project_slug, pk]),\n )\n", "path": "readthedocs/builds/views.py" } ]
diff --git a/readthedocs/builds/views.py b/readthedocs/builds/views.py index dfdee2abf97..e8e3d458e2c 100644 --- a/readthedocs/builds/views.py +++ b/readthedocs/builds/views.py @@ -41,7 +41,7 @@ def get_queryset(self): queryset = Build.objects.public( user=self.request.user, project=self.project, - ) + ).select_related('project', 'version') return queryset
redis__redis-py-2254
[ { "content": "import threading\nimport time as mod_time\nimport uuid\nfrom types import SimpleNamespace, TracebackType\nfrom typing import Optional, Type\n\nfrom redis.exceptions import LockError, LockNotOwnedError\nfrom redis.typing import Number\n\n\nclass Lock:\n \"\"\"\n A shared, distributed Lock. Using Redis for locking allows the Lock\n to be shared across processes and/or machines.\n\n It's left to the user to resolve deadlock issues and make sure\n multiple clients play nicely together.\n \"\"\"\n\n lua_release = None\n lua_extend = None\n lua_reacquire = None\n\n # KEYS[1] - lock name\n # ARGV[1] - token\n # return 1 if the lock was released, otherwise 0\n LUA_RELEASE_SCRIPT = \"\"\"\n local token = redis.call('get', KEYS[1])\n if not token or token ~= ARGV[1] then\n return 0\n end\n redis.call('del', KEYS[1])\n return 1\n \"\"\"\n\n # KEYS[1] - lock name\n # ARGV[1] - token\n # ARGV[2] - additional milliseconds\n # ARGV[3] - \"0\" if the additional time should be added to the lock's\n # existing ttl or \"1\" if the existing ttl should be replaced\n # return 1 if the locks time was extended, otherwise 0\n LUA_EXTEND_SCRIPT = \"\"\"\n local token = redis.call('get', KEYS[1])\n if not token or token ~= ARGV[1] then\n return 0\n end\n local expiration = redis.call('pttl', KEYS[1])\n if not expiration then\n expiration = 0\n end\n if expiration < 0 then\n return 0\n end\n\n local newttl = ARGV[2]\n if ARGV[3] == \"0\" then\n newttl = ARGV[2] + expiration\n end\n redis.call('pexpire', KEYS[1], newttl)\n return 1\n \"\"\"\n\n # KEYS[1] - lock name\n # ARGV[1] - token\n # ARGV[2] - milliseconds\n # return 1 if the locks time was reacquired, otherwise 0\n LUA_REACQUIRE_SCRIPT = \"\"\"\n local token = redis.call('get', KEYS[1])\n if not token or token ~= ARGV[1] then\n return 0\n end\n redis.call('pexpire', KEYS[1], ARGV[2])\n return 1\n \"\"\"\n\n def __init__(\n self,\n redis,\n name: str,\n timeout: Optional[Number] = None,\n sleep: Number = 0.1,\n blocking: bool = True,\n blocking_timeout: Optional[Number] = None,\n thread_local: bool = True,\n ):\n \"\"\"\n Create a new Lock instance named ``name`` using the Redis client\n supplied by ``redis``.\n\n ``timeout`` indicates a maximum life for the lock in seconds.\n By default, it will remain locked until release() is called.\n ``timeout`` can be specified as a float or integer, both representing\n the number of seconds to wait.\n\n ``sleep`` indicates the amount of time to sleep in seconds per loop\n iteration when the lock is in blocking mode and another client is\n currently holding the lock.\n\n ``blocking`` indicates whether calling ``acquire`` should block until\n the lock has been acquired or to fail immediately, causing ``acquire``\n to return False and the lock not being acquired. Defaults to True.\n Note this value can be overridden by passing a ``blocking``\n argument to ``acquire``.\n\n ``blocking_timeout`` indicates the maximum amount of time in seconds to\n spend trying to acquire the lock. A value of ``None`` indicates\n continue trying forever. ``blocking_timeout`` can be specified as a\n float or integer, both representing the number of seconds to wait.\n\n ``thread_local`` indicates whether the lock token is placed in\n thread-local storage. By default, the token is placed in thread local\n storage so that a thread only sees its token, not a token set by\n another thread. Consider the following timeline:\n\n time: 0, thread-1 acquires `my-lock`, with a timeout of 5 seconds.\n thread-1 sets the token to \"abc\"\n time: 1, thread-2 blocks trying to acquire `my-lock` using the\n Lock instance.\n time: 5, thread-1 has not yet completed. redis expires the lock\n key.\n time: 5, thread-2 acquired `my-lock` now that it's available.\n thread-2 sets the token to \"xyz\"\n time: 6, thread-1 finishes its work and calls release(). if the\n token is *not* stored in thread local storage, then\n thread-1 would see the token value as \"xyz\" and would be\n able to successfully release the thread-2's lock.\n\n In some use cases it's necessary to disable thread local storage. For\n example, if you have code where one thread acquires a lock and passes\n that lock instance to a worker thread to release later. If thread\n local storage isn't disabled in this case, the worker thread won't see\n the token set by the thread that acquired the lock. Our assumption\n is that these cases aren't common and as such default to using\n thread local storage.\n \"\"\"\n self.redis = redis\n self.name = name\n self.timeout = timeout\n self.sleep = sleep\n self.blocking = blocking\n self.blocking_timeout = blocking_timeout\n self.thread_local = bool(thread_local)\n self.local = threading.local() if self.thread_local else SimpleNamespace()\n self.local.token = None\n self.register_scripts()\n\n def register_scripts(self) -> None:\n cls = self.__class__\n client = self.redis\n if cls.lua_release is None:\n cls.lua_release = client.register_script(cls.LUA_RELEASE_SCRIPT)\n if cls.lua_extend is None:\n cls.lua_extend = client.register_script(cls.LUA_EXTEND_SCRIPT)\n if cls.lua_reacquire is None:\n cls.lua_reacquire = client.register_script(cls.LUA_REACQUIRE_SCRIPT)\n\n def __enter__(self) -> \"Lock\":\n if self.acquire():\n return self\n raise LockError(\"Unable to acquire lock within the time specified\")\n\n def __exit__(\n self,\n exc_type: Optional[Type[BaseException]],\n exc_value: Optional[BaseException],\n traceback: Optional[TracebackType],\n ) -> None:\n self.release()\n\n def acquire(\n self,\n *,\n sleep: Optional[Number] = None,\n blocking: Optional[bool] = None,\n blocking_timeout: Optional[Number] = None,\n token: Optional[str] = None,\n ):\n \"\"\"\n Use Redis to hold a shared, distributed lock named ``name``.\n Returns True once the lock is acquired.\n\n If ``blocking`` is False, always return immediately. If the lock\n was acquired, return True, otherwise return False.\n\n ``blocking_timeout`` specifies the maximum number of seconds to\n wait trying to acquire the lock.\n\n ``token`` specifies the token value to be used. If provided, token\n must be a bytes object or a string that can be encoded to a bytes\n object with the default encoding. If a token isn't specified, a UUID\n will be generated.\n \"\"\"\n if sleep is None:\n sleep = self.sleep\n if token is None:\n token = uuid.uuid1().hex.encode()\n else:\n encoder = self.redis.get_encoder()\n token = encoder.encode(token)\n if blocking is None:\n blocking = self.blocking\n if blocking_timeout is None:\n blocking_timeout = self.blocking_timeout\n stop_trying_at = None\n if blocking_timeout is not None:\n stop_trying_at = mod_time.monotonic() + blocking_timeout\n while True:\n if self.do_acquire(token):\n self.local.token = token\n return True\n if not blocking:\n return False\n next_try_at = mod_time.monotonic() + sleep\n if stop_trying_at is not None and next_try_at > stop_trying_at:\n return False\n mod_time.sleep(sleep)\n\n def do_acquire(self, token: str) -> bool:\n if self.timeout:\n # convert to milliseconds\n timeout = int(self.timeout * 1000)\n else:\n timeout = None\n if self.redis.set(self.name, token, nx=True, px=timeout):\n return True\n return False\n\n def locked(self) -> bool:\n \"\"\"\n Returns True if this key is locked by any process, otherwise False.\n \"\"\"\n return self.redis.get(self.name) is not None\n\n def owned(self) -> bool:\n \"\"\"\n Returns True if this key is locked by this lock, otherwise False.\n \"\"\"\n stored_token = self.redis.get(self.name)\n # need to always compare bytes to bytes\n # TODO: this can be simplified when the context manager is finished\n if stored_token and not isinstance(stored_token, bytes):\n encoder = self.redis.get_encoder()\n stored_token = encoder.encode(stored_token)\n return self.local.token is not None and stored_token == self.local.token\n\n def release(self) -> None:\n \"\"\"\n Releases the already acquired lock\n \"\"\"\n expected_token = self.local.token\n if expected_token is None:\n raise LockError(\"Cannot release an unlocked lock\")\n self.local.token = None\n self.do_release(expected_token)\n\n def do_release(self, expected_token: str) -> None:\n if not bool(\n self.lua_release(keys=[self.name], args=[expected_token], client=self.redis)\n ):\n raise LockNotOwnedError(\"Cannot release a lock\" \" that's no longer owned\")\n\n def extend(self, additional_time: int, replace_ttl: bool = False) -> bool:\n \"\"\"\n Adds more time to an already acquired lock.\n\n ``additional_time`` can be specified as an integer or a float, both\n representing the number of seconds to add.\n\n ``replace_ttl`` if False (the default), add `additional_time` to\n the lock's existing ttl. If True, replace the lock's ttl with\n `additional_time`.\n \"\"\"\n if self.local.token is None:\n raise LockError(\"Cannot extend an unlocked lock\")\n if self.timeout is None:\n raise LockError(\"Cannot extend a lock with no timeout\")\n return self.do_extend(additional_time, replace_ttl)\n\n def do_extend(self, additional_time: int, replace_ttl: bool) -> bool:\n additional_time = int(additional_time * 1000)\n if not bool(\n self.lua_extend(\n keys=[self.name],\n args=[self.local.token, additional_time, \"1\" if replace_ttl else \"0\"],\n client=self.redis,\n )\n ):\n raise LockNotOwnedError(\"Cannot extend a lock that's no longer owned\")\n return True\n\n def reacquire(self) -> bool:\n \"\"\"\n Resets a TTL of an already acquired lock back to a timeout value.\n \"\"\"\n if self.local.token is None:\n raise LockError(\"Cannot reacquire an unlocked lock\")\n if self.timeout is None:\n raise LockError(\"Cannot reacquire a lock with no timeout\")\n return self.do_reacquire()\n\n def do_reacquire(self) -> bool:\n timeout = int(self.timeout * 1000)\n if not bool(\n self.lua_reacquire(\n keys=[self.name], args=[self.local.token, timeout], client=self.redis\n )\n ):\n raise LockNotOwnedError(\"Cannot reacquire a lock that's no longer owned\")\n return True\n", "path": "redis/lock.py" } ]
[ { "content": "import threading\nimport time as mod_time\nimport uuid\nfrom types import SimpleNamespace, TracebackType\nfrom typing import Optional, Type\n\nfrom redis.exceptions import LockError, LockNotOwnedError\nfrom redis.typing import Number\n\n\nclass Lock:\n \"\"\"\n A shared, distributed Lock. Using Redis for locking allows the Lock\n to be shared across processes and/or machines.\n\n It's left to the user to resolve deadlock issues and make sure\n multiple clients play nicely together.\n \"\"\"\n\n lua_release = None\n lua_extend = None\n lua_reacquire = None\n\n # KEYS[1] - lock name\n # ARGV[1] - token\n # return 1 if the lock was released, otherwise 0\n LUA_RELEASE_SCRIPT = \"\"\"\n local token = redis.call('get', KEYS[1])\n if not token or token ~= ARGV[1] then\n return 0\n end\n redis.call('del', KEYS[1])\n return 1\n \"\"\"\n\n # KEYS[1] - lock name\n # ARGV[1] - token\n # ARGV[2] - additional milliseconds\n # ARGV[3] - \"0\" if the additional time should be added to the lock's\n # existing ttl or \"1\" if the existing ttl should be replaced\n # return 1 if the locks time was extended, otherwise 0\n LUA_EXTEND_SCRIPT = \"\"\"\n local token = redis.call('get', KEYS[1])\n if not token or token ~= ARGV[1] then\n return 0\n end\n local expiration = redis.call('pttl', KEYS[1])\n if not expiration then\n expiration = 0\n end\n if expiration < 0 then\n return 0\n end\n\n local newttl = ARGV[2]\n if ARGV[3] == \"0\" then\n newttl = ARGV[2] + expiration\n end\n redis.call('pexpire', KEYS[1], newttl)\n return 1\n \"\"\"\n\n # KEYS[1] - lock name\n # ARGV[1] - token\n # ARGV[2] - milliseconds\n # return 1 if the locks time was reacquired, otherwise 0\n LUA_REACQUIRE_SCRIPT = \"\"\"\n local token = redis.call('get', KEYS[1])\n if not token or token ~= ARGV[1] then\n return 0\n end\n redis.call('pexpire', KEYS[1], ARGV[2])\n return 1\n \"\"\"\n\n def __init__(\n self,\n redis,\n name: str,\n timeout: Optional[Number] = None,\n sleep: Number = 0.1,\n blocking: bool = True,\n blocking_timeout: Optional[Number] = None,\n thread_local: bool = True,\n ):\n \"\"\"\n Create a new Lock instance named ``name`` using the Redis client\n supplied by ``redis``.\n\n ``timeout`` indicates a maximum life for the lock in seconds.\n By default, it will remain locked until release() is called.\n ``timeout`` can be specified as a float or integer, both representing\n the number of seconds to wait.\n\n ``sleep`` indicates the amount of time to sleep in seconds per loop\n iteration when the lock is in blocking mode and another client is\n currently holding the lock.\n\n ``blocking`` indicates whether calling ``acquire`` should block until\n the lock has been acquired or to fail immediately, causing ``acquire``\n to return False and the lock not being acquired. Defaults to True.\n Note this value can be overridden by passing a ``blocking``\n argument to ``acquire``.\n\n ``blocking_timeout`` indicates the maximum amount of time in seconds to\n spend trying to acquire the lock. A value of ``None`` indicates\n continue trying forever. ``blocking_timeout`` can be specified as a\n float or integer, both representing the number of seconds to wait.\n\n ``thread_local`` indicates whether the lock token is placed in\n thread-local storage. By default, the token is placed in thread local\n storage so that a thread only sees its token, not a token set by\n another thread. Consider the following timeline:\n\n time: 0, thread-1 acquires `my-lock`, with a timeout of 5 seconds.\n thread-1 sets the token to \"abc\"\n time: 1, thread-2 blocks trying to acquire `my-lock` using the\n Lock instance.\n time: 5, thread-1 has not yet completed. redis expires the lock\n key.\n time: 5, thread-2 acquired `my-lock` now that it's available.\n thread-2 sets the token to \"xyz\"\n time: 6, thread-1 finishes its work and calls release(). if the\n token is *not* stored in thread local storage, then\n thread-1 would see the token value as \"xyz\" and would be\n able to successfully release the thread-2's lock.\n\n In some use cases it's necessary to disable thread local storage. For\n example, if you have code where one thread acquires a lock and passes\n that lock instance to a worker thread to release later. If thread\n local storage isn't disabled in this case, the worker thread won't see\n the token set by the thread that acquired the lock. Our assumption\n is that these cases aren't common and as such default to using\n thread local storage.\n \"\"\"\n self.redis = redis\n self.name = name\n self.timeout = timeout\n self.sleep = sleep\n self.blocking = blocking\n self.blocking_timeout = blocking_timeout\n self.thread_local = bool(thread_local)\n self.local = threading.local() if self.thread_local else SimpleNamespace()\n self.local.token = None\n self.register_scripts()\n\n def register_scripts(self) -> None:\n cls = self.__class__\n client = self.redis\n if cls.lua_release is None:\n cls.lua_release = client.register_script(cls.LUA_RELEASE_SCRIPT)\n if cls.lua_extend is None:\n cls.lua_extend = client.register_script(cls.LUA_EXTEND_SCRIPT)\n if cls.lua_reacquire is None:\n cls.lua_reacquire = client.register_script(cls.LUA_REACQUIRE_SCRIPT)\n\n def __enter__(self) -> \"Lock\":\n if self.acquire():\n return self\n raise LockError(\"Unable to acquire lock within the time specified\")\n\n def __exit__(\n self,\n exc_type: Optional[Type[BaseException]],\n exc_value: Optional[BaseException],\n traceback: Optional[TracebackType],\n ) -> None:\n self.release()\n\n def acquire(\n self,\n sleep: Optional[Number] = None,\n blocking: Optional[bool] = None,\n blocking_timeout: Optional[Number] = None,\n token: Optional[str] = None,\n ):\n \"\"\"\n Use Redis to hold a shared, distributed lock named ``name``.\n Returns True once the lock is acquired.\n\n If ``blocking`` is False, always return immediately. If the lock\n was acquired, return True, otherwise return False.\n\n ``blocking_timeout`` specifies the maximum number of seconds to\n wait trying to acquire the lock.\n\n ``token`` specifies the token value to be used. If provided, token\n must be a bytes object or a string that can be encoded to a bytes\n object with the default encoding. If a token isn't specified, a UUID\n will be generated.\n \"\"\"\n if sleep is None:\n sleep = self.sleep\n if token is None:\n token = uuid.uuid1().hex.encode()\n else:\n encoder = self.redis.get_encoder()\n token = encoder.encode(token)\n if blocking is None:\n blocking = self.blocking\n if blocking_timeout is None:\n blocking_timeout = self.blocking_timeout\n stop_trying_at = None\n if blocking_timeout is not None:\n stop_trying_at = mod_time.monotonic() + blocking_timeout\n while True:\n if self.do_acquire(token):\n self.local.token = token\n return True\n if not blocking:\n return False\n next_try_at = mod_time.monotonic() + sleep\n if stop_trying_at is not None and next_try_at > stop_trying_at:\n return False\n mod_time.sleep(sleep)\n\n def do_acquire(self, token: str) -> bool:\n if self.timeout:\n # convert to milliseconds\n timeout = int(self.timeout * 1000)\n else:\n timeout = None\n if self.redis.set(self.name, token, nx=True, px=timeout):\n return True\n return False\n\n def locked(self) -> bool:\n \"\"\"\n Returns True if this key is locked by any process, otherwise False.\n \"\"\"\n return self.redis.get(self.name) is not None\n\n def owned(self) -> bool:\n \"\"\"\n Returns True if this key is locked by this lock, otherwise False.\n \"\"\"\n stored_token = self.redis.get(self.name)\n # need to always compare bytes to bytes\n # TODO: this can be simplified when the context manager is finished\n if stored_token and not isinstance(stored_token, bytes):\n encoder = self.redis.get_encoder()\n stored_token = encoder.encode(stored_token)\n return self.local.token is not None and stored_token == self.local.token\n\n def release(self) -> None:\n \"\"\"\n Releases the already acquired lock\n \"\"\"\n expected_token = self.local.token\n if expected_token is None:\n raise LockError(\"Cannot release an unlocked lock\")\n self.local.token = None\n self.do_release(expected_token)\n\n def do_release(self, expected_token: str) -> None:\n if not bool(\n self.lua_release(keys=[self.name], args=[expected_token], client=self.redis)\n ):\n raise LockNotOwnedError(\"Cannot release a lock\" \" that's no longer owned\")\n\n def extend(self, additional_time: int, replace_ttl: bool = False) -> bool:\n \"\"\"\n Adds more time to an already acquired lock.\n\n ``additional_time`` can be specified as an integer or a float, both\n representing the number of seconds to add.\n\n ``replace_ttl`` if False (the default), add `additional_time` to\n the lock's existing ttl. If True, replace the lock's ttl with\n `additional_time`.\n \"\"\"\n if self.local.token is None:\n raise LockError(\"Cannot extend an unlocked lock\")\n if self.timeout is None:\n raise LockError(\"Cannot extend a lock with no timeout\")\n return self.do_extend(additional_time, replace_ttl)\n\n def do_extend(self, additional_time: int, replace_ttl: bool) -> bool:\n additional_time = int(additional_time * 1000)\n if not bool(\n self.lua_extend(\n keys=[self.name],\n args=[self.local.token, additional_time, \"1\" if replace_ttl else \"0\"],\n client=self.redis,\n )\n ):\n raise LockNotOwnedError(\"Cannot extend a lock that's no longer owned\")\n return True\n\n def reacquire(self) -> bool:\n \"\"\"\n Resets a TTL of an already acquired lock back to a timeout value.\n \"\"\"\n if self.local.token is None:\n raise LockError(\"Cannot reacquire an unlocked lock\")\n if self.timeout is None:\n raise LockError(\"Cannot reacquire a lock with no timeout\")\n return self.do_reacquire()\n\n def do_reacquire(self) -> bool:\n timeout = int(self.timeout * 1000)\n if not bool(\n self.lua_reacquire(\n keys=[self.name], args=[self.local.token, timeout], client=self.redis\n )\n ):\n raise LockNotOwnedError(\"Cannot reacquire a lock that's no longer owned\")\n return True\n", "path": "redis/lock.py" } ]
diff --git a/redis/lock.py b/redis/lock.py index 650d0ae56c..912ff57819 100644 --- a/redis/lock.py +++ b/redis/lock.py @@ -169,7 +169,6 @@ def __exit__( def acquire( self, - *, sleep: Optional[Number] = None, blocking: Optional[bool] = None, blocking_timeout: Optional[Number] = None,
buildbot__buildbot-1214
[ { "content": "#!/usr/bin/env python\n#\n# This file is part of Buildbot. Buildbot is free software: you can\n# redistribute it and/or modify it under the terms of the GNU General Public\n# License as published by the Free Software Foundation, version 2.\n#\n# This program is distributed in the hope that it will be useful, but WITHOUT\n# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\n# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more\n# details.\n#\n# You should have received a copy of the GNU General Public License along with\n# this program; if not, write to the Free Software Foundation, Inc., 51\n# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n#\n# Copyright Buildbot Team Members\n\nfrom setuptools import setup\nimport buildbot_pkg\n\nsetup(\n name='buildbot_pkg',\n version=buildbot_pkg.getVersion(\".\"),\n description='Buildbot packaging tools',\n author=u'Pierre Tardy',\n author_email=u'tardyp@gmail.com',\n url='http://buildbot.net/',\n license='GNU GPL',\n py_modules=['buildbot_pkg'],\n)\n", "path": "pkg/setup.py" } ]
[ { "content": "#!/usr/bin/env python\n#\n# This file is part of Buildbot. Buildbot is free software: you can\n# redistribute it and/or modify it under the terms of the GNU General Public\n# License as published by the Free Software Foundation, version 2.\n#\n# This program is distributed in the hope that it will be useful, but WITHOUT\n# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\n# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more\n# details.\n#\n# You should have received a copy of the GNU General Public License along with\n# this program; if not, write to the Free Software Foundation, Inc., 51\n# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n#\n# Copyright Buildbot Team Members\n\nfrom setuptools import setup\nimport buildbot_pkg\n\nsetup(\n name='buildbot-pkg',\n version=buildbot_pkg.getVersion(\".\"),\n description='Buildbot packaging tools',\n author=u'Pierre Tardy',\n author_email=u'tardyp@gmail.com',\n url='http://buildbot.net/',\n license='GNU GPL',\n py_modules=['buildbot_pkg'],\n)\n", "path": "pkg/setup.py" } ]
diff --git a/pkg/setup.py b/pkg/setup.py index 51b1ec8d6ac8..c7d089650654 100755 --- a/pkg/setup.py +++ b/pkg/setup.py @@ -19,7 +19,7 @@ import buildbot_pkg setup( - name='buildbot_pkg', + name='buildbot-pkg', version=buildbot_pkg.getVersion("."), description='Buildbot packaging tools', author=u'Pierre Tardy',
DistrictDataLabs__yellowbrick-904
[ { "content": "# yellowbrick.features.rfecv\n# Visualize the number of features selected with recursive feature elimination\n#\n# Author: Benjamin Bengfort <benjamin@bengfort.com>\n# Created: Tue Apr 03 17:31:37 2018 -0400\n#\n# ID: rfecv.py [] benjamin@bengfort.com $\n\n\"\"\"\nVisualize the number of features selected using recursive feature elimination\n\"\"\"\n\n##########################################################################\n## Imports\n##########################################################################\n\nimport numpy as np\n\nfrom yellowbrick.base import ModelVisualizer\nfrom yellowbrick.exceptions import YellowbrickValueError\n\nfrom sklearn.utils import check_X_y\nfrom sklearn.feature_selection import RFE\nfrom sklearn.model_selection import cross_val_score\n\n\n##########################################################################\n## Recursive Feature Elimination\n##########################################################################\n\nclass RFECV(ModelVisualizer):\n \"\"\"\n Recursive Feature Elimination, Cross-Validated (RFECV) feature selection.\n\n Selects the best subset of features for the supplied estimator by removing\n 0 to N features (where N is the number of features) using recursive\n feature elimination, then selecting the best subset based on the\n cross-validation score of the model. Recursive feature elimination\n eliminates n features from a model by fitting the model multiple times and\n at each step, removing the weakest features, determined by either the\n ``coef_`` or ``feature_importances_`` attribute of the fitted model.\n\n The visualization plots the score relative to each subset and shows trends\n in feature elimination. If the feature elimination CV score is flat, then\n potentially there are not enough features in the model. An ideal curve is\n when the score jumps from low to high as the number of features removed\n increases, then slowly decreases again from the optimal number of\n features.\n\n Parameters\n ----------\n model : a scikit-learn estimator\n An object that implements ``fit`` and provides information about the\n relative importance of features with either a ``coef_`` or\n ``feature_importances_`` attribute.\n\n Note that the object is cloned for each validation.\n\n ax : matplotlib.Axes object, optional\n The axes object to plot the figure on.\n\n step : int or float, optional (default=1)\n If greater than or equal to 1, then step corresponds to the (integer)\n number of features to remove at each iteration. If within (0.0, 1.0),\n then step corresponds to the percentage (rounded down) of features to\n remove at each iteration.\n\n groups : array-like, with shape (n_samples,), optional\n Group labels for the samples used while splitting the dataset into\n train/test set.\n\n cv : int, cross-validation generator or an iterable, optional\n Determines the cross-validation splitting strategy.\n Possible inputs for cv are:\n\n - None, to use the default 3-fold cross-validation,\n - integer, to specify the number of folds.\n - An object to be used as a cross-validation generator.\n - An iterable yielding train/test splits.\n\n see the scikit-learn\n `cross-validation guide <http://scikit-learn.org/stable/modules/cross_validation.html>`_\n for more information on the possible strategies that can be used here.\n\n scoring : string, callable or None, optional, default: None\n A string or scorer callable object / function with signature\n ``scorer(estimator, X, y)``. See scikit-learn model evaluation\n documentation for names of possible metrics.\n\n kwargs : dict\n Keyword arguments that are passed to the base class and may influence\n the visualization as defined in other Visualizers.\n\n Attributes\n ----------\n n_features_ : int\n The number of features in the selected subset\n\n support_ : array of shape [n_features]\n A mask of the selected features\n\n ranking_ : array of shape [n_features]\n The feature ranking, such that ``ranking_[i]`` corresponds to the\n ranked position of feature i. Selected features are assigned rank 1.\n\n cv_scores_ : array of shape [n_subsets_of_features, n_splits]\n The cross-validation scores for each subset of features and splits in\n the cross-validation strategy.\n\n rfe_estimator_ : sklearn.feature_selection.RFE\n A fitted RFE estimator wrapping the original estimator. All estimator\n functions such as ``predict()`` and ``score()`` are passed through to\n this estimator (it rewraps the original model).\n\n n_feature_subsets_ : array of shape [n_subsets_of_features]\n The number of features removed on each iteration of RFE, computed by the\n number of features in the dataset and the step parameter.\n\n Notes\n -----\n This model wraps ``sklearn.feature_selection.RFE`` and not\n ``sklearn.feature_selection.RFECV`` because access to the internals of the\n CV and RFE estimators is required for the visualization. The visualizer\n does take similar arguments, however it does not expose the same internal\n attributes.\n\n Additionally, the RFE model can be accessed via the ``rfe_estimator_``\n attribute. Once fitted, the visualizer acts as a wrapper for this\n estimator and not for the original model passed to the model. This way the\n visualizer model can be used to make predictions.\n\n .. caution:: This visualizer requires a model that has either a ``coef_``\n or ``feature_importances_`` attribute when fitted.\n \"\"\"\n\n def __init__(self, model, ax=None, step=1, groups=None, cv=None,\n scoring=None, **kwargs):\n\n # Initialize the model visualizer\n super(RFECV, self).__init__(model, ax=ax, **kwargs)\n\n # Set parameters\n self.set_params(step=step, groups=groups, cv=cv, scoring=scoring)\n\n def fit(self, X, y=None):\n \"\"\"\n Fits the RFECV with the wrapped model to the specified data and draws\n the rfecv curve with the optimal number of features found.\n\n Parameters\n ----------\n X : array-like, shape (n_samples, n_features)\n Training vector, where n_samples is the number of samples and\n n_features is the number of features.\n\n y : array-like, shape (n_samples) or (n_samples, n_features), optional\n Target relative to X for classification or regression.\n\n Returns\n -------\n self : instance\n Returns the instance of the RFECV visualizer.\n \"\"\"\n X, y = check_X_y(X, y, \"csr\")\n n_features = X.shape[1]\n\n # This check is kind of unnecessary since RFE will do it, but it's\n # nice to get it out of the way ASAP and raise a meaningful error.\n if 0.0 < self.step < 1.0:\n step = int(max(1, self.step * n_features))\n else:\n step = int(self.step)\n\n if step < 0:\n raise YellowbrickValueError(\"step must be >0\")\n\n # Create the RFE model\n rfe = RFE(self.estimator, step=step)\n self.n_feature_subsets_ = np.arange(1, n_features+step, step)\n\n # Create the cross validation params\n # TODO: handle random state\n cv_params = {\n key: self.get_params()[key]\n for key in ('groups', 'cv', 'scoring')\n }\n\n # Perform cross-validation for each feature subset\n scores = []\n for n_features_to_select in self.n_feature_subsets_:\n rfe.set_params(n_features_to_select=n_features_to_select)\n scores.append(cross_val_score(rfe, X, y, **cv_params))\n\n # Convert scores to array\n self.cv_scores_ = np.array(scores)\n\n # Find the best RFE model\n bestidx = self.cv_scores_.mean(axis=1).argmax()\n self.n_features_ = self.n_feature_subsets_[bestidx]\n\n # Fit the final RFE model for the number of features\n self.rfe_estimator_ = rfe\n self.rfe_estimator_.set_params(n_features_to_select=self.n_features_)\n self.rfe_estimator_.fit(X, y)\n\n # Rewrap the visualizer to use the rfe estimator\n self._wrapped = self.rfe_estimator_\n\n # Hoist the RFE params to the visualizer\n self.support_ = self.rfe_estimator_.support_\n self.ranking_ = self.rfe_estimator_.ranking_\n\n self.draw()\n return self\n\n def draw(self, **kwargs):\n \"\"\"\n Renders the rfecv curve.\n \"\"\"\n # Compute the curves\n x = self.n_feature_subsets_\n means = self.cv_scores_.mean(axis=1)\n sigmas = self.cv_scores_.std(axis=1)\n\n\n # Plot one standard deviation above and below the mean\n self.ax.fill_between(x, means - sigmas, means+sigmas, alpha=0.25)\n\n # Plot the curve\n self.ax.plot(x, means, 'o-')\n\n # Plot the maximum number of features\n self.ax.axvline(\n self.n_features_, c='k', ls='--',\n label=\"n_features = {}\\nscore = {:0.3f}\".format(\n self.n_features_, self.cv_scores_.mean(axis=1).max()\n )\n )\n\n return self.ax\n\n def finalize(self, **kwargs):\n \"\"\"\n Add the title, legend, and other visual final touches to the plot.\n \"\"\"\n # Set the title of the figure\n self.set_title('RFECV for {}'.format(self.name))\n\n # Add the legend\n self.ax.legend(frameon=True, loc='best')\n\n # Set the axis labels\n self.ax.set_xlabel('Number of Features Selected')\n self.ax.set_ylabel('Score')\n\n\n##########################################################################\n## Quick Methods\n##########################################################################\n\ndef rfecv(model, X, y, ax=None, step=1, groups=None, cv=None,\n scoring=None, **kwargs):\n \"\"\"\n Performs recursive feature elimination with cross-validation to determine\n an optimal number of features for a model. Visualizes the feature subsets\n with respect to the cross-validation score.\n\n This helper function is a quick wrapper to utilize the RFECV visualizer\n for one-off analysis.\n\n Parameters\n ----------\n model : a scikit-learn estimator\n An object that implements ``fit`` and provides information about the\n relative importance of features with either a ``coef_`` or\n ``feature_importances_`` attribute.\n\n Note that the object is cloned for each validation.\n\n X : array-like, shape (n_samples, n_features)\n Training vector, where n_samples is the number of samples and\n n_features is the number of features.\n\n y : array-like, shape (n_samples) or (n_samples, n_features), optional\n Target relative to X for classification or regression.\n\n ax : matplotlib.Axes object, optional\n The axes object to plot the figure on.\n\n step : int or float, optional (default=1)\n If greater than or equal to 1, then step corresponds to the (integer)\n number of features to remove at each iteration. If within (0.0, 1.0),\n then step corresponds to the percentage (rounded down) of features to\n remove at each iteration.\n\n groups : array-like, with shape (n_samples,), optional\n Group labels for the samples used while splitting the dataset into\n train/test set.\n\n cv : int, cross-validation generator or an iterable, optional\n Determines the cross-validation splitting strategy.\n Possible inputs for cv are:\n\n - None, to use the default 3-fold cross-validation,\n - integer, to specify the number of folds.\n - An object to be used as a cross-validation generator.\n - An iterable yielding train/test splits.\n\n see the scikit-learn\n `cross-validation guide <http://scikit-learn.org/stable/modules/cross_validation.html>`_\n for more information on the possible strategies that can be used here.\n\n scoring : string, callable or None, optional, default: None\n A string or scorer callable object / function with signature\n ``scorer(estimator, X, y)``. See scikit-learn model evaluation\n documentation for names of possible metrics.\n\n kwargs : dict\n Keyword arguments that are passed to the base class and may influence\n the visualization as defined in other Visualizers. These arguments are\n also passed to the `poof()` method, e.g. can pass a path to save the\n figure to.\n\n Returns\n -------\n ax : matplotlib axes\n Returns the axes that the rfecv were drawn on.\n \"\"\"\n # Initialize the visualizer\n oz = RFECV(model, ax=ax, step=step, groups=groups, cv=cv, scoring=scoring)\n\n # Fit and poof the visualizer\n oz.fit(X, y)\n oz.poof(**kwargs)\n return oz.ax\n", "path": "yellowbrick/features/rfecv.py" } ]
[ { "content": "# yellowbrick.features.rfecv\n# Visualize the number of features selected with recursive feature elimination\n#\n# Author: Benjamin Bengfort <benjamin@bengfort.com>\n# Created: Tue Apr 03 17:31:37 2018 -0400\n#\n# ID: rfecv.py [] benjamin@bengfort.com $\n\n\"\"\"\nVisualize the number of features selected using recursive feature elimination\n\"\"\"\n\n##########################################################################\n## Imports\n##########################################################################\n\nimport numpy as np\n\nfrom yellowbrick.base import ModelVisualizer\nfrom yellowbrick.exceptions import YellowbrickValueError\n\nfrom sklearn.utils import check_X_y\nfrom sklearn.feature_selection import RFE\nfrom sklearn.model_selection import cross_val_score\n\n\n##########################################################################\n## Recursive Feature Elimination\n##########################################################################\n\nclass RFECV(ModelVisualizer):\n \"\"\"\n Recursive Feature Elimination, Cross-Validated (RFECV) feature selection.\n\n Selects the best subset of features for the supplied estimator by removing\n 0 to N features (where N is the number of features) using recursive\n feature elimination, then selecting the best subset based on the\n cross-validation score of the model. Recursive feature elimination\n eliminates n features from a model by fitting the model multiple times and\n at each step, removing the weakest features, determined by either the\n ``coef_`` or ``feature_importances_`` attribute of the fitted model.\n\n The visualization plots the score relative to each subset and shows trends\n in feature elimination. If the feature elimination CV score is flat, then\n potentially there are not enough features in the model. An ideal curve is\n when the score jumps from low to high as the number of features removed\n increases, then slowly decreases again from the optimal number of\n features.\n\n Parameters\n ----------\n model : a scikit-learn estimator\n An object that implements ``fit`` and provides information about the\n relative importance of features with either a ``coef_`` or\n ``feature_importances_`` attribute.\n\n Note that the object is cloned for each validation.\n\n ax : matplotlib.Axes object, optional\n The axes object to plot the figure on.\n\n step : int or float, optional (default=1)\n If greater than or equal to 1, then step corresponds to the (integer)\n number of features to remove at each iteration. If within (0.0, 1.0),\n then step corresponds to the percentage (rounded down) of features to\n remove at each iteration.\n\n groups : array-like, with shape (n_samples,), optional\n Group labels for the samples used while splitting the dataset into\n train/test set.\n\n cv : int, cross-validation generator or an iterable, optional\n Determines the cross-validation splitting strategy.\n Possible inputs for cv are:\n\n - None, to use the default 3-fold cross-validation,\n - integer, to specify the number of folds.\n - An object to be used as a cross-validation generator.\n - An iterable yielding train/test splits.\n\n see the scikit-learn\n `cross-validation guide <http://scikit-learn.org/stable/modules/cross_validation.html>`_\n for more information on the possible strategies that can be used here.\n\n scoring : string, callable or None, optional, default: None\n A string or scorer callable object / function with signature\n ``scorer(estimator, X, y)``. See scikit-learn model evaluation\n documentation for names of possible metrics.\n\n kwargs : dict\n Keyword arguments that are passed to the base class and may influence\n the visualization as defined in other Visualizers.\n\n Attributes\n ----------\n n_features_ : int\n The number of features in the selected subset\n\n support_ : array of shape [n_features]\n A mask of the selected features\n\n ranking_ : array of shape [n_features]\n The feature ranking, such that ``ranking_[i]`` corresponds to the\n ranked position of feature i. Selected features are assigned rank 1.\n\n cv_scores_ : array of shape [n_subsets_of_features, n_splits]\n The cross-validation scores for each subset of features and splits in\n the cross-validation strategy.\n\n rfe_estimator_ : sklearn.feature_selection.RFE\n A fitted RFE estimator wrapping the original estimator. All estimator\n functions such as ``predict()`` and ``score()`` are passed through to\n this estimator (it rewraps the original model).\n\n n_feature_subsets_ : array of shape [n_subsets_of_features]\n The number of features removed on each iteration of RFE, computed by the\n number of features in the dataset and the step parameter.\n\n Notes\n -----\n This model wraps ``sklearn.feature_selection.RFE`` and not\n ``sklearn.feature_selection.RFECV`` because access to the internals of the\n CV and RFE estimators is required for the visualization. The visualizer\n does take similar arguments, however it does not expose the same internal\n attributes.\n\n Additionally, the RFE model can be accessed via the ``rfe_estimator_``\n attribute. Once fitted, the visualizer acts as a wrapper for this\n estimator and not for the original model passed to the model. This way the\n visualizer model can be used to make predictions.\n\n .. caution:: This visualizer requires a model that has either a ``coef_``\n or ``feature_importances_`` attribute when fitted.\n \"\"\"\n\n def __init__(self, model, ax=None, step=1, groups=None, cv=None,\n scoring=None, **kwargs):\n\n # Initialize the model visualizer\n super(RFECV, self).__init__(model, ax=ax, **kwargs)\n\n # Set parameters\n self.set_params(step=step, groups=groups, cv=cv, scoring=scoring)\n\n def fit(self, X, y=None):\n \"\"\"\n Fits the RFECV with the wrapped model to the specified data and draws\n the rfecv curve with the optimal number of features found.\n\n Parameters\n ----------\n X : array-like, shape (n_samples, n_features)\n Training vector, where n_samples is the number of samples and\n n_features is the number of features.\n\n y : array-like, shape (n_samples) or (n_samples, n_features), optional\n Target relative to X for classification or regression.\n\n Returns\n -------\n self : instance\n Returns the instance of the RFECV visualizer.\n \"\"\"\n X, y = check_X_y(X, y, \"csr\")\n n_features = X.shape[1]\n\n # This check is kind of unnecessary since RFE will do it, but it's\n # nice to get it out of the way ASAP and raise a meaningful error.\n if 0.0 < self.step < 1.0:\n step = int(max(1, self.step * n_features))\n else:\n step = int(self.step)\n\n if step <= 0:\n raise YellowbrickValueError(\"step must be >0\")\n\n # Create the RFE model\n rfe = RFE(self.estimator, step=step)\n self.n_feature_subsets_ = np.arange(1, n_features+step, step)\n\n # Create the cross validation params\n # TODO: handle random state\n cv_params = {\n key: self.get_params()[key]\n for key in ('groups', 'cv', 'scoring')\n }\n\n # Perform cross-validation for each feature subset\n scores = []\n for n_features_to_select in self.n_feature_subsets_:\n rfe.set_params(n_features_to_select=n_features_to_select)\n scores.append(cross_val_score(rfe, X, y, **cv_params))\n\n # Convert scores to array\n self.cv_scores_ = np.array(scores)\n\n # Find the best RFE model\n bestidx = self.cv_scores_.mean(axis=1).argmax()\n self.n_features_ = self.n_feature_subsets_[bestidx]\n\n # Fit the final RFE model for the number of features\n self.rfe_estimator_ = rfe\n self.rfe_estimator_.set_params(n_features_to_select=self.n_features_)\n self.rfe_estimator_.fit(X, y)\n\n # Rewrap the visualizer to use the rfe estimator\n self._wrapped = self.rfe_estimator_\n\n # Hoist the RFE params to the visualizer\n self.support_ = self.rfe_estimator_.support_\n self.ranking_ = self.rfe_estimator_.ranking_\n\n self.draw()\n return self\n\n def draw(self, **kwargs):\n \"\"\"\n Renders the rfecv curve.\n \"\"\"\n # Compute the curves\n x = self.n_feature_subsets_\n means = self.cv_scores_.mean(axis=1)\n sigmas = self.cv_scores_.std(axis=1)\n\n\n # Plot one standard deviation above and below the mean\n self.ax.fill_between(x, means - sigmas, means+sigmas, alpha=0.25)\n\n # Plot the curve\n self.ax.plot(x, means, 'o-')\n\n # Plot the maximum number of features\n self.ax.axvline(\n self.n_features_, c='k', ls='--',\n label=\"n_features = {}\\nscore = {:0.3f}\".format(\n self.n_features_, self.cv_scores_.mean(axis=1).max()\n )\n )\n\n return self.ax\n\n def finalize(self, **kwargs):\n \"\"\"\n Add the title, legend, and other visual final touches to the plot.\n \"\"\"\n # Set the title of the figure\n self.set_title('RFECV for {}'.format(self.name))\n\n # Add the legend\n self.ax.legend(frameon=True, loc='best')\n\n # Set the axis labels\n self.ax.set_xlabel('Number of Features Selected')\n self.ax.set_ylabel('Score')\n\n\n##########################################################################\n## Quick Methods\n##########################################################################\n\ndef rfecv(model, X, y, ax=None, step=1, groups=None, cv=None,\n scoring=None, **kwargs):\n \"\"\"\n Performs recursive feature elimination with cross-validation to determine\n an optimal number of features for a model. Visualizes the feature subsets\n with respect to the cross-validation score.\n\n This helper function is a quick wrapper to utilize the RFECV visualizer\n for one-off analysis.\n\n Parameters\n ----------\n model : a scikit-learn estimator\n An object that implements ``fit`` and provides information about the\n relative importance of features with either a ``coef_`` or\n ``feature_importances_`` attribute.\n\n Note that the object is cloned for each validation.\n\n X : array-like, shape (n_samples, n_features)\n Training vector, where n_samples is the number of samples and\n n_features is the number of features.\n\n y : array-like, shape (n_samples) or (n_samples, n_features), optional\n Target relative to X for classification or regression.\n\n ax : matplotlib.Axes object, optional\n The axes object to plot the figure on.\n\n step : int or float, optional (default=1)\n If greater than or equal to 1, then step corresponds to the (integer)\n number of features to remove at each iteration. If within (0.0, 1.0),\n then step corresponds to the percentage (rounded down) of features to\n remove at each iteration.\n\n groups : array-like, with shape (n_samples,), optional\n Group labels for the samples used while splitting the dataset into\n train/test set.\n\n cv : int, cross-validation generator or an iterable, optional\n Determines the cross-validation splitting strategy.\n Possible inputs for cv are:\n\n - None, to use the default 3-fold cross-validation,\n - integer, to specify the number of folds.\n - An object to be used as a cross-validation generator.\n - An iterable yielding train/test splits.\n\n see the scikit-learn\n `cross-validation guide <http://scikit-learn.org/stable/modules/cross_validation.html>`_\n for more information on the possible strategies that can be used here.\n\n scoring : string, callable or None, optional, default: None\n A string or scorer callable object / function with signature\n ``scorer(estimator, X, y)``. See scikit-learn model evaluation\n documentation for names of possible metrics.\n\n kwargs : dict\n Keyword arguments that are passed to the base class and may influence\n the visualization as defined in other Visualizers. These arguments are\n also passed to the `poof()` method, e.g. can pass a path to save the\n figure to.\n\n Returns\n -------\n ax : matplotlib axes\n Returns the axes that the rfecv were drawn on.\n \"\"\"\n # Initialize the visualizer\n oz = RFECV(model, ax=ax, step=step, groups=groups, cv=cv, scoring=scoring)\n\n # Fit and poof the visualizer\n oz.fit(X, y)\n oz.poof(**kwargs)\n return oz.ax\n", "path": "yellowbrick/features/rfecv.py" } ]
diff --git a/docs/contributing/advanced_development_topics.rst b/docs/contributing/advanced_development_topics.rst index 6ebaa8bf0..6f32446c2 100644 --- a/docs/contributing/advanced_development_topics.rst +++ b/docs/contributing/advanced_development_topics.rst @@ -72,9 +72,9 @@ Testing Conventions Ensure there is at least one image comparison test per visualizer. This is the primary regression testing of Yellowbrick and these tests catch a lot when changes occur in our dependencies or environment. -- Use pytest assertions rather than unittest. +- Use pytest assertions rather than ``unittest.TestCase`` methods. - We prefer ``assert 2+2 == 4`` rather than ``self.assertEquals(2+2, 4)``. Though there is a lot of legacy unittest assertions, we've moved to pytest and one day believe we will have removed the unittest dependency. + We prefer ``assert 2+2 == 4`` rather than ``self.assertEquals(2+2, 4)``. As a result, test classes should not extend ``unittest.Testcase`` but should extend the ``VisualTestCase`` in the tests package. Note that if you're writing tests that do not generate matplotlib figures you can simply extend ``object``. - Use test fixtures and sklearn dataset generators. diff --git a/docs/contributing/developing_visualizers.rst b/docs/contributing/developing_visualizers.rst index 6a845d46d..937144912 100644 --- a/docs/contributing/developing_visualizers.rst +++ b/docs/contributing/developing_visualizers.rst @@ -86,26 +86,21 @@ Testing The test package mirrors the yellowbrick package in structure and also contains several helper methods and base functionality. To add a test to your visualizer, find the corresponding file to add the test case, or create a new test file in the same place you added your code. -Visual tests are notoriously difficult to create --- how do you test a visualization or figure? Moreover, testing scikit-learn models with real data can consume a lot of memory. Therefore the primary test you should create is simply to test your visualizer from end to end and make sure that no exceptions occur. To assist with this, we have two primary helpers, ``VisualTestCase`` and ``DatasetMixin``. Create your unittest as follows:: +Visual tests are notoriously difficult to create --- how do you test a visualization or figure? Moreover, testing scikit-learn models with real data can consume a lot of memory. Therefore the primary test you should create is simply to test your visualizer from end to end and make sure that no exceptions occur. To assist with this, we have two primary helpers, ``VisualTestCase`` and ``DatasetMixin``. Create your tests as follows:: import pytest + from tests.base import VisualTestCase - from tests.dataset import DatasetMixin + from yellowbrick.datasets import load_occupancy - class MyVisualizerTests(VisualTestCase, DatasetMixin): + class MyVisualizerTests(VisualTestCase): def test_my_visualizer(self): """ Test MyVisualizer on a real dataset """ - # Load the data from the fixture - dataset = self.load_data('occupancy') - - # Get the data - X = dataset[[ - "temperature", "relative_humidity", "light", "C02", "humidity" - ]] - y = dataset['occupancy'].astype(int) + # Load the occupancy dataset + X, y = load_occupancy() try: visualizer = MyVisualizer() @@ -114,6 +109,7 @@ Visual tests are notoriously difficult to create --- how do you test a visualiza except Exception as e: pytest.fail("my visualizer didn't work") + Running the Test Suite ---------------------- @@ -136,7 +132,7 @@ Writing an image based comparison test is only a little more difficult than the The main consideration is that you must specify the “baseline”, or expected, image in the ``tests/baseline_images/`` folder structure. -For example, create your unittest located in ``tests/test_regressor/test_myvisualizer.py`` as follows:: +For example, create your test function located in ``tests/test_regressor/test_myvisualizer.py`` as follows:: from tests.base import VisualTestCase ... @@ -248,7 +244,7 @@ This is a pretty good structure for a documentation page; a brief introduction f At this point there are several places where you can list your visualizer, but to ensure it is included in the documentation it *must be listed in the TOC of the local index*. Find the ``index.rst`` file in your subdirectory and add your rst file (without the ``.rst`` extension) to the ``..toctree::`` directive. This will ensure the documentation is included when it is built. -Building the Docs +Building the Docs ~~~~~~~~~~~~~~~~~ Speaking of, you can build your documentation by changing into the ``docs`` directory and running ``make html``, the documentation will be built and rendered in the ``_build/html`` directory. You can view it by opening ``_build/html/index.html`` then navigating to your documentation in the browser. diff --git a/tests/README.md b/tests/README.md index dee805042..f22f58eb0 100644 --- a/tests/README.md +++ b/tests/README.md @@ -2,7 +2,7 @@ *Welcome to the Yellowbrick tests!* -If you're looking for information about how to use Yellowbrick, for our contributor's guide, for examples and teaching resources, for answers to frequently asked questions, and more, please visit the latest version of our documentation at [www.scikit-yb.org](https://www.scikit-yb.org/). +If you're looking for information about how to use Yellowbrick, for our contributor's guide, for examples and teaching resources, for answers to frequently asked questions, and more, please visit the latest version of our documentation at [www.scikit-yb.org](https://www.scikit-yb.org/). ## Running Yellowbrick Tests @@ -20,7 +20,7 @@ Tests can then be run as follows from the project `root`: $ make test ``` -The Makefile uses the `pytest` runner and testing suite as well as the coverage library. +The Makefile uses the `pytest` runner and testing suite as well as the coverage library. ## Adding a Test for Your Visualizer @@ -28,11 +28,11 @@ The `tests` package mirrors the yellowbrick package in structure and also contai ### Visual Tests -The primary test you should create is simply to test your visualizer from end to end and make sure that no exceptions occur. +The primary test you should create is simply to test your visualizer from end to end and make sure that no exceptions occur. -Visual tests are notoriously difficult to create --- how do you test a visualization or figure? Moreover, testing scikit-learn models with real data can consume a lot of memory. To assist with this, we have two primary helpers, `VisualTestCase` and the `yellowbrick.datasets` module. +Visual tests are notoriously difficult to create --- how do you test a visualization or figure? Moreover, testing scikit-learn models with real data can consume a lot of memory. To assist with this, we have two primary helpers, `VisualTestCase` and the `yellowbrick.datasets` module. -Leverage these helpers to create your unittest as follows: +Leverage these helpers to create your tests as follows: ```python import pytest @@ -64,7 +64,7 @@ Writing an image-based comparison test is only a little more difficult than the The main consideration is that you must specify the “baseline” (i.e. expected) image in the `tests/baseline_images/` folder structure. -For example, let's say you create your unittest in `tests/test_regressor/test_myvisualizer.py` as follows: +For example, let's say you create your tests in `tests/test_regressor/test_myvisualizer.py` as follows: ```python from tests.base import VisualTestCase diff --git a/tests/__init__.py b/tests/__init__.py index 134c73e0f..d6b063c7c 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -17,7 +17,6 @@ ## Imports ########################################################################## -import unittest import matplotlib ## IMPORTANT! Set matplotlib to use the Agg backend before imported anywhere! @@ -35,13 +34,13 @@ ## Initialization Tests ########################################################################## -class InitializationTests(unittest.TestCase): +class TestInitialization(object): def test_sanity(self): """ Test that tests work by confirming 7-3 = 4 """ - self.assertEqual(7-3, 4, "The world went wrong!!") + assert 7 - 3 == 4, "The world went wrong!!" def test_import(self): """ @@ -58,6 +57,6 @@ def test_version(self): """ try: import yellowbrick as yb - self.assertEqual(yb.__version__, EXPECTED_VERSION) + assert yb.__version__ == EXPECTED_VERSION except ImportError: self.fail("Could not import the yellowbrick library!") diff --git a/tests/base.py b/tests/base.py index 869b893eb..7899f24d5 100644 --- a/tests/base.py +++ b/tests/base.py @@ -15,24 +15,31 @@ ########################################################################## import os -import inspect import sys +import inspect -import unittest import matplotlib as mpl import matplotlib.pyplot as plt from matplotlib import ticker -from matplotlib import rcParams - from matplotlib.testing.compare import compare_images from yellowbrick.exceptions import ImageComparisonFailure + +########################################################################## +## Environment +########################################################################## + def is_windows_or_conda(): + """ + Simple detection mechanism to determine if the tests are running in a + win32 or Anaconda/Miniconda environment. + """ is_windows = sys.platform == 'win32' is_conda = os.path.exists(os.path.join(sys.prefix, 'conda-meta')) return is_windows or is_conda + ########################################################################## ## Module Constants ########################################################################## @@ -43,45 +50,45 @@ def is_windows_or_conda(): BASELINE_IMAGES = os.path.join(TESTS, "baseline_images") IS_WINDOWS_OR_CONDA = is_windows_or_conda() + ########################################################################## ## Visual Test Case ########################################################################## -class VisualTestCase(unittest.TestCase): - - @classmethod - def setUpClass(klass): - """ - This setup function is available to ensure that all CI tests - that do visual work are set up correctly. +class VisualTestCase(object): + """ + The visual test case class ensures that all tests inside of the class + can execute image similarity tests inside of a clean matplotlib global + figure. + """ - Note: + def setup_method(self): """ - super(VisualTestCase, klass).setUpClass() + Before a visual test case method is run, ensure that the previous + figure is closed and the current axes are cleared. - def setUp(self): - """ - Close all previous plots + See: https://docs.pytest.org/en/latest/xunit_setup.html """ # Reset the matplotlib environment - plt.cla() # clear current axis - plt.clf() # clear current figure - plt.close("all") # close all existing plots + plt.cla() # clear current axis + plt.clf() # clear current figure + plt.close("all") # close all existing plots - # Travis-CI does not have san-serif - rcParams['font.family'] = 'DejaVu Sans' + # Travis-CI does not have san-serif so ensure standard fonts are used. + # Note that this must be set before each test otherwise it will be reset by + # the Yellowbrick styles. + mpl.rcParams['font.family'] = 'DejaVu Sans' - super(VisualTestCase, self).setUp() - - def assert_images_similar(self, visualizer=None, ax=None, tol=0.01, windows_tol=None, **kwargs): + def assert_images_similar(self, visualizer=None, ax=None, + tol=0.01, windows_tol=None, **kwargs): """Accessible testing method for testing generation of a Visualizer. Requires the placement of a baseline image for comparison in the tests/baseline_images folder that corresponds to the module path of the VisualTestCase being evaluated. The name of the image corresponds to - the unittest function where "self.assert_images_similar" is called. + the test function where "self.assert_images_similar" is called. - For example, calling "assert_images_similar" in the unittest + For example, calling "assert_images_similar" in the test function "test_class_report" in tests.test_classifier.test_class_balance would require placement a baseline image at: @@ -93,20 +100,21 @@ def assert_images_similar(self, visualizer=None, ax=None, tol=0.01, windows_tol= actual_images/ - visualizer : yellowbrick visualizer + visualizer : yellowbrick visualizer, default: None An instantiated yellowbrick visualizer that has been fitted, transformed and had all operations except for poof called on it. ax : matplotlib Axes, default: None The axis to plot the figure on. - tol : float + tol : float, default: 0.01 The tolerance (a color value difference, where 255 is the maximal difference). The test fails if the average pixel difference is greater than this value. windows_tol: float, default: None - Similar to the tol parameter, but targeted for testing on a windows environment. + Similar to the tol parameter, but targeted for testing on a + windows environment. kwargs : dict Options to pass to the ImageComparison class. @@ -116,7 +124,12 @@ def assert_images_similar(self, visualizer=None, ax=None, tol=0.01, windows_tol= # Build and execute the image comparison compare = ImageComparison( - inspect.stack(), visualizer=visualizer, ax=ax, tol=tol, windows_tol=windows_tol, **kwargs + inspect.stack(), + visualizer=visualizer, + ax=ax, + tol=tol, + windows_tol=windows_tol, + **kwargs ) compare() @@ -182,8 +195,8 @@ class ImageComparison(object): ValueError : at least one of visualizer or ax must be specified. """ - def __init__(self, stack, visualizer=None, ax=None, tol=0.01, - windows_tol=0.01, ext=".png", remove_ticks=True, + def __init__(self, stack, visualizer=None, ax=None, tol=0.01, + windows_tol=0.01, ext=".png", remove_ticks=True, remove_title=True, remove_labels=True, remove_legend=True): # Ensure we have something to draw on @@ -216,10 +229,9 @@ def __init__(self, stack, visualizer=None, ax=None, tol=0.01, # Set the error tolerance depending on the os if os.name == "nt" and windows_tol is not None: self.tol = windows_tol - else: + else: self.tol = tol - # Save other image comparison properties self.ext = ext self.remove_ticks = remove_ticks diff --git a/tests/conftest.py b/tests/conftest.py index d6ffcbe98..b52965bb8 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -18,9 +18,34 @@ ########################################################################## import os +import matplotlib as mpl from pytest_flakes import FlakesItem + +########################################################################## +## Configure tests +########################################################################## + +def pytest_configure(config): + """ + This function is called by pytest for every plugin and conftest file + after the command line arguments have been passed but before the + session object is created and all of the tests are created. It is used + to set a global configuration before all tests are run. + + Yellowbrick uses this function primarily to ensure that the matplotlib + environment is setup correctly for all tests. + """ + # This is redundant with the line in tests/__init__.py but ensures that + # the backend is correctly set across all tests and plugins. + mpl.use('Agg') + + # Travis-CI does not have san-serif so ensure standard fonts are used. + # TODO: this is currently being reset before each test; needs fixing. + mpl.rcParams['font.family'] = 'DejaVu Sans' + + ########################################################################## ## PyTest Hooks ########################################################################## diff --git a/tests/dataset.py b/tests/dataset.py index 5354d912a..544f9664b 100644 --- a/tests/dataset.py +++ b/tests/dataset.py @@ -105,7 +105,7 @@ class DatasetMixin(object): """ - Mixin for unittest.TestCase class to download datasets from S3 for + Mixin for VisualTestCase class to download datasets from S3 for testing real world machine learning visual diagnostics. """ diff --git a/tests/requirements.txt b/tests/requirements.txt index f88565d87..5456d0538 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -15,7 +15,7 @@ requests>=2.18.3 # Optional Testing Dependencies nltk>=3.2 -# spacy>=2.0.18 +# spacy>=2.0.18 pandas>=0.20 umap-learn==0.3 numba==0.42 diff --git a/tests/test_base.py b/tests/test_base.py index d011e4d34..119619e9d 100644 --- a/tests/test_base.py +++ b/tests/test_base.py @@ -31,6 +31,7 @@ from sklearn.datasets import make_classification + ########################################################################## ## Base Cases ########################################################################## diff --git a/tests/test_bestfit.py b/tests/test_bestfit.py index 8641b4a91..77476ee65 100644 --- a/tests/test_bestfit.py +++ b/tests/test_bestfit.py @@ -35,49 +35,49 @@ ## Best fit tests ########################################################################## -class BestFitTests(VisualTestCase): +class TestBestFit(VisualTestCase): def test_bad_estimator(self): """ Test that a bad estimator name raises a value error. """ - fig, axe = plt.subplots() + fig, ax = plt.subplots() X, y = ANSCOMBE[1] - with self.assertRaises(YellowbrickValueError): - draw_best_fit(X, y, axe, 'pepper') + with pytest.raises(YellowbrickValueError): + draw_best_fit(X, y, ax, 'pepper') def test_ensure_same_length(self): """ Ensure that vectors of different lengths raise """ - fig, axe = plt.subplots() + fig, ax = plt.subplots() X = np.array([1, 2, 3, 5, 8, 10, 2]) y = np.array([1, 3, 6, 2]) - with self.assertRaises(YellowbrickValueError): - draw_best_fit(X, y, axe, 'linear') + with pytest.raises(YellowbrickValueError): + draw_best_fit(X, y, ax, 'linear') - with self.assertRaises(YellowbrickValueError): - draw_best_fit(X[:,np.newaxis], y, axe, 'linear') + with pytest.raises(YellowbrickValueError): + draw_best_fit(X[:,np.newaxis], y, ax, 'linear') @pytest.mark.filterwarnings('ignore') - def testdraw_best_fit(self): + def test_draw_best_fit(self): """ Test that drawing a best fit line works. """ - fig, axe = plt.subplots() + fig, ax = plt.subplots() X, y = ANSCOMBE[0] - self.assertEqual(axe, draw_best_fit(X, y, axe, 'linear')) - self.assertEqual(axe, draw_best_fit(X, y, axe, 'quadratic')) + assert ax == draw_best_fit(X, y, ax, 'linear') + assert ax == draw_best_fit(X, y, ax, 'quadratic') ########################################################################## ## Estimator tests ########################################################################## -class EstimatorTests(VisualTestCase): +class TestEstimator(VisualTestCase): """ Test the estimator functions for best fit lines. """ @@ -92,9 +92,8 @@ def test_linear(self): X = X[:,np.newaxis] model = fit_linear(X, y) - self.assertIsNotNone(model) - self.assertIsInstance(model, LinearRegression) - + assert model is not None + assert isinstance(model, LinearRegression) def test_quadratic(self): """ @@ -106,8 +105,8 @@ def test_quadratic(self): X = X[:,np.newaxis] model = fit_quadratic(X, y) - self.assertIsNotNone(model) - self.assertIsInstance(model, Pipeline) + assert model is not None + assert isinstance(model, Pipeline) def test_select_best(self): """ @@ -119,8 +118,8 @@ def test_select_best(self): X = X[:,np.newaxis] model = fit_select_best(X, y) - self.assertIsNotNone(model) - self.assertIsInstance(model, Pipeline) + assert model is not None + assert isinstance(model, Pipeline) X, y = ANSCOMBE[3] X = np.array(X) @@ -128,5 +127,5 @@ def test_select_best(self): X = X[:,np.newaxis] model = fit_select_best(X, y) - self.assertIsNotNone(model) - self.assertIsInstance(model, LinearRegression) + assert model is not None + assert isinstance(model, LinearRegression) diff --git a/tests/test_classifier/__init__.py b/tests/test_classifier/__init__.py index c82b7f039..a07b46aea 100644 --- a/tests/test_classifier/__init__.py +++ b/tests/test_classifier/__init__.py @@ -1,6 +1,13 @@ -#Backend must be set before first use. -# Setting backend here allows us to run tests just in this folder, without running the whole yellowbrick.tests folder -# This command will have no effect if backend has already been set previously. -import matplotlib -matplotlib.use('Agg') +# tests.test_classifier +# Tests for the classifier visualizers +# +# ID: __init__.py [] benjamin@bengfort.com $ + +""" +Tests for the classifier visualizers +""" + +########################################################################## +## Imports +########################################################################## diff --git a/tests/test_classifier/test_class_prediction_error.py b/tests/test_classifier/test_class_prediction_error.py index 826cf3ff0..341e2f4a6 100644 --- a/tests/test_classifier/test_class_prediction_error.py +++ b/tests/test_classifier/test_class_prediction_error.py @@ -45,7 +45,7 @@ ########################################################################## -class ClassPredictionErrorTests(VisualTestCase, DatasetMixin): +class TestClassPredictionError(VisualTestCase, DatasetMixin): def test_integration_class_prediction_error(self): """ @@ -79,7 +79,7 @@ def test_classes_greater_than_indices(self): """ model = LinearSVC() model.fit(X, y) - with self.assertRaises(ModelError): + with pytest.raises(ModelError): visualizer = ClassPredictionError( model, classes=["A", "B", "C", "D", "E"] ) @@ -91,7 +91,7 @@ def test_classes_less_than_indices(self): """ model = LinearSVC() model.fit(X, y) - with self.assertRaises(NotImplementedError): + with pytest.raises(NotImplementedError): visualizer = ClassPredictionError(model, classes=["A"]) visualizer.score(X, y) @@ -109,7 +109,7 @@ def test_class_type(self): X, y = make_multilabel_classification() model = RandomForestClassifier() model.fit(X, y) - with self.assertRaises(YellowbrickValueError): + with pytest.raises(YellowbrickValueError): visualizer = ClassPredictionError(model) visualizer.score(X, y) diff --git a/tests/test_classifier/test_classification_report.py b/tests/test_classifier/test_classification_report.py index 1badee928..52c8b9b69 100644 --- a/tests/test_classifier/test_classification_report.py +++ b/tests/test_classifier/test_classification_report.py @@ -44,7 +44,7 @@ ########################################################################## @pytest.mark.usefixtures("binary", "multiclass") -class ClassificationReportTests(VisualTestCase, DatasetMixin): +class TestClassificationReport(VisualTestCase, DatasetMixin): """ ClassificationReport visualizer tests """ diff --git a/tests/test_classifier/test_confusion_matrix.py b/tests/test_classifier/test_confusion_matrix.py index 7f43beb65..3a3170264 100644 --- a/tests/test_classifier/test_confusion_matrix.py +++ b/tests/test_classifier/test_confusion_matrix.py @@ -68,7 +68,7 @@ def digits(request): ########################################################################## @pytest.mark.usefixtures("digits") -class ConfusionMatrixTests(VisualTestCase): +class TestConfusionMatrix(VisualTestCase): """ Test ConfusionMatrix visualizer """ diff --git a/tests/test_classifier/test_rocauc.py b/tests/test_classifier/test_rocauc.py index dccf2666a..a136ee3d3 100644 --- a/tests/test_classifier/test_rocauc.py +++ b/tests/test_classifier/test_rocauc.py @@ -52,12 +52,29 @@ class FakeClassifier(BaseEstimator, ClassifierMixin): pass +def assert_valid_rocauc_scores(visualizer, nscores=4): + """ + Assertion helper to ensure scores are correctly computed + """ + __tracebackhide__ = True + assert len(visualizer.fpr.keys()) == nscores + assert len(visualizer.tpr.keys()) == nscores + assert len(visualizer.roc_auc.keys()) == nscores + + for k in (0, 1, "micro", "macro"): + assert k in visualizer.fpr + assert k in visualizer.tpr + assert k in visualizer.roc_auc + assert len(visualizer.fpr[k]) == len(visualizer.tpr[k]) + assert 0.0 < visualizer.roc_auc[k] < 1.0 + + ########################################################################## ## Tests ########################################################################## @pytest.mark.usefixtures("binary", "multiclass") -class ROCAUCTests(VisualTestCase, DatasetMixin): +class TestROCAUC(VisualTestCase, DatasetMixin): def test_binary_probability(self): """ @@ -74,20 +91,10 @@ def test_binary_probability(self): assert 0 <= s <= 1 # Check the scores - self.assertEqual(len(visualizer.fpr.keys()), 4) - self.assertEqual(len(visualizer.tpr.keys()), 4) - self.assertEqual(len(visualizer.roc_auc.keys()), 4) - - for k in (0, 1, "micro", "macro"): - self.assertIn(k, visualizer.fpr) - self.assertIn(k, visualizer.tpr) - self.assertIn(k, visualizer.roc_auc) - self.assertEqual(len(visualizer.fpr[k]), len(visualizer.tpr[k])) - self.assertGreater(visualizer.roc_auc[k], 0.0) - self.assertLess(visualizer.roc_auc[k], 1.0) + assert_valid_rocauc_scores(visualizer) # Compare the images - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer, tol=TOL) def test_binary_probability_decision(self): @@ -105,20 +112,10 @@ def test_binary_probability_decision(self): assert 0 <= s <= 1 # Check the scores - self.assertEqual(len(visualizer.fpr.keys()), 4) - self.assertEqual(len(visualizer.tpr.keys()), 4) - self.assertEqual(len(visualizer.roc_auc.keys()), 4) - - for k in (0, 1, "micro", "macro"): - self.assertIn(k, visualizer.fpr) - self.assertIn(k, visualizer.tpr) - self.assertIn(k, visualizer.roc_auc) - self.assertEqual(len(visualizer.fpr[k]), len(visualizer.tpr[k])) - self.assertGreater(visualizer.roc_auc[k], 0.0) - self.assertLess(visualizer.roc_auc[k], 1.0) + assert_valid_rocauc_scores(visualizer) # Compare the images - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer, tol=TOL) def test_binary_decision(self): @@ -136,13 +133,13 @@ def test_binary_decision(self): assert 0 <= s <= 1 # Check the scores - self.assertEqual(len(visualizer.fpr.keys()), 1) - self.assertEqual(len(visualizer.tpr.keys()), 1) - self.assertEqual(len(visualizer.roc_auc.keys()), 1) + assert len(visualizer.fpr.keys()) == 1 + assert len(visualizer.tpr.keys()) == 1 + assert len(visualizer.roc_auc.keys()) == 1 # Compare the images # NOTE: increased tolerance for both AppVeyor and Travis CI tests - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer, tol=10) def test_binary_micro_error(self): @@ -154,7 +151,7 @@ def test_binary_micro_error(self): visualizer.fit(self.binary.X.train, self.binary.y.train) # Ensure score raises error (micro curves aren't defined for binary decisions) - with self.assertRaises(ModelError): + with pytest.raises(ModelError): visualizer.score(self.binary.X.test, self.binary.y.test) def test_binary_macro_error(self): @@ -166,7 +163,7 @@ def test_binary_macro_error(self): visualizer.fit(self.binary.X.train, self.binary.y.train) # Ensure score raises error (macro curves aren't defined for binary decisions) - with self.assertRaises(ModelError): + with pytest.raises(ModelError): visualizer.score(self.binary.X.test, self.binary.y.test) def test_binary_per_class_error(self): @@ -178,7 +175,7 @@ def test_binary_per_class_error(self): visualizer.fit(self.binary.X.train, self.binary.y.train) # Ensure score raises error (per_class curves not defined for binary decisions) - with self.assertRaises(ModelError): + with pytest.raises(ModelError): visualizer.score(self.binary.X.test, self.binary.y.test) def test_multiclass_rocauc(self): @@ -196,20 +193,10 @@ def test_multiclass_rocauc(self): assert 0 <= s <= 1 # Check the scores - self.assertEqual(len(visualizer.fpr.keys()), 8) - self.assertEqual(len(visualizer.tpr.keys()), 8) - self.assertEqual(len(visualizer.roc_auc.keys()), 8) - - for k in (0, 1, "micro", "macro"): - self.assertIn(k, visualizer.fpr) - self.assertIn(k, visualizer.tpr) - self.assertIn(k, visualizer.roc_auc) - self.assertEqual(len(visualizer.fpr[k]), len(visualizer.tpr[k])) - self.assertGreater(visualizer.roc_auc[k], 0.0) - self.assertLess(visualizer.roc_auc[k], 1.0) + assert_valid_rocauc_scores(visualizer, nscores=8) # Compare the images - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer, tol=TOL) def test_rocauc_quickmethod(self): @@ -232,15 +219,15 @@ def test_rocauc_no_micro(self): # Score the visualizer (should be the macro average) s = visualizer.score(self.binary.X.test, self.binary.y.test) - self.assertAlmostEqual(s, 0.8) + assert s == pytest.approx(0.8) # Assert that there is no micro score - self.assertNotIn("micro", visualizer.fpr) - self.assertNotIn("micro", visualizer.tpr) - self.assertNotIn("micro", visualizer.roc_auc) + assert "micro" not in visualizer.fpr + assert "micro" not in visualizer.tpr + assert "micro" not in visualizer.roc_auc # Compare the images - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer, tol=TOL) def test_rocauc_no_macro(self): @@ -253,15 +240,15 @@ def test_rocauc_no_macro(self): # Score the visualizer (should be the micro average) s = visualizer.score(self.binary.X.test, self.binary.y.test) - self.assertAlmostEqual(s, 0.8) + assert s == pytest.approx(0.8) # Assert that there is no macro score - self.assertNotIn("macro", visualizer.fpr) - self.assertNotIn("macro", visualizer.tpr) - self.assertNotIn("macro", visualizer.roc_auc) + assert "macro" not in visualizer.fpr + assert "macro" not in visualizer.tpr + assert "macro" not in visualizer.roc_auc # Compare the images - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer, tol=TOL) def test_rocauc_no_macro_no_micro(self): @@ -274,20 +261,20 @@ def test_rocauc_no_macro_no_micro(self): # Score the visualizer (should be the F1 score) s = visualizer.score(self.binary.X.test, self.binary.y.test) - self.assertAlmostEqual(s, 0.8) + assert s == pytest.approx(0.8) # Assert that there is no macro score - self.assertNotIn("macro", visualizer.fpr) - self.assertNotIn("macro", visualizer.tpr) - self.assertNotIn("macro", visualizer.roc_auc) + assert "macro" not in visualizer.fpr + assert "macro" not in visualizer.tpr + assert "macro" not in visualizer.roc_auc # Assert that there is no micro score - self.assertNotIn("micro", visualizer.fpr) - self.assertNotIn("micro", visualizer.tpr) - self.assertNotIn("micro", visualizer.roc_auc) + assert "micro" not in visualizer.fpr + assert "micro" not in visualizer.tpr + assert "micro" not in visualizer.roc_auc # Compare the images - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer, tol=TOL) def test_rocauc_no_classes(self): @@ -300,16 +287,16 @@ def test_rocauc_no_classes(self): # Score the visualizer (should be the micro average) s = visualizer.score(self.binary.X.test, self.binary.y.test) - self.assertAlmostEqual(s, 0.8) + assert s == pytest.approx(0.8) # Assert that there still are per-class scores for c in (0, 1): - self.assertIn(c, visualizer.fpr) - self.assertIn(c, visualizer.tpr) - self.assertIn(c, visualizer.roc_auc) + assert c in visualizer.fpr + assert c in visualizer.tpr + assert c in visualizer.roc_auc # Compare the images - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer, tol=TOL) def test_rocauc_no_curves(self): @@ -336,7 +323,7 @@ def test_rocauc_label_encoded(self): # Score the visualizer visualizer.score(self.multiclass.X.test, self.multiclass.y.test) - self.assertEqual(list(visualizer.classes_), class_labels) + assert list(visualizer.classes_) == class_labels def test_rocauc_not_label_encoded(self): """ @@ -352,7 +339,7 @@ def test_rocauc_not_label_encoded(self): visualizer.fit(self.multiclass.X.train, y_train) # Confirm that y_train and y_test have the same targets before calling score - self.assertEqual(set(y_train), set(y_test)) + assert set(y_train) == set(y_test) def test_binary_decision_function_rocauc(self): """ @@ -360,7 +347,7 @@ def test_binary_decision_function_rocauc(self): """ # Load the model and assert there is no predict_proba method. model = LinearSVC() - with self.assertRaises(AttributeError): + with pytest.raises(AttributeError): model.predict_proba # Fit model and visualizer @@ -384,7 +371,7 @@ def test_multi_decision_function_rocauc(self): """ # Load the model and assert there is no predict_proba method. model = LinearSVC() - with self.assertRaises(AttributeError): + with pytest.raises(AttributeError): model.predict_proba # Fit model and visualizer @@ -412,7 +399,7 @@ def test_predict_proba_rocauc(self): """ # Load the model and assert there is no decision_function method. model = GaussianNB() - with self.assertRaises(AttributeError): + with pytest.raises(AttributeError): model.decision_function # Fit model and visualizer @@ -444,5 +431,5 @@ def test_no_scoring_function(self): Test ROCAUC with classifiers that have no scoring method """ visualizer = ROCAUC(FakeClassifier()) - with self.assertRaises(ModelError): + with pytest.raises(ModelError): visualizer._get_y_scores(self.binary.X.train) diff --git a/tests/test_classifier/test_threshold.py b/tests/test_classifier/test_threshold.py index 8a4907777..3e06ae6b9 100644 --- a/tests/test_classifier/test_threshold.py +++ b/tests/test_classifier/test_threshold.py @@ -72,7 +72,7 @@ def test_binary_discrimination_threshold(self): visualizer = DiscriminationThreshold(model, ax=ax, random_state=23) visualizer.fit(X, y) - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer) @@ -119,7 +119,7 @@ def test_pandas_integration(self): LogisticRegression(), ax=ax, classes=classes, random_state=193 ) viz.fit(X, y) - viz.poof() + viz.finalize() self.assert_images_similar(viz, tol=0.1) @@ -184,7 +184,7 @@ def test_binary_discrimination_threshold_alt_args(self): ) visualizer.fit(X, y) - visualizer.poof() + visualizer.finalize() for metric in exclude: assert metric not in visualizer.cv_scores_ diff --git a/tests/test_cluster/test_base.py b/tests/test_cluster/test_base.py index 66d91ada8..41aa4c1bd 100644 --- a/tests/test_cluster/test_base.py +++ b/tests/test_cluster/test_base.py @@ -17,7 +17,7 @@ ## Imports ########################################################################## -import unittest +import pytest from yellowbrick.exceptions import YellowbrickTypeError from yellowbrick.cluster.base import ClusteringScoreVisualizer @@ -28,30 +28,31 @@ from sklearn.cluster import KMeans, MiniBatchKMeans, AffinityPropagation from sklearn.cluster import MeanShift, DBSCAN, Birch + ########################################################################## ## Clustering Base Test Cases ########################################################################## -class ClusterBaseTests(unittest.TestCase): +class TestClusterBase(object): + + @pytest.mark.parametrize("model", [ + SVC, SVR, Ridge, RidgeCV, LinearRegression, RandomForestClassifier + ]) + def test_clusterer_enforcement_raises(self, model): + """ + Assert that non-cluster models raise a TypeError for cluster visualizers + """ + with pytest.raises(YellowbrickTypeError): + ClusteringScoreVisualizer(model()) - def test_clusterer_enforcement(self): + @pytest.mark.parametrize("model", [ + KMeans, MiniBatchKMeans, AffinityPropagation, MeanShift, DBSCAN, Birch + ]) + def test_clusterer_enforcement(self, model): """ Assert that only clustering estimators can be passed to cluster viz """ - nomodels = [ - SVC, SVR, Ridge, RidgeCV, LinearRegression, RandomForestClassifier - ] - - for nomodel in nomodels: - with self.assertRaises(YellowbrickTypeError): - ClusteringScoreVisualizer(nomodel()) - - models = [ - KMeans, MiniBatchKMeans, AffinityPropagation, MeanShift, DBSCAN, Birch - ] - - for model in models: - try: - ClusteringScoreVisualizer(model()) - except YellowbrickTypeError: - self.fail("could not pass clustering estimator to visualizer") + try: + ClusteringScoreVisualizer(model()) + except YellowbrickTypeError: + self.fail("could not pass clustering estimator to visualizer") diff --git a/tests/test_cluster/test_elbow.py b/tests/test_cluster/test_elbow.py index 5cfcf0d8a..77cf72c0b 100644 --- a/tests/test_cluster/test_elbow.py +++ b/tests/test_cluster/test_elbow.py @@ -143,7 +143,7 @@ def test_integrated_kmeans_elbow(self): visualizer = KElbowVisualizer(KMeans(random_state=42), k=4, ax=ax) visualizer.fit(X) - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer) except Exception as e: @@ -157,7 +157,7 @@ def test_integrated_mini_batch_kmeans_elbow(self): # NOTE #182: cannot use occupancy dataset because of memory usage # Generate a blobs data set - X,y = make_blobs( + X, y = make_blobs( n_samples=1000, n_features=12, centers=6, shuffle=True, random_state=42 ) @@ -168,7 +168,7 @@ def test_integrated_mini_batch_kmeans_elbow(self): MiniBatchKMeans(random_state=42), k=4, ax=ax ) visualizer.fit(X) - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer) except Exception as e: @@ -186,7 +186,7 @@ def test_topic_modeling_k_means(self): visualizer = KElbowVisualizer(KMeans(), k=(4, 8)) visualizer.fit(docs) - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer) @@ -236,7 +236,7 @@ def test_distortion_metric(self): expected = np.array([ 69.100065, 54.081571, 43.146921, 34.978487]) assert len(visualizer.k_scores_) == 4 - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer) assert_array_almost_equal(visualizer.k_scores_, expected) @@ -255,7 +255,7 @@ def test_silhouette_metric(self): expected = np.array([ 0.691636, 0.456646, 0.255174, 0.239842]) assert len(visualizer.k_scores_) == 4 - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer) assert_array_almost_equal(visualizer.k_scores_, expected) @@ -279,13 +279,13 @@ def test_calinski_harabasz_metric(self): 40.952179227847012, 35.939494 ]) - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer) assert_array_almost_equal(visualizer.k_scores_, expected) def test_locate_elbow(self): """ - Test the addition of locate_elbow to an image + Test the addition of locate_elbow to an image """ X,y = make_blobs( n_samples=1000, n_features=5, centers=3, shuffle=True, random_state=42 @@ -303,7 +303,7 @@ def test_locate_elbow(self): 4286.479848, 12463.383743, 8766.999551, 6950.08391, 5865.79722 ]) - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer, windows_tol=2.2) assert_array_almost_equal(visualizer.k_scores_, expected) @@ -347,6 +347,6 @@ def test_timings(self): # call draw again which is normally called in fit visualizer.draw() - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer) diff --git a/tests/test_cluster/test_silhouette.py b/tests/test_cluster/test_silhouette.py index 9538ec280..bdbd9b47d 100644 --- a/tests/test_cluster/test_silhouette.py +++ b/tests/test_cluster/test_silhouette.py @@ -34,9 +34,9 @@ ## SilhouetteVisualizer Test Cases ########################################################################## -class SilhouetteVisualizerTests(VisualTestCase): +class TestSilhouetteVisualizer(VisualTestCase): """ - Silhouette Visualizer + Silhouette Visualizer Tests """ @pytest.mark.xfail( @@ -59,7 +59,7 @@ def test_integrated_kmeans_silhouette(self): visualizer = SilhouetteVisualizer(KMeans(random_state=0), ax=ax) visualizer.fit(X) - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer, remove_legend=True) except Exception as e: @@ -85,7 +85,7 @@ def test_integrated_mini_batch_kmeans_silhouette(self): visualizer = SilhouetteVisualizer(MiniBatchKMeans(random_state=0), ax=ax) visualizer.fit(X) - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer, remove_legend=True) except Exception as e: @@ -118,7 +118,7 @@ def test_colormap_silhouette(self): visualizer = SilhouetteVisualizer(MiniBatchKMeans(random_state=0), ax=ax, colormap='gnuplot') visualizer.fit(X) - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer, remove_legend=True) except Exception as e: @@ -145,7 +145,7 @@ def test_colors_silhouette(self): colors=['red', 'green', 'blue', 'indigo', 'cyan', 'lavender'] ) visualizer.fit(X) - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer, remove_legend=True) except Exception as e: @@ -167,7 +167,7 @@ def test_colormap_as_colors_silhouette(self): visualizer = SilhouetteVisualizer(MiniBatchKMeans(random_state=0), ax=ax, colors='cool') visualizer.fit(X) - visualizer.poof() + visualizer.finalize() tol = 3.2 if sys.platform == "win32" else 0.01 # Fails on AppVeyor with RMS 3.143 self.assert_images_similar(visualizer, remove_legend=True, tol=tol) diff --git a/tests/test_contrib/test_classifier/test_boundaries.py b/tests/test_contrib/test_classifier/test_boundaries.py index 301fc3a78..e2fa24256 100644 --- a/tests/test_contrib/test_classifier/test_boundaries.py +++ b/tests/test_contrib/test_classifier/test_boundaries.py @@ -66,7 +66,7 @@ @pytest.mark.filterwarnings('ignore') -class DecisionBoundariesVisualizerTest(VisualTestCase): +class TestDecisionBoundariesVisualizer(VisualTestCase): """ Test DecisionBoundariesVisualizer """ @@ -102,24 +102,23 @@ def test_init(self): model = neighbors.KNeighborsClassifier(3) viz = DecisionBoundariesVisualizer(model) - self.assertEquals(viz.step_size, 0.0025) - self.assertEqual(viz.name, 'KNeighborsClassifier') - self.assertEqual(viz.estimator, model) + assert viz.step_size == 0.0025 + assert viz.name == 'KNeighborsClassifier' + assert viz.estimator is model - self.assertIsNone(viz.classes_) - self.assertIsNone(viz.features_) - self.assertIsNotNone(viz.markers) - self.assertIsNotNone(viz.scatter_alpha) - self.assertTrue(viz.show_scatter) - - self.assertIsNone(viz.Z) - self.assertIsNone(viz.xx) - self.assertIsNone(viz.yy) - self.assertIsNone(viz.class_labels) - self.assertIsNone(viz.title) - self.assertIsNone(viz.x) - self.assertIsNone(viz.y) + assert viz.classes_ is None + assert viz.features_ is None + assert viz.markers is not None + assert viz.scatter_alpha is not None + assert viz.show_scatter is True + assert viz.Z is None + assert viz.xx is None + assert viz.yy is None + assert viz.class_labels is None + assert viz.title is None + assert viz.x is None + assert viz.y is None def test_scatter_xy_and_features_raise_error(self): """ @@ -128,7 +127,7 @@ def test_scatter_xy_and_features_raise_error(self): model = neighbors.KNeighborsClassifier(3) features = ["temperature", "relative_humidity", "light"] - with self.assertRaises(YellowbrickValueError): + with pytest.raises(YellowbrickValueError): DecisionBoundariesVisualizer( model, features=features, x='one', y='two' ) @@ -139,8 +138,7 @@ def test_scatter_xy_changes_to_features(self): """ model = neighbors.KNeighborsClassifier(3) visualizer = DecisionBoundariesVisualizer(model, x='one', y='two') - self.assertEquals(visualizer.features_, ['one', 'two']) - + assert visualizer.features_ == ['one', 'two'] def test_fit(self): """ @@ -154,17 +152,17 @@ def test_fit(self): fitted_viz = viz.fit(X_two_cols, y=y) # assert that classes and labels are established - self.assertEqual(fitted_viz.classes_, {0: '0', 1: '1', 2: '2', 3: '3'}) - self.assertEqual(fitted_viz.features_, ['Feature One', 'Feature Two']) + assert fitted_viz.classes_ == {0: '0', 1: '1', 2: '2', 3: '3'} + assert fitted_viz.features_ == ['Feature One', 'Feature Two'] # assert that the fit method is called model.fit.assert_called_once_with(X_two_cols, y) # mock object is called twice in predict and reshape - self.assertEqual(len(model.predict.mock_calls), 2) + assert len(model.predict.mock_calls) == 2 # test that attrs are set - self.assertIsNotNone(fitted_viz.ax) - self.assertIsNotNone(fitted_viz.Z_shape) + assert fitted_viz.ax is not None + assert fitted_viz.Z_shape is not None def test_fit_class_labels(self): """ @@ -174,11 +172,7 @@ def test_fit_class_labels(self): viz = DecisionBoundariesVisualizer( model, classes=['one', 'two', 'three', 'four']) fitted_viz = viz.fit(X_two_cols, y=y) - self.assertEquals(fitted_viz.classes_, - {'three': '2', - 'four': '3', - 'two': '1', - 'one': '0'}) + assert fitted_viz.classes_ == {'three': '2', 'four': '3', 'two': '1', 'one': '0'} def test_fit_class_labels_class_names_edge_case(self): """ @@ -187,7 +181,9 @@ def test_fit_class_labels_class_names_edge_case(self): model = neighbors.KNeighborsClassifier(3) viz = DecisionBoundariesVisualizer( model, classes=['one', 'two', 'three', 'four', 'five']) - self.assertRaises(YellowbrickTypeError, viz.fit, X_two_cols, y=y) + + with pytest.raises(YellowbrickTypeError): + viz.fit(X_two_cols, y=y) def test_fit_features_assignment_None(self): """ @@ -195,9 +191,9 @@ def test_fit_features_assignment_None(self): """ model = neighbors.KNeighborsClassifier(3) viz = DecisionBoundariesVisualizer(model) - self.assertIsNone(viz.features_) + assert viz.features_ is None fitted_viz = viz.fit(X_two_cols, y=y) - self.assertEquals(fitted_viz.features_, ['Feature One', 'Feature Two']) + assert fitted_viz.features_ == ['Feature One', 'Feature Two'] def test_fit_features_assignment(self): """ @@ -206,7 +202,7 @@ def test_fit_features_assignment(self): model = neighbors.KNeighborsClassifier(3) viz = DecisionBoundariesVisualizer(model, features=['one', 'two']) fitted_viz = viz.fit(X_two_cols, y=y) - self.assertEquals(fitted_viz.features_, ['one', 'two']) + assert fitted_viz.features_ == ['one', 'two'] @mock.patch("yellowbrick.contrib.classifier.boundaries.OrderedDict") def test_draw_ordereddict_calls(self, mock_odict): @@ -216,8 +212,11 @@ def test_draw_ordereddict_calls(self, mock_odict): mock_odict.return_value = {} model = neighbors.KNeighborsClassifier(3) viz = DecisionBoundariesVisualizer(model, features=['one', 'two']) - self.assertRaises(KeyError, viz.fit_draw, X_two_cols, y=y) - self.assertEquals(len(mock_odict.mock_calls), 2) + + with pytest.raises(KeyError): + viz.fit_draw(X_two_cols, y=y) + + assert len(mock_odict.mock_calls) == 2 @mock.patch("yellowbrick.contrib.classifier.boundaries.resolve_colors") def test_draw_ordereddict_calls_one(self, mock_resolve_colors): @@ -227,8 +226,11 @@ def test_draw_ordereddict_calls_one(self, mock_resolve_colors): mock_resolve_colors.return_value = [] model = neighbors.KNeighborsClassifier(3) viz = DecisionBoundariesVisualizer(model, features=['one', 'two']) - self.assertRaises(StopIteration, viz.fit_draw, X_two_cols, y=y) - self.assertEquals(len(mock_resolve_colors.mock_calls), 1) + + with pytest.raises(StopIteration): + viz.fit_draw(X_two_cols, y=y) + + assert len(mock_resolve_colors.mock_calls) == 1 def test_draw_ax_show_scatter_true(self): """ @@ -243,9 +245,9 @@ def test_draw_ax_show_scatter_true(self): fitted_viz.ax.legend = mock.MagicMock() fitted_viz.draw(X_two_cols, y=y) - self.assertEquals(len(fitted_viz.ax.pcolormesh.mock_calls), 1) - self.assertEquals(len(fitted_viz.ax.scatter.mock_calls), 4) - self.assertEquals(len(fitted_viz.ax.legend.mock_calls), 0) + assert len(fitted_viz.ax.pcolormesh.mock_calls) == 1 + assert len(fitted_viz.ax.scatter.mock_calls) == 4 + assert len(fitted_viz.ax.legend.mock_calls) == 0 def test_draw_ax_show_scatter_False(self): """ @@ -261,9 +263,9 @@ def test_draw_ax_show_scatter_False(self): fitted_viz.ax.legend = mock.MagicMock() fitted_viz.draw(X_two_cols, y=y) - self.assertEquals(len(fitted_viz.ax.pcolormesh.mock_calls), 1) - self.assertEquals(len(fitted_viz.ax.scatter.mock_calls), 0) - self.assertEquals(len(fitted_viz.ax.legend.mock_calls), 1) + assert len(fitted_viz.ax.pcolormesh.mock_calls) == 1 + assert len(fitted_viz.ax.scatter.mock_calls) == 0 + assert len(fitted_viz.ax.legend.mock_calls) == 1 def test_finalize(self): """ @@ -280,7 +282,7 @@ def test_finalize(self): fitted_viz.ax.set_xlabel = mock.MagicMock() fitted_viz.ax.set_ylabel = mock.MagicMock() - fitted_viz.poof() + fitted_viz.finalize() fitted_viz.ax.legend.assert_called_once_with(loc='best', frameon=True) fitted_viz.ax.set_xlabel.assert_called_once_with('one') @@ -345,7 +347,7 @@ def test_integrated_plot_numpy_named_arrays(self): visualizer = DecisionBoundariesVisualizer(model, features=['a', 'f']) visualizer.fit_draw_poof(X, y=y) - self.assertEquals(visualizer.features_, ['a', 'f']) + assert visualizer.features_ == ['a', 'f'] self.assert_images_similar(visualizer) def test_integrated_scatter_numpy_arrays_no_names(self): @@ -356,7 +358,7 @@ def test_integrated_scatter_numpy_arrays_no_names(self): visualizer = DecisionBoundariesVisualizer(model, features=[1, 2]) visualizer.fit_draw_poof(X, y) - self.assertEquals(visualizer.features_, [1, 2]) + assert visualizer.features_ == [1, 2] @pytest.mark.xfail( sys.platform == 'win32', reason="images not close on windows" diff --git a/tests/test_contrib/test_missing/test_bar.py b/tests/test_contrib/test_missing/test_bar.py index 0ab1ee3d4..5c92a02a1 100644 --- a/tests/test_contrib/test_missing/test_bar.py +++ b/tests/test_contrib/test_missing/test_bar.py @@ -18,6 +18,9 @@ ########################################################################## import os +import pytest +import numpy as np + from tests.base import VisualTestCase from sklearn.datasets import make_classification from yellowbrick.contrib.missing.bar import * @@ -27,21 +30,22 @@ except ImportError: pd = None + +@pytest.fixture(scope="class") +def missing_bar_tolerance(request): + request.cls.tol = 0.5 if os.name == 'nt' else 0.01 + + ########################################################################## ## Feature Importances Tests ########################################################################## +@pytest.mark.usefixtures("missing_bar_tolerance") class TestMissingBarVisualizer(VisualTestCase): """ FeatureImportances visualizer """ - def setUp(self): - super(TestMissingBarVisualizer, self).setUp() - self.tol = 0.01 - if os.name == 'nt': # Windows - self.tol = 0.5 - def test_missingvaluesbar_pandas(self): """ Integration test of visualizer with pandas @@ -58,11 +62,10 @@ def test_missingvaluesbar_pandas(self): features = [str(n) for n in range(20)] viz = MissingValuesBar(features=features) viz.fit(X_) - viz.poof() + viz.finalize() self.assert_images_similar(viz, tol=self.tol) - def test_missingvaluesbar_numpy(self): """ Integration test of visualizer with numpy without target y passed in @@ -78,7 +81,7 @@ def test_missingvaluesbar_numpy(self): features = [str(n) for n in range(20)] viz = MissingValuesBar(features=features) viz.fit(X) - viz.poof() + viz.finalize() self.assert_images_similar(viz, tol=self.tol) @@ -98,7 +101,7 @@ def test_missingvaluesbar_numpy_with_y_target(self): features = [str(n) for n in range(20)] viz = MissingValuesBar(features=features) viz.fit(X, y) - viz.poof() + viz.finalize() self.assert_images_similar(viz, tol=self.tol) @@ -118,6 +121,6 @@ def test_missingvaluesbar_numpy_with_y_target_with_labels(self): features = [str(n) for n in range(20)] viz = MissingValuesBar(features=features, classes=['class A', 'class B']) viz.fit(X, y) - viz.poof() + viz.finalize() self.assert_images_similar(viz, tol=self.tol) diff --git a/tests/test_contrib/test_missing/test_dispersion.py b/tests/test_contrib/test_missing/test_dispersion.py index 0636f7a70..7735c67e8 100644 --- a/tests/test_contrib/test_missing/test_dispersion.py +++ b/tests/test_contrib/test_missing/test_dispersion.py @@ -16,7 +16,10 @@ ########################################################################## ## Imports ########################################################################## + import os +import pytest + from sklearn.datasets import make_classification from tests.base import VisualTestCase @@ -27,20 +30,21 @@ except ImportError: pd = None + +@pytest.fixture(scope="class") +def missing_dispersion_tolerance(request): + request.cls.tol = 0.5 if os.name == 'nt' else 0.01 + + ########################################################################## ## Feature Importances Tests ########################################################################## -class MissingValuesDispersionTestCase(VisualTestCase): +@pytest.mark.usefixtures("missing_dispersion_tolerance") +class TestMissingValuesDispersion(VisualTestCase): """ MissingValuesDispersion visualizer """ - def setUp(self): - super(MissingValuesDispersionTestCase, self).setUp() - self.tol = 0.01 - if os.name == 'nt': # Windows - self.tol = 5.0 - def test_missingvaluesdispersion_with_pandas(self): """ @@ -58,7 +62,7 @@ def test_missingvaluesdispersion_with_pandas(self): features = [str(n) for n in range(20)] viz = MissingValuesDispersion(features=features) viz.fit(X_) - viz.poof() + viz.finalize() self.assert_images_similar(viz, tol=self.tol) @@ -79,11 +83,10 @@ def test_missingvaluesdispersion_with_pandas_with_y_targets(self): classes = ['Class A', 'Class B'] viz = MissingValuesDispersion(features=features, classes=classes) viz.fit(X_, y=y) - viz.poof() + viz.finalize() self.assert_images_similar(viz, tol=self.tol) - def test_missingvaluesdispersion_with_numpy(self): """ Integration test of visualizer with numpy @@ -99,7 +102,7 @@ def test_missingvaluesdispersion_with_numpy(self): features = [str(n) for n in range(20)] viz = MissingValuesDispersion(features=features) viz.fit(X) - viz.poof() + viz.finalize() self.assert_images_similar(viz, tol=self.tol) @@ -119,6 +122,6 @@ def test_missingvaluesdispersion_with_numpy_with_y_targets(self): classes = ['Class A', 'Class B'] viz = MissingValuesDispersion(features=features, classes=classes) viz.fit(X, y=y) - viz.poof() + viz.finalize() self.assert_images_similar(viz, tol=self.tol) diff --git a/tests/test_contrib/test_scatter.py b/tests/test_contrib/test_scatter.py index 86f6d657a..1d6bb9bd6 100644 --- a/tests/test_contrib/test_scatter.py +++ b/tests/test_contrib/test_scatter.py @@ -16,11 +16,10 @@ # Imports ########################################################################## -from unittest import mock - -import matplotlib as mpl import pytest +import matplotlib as mpl +from unittest import mock from tests.base import VisualTestCase from yellowbrick.contrib.scatter import * from yellowbrick.datasets import load_occupancy @@ -38,7 +37,7 @@ ########################################################################## @pytest.mark.filterwarnings('ignore') -class ScatterVizTests(VisualTestCase): +class TestScatterViz(VisualTestCase): """ Test ScatterViz """ @@ -61,7 +60,7 @@ def test_init_alias(self): """ features = ["temperature", "relative humidity"] visualizer = ScatterVisualizer(features=features, markers=['*']) - self.assertIsNotNone(visualizer.markers) + assert visualizer.markers is not None def test_scatter(self): """ @@ -89,7 +88,7 @@ def test_scatter_no_features(self): X_two_cols = self.X[:, :2] visualizer = ScatterViz() visualizer.fit_transform_poof(X_two_cols, self.y) - self.assertEquals(visualizer.features_, ['Feature One', 'Feature Two']) + assert visualizer.features_ == ['Feature One', 'Feature Two'] def test_scatter_only_two_features_allowed_init(self): """ @@ -97,7 +96,7 @@ def test_scatter_only_two_features_allowed_init(self): """ features = ["temperature", "relative humidity", "light"] - with self.assertRaises(YellowbrickValueError): + with pytest.raises(YellowbrickValueError): ScatterViz(features=features) def test_scatter_xy_and_features_raise_error(self): @@ -106,7 +105,7 @@ def test_scatter_xy_and_features_raise_error(self): """ features = ["temperature", "relative humidity", "light"] - with self.assertRaises(YellowbrickValueError): + with pytest.raises(YellowbrickValueError): ScatterViz(features=features, x='one', y='two') def test_scatter_xy_changes_to_features(self): @@ -114,17 +113,15 @@ def test_scatter_xy_changes_to_features(self): Assert that x,y with no features will not raise scatterviz error """ visualizer = ScatterViz(x='one', y='two') - self.assertEquals(visualizer.features_, ['one', 'two']) + assert visualizer.features_ == ['one', 'two'] def test_scatter_requires_two_features_in_numpy_matrix(self): """ Assert only two features allowed for scatter visualizer if not in init """ visualizer = ScatterViz() - with self.assertRaises(YellowbrickValueError) as context: + with pytest.raises(YellowbrickValueError, match='only accepts two features'): visualizer.fit_transform(self.X, self.y) - self.assertTrue( - 'only accepts two features' in str(context.exception)) def test_integrated_scatter(self): """ @@ -170,7 +167,7 @@ def test_scatter_quick_method(self): ax = scatterviz(X[:, :2], y=y, ax=None, features=features) # test that is returns a matplotlib obj with axes - self.assertIsInstance(ax, mpl.axes.Axes) + assert isinstance(ax, mpl.axes.Axes) @pytest.mark.skipif(pd is None, reason="pandas is required for this test") def test_integrated_scatter_with_pandas(self): @@ -205,7 +202,7 @@ def test_integrated_scatter_numpy_named_arrays(self): X_named = self.X.astype(dt, casting='unsafe') visualizer = ScatterViz(features=['one', 'two']) visualizer.fit_transform_poof(X_named, self.y) - self.assertEquals(visualizer.features_, ['one', 'two']) + assert visualizer.features_ == ['one', 'two'] def test_integrated_scatter_numpy_arrays_no_names(self): """ @@ -213,7 +210,7 @@ def test_integrated_scatter_numpy_arrays_no_names(self): """ visualizer = ScatterViz(features=[1, 2]) visualizer.fit_transform_poof(self.X, self.y) - self.assertEquals(visualizer.features_, [1, 2]) + assert visualizer.features_ == [1, 2] def test_scatter_image(self): """ diff --git a/tests/test_draw.py b/tests/test_draw.py index a7a111961..fc740a059 100644 --- a/tests/test_draw.py +++ b/tests/test_draw.py @@ -36,14 +36,14 @@ def test_manual_legend_uneven_colors(): @pytest.fixture(scope="class") def data(request): - + data = np.array( [[4, 8, 7, 6, 5, 2, 1], [6, 7, 9, 6, 9, 3, 6], [5, 1, 6, 8, 4, 7, 8], [6, 8, 1, 5, 6, 7, 4]] ) - + request.cls.data = data ########################################################################## @@ -83,80 +83,79 @@ def test_manual_legend(self): def test_vertical_bar_stack(self): """ - Test bar_stack for vertical orientation + Test bar_stack for vertical orientation """ _, ax = plt.subplots() - + # Plots stacked bar charts bar_stack(self.data, ax=ax, orientation='v') - + # Assert image similarity self.assert_images_similar(ax=ax, tol=0.1) - + def test_horizontal_bar_stack(self): """ - Test bar_stack for horizontal orientation + Test bar_stack for horizontal orientation """ _, ax = plt.subplots() # Plots stacked bar charts bar_stack(self.data, ax=ax, orientation='h') - + # Assert image similarity self.assert_images_similar(ax=ax, tol=0.1) - + def test_single_row_bar_stack(self): """ - Test bar_stack for single row - """ + Test bar_stack for single row + """ data = np.array([[4, 8, 7, 6, 5, 2, 1]]) - + _, ax = plt.subplots() - + # Plots stacked bar charts bar_stack(data, ax=ax) - + # Assert image similarity self.assert_images_similar(ax=ax, tol=0.1) - + def test_labels_vertical(self): """ Test labels and ticks for vertical barcharts - """ + """ labels = ['books', 'cinema', 'cooking', 'gaming'] - ticks = ['noun', 'verb', 'adverb', 'pronoun', 'preposition', + ticks = ['noun', 'verb', 'adverb', 'pronoun', 'preposition', 'digit', 'other'] _, ax = plt.subplots() - + # Plots stacked bar charts - bar_stack(self.data, labels = labels, ticks=ticks, + bar_stack(self.data, labels = labels, ticks=ticks, colors=['r','b','g','y']) - + # Extract tick labels from the plot ticks_ax = [tick.get_text() for tick in ax.xaxis.get_ticklabels()] #Assert that ticks are set properly assert ticks_ax==ticks - + # Assert image similarity self.assert_images_similar(ax=ax, tol=0.05) - + def test_labels_horizontal(self): """ Test labels and ticks with horizontal barcharts - """ + """ labels = ['books', 'cinema', 'cooking', 'gaming'] - ticks = ['noun', 'verb', 'adverb', 'pronoun', 'preposition', + ticks = ['noun', 'verb', 'adverb', 'pronoun', 'preposition', 'digit', 'other'] _, ax = plt.subplots() - + # Plots stacked bar charts - bar_stack(self.data, labels = labels, ticks=ticks, orientation='h', + bar_stack(self.data, labels = labels, ticks=ticks, orientation='h', colormap='cool') - + # Extract tick labels from the plot ticks_ax = [tick.get_text() for tick in ax.yaxis.get_ticklabels()] #Assert that ticks are set properly assert ticks_ax==ticks - + # Assert image similarity self.assert_images_similar(ax=ax, tol=0.05) - \ No newline at end of file diff --git a/tests/test_features/test_base.py b/tests/test_features/test_base.py index 086eaab9d..040551418 100644 --- a/tests/test_features/test_base.py +++ b/tests/test_features/test_base.py @@ -28,22 +28,13 @@ ## FeatureVisualizer Base Tests ########################################################################## -class FeatureVisualizerBaseTests(VisualTestCase): +class TestFeatureVisualizerBase(VisualTestCase): def test_subclass(self): """ Assert the feature visualizer is in its rightful place """ visualizer = FeatureVisualizer() - self.assertIsInstance(visualizer, TransformerMixin) - self.assertIsInstance(visualizer, BaseEstimator) - self.assertIsInstance(visualizer, Visualizer) - - # def test_interface(self): - # """ - # Test the feature visualizer interface - # """ - # - # visualizer = FeatureVisualizer() - # with self.assertRaises(NotImplementedError): - # visualizer.poof() + assert isinstance(visualizer, TransformerMixin) + assert isinstance(visualizer, BaseEstimator) + assert isinstance(visualizer, Visualizer) diff --git a/tests/test_features/test_jointplot.py b/tests/test_features/test_jointplot.py index 84b6832fc..1d7f0ad31 100644 --- a/tests/test_features/test_jointplot.py +++ b/tests/test_features/test_jointplot.py @@ -23,11 +23,12 @@ ########################################################################## import sys +import pytest +import numpy as np + from functools import partial from unittest.mock import patch, MagicMock -import numpy as np -import pytest from sklearn.datasets import make_classification, make_regression from tests.base import IS_WINDOWS_OR_CONDA, VisualTestCase @@ -46,6 +47,7 @@ except ImportError: pd = None + ########################################################################## ## Fixtures ########################################################################## diff --git a/tests/test_features/test_manifold.py b/tests/test_features/test_manifold.py index fbb02c849..83f671bae 100644 --- a/tests/test_features/test_manifold.py +++ b/tests/test_features/test_manifold.py @@ -44,60 +44,50 @@ class TestManifold(VisualTestCase): Test Manifold visualizer """ - def test_manifold_construction(self): + @pytest.mark.parametrize("algorithm", [ + "lle", "ltsa", "hessian", "modified", "isomap", "mds", "spectral", "tsne", + ]) + def test_manifold_construction(self, algorithm): """ Should be able to construct a manifold estimator from a string """ - # TODO: parametrize this once unittest.TestCase dependency removed. - algorithms = [ - "lle", "ltsa", "hessian", "modified", - "isomap", "mds", "spectral", "tsne", - ] - - for algorithm in algorithms: - message = "case failed for {}".format(algorithm) - params = { - "n_neighbors": 18, - "random_state": 53, - } - oz = Manifold(manifold=algorithm, **params) - assert is_estimator(oz.manifold), message - assert oz.manifold.get_params()["n_components"] == 2, message - - manifold_params = oz.manifold.get_params() - for param, value in params.items(): - if param in manifold_params: - assert value == manifold_params[param], message - - def test_manifold_warning(self): + message = "case failed for {}".format(algorithm) + params = { + "n_neighbors": 18, + "random_state": 53, + } + oz = Manifold(manifold=algorithm, **params) + assert is_estimator(oz.manifold), message + assert oz.manifold.get_params()["n_components"] == 2, message + + manifold_params = oz.manifold.get_params() + for param, value in params.items(): + if param in manifold_params: + assert value == manifold_params[param], message + + @pytest.mark.parametrize("algorithm", [ + "lle", "ltsa", "hessian", "modified", "isomap", "spectral", + ]) + def test_manifold_warning(self, algorithm): """ Should raise a warning if n_neighbors not specified """ - # TODO: parametrize this once unittest.TestCase dependency removed. - algorithms = [ - "lle", "ltsa", "hessian", "modified", "isomap", "spectral", - ] + message = "case failed for {}".format(algorithm) + n_neighbors = 6 if algorithm == "hessian" else 5 - for algorithm in algorithms: - message = "case failed for {}".format(algorithm) - n_neighbors = 6 if algorithm == "hessian" else 5 + with pytest.warns(YellowbrickWarning): + oz = Manifold(manifold=algorithm) + assert oz.n_neighbors == n_neighbors, message - with pytest.warns(YellowbrickWarning): - oz = Manifold(manifold=algorithm) - assert oz.n_neighbors == n_neighbors, message - - def test_manifold_no_warning(self): + @pytest.mark.parametrize("algorithm", ["mds", "tsne"]) + def test_manifold_no_warning(self, algorithm): """ Should not raise a warning if n_neighbors not specified """ - # TODO: parametrize this once unittest.TestCase dependency removed. - algorithms = ["mds", "tsne"] - - for algorithm in algorithms: - message = "case failed for {}".format(algorithm) + message = "case failed for {}".format(algorithm) - with pytest.warns(None) as record: - assert not record.list, message + with pytest.warns(None) as record: + assert not record.list, message def test_bad_manifold_exception(self): """ @@ -216,21 +206,16 @@ def test_manifold_pandas(self): self.assert_images_similar(oz, tol=35) @pytest.mark.filterwarnings("ignore:Conversion of the second argument") - def test_manifold_algorithm_fit(self): + @pytest.mark.parametrize("algorithm", [ + "lle", "ltsa", "hessian", "modified", "isomap", "mds", "spectral", "tsne", + ]) + def test_manifold_algorithm_fit(self, algorithm): """ Test that all algorithms can be fitted correctly """ - # TODO: parametrize this once unittest.TestCase dependency removed. - algorithms = [ - "lle", "ltsa", "hessian", "modified", - "isomap", "mds", "spectral", "tsne", - ] - X, y = make_s_curve(200, random_state=888) - - for algorithm in algorithms: - oz = Manifold(manifold=algorithm, n_neighbors=10, random_state=223) - oz.fit(X, y) + oz = Manifold(manifold=algorithm, n_neighbors=10, random_state=223) + oz.fit(X, y) def test_determine_target_color_type(self): """ diff --git a/tests/test_features/test_pca.py b/tests/test_features/test_pca.py index 0ed5da16b..9dcedaacb 100644 --- a/tests/test_features/test_pca.py +++ b/tests/test_features/test_pca.py @@ -56,7 +56,7 @@ def binary(request): ########################################################################## @pytest.mark.usefixtures("binary") -class PCADecompositionTests(VisualTestCase): +class TestPCADecomposition(VisualTestCase): """ Test the PCADecomposition visualizer """ @@ -191,7 +191,7 @@ def test_scale_true_3d_execption(self): with pytest.raises(ValueError, match=e): pca = PCADecomposition(**params) pca.fit(X) - + @mock.patch('yellowbrick.features.pca.plt.sca', autospec=True) def test_alpha_param(self, mock_sca): """ @@ -202,7 +202,7 @@ def test_alpha_param(self, mock_sca): visualizer = PCADecomposition(**params).fit(self.dataset.X) pca_array = visualizer.transform(self.dataset.X) assert visualizer.alpha == 0.3 - + visualizer.ax = mock.MagicMock() visualizer.fit(self.dataset.X) visualizer.transform(self.dataset.X) @@ -212,4 +212,4 @@ def test_alpha_param(self, mock_sca): assert "alpha" in scatter_kwargs assert scatter_kwargs["alpha"] == 0.3 assert pca_array.shape == (self.dataset.X.shape[0], 2) - + diff --git a/tests/test_features/test_pcoords.py b/tests/test_features/test_pcoords.py index 1227040a6..ade68b43b 100644 --- a/tests/test_features/test_pcoords.py +++ b/tests/test_features/test_pcoords.py @@ -70,7 +70,7 @@ def test_parallel_coords(self): """ visualizer = ParallelCoordinates() visualizer.fit_transform(self.dataset.X, self.dataset.y) - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer, tol=0.25) def test_parallel_coords_fast(self): @@ -79,7 +79,7 @@ def test_parallel_coords_fast(self): """ visualizer = ParallelCoordinates(fast=True) visualizer.fit_transform(self.dataset.X, self.dataset.y) - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer, tol=0.25) def test_alpha(self): @@ -88,7 +88,7 @@ def test_alpha(self): """ visualizer = ParallelCoordinates(alpha=1.0) visualizer.fit_transform(self.dataset.X, self.dataset.y) - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer, tol=0.25) def test_alpha_fast(self): @@ -97,7 +97,7 @@ def test_alpha_fast(self): """ visualizer = ParallelCoordinates(alpha=1.0, fast=True) visualizer.fit_transform(self.dataset.X, self.dataset.y) - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer, tol=0.25) def test_labels(self): @@ -108,7 +108,7 @@ def test_labels(self): classes=['a', 'b', 'c'], features=['f1', 'f2', 'f3', 'f4', 'f5'] ) visualizer.fit_transform(self.dataset.X, self.dataset.y) - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer) def test_labels_fast(self): @@ -119,7 +119,7 @@ def test_labels_fast(self): classes=['a', 'b', 'c'], features=['f1', 'f2', 'f3', 'f4', 'f5'], fast=True ) visualizer.fit_transform(self.dataset.X, self.dataset.y) - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer) def test_normalized_l2(self): @@ -128,7 +128,7 @@ def test_normalized_l2(self): """ visualizer = ParallelCoordinates(normalize='l2') visualizer.fit_transform(self.dataset.X, self.dataset.y) - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer, tol=0.25) def test_normalized_l2_fast(self): @@ -137,7 +137,7 @@ def test_normalized_l2_fast(self): """ visualizer = ParallelCoordinates(normalize='l2', fast=True) visualizer.fit_transform(self.dataset.X, self.dataset.y) - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer, tol=0.25) def test_normalized_minmax(self): @@ -146,7 +146,7 @@ def test_normalized_minmax(self): """ visualizer = ParallelCoordinates(normalize='minmax') visualizer.fit_transform(self.dataset.X, self.dataset.y) - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer, tol=0.25) def test_normalized_minmax_fast(self): @@ -155,7 +155,7 @@ def test_normalized_minmax_fast(self): """ visualizer = ParallelCoordinates(normalize='minmax', fast=True) visualizer.fit_transform(self.dataset.X, self.dataset.y) - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer, tol=0.25) @pytest.mark.skipif(pd is None, reason="test requires pandas") @@ -174,7 +174,7 @@ def test_pandas_integration_sampled(self): sample=0.05, shuffle=True, random_state=4291, classes=classes ) oz.fit_transform(X, y) - oz.poof() + oz.finalize() self.assert_images_similar(oz, tol=0.1) @@ -193,7 +193,7 @@ def test_numpy_integration_sampled(self): sample=0.05, shuffle=True, random_state=4291, classes=classes ) oz.fit_transform(X, y) - oz.poof() + oz.finalize() self.assert_images_similar(oz, tol=0.1) @@ -211,7 +211,7 @@ def test_pandas_integration_fast(self): oz = ParallelCoordinates(fast=True, classes=classes) oz.fit_transform(X, y) - oz.poof() + oz.finalize() self.assert_images_similar(oz, tol=0.1) @@ -228,7 +228,7 @@ def test_numpy_integration_fast(self): oz = ParallelCoordinates(fast=True, classes=classes) oz.fit_transform(X, y) - oz.poof() + oz.finalize() self.assert_images_similar(oz, tol=0.1) @@ -236,7 +236,7 @@ def test_normalized_invalid_arg(self): """ Invalid argument to 'normalize' should raise """ - with self.assertRaises(YellowbrickValueError): + with pytest.raises(YellowbrickValueError): ParallelCoordinates(normalize='foo') def test_sample_int(self): @@ -276,7 +276,7 @@ def test_sample_int_invalid(self): """ Negative int values should raise exception """ - with self.assertRaises(YellowbrickValueError): + with pytest.raises(YellowbrickValueError): ParallelCoordinates(sample=-1) def test_sample_float(self): @@ -316,16 +316,17 @@ def test_sample_float_invalid(self): """ Float values for 'sample' argument outside [0,1] should raise. """ - with self.assertRaises(YellowbrickValueError): + with pytest.raises(YellowbrickValueError): ParallelCoordinates(sample=-0.2) - with self.assertRaises(YellowbrickValueError): + + with pytest.raises(YellowbrickValueError): ParallelCoordinates(sample=1.1) def test_sample_invalid_type(self): """ Non-numeric values for 'sample' argument should raise. """ - with self.assertRaises(YellowbrickTypeError): + with pytest.raises(YellowbrickTypeError): ParallelCoordinates(sample='foo') @staticmethod diff --git a/tests/test_features/test_radviz.py b/tests/test_features/test_radviz.py index fbda7d152..a7f40f3dc 100644 --- a/tests/test_features/test_radviz.py +++ b/tests/test_features/test_radviz.py @@ -96,7 +96,7 @@ def test_radviz(self): """ visualizer = RadViz() visualizer.fit_transform(self.dataset.X, self.dataset.y) - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer, tol=0.25) def test_radviz_alpha(self): @@ -105,7 +105,7 @@ def test_radviz_alpha(self): """ visualizer = RadViz(alpha=0.5) visualizer.fit_transform(self.dataset.X, self.dataset.y) - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer, tol=0.25) @pytest.mark.xfail( diff --git a/tests/test_features/test_rfecv.py b/tests/test_features/test_rfecv.py index c428c5b18..d0fde420a 100644 --- a/tests/test_features/test_rfecv.py +++ b/tests/test_features/test_rfecv.py @@ -107,7 +107,7 @@ def test_rfecv_classification(self): cv = ShuffleSplit(3, random_state=21) oz = RFECV(SVC(kernel="linear", C=1), cv=cv) oz.fit(self.dataset.X, self.dataset.y) - oz.poof() + oz.finalize() self.assert_images_similar(oz, remove_legend=True) @@ -144,7 +144,7 @@ def test_pandas_integration(self): cv = StratifiedKFold(n_splits=4, random_state=32) oz = RFECV(RandomForestClassifier(random_state=83), cv=cv) oz.fit(X, y) - oz.poof() + oz.finalize() self.assert_images_similar(oz, remove_legend=True) @@ -164,17 +164,17 @@ def test_numpy_integration(self): cv = StratifiedKFold(n_splits=4, random_state=32) oz = RFECV(RandomForestClassifier(random_state=83), cv=cv) oz.fit(X, y) - oz.poof() + oz.finalize() self.assert_images_similar(oz, remove_legend=True) - def test_invalid_step(self): + @pytest.mark.parametrize("step", [0, -1, -5]) + def test_invalid_step(self, step): """ Test step hyperparam validation """ - # TODO: parametrize when unittest is removed with pytest.raises(YellowbrickValueError, match="step must be >0"): - oz = RFECV(SVC(kernel="linear"), step=-1) + oz = RFECV(SVC(kernel="linear"), step=step) oz.fit(self.dataset.X, self.dataset.y) def test_rfecv_step(self): diff --git a/tests/test_meta.py b/tests/test_meta.py index 2d697d2c0..98a54e7de 100644 --- a/tests/test_meta.py +++ b/tests/test_meta.py @@ -113,7 +113,7 @@ def test_missing_baseline_image(self): Test that a missing basline image raises an exception """ viz = RandomVisualizer(random_state=14).fit() - viz.poof() + viz.finalize() # Assert the baseline image does not exist assert_path_not_exists( @@ -133,7 +133,7 @@ def test_random_visualizer(self): Test that a random visualization is correctly compared to a baseline """ viz = RandomVisualizer(random_state=111).fit() - viz.poof() + viz.finalize() assert mpl.get_backend() == 'agg' @@ -147,7 +147,7 @@ def test_random_visualizer_not_close(self): """ # Baseline image random_state=225 viz = RandomVisualizer(random_state=224).fit() - viz.poof() + viz.finalize() with pytest.raises(ImageComparisonFailure, match="images not close"): self.assert_images_similar(viz) @@ -162,6 +162,6 @@ def test_random_visualizer_increased_tolerance(self): Test that not close visualizers pass with increased tolerance """ viz = RandomVisualizer(random_state=224).fit() - viz.poof() + viz.finalize() self.assert_images_similar(viz, tol=30) diff --git a/tests/test_model_selection/test_cross_validation.py b/tests/test_model_selection/test_cross_validation.py index f6223c573..e3ea90d22 100644 --- a/tests/test_model_selection/test_cross_validation.py +++ b/tests/test_model_selection/test_cross_validation.py @@ -80,7 +80,7 @@ def test_classifier(self): ) oz.fit(X, y) - oz.poof() + oz.finalize() self.assert_images_similar(oz, tol=2.0) @@ -120,7 +120,7 @@ def test_regression(self): ) oz.fit(X, y) - oz.poof() + oz.finalize() self.assert_images_similar(oz, tol=36.0) @@ -178,6 +178,6 @@ def test_pandas_integration(self): oz = CVScores(BernoulliNB(), cv=cv) oz.fit(X, y) - oz.poof() + oz.finalize() self.assert_images_similar(oz, tol=2.0) diff --git a/tests/test_model_selection/test_learning_curve.py b/tests/test_model_selection/test_learning_curve.py index 06acccf73..f16a6467b 100644 --- a/tests/test_model_selection/test_learning_curve.py +++ b/tests/test_model_selection/test_learning_curve.py @@ -83,7 +83,7 @@ def test_classifier(self): oz = LearningCurve( RandomForestClassifier(random_state=21), random_state=12 ).fit(X, y) - oz.poof() + oz.finalize() self.assert_images_similar(oz) @@ -98,7 +98,7 @@ def test_regressor(self): oz = LearningCurve(Ridge(), random_state=18) oz.fit(X, y) - oz.poof() + oz.finalize() self.assert_images_similar(oz) @@ -111,7 +111,7 @@ def test_clusters(self): oz = LearningCurve( MiniBatchKMeans(random_state=281), random_state=182 ).fit(X) - oz.poof() + oz.finalize() self.assert_images_similar(oz, tol=10) @@ -153,7 +153,7 @@ def test_pandas_integration(self): cv = StratifiedKFold(n_splits=4, random_state=32) oz = LearningCurve(GaussianNB(), cv=cv, random_state=23) oz.fit(X, y) - oz.poof() + oz.finalize() self.assert_images_similar(oz) diff --git a/tests/test_model_selection/test_validation_curve.py b/tests/test_model_selection/test_validation_curve.py index 1dbacc741..f48fb2fa0 100644 --- a/tests/test_model_selection/test_validation_curve.py +++ b/tests/test_model_selection/test_validation_curve.py @@ -90,7 +90,7 @@ def test_classifier(self): ) oz.fit(X, y) - oz.poof() + oz.finalize() self.assert_images_similar(oz) @@ -109,7 +109,7 @@ def test_regression(self): ) oz.fit(X, y) - oz.poof() + oz.finalize() self.assert_images_similar(oz, tol=12.0) @@ -155,7 +155,7 @@ def test_pandas_integration(self): BernoulliNB(), cv=cv, param_range=pr, param_name='alpha' ) oz.fit(X, y) - oz.poof() + oz.finalize() self.assert_images_similar(oz) diff --git a/tests/test_pipeline.py b/tests/test_pipeline.py index d112148c2..aa582e8a9 100644 --- a/tests/test_pipeline.py +++ b/tests/test_pipeline.py @@ -18,7 +18,7 @@ ########################################################################## import os -import unittest +import pytest from unittest import mock from yellowbrick.base import Visualizer @@ -40,6 +40,7 @@ class MockEstimator(BaseEstimator): def fit(self, X, y=None, **kwargs): return self + class MockVisualEstimator(Visualizer): def fit(self, X, y=None, **kwargs): @@ -76,7 +77,7 @@ def draw(self, **kwargs): ## VisualPipeline Tests ########################################################################## -class VisualPipelineTests(unittest.TestCase): +class TestVisualPipeline(object): def test_validate_steps(self): """ @@ -87,7 +88,7 @@ def test_validate_steps(self): # TypeError if the steps don't match transforms --> estimator. # validate a bad intermediate transformer on the Pipeline - with self.assertRaises(TypeError): + with pytest.raises(TypeError): Pipeline([ ('real', MockTransformer()), ('bad', Thing()), @@ -95,7 +96,7 @@ def test_validate_steps(self): ]) # validate a bad intermediate transformer on the VisualPipeline - with self.assertRaises(TypeError): + with pytest.raises(TypeError): VisualPipeline([ ('real', MockTransformer()), ('bad', Thing()), @@ -103,14 +104,14 @@ def test_validate_steps(self): ]) # validate a bad final estimator on the Pipeline - with self.assertRaises(TypeError): + with pytest.raises(TypeError): Pipeline([ ('real', MockTransformer()), ('bad', Thing()), ]) # validate a bad final estimator on the VisualPipeline - with self.assertRaises(TypeError): + with pytest.raises(TypeError): VisualPipeline([ ('real', MockTransformer()), ('bad', Thing()), @@ -149,11 +150,11 @@ def test_visual_steps_property(self): ('e', MockEstimator()), ]) - self.assertNotIn('a', pipeline.visual_steps) - self.assertIn('b', pipeline.visual_steps) - self.assertNotIn('c', pipeline.visual_steps) - self.assertIn('d', pipeline.visual_steps) - self.assertNotIn('e', pipeline.visual_steps) + assert 'a' not in pipeline.visual_steps + assert 'b' in pipeline.visual_steps + assert 'c' not in pipeline.visual_steps + assert 'd' in pipeline.visual_steps + assert 'e' not in pipeline.visual_steps def test_pipeline_poof(self): """ @@ -192,7 +193,7 @@ def test_pipeline_savefig_poof(self): pipeline.steps[3][1].poof.assert_called_once_with(outpath=os.path.join(tmpdir, "d.pdf")) pipeline.steps[4][1].poof.assert_called_once_with(outpath=os.path.join(tmpdir, "e.pdf")) - @unittest.skip("need to find a way for fit to return self in mocks") + @pytest.mark.skip(reason="need to find a way for fit to return self in mocks") def test_fit_transform_poof_and_draw_calls(self): """ Test calling fit, transform, and poof on the pipeline diff --git a/tests/test_regressor/test_alphas.py b/tests/test_regressor/test_alphas.py index e7bf34608..c2d34dd0f 100644 --- a/tests/test_regressor/test_alphas.py +++ b/tests/test_regressor/test_alphas.py @@ -29,6 +29,8 @@ from yellowbrick.exceptions import YellowbrickValueError from sklearn.svm import SVR, SVC +from sklearn.cluster import KMeans +from sklearn.decomposition import PCA from sklearn.datasets import make_regression from sklearn.linear_model import Ridge, RidgeCV from sklearn.linear_model import Lasso, LassoCV @@ -57,33 +59,35 @@ def test_similar_image(self): X, y = make_regression(random_state=0) visualizer.fit(X, y) - visualizer.poof() + visualizer.finalize() self.assert_images_similar(visualizer) - def test_regressor_cv(self): + @pytest.mark.parametrize("model", [SVR, Ridge, Lasso, LassoLars, ElasticNet]) + def test_regressor_nocv(self, model): """ Ensure only "CV" regressors are allowed """ - # TODO: parametrize with models when unittest dependency removed - for model in (SVR, Ridge, Lasso, LassoLars, ElasticNet): - with pytest.raises(YellowbrickTypeError): - AlphaSelection(model()) + with pytest.raises(YellowbrickTypeError): + AlphaSelection(model()) - # TODO: parametrize with models when unittest dependency removed (new test case) - for model in (RidgeCV, LassoCV, LassoLarsCV, ElasticNetCV): - try: - AlphaSelection(model()) - except YellowbrickTypeError: - pytest.fail("could not instantiate RegressorCV on alpha selection") + @pytest.mark.parametrize("model", [RidgeCV, LassoCV, LassoLarsCV, ElasticNetCV]) + def test_regressor_cv(self, model): + """ + Ensure "CV" regressors are allowed + """ + try: + AlphaSelection(model()) + except YellowbrickTypeError: + pytest.fail("could not instantiate RegressorCV on alpha selection") - def test_only_regressors(self): + @pytest.mark.parametrize("model", [SVC, KMeans, PCA]) + def test_only_regressors(self, model): """ Assert AlphaSelection only works with regressors """ - # TODO: parameterize with classifier, clusterer, decomposition with pytest.raises(YellowbrickTypeError): - AlphaSelection(SVC()) + AlphaSelection(model()) def test_store_cv_values(self): """ @@ -99,21 +103,19 @@ def test_store_cv_values(self): model = AlphaSelection(RidgeCV(store_cv_values=False)) assert model.estimator.store_cv_values - def test_get_alphas_param(self): + @pytest.mark.parametrize("model", [RidgeCV, LassoCV, ElasticNetCV]) + def test_get_alphas_param(self, model): """ - Assert that we can get the alphas from ridge, lasso, and elasticnet + Assert that we can get the alphas from original CV models """ alphas = np.logspace(-10, -2, 100) - # Test original CV models - # TODO: parametrize this test with different models - for model in (RidgeCV, LassoCV, ElasticNetCV): - try: - model = AlphaSelection(model(alphas=alphas)) - malphas = model._find_alphas_param() - assert_array_equal(alphas, malphas) - except YellowbrickValueError: - pytest.fail("could not find alphas on {}".format(model.name)) + try: + model = AlphaSelection(model(alphas=alphas)) + malphas = model._find_alphas_param() + assert_array_equal(alphas, malphas) + except YellowbrickValueError: + pytest.fail("could not find alphas on {}".format(model.name)) def test_get_alphas_param_lassolars(self): """ @@ -128,24 +130,21 @@ def test_get_alphas_param_lassolars(self): except YellowbrickValueError: pytest.fail("could not find alphas on {}".format(model.name)) - def test_get_errors_param(self): + @pytest.mark.parametrize("model", [RidgeCV, LassoCV, LassoLarsCV, ElasticNetCV]) + def test_get_errors_param(self, model): """ Test known models we can get the cv errors for alpha selection """ + try: + model = AlphaSelection(model()) - # Test original CV models - # TODO: parametrize this test with different models - for model in (RidgeCV, LassoCV, LassoLarsCV, ElasticNetCV): - try: - model = AlphaSelection(model()) - - X, y = make_regression() - model.fit(X, y) + X, y = make_regression() + model.fit(X, y) - errors = model._find_errors_param() - assert len(errors) > 0 - except YellowbrickValueError: - pytest.fail("could not find errors on {}".format(model.name)) + errors = model._find_errors_param() + assert len(errors) > 0 + except YellowbrickValueError: + pytest.fail("could not find errors on {}".format(model.name)) def test_score(self): """ diff --git a/tests/test_style/test_colors.py b/tests/test_style/test_colors.py index 5ca797145..aaf7a7def 100644 --- a/tests/test_style/test_colors.py +++ b/tests/test_style/test_colors.py @@ -235,7 +235,7 @@ def test_integrated_yb_colormap(self): ) visualizer = SilhouetteVisualizer(KMeans(random_state=0), colormap='neural_paint') visualizer.fit(X) - visualizer.poof() + visualizer.finalize() tol = 3.2 if sys.platform == "win32" else 0.01 # Fails on AppVeyor with RMS 3.143 self.assert_images_similar(visualizer, remove_legend=True, tol=tol) diff --git a/tests/test_style/test_palettes.py b/tests/test_style/test_palettes.py index 6ff78e71f..ec8dd2c5a 100644 --- a/tests/test_style/test_palettes.py +++ b/tests/test_style/test_palettes.py @@ -17,7 +17,7 @@ ## Imports ########################################################################## -import unittest +import pytest import numpy as np import matplotlib as mpl @@ -35,7 +35,7 @@ ## Color Palette Tests ########################################################################## -class ColorPaletteObjectTests(VisualTestCase): +class TestColorPaletteObject(VisualTestCase): """ Tests the ColorPalette object """ @@ -54,11 +54,11 @@ def test_init_palette_by_name(self): "Could not instantiate {} color palette by name".format(name) ) - self.assertEqual(value, palette) + assert value == palette # Try a name not in PALETTES - with self.assertRaises(YellowbrickValueError): - self.assertNotIn('foo', PALETTES, "Cannot test bad name 'foo' it is in PALETTES!") + with pytest.raises(YellowbrickValueError): + assert 'foo' not in PALETTES, "Cannot test bad name 'foo' it is in PALETTES!" palette = ColorPalette('foo') def test_init_palette_by_list(self): @@ -69,12 +69,12 @@ def test_init_palette_by_list(self): # Try all the values in the palettes (HEX) for value in PALETTES.values(): palette = ColorPalette(value) - self.assertEqual(len(value), len(palette)) + assert len(value) == len(palette) # Try all the values converted to RGB for value in PALETTES.values(): palette = ColorPalette(map(mpl.colors.colorConverter.to_rgb, value)) - self.assertEqual(len(value), len(palette)) + assert len(value) == len(palette) def test_color_palette_context(self): """ @@ -84,10 +84,10 @@ def test_color_palette_context(self): context = color_palette('dark') with ColorPalette('dark') as palette: - self.assertIsInstance(palette, ColorPalette) - self.assertEqual(get_color_cycle(), context) + assert isinstance(palette, ColorPalette) + assert get_color_cycle() == context - self.assertEqual(get_color_cycle(), default) + assert get_color_cycle() == default def test_as_hex_as_rgb(self): """ @@ -97,16 +97,16 @@ def test_as_hex_as_rgb(self): expected = PALETTES['flatui'] morgified = palette.as_hex() - self.assertIsNot(morgified, palette) - self.assertIsInstance(morgified, ColorPalette) - self.assertEqual(morgified, expected) + assert morgified is not palette + assert isinstance(morgified, ColorPalette) + assert morgified == expected remorgified = morgified.as_rgb() - self.assertIsNot(remorgified, morgified) - self.assertIsNot(remorgified, palette) - self.assertEqual(remorgified, palette) + assert remorgified is not morgified + assert remorgified is not palette + assert remorgified == palette - @unittest.skip("not implemented yet") + @pytest.mark.skip(reason="not implemented yet") def test_plot_color_palette(self): """ Test the plotting of a color palette for color visualization @@ -116,7 +116,7 @@ def test_plot_color_palette(self): ) -class ColorPaletteFunctionTests(VisualTestCase): +class TestColorPaletteFunction(VisualTestCase): """ Tests the color_palette function. """ @@ -127,7 +127,7 @@ def test_current_palette(self): """ pal = color_palette(["red", "blue", "green"], 3) set_palette(pal, 3) - self.assertEqual(pal, get_color_cycle()) + assert pal == get_color_cycle() # Reset the palette set_aesthetic() @@ -141,9 +141,9 @@ def test_palette_context(self): context_pal = color_palette("muted") with color_palette(context_pal): - self.assertEqual(get_color_cycle(), context_pal) + assert get_color_cycle() == context_pal - self.assertEqual(get_color_cycle(), default_pal) + assert get_color_cycle() == default_pal def test_big_palette_context(self): """ @@ -155,9 +155,9 @@ def test_big_palette_context(self): set_palette(original_pal) with color_palette(context_pal, 10): - self.assertEqual(get_color_cycle(), context_pal) + assert get_color_cycle() == context_pal - self.assertEqual(get_color_cycle(), original_pal) + assert get_color_cycle() == original_pal # Reset default set_aesthetic() @@ -169,7 +169,7 @@ def test_yellowbrick_palettes(self): pals = ["accent", "dark", "pastel", "bold", "muted"] for name in pals: pal_out = color_palette(name) - self.assertEqual(len(pal_out), 6, "{} is not of len 6".format(name)) + assert len(pal_out) == 6, "{} is not of len 6".format(name) def test_seaborn_palettes(self): """ @@ -179,7 +179,7 @@ def test_seaborn_palettes(self): "sns_bright", "sns_dark", "sns_colorblind"] for name in pals: pal_out = color_palette(name) - self.assertEqual(len(pal_out), 6) + assert len(pal_out) == 6 def test_other_palettes(self): """ @@ -188,7 +188,8 @@ def test_other_palettes(self): pals = ["flatui", "paired", "neural_paint", "set1"] for name in pals: pal_out = color_palette(name) - self.assertTrue(pal_out) + assert pal_out is not None + assert len(pal_out) > 0 def test_bad_palette_name(self): @@ -196,10 +197,10 @@ def test_bad_palette_name(self): Test that a bad palette name raises an exception """ - with self.assertRaises(ValueError): + with pytest.raises(ValueError): color_palette("IAmNotAPalette") - with self.assertRaises(YellowbrickValueError): + with pytest.raises(YellowbrickValueError): color_palette("IAmNotAPalette") def test_bad_palette_colors(self): @@ -208,10 +209,10 @@ def test_bad_palette_colors(self): """ pal = ["red", "blue", "iamnotacolor"] - with self.assertRaises(ValueError): + with pytest.raises(ValueError): color_palette(pal) - with self.assertRaises(YellowbrickValueError): + with pytest.raises(YellowbrickValueError): color_palette(pal) def test_palette_is_list_of_tuples(self): @@ -222,10 +223,10 @@ def test_palette_is_list_of_tuples(self): pal_in = np.array(["red", "blue", "green"]) pal_out = color_palette(pal_in, 3) - self.assertIsInstance(pal_out, list) - self.assertIsInstance(pal_out[0], tuple) - self.assertIsInstance(pal_out[0][0], float) - self.assertEqual(len(pal_out[0]), 3) + assert isinstance(pal_out, list) + assert isinstance(pal_out[0], tuple) + assert isinstance(pal_out[0][0], float) + assert len(pal_out[0]) == 3 def test_palette_cycles(self): """ @@ -233,20 +234,20 @@ def test_palette_cycles(self): """ accent = color_palette("accent") double_accent = color_palette("accent", 12) - self.assertEqual(double_accent, accent + accent) + assert double_accent == accent + accent - @unittest.skip("Discovered this commented out, don't know why") + @pytest.mark.skip(reason="discovered this commented out, don't know why") def test_cbrewer_qual(self): """ Test colorbrewer qualitative palettes """ pal_short = mpl_palette("Set1", 4) pal_long = mpl_palette("Set1", 6) - self.assertEqual(pal_short, pal_long[:4]) + assert pal_short == pal_long[:4] pal_full = palettes.mpl_palette("Set2", 8) pal_long = palettes.mpl_palette("Set2", 10) - self.assertEqual(pal_full, pal_long[:8]) + assert pal_full == pal_long[:8] def test_color_codes(self): """ @@ -257,7 +258,7 @@ def test_color_codes(self): for code, color in zip("bgrmyck", colors): rgb_want = mpl.colors.colorConverter.to_rgb(color) rgb_got = mpl.colors.colorConverter.to_rgb(code) - self.assertEqual(rgb_want, rgb_got) + assert rgb_want == rgb_got set_color_codes("reset") def test_as_hex(self): @@ -266,10 +267,10 @@ def test_as_hex(self): """ pal = color_palette("accent") for rgb, hex in zip(pal, pal.as_hex()): - self.assertEqual(mpl.colors.rgb2hex(rgb), hex) + assert mpl.colors.rgb2hex(rgb) == hex for rgb_e, rgb_v in zip(pal, pal.as_hex().as_rgb()): - self.assertEqual(rgb_e, rgb_v) + assert rgb_e == rgb_v def test_preserved_palette_length(self): """ @@ -277,7 +278,7 @@ def test_preserved_palette_length(self): """ pal_in = color_palette("Set1", 10) pal_out = color_palette(pal_in) - self.assertEqual(pal_in, pal_out) + assert pal_in == pal_out def test_color_sequence(self): """ @@ -286,33 +287,30 @@ def test_color_sequence(self): for name, ncols in SEQUENCES.items(): for n in ncols.keys(): cmap = color_sequence(name, n) - self.assertEqual(name, cmap.name) - self.assertEqual(n, cmap.N) + assert name == cmap.name + assert n == cmap.N def test_color_sequence_default(self): """ Assert the default color sequence is RdBu """ cmap = color_sequence() - self.assertEqual(cmap.name, "RdBu") - self.assertEqual(cmap.N, 11) + assert cmap.name == "RdBu" + assert cmap.N == 11 def test_color_sequence_unrecocognized(self): """ Test value errors for unrecognized sequences """ - with self.assertRaises(YellowbrickValueError): + with pytest.raises(YellowbrickValueError): color_sequence('PepperBucks', 3) def test_color_sequence_bounds(self): """ Test color sequence out of bounds value error """ - with self.assertRaises(YellowbrickValueError): + with pytest.raises(YellowbrickValueError): color_sequence('RdBu', 18) - with self.assertRaises(YellowbrickValueError): + with pytest.raises(YellowbrickValueError): color_sequence('RdBu', 2) - -if __name__ == "__main__": - unittest.main() diff --git a/tests/test_style/test_rcmod.py b/tests/test_style/test_rcmod.py index d62ca2820..9ea510424 100644 --- a/tests/test_style/test_rcmod.py +++ b/tests/test_style/test_rcmod.py @@ -18,13 +18,12 @@ ## Imports ########################################################################## -import unittest +import pytest import numpy as np import matplotlib as mpl import numpy.testing as npt import yellowbrick.style.rcmod as yb_rcmod -from distutils.version import LooseVersion from tests.base import VisualTestCase @@ -38,9 +37,9 @@ class RCParamTester(VisualTestCase): """ excluded_params = { - "backend", # This cannot be changed by manipulating rc - "svg.embed_char_paths", # This param causes test issues and is deprecated anyway - "font.family", # breaks the visualtest case + "backend", # This cannot be changed by manipulating rc + "svg.embed_char_paths", # This param causes test issues and is deprecated + "font.family", # breaks the visualtest case } def flatten_list(self, orig_list): @@ -57,7 +56,7 @@ def assert_rc_params(self, params): elif isinstance(v, np.ndarray): npt.assert_array_equal(mpl.rcParams[k], v) else: - self.assertEqual((k, mpl.rcParams[k]), (k, v)) + assert (k, mpl.rcParams[k]) == (k, v) ########################################################################## @@ -80,8 +79,8 @@ def test_rc_override(self): rc = {"axes.facecolor": "blue", "foo.notaparam": "bar"} out = yb_rcmod._axes_style("darkgrid", rc) - self.assertEqual(out["axes.facecolor"], "blue") - self.assertNotIn("foo.notaparam", out) + assert out["axes.facecolor"] == "blue" + assert "foo.notaparam" not in out def test_set_style(self): """ @@ -91,7 +90,7 @@ def test_set_style(self): yb_rcmod.set_style() self.assert_rc_params(style_dict) - @unittest.skip("This test doesn't make sense without multiple styles") + @pytest.mark.skip(reason="this test doesn't make sense without multiple styles") def test_style_context_manager(self): yb_rcmod.set_style("darkgrid") @@ -112,25 +111,20 @@ def test_style_context_independence(self): """ Assert context and style independence """ - self.assertTrue(set(yb_rcmod._style_keys) ^ set(yb_rcmod._context_keys)) + assert len(set(yb_rcmod._style_keys) ^ set(yb_rcmod._context_keys)) > 0 def test_set_rc(self): """ Test the ability to set the mpl configuration rc dict """ yb_rcmod.set_aesthetic(rc={"lines.linewidth": 4}) - self.assertEqual(mpl.rcParams["lines.linewidth"], 4) + assert mpl.rcParams["lines.linewidth"] == 4 yb_rcmod.set_aesthetic() def test_reset_defaults(self): """ Test the ability to reset to the mpl defaults """ - # Changes to the rc parameters make this test hard to manage - # on older versions of matplotlib, so we'll skip it - if LooseVersion(mpl.__version__) < LooseVersion("1.3"): - raise self.SkipTest - yb_rcmod.reset_defaults() self.assert_rc_params(mpl.rcParamsDefault) yb_rcmod.set_aesthetic() @@ -139,12 +133,6 @@ def test_reset_orig(self): """ Test the ability to reset to the original (respecting custom styles) """ - - # Changes to the rc parameters make this test hard to manage - # on older versions of matplotlib, so we'll skip it - if LooseVersion(mpl.__version__) < LooseVersion("1.3"): - raise self.SkipTest - yb_rcmod.reset_orig() self.assert_rc_params(mpl.rcParamsOrig) yb_rcmod.set_aesthetic() @@ -171,7 +159,7 @@ def test_font_scale(self): "xtick.labelsize", "ytick.labelsize", "font.size"] for k in font_keys: - self.assertEqual(notebook_ref[k] * 2, notebook_big[k]) + assert notebook_ref[k] * 2 == notebook_big[k] def test_rc_override(self): """ @@ -180,8 +168,8 @@ def test_rc_override(self): key, val = "grid.linewidth", 5 rc = {key: val, "foo": "bar"} out = yb_rcmod._plotting_context("talk", rc=rc) - self.assertEqual(out[key], val) - self.assertNotIn("foo", out) + assert out[key] == val + assert "foo" not in out def test__set_context(self): """ @@ -191,7 +179,7 @@ def test__set_context(self): yb_rcmod._set_context() self.assert_rc_params(context_dict) - @unittest.skip("This test doesn't make sense without multiple contexts") + @pytest.mark.skip(reason="this test doesn't make sense without multiple contexts") def test_context_context_manager(self): yb_rcmod._set_context("notebook") @@ -208,6 +196,3 @@ def func(): func() self.assert_rc_params(orig_params) - -if __name__ == "__main__": - unittest.main() diff --git a/tests/test_target/test_binning.py b/tests/test_target/test_binning.py index 1f55c4cc9..df7317b6b 100644 --- a/tests/test_target/test_binning.py +++ b/tests/test_target/test_binning.py @@ -1,7 +1,7 @@ # tests.test_target.test_binning # Tests for the BalancedBinningReference visualizer # -# Author: Juan L. Kehoe (juanluo2008@gmail.com) +# Author: Juan L. Kehoe (juanluo2008@gmail.com) # Author: Prema Damodaran Roman (pdamo24@gmail.com) # Created: Thu Jul 20 10:21:49 2018 -0400 # @@ -11,29 +11,28 @@ from tests.dataset import DatasetMixin from yellowbrick.target.binning import * + ########################################################################## ## BalancedBinningReference Tests ########################################################################## class TestBalancedBinningReference(VisualTestCase, DatasetMixin): - """ - Test the BalancedBinningReference visualizer - """ - - def test_balancedbinningreference(self): - """ - Test Histogram on a real dataset - """ - # Load the data from the fixture - dataset = self.load_data('occupancy') - - # Get the data - y = dataset["temperature"] - - - visualizer = BalancedBinningReference() - visualizer.fit(y) - visualizer.finalize() - self.assert_images_similar(visualizer, tol=0.5) - - \ No newline at end of file + """ + Test the BalancedBinningReference visualizer + """ + + def test_balancedbinningreference(self): + """ + Test Histogram on a real dataset + """ + # Load the data from the fixture + dataset = self.load_data('occupancy') + + # Get the data + y = dataset["temperature"] + + visualizer = BalancedBinningReference() + visualizer.fit(y) + visualizer.finalize() + self.assert_images_similar(visualizer, tol=0.5) + diff --git a/tests/test_target/test_class_balance.py b/tests/test_target/test_class_balance.py index ded124a4a..015c06e5d 100644 --- a/tests/test_target/test_class_balance.py +++ b/tests/test_target/test_class_balance.py @@ -66,7 +66,7 @@ def make_fixture(binary=False, balanced=False, split=False): ## Tests ########################################################################## -class ClassBalanceTests(VisualTestCase, DatasetMixin): +class TestClassBalance(VisualTestCase, DatasetMixin): """ Test ClassBalance visualizer """ diff --git a/tests/test_target/test_feature_correlation.py b/tests/test_target/test_feature_correlation.py index de357550d..dcd06edd1 100644 --- a/tests/test_target/test_feature_correlation.py +++ b/tests/test_target/test_feature_correlation.py @@ -20,10 +20,6 @@ import sys import pytest import numpy as np -try: - import pandas as pd -except ImportError: - pd = None import numpy.testing as npt import matplotlib.pyplot as plt @@ -31,9 +27,13 @@ from yellowbrick.exceptions import YellowbrickValueError, YellowbrickWarning from sklearn import datasets - from tests.base import VisualTestCase +try: + import pandas as pd +except ImportError: + pd = None + ########################################################################## ## Feature Correlation Tests diff --git a/tests/test_text/test_base.py b/tests/test_text/test_base.py index f913b537e..855d32d2c 100644 --- a/tests/test_text/test_base.py +++ b/tests/test_text/test_base.py @@ -17,8 +17,6 @@ ## Imports ########################################################################## -import unittest - from yellowbrick.base import * from yellowbrick.text.base import * from sklearn.base import BaseEstimator, TransformerMixin @@ -28,22 +26,13 @@ ## TextVisualizer Base Tests ########################################################################## -class TextVisualizerBaseTests(unittest.TestCase): +class TestTextVisualizerBase(object): def test_subclass(self): """ - Assert the text visualizer is subclassed correctly + Assert the text visualizer is subclassed correctly """ visualizer = TextVisualizer() - self.assertIsInstance(visualizer, TransformerMixin) - self.assertIsInstance(visualizer, BaseEstimator) - self.assertIsInstance(visualizer, Visualizer) - - # def test_interface(self): - # """ - # Test the feature visualizer interface - # """ - # - # visualizer = TextVisualizer() - # with self.assertRaises(NotImplementedError): - # visualizer.poof() + assert isinstance(visualizer, TransformerMixin) + assert isinstance(visualizer, BaseEstimator) + assert isinstance(visualizer, Visualizer) diff --git a/tests/test_text/test_dispersion.py b/tests/test_text/test_dispersion.py index c6bda43e1..19dee945d 100644 --- a/tests/test_text/test_dispersion.py +++ b/tests/test_text/test_dispersion.py @@ -19,12 +19,13 @@ ########################################################################## import pytest +import matplotlib.pyplot as plt from yellowbrick.exceptions import YellowbrickValueError from yellowbrick.datasets import load_hobbies from yellowbrick.text.dispersion import * from tests.base import VisualTestCase -import matplotlib.pyplot as plt + ########################################################################## ## Data @@ -36,7 +37,7 @@ ## DispersionPlot Tests ########################################################################## -class DispersionPlotTests(VisualTestCase): +class TestDispersionPlot(VisualTestCase): def test_quick_method(self): """ @@ -107,7 +108,6 @@ def test_dispersion_plot_annotate_docs(self): self.assert_images_similar(visualizer, tol=25.5) - def test_dispersion_plot_color_by_class(self): """ Assert no errors occur during DispersionPlot integration diff --git a/tests/test_text/test_freqdist.py b/tests/test_text/test_freqdist.py index 5e654ea3c..29ebe25ec 100644 --- a/tests/test_text/test_freqdist.py +++ b/tests/test_text/test_freqdist.py @@ -35,7 +35,7 @@ ## FreqDist Tests ########################################################################## -class FreqDistTests(VisualTestCase): +class TestFreqDist(VisualTestCase): @pytest.mark.xfail( IS_WINDOWS_OR_CONDA, diff --git a/tests/test_text/test_postag.py b/tests/test_text/test_postag.py index f2f66446b..a8a4bd0a9 100644 --- a/tests/test_text/test_postag.py +++ b/tests/test_text/test_postag.py @@ -37,6 +37,7 @@ except ImportError: spacy = None + ########################################################################## ## Data ########################################################################## @@ -201,11 +202,11 @@ def test_frequency_mode(self): viz = postag(tagged_docs, ax=ax, frequency=True) viz.finalize() ax.grid(False) - + # Sorted tags i.e predetermined order sorted_tags = ['noun', 'adjective', 'punctuation', 'verb', 'preposition', - 'determiner', 'adverb', 'conjunction', 'pronoun', 'wh- word', - 'modal', 'infinitive', 'possessive', 'other', 'symbol', + 'determiner', 'adverb', 'conjunction', 'pronoun', 'wh- word', + 'modal', 'infinitive', 'possessive', 'other', 'symbol', 'existential', 'digit', 'non-English', 'interjection', 'list'] # Extract tick labels from the plot ticks_ax = [tick.get_text() for tick in ax.xaxis.get_ticklabels()] @@ -284,10 +285,10 @@ def test_stack_mode(self): visualizer.ax.grid(False) self.assert_images_similar(ax=ax) - + def test_stack_frequency_mode(self): """ - Assert no errors occur when the visualizer is run on both stack and + Assert no errors occur when the visualizer is run on both stack and frequency mode """ check_nltk_data() @@ -298,11 +299,11 @@ def test_stack_frequency_mode(self): visualizer = PosTagVisualizer(stack=True, frequency=True, ax=ax) visualizer.fit(tagged_docs, y=['a','b','c']) visualizer.ax.grid(False) - + # Sorted tags i.e predetermined order sorted_tags = ['noun', 'adjective', 'punctuation', 'verb', 'preposition', - 'determiner', 'adverb', 'conjunction', 'pronoun', 'wh- word', - 'modal', 'infinitive', 'possessive', 'other', 'symbol', + 'determiner', 'adverb', 'conjunction', 'pronoun', 'wh- word', + 'modal', 'infinitive', 'possessive', 'other', 'symbol', 'existential', 'digit', 'non-English', 'interjection', 'list'] # Extract tick labels from the plot ticks_ax = [tick.get_text() for tick in ax.xaxis.get_ticklabels()] diff --git a/tests/test_text/test_tsne.py b/tests/test_text/test_tsne.py index 8fee67cd2..dc56d554d 100644 --- a/tests/test_text/test_tsne.py +++ b/tests/test_text/test_tsne.py @@ -41,6 +41,7 @@ corpus = load_hobbies() + ########################################################################## ## TSNE Tests ########################################################################## @@ -132,16 +133,16 @@ def test_custom_colors_tsne(self): """ ## produce random data X, y = make_classification(n_samples=200, n_features=100, - n_informative=20, n_redundant=10, + n_informative=20, n_redundant=10, n_classes=5, random_state=42) - + ## specify a list of custom colors >= n_classes purple_blues = ["indigo", "orchid", "plum", "navy", "purple", "blue"] - + ## instantiate the visualizer and check that self.colors is correct purple_tsne = TSNEVisualizer(colors=purple_blues, random_state=87) assert purple_tsne.colors == purple_blues - + ## fit the visualizer and check that self.color_values is as long as ## n_classes and is the first n_classes items in self.colors purple_tsne.fit(X,y) diff --git a/tests/test_text/test_umap.py b/tests/test_text/test_umap.py index c9798831b..4bce784fb 100644 --- a/tests/test_text/test_umap.py +++ b/tests/test_text/test_umap.py @@ -51,6 +51,7 @@ corpus = load_hobbies() + ########################################################################## ## UMAP Tests ########################################################################## @@ -143,16 +144,16 @@ def test_custom_colors_umap(self): """ ## produce random data X, y = make_classification(n_samples=200, n_features=100, - n_informative=20, n_redundant=10, + n_informative=20, n_redundant=10, n_classes=5, random_state=42) - + ## specify a list of custom colors >= n_classes purple_blues = ["indigo", "orchid", "plum", "navy", "purple", "blue"] - + ## instantiate the visualizer and check that self.colors is correct purple_umap = UMAPVisualizer(colors=purple_blues, random_state=87) assert purple_umap.colors == purple_blues - + ## fit the visualizer and check that self.color_values is as long as ## n_classes and is the first n_classes items in self.colors purple_umap.fit(X,y) diff --git a/tests/test_utils/test_decorators.py b/tests/test_utils/test_decorators.py index 99e6a477f..c5c9c98f5 100644 --- a/tests/test_utils/test_decorators.py +++ b/tests/test_utils/test_decorators.py @@ -17,8 +17,6 @@ ## Imports ########################################################################## -import unittest - from yellowbrick.utils.decorators import * @@ -26,7 +24,7 @@ ## Decorator Tests ########################################################################## -class DecoratorTests(unittest.TestCase): +class TestDecorators(object): """ Tests for the decorator utilities. """ @@ -43,10 +41,9 @@ def foo(self): return "bar" viz = Visualizer() - self.assertFalse(hasattr(viz, "_foo")) - self.assertEqual(viz.foo, "bar") - self.assertEqual(viz._foo, "bar") - + assert not hasattr(viz, "_foo") + assert viz.foo == "bar" + assert viz._foo == "bar" def test_docutil(self): """ @@ -69,34 +66,18 @@ def undecorated(*args, **kwargs): pass # Test the undecorated string to protect from magic - self.assertEqual( - undecorated.__doc__.strip(), "This is an undecorated function string." - ) + assert undecorated.__doc__.strip() == "This is an undecorated function string." # Decorate manually and test the newly decorated return function. decorated = docutil(Visualizer.__init__)(undecorated) - self.assertEqual( - decorated.__doc__.strip(), "This is the correct docstring." - ) + assert decorated.__doc__.strip() == "This is the correct docstring." # Assert that decoration modifies the original function. - self.assertEqual( - undecorated.__doc__.strip(), "This is the correct docstring." - ) + assert undecorated.__doc__.strip() == "This is the correct docstring." @docutil(Visualizer.__init__) def sugar(*args, **kwargs): pass # Assert that syntactic sugar works as expected. - self.assertEqual( - sugar.__doc__.strip(), "This is the correct docstring." - ) - - -########################################################################## -## Execute Tests -########################################################################## - -if __name__ == "__main__": - unittest.main() + assert sugar.__doc__.strip() == "This is the correct docstring." diff --git a/tests/test_utils/test_helpers.py b/tests/test_utils/test_helpers.py index 6c4fe9f62..b276a97f3 100644 --- a/tests/test_utils/test_helpers.py +++ b/tests/test_utils/test_helpers.py @@ -81,7 +81,6 @@ def test_str_input(self): ## Numeric Function Tests ########################################################################## - class TestNumericFunctions(object): """ Numeric helper functions diff --git a/tests/test_utils/test_kneed.py b/tests/test_utils/test_kneed.py index e0e788a9c..c9134c711 100644 --- a/tests/test_utils/test_kneed.py +++ b/tests/test_utils/test_kneed.py @@ -2,22 +2,22 @@ # A port of the tests for knee-point detection package, kneed. # # Author: Kevin Arvai -# Author: Pradeep Singh +# Author: Pradeep Singh # Created: Mon Apr 23 01:29:18 2019 -0400 # # Copyright (C) 2017 Kevin Arvai # All rights reserved. -# Redistribution and use in source and binary forms, with or without modification, +# Redistribution and use in source and binary forms, with or without modification, # are permitted provided that the following conditions are met: -# +# # 1. Redistributions of source code must retain the above copyright notice, this list # of conditions and the following disclaimer. # -# 2. Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other +# 2. Redistributions in binary form must reproduce the above copyright notice, this +# list of conditions and the following disclaimer in the documentation and/or other # materials provided with the distribution. # -# 3. Neither the name of the copyright holder nor the names of its contributors may +# 3. Neither the name of the copyright holder nor the names of its contributors may # be used to endorse or promote products derived from this software without specific # prior written permission. # @@ -26,7 +26,7 @@ # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS # OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN @@ -35,10 +35,11 @@ # ID: test_kneed.py [] pswaldia@no-reply.github.com $ """ -This package contains a port of the tests for knee-point detection package, kneed, by -Kevin Arvai and hosted at https://github.com/arvkevi/kneed. This port is maintained +This package contains a port of the tests for knee-point detection package, kneed, by +Kevin Arvai and hosted at https://github.com/arvkevi/kneed. This port is maintained with permission by the Yellowbrick contributors. """ + import numpy as np from yellowbrick.utils.kneed import KneeLocator @@ -50,28 +51,28 @@ def test_concave_increasing(): - """Tests that a correct knee point is detected in + """Tests that a correct knee point is detected in curve having concave and increasing nature.""" kn = KneeLocator(x, y_concave_inc, curve_nature='concave', curve_direction='increasing') assert kn.knee == 2 def test_concave_decreasing(): - """Tests that a correct knee point is detected in + """Tests that a correct knee point is detected in curve having concave and decreasing nature.""" kn = KneeLocator(x, y_concave_dec, curve_nature='concave', curve_direction='decreasing') assert kn.knee == 7 def test_convex_increasing(): - """Tests that a correct knee point is detected in + """Tests that a correct knee point is detected in curve having convex and increasing nature.""" kn = KneeLocator(x, y_convex_inc, curve_nature='convex', curve_direction='increasing') assert kn.knee == 7 def test_convex_decreasing(): - """Tests that a correct knee point is detected in + """Tests that a correct knee point is detected in curve having convex and decreasing nature.""" kn = KneeLocator(x, y_convex_dec, curve_nature='convex', curve_direction='decreasing') assert kn.knee == 2 diff --git a/tests/test_utils/test_timer.py b/tests/test_utils/test_timer.py index 5f7cbf719..8f1334511 100644 --- a/tests/test_utils/test_timer.py +++ b/tests/test_utils/test_timer.py @@ -19,6 +19,7 @@ from unittest import mock from yellowbrick.utils.timer import * + ########################################################################## ## Helper Function Tests ########################################################################## diff --git a/yellowbrick/features/rfecv.py b/yellowbrick/features/rfecv.py index e224bd8f1..e68af5c75 100644 --- a/yellowbrick/features/rfecv.py +++ b/yellowbrick/features/rfecv.py @@ -171,7 +171,7 @@ def fit(self, X, y=None): else: step = int(self.step) - if step < 0: + if step <= 0: raise YellowbrickValueError("step must be >0") # Create the RFE model
OpenNMT__OpenNMT-tf-577
[ { "content": "\"\"\"ARK data file to TFRecords converter.\n\nThe scripts takes the ARK data file and optionally the indexed target text\nto write aligned source and target data.\n\"\"\"\n\nimport argparse\nimport numpy as np\nimport tensorflow as tf\n\nfrom opennmt.inputters.record_inputter import write_sequence_record\n\n\ndef consume_next_vector(ark_file):\n \"\"\"Consumes the next vector.\n\n Args:\n ark_file: The ARK data file.\n\n Returns:\n The next vector as a 2D Numpy array.\n \"\"\"\n idx = None\n vector = []\n\n for line in ark_file:\n line = line.strip()\n fields = line.split()\n\n if not idx:\n idx = fields[0]\n fields.pop(0)\n fields.pop(0)\n\n end = fields and fields[-1] == \"]\"\n\n if end:\n fields.pop()\n\n if fields:\n vector.append(fields)\n\n if end:\n break\n\n return idx, np.asarray(vector, dtype=tf.float32)\n\ndef consume_next_text(text_file):\n \"\"\"Consumes the next text line from `text_file`.\"\"\"\n idx = None\n text = text_file.readline()\n\n if text:\n tokens = text.strip().split()\n idx = tokens[0]\n tokens.pop(0)\n text = \" \".join(tokens)\n\n return idx, text\n\ndef write_text(text, writer):\n \"\"\"Serializes a line of text.\"\"\"\n writer.write(text)\n writer.write(\"\\n\")\n\ndef ark_to_records_aligned(ark_filename, text_filename, out_prefix, compression_type=None):\n \"\"\"Converts ARK and text datasets to aligned TFRecords and text datasets.\"\"\"\n record_filename = \"%s.records\" % out_prefix\n if compression_type == \"GZIP\":\n record_filename = \"%s.gz\" % record_filename\n record_writer = tf.io.TFRecordWriter(record_filename, options=compression_type)\n text_writer = open(out_prefix + \".txt\", encoding=\"utf-8\", mode=\"w\")\n\n ark_buffer = {}\n text_buffer = {}\n count = 0\n\n def _write_example(vector, text):\n write_sequence_record(vector, record_writer)\n write_text(text, text_writer)\n\n def _search_aligned():\n for idx in ark_buffer:\n if idx in text_buffer:\n vector = ark_buffer[idx]\n text = text_buffer[idx]\n\n del ark_buffer[idx]\n del text_buffer[idx]\n\n return vector, text\n\n return None, None\n\n with open(ark_filename, encoding=\"utf-8\") as ark_file, open(text_filename, encoding=\"utf-8\") as text_file: #pylint: disable=line-too-long\n while True:\n ark_idx, vector = consume_next_vector(ark_file)\n text_idx, text = consume_next_text(text_file)\n\n if not ark_idx and not text_idx:\n # Both files are empty.\n break\n\n if ark_idx == text_idx:\n # If the indices match, write the example.\n _write_example(vector, text)\n count += 1\n else:\n # Otherwise store the entries.\n if ark_idx:\n ark_buffer[ark_idx] = vector\n if text_idx:\n text_buffer[text_idx] = text\n\n # Look if we can now find aligned entries.\n vector, text = _search_aligned()\n\n if vector is not None:\n _write_example(vector, text)\n count += 1\n\n # Search alignments in stored entries.\n while True:\n vector, text = _search_aligned()\n if vector is None:\n break\n _write_example(vector, text)\n count += 1\n\n record_writer.close()\n text_writer.close()\n\n print(\"Saved {} aligned records.\".format(count))\n\ndef ark_to_records(ark_filename, out_prefix, compression_type=None):\n \"\"\"Converts ARK dataset to TFRecords.\"\"\"\n record_writer = tf.io.TFRecordWriter(out_prefix + \".records\", options=compression_type)\n count = 0\n\n with open(ark_filename, encoding=\"utf-8\") as ark_file:\n while True:\n ark_idx, vector = consume_next_vector(ark_file)\n if not ark_idx:\n break\n write_sequence_record(vector, record_writer)\n count += 1\n\n record_writer.close()\n print(\"Saved {} records.\".format(count))\n\n\ndef main():\n parser = argparse.ArgumentParser()\n parser.add_argument(\"--ark\", required=True,\n help=\"Indexed ARK data file.\")\n parser.add_argument(\"--txt\",\n help=(\"Indexed target text data file \"\n \"(must set it to align source and target files).\"))\n parser.add_argument(\"--out\", required=True,\n help=\"Output files prefix (will be suffixed by .records and .txt).\")\n parser.add_argument(\"--compression_type\", default=None, choices=[\"GZIP\"],\n help=\"Optional compression type.\")\n args = parser.parse_args()\n\n if args.txt:\n ark_to_records_aligned(args.ark, args.txt, args.out, compression_type=args.compression_type)\n else:\n ark_to_records(args.ark, args.out, compression_type=args.compression_type)\n\nif __name__ == \"__main__\":\n main()\n", "path": "opennmt/bin/ark_to_records.py" } ]
[ { "content": "\"\"\"ARK data file to TFRecords converter.\n\nThe scripts takes the ARK data file and optionally the indexed target text\nto write aligned source and target data.\n\"\"\"\n\nimport argparse\nimport numpy as np\nimport tensorflow as tf\n\nfrom opennmt.inputters.record_inputter import write_sequence_record\n\n\ndef consume_next_vector(ark_file):\n \"\"\"Consumes the next vector.\n\n Args:\n ark_file: The ARK data file.\n\n Returns:\n The next vector as a 2D Numpy array.\n \"\"\"\n idx = None\n vector = []\n\n for line in ark_file:\n line = line.strip()\n fields = line.split()\n\n if not idx:\n idx = fields[0]\n fields.pop(0)\n fields.pop(0)\n\n end = fields and fields[-1] == \"]\"\n\n if end:\n fields.pop()\n\n if fields:\n vector.append(fields)\n\n if end:\n break\n\n return idx, np.asarray(vector, dtype=np.float32)\n\ndef consume_next_text(text_file):\n \"\"\"Consumes the next text line from `text_file`.\"\"\"\n idx = None\n text = text_file.readline()\n\n if text:\n tokens = text.strip().split()\n idx = tokens[0]\n tokens.pop(0)\n text = \" \".join(tokens)\n\n return idx, text\n\ndef write_text(text, writer):\n \"\"\"Serializes a line of text.\"\"\"\n writer.write(text)\n writer.write(\"\\n\")\n\ndef ark_to_records_aligned(ark_filename, text_filename, out_prefix, compression_type=None):\n \"\"\"Converts ARK and text datasets to aligned TFRecords and text datasets.\"\"\"\n record_filename = \"%s.records\" % out_prefix\n if compression_type == \"GZIP\":\n record_filename = \"%s.gz\" % record_filename\n record_writer = tf.io.TFRecordWriter(record_filename, options=compression_type)\n text_writer = open(out_prefix + \".txt\", encoding=\"utf-8\", mode=\"w\")\n\n ark_buffer = {}\n text_buffer = {}\n count = 0\n\n def _write_example(vector, text):\n write_sequence_record(vector, record_writer)\n write_text(text, text_writer)\n\n def _search_aligned():\n for idx in ark_buffer:\n if idx in text_buffer:\n vector = ark_buffer[idx]\n text = text_buffer[idx]\n\n del ark_buffer[idx]\n del text_buffer[idx]\n\n return vector, text\n\n return None, None\n\n with open(ark_filename, encoding=\"utf-8\") as ark_file, open(text_filename, encoding=\"utf-8\") as text_file: #pylint: disable=line-too-long\n while True:\n ark_idx, vector = consume_next_vector(ark_file)\n text_idx, text = consume_next_text(text_file)\n\n if not ark_idx and not text_idx:\n # Both files are empty.\n break\n\n if ark_idx == text_idx:\n # If the indices match, write the example.\n _write_example(vector, text)\n count += 1\n else:\n # Otherwise store the entries.\n if ark_idx:\n ark_buffer[ark_idx] = vector\n if text_idx:\n text_buffer[text_idx] = text\n\n # Look if we can now find aligned entries.\n vector, text = _search_aligned()\n\n if vector is not None:\n _write_example(vector, text)\n count += 1\n\n # Search alignments in stored entries.\n while True:\n vector, text = _search_aligned()\n if vector is None:\n break\n _write_example(vector, text)\n count += 1\n\n record_writer.close()\n text_writer.close()\n\n print(\"Saved {} aligned records.\".format(count))\n\ndef ark_to_records(ark_filename, out_prefix, compression_type=None):\n \"\"\"Converts ARK dataset to TFRecords.\"\"\"\n record_writer = tf.io.TFRecordWriter(out_prefix + \".records\", options=compression_type)\n count = 0\n\n with open(ark_filename, encoding=\"utf-8\") as ark_file:\n while True:\n ark_idx, vector = consume_next_vector(ark_file)\n if not ark_idx:\n break\n write_sequence_record(vector, record_writer)\n count += 1\n\n record_writer.close()\n print(\"Saved {} records.\".format(count))\n\n\ndef main():\n parser = argparse.ArgumentParser()\n parser.add_argument(\"--ark\", required=True,\n help=\"Indexed ARK data file.\")\n parser.add_argument(\"--txt\",\n help=(\"Indexed target text data file \"\n \"(must set it to align source and target files).\"))\n parser.add_argument(\"--out\", required=True,\n help=\"Output files prefix (will be suffixed by .records and .txt).\")\n parser.add_argument(\"--compression_type\", default=None, choices=[\"GZIP\"],\n help=\"Optional compression type.\")\n args = parser.parse_args()\n\n if args.txt:\n ark_to_records_aligned(args.ark, args.txt, args.out, compression_type=args.compression_type)\n else:\n ark_to_records(args.ark, args.out, compression_type=args.compression_type)\n\nif __name__ == \"__main__\":\n main()\n", "path": "opennmt/bin/ark_to_records.py" } ]
diff --git a/opennmt/bin/ark_to_records.py b/opennmt/bin/ark_to_records.py index 2fcc7fab7..6eb79dd60 100644 --- a/opennmt/bin/ark_to_records.py +++ b/opennmt/bin/ark_to_records.py @@ -43,7 +43,7 @@ def consume_next_vector(ark_file): if end: break - return idx, np.asarray(vector, dtype=tf.float32) + return idx, np.asarray(vector, dtype=np.float32) def consume_next_text(text_file): """Consumes the next text line from `text_file`."""
getredash__redash-3421
[ { "content": "import sqlparse\nfrom flask import jsonify, request, url_for\nfrom flask_login import login_required\nfrom flask_restful import abort\nfrom sqlalchemy.orm.exc import StaleDataError\nfrom funcy import partial\n\nfrom redash import models, settings\nfrom redash.authentication.org_resolving import current_org\nfrom redash.handlers.base import (BaseResource, filter_by_tags, get_object_or_404,\n org_scoped_rule, paginate, routes, order_results as _order_results)\nfrom redash.handlers.query_results import run_query\nfrom redash.permissions import (can_modify, not_view_only, require_access,\n require_admin_or_owner,\n require_object_modify_permission,\n require_permission, view_only)\nfrom redash.utils import collect_parameters_from_request\nfrom redash.serializers import QuerySerializer\n\n\n# Ordering map for relationships\norder_map = {\n 'name': 'lowercase_name',\n '-name': '-lowercase_name',\n 'created_at': 'created_at',\n '-created_at': '-created_at',\n 'schedule': 'schedule',\n '-schedule': '-schedule',\n 'runtime': 'query_results-runtime',\n '-runtime': '-query_results-runtime',\n 'executed_at': 'query_results-retrieved_at',\n '-executed_at': '-query_results-retrieved_at',\n 'created_by': 'users-name',\n '-created_by': '-users-name',\n}\n\norder_results = partial(\n _order_results,\n default_order='-created_at',\n allowed_orders=order_map,\n)\n\n\n@routes.route(org_scoped_rule('/api/queries/format'), methods=['POST'])\n@login_required\ndef format_sql_query(org_slug=None):\n \"\"\"\n Formats an SQL query using the Python ``sqlparse`` formatter.\n\n :<json string query: The SQL text to format\n :>json string query: Formatted SQL text\n \"\"\"\n arguments = request.get_json(force=True)\n query = arguments.get(\"query\", \"\")\n\n return jsonify({'query': sqlparse.format(query, **settings.SQLPARSE_FORMAT_OPTIONS)})\n\n\nclass QuerySearchResource(BaseResource):\n @require_permission('view_query')\n def get(self):\n \"\"\"\n Search query text, names, and descriptions.\n\n :qparam string q: Search term\n :qparam number include_drafts: Whether to include draft in results\n\n Responds with a list of :ref:`query <query-response-label>` objects.\n \"\"\"\n term = request.args.get('q', '')\n if not term:\n return []\n\n include_drafts = request.args.get('include_drafts') is not None\n\n self.record_event({\n 'action': 'search',\n 'object_type': 'query',\n 'term': term,\n })\n\n # this redirects to the new query list API that is aware of search\n new_location = url_for(\n 'queries',\n q=term,\n org_slug=current_org.slug,\n drafts='true' if include_drafts else 'false',\n )\n return {}, 301, {'Location': new_location}\n\n\nclass QueryRecentResource(BaseResource):\n @require_permission('view_query')\n def get(self):\n \"\"\"\n Retrieve up to 10 queries recently modified by the user.\n\n Responds with a list of :ref:`query <query-response-label>` objects.\n \"\"\"\n\n results = models.Query.by_user(self.current_user).order_by(models.Query.updated_at.desc()).limit(10)\n return QuerySerializer(results, with_last_modified_by=False, with_user=False).serialize()\n\n\nclass BaseQueryListResource(BaseResource):\n\n def get_queries(self, search_term):\n if search_term:\n results = models.Query.search(\n search_term,\n self.current_user.group_ids,\n self.current_user.id,\n include_drafts=True,\n )\n else:\n results = models.Query.all_queries(\n self.current_user.group_ids,\n self.current_user.id,\n include_drafts=True,\n )\n return filter_by_tags(results, models.Query.tags)\n\n @require_permission('view_query')\n def get(self):\n \"\"\"\n Retrieve a list of queries.\n\n :qparam number page_size: Number of queries to return per page\n :qparam number page: Page number to retrieve\n :qparam number order: Name of column to order by\n :qparam number q: Full text search term\n\n Responds with an array of :ref:`query <query-response-label>` objects.\n \"\"\"\n # See if we want to do full-text search or just regular queries\n search_term = request.args.get('q', '')\n\n queries = self.get_queries(search_term)\n\n results = filter_by_tags(queries, models.Query.tags)\n\n # order results according to passed order parameter,\n # special-casing search queries where the database\n # provides an order by search rank\n ordered_results = order_results(results, fallback=bool(search_term))\n\n page = request.args.get('page', 1, type=int)\n page_size = request.args.get('page_size', 25, type=int)\n\n response = paginate(\n ordered_results,\n page=page,\n page_size=page_size,\n serializer=QuerySerializer,\n with_stats=True,\n with_last_modified_by=False\n )\n\n if search_term:\n self.record_event({\n 'action': 'search',\n 'object_type': 'query',\n 'term': search_term,\n })\n else:\n self.record_event({\n 'action': 'list',\n 'object_type': 'query',\n })\n\n return response\n\n\nclass QueryListResource(BaseQueryListResource):\n @require_permission('create_query')\n def post(self):\n \"\"\"\n Create a new query.\n\n :<json number data_source_id: The ID of the data source this query will run on\n :<json string query: Query text\n :<json string name:\n :<json string description:\n :<json string schedule: Schedule interval, in seconds, for repeated execution of this query\n :<json object options: Query options\n\n .. _query-response-label:\n\n :>json number id: Query ID\n :>json number latest_query_data_id: ID for latest output data from this query\n :>json string name:\n :>json string description:\n :>json string query: Query text\n :>json string query_hash: Hash of query text\n :>json string schedule: Schedule interval, in seconds, for repeated execution of this query\n :>json string api_key: Key for public access to this query's results.\n :>json boolean is_archived: Whether this query is displayed in indexes and search results or not.\n :>json boolean is_draft: Whether this query is a draft or not\n :>json string updated_at: Time of last modification, in ISO format\n :>json string created_at: Time of creation, in ISO format\n :>json number data_source_id: ID of the data source this query will run on\n :>json object options: Query options\n :>json number version: Revision version (for update conflict avoidance)\n :>json number user_id: ID of query creator\n :>json number last_modified_by_id: ID of user who last modified this query\n :>json string retrieved_at: Time when query results were last retrieved, in ISO format (may be null)\n :>json number runtime: Runtime of last query execution, in seconds (may be null)\n \"\"\"\n query_def = request.get_json(force=True)\n data_source = models.DataSource.get_by_id_and_org(query_def.pop('data_source_id'), self.current_org)\n require_access(data_source.groups, self.current_user, not_view_only)\n\n for field in ['id', 'created_at', 'api_key', 'visualizations', 'latest_query_data', 'last_modified_by']:\n query_def.pop(field, None)\n\n query_def['query_text'] = query_def.pop('query')\n query_def['user'] = self.current_user\n query_def['data_source'] = data_source\n query_def['org'] = self.current_org\n query_def['is_draft'] = True\n query = models.Query.create(**query_def)\n models.db.session.add(query)\n models.db.session.commit()\n\n self.record_event({\n 'action': 'create',\n 'object_id': query.id,\n 'object_type': 'query'\n })\n\n return QuerySerializer(query).serialize()\n\n\nclass QueryArchiveResource(BaseQueryListResource):\n\n def get_queries(self, search_term):\n if search_term:\n return models.Query.search(\n search_term,\n self.current_user.group_ids,\n self.current_user.id,\n include_drafts=False,\n include_archived=True,\n )\n else:\n return models.Query.all_queries(\n self.current_user.group_ids,\n self.current_user.id,\n include_drafts=False,\n include_archived=True,\n )\n\n\nclass MyQueriesResource(BaseResource):\n @require_permission('view_query')\n def get(self):\n \"\"\"\n Retrieve a list of queries created by the current user.\n\n :qparam number page_size: Number of queries to return per page\n :qparam number page: Page number to retrieve\n :qparam number order: Name of column to order by\n :qparam number search: Full text search term\n\n Responds with an array of :ref:`query <query-response-label>` objects.\n \"\"\"\n search_term = request.args.get('q', '')\n if search_term:\n results = models.Query.search_by_user(search_term, self.current_user)\n else:\n results = models.Query.by_user(self.current_user)\n\n results = filter_by_tags(results, models.Query.tags)\n\n # order results according to passed order parameter,\n # special-casing search queries where the database\n # provides an order by search rank\n ordered_results = order_results(results, fallback=bool(search_term))\n\n page = request.args.get('page', 1, type=int)\n page_size = request.args.get('page_size', 25, type=int)\n return paginate(\n ordered_results,\n page,\n page_size,\n QuerySerializer,\n with_stats=True,\n with_last_modified_by=False,\n )\n\n\nclass QueryResource(BaseResource):\n @require_permission('edit_query')\n def post(self, query_id):\n \"\"\"\n Modify a query.\n\n :param query_id: ID of query to update\n :<json number data_source_id: The ID of the data source this query will run on\n :<json string query: Query text\n :<json string name:\n :<json string description:\n :<json string schedule: Schedule interval, in seconds, for repeated execution of this query\n :<json object options: Query options\n\n Responds with the updated :ref:`query <query-response-label>` object.\n \"\"\"\n query = get_object_or_404(models.Query.get_by_id_and_org, query_id, self.current_org)\n query_def = request.get_json(force=True)\n\n require_object_modify_permission(query, self.current_user)\n\n for field in ['id', 'created_at', 'api_key', 'visualizations', 'latest_query_data', 'user', 'last_modified_by', 'org']:\n query_def.pop(field, None)\n\n if 'query' in query_def:\n query_def['query_text'] = query_def.pop('query')\n\n query_def['last_modified_by'] = self.current_user\n query_def['changed_by'] = self.current_user\n # SQLAlchemy handles the case where a concurrent transaction beats us\n # to the update. But we still have to make sure that we're not starting\n # out behind.\n if 'version' in query_def and query_def['version'] != query.version:\n abort(409)\n\n try:\n self.update_model(query, query_def)\n models.db.session.commit()\n except StaleDataError:\n abort(409)\n\n return QuerySerializer(query, with_visualizations=True).serialize()\n\n @require_permission('view_query')\n def get(self, query_id):\n \"\"\"\n Retrieve a query.\n\n :param query_id: ID of query to fetch\n\n Responds with the :ref:`query <query-response-label>` contents.\n \"\"\"\n q = get_object_or_404(models.Query.get_by_id_and_org, query_id, self.current_org)\n require_access(q.groups, self.current_user, view_only)\n\n result = QuerySerializer(q, with_visualizations=True).serialize()\n result['can_edit'] = can_modify(q, self.current_user)\n\n self.record_event({\n 'action': 'view',\n 'object_id': query_id,\n 'object_type': 'query',\n })\n\n return result\n\n # TODO: move to resource of its own? (POST /queries/{id}/archive)\n def delete(self, query_id):\n \"\"\"\n Archives a query.\n\n :param query_id: ID of query to archive\n \"\"\"\n query = get_object_or_404(models.Query.get_by_id_and_org, query_id, self.current_org)\n require_admin_or_owner(query.user_id)\n query.archive(self.current_user)\n models.db.session.commit()\n\n\nclass QueryForkResource(BaseResource):\n @require_permission('edit_query')\n def post(self, query_id):\n \"\"\"\n Creates a new query, copying the query text from an existing one.\n\n :param query_id: ID of query to fork\n\n Responds with created :ref:`query <query-response-label>` object.\n \"\"\"\n query = get_object_or_404(models.Query.get_by_id_and_org, query_id, self.current_org)\n require_access(query.data_source.groups, self.current_user, not_view_only)\n forked_query = query.fork(self.current_user)\n models.db.session.commit()\n\n self.record_event({\n 'action': 'fork',\n 'object_id': query_id,\n 'object_type': 'query',\n })\n\n return QuerySerializer(forked_query, with_visualizations=True).serialize()\n\n\nclass QueryRefreshResource(BaseResource):\n def post(self, query_id):\n \"\"\"\n Execute a query, updating the query object with the results.\n\n :param query_id: ID of query to execute\n\n Responds with query task details.\n \"\"\"\n # TODO: this should actually check for permissions, but because currently you can only\n # get here either with a user API key or a query one, we can just check whether it's\n # an api key (meaning this is a query API key, which only grants read access).\n if self.current_user.is_api_user():\n abort(403, message=\"Please use a user API key.\")\n\n query = get_object_or_404(models.Query.get_by_id_and_org, query_id, self.current_org)\n require_access(query.groups, self.current_user, not_view_only)\n\n parameter_values = collect_parameters_from_request(request.args)\n\n return run_query(query.data_source, parameter_values, query.query_text, query.id)\n\n\nclass QueryTagsResource(BaseResource):\n def get(self):\n \"\"\"\n Returns all query tags including those for drafts.\n \"\"\"\n tags = models.Query.all_tags(self.current_user, include_drafts=True)\n return {\n 'tags': [\n {\n 'name': name,\n 'count': count,\n }\n for name, count in tags\n ]\n }\n", "path": "redash/handlers/queries.py" } ]
[ { "content": "import sqlparse\nfrom flask import jsonify, request, url_for\nfrom flask_login import login_required\nfrom flask_restful import abort\nfrom sqlalchemy.orm.exc import StaleDataError\nfrom funcy import partial\n\nfrom redash import models, settings\nfrom redash.authentication.org_resolving import current_org\nfrom redash.handlers.base import (BaseResource, filter_by_tags, get_object_or_404,\n org_scoped_rule, paginate, routes, order_results as _order_results)\nfrom redash.handlers.query_results import run_query\nfrom redash.permissions import (can_modify, not_view_only, require_access,\n require_admin_or_owner,\n require_object_modify_permission,\n require_permission, view_only)\nfrom redash.utils import collect_parameters_from_request\nfrom redash.serializers import QuerySerializer\n\n\n# Ordering map for relationships\norder_map = {\n 'name': 'lowercase_name',\n '-name': '-lowercase_name',\n 'created_at': 'created_at',\n '-created_at': '-created_at',\n 'schedule': 'schedule',\n '-schedule': '-schedule',\n 'runtime': 'query_results-runtime',\n '-runtime': '-query_results-runtime',\n 'executed_at': 'query_results-retrieved_at',\n '-executed_at': '-query_results-retrieved_at',\n 'created_by': 'users-name',\n '-created_by': '-users-name',\n}\n\norder_results = partial(\n _order_results,\n default_order='-created_at',\n allowed_orders=order_map,\n)\n\n\n@routes.route(org_scoped_rule('/api/queries/format'), methods=['POST'])\n@login_required\ndef format_sql_query(org_slug=None):\n \"\"\"\n Formats an SQL query using the Python ``sqlparse`` formatter.\n\n :<json string query: The SQL text to format\n :>json string query: Formatted SQL text\n \"\"\"\n arguments = request.get_json(force=True)\n query = arguments.get(\"query\", \"\")\n\n return jsonify({'query': sqlparse.format(query, **settings.SQLPARSE_FORMAT_OPTIONS)})\n\n\nclass QuerySearchResource(BaseResource):\n @require_permission('view_query')\n def get(self):\n \"\"\"\n Search query text, names, and descriptions.\n\n :qparam string q: Search term\n :qparam number include_drafts: Whether to include draft in results\n\n Responds with a list of :ref:`query <query-response-label>` objects.\n \"\"\"\n term = request.args.get('q', '')\n if not term:\n return []\n\n include_drafts = request.args.get('include_drafts') is not None\n\n self.record_event({\n 'action': 'search',\n 'object_type': 'query',\n 'term': term,\n })\n\n # this redirects to the new query list API that is aware of search\n new_location = url_for(\n 'queries',\n q=term,\n org_slug=current_org.slug,\n drafts='true' if include_drafts else 'false',\n )\n return {}, 301, {'Location': new_location}\n\n\nclass QueryRecentResource(BaseResource):\n @require_permission('view_query')\n def get(self):\n \"\"\"\n Retrieve up to 10 queries recently modified by the user.\n\n Responds with a list of :ref:`query <query-response-label>` objects.\n \"\"\"\n\n results = models.Query.by_user(self.current_user).order_by(models.Query.updated_at.desc()).limit(10)\n return QuerySerializer(results, with_last_modified_by=False, with_user=False).serialize()\n\n\nclass BaseQueryListResource(BaseResource):\n\n def get_queries(self, search_term):\n if search_term:\n results = models.Query.search(\n search_term,\n self.current_user.group_ids,\n self.current_user.id,\n include_drafts=True,\n )\n else:\n results = models.Query.all_queries(\n self.current_user.group_ids,\n self.current_user.id,\n include_drafts=True,\n )\n return filter_by_tags(results, models.Query.tags)\n\n @require_permission('view_query')\n def get(self):\n \"\"\"\n Retrieve a list of queries.\n\n :qparam number page_size: Number of queries to return per page\n :qparam number page: Page number to retrieve\n :qparam number order: Name of column to order by\n :qparam number q: Full text search term\n\n Responds with an array of :ref:`query <query-response-label>` objects.\n \"\"\"\n # See if we want to do full-text search or just regular queries\n search_term = request.args.get('q', '')\n\n queries = self.get_queries(search_term)\n\n results = filter_by_tags(queries, models.Query.tags)\n\n # order results according to passed order parameter,\n # special-casing search queries where the database\n # provides an order by search rank\n ordered_results = order_results(results, fallback=bool(search_term))\n\n page = request.args.get('page', 1, type=int)\n page_size = request.args.get('page_size', 25, type=int)\n\n response = paginate(\n ordered_results,\n page=page,\n page_size=page_size,\n serializer=QuerySerializer,\n with_stats=True,\n with_last_modified_by=False\n )\n\n if search_term:\n self.record_event({\n 'action': 'search',\n 'object_type': 'query',\n 'term': search_term,\n })\n else:\n self.record_event({\n 'action': 'list',\n 'object_type': 'query',\n })\n\n return response\n\n\nclass QueryListResource(BaseQueryListResource):\n @require_permission('create_query')\n def post(self):\n \"\"\"\n Create a new query.\n\n :<json number data_source_id: The ID of the data source this query will run on\n :<json string query: Query text\n :<json string name:\n :<json string description:\n :<json string schedule: Schedule interval, in seconds, for repeated execution of this query\n :<json object options: Query options\n\n .. _query-response-label:\n\n :>json number id: Query ID\n :>json number latest_query_data_id: ID for latest output data from this query\n :>json string name:\n :>json string description:\n :>json string query: Query text\n :>json string query_hash: Hash of query text\n :>json string schedule: Schedule interval, in seconds, for repeated execution of this query\n :>json string api_key: Key for public access to this query's results.\n :>json boolean is_archived: Whether this query is displayed in indexes and search results or not.\n :>json boolean is_draft: Whether this query is a draft or not\n :>json string updated_at: Time of last modification, in ISO format\n :>json string created_at: Time of creation, in ISO format\n :>json number data_source_id: ID of the data source this query will run on\n :>json object options: Query options\n :>json number version: Revision version (for update conflict avoidance)\n :>json number user_id: ID of query creator\n :>json number last_modified_by_id: ID of user who last modified this query\n :>json string retrieved_at: Time when query results were last retrieved, in ISO format (may be null)\n :>json number runtime: Runtime of last query execution, in seconds (may be null)\n \"\"\"\n query_def = request.get_json(force=True)\n data_source = models.DataSource.get_by_id_and_org(query_def.pop('data_source_id'), self.current_org)\n require_access(data_source.groups, self.current_user, not_view_only)\n\n for field in ['id', 'created_at', 'api_key', 'visualizations', 'latest_query_data', 'last_modified_by']:\n query_def.pop(field, None)\n\n query_def['query_text'] = query_def.pop('query')\n query_def['user'] = self.current_user\n query_def['data_source'] = data_source\n query_def['org'] = self.current_org\n query_def['is_draft'] = True\n query = models.Query.create(**query_def)\n models.db.session.add(query)\n models.db.session.commit()\n\n self.record_event({\n 'action': 'create',\n 'object_id': query.id,\n 'object_type': 'query'\n })\n\n return QuerySerializer(query, with_visualizations=True).serialize()\n\n\nclass QueryArchiveResource(BaseQueryListResource):\n\n def get_queries(self, search_term):\n if search_term:\n return models.Query.search(\n search_term,\n self.current_user.group_ids,\n self.current_user.id,\n include_drafts=False,\n include_archived=True,\n )\n else:\n return models.Query.all_queries(\n self.current_user.group_ids,\n self.current_user.id,\n include_drafts=False,\n include_archived=True,\n )\n\n\nclass MyQueriesResource(BaseResource):\n @require_permission('view_query')\n def get(self):\n \"\"\"\n Retrieve a list of queries created by the current user.\n\n :qparam number page_size: Number of queries to return per page\n :qparam number page: Page number to retrieve\n :qparam number order: Name of column to order by\n :qparam number search: Full text search term\n\n Responds with an array of :ref:`query <query-response-label>` objects.\n \"\"\"\n search_term = request.args.get('q', '')\n if search_term:\n results = models.Query.search_by_user(search_term, self.current_user)\n else:\n results = models.Query.by_user(self.current_user)\n\n results = filter_by_tags(results, models.Query.tags)\n\n # order results according to passed order parameter,\n # special-casing search queries where the database\n # provides an order by search rank\n ordered_results = order_results(results, fallback=bool(search_term))\n\n page = request.args.get('page', 1, type=int)\n page_size = request.args.get('page_size', 25, type=int)\n return paginate(\n ordered_results,\n page,\n page_size,\n QuerySerializer,\n with_stats=True,\n with_last_modified_by=False,\n )\n\n\nclass QueryResource(BaseResource):\n @require_permission('edit_query')\n def post(self, query_id):\n \"\"\"\n Modify a query.\n\n :param query_id: ID of query to update\n :<json number data_source_id: The ID of the data source this query will run on\n :<json string query: Query text\n :<json string name:\n :<json string description:\n :<json string schedule: Schedule interval, in seconds, for repeated execution of this query\n :<json object options: Query options\n\n Responds with the updated :ref:`query <query-response-label>` object.\n \"\"\"\n query = get_object_or_404(models.Query.get_by_id_and_org, query_id, self.current_org)\n query_def = request.get_json(force=True)\n\n require_object_modify_permission(query, self.current_user)\n\n for field in ['id', 'created_at', 'api_key', 'visualizations', 'latest_query_data', 'user', 'last_modified_by', 'org']:\n query_def.pop(field, None)\n\n if 'query' in query_def:\n query_def['query_text'] = query_def.pop('query')\n\n query_def['last_modified_by'] = self.current_user\n query_def['changed_by'] = self.current_user\n # SQLAlchemy handles the case where a concurrent transaction beats us\n # to the update. But we still have to make sure that we're not starting\n # out behind.\n if 'version' in query_def and query_def['version'] != query.version:\n abort(409)\n\n try:\n self.update_model(query, query_def)\n models.db.session.commit()\n except StaleDataError:\n abort(409)\n\n return QuerySerializer(query, with_visualizations=True).serialize()\n\n @require_permission('view_query')\n def get(self, query_id):\n \"\"\"\n Retrieve a query.\n\n :param query_id: ID of query to fetch\n\n Responds with the :ref:`query <query-response-label>` contents.\n \"\"\"\n q = get_object_or_404(models.Query.get_by_id_and_org, query_id, self.current_org)\n require_access(q.groups, self.current_user, view_only)\n\n result = QuerySerializer(q, with_visualizations=True).serialize()\n result['can_edit'] = can_modify(q, self.current_user)\n\n self.record_event({\n 'action': 'view',\n 'object_id': query_id,\n 'object_type': 'query',\n })\n\n return result\n\n # TODO: move to resource of its own? (POST /queries/{id}/archive)\n def delete(self, query_id):\n \"\"\"\n Archives a query.\n\n :param query_id: ID of query to archive\n \"\"\"\n query = get_object_or_404(models.Query.get_by_id_and_org, query_id, self.current_org)\n require_admin_or_owner(query.user_id)\n query.archive(self.current_user)\n models.db.session.commit()\n\n\nclass QueryForkResource(BaseResource):\n @require_permission('edit_query')\n def post(self, query_id):\n \"\"\"\n Creates a new query, copying the query text from an existing one.\n\n :param query_id: ID of query to fork\n\n Responds with created :ref:`query <query-response-label>` object.\n \"\"\"\n query = get_object_or_404(models.Query.get_by_id_and_org, query_id, self.current_org)\n require_access(query.data_source.groups, self.current_user, not_view_only)\n forked_query = query.fork(self.current_user)\n models.db.session.commit()\n\n self.record_event({\n 'action': 'fork',\n 'object_id': query_id,\n 'object_type': 'query',\n })\n\n return QuerySerializer(forked_query, with_visualizations=True).serialize()\n\n\nclass QueryRefreshResource(BaseResource):\n def post(self, query_id):\n \"\"\"\n Execute a query, updating the query object with the results.\n\n :param query_id: ID of query to execute\n\n Responds with query task details.\n \"\"\"\n # TODO: this should actually check for permissions, but because currently you can only\n # get here either with a user API key or a query one, we can just check whether it's\n # an api key (meaning this is a query API key, which only grants read access).\n if self.current_user.is_api_user():\n abort(403, message=\"Please use a user API key.\")\n\n query = get_object_or_404(models.Query.get_by_id_and_org, query_id, self.current_org)\n require_access(query.groups, self.current_user, not_view_only)\n\n parameter_values = collect_parameters_from_request(request.args)\n\n return run_query(query.data_source, parameter_values, query.query_text, query.id)\n\n\nclass QueryTagsResource(BaseResource):\n def get(self):\n \"\"\"\n Returns all query tags including those for drafts.\n \"\"\"\n tags = models.Query.all_tags(self.current_user, include_drafts=True)\n return {\n 'tags': [\n {\n 'name': name,\n 'count': count,\n }\n for name, count in tags\n ]\n }\n", "path": "redash/handlers/queries.py" } ]
diff --git a/client/app/pages/queries/view.js b/client/app/pages/queries/view.js index b230ab4dc0..276feab73b 100644 --- a/client/app/pages/queries/view.js +++ b/client/app/pages/queries/view.js @@ -400,7 +400,7 @@ function QueryViewCtrl( } if (status === 'done') { - const ranSelectedQuery = $scope.query.query !== $scope.queryResult.query; + const ranSelectedQuery = $scope.query.query !== $scope.queryResult.query_result.query; if (!ranSelectedQuery) { $scope.query.latest_query_data_id = $scope.queryResult.getId(); $scope.query.queryResult = $scope.queryResult; @@ -445,6 +445,9 @@ function QueryViewCtrl( $scope.saveQuery().then((query) => { // Because we have a path change, we need to "signal" the next page to // open the visualization editor. + // TODO: we don't really need this. Just need to assign query to $scope.query + // and maybe a few more small changes. Not worth handling this now, but also + // we shouldn't copy this bizzare method to the React codebase. $location.path(query.getSourceLink()).hash('add'); }); } else { diff --git a/redash/handlers/queries.py b/redash/handlers/queries.py index bd43c69576..0fc867ae8e 100644 --- a/redash/handlers/queries.py +++ b/redash/handlers/queries.py @@ -228,7 +228,7 @@ def post(self): 'object_type': 'query' }) - return QuerySerializer(query).serialize() + return QuerySerializer(query, with_visualizations=True).serialize() class QueryArchiveResource(BaseQueryListResource):
arviz-devs__arviz-1962
[ { "content": "# pylint: disable=too-many-instance-attributes,too-many-lines\r\n\"\"\"PyStan-specific conversion code.\"\"\"\r\nimport re\r\nimport warnings\r\nfrom collections import OrderedDict\r\nfrom copy import deepcopy\r\n\r\nimport numpy as np\r\nimport xarray as xr\r\n\r\nfrom .. import _log\r\nfrom ..rcparams import rcParams\r\nfrom .base import dict_to_dataset, generate_dims_coords, infer_stan_dtypes, make_attrs, requires\r\nfrom .inference_data import InferenceData\r\n\r\ntry:\r\n import ujson as json\r\nexcept ImportError:\r\n # Can't find ujson using json\r\n # mypy struggles with conditional imports expressed as catching ImportError:\r\n # https://github.com/python/mypy/issues/1153\r\n import json # type: ignore\r\n\r\n\r\nclass PyStanConverter:\r\n \"\"\"Encapsulate PyStan specific logic.\"\"\"\r\n\r\n def __init__(\r\n self,\r\n *,\r\n posterior=None,\r\n posterior_predictive=None,\r\n predictions=None,\r\n prior=None,\r\n prior_predictive=None,\r\n observed_data=None,\r\n constant_data=None,\r\n predictions_constant_data=None,\r\n log_likelihood=None,\r\n coords=None,\r\n dims=None,\r\n save_warmup=None,\r\n dtypes=None,\r\n ):\r\n self.posterior = posterior\r\n self.posterior_predictive = posterior_predictive\r\n self.predictions = predictions\r\n self.prior = prior\r\n self.prior_predictive = prior_predictive\r\n self.observed_data = observed_data\r\n self.constant_data = constant_data\r\n self.predictions_constant_data = predictions_constant_data\r\n self.log_likelihood = (\r\n rcParams[\"data.log_likelihood\"] if log_likelihood is None else log_likelihood\r\n )\r\n self.coords = coords\r\n self.dims = dims\r\n self.save_warmup = rcParams[\"data.save_warmup\"] if save_warmup is None else save_warmup\r\n self.dtypes = dtypes\r\n\r\n if (\r\n self.log_likelihood is True\r\n and self.posterior is not None\r\n and \"log_lik\" in self.posterior.sim[\"pars_oi\"]\r\n ):\r\n self.log_likelihood = [\"log_lik\"]\r\n elif isinstance(self.log_likelihood, bool):\r\n self.log_likelihood = None\r\n\r\n import pystan # pylint: disable=import-error\r\n\r\n self.pystan = pystan\r\n\r\n @requires(\"posterior\")\r\n def posterior_to_xarray(self):\r\n \"\"\"Extract posterior samples from fit.\"\"\"\r\n posterior = self.posterior\r\n # filter posterior_predictive and log_likelihood\r\n posterior_predictive = self.posterior_predictive\r\n if posterior_predictive is None:\r\n posterior_predictive = []\r\n elif isinstance(posterior_predictive, str):\r\n posterior_predictive = [posterior_predictive]\r\n predictions = self.predictions\r\n if predictions is None:\r\n predictions = []\r\n elif isinstance(predictions, str):\r\n predictions = [predictions]\r\n log_likelihood = self.log_likelihood\r\n if log_likelihood is None:\r\n log_likelihood = []\r\n elif isinstance(log_likelihood, str):\r\n log_likelihood = [log_likelihood]\r\n elif isinstance(log_likelihood, dict):\r\n log_likelihood = list(log_likelihood.values())\r\n\r\n ignore = posterior_predictive + predictions + log_likelihood + [\"lp__\"]\r\n\r\n data, data_warmup = get_draws(\r\n posterior, ignore=ignore, warmup=self.save_warmup, dtypes=self.dtypes\r\n )\r\n attrs = get_attrs(posterior)\r\n return (\r\n dict_to_dataset(\r\n data, library=self.pystan, attrs=attrs, coords=self.coords, dims=self.dims\r\n ),\r\n dict_to_dataset(\r\n data_warmup, library=self.pystan, attrs=attrs, coords=self.coords, dims=self.dims\r\n ),\r\n )\r\n\r\n @requires(\"posterior\")\r\n def sample_stats_to_xarray(self):\r\n \"\"\"Extract sample_stats from posterior.\"\"\"\r\n posterior = self.posterior\r\n\r\n data, data_warmup = get_sample_stats(posterior, warmup=self.save_warmup)\r\n\r\n # lp__\r\n stat_lp, stat_lp_warmup = get_draws(\r\n posterior, variables=\"lp__\", warmup=self.save_warmup, dtypes=self.dtypes\r\n )\r\n data[\"lp\"] = stat_lp[\"lp__\"]\r\n if stat_lp_warmup:\r\n data_warmup[\"lp\"] = stat_lp_warmup[\"lp__\"]\r\n\r\n attrs = get_attrs(posterior)\r\n return (\r\n dict_to_dataset(\r\n data, library=self.pystan, attrs=attrs, coords=self.coords, dims=self.dims\r\n ),\r\n dict_to_dataset(\r\n data_warmup, library=self.pystan, attrs=attrs, coords=self.coords, dims=self.dims\r\n ),\r\n )\r\n\r\n @requires(\"posterior\")\r\n @requires(\"log_likelihood\")\r\n def log_likelihood_to_xarray(self):\r\n \"\"\"Store log_likelihood data in log_likelihood group.\"\"\"\r\n fit = self.posterior\r\n\r\n # log_likelihood values\r\n log_likelihood = self.log_likelihood\r\n if isinstance(log_likelihood, str):\r\n log_likelihood = [log_likelihood]\r\n if isinstance(log_likelihood, (list, tuple)):\r\n log_likelihood = {name: name for name in log_likelihood}\r\n log_likelihood_draws, log_likelihood_draws_warmup = get_draws(\r\n fit,\r\n variables=list(log_likelihood.values()),\r\n warmup=self.save_warmup,\r\n dtypes=self.dtypes,\r\n )\r\n data = {\r\n obs_var_name: log_likelihood_draws[log_like_name]\r\n for obs_var_name, log_like_name in log_likelihood.items()\r\n if log_like_name in log_likelihood_draws\r\n }\r\n\r\n data_warmup = {\r\n obs_var_name: log_likelihood_draws_warmup[log_like_name]\r\n for obs_var_name, log_like_name in log_likelihood.items()\r\n if log_like_name in log_likelihood_draws_warmup\r\n }\r\n\r\n return (\r\n dict_to_dataset(\r\n data, library=self.pystan, coords=self.coords, dims=self.dims, skip_event_dims=True\r\n ),\r\n dict_to_dataset(\r\n data_warmup,\r\n library=self.pystan,\r\n coords=self.coords,\r\n dims=self.dims,\r\n skip_event_dims=True,\r\n ),\r\n )\r\n\r\n @requires(\"posterior\")\r\n @requires(\"posterior_predictive\")\r\n def posterior_predictive_to_xarray(self):\r\n \"\"\"Convert posterior_predictive samples to xarray.\"\"\"\r\n posterior = self.posterior\r\n posterior_predictive = self.posterior_predictive\r\n data, data_warmup = get_draws(\r\n posterior, variables=posterior_predictive, warmup=self.save_warmup, dtypes=self.dtypes\r\n )\r\n return (\r\n dict_to_dataset(data, library=self.pystan, coords=self.coords, dims=self.dims),\r\n dict_to_dataset(data_warmup, library=self.pystan, coords=self.coords, dims=self.dims),\r\n )\r\n\r\n @requires(\"posterior\")\r\n @requires(\"predictions\")\r\n def predictions_to_xarray(self):\r\n \"\"\"Convert predictions samples to xarray.\"\"\"\r\n posterior = self.posterior\r\n predictions = self.predictions\r\n data, data_warmup = get_draws(\r\n posterior, variables=predictions, warmup=self.save_warmup, dtypes=self.dtypes\r\n )\r\n return (\r\n dict_to_dataset(data, library=self.pystan, coords=self.coords, dims=self.dims),\r\n dict_to_dataset(data_warmup, library=self.pystan, coords=self.coords, dims=self.dims),\r\n )\r\n\r\n @requires(\"prior\")\r\n def prior_to_xarray(self):\r\n \"\"\"Convert prior samples to xarray.\"\"\"\r\n prior = self.prior\r\n # filter posterior_predictive and log_likelihood\r\n prior_predictive = self.prior_predictive\r\n if prior_predictive is None:\r\n prior_predictive = []\r\n elif isinstance(prior_predictive, str):\r\n prior_predictive = [prior_predictive]\r\n\r\n ignore = prior_predictive + [\"lp__\"]\r\n\r\n data, _ = get_draws(prior, ignore=ignore, warmup=False, dtypes=self.dtypes)\r\n attrs = get_attrs(prior)\r\n return dict_to_dataset(\r\n data, library=self.pystan, attrs=attrs, coords=self.coords, dims=self.dims\r\n )\r\n\r\n @requires(\"prior\")\r\n def sample_stats_prior_to_xarray(self):\r\n \"\"\"Extract sample_stats_prior from prior.\"\"\"\r\n prior = self.prior\r\n data, _ = get_sample_stats(prior, warmup=False)\r\n\r\n # lp__\r\n stat_lp, _ = get_draws(prior, variables=\"lp__\", warmup=False, dtypes=self.dtypes)\r\n data[\"lp\"] = stat_lp[\"lp__\"]\r\n\r\n attrs = get_attrs(prior)\r\n return dict_to_dataset(\r\n data, library=self.pystan, attrs=attrs, coords=self.coords, dims=self.dims\r\n )\r\n\r\n @requires(\"prior\")\r\n @requires(\"prior_predictive\")\r\n def prior_predictive_to_xarray(self):\r\n \"\"\"Convert prior_predictive samples to xarray.\"\"\"\r\n prior = self.prior\r\n prior_predictive = self.prior_predictive\r\n data, _ = get_draws(prior, variables=prior_predictive, warmup=False, dtypes=self.dtypes)\r\n return dict_to_dataset(data, library=self.pystan, coords=self.coords, dims=self.dims)\r\n\r\n @requires(\"posterior\")\r\n @requires([\"observed_data\", \"constant_data\", \"predictions_constant_data\"])\r\n def data_to_xarray(self):\r\n \"\"\"Convert observed, constant data and predictions constant data to xarray.\"\"\"\r\n posterior = self.posterior\r\n if self.dims is None:\r\n dims = {}\r\n else:\r\n dims = self.dims\r\n obs_const_dict = {}\r\n for group_name in (\"observed_data\", \"constant_data\", \"predictions_constant_data\"):\r\n names = getattr(self, group_name)\r\n if names is None:\r\n continue\r\n names = [names] if isinstance(names, str) else names\r\n data = OrderedDict()\r\n for key in names:\r\n vals = np.atleast_1d(posterior.data[key])\r\n val_dims = dims.get(key)\r\n val_dims, coords = generate_dims_coords(\r\n vals.shape, key, dims=val_dims, coords=self.coords\r\n )\r\n data[key] = xr.DataArray(vals, dims=val_dims, coords=coords)\r\n obs_const_dict[group_name] = xr.Dataset(\r\n data_vars=data, attrs=make_attrs(library=self.pystan)\r\n )\r\n return obs_const_dict\r\n\r\n def to_inference_data(self):\r\n \"\"\"Convert all available data to an InferenceData object.\r\n\r\n Note that if groups can not be created (i.e., there is no `fit`, so\r\n the `posterior` and `sample_stats` can not be extracted), then the InferenceData\r\n will not have those groups.\r\n \"\"\"\r\n data_dict = self.data_to_xarray()\r\n return InferenceData(\r\n save_warmup=self.save_warmup,\r\n **{\r\n \"posterior\": self.posterior_to_xarray(),\r\n \"sample_stats\": self.sample_stats_to_xarray(),\r\n \"log_likelihood\": self.log_likelihood_to_xarray(),\r\n \"posterior_predictive\": self.posterior_predictive_to_xarray(),\r\n \"predictions\": self.predictions_to_xarray(),\r\n \"prior\": self.prior_to_xarray(),\r\n \"sample_stats_prior\": self.sample_stats_prior_to_xarray(),\r\n \"prior_predictive\": self.prior_predictive_to_xarray(),\r\n **({} if data_dict is None else data_dict),\r\n },\r\n )\r\n\r\n\r\nclass PyStan3Converter:\r\n \"\"\"Encapsulate PyStan3 specific logic.\"\"\"\r\n\r\n # pylint: disable=too-many-instance-attributes\r\n def __init__(\r\n self,\r\n *,\r\n posterior=None,\r\n posterior_model=None,\r\n posterior_predictive=None,\r\n predictions=None,\r\n prior=None,\r\n prior_model=None,\r\n prior_predictive=None,\r\n observed_data=None,\r\n constant_data=None,\r\n predictions_constant_data=None,\r\n log_likelihood=None,\r\n coords=None,\r\n dims=None,\r\n dtypes=None,\r\n ):\r\n self.posterior = posterior\r\n self.posterior_model = posterior_model\r\n self.posterior_predictive = posterior_predictive\r\n self.predictions = predictions\r\n self.prior = prior\r\n self.prior_model = prior_model\r\n self.prior_predictive = prior_predictive\r\n self.observed_data = observed_data\r\n self.constant_data = constant_data\r\n self.predictions_constant_data = predictions_constant_data\r\n self.log_likelihood = (\r\n rcParams[\"data.log_likelihood\"] if log_likelihood is None else log_likelihood\r\n )\r\n self.coords = coords\r\n self.dims = dims\r\n self.dtypes = dtypes\r\n\r\n if (\r\n self.log_likelihood is True\r\n and self.posterior is not None\r\n and \"log_lik\" in self.posterior.param_names\r\n ):\r\n self.log_likelihood = [\"log_lik\"]\r\n elif isinstance(self.log_likelihood, bool):\r\n self.log_likelihood = None\r\n\r\n import stan # pylint: disable=import-error\r\n\r\n self.stan = stan\r\n\r\n @requires(\"posterior\")\r\n def posterior_to_xarray(self):\r\n \"\"\"Extract posterior samples from fit.\"\"\"\r\n posterior = self.posterior\r\n posterior_model = self.posterior_model\r\n # filter posterior_predictive and log_likelihood\r\n posterior_predictive = self.posterior_predictive\r\n if posterior_predictive is None:\r\n posterior_predictive = []\r\n elif isinstance(posterior_predictive, str):\r\n posterior_predictive = [posterior_predictive]\r\n predictions = self.predictions\r\n if predictions is None:\r\n predictions = []\r\n elif isinstance(predictions, str):\r\n predictions = [predictions]\r\n log_likelihood = self.log_likelihood\r\n if log_likelihood is None:\r\n log_likelihood = []\r\n elif isinstance(log_likelihood, str):\r\n log_likelihood = [log_likelihood]\r\n elif isinstance(log_likelihood, dict):\r\n log_likelihood = list(log_likelihood.values())\r\n\r\n ignore = posterior_predictive + predictions + log_likelihood\r\n\r\n data = get_draws_stan3(posterior, model=posterior_model, ignore=ignore, dtypes=self.dtypes)\r\n attrs = get_attrs_stan3(posterior, model=posterior_model)\r\n return dict_to_dataset(\r\n data, library=self.stan, attrs=attrs, coords=self.coords, dims=self.dims\r\n )\r\n\r\n @requires(\"posterior\")\r\n def sample_stats_to_xarray(self):\r\n \"\"\"Extract sample_stats from posterior.\"\"\"\r\n posterior = self.posterior\r\n posterior_model = self.posterior_model\r\n data = get_sample_stats_stan3(posterior, ignore=\"lp__\", dtypes=self.dtypes)\r\n data[\"lp\"] = get_sample_stats_stan3(posterior, variables=\"lp__\")[\"lp\"]\r\n\r\n attrs = get_attrs_stan3(posterior, model=posterior_model)\r\n return dict_to_dataset(\r\n data, library=self.stan, attrs=attrs, coords=self.coords, dims=self.dims\r\n )\r\n\r\n @requires(\"posterior\")\r\n @requires(\"log_likelihood\")\r\n def log_likelihood_to_xarray(self):\r\n \"\"\"Store log_likelihood data in log_likelihood group.\"\"\"\r\n fit = self.posterior\r\n\r\n log_likelihood = self.log_likelihood\r\n model = self.posterior_model\r\n if isinstance(log_likelihood, str):\r\n log_likelihood = [log_likelihood]\r\n if isinstance(log_likelihood, (list, tuple)):\r\n log_likelihood = {name: name for name in log_likelihood}\r\n log_likelihood_draws = get_draws_stan3(\r\n fit, model=model, variables=list(log_likelihood.values()), dtypes=self.dtypes\r\n )\r\n data = {\r\n obs_var_name: log_likelihood_draws[log_like_name]\r\n for obs_var_name, log_like_name in log_likelihood.items()\r\n if log_like_name in log_likelihood_draws\r\n }\r\n\r\n return dict_to_dataset(data, library=self.stan, coords=self.coords, dims=self.dims)\r\n\r\n @requires(\"posterior\")\r\n @requires(\"posterior_predictive\")\r\n def posterior_predictive_to_xarray(self):\r\n \"\"\"Convert posterior_predictive samples to xarray.\"\"\"\r\n posterior = self.posterior\r\n posterior_model = self.posterior_model\r\n posterior_predictive = self.posterior_predictive\r\n data = get_draws_stan3(\r\n posterior, model=posterior_model, variables=posterior_predictive, dtypes=self.dtypes\r\n )\r\n return dict_to_dataset(data, library=self.stan, coords=self.coords, dims=self.dims)\r\n\r\n @requires(\"posterior\")\r\n @requires(\"predictions\")\r\n def predictions_to_xarray(self):\r\n \"\"\"Convert predictions samples to xarray.\"\"\"\r\n posterior = self.posterior\r\n posterior_model = self.posterior_model\r\n predictions = self.predictions\r\n data = get_draws_stan3(\r\n posterior, model=posterior_model, variables=predictions, dtypes=self.dtypes\r\n )\r\n return dict_to_dataset(data, library=self.stan, coords=self.coords, dims=self.dims)\r\n\r\n @requires(\"prior\")\r\n def prior_to_xarray(self):\r\n \"\"\"Convert prior samples to xarray.\"\"\"\r\n prior = self.prior\r\n prior_model = self.prior_model\r\n # filter posterior_predictive and log_likelihood\r\n prior_predictive = self.prior_predictive\r\n if prior_predictive is None:\r\n prior_predictive = []\r\n elif isinstance(prior_predictive, str):\r\n prior_predictive = [prior_predictive]\r\n\r\n ignore = prior_predictive\r\n\r\n data = get_draws_stan3(prior, model=prior_model, ignore=ignore, dtypes=self.dtypes)\r\n attrs = get_attrs_stan3(prior, model=prior_model)\r\n return dict_to_dataset(\r\n data, library=self.stan, attrs=attrs, coords=self.coords, dims=self.dims\r\n )\r\n\r\n @requires(\"prior\")\r\n def sample_stats_prior_to_xarray(self):\r\n \"\"\"Extract sample_stats_prior from prior.\"\"\"\r\n prior = self.prior\r\n prior_model = self.prior_model\r\n data = get_sample_stats_stan3(prior, dtypes=self.dtypes)\r\n attrs = get_attrs_stan3(prior, model=prior_model)\r\n return dict_to_dataset(\r\n data, library=self.stan, attrs=attrs, coords=self.coords, dims=self.dims\r\n )\r\n\r\n @requires(\"prior\")\r\n @requires(\"prior_predictive\")\r\n def prior_predictive_to_xarray(self):\r\n \"\"\"Convert prior_predictive samples to xarray.\"\"\"\r\n prior = self.prior\r\n prior_model = self.prior_model\r\n prior_predictive = self.prior_predictive\r\n data = get_draws_stan3(\r\n prior, model=prior_model, variables=prior_predictive, dtypes=self.dtypes\r\n )\r\n return dict_to_dataset(data, library=self.stan, coords=self.coords, dims=self.dims)\r\n\r\n @requires(\"posterior_model\")\r\n @requires([\"observed_data\", \"constant_data\"])\r\n def observed_and_constant_data_to_xarray(self):\r\n \"\"\"Convert observed data to xarray.\"\"\"\r\n posterior_model = self.posterior_model\r\n if self.dims is None:\r\n dims = {}\r\n else:\r\n dims = self.dims\r\n obs_const_dict = {}\r\n for group_name in (\"observed_data\", \"constant_data\"):\r\n names = getattr(self, group_name)\r\n if names is None:\r\n continue\r\n names = [names] if isinstance(names, str) else names\r\n data = OrderedDict()\r\n for key in names:\r\n vals = np.atleast_1d(posterior_model.data[key])\r\n val_dims = dims.get(key)\r\n val_dims, coords = generate_dims_coords(\r\n vals.shape, key, dims=val_dims, coords=self.coords\r\n )\r\n data[key] = xr.DataArray(vals, dims=val_dims, coords=coords)\r\n obs_const_dict[group_name] = xr.Dataset(\r\n data_vars=data, attrs=make_attrs(library=self.stan)\r\n )\r\n return obs_const_dict\r\n\r\n @requires(\"posterior_model\")\r\n @requires(\"predictions_constant_data\")\r\n def predictions_constant_data_to_xarray(self):\r\n \"\"\"Convert observed data to xarray.\"\"\"\r\n posterior_model = self.posterior_model\r\n if self.dims is None:\r\n dims = {}\r\n else:\r\n dims = self.dims\r\n names = self.predictions_constant_data\r\n names = [names] if isinstance(names, str) else names\r\n data = OrderedDict()\r\n for key in names:\r\n vals = np.atleast_1d(posterior_model.data[key])\r\n val_dims = dims.get(key)\r\n val_dims, coords = generate_dims_coords(\r\n vals.shape, key, dims=val_dims, coords=self.coords\r\n )\r\n data[key] = xr.DataArray(vals, dims=val_dims, coords=coords)\r\n return xr.Dataset(data_vars=data, attrs=make_attrs(library=self.stan))\r\n\r\n def to_inference_data(self):\r\n \"\"\"Convert all available data to an InferenceData object.\r\n\r\n Note that if groups can not be created (i.e., there is no `fit`, so\r\n the `posterior` and `sample_stats` can not be extracted), then the InferenceData\r\n will not have those groups.\r\n \"\"\"\r\n obs_const_dict = self.observed_and_constant_data_to_xarray()\r\n predictions_const_data = self.predictions_constant_data_to_xarray()\r\n return InferenceData(\r\n **{\r\n \"posterior\": self.posterior_to_xarray(),\r\n \"sample_stats\": self.sample_stats_to_xarray(),\r\n \"log_likelihood\": self.log_likelihood_to_xarray(),\r\n \"posterior_predictive\": self.posterior_predictive_to_xarray(),\r\n \"predictions\": self.predictions_to_xarray(),\r\n \"prior\": self.prior_to_xarray(),\r\n \"sample_stats_prior\": self.sample_stats_prior_to_xarray(),\r\n \"prior_predictive\": self.prior_predictive_to_xarray(),\r\n **({} if obs_const_dict is None else obs_const_dict),\r\n **(\r\n {}\r\n if predictions_const_data is None\r\n else {\"predictions_constant_data\": predictions_const_data}\r\n ),\r\n }\r\n )\r\n\r\n\r\ndef get_draws(fit, variables=None, ignore=None, warmup=False, dtypes=None):\r\n \"\"\"Extract draws from PyStan fit.\"\"\"\r\n if ignore is None:\r\n ignore = []\r\n if fit.mode == 1:\r\n msg = \"Model in mode 'test_grad'. Sampling is not conducted.\"\r\n raise AttributeError(msg)\r\n\r\n if fit.mode == 2 or fit.sim.get(\"samples\") is None:\r\n msg = \"Fit doesn't contain samples.\"\r\n raise AttributeError(msg)\r\n\r\n if dtypes is None:\r\n dtypes = {}\r\n\r\n dtypes = {**infer_dtypes(fit), **dtypes}\r\n\r\n if variables is None:\r\n variables = fit.sim[\"pars_oi\"]\r\n elif isinstance(variables, str):\r\n variables = [variables]\r\n variables = list(variables)\r\n\r\n for var, dim in zip(fit.sim[\"pars_oi\"], fit.sim[\"dims_oi\"]):\r\n if var in variables and np.prod(dim) == 0:\r\n del variables[variables.index(var)]\r\n\r\n ndraws_warmup = fit.sim[\"warmup2\"]\r\n if max(ndraws_warmup) == 0:\r\n warmup = False\r\n ndraws = [s - w for s, w in zip(fit.sim[\"n_save\"], ndraws_warmup)]\r\n nchain = len(fit.sim[\"samples\"])\r\n\r\n # check if the values are in 0-based (<=2.17) or 1-based indexing (>=2.18)\r\n shift = 1\r\n if any(dim and np.prod(dim) != 0 for dim in fit.sim[\"dims_oi\"]):\r\n # choose variable with lowest number of dims > 1\r\n par_idx = min(\r\n (dim, i) for i, dim in enumerate(fit.sim[\"dims_oi\"]) if (dim and np.prod(dim) != 0)\r\n )[1]\r\n offset = int(sum(map(np.product, fit.sim[\"dims_oi\"][:par_idx])))\r\n par_offset = int(np.product(fit.sim[\"dims_oi\"][par_idx]))\r\n par_keys = fit.sim[\"fnames_oi\"][offset : offset + par_offset]\r\n shift = len(par_keys)\r\n for item in par_keys:\r\n _, shape = item.replace(\"]\", \"\").split(\"[\")\r\n shape_idx_min = min(int(shape_value) for shape_value in shape.split(\",\"))\r\n if shape_idx_min < shift:\r\n shift = shape_idx_min\r\n # If shift is higher than 1, this will probably mean that Stan\r\n # has implemented sparse structure (saves only non-zero parts),\r\n # but let's hope that dims are still corresponding to the full shape\r\n shift = int(min(shift, 1))\r\n\r\n var_keys = OrderedDict((var, []) for var in fit.sim[\"pars_oi\"])\r\n for key in fit.sim[\"fnames_oi\"]:\r\n var, *tails = key.split(\"[\")\r\n loc = [Ellipsis]\r\n for tail in tails:\r\n loc = []\r\n for i in tail[:-1].split(\",\"):\r\n loc.append(int(i) - shift)\r\n var_keys[var].append((key, loc))\r\n\r\n shapes = dict(zip(fit.sim[\"pars_oi\"], fit.sim[\"dims_oi\"]))\r\n\r\n variables = [var for var in variables if var not in ignore]\r\n\r\n data = OrderedDict()\r\n data_warmup = OrderedDict()\r\n\r\n for var in variables:\r\n if var in data:\r\n continue\r\n keys_locs = var_keys.get(var, [(var, [Ellipsis])])\r\n shape = shapes.get(var, [])\r\n dtype = dtypes.get(var)\r\n\r\n ndraw = max(ndraws)\r\n ary_shape = [nchain, ndraw] + shape\r\n ary = np.empty(ary_shape, dtype=dtype, order=\"F\")\r\n\r\n if warmup:\r\n nwarmup = max(ndraws_warmup)\r\n ary_warmup_shape = [nchain, nwarmup] + shape\r\n ary_warmup = np.empty(ary_warmup_shape, dtype=dtype, order=\"F\")\r\n\r\n for chain, (pyholder, ndraw, ndraw_warmup) in enumerate(\r\n zip(fit.sim[\"samples\"], ndraws, ndraws_warmup)\r\n ):\r\n axes = [chain, slice(None)]\r\n for key, loc in keys_locs:\r\n ary_slice = tuple(axes + loc)\r\n ary[ary_slice] = pyholder.chains[key][-ndraw:]\r\n if warmup:\r\n ary_warmup[ary_slice] = pyholder.chains[key][:ndraw_warmup]\r\n data[var] = ary\r\n if warmup:\r\n data_warmup[var] = ary_warmup\r\n return data, data_warmup\r\n\r\n\r\ndef get_sample_stats(fit, warmup=False, dtypes=None):\r\n \"\"\"Extract sample stats from PyStan fit.\"\"\"\r\n if dtypes is None:\r\n dtypes = {}\r\n dtypes = {\"divergent__\": bool, \"n_leapfrog__\": np.int64, \"treedepth__\": np.int64, **dtypes}\r\n\r\n rename_dict = {\r\n \"divergent\": \"diverging\",\r\n \"n_leapfrog\": \"n_steps\",\r\n \"treedepth\": \"tree_depth\",\r\n \"stepsize\": \"step_size\",\r\n \"accept_stat\": \"acceptance_rate\",\r\n }\r\n\r\n ndraws_warmup = fit.sim[\"warmup2\"]\r\n if max(ndraws_warmup) == 0:\r\n warmup = False\r\n ndraws = [s - w for s, w in zip(fit.sim[\"n_save\"], ndraws_warmup)]\r\n\r\n extraction = OrderedDict()\r\n extraction_warmup = OrderedDict()\r\n for chain, (pyholder, ndraw, ndraw_warmup) in enumerate(\r\n zip(fit.sim[\"samples\"], ndraws, ndraws_warmup)\r\n ):\r\n if chain == 0:\r\n for key in pyholder[\"sampler_param_names\"]:\r\n extraction[key] = []\r\n if warmup:\r\n extraction_warmup[key] = []\r\n for key, values in zip(pyholder[\"sampler_param_names\"], pyholder[\"sampler_params\"]):\r\n extraction[key].append(values[-ndraw:])\r\n if warmup:\r\n extraction_warmup[key].append(values[:ndraw_warmup])\r\n\r\n data = OrderedDict()\r\n for key, values in extraction.items():\r\n values = np.stack(values, axis=0)\r\n dtype = dtypes.get(key)\r\n values = values.astype(dtype)\r\n name = re.sub(\"__$\", \"\", key)\r\n name = rename_dict.get(name, name)\r\n data[name] = values\r\n\r\n data_warmup = OrderedDict()\r\n if warmup:\r\n for key, values in extraction_warmup.items():\r\n values = np.stack(values, axis=0)\r\n values = values.astype(dtypes.get(key))\r\n name = re.sub(\"__$\", \"\", key)\r\n name = rename_dict.get(name, name)\r\n data_warmup[name] = values\r\n\r\n return data, data_warmup\r\n\r\n\r\ndef get_attrs(fit):\r\n \"\"\"Get attributes from PyStan fit object.\"\"\"\r\n attrs = {}\r\n\r\n try:\r\n attrs[\"args\"] = [deepcopy(holder.args) for holder in fit.sim[\"samples\"]]\r\n except Exception as exp: # pylint: disable=broad-except\r\n _log.warning(\"Failed to fetch args from fit: %s\", exp)\r\n if \"args\" in attrs:\r\n for arg in attrs[\"args\"]:\r\n if isinstance(arg[\"init\"], bytes):\r\n arg[\"init\"] = arg[\"init\"].decode(\"utf-8\")\r\n attrs[\"args\"] = json.dumps(attrs[\"args\"])\r\n try:\r\n attrs[\"inits\"] = [holder.inits for holder in fit.sim[\"samples\"]]\r\n except Exception as exp: # pylint: disable=broad-except\r\n _log.warning(\"Failed to fetch `args` from fit: %s\", exp)\r\n else:\r\n attrs[\"inits\"] = json.dumps(attrs[\"inits\"])\r\n\r\n attrs[\"step_size\"] = []\r\n attrs[\"metric\"] = []\r\n attrs[\"inv_metric\"] = []\r\n for holder in fit.sim[\"samples\"]:\r\n try:\r\n step_size = float(\r\n re.search(\r\n r\"step\\s*size\\s*=\\s*([0-9]+.?[0-9]+)\\s*\",\r\n holder.adaptation_info,\r\n flags=re.IGNORECASE,\r\n ).group(1)\r\n )\r\n except AttributeError:\r\n step_size = np.nan\r\n attrs[\"step_size\"].append(step_size)\r\n\r\n inv_metric_match = re.search(\r\n r\"mass matrix:\\s*(.*)\\s*$\", holder.adaptation_info, flags=re.DOTALL\r\n )\r\n if inv_metric_match:\r\n inv_metric_str = inv_metric_match.group(1)\r\n if \"Diagonal elements of inverse mass matrix\" in holder.adaptation_info:\r\n metric = \"diag_e\"\r\n inv_metric = [float(item) for item in inv_metric_str.strip(\" #\\n\").split(\",\")]\r\n else:\r\n metric = \"dense_e\"\r\n inv_metric = [\r\n list(map(float, item.split(\",\")))\r\n for item in re.sub(r\"#\\s\", \"\", inv_metric_str).splitlines()\r\n ]\r\n else:\r\n metric = \"unit_e\"\r\n inv_metric = None\r\n\r\n attrs[\"metric\"].append(metric)\r\n attrs[\"inv_metric\"].append(inv_metric)\r\n attrs[\"inv_metric\"] = json.dumps(attrs[\"inv_metric\"])\r\n\r\n if not attrs[\"step_size\"]:\r\n del attrs[\"step_size\"]\r\n\r\n attrs[\"adaptation_info\"] = fit.get_adaptation_info()\r\n attrs[\"stan_code\"] = fit.get_stancode()\r\n\r\n return attrs\r\n\r\n\r\ndef get_draws_stan3(fit, model=None, variables=None, ignore=None, dtypes=None):\r\n \"\"\"Extract draws from PyStan3 fit.\"\"\"\r\n if ignore is None:\r\n ignore = []\r\n\r\n if dtypes is None:\r\n dtypes = {}\r\n\r\n if model is not None:\r\n dtypes = {**infer_dtypes(fit, model), **dtypes}\r\n\r\n if variables is None:\r\n variables = fit.param_names\r\n elif isinstance(variables, str):\r\n variables = [variables]\r\n variables = list(variables)\r\n\r\n data = OrderedDict()\r\n\r\n for var in variables:\r\n if var in data:\r\n continue\r\n dtype = dtypes.get(var)\r\n\r\n # in future fix the correct number of draws if fit.save_warmup is True\r\n new_shape = (*fit.dims[fit.param_names.index(var)], -1, fit.num_chains)\r\n if 0 in new_shape:\r\n continue\r\n values = fit._draws[fit._parameter_indexes(var), :] # pylint: disable=protected-access\r\n values = values.reshape(new_shape, order=\"F\")\r\n values = np.moveaxis(values, [-2, -1], [1, 0])\r\n values = values.astype(dtype)\r\n data[var] = values\r\n\r\n return data\r\n\r\n\r\ndef get_sample_stats_stan3(fit, variables=None, ignore=None, dtypes=None):\r\n \"\"\"Extract sample stats from PyStan3 fit.\"\"\"\r\n if dtypes is None:\r\n dtypes = {}\r\n dtypes = {\"divergent__\": bool, \"n_leapfrog__\": np.int64, \"treedepth__\": np.int64, **dtypes}\r\n\r\n rename_dict = {\r\n \"divergent\": \"diverging\",\r\n \"n_leapfrog\": \"n_steps\",\r\n \"treedepth\": \"tree_depth\",\r\n \"stepsize\": \"step_size\",\r\n \"accept_stat\": \"acceptance_rate\",\r\n }\r\n\r\n if isinstance(variables, str):\r\n variables = [variables]\r\n if isinstance(ignore, str):\r\n ignore = [ignore]\r\n\r\n data = OrderedDict()\r\n for key in fit.sample_and_sampler_param_names:\r\n if (variables and key not in variables) or (ignore and key in ignore):\r\n continue\r\n new_shape = -1, fit.num_chains\r\n values = fit._draws[fit._parameter_indexes(key)] # pylint: disable=protected-access\r\n values = values.reshape(new_shape, order=\"F\")\r\n values = np.moveaxis(values, [-2, -1], [1, 0])\r\n dtype = dtypes.get(key)\r\n values = values.astype(dtype)\r\n name = re.sub(\"__$\", \"\", key)\r\n name = rename_dict.get(name, name)\r\n data[name] = values\r\n\r\n return data\r\n\r\n\r\ndef get_attrs_stan3(fit, model=None):\r\n \"\"\"Get attributes from PyStan3 fit and model object.\"\"\"\r\n attrs = {}\r\n for key in [\"num_chains\", \"num_samples\", \"num_thin\", \"num_warmup\", \"save_warmup\"]:\r\n try:\r\n attrs[key] = getattr(fit, key)\r\n except AttributeError as exp:\r\n _log.warning(\"Failed to access attribute %s in fit object %s\", key, exp)\r\n\r\n if model is not None:\r\n for key in [\"model_name\", \"program_code\", \"random_seed\"]:\r\n try:\r\n attrs[key] = getattr(model, key)\r\n except AttributeError as exp:\r\n _log.warning(\"Failed to access attribute %s in model object %s\", key, exp)\r\n\r\n return attrs\r\n\r\n\r\ndef infer_dtypes(fit, model=None):\r\n \"\"\"Infer dtypes from Stan model code.\r\n\r\n Function strips out generated quantities block and searches for `int`\r\n dtypes after stripping out comments inside the block.\r\n \"\"\"\r\n if model is None:\r\n stan_code = fit.get_stancode()\r\n model_pars = fit.model_pars\r\n else:\r\n stan_code = model.program_code\r\n model_pars = fit.param_names\r\n\r\n dtypes = {key: item for key, item in infer_stan_dtypes(stan_code).items() if key in model_pars}\r\n return dtypes\r\n\r\n\r\n# pylint disable=too-many-instance-attributes\r\ndef from_pystan(\r\n posterior=None,\r\n *,\r\n posterior_predictive=None,\r\n predictions=None,\r\n prior=None,\r\n prior_predictive=None,\r\n observed_data=None,\r\n constant_data=None,\r\n predictions_constant_data=None,\r\n log_likelihood=None,\r\n coords=None,\r\n dims=None,\r\n posterior_model=None,\r\n prior_model=None,\r\n save_warmup=None,\r\n dtypes=None,\r\n):\r\n \"\"\"Convert PyStan data into an InferenceData object.\r\n\r\n For a usage example read the\r\n :ref:`Creating InferenceData section on from_pystan <creating_InferenceData>`\r\n\r\n Parameters\r\n ----------\r\n posterior : StanFit4Model or stan.fit.Fit\r\n PyStan fit object for posterior.\r\n posterior_predictive : str, a list of str\r\n Posterior predictive samples for the posterior.\r\n predictions : str, a list of str\r\n Out-of-sample predictions for the posterior.\r\n prior : StanFit4Model or stan.fit.Fit\r\n PyStan fit object for prior.\r\n prior_predictive : str, a list of str\r\n Posterior predictive samples for the prior.\r\n observed_data : str or a list of str\r\n observed data used in the sampling.\r\n Observed data is extracted from the `posterior.data`.\r\n PyStan3 needs model object for the extraction.\r\n See `posterior_model`.\r\n constant_data : str or list of str\r\n Constants relevant to the model (i.e. x values in a linear\r\n regression).\r\n predictions_constant_data : str or list of str\r\n Constants relevant to the model predictions (i.e. new x values in a linear\r\n regression).\r\n log_likelihood : dict of {str: str}, list of str or str, optional\r\n Pointwise log_likelihood for the data. log_likelihood is extracted from the\r\n posterior. It is recommended to use this argument as a dictionary whose keys\r\n are observed variable names and its values are the variables storing log\r\n likelihood arrays in the Stan code. In other cases, a dictionary with keys\r\n equal to its values is used. By default, if a variable ``log_lik`` is\r\n present in the Stan model, it will be retrieved as pointwise log\r\n likelihood values. Use ``False`` or set ``data.log_likelihood`` to\r\n false to avoid this behaviour.\r\n coords : dict[str, iterable]\r\n A dictionary containing the values that are used as index. The key\r\n is the name of the dimension, the values are the index values.\r\n dims : dict[str, List(str)]\r\n A mapping from variables to a list of coordinate names for the variable.\r\n posterior_model : stan.model.Model\r\n PyStan3 specific model object. Needed for automatic dtype parsing\r\n and for the extraction of observed data.\r\n prior_model : stan.model.Model\r\n PyStan3 specific model object. Needed for automatic dtype parsing.\r\n save_warmup : bool\r\n Save warmup iterations into InferenceData object. If not defined, use default\r\n defined by the rcParams. Not supported in PyStan3.\r\n dtypes: dict\r\n A dictionary containing dtype information (int, float) for parameters.\r\n By default dtype information is extracted from the model code.\r\n Model code is extracted from fit object in PyStan 2 and from model object\r\n in PyStan 3.\r\n\r\n Returns\r\n -------\r\n InferenceData object\r\n \"\"\"\r\n check_posterior = (posterior is not None) and (type(posterior).__module__ == \"stan.fit\")\r\n check_prior = (prior is not None) and (type(prior).__module__ == \"stan.fit\")\r\n if check_posterior or check_prior:\r\n if save_warmup:\r\n warnings.warn(\r\n \"save_warmup is not currently supported for PyStan3\",\r\n UserWarning,\r\n )\r\n return PyStan3Converter(\r\n posterior=posterior,\r\n posterior_model=posterior_model,\r\n posterior_predictive=posterior_predictive,\r\n predictions=predictions,\r\n prior=prior,\r\n prior_model=prior_model,\r\n prior_predictive=prior_predictive,\r\n observed_data=observed_data,\r\n constant_data=constant_data,\r\n predictions_constant_data=predictions_constant_data,\r\n log_likelihood=log_likelihood,\r\n coords=coords,\r\n dims=dims,\r\n dtypes=dtypes,\r\n ).to_inference_data()\r\n else:\r\n return PyStanConverter(\r\n posterior=posterior,\r\n posterior_predictive=posterior_predictive,\r\n predictions=predictions,\r\n prior=prior,\r\n prior_predictive=prior_predictive,\r\n observed_data=observed_data,\r\n constant_data=constant_data,\r\n predictions_constant_data=predictions_constant_data,\r\n log_likelihood=log_likelihood,\r\n coords=coords,\r\n dims=dims,\r\n save_warmup=save_warmup,\r\n dtypes=dtypes,\r\n ).to_inference_data()\r\n", "path": "arviz/data/io_pystan.py" } ]
[ { "content": "# pylint: disable=too-many-instance-attributes,too-many-lines\r\n\"\"\"PyStan-specific conversion code.\"\"\"\r\nimport re\r\nimport warnings\r\nfrom collections import OrderedDict\r\nfrom copy import deepcopy\r\n\r\nimport numpy as np\r\nimport xarray as xr\r\n\r\nfrom .. import _log\r\nfrom ..rcparams import rcParams\r\nfrom .base import dict_to_dataset, generate_dims_coords, infer_stan_dtypes, make_attrs, requires\r\nfrom .inference_data import InferenceData\r\n\r\ntry:\r\n import ujson as json\r\nexcept ImportError:\r\n # Can't find ujson using json\r\n # mypy struggles with conditional imports expressed as catching ImportError:\r\n # https://github.com/python/mypy/issues/1153\r\n import json # type: ignore\r\n\r\n\r\nclass PyStanConverter:\r\n \"\"\"Encapsulate PyStan specific logic.\"\"\"\r\n\r\n def __init__(\r\n self,\r\n *,\r\n posterior=None,\r\n posterior_predictive=None,\r\n predictions=None,\r\n prior=None,\r\n prior_predictive=None,\r\n observed_data=None,\r\n constant_data=None,\r\n predictions_constant_data=None,\r\n log_likelihood=None,\r\n coords=None,\r\n dims=None,\r\n save_warmup=None,\r\n dtypes=None,\r\n ):\r\n self.posterior = posterior\r\n self.posterior_predictive = posterior_predictive\r\n self.predictions = predictions\r\n self.prior = prior\r\n self.prior_predictive = prior_predictive\r\n self.observed_data = observed_data\r\n self.constant_data = constant_data\r\n self.predictions_constant_data = predictions_constant_data\r\n self.log_likelihood = (\r\n rcParams[\"data.log_likelihood\"] if log_likelihood is None else log_likelihood\r\n )\r\n self.coords = coords\r\n self.dims = dims\r\n self.save_warmup = rcParams[\"data.save_warmup\"] if save_warmup is None else save_warmup\r\n self.dtypes = dtypes\r\n\r\n if (\r\n self.log_likelihood is True\r\n and self.posterior is not None\r\n and \"log_lik\" in self.posterior.sim[\"pars_oi\"]\r\n ):\r\n self.log_likelihood = [\"log_lik\"]\r\n elif isinstance(self.log_likelihood, bool):\r\n self.log_likelihood = None\r\n\r\n import pystan # pylint: disable=import-error\r\n\r\n self.pystan = pystan\r\n\r\n @requires(\"posterior\")\r\n def posterior_to_xarray(self):\r\n \"\"\"Extract posterior samples from fit.\"\"\"\r\n posterior = self.posterior\r\n # filter posterior_predictive and log_likelihood\r\n posterior_predictive = self.posterior_predictive\r\n if posterior_predictive is None:\r\n posterior_predictive = []\r\n elif isinstance(posterior_predictive, str):\r\n posterior_predictive = [posterior_predictive]\r\n predictions = self.predictions\r\n if predictions is None:\r\n predictions = []\r\n elif isinstance(predictions, str):\r\n predictions = [predictions]\r\n log_likelihood = self.log_likelihood\r\n if log_likelihood is None:\r\n log_likelihood = []\r\n elif isinstance(log_likelihood, str):\r\n log_likelihood = [log_likelihood]\r\n elif isinstance(log_likelihood, dict):\r\n log_likelihood = list(log_likelihood.values())\r\n\r\n ignore = posterior_predictive + predictions + log_likelihood + [\"lp__\"]\r\n\r\n data, data_warmup = get_draws(\r\n posterior, ignore=ignore, warmup=self.save_warmup, dtypes=self.dtypes\r\n )\r\n attrs = get_attrs(posterior)\r\n return (\r\n dict_to_dataset(\r\n data, library=self.pystan, attrs=attrs, coords=self.coords, dims=self.dims\r\n ),\r\n dict_to_dataset(\r\n data_warmup, library=self.pystan, attrs=attrs, coords=self.coords, dims=self.dims\r\n ),\r\n )\r\n\r\n @requires(\"posterior\")\r\n def sample_stats_to_xarray(self):\r\n \"\"\"Extract sample_stats from posterior.\"\"\"\r\n posterior = self.posterior\r\n\r\n data, data_warmup = get_sample_stats(posterior, warmup=self.save_warmup)\r\n\r\n # lp__\r\n stat_lp, stat_lp_warmup = get_draws(\r\n posterior, variables=\"lp__\", warmup=self.save_warmup, dtypes=self.dtypes\r\n )\r\n data[\"lp\"] = stat_lp[\"lp__\"]\r\n if stat_lp_warmup:\r\n data_warmup[\"lp\"] = stat_lp_warmup[\"lp__\"]\r\n\r\n attrs = get_attrs(posterior)\r\n return (\r\n dict_to_dataset(\r\n data, library=self.pystan, attrs=attrs, coords=self.coords, dims=self.dims\r\n ),\r\n dict_to_dataset(\r\n data_warmup, library=self.pystan, attrs=attrs, coords=self.coords, dims=self.dims\r\n ),\r\n )\r\n\r\n @requires(\"posterior\")\r\n @requires(\"log_likelihood\")\r\n def log_likelihood_to_xarray(self):\r\n \"\"\"Store log_likelihood data in log_likelihood group.\"\"\"\r\n fit = self.posterior\r\n\r\n # log_likelihood values\r\n log_likelihood = self.log_likelihood\r\n if isinstance(log_likelihood, str):\r\n log_likelihood = [log_likelihood]\r\n if isinstance(log_likelihood, (list, tuple)):\r\n log_likelihood = {name: name for name in log_likelihood}\r\n log_likelihood_draws, log_likelihood_draws_warmup = get_draws(\r\n fit,\r\n variables=list(log_likelihood.values()),\r\n warmup=self.save_warmup,\r\n dtypes=self.dtypes,\r\n )\r\n data = {\r\n obs_var_name: log_likelihood_draws[log_like_name]\r\n for obs_var_name, log_like_name in log_likelihood.items()\r\n if log_like_name in log_likelihood_draws\r\n }\r\n\r\n data_warmup = {\r\n obs_var_name: log_likelihood_draws_warmup[log_like_name]\r\n for obs_var_name, log_like_name in log_likelihood.items()\r\n if log_like_name in log_likelihood_draws_warmup\r\n }\r\n\r\n return (\r\n dict_to_dataset(\r\n data, library=self.pystan, coords=self.coords, dims=self.dims, skip_event_dims=True\r\n ),\r\n dict_to_dataset(\r\n data_warmup,\r\n library=self.pystan,\r\n coords=self.coords,\r\n dims=self.dims,\r\n skip_event_dims=True,\r\n ),\r\n )\r\n\r\n @requires(\"posterior\")\r\n @requires(\"posterior_predictive\")\r\n def posterior_predictive_to_xarray(self):\r\n \"\"\"Convert posterior_predictive samples to xarray.\"\"\"\r\n posterior = self.posterior\r\n posterior_predictive = self.posterior_predictive\r\n data, data_warmup = get_draws(\r\n posterior, variables=posterior_predictive, warmup=self.save_warmup, dtypes=self.dtypes\r\n )\r\n return (\r\n dict_to_dataset(data, library=self.pystan, coords=self.coords, dims=self.dims),\r\n dict_to_dataset(data_warmup, library=self.pystan, coords=self.coords, dims=self.dims),\r\n )\r\n\r\n @requires(\"posterior\")\r\n @requires(\"predictions\")\r\n def predictions_to_xarray(self):\r\n \"\"\"Convert predictions samples to xarray.\"\"\"\r\n posterior = self.posterior\r\n predictions = self.predictions\r\n data, data_warmup = get_draws(\r\n posterior, variables=predictions, warmup=self.save_warmup, dtypes=self.dtypes\r\n )\r\n return (\r\n dict_to_dataset(data, library=self.pystan, coords=self.coords, dims=self.dims),\r\n dict_to_dataset(data_warmup, library=self.pystan, coords=self.coords, dims=self.dims),\r\n )\r\n\r\n @requires(\"prior\")\r\n def prior_to_xarray(self):\r\n \"\"\"Convert prior samples to xarray.\"\"\"\r\n prior = self.prior\r\n # filter posterior_predictive and log_likelihood\r\n prior_predictive = self.prior_predictive\r\n if prior_predictive is None:\r\n prior_predictive = []\r\n elif isinstance(prior_predictive, str):\r\n prior_predictive = [prior_predictive]\r\n\r\n ignore = prior_predictive + [\"lp__\"]\r\n\r\n data, _ = get_draws(prior, ignore=ignore, warmup=False, dtypes=self.dtypes)\r\n attrs = get_attrs(prior)\r\n return dict_to_dataset(\r\n data, library=self.pystan, attrs=attrs, coords=self.coords, dims=self.dims\r\n )\r\n\r\n @requires(\"prior\")\r\n def sample_stats_prior_to_xarray(self):\r\n \"\"\"Extract sample_stats_prior from prior.\"\"\"\r\n prior = self.prior\r\n data, _ = get_sample_stats(prior, warmup=False)\r\n\r\n # lp__\r\n stat_lp, _ = get_draws(prior, variables=\"lp__\", warmup=False, dtypes=self.dtypes)\r\n data[\"lp\"] = stat_lp[\"lp__\"]\r\n\r\n attrs = get_attrs(prior)\r\n return dict_to_dataset(\r\n data, library=self.pystan, attrs=attrs, coords=self.coords, dims=self.dims\r\n )\r\n\r\n @requires(\"prior\")\r\n @requires(\"prior_predictive\")\r\n def prior_predictive_to_xarray(self):\r\n \"\"\"Convert prior_predictive samples to xarray.\"\"\"\r\n prior = self.prior\r\n prior_predictive = self.prior_predictive\r\n data, _ = get_draws(prior, variables=prior_predictive, warmup=False, dtypes=self.dtypes)\r\n return dict_to_dataset(data, library=self.pystan, coords=self.coords, dims=self.dims)\r\n\r\n @requires(\"posterior\")\r\n @requires([\"observed_data\", \"constant_data\", \"predictions_constant_data\"])\r\n def data_to_xarray(self):\r\n \"\"\"Convert observed, constant data and predictions constant data to xarray.\"\"\"\r\n posterior = self.posterior\r\n if self.dims is None:\r\n dims = {}\r\n else:\r\n dims = self.dims\r\n obs_const_dict = {}\r\n for group_name in (\"observed_data\", \"constant_data\", \"predictions_constant_data\"):\r\n names = getattr(self, group_name)\r\n if names is None:\r\n continue\r\n names = [names] if isinstance(names, str) else names\r\n data = OrderedDict()\r\n for key in names:\r\n vals = np.atleast_1d(posterior.data[key])\r\n val_dims = dims.get(key)\r\n val_dims, coords = generate_dims_coords(\r\n vals.shape, key, dims=val_dims, coords=self.coords\r\n )\r\n data[key] = xr.DataArray(vals, dims=val_dims, coords=coords)\r\n obs_const_dict[group_name] = xr.Dataset(\r\n data_vars=data, attrs=make_attrs(library=self.pystan)\r\n )\r\n return obs_const_dict\r\n\r\n def to_inference_data(self):\r\n \"\"\"Convert all available data to an InferenceData object.\r\n\r\n Note that if groups can not be created (i.e., there is no `fit`, so\r\n the `posterior` and `sample_stats` can not be extracted), then the InferenceData\r\n will not have those groups.\r\n \"\"\"\r\n data_dict = self.data_to_xarray()\r\n return InferenceData(\r\n save_warmup=self.save_warmup,\r\n **{\r\n \"posterior\": self.posterior_to_xarray(),\r\n \"sample_stats\": self.sample_stats_to_xarray(),\r\n \"log_likelihood\": self.log_likelihood_to_xarray(),\r\n \"posterior_predictive\": self.posterior_predictive_to_xarray(),\r\n \"predictions\": self.predictions_to_xarray(),\r\n \"prior\": self.prior_to_xarray(),\r\n \"sample_stats_prior\": self.sample_stats_prior_to_xarray(),\r\n \"prior_predictive\": self.prior_predictive_to_xarray(),\r\n **({} if data_dict is None else data_dict),\r\n },\r\n )\r\n\r\n\r\nclass PyStan3Converter:\r\n \"\"\"Encapsulate PyStan3 specific logic.\"\"\"\r\n\r\n # pylint: disable=too-many-instance-attributes\r\n def __init__(\r\n self,\r\n *,\r\n posterior=None,\r\n posterior_model=None,\r\n posterior_predictive=None,\r\n predictions=None,\r\n prior=None,\r\n prior_model=None,\r\n prior_predictive=None,\r\n observed_data=None,\r\n constant_data=None,\r\n predictions_constant_data=None,\r\n log_likelihood=None,\r\n coords=None,\r\n dims=None,\r\n dtypes=None,\r\n ):\r\n self.posterior = posterior\r\n self.posterior_model = posterior_model\r\n self.posterior_predictive = posterior_predictive\r\n self.predictions = predictions\r\n self.prior = prior\r\n self.prior_model = prior_model\r\n self.prior_predictive = prior_predictive\r\n self.observed_data = observed_data\r\n self.constant_data = constant_data\r\n self.predictions_constant_data = predictions_constant_data\r\n self.log_likelihood = (\r\n rcParams[\"data.log_likelihood\"] if log_likelihood is None else log_likelihood\r\n )\r\n self.coords = coords\r\n self.dims = dims\r\n self.dtypes = dtypes\r\n\r\n if (\r\n self.log_likelihood is True\r\n and self.posterior is not None\r\n and \"log_lik\" in self.posterior.param_names\r\n ):\r\n self.log_likelihood = [\"log_lik\"]\r\n elif isinstance(self.log_likelihood, bool):\r\n self.log_likelihood = None\r\n\r\n import stan # pylint: disable=import-error\r\n\r\n self.stan = stan\r\n\r\n @requires(\"posterior\")\r\n def posterior_to_xarray(self):\r\n \"\"\"Extract posterior samples from fit.\"\"\"\r\n posterior = self.posterior\r\n posterior_model = self.posterior_model\r\n # filter posterior_predictive and log_likelihood\r\n posterior_predictive = self.posterior_predictive\r\n if posterior_predictive is None:\r\n posterior_predictive = []\r\n elif isinstance(posterior_predictive, str):\r\n posterior_predictive = [posterior_predictive]\r\n predictions = self.predictions\r\n if predictions is None:\r\n predictions = []\r\n elif isinstance(predictions, str):\r\n predictions = [predictions]\r\n log_likelihood = self.log_likelihood\r\n if log_likelihood is None:\r\n log_likelihood = []\r\n elif isinstance(log_likelihood, str):\r\n log_likelihood = [log_likelihood]\r\n elif isinstance(log_likelihood, dict):\r\n log_likelihood = list(log_likelihood.values())\r\n\r\n ignore = posterior_predictive + predictions + log_likelihood\r\n\r\n data = get_draws_stan3(posterior, model=posterior_model, ignore=ignore, dtypes=self.dtypes)\r\n attrs = get_attrs_stan3(posterior, model=posterior_model)\r\n return dict_to_dataset(\r\n data, library=self.stan, attrs=attrs, coords=self.coords, dims=self.dims\r\n )\r\n\r\n @requires(\"posterior\")\r\n def sample_stats_to_xarray(self):\r\n \"\"\"Extract sample_stats from posterior.\"\"\"\r\n posterior = self.posterior\r\n posterior_model = self.posterior_model\r\n data = get_sample_stats_stan3(posterior, ignore=\"lp__\", dtypes=self.dtypes)\r\n data[\"lp\"] = get_sample_stats_stan3(posterior, variables=\"lp__\")[\"lp\"]\r\n\r\n attrs = get_attrs_stan3(posterior, model=posterior_model)\r\n return dict_to_dataset(\r\n data, library=self.stan, attrs=attrs, coords=self.coords, dims=self.dims\r\n )\r\n\r\n @requires(\"posterior\")\r\n @requires(\"log_likelihood\")\r\n def log_likelihood_to_xarray(self):\r\n \"\"\"Store log_likelihood data in log_likelihood group.\"\"\"\r\n fit = self.posterior\r\n\r\n log_likelihood = self.log_likelihood\r\n model = self.posterior_model\r\n if isinstance(log_likelihood, str):\r\n log_likelihood = [log_likelihood]\r\n if isinstance(log_likelihood, (list, tuple)):\r\n log_likelihood = {name: name for name in log_likelihood}\r\n log_likelihood_draws = get_draws_stan3(\r\n fit, model=model, variables=list(log_likelihood.values()), dtypes=self.dtypes\r\n )\r\n data = {\r\n obs_var_name: log_likelihood_draws[log_like_name]\r\n for obs_var_name, log_like_name in log_likelihood.items()\r\n if log_like_name in log_likelihood_draws\r\n }\r\n\r\n return dict_to_dataset(data, library=self.stan, coords=self.coords, dims=self.dims)\r\n\r\n @requires(\"posterior\")\r\n @requires(\"posterior_predictive\")\r\n def posterior_predictive_to_xarray(self):\r\n \"\"\"Convert posterior_predictive samples to xarray.\"\"\"\r\n posterior = self.posterior\r\n posterior_model = self.posterior_model\r\n posterior_predictive = self.posterior_predictive\r\n data = get_draws_stan3(\r\n posterior, model=posterior_model, variables=posterior_predictive, dtypes=self.dtypes\r\n )\r\n return dict_to_dataset(data, library=self.stan, coords=self.coords, dims=self.dims)\r\n\r\n @requires(\"posterior\")\r\n @requires(\"predictions\")\r\n def predictions_to_xarray(self):\r\n \"\"\"Convert predictions samples to xarray.\"\"\"\r\n posterior = self.posterior\r\n posterior_model = self.posterior_model\r\n predictions = self.predictions\r\n data = get_draws_stan3(\r\n posterior, model=posterior_model, variables=predictions, dtypes=self.dtypes\r\n )\r\n return dict_to_dataset(data, library=self.stan, coords=self.coords, dims=self.dims)\r\n\r\n @requires(\"prior\")\r\n def prior_to_xarray(self):\r\n \"\"\"Convert prior samples to xarray.\"\"\"\r\n prior = self.prior\r\n prior_model = self.prior_model\r\n # filter posterior_predictive and log_likelihood\r\n prior_predictive = self.prior_predictive\r\n if prior_predictive is None:\r\n prior_predictive = []\r\n elif isinstance(prior_predictive, str):\r\n prior_predictive = [prior_predictive]\r\n\r\n ignore = prior_predictive\r\n\r\n data = get_draws_stan3(prior, model=prior_model, ignore=ignore, dtypes=self.dtypes)\r\n attrs = get_attrs_stan3(prior, model=prior_model)\r\n return dict_to_dataset(\r\n data, library=self.stan, attrs=attrs, coords=self.coords, dims=self.dims\r\n )\r\n\r\n @requires(\"prior\")\r\n def sample_stats_prior_to_xarray(self):\r\n \"\"\"Extract sample_stats_prior from prior.\"\"\"\r\n prior = self.prior\r\n prior_model = self.prior_model\r\n data = get_sample_stats_stan3(prior, dtypes=self.dtypes)\r\n attrs = get_attrs_stan3(prior, model=prior_model)\r\n return dict_to_dataset(\r\n data, library=self.stan, attrs=attrs, coords=self.coords, dims=self.dims\r\n )\r\n\r\n @requires(\"prior\")\r\n @requires(\"prior_predictive\")\r\n def prior_predictive_to_xarray(self):\r\n \"\"\"Convert prior_predictive samples to xarray.\"\"\"\r\n prior = self.prior\r\n prior_model = self.prior_model\r\n prior_predictive = self.prior_predictive\r\n data = get_draws_stan3(\r\n prior, model=prior_model, variables=prior_predictive, dtypes=self.dtypes\r\n )\r\n return dict_to_dataset(data, library=self.stan, coords=self.coords, dims=self.dims)\r\n\r\n @requires(\"posterior_model\")\r\n @requires([\"observed_data\", \"constant_data\"])\r\n def observed_and_constant_data_to_xarray(self):\r\n \"\"\"Convert observed data to xarray.\"\"\"\r\n posterior_model = self.posterior_model\r\n if self.dims is None:\r\n dims = {}\r\n else:\r\n dims = self.dims\r\n obs_const_dict = {}\r\n for group_name in (\"observed_data\", \"constant_data\"):\r\n names = getattr(self, group_name)\r\n if names is None:\r\n continue\r\n names = [names] if isinstance(names, str) else names\r\n data = OrderedDict()\r\n for key in names:\r\n vals = np.atleast_1d(posterior_model.data[key])\r\n val_dims = dims.get(key)\r\n val_dims, coords = generate_dims_coords(\r\n vals.shape, key, dims=val_dims, coords=self.coords\r\n )\r\n data[key] = xr.DataArray(vals, dims=val_dims, coords=coords)\r\n obs_const_dict[group_name] = xr.Dataset(\r\n data_vars=data, attrs=make_attrs(library=self.stan)\r\n )\r\n return obs_const_dict\r\n\r\n @requires(\"posterior_model\")\r\n @requires(\"predictions_constant_data\")\r\n def predictions_constant_data_to_xarray(self):\r\n \"\"\"Convert observed data to xarray.\"\"\"\r\n posterior_model = self.posterior_model\r\n if self.dims is None:\r\n dims = {}\r\n else:\r\n dims = self.dims\r\n names = self.predictions_constant_data\r\n names = [names] if isinstance(names, str) else names\r\n data = OrderedDict()\r\n for key in names:\r\n vals = np.atleast_1d(posterior_model.data[key])\r\n val_dims = dims.get(key)\r\n val_dims, coords = generate_dims_coords(\r\n vals.shape, key, dims=val_dims, coords=self.coords\r\n )\r\n data[key] = xr.DataArray(vals, dims=val_dims, coords=coords)\r\n return xr.Dataset(data_vars=data, attrs=make_attrs(library=self.stan))\r\n\r\n def to_inference_data(self):\r\n \"\"\"Convert all available data to an InferenceData object.\r\n\r\n Note that if groups can not be created (i.e., there is no `fit`, so\r\n the `posterior` and `sample_stats` can not be extracted), then the InferenceData\r\n will not have those groups.\r\n \"\"\"\r\n obs_const_dict = self.observed_and_constant_data_to_xarray()\r\n predictions_const_data = self.predictions_constant_data_to_xarray()\r\n return InferenceData(\r\n **{\r\n \"posterior\": self.posterior_to_xarray(),\r\n \"sample_stats\": self.sample_stats_to_xarray(),\r\n \"log_likelihood\": self.log_likelihood_to_xarray(),\r\n \"posterior_predictive\": self.posterior_predictive_to_xarray(),\r\n \"predictions\": self.predictions_to_xarray(),\r\n \"prior\": self.prior_to_xarray(),\r\n \"sample_stats_prior\": self.sample_stats_prior_to_xarray(),\r\n \"prior_predictive\": self.prior_predictive_to_xarray(),\r\n **({} if obs_const_dict is None else obs_const_dict),\r\n **(\r\n {}\r\n if predictions_const_data is None\r\n else {\"predictions_constant_data\": predictions_const_data}\r\n ),\r\n }\r\n )\r\n\r\n\r\ndef get_draws(fit, variables=None, ignore=None, warmup=False, dtypes=None):\r\n \"\"\"Extract draws from PyStan fit.\"\"\"\r\n if ignore is None:\r\n ignore = []\r\n if fit.mode == 1:\r\n msg = \"Model in mode 'test_grad'. Sampling is not conducted.\"\r\n raise AttributeError(msg)\r\n\r\n if fit.mode == 2 or fit.sim.get(\"samples\") is None:\r\n msg = \"Fit doesn't contain samples.\"\r\n raise AttributeError(msg)\r\n\r\n if dtypes is None:\r\n dtypes = {}\r\n\r\n dtypes = {**infer_dtypes(fit), **dtypes}\r\n\r\n if variables is None:\r\n variables = fit.sim[\"pars_oi\"]\r\n elif isinstance(variables, str):\r\n variables = [variables]\r\n variables = list(variables)\r\n\r\n for var, dim in zip(fit.sim[\"pars_oi\"], fit.sim[\"dims_oi\"]):\r\n if var in variables and np.prod(dim) == 0:\r\n del variables[variables.index(var)]\r\n\r\n ndraws_warmup = fit.sim[\"warmup2\"]\r\n if max(ndraws_warmup) == 0:\r\n warmup = False\r\n ndraws = [s - w for s, w in zip(fit.sim[\"n_save\"], ndraws_warmup)]\r\n nchain = len(fit.sim[\"samples\"])\r\n\r\n # check if the values are in 0-based (<=2.17) or 1-based indexing (>=2.18)\r\n shift = 1\r\n if any(dim and np.prod(dim) != 0 for dim in fit.sim[\"dims_oi\"]):\r\n # choose variable with lowest number of dims > 1\r\n par_idx = min(\r\n (dim, i) for i, dim in enumerate(fit.sim[\"dims_oi\"]) if (dim and np.prod(dim) != 0)\r\n )[1]\r\n offset = int(sum(map(np.product, fit.sim[\"dims_oi\"][:par_idx])))\r\n par_offset = int(np.product(fit.sim[\"dims_oi\"][par_idx]))\r\n par_keys = fit.sim[\"fnames_oi\"][offset : offset + par_offset]\r\n shift = len(par_keys)\r\n for item in par_keys:\r\n _, shape = item.replace(\"]\", \"\").split(\"[\")\r\n shape_idx_min = min(int(shape_value) for shape_value in shape.split(\",\"))\r\n if shape_idx_min < shift:\r\n shift = shape_idx_min\r\n # If shift is higher than 1, this will probably mean that Stan\r\n # has implemented sparse structure (saves only non-zero parts),\r\n # but let's hope that dims are still corresponding to the full shape\r\n shift = int(min(shift, 1))\r\n\r\n var_keys = OrderedDict((var, []) for var in fit.sim[\"pars_oi\"])\r\n for key in fit.sim[\"fnames_oi\"]:\r\n var, *tails = key.split(\"[\")\r\n loc = [Ellipsis]\r\n for tail in tails:\r\n loc = []\r\n for i in tail[:-1].split(\",\"):\r\n loc.append(int(i) - shift)\r\n var_keys[var].append((key, loc))\r\n\r\n shapes = dict(zip(fit.sim[\"pars_oi\"], fit.sim[\"dims_oi\"]))\r\n\r\n variables = [var for var in variables if var not in ignore]\r\n\r\n data = OrderedDict()\r\n data_warmup = OrderedDict()\r\n\r\n for var in variables:\r\n if var in data:\r\n continue\r\n keys_locs = var_keys.get(var, [(var, [Ellipsis])])\r\n shape = shapes.get(var, [])\r\n dtype = dtypes.get(var)\r\n\r\n ndraw = max(ndraws)\r\n ary_shape = [nchain, ndraw] + shape\r\n ary = np.empty(ary_shape, dtype=dtype, order=\"F\")\r\n\r\n if warmup:\r\n nwarmup = max(ndraws_warmup)\r\n ary_warmup_shape = [nchain, nwarmup] + shape\r\n ary_warmup = np.empty(ary_warmup_shape, dtype=dtype, order=\"F\")\r\n\r\n for chain, (pyholder, ndraw, ndraw_warmup) in enumerate(\r\n zip(fit.sim[\"samples\"], ndraws, ndraws_warmup)\r\n ):\r\n axes = [chain, slice(None)]\r\n for key, loc in keys_locs:\r\n ary_slice = tuple(axes + loc)\r\n ary[ary_slice] = pyholder.chains[key][-ndraw:]\r\n if warmup:\r\n ary_warmup[ary_slice] = pyholder.chains[key][:ndraw_warmup]\r\n data[var] = ary\r\n if warmup:\r\n data_warmup[var] = ary_warmup\r\n return data, data_warmup\r\n\r\n\r\ndef get_sample_stats(fit, warmup=False, dtypes=None):\r\n \"\"\"Extract sample stats from PyStan fit.\"\"\"\r\n if dtypes is None:\r\n dtypes = {}\r\n dtypes = {\"divergent__\": bool, \"n_leapfrog__\": np.int64, \"treedepth__\": np.int64, **dtypes}\r\n\r\n rename_dict = {\r\n \"divergent\": \"diverging\",\r\n \"n_leapfrog\": \"n_steps\",\r\n \"treedepth\": \"tree_depth\",\r\n \"stepsize\": \"step_size\",\r\n \"accept_stat\": \"acceptance_rate\",\r\n }\r\n\r\n ndraws_warmup = fit.sim[\"warmup2\"]\r\n if max(ndraws_warmup) == 0:\r\n warmup = False\r\n ndraws = [s - w for s, w in zip(fit.sim[\"n_save\"], ndraws_warmup)]\r\n\r\n extraction = OrderedDict()\r\n extraction_warmup = OrderedDict()\r\n for chain, (pyholder, ndraw, ndraw_warmup) in enumerate(\r\n zip(fit.sim[\"samples\"], ndraws, ndraws_warmup)\r\n ):\r\n if chain == 0:\r\n for key in pyholder[\"sampler_param_names\"]:\r\n extraction[key] = []\r\n if warmup:\r\n extraction_warmup[key] = []\r\n for key, values in zip(pyholder[\"sampler_param_names\"], pyholder[\"sampler_params\"]):\r\n extraction[key].append(values[-ndraw:])\r\n if warmup:\r\n extraction_warmup[key].append(values[:ndraw_warmup])\r\n\r\n data = OrderedDict()\r\n for key, values in extraction.items():\r\n values = np.stack(values, axis=0)\r\n dtype = dtypes.get(key)\r\n values = values.astype(dtype)\r\n name = re.sub(\"__$\", \"\", key)\r\n name = rename_dict.get(name, name)\r\n data[name] = values\r\n\r\n data_warmup = OrderedDict()\r\n if warmup:\r\n for key, values in extraction_warmup.items():\r\n values = np.stack(values, axis=0)\r\n values = values.astype(dtypes.get(key))\r\n name = re.sub(\"__$\", \"\", key)\r\n name = rename_dict.get(name, name)\r\n data_warmup[name] = values\r\n\r\n return data, data_warmup\r\n\r\n\r\ndef get_attrs(fit):\r\n \"\"\"Get attributes from PyStan fit object.\"\"\"\r\n attrs = {}\r\n\r\n try:\r\n attrs[\"args\"] = [deepcopy(holder.args) for holder in fit.sim[\"samples\"]]\r\n except Exception as exp: # pylint: disable=broad-except\r\n _log.warning(\"Failed to fetch args from fit: %s\", exp)\r\n if \"args\" in attrs:\r\n for arg in attrs[\"args\"]:\r\n if isinstance(arg[\"init\"], bytes):\r\n arg[\"init\"] = arg[\"init\"].decode(\"utf-8\")\r\n attrs[\"args\"] = json.dumps(attrs[\"args\"])\r\n try:\r\n attrs[\"inits\"] = [holder.inits for holder in fit.sim[\"samples\"]]\r\n except Exception as exp: # pylint: disable=broad-except\r\n _log.warning(\"Failed to fetch `args` from fit: %s\", exp)\r\n else:\r\n attrs[\"inits\"] = json.dumps(attrs[\"inits\"])\r\n\r\n attrs[\"step_size\"] = []\r\n attrs[\"metric\"] = []\r\n attrs[\"inv_metric\"] = []\r\n for holder in fit.sim[\"samples\"]:\r\n try:\r\n step_size = float(\r\n re.search(\r\n r\"step\\s*size\\s*=\\s*([0-9]+.?[0-9]+)\\s*\",\r\n holder.adaptation_info,\r\n flags=re.IGNORECASE,\r\n ).group(1)\r\n )\r\n except AttributeError:\r\n step_size = np.nan\r\n attrs[\"step_size\"].append(step_size)\r\n\r\n inv_metric_match = re.search(\r\n r\"mass matrix:\\s*(.*)\\s*$\", holder.adaptation_info, flags=re.DOTALL\r\n )\r\n if inv_metric_match:\r\n inv_metric_str = inv_metric_match.group(1)\r\n if \"Diagonal elements of inverse mass matrix\" in holder.adaptation_info:\r\n metric = \"diag_e\"\r\n inv_metric = [float(item) for item in inv_metric_str.strip(\" #\\n\").split(\",\")]\r\n else:\r\n metric = \"dense_e\"\r\n inv_metric = [\r\n list(map(float, item.split(\",\")))\r\n for item in re.sub(r\"#\\s\", \"\", inv_metric_str).splitlines()\r\n ]\r\n else:\r\n metric = \"unit_e\"\r\n inv_metric = None\r\n\r\n attrs[\"metric\"].append(metric)\r\n attrs[\"inv_metric\"].append(inv_metric)\r\n attrs[\"inv_metric\"] = json.dumps(attrs[\"inv_metric\"])\r\n\r\n if not attrs[\"step_size\"]:\r\n del attrs[\"step_size\"]\r\n\r\n attrs[\"adaptation_info\"] = fit.get_adaptation_info()\r\n attrs[\"stan_code\"] = fit.get_stancode()\r\n\r\n return attrs\r\n\r\n\r\ndef get_draws_stan3(fit, model=None, variables=None, ignore=None, dtypes=None):\r\n \"\"\"Extract draws from PyStan3 fit.\"\"\"\r\n if ignore is None:\r\n ignore = []\r\n\r\n if dtypes is None:\r\n dtypes = {}\r\n\r\n if model is not None:\r\n dtypes = {**infer_dtypes(fit, model), **dtypes}\r\n\r\n if variables is None:\r\n variables = fit.param_names\r\n elif isinstance(variables, str):\r\n variables = [variables]\r\n variables = list(variables)\r\n\r\n data = OrderedDict()\r\n\r\n for var in variables:\r\n if var in ignore:\r\n continue\r\n if var in data:\r\n continue\r\n dtype = dtypes.get(var)\r\n\r\n # in future fix the correct number of draws if fit.save_warmup is True\r\n new_shape = (*fit.dims[fit.param_names.index(var)], -1, fit.num_chains)\r\n if 0 in new_shape:\r\n continue\r\n values = fit._draws[fit._parameter_indexes(var), :] # pylint: disable=protected-access\r\n values = values.reshape(new_shape, order=\"F\")\r\n values = np.moveaxis(values, [-2, -1], [1, 0])\r\n values = values.astype(dtype)\r\n data[var] = values\r\n\r\n return data\r\n\r\n\r\ndef get_sample_stats_stan3(fit, variables=None, ignore=None, dtypes=None):\r\n \"\"\"Extract sample stats from PyStan3 fit.\"\"\"\r\n if dtypes is None:\r\n dtypes = {}\r\n dtypes = {\"divergent__\": bool, \"n_leapfrog__\": np.int64, \"treedepth__\": np.int64, **dtypes}\r\n\r\n rename_dict = {\r\n \"divergent\": \"diverging\",\r\n \"n_leapfrog\": \"n_steps\",\r\n \"treedepth\": \"tree_depth\",\r\n \"stepsize\": \"step_size\",\r\n \"accept_stat\": \"acceptance_rate\",\r\n }\r\n\r\n if isinstance(variables, str):\r\n variables = [variables]\r\n if isinstance(ignore, str):\r\n ignore = [ignore]\r\n\r\n data = OrderedDict()\r\n for key in fit.sample_and_sampler_param_names:\r\n if (variables and key not in variables) or (ignore and key in ignore):\r\n continue\r\n new_shape = -1, fit.num_chains\r\n values = fit._draws[fit._parameter_indexes(key)] # pylint: disable=protected-access\r\n values = values.reshape(new_shape, order=\"F\")\r\n values = np.moveaxis(values, [-2, -1], [1, 0])\r\n dtype = dtypes.get(key)\r\n values = values.astype(dtype)\r\n name = re.sub(\"__$\", \"\", key)\r\n name = rename_dict.get(name, name)\r\n data[name] = values\r\n\r\n return data\r\n\r\n\r\ndef get_attrs_stan3(fit, model=None):\r\n \"\"\"Get attributes from PyStan3 fit and model object.\"\"\"\r\n attrs = {}\r\n for key in [\"num_chains\", \"num_samples\", \"num_thin\", \"num_warmup\", \"save_warmup\"]:\r\n try:\r\n attrs[key] = getattr(fit, key)\r\n except AttributeError as exp:\r\n _log.warning(\"Failed to access attribute %s in fit object %s\", key, exp)\r\n\r\n if model is not None:\r\n for key in [\"model_name\", \"program_code\", \"random_seed\"]:\r\n try:\r\n attrs[key] = getattr(model, key)\r\n except AttributeError as exp:\r\n _log.warning(\"Failed to access attribute %s in model object %s\", key, exp)\r\n\r\n return attrs\r\n\r\n\r\ndef infer_dtypes(fit, model=None):\r\n \"\"\"Infer dtypes from Stan model code.\r\n\r\n Function strips out generated quantities block and searches for `int`\r\n dtypes after stripping out comments inside the block.\r\n \"\"\"\r\n if model is None:\r\n stan_code = fit.get_stancode()\r\n model_pars = fit.model_pars\r\n else:\r\n stan_code = model.program_code\r\n model_pars = fit.param_names\r\n\r\n dtypes = {key: item for key, item in infer_stan_dtypes(stan_code).items() if key in model_pars}\r\n return dtypes\r\n\r\n\r\n# pylint disable=too-many-instance-attributes\r\ndef from_pystan(\r\n posterior=None,\r\n *,\r\n posterior_predictive=None,\r\n predictions=None,\r\n prior=None,\r\n prior_predictive=None,\r\n observed_data=None,\r\n constant_data=None,\r\n predictions_constant_data=None,\r\n log_likelihood=None,\r\n coords=None,\r\n dims=None,\r\n posterior_model=None,\r\n prior_model=None,\r\n save_warmup=None,\r\n dtypes=None,\r\n):\r\n \"\"\"Convert PyStan data into an InferenceData object.\r\n\r\n For a usage example read the\r\n :ref:`Creating InferenceData section on from_pystan <creating_InferenceData>`\r\n\r\n Parameters\r\n ----------\r\n posterior : StanFit4Model or stan.fit.Fit\r\n PyStan fit object for posterior.\r\n posterior_predictive : str, a list of str\r\n Posterior predictive samples for the posterior.\r\n predictions : str, a list of str\r\n Out-of-sample predictions for the posterior.\r\n prior : StanFit4Model or stan.fit.Fit\r\n PyStan fit object for prior.\r\n prior_predictive : str, a list of str\r\n Posterior predictive samples for the prior.\r\n observed_data : str or a list of str\r\n observed data used in the sampling.\r\n Observed data is extracted from the `posterior.data`.\r\n PyStan3 needs model object for the extraction.\r\n See `posterior_model`.\r\n constant_data : str or list of str\r\n Constants relevant to the model (i.e. x values in a linear\r\n regression).\r\n predictions_constant_data : str or list of str\r\n Constants relevant to the model predictions (i.e. new x values in a linear\r\n regression).\r\n log_likelihood : dict of {str: str}, list of str or str, optional\r\n Pointwise log_likelihood for the data. log_likelihood is extracted from the\r\n posterior. It is recommended to use this argument as a dictionary whose keys\r\n are observed variable names and its values are the variables storing log\r\n likelihood arrays in the Stan code. In other cases, a dictionary with keys\r\n equal to its values is used. By default, if a variable ``log_lik`` is\r\n present in the Stan model, it will be retrieved as pointwise log\r\n likelihood values. Use ``False`` or set ``data.log_likelihood`` to\r\n false to avoid this behaviour.\r\n coords : dict[str, iterable]\r\n A dictionary containing the values that are used as index. The key\r\n is the name of the dimension, the values are the index values.\r\n dims : dict[str, List(str)]\r\n A mapping from variables to a list of coordinate names for the variable.\r\n posterior_model : stan.model.Model\r\n PyStan3 specific model object. Needed for automatic dtype parsing\r\n and for the extraction of observed data.\r\n prior_model : stan.model.Model\r\n PyStan3 specific model object. Needed for automatic dtype parsing.\r\n save_warmup : bool\r\n Save warmup iterations into InferenceData object. If not defined, use default\r\n defined by the rcParams. Not supported in PyStan3.\r\n dtypes: dict\r\n A dictionary containing dtype information (int, float) for parameters.\r\n By default dtype information is extracted from the model code.\r\n Model code is extracted from fit object in PyStan 2 and from model object\r\n in PyStan 3.\r\n\r\n Returns\r\n -------\r\n InferenceData object\r\n \"\"\"\r\n check_posterior = (posterior is not None) and (type(posterior).__module__ == \"stan.fit\")\r\n check_prior = (prior is not None) and (type(prior).__module__ == \"stan.fit\")\r\n if check_posterior or check_prior:\r\n if save_warmup:\r\n warnings.warn(\r\n \"save_warmup is not currently supported for PyStan3\",\r\n UserWarning,\r\n )\r\n return PyStan3Converter(\r\n posterior=posterior,\r\n posterior_model=posterior_model,\r\n posterior_predictive=posterior_predictive,\r\n predictions=predictions,\r\n prior=prior,\r\n prior_model=prior_model,\r\n prior_predictive=prior_predictive,\r\n observed_data=observed_data,\r\n constant_data=constant_data,\r\n predictions_constant_data=predictions_constant_data,\r\n log_likelihood=log_likelihood,\r\n coords=coords,\r\n dims=dims,\r\n dtypes=dtypes,\r\n ).to_inference_data()\r\n else:\r\n return PyStanConverter(\r\n posterior=posterior,\r\n posterior_predictive=posterior_predictive,\r\n predictions=predictions,\r\n prior=prior,\r\n prior_predictive=prior_predictive,\r\n observed_data=observed_data,\r\n constant_data=constant_data,\r\n predictions_constant_data=predictions_constant_data,\r\n log_likelihood=log_likelihood,\r\n coords=coords,\r\n dims=dims,\r\n save_warmup=save_warmup,\r\n dtypes=dtypes,\r\n ).to_inference_data()\r\n", "path": "arviz/data/io_pystan.py" } ]
diff --git a/arviz/data/io_pystan.py b/arviz/data/io_pystan.py index 0de5db3b1d..2401c7084e 100644 --- a/arviz/data/io_pystan.py +++ b/arviz/data/io_pystan.py @@ -809,6 +809,8 @@ def get_draws_stan3(fit, model=None, variables=None, ignore=None, dtypes=None): data = OrderedDict() for var in variables: + if var in ignore: + continue if var in data: continue dtype = dtypes.get(var) diff --git a/arviz/tests/external_tests/test_data_pystan.py b/arviz/tests/external_tests/test_data_pystan.py index feb82d1a9a..c2aa9322d9 100644 --- a/arviz/tests/external_tests/test_data_pystan.py +++ b/arviz/tests/external_tests/test_data_pystan.py @@ -153,7 +153,7 @@ def test_inference_data(self, data, eight_schools_params): inference_data5 = self.get_inference_data5(data) # inference_data 1 test_dict = { - "posterior": ["theta"], + "posterior": ["theta", "~log_lik"], "posterior_predictive": ["y_hat"], "predictions": ["y_hat"], "observed_data": ["y"],
TheAlgorithms__Python-11276
[ { "content": "import math\n\n\nclass SegmentTree:\n def __init__(self, a):\n self.A = a\n self.N = len(self.A)\n self.st = [0] * (\n 4 * self.N\n ) # approximate the overall size of segment tree with array N\n if self.N:\n self.build(1, 0, self.N - 1)\n\n def left(self, idx):\n \"\"\"\n Returns the left child index for a given index in a binary tree.\n\n >>> s = SegmentTree([1, 2, 3])\n >>> s.left(1)\n 2\n >>> s.left(2)\n 4\n \"\"\"\n return idx * 2\n\n def right(self, idx):\n \"\"\"\n Returns the right child index for a given index in a binary tree.\n\n >>> s = SegmentTree([1, 2, 3])\n >>> s.right(1)\n 3\n >>> s.right(2)\n 5\n \"\"\"\n return idx * 2 + 1\n\n def build(self, idx, l, r): # noqa: E741\n if l == r:\n self.st[idx] = self.A[l]\n else:\n mid = (l + r) // 2\n self.build(self.left(idx), l, mid)\n self.build(self.right(idx), mid + 1, r)\n self.st[idx] = max(self.st[self.left(idx)], self.st[self.right(idx)])\n\n def update(self, a, b, val):\n \"\"\"\n Update the values in the segment tree in the range [a,b] with the given value.\n\n >>> s = SegmentTree([1, 2, 3, 4, 5])\n >>> s.update(2, 4, 10)\n True\n >>> s.query(1, 5)\n 10\n \"\"\"\n return self.update_recursive(1, 0, self.N - 1, a - 1, b - 1, val)\n\n def update_recursive(self, idx, l, r, a, b, val): # noqa: E741\n \"\"\"\n update(1, 1, N, a, b, v) for update val v to [a,b]\n \"\"\"\n if r < a or l > b:\n return True\n if l == r:\n self.st[idx] = val\n return True\n mid = (l + r) // 2\n self.update_recursive(self.left(idx), l, mid, a, b, val)\n self.update_recursive(self.right(idx), mid + 1, r, a, b, val)\n self.st[idx] = max(self.st[self.left(idx)], self.st[self.right(idx)])\n return True\n\n def query(self, a, b):\n \"\"\"\n Query the maximum value in the range [a,b].\n\n >>> s = SegmentTree([1, 2, 3, 4, 5])\n >>> s.query(1, 3)\n 3\n >>> s.query(1, 5)\n 5\n \"\"\"\n return self.query_recursive(1, 0, self.N - 1, a - 1, b - 1)\n\n def query_recursive(self, idx, l, r, a, b): # noqa: E741\n \"\"\"\n query(1, 1, N, a, b) for query max of [a,b]\n \"\"\"\n if r < a or l > b:\n return -math.inf\n if l >= a and r <= b:\n return self.st[idx]\n mid = (l + r) // 2\n q1 = self.query_recursive(self.left(idx), l, mid, a, b)\n q2 = self.query_recursive(self.right(idx), mid + 1, r, a, b)\n return max(q1, q2)\n\n def show_data(self):\n show_list = []\n for i in range(1, N + 1):\n show_list += [self.query(i, i)]\n print(show_list)\n\n\nif __name__ == \"__main__\":\n A = [1, 2, -4, 7, 3, -5, 6, 11, -20, 9, 14, 15, 5, 2, -8]\n N = 15\n segt = SegmentTree(A)\n print(segt.query(4, 6))\n print(segt.query(7, 11))\n print(segt.query(7, 12))\n segt.update(1, 3, 111)\n print(segt.query(1, 15))\n segt.update(7, 8, 235)\n segt.show_data()\n", "path": "data_structures/binary_tree/segment_tree.py" } ]
[ { "content": "import math\n\n\nclass SegmentTree:\n def __init__(self, a):\n self.A = a\n self.N = len(self.A)\n self.st = [0] * (\n 4 * self.N\n ) # approximate the overall size of segment tree with array N\n if self.N:\n self.build(1, 0, self.N - 1)\n\n def left(self, idx):\n \"\"\"\n Returns the left child index for a given index in a binary tree.\n\n >>> s = SegmentTree([1, 2, 3])\n >>> s.left(1)\n 2\n >>> s.left(2)\n 4\n \"\"\"\n return idx * 2\n\n def right(self, idx):\n \"\"\"\n Returns the right child index for a given index in a binary tree.\n\n >>> s = SegmentTree([1, 2, 3])\n >>> s.right(1)\n 3\n >>> s.right(2)\n 5\n \"\"\"\n return idx * 2 + 1\n\n def build(self, idx, l, r): # noqa: E741\n if l == r:\n self.st[idx] = self.A[l]\n else:\n mid = (l + r) // 2\n self.build(self.left(idx), l, mid)\n self.build(self.right(idx), mid + 1, r)\n self.st[idx] = max(self.st[self.left(idx)], self.st[self.right(idx)])\n\n def update(self, a, b, val):\n \"\"\"\n Update the values in the segment tree in the range [a,b] with the given value.\n\n >>> s = SegmentTree([1, 2, 3, 4, 5])\n >>> s.update(2, 4, 10)\n True\n >>> s.query(1, 5)\n 10\n \"\"\"\n return self.update_recursive(1, 0, self.N - 1, a - 1, b - 1, val)\n\n def update_recursive(self, idx, l, r, a, b, val): # noqa: E741\n \"\"\"\n update(1, 1, N, a, b, v) for update val v to [a,b]\n \"\"\"\n if r < a or l > b:\n return True\n if l == r:\n self.st[idx] = val\n return True\n mid = (l + r) // 2\n self.update_recursive(self.left(idx), l, mid, a, b, val)\n self.update_recursive(self.right(idx), mid + 1, r, a, b, val)\n self.st[idx] = max(self.st[self.left(idx)], self.st[self.right(idx)])\n return True\n\n def query(self, a, b):\n \"\"\"\n Query the maximum value in the range [a,b].\n\n >>> s = SegmentTree([1, 2, 3, 4, 5])\n >>> s.query(1, 3)\n 3\n >>> s.query(1, 5)\n 5\n \"\"\"\n return self.query_recursive(1, 0, self.N - 1, a - 1, b - 1)\n\n def query_recursive(self, idx, l, r, a, b): # noqa: E741\n \"\"\"\n query(1, 1, N, a, b) for query max of [a,b]\n \"\"\"\n if r < a or l > b:\n return -math.inf\n if l >= a and r <= b:\n return self.st[idx]\n mid = (l + r) // 2\n q1 = self.query_recursive(self.left(idx), l, mid, a, b)\n q2 = self.query_recursive(self.right(idx), mid + 1, r, a, b)\n return max(q1, q2)\n\n def show_data(self):\n show_list = []\n for i in range(1, self.N + 1):\n show_list += [self.query(i, i)]\n print(show_list)\n\n\nif __name__ == \"__main__\":\n A = [1, 2, -4, 7, 3, -5, 6, 11, -20, 9, 14, 15, 5, 2, -8]\n N = 15\n segt = SegmentTree(A)\n print(segt.query(4, 6))\n print(segt.query(7, 11))\n print(segt.query(7, 12))\n segt.update(1, 3, 111)\n print(segt.query(1, 15))\n segt.update(7, 8, 235)\n segt.show_data()\n", "path": "data_structures/binary_tree/segment_tree.py" } ]
diff --git a/data_structures/binary_tree/segment_tree.py b/data_structures/binary_tree/segment_tree.py index 3b0b32946f6e..608e6326763a 100644 --- a/data_structures/binary_tree/segment_tree.py +++ b/data_structures/binary_tree/segment_tree.py @@ -98,7 +98,7 @@ def query_recursive(self, idx, l, r, a, b): # noqa: E741 def show_data(self): show_list = [] - for i in range(1, N + 1): + for i in range(1, self.N + 1): show_list += [self.query(i, i)] print(show_list)
typeddjango__django-stubs-1326
[ { "content": "import os\nfrom typing import List\n\nfrom setuptools import find_packages, setup\n\n\ndef find_stub_files(name: str) -> List[str]:\n result = []\n for root, _dirs, files in os.walk(name):\n for file in files:\n if file.endswith(\".pyi\"):\n if os.path.sep in root:\n sub_root = root.split(os.path.sep, 1)[-1]\n file = os.path.join(sub_root, file)\n result.append(file)\n return result\n\n\nwith open(\"README.md\") as f:\n readme = f.read()\n\ndependencies = [\n \"mypy>=0.980\",\n \"django\",\n \"django-stubs-ext>=0.7.0\",\n \"tomli\",\n # Types:\n \"typing-extensions\",\n \"types-pytz\",\n \"types-PyYAML\",\n]\n\nextras_require = {\n \"compatible-mypy\": [\"mypy>=0.980,<0.990\"],\n}\n\nsetup(\n name=\"django-stubs\",\n version=\"1.13.1\",\n description=\"Mypy stubs for Django\",\n long_description=readme,\n long_description_content_type=\"text/markdown\",\n license=\"MIT\",\n url=\"https://github.com/typeddjango/django-stubs\",\n author=\"Maksim Kurnikov\",\n author_email=\"maxim.kurnikov@gmail.com\",\n maintainer=\"Nikita Sobolev\",\n maintainer_email=\"mail@sobolevn.me\",\n py_modules=[],\n python_requires=\">=3.7\",\n install_requires=dependencies,\n extras_require=extras_require,\n packages=[\"django-stubs\", *find_packages(exclude=[\"scripts\"])],\n package_data={\n \"django-stubs\": find_stub_files(\"django-stubs\"),\n \"mypy_django_plugin\": [\"py.typed\"],\n },\n classifiers=[\n \"License :: OSI Approved :: MIT License\",\n \"Operating System :: OS Independent\",\n \"Programming Language :: Python :: 3.7\",\n \"Programming Language :: Python :: 3.8\",\n \"Programming Language :: Python :: 3.9\",\n \"Programming Language :: Python :: 3.10\",\n \"Programming Language :: Python :: 3.11\",\n \"Typing :: Typed\",\n \"Framework :: Django\",\n \"Framework :: Django :: 2.2\",\n \"Framework :: Django :: 3.0\",\n \"Framework :: Django :: 3.1\",\n \"Framework :: Django :: 3.2\",\n \"Framework :: Django :: 4.0\",\n \"Framework :: Django :: 4.1\",\n ],\n project_urls={\n \"Release notes\": \"https://github.com/typeddjango/django-stubs/releases\",\n },\n)\n", "path": "setup.py" } ]
[ { "content": "import os\nfrom typing import List\n\nfrom setuptools import find_packages, setup\n\n\ndef find_stub_files(name: str) -> List[str]:\n result = []\n for root, _dirs, files in os.walk(name):\n for file in files:\n if file.endswith(\".pyi\"):\n if os.path.sep in root:\n sub_root = root.split(os.path.sep, 1)[-1]\n file = os.path.join(sub_root, file)\n result.append(file)\n return result\n\n\nwith open(\"README.md\") as f:\n readme = f.read()\n\ndependencies = [\n \"mypy>=0.980\",\n \"django\",\n \"django-stubs-ext>=0.7.0\",\n \"tomli\",\n # Types:\n \"typing-extensions\",\n \"types-pytz\",\n \"types-PyYAML\",\n]\n\nextras_require = {\n \"compatible-mypy\": [\"mypy>=0.980,<0.990\"],\n}\n\nsetup(\n name=\"django-stubs\",\n version=\"1.13.2\",\n description=\"Mypy stubs for Django\",\n long_description=readme,\n long_description_content_type=\"text/markdown\",\n license=\"MIT\",\n url=\"https://github.com/typeddjango/django-stubs\",\n author=\"Maksim Kurnikov\",\n author_email=\"maxim.kurnikov@gmail.com\",\n maintainer=\"Nikita Sobolev\",\n maintainer_email=\"mail@sobolevn.me\",\n py_modules=[],\n python_requires=\">=3.7\",\n install_requires=dependencies,\n extras_require=extras_require,\n packages=[\"django-stubs\", *find_packages(exclude=[\"scripts\"])],\n package_data={\n \"django-stubs\": find_stub_files(\"django-stubs\"),\n \"mypy_django_plugin\": [\"py.typed\"],\n },\n classifiers=[\n \"License :: OSI Approved :: MIT License\",\n \"Operating System :: OS Independent\",\n \"Programming Language :: Python :: 3.7\",\n \"Programming Language :: Python :: 3.8\",\n \"Programming Language :: Python :: 3.9\",\n \"Programming Language :: Python :: 3.10\",\n \"Programming Language :: Python :: 3.11\",\n \"Typing :: Typed\",\n \"Framework :: Django\",\n \"Framework :: Django :: 2.2\",\n \"Framework :: Django :: 3.0\",\n \"Framework :: Django :: 3.1\",\n \"Framework :: Django :: 3.2\",\n \"Framework :: Django :: 4.0\",\n \"Framework :: Django :: 4.1\",\n ],\n project_urls={\n \"Release notes\": \"https://github.com/typeddjango/django-stubs/releases\",\n },\n)\n", "path": "setup.py" } ]
diff --git a/setup.py b/setup.py index 442eeed98..6649dac60 100644 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ def find_stub_files(name: str) -> List[str]: setup( name="django-stubs", - version="1.13.1", + version="1.13.2", description="Mypy stubs for Django", long_description=readme, long_description_content_type="text/markdown",
pytorch__vision-8164
[ { "content": "import csv\nimport os\nfrom typing import Any, Callable, List, Optional, Tuple\n\nfrom PIL import Image\n\nfrom .utils import download_and_extract_archive\nfrom .vision import VisionDataset\n\n\nclass Kitti(VisionDataset):\n \"\"\"`KITTI <http://www.cvlibs.net/datasets/kitti/eval_object.php?obj_benchmark>`_ Dataset.\n\n It corresponds to the \"left color images of object\" dataset, for object detection.\n\n Args:\n root (string): Root directory where images are downloaded to.\n Expects the following folder structure if download=False:\n\n .. code::\n\n <root>\n └── Kitti\n └─ raw\n ├── training\n | ├── image_2\n | └── label_2\n └── testing\n └── image_2\n train (bool, optional): Use ``train`` split if true, else ``test`` split.\n Defaults to ``train``.\n transform (callable, optional): A function/transform that takes in a PIL image\n and returns a transformed version. E.g, ``transforms.PILToTensor``\n target_transform (callable, optional): A function/transform that takes in the\n target and transforms it.\n transforms (callable, optional): A function/transform that takes input sample\n and its target as entry and returns a transformed version.\n download (bool, optional): If true, downloads the dataset from the internet and\n puts it in root directory. If dataset is already downloaded, it is not\n downloaded again.\n\n \"\"\"\n\n data_url = \"https://s3.eu-central-1.amazonaws.com/avg-kitti/\"\n resources = [\n \"data_object_image_2.zip\",\n \"data_object_label_2.zip\",\n ]\n image_dir_name = \"image_2\"\n labels_dir_name = \"label_2\"\n\n def __init__(\n self,\n root: str,\n train: bool = True,\n transform: Optional[Callable] = None,\n target_transform: Optional[Callable] = None,\n transforms: Optional[Callable] = None,\n download: bool = False,\n ):\n super().__init__(\n root,\n transform=transform,\n target_transform=target_transform,\n transforms=transforms,\n )\n self.images = []\n self.targets = []\n self.root = root\n self.train = train\n self._location = \"training\" if self.train else \"testing\"\n\n if download:\n self.download()\n if not self._check_exists():\n raise RuntimeError(\"Dataset not found. You may use download=True to download it.\")\n\n image_dir = os.path.join(self._raw_folder, self._location, self.image_dir_name)\n if self.train:\n labels_dir = os.path.join(self._raw_folder, self._location, self.labels_dir_name)\n for img_file in os.listdir(image_dir):\n self.images.append(os.path.join(image_dir, img_file))\n if self.train:\n self.targets.append(os.path.join(labels_dir, f\"{img_file.split('.')[0]}.txt\"))\n\n def __getitem__(self, index: int) -> Tuple[Any, Any]:\n \"\"\"Get item at a given index.\n\n Args:\n index (int): Index\n Returns:\n tuple: (image, target), where\n target is a list of dictionaries with the following keys:\n\n - type: str\n - truncated: float\n - occluded: int\n - alpha: float\n - bbox: float[4]\n - dimensions: float[3]\n - locations: float[3]\n - rotation_y: float\n\n \"\"\"\n image = Image.open(self.images[index])\n target = self._parse_target(index) if self.train else None\n if self.transforms:\n image, target = self.transforms(image, target)\n return image, target\n\n def _parse_target(self, index: int) -> List:\n target = []\n with open(self.targets[index]) as inp:\n content = csv.reader(inp, delimiter=\" \")\n for line in content:\n target.append(\n {\n \"type\": line[0],\n \"truncated\": float(line[1]),\n \"occluded\": int(line[2]),\n \"alpha\": float(line[3]),\n \"bbox\": [float(x) for x in line[4:8]],\n \"dimensions\": [float(x) for x in line[8:11]],\n \"location\": [float(x) for x in line[11:14]],\n \"rotation_y\": float(line[14]),\n }\n )\n return target\n\n def __len__(self) -> int:\n return len(self.images)\n\n @property\n def _raw_folder(self) -> str:\n return os.path.join(self.root, self.__class__.__name__, \"raw\")\n\n def _check_exists(self) -> bool:\n \"\"\"Check if the data directory exists.\"\"\"\n folders = [self.image_dir_name]\n if self.train:\n folders.append(self.labels_dir_name)\n return all(os.path.isdir(os.path.join(self._raw_folder, self._location, fname)) for fname in folders)\n\n def download(self) -> None:\n \"\"\"Download the KITTI data if it doesn't exist already.\"\"\"\n\n if self._check_exists():\n return\n\n os.makedirs(self._raw_folder, exist_ok=True)\n\n # download files\n for fname in self.resources:\n download_and_extract_archive(\n url=f\"{self.data_url}{fname}\",\n download_root=self._raw_folder,\n filename=fname,\n )\n", "path": "torchvision/datasets/kitti.py" } ]
[ { "content": "import csv\nimport os\nfrom typing import Any, Callable, List, Optional, Tuple\n\nfrom PIL import Image\n\nfrom .utils import download_and_extract_archive\nfrom .vision import VisionDataset\n\n\nclass Kitti(VisionDataset):\n \"\"\"`KITTI <http://www.cvlibs.net/datasets/kitti/eval_object.php?obj_benchmark>`_ Dataset.\n\n It corresponds to the \"left color images of object\" dataset, for object detection.\n\n Args:\n root (string): Root directory where images are downloaded to.\n Expects the following folder structure if download=False:\n\n .. code::\n\n <root>\n └── Kitti\n └─ raw\n ├── training\n | ├── image_2\n | └── label_2\n └── testing\n └── image_2\n train (bool, optional): Use ``train`` split if true, else ``test`` split.\n Defaults to ``train``.\n transform (callable, optional): A function/transform that takes in a PIL image\n and returns a transformed version. E.g, ``transforms.PILToTensor``\n target_transform (callable, optional): A function/transform that takes in the\n target and transforms it.\n transforms (callable, optional): A function/transform that takes input sample\n and its target as entry and returns a transformed version.\n download (bool, optional): If true, downloads the dataset from the internet and\n puts it in root directory. If dataset is already downloaded, it is not\n downloaded again.\n\n \"\"\"\n\n data_url = \"https://s3.eu-central-1.amazonaws.com/avg-kitti/\"\n resources = [\n \"data_object_image_2.zip\",\n \"data_object_label_2.zip\",\n ]\n image_dir_name = \"image_2\"\n labels_dir_name = \"label_2\"\n\n def __init__(\n self,\n root: str,\n train: bool = True,\n transform: Optional[Callable] = None,\n target_transform: Optional[Callable] = None,\n transforms: Optional[Callable] = None,\n download: bool = False,\n ):\n super().__init__(\n root,\n transform=transform,\n target_transform=target_transform,\n transforms=transforms,\n )\n self.images = []\n self.targets = []\n self.train = train\n self._location = \"training\" if self.train else \"testing\"\n\n if download:\n self.download()\n if not self._check_exists():\n raise RuntimeError(\"Dataset not found. You may use download=True to download it.\")\n\n image_dir = os.path.join(self._raw_folder, self._location, self.image_dir_name)\n if self.train:\n labels_dir = os.path.join(self._raw_folder, self._location, self.labels_dir_name)\n for img_file in os.listdir(image_dir):\n self.images.append(os.path.join(image_dir, img_file))\n if self.train:\n self.targets.append(os.path.join(labels_dir, f\"{img_file.split('.')[0]}.txt\"))\n\n def __getitem__(self, index: int) -> Tuple[Any, Any]:\n \"\"\"Get item at a given index.\n\n Args:\n index (int): Index\n Returns:\n tuple: (image, target), where\n target is a list of dictionaries with the following keys:\n\n - type: str\n - truncated: float\n - occluded: int\n - alpha: float\n - bbox: float[4]\n - dimensions: float[3]\n - locations: float[3]\n - rotation_y: float\n\n \"\"\"\n image = Image.open(self.images[index])\n target = self._parse_target(index) if self.train else None\n if self.transforms:\n image, target = self.transforms(image, target)\n return image, target\n\n def _parse_target(self, index: int) -> List:\n target = []\n with open(self.targets[index]) as inp:\n content = csv.reader(inp, delimiter=\" \")\n for line in content:\n target.append(\n {\n \"type\": line[0],\n \"truncated\": float(line[1]),\n \"occluded\": int(line[2]),\n \"alpha\": float(line[3]),\n \"bbox\": [float(x) for x in line[4:8]],\n \"dimensions\": [float(x) for x in line[8:11]],\n \"location\": [float(x) for x in line[11:14]],\n \"rotation_y\": float(line[14]),\n }\n )\n return target\n\n def __len__(self) -> int:\n return len(self.images)\n\n @property\n def _raw_folder(self) -> str:\n return os.path.join(self.root, self.__class__.__name__, \"raw\")\n\n def _check_exists(self) -> bool:\n \"\"\"Check if the data directory exists.\"\"\"\n folders = [self.image_dir_name]\n if self.train:\n folders.append(self.labels_dir_name)\n return all(os.path.isdir(os.path.join(self._raw_folder, self._location, fname)) for fname in folders)\n\n def download(self) -> None:\n \"\"\"Download the KITTI data if it doesn't exist already.\"\"\"\n\n if self._check_exists():\n return\n\n os.makedirs(self._raw_folder, exist_ok=True)\n\n # download files\n for fname in self.resources:\n download_and_extract_archive(\n url=f\"{self.data_url}{fname}\",\n download_root=self._raw_folder,\n filename=fname,\n )\n", "path": "torchvision/datasets/kitti.py" } ]
diff --git a/torchvision/datasets/kitti.py b/torchvision/datasets/kitti.py index c166a25c7d8..37b99006c75 100644 --- a/torchvision/datasets/kitti.py +++ b/torchvision/datasets/kitti.py @@ -66,7 +66,6 @@ def __init__( ) self.images = [] self.targets = [] - self.root = root self.train = train self._location = "training" if self.train else "testing"
pypi__warehouse-3130
[ { "content": "# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nfrom first import first\nfrom pyramid.httpexceptions import HTTPMovedPermanently, HTTPNotFound\nfrom pyramid.view import view_config\nfrom sqlalchemy.orm.exc import NoResultFound\n\nfrom warehouse.accounts.models import User\nfrom warehouse.cache.origin import origin_cache\nfrom warehouse.packaging.models import Release, Role\n\n\n@view_config(\n route_name=\"packaging.project\",\n renderer=\"packaging/detail.html\",\n decorator=[\n origin_cache(\n 1 * 24 * 60 * 60, # 1 day\n stale_while_revalidate=1 * 24 * 60 * 60, # 1 day\n stale_if_error=5 * 24 * 60 * 60, # 5 days\n ),\n ],\n)\ndef project_detail(project, request):\n if project.name != request.matchdict.get(\"name\", project.name):\n return HTTPMovedPermanently(\n request.current_route_path(name=project.name),\n )\n\n try:\n release = (\n request.db.query(Release)\n .filter(Release.project == project)\n .order_by(\n Release.is_prerelease.nullslast(),\n Release._pypi_ordering.desc())\n .limit(1)\n .one()\n )\n except NoResultFound:\n return HTTPNotFound()\n\n return release_detail(release, request)\n\n\n@view_config(\n route_name=\"packaging.release\",\n renderer=\"packaging/detail.html\",\n decorator=[\n origin_cache(\n 1 * 24 * 60 * 60, # 1 day\n stale_while_revalidate=1 * 24 * 60 * 60, # 1 day\n stale_if_error=5 * 24 * 60 * 60, # 5 days\n ),\n ],\n)\ndef release_detail(release, request):\n project = release.project\n\n if not {project.name, release.version} <= set(request.matchdict.values()):\n return HTTPMovedPermanently(\n request.current_route_path(\n name=project.name, version=release.version,\n ),\n )\n\n # Get all of the registered versions for this Project, in order of newest\n # to oldest.\n all_releases = (\n request.db.query(Release)\n .filter(Release.project == project)\n .with_entities(\n Release.version,\n Release.is_prerelease,\n Release.created)\n .order_by(Release._pypi_ordering.desc())\n .all()\n )\n\n # Get the latest non-prerelease of this Project, or the latest release if\n # all releases are prereleases.\n latest_release = first(\n all_releases,\n key=lambda r: not r.is_prerelease,\n default=all_releases[0],\n )\n\n # Get all of the maintainers for this project.\n maintainers = [\n r.user\n for r in (\n request.db.query(Role)\n .join(User)\n .filter(Role.project == project)\n .distinct(User.username)\n .order_by(User.username)\n .all()\n )\n ]\n\n # Get the license from the classifiers or metadata, preferring classifiers.\n license = None\n if release.license:\n # Make a best effort when the entire license text is given\n # by using the first line only.\n license = release.license.split('\\n')[0]\n license_classifiers = [c.split(\" :: \")[-1] for c in release.classifiers\n if c.startswith(\"License\")]\n if license_classifiers:\n license = ', '.join(license_classifiers)\n\n return {\n \"project\": project,\n \"release\": release,\n \"files\": release.files.all(),\n \"latest_release\": latest_release,\n \"all_releases\": all_releases,\n \"maintainers\": maintainers,\n \"license\": license,\n }\n\n\n@view_config(\n route_name=\"includes.edit-project-button\",\n renderer=\"includes/edit-project-button.html\",\n uses_session=True,\n permission=\"manage\",\n)\ndef edit_project_button(project, request):\n return {'project': project}\n", "path": "warehouse/packaging/views.py" } ]
[ { "content": "# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\nfrom first import first\nfrom pyramid.httpexceptions import HTTPMovedPermanently, HTTPNotFound\nfrom pyramid.view import view_config\nfrom sqlalchemy.orm.exc import NoResultFound\n\nfrom warehouse.accounts.models import User\nfrom warehouse.cache.origin import origin_cache\nfrom warehouse.packaging.models import Release, Role\n\n\n@view_config(\n route_name=\"packaging.project\",\n renderer=\"packaging/detail.html\",\n decorator=[\n origin_cache(\n 1 * 24 * 60 * 60, # 1 day\n stale_while_revalidate=1 * 24 * 60 * 60, # 1 day\n stale_if_error=5 * 24 * 60 * 60, # 5 days\n ),\n ],\n)\ndef project_detail(project, request):\n if project.name != request.matchdict.get(\"name\", project.name):\n return HTTPMovedPermanently(\n request.current_route_path(name=project.name),\n )\n\n try:\n release = (\n request.db.query(Release)\n .filter(Release.project == project)\n .order_by(\n Release.is_prerelease.nullslast(),\n Release._pypi_ordering.desc())\n .limit(1)\n .one()\n )\n except NoResultFound:\n return HTTPNotFound()\n\n return release_detail(release, request)\n\n\n@view_config(\n route_name=\"packaging.release\",\n renderer=\"packaging/detail.html\",\n decorator=[\n origin_cache(\n 1 * 24 * 60 * 60, # 1 day\n stale_while_revalidate=1 * 24 * 60 * 60, # 1 day\n stale_if_error=5 * 24 * 60 * 60, # 5 days\n ),\n ],\n)\ndef release_detail(release, request):\n project = release.project\n\n if not {project.name, release.version} <= set(request.matchdict.values()):\n return HTTPMovedPermanently(\n request.current_route_path(\n name=project.name, version=release.version,\n ),\n )\n\n # Get all of the registered versions for this Project, in order of newest\n # to oldest.\n all_releases = (\n request.db.query(Release)\n .filter(Release.project == project)\n .with_entities(\n Release.version,\n Release.is_prerelease,\n Release.created)\n .order_by(Release._pypi_ordering.desc())\n .all()\n )\n\n # Get the latest non-prerelease of this Project, or the latest release if\n # all releases are prereleases.\n latest_release = first(\n all_releases,\n key=lambda r: not r.is_prerelease,\n default=all_releases[0],\n )\n\n # Get all of the maintainers for this project.\n maintainers = [\n r.user\n for r in (\n request.db.query(Role)\n .join(User)\n .filter(Role.project == project)\n .distinct(User.username)\n .order_by(User.username)\n .all()\n )\n ]\n\n # Get the license from the classifiers or metadata, preferring classifiers.\n license = None\n if release.license:\n # Make a best effort when the entire license text is given\n # by using the first line only.\n license = release.license.split('\\n')[0]\n license_classifiers = [c.split(\" :: \")[-1] for c in release.classifiers\n if c.startswith(\"License\")]\n if license_classifiers:\n license = ', '.join(license_classifiers)\n\n return {\n \"project\": project,\n \"release\": release,\n \"files\": release.files.all(),\n \"latest_release\": latest_release,\n \"all_releases\": all_releases,\n \"maintainers\": maintainers,\n \"license\": license,\n }\n\n\n@view_config(\n route_name=\"includes.edit-project-button\",\n renderer=\"includes/manage-project-button.html\",\n uses_session=True,\n permission=\"manage\",\n)\ndef edit_project_button(project, request):\n return {'project': project}\n", "path": "warehouse/packaging/views.py" } ]
diff --git a/warehouse/packaging/views.py b/warehouse/packaging/views.py index 5d534e1ae03d..4711e17cbfc7 100644 --- a/warehouse/packaging/views.py +++ b/warehouse/packaging/views.py @@ -132,7 +132,7 @@ def release_detail(release, request): @view_config( route_name="includes.edit-project-button", - renderer="includes/edit-project-button.html", + renderer="includes/manage-project-button.html", uses_session=True, permission="manage", ) diff --git a/warehouse/static/sass/blocks/_package-snippet.scss b/warehouse/static/sass/blocks/_package-snippet.scss index 7a1607bf9f98..fc0dca22e324 100644 --- a/warehouse/static/sass/blocks/_package-snippet.scss +++ b/warehouse/static/sass/blocks/_package-snippet.scss @@ -69,7 +69,7 @@ } &__buttons { - width: 140px; + width: 180px; .button { display: inline-block; diff --git a/warehouse/templates/includes/edit-project-button.html b/warehouse/templates/includes/manage-project-button.html similarity index 94% rename from warehouse/templates/includes/edit-project-button.html rename to warehouse/templates/includes/manage-project-button.html index 5ea96acada81..7607e3a1b13f 100644 --- a/warehouse/templates/includes/edit-project-button.html +++ b/warehouse/templates/includes/manage-project-button.html @@ -13,5 +13,5 @@ -#} {% if request.user %} - <a href="{{ request.route_path('manage.project.releases', project_name=project.name) }}" class="button button--primary package-description__edit-button">Edit Project</a> + <a href="{{ request.route_path('manage.project.releases', project_name=project.name) }}" class="button button--primary package-description__edit-button">Manage Project</a> {% endif %} diff --git a/warehouse/templates/manage/projects.html b/warehouse/templates/manage/projects.html index 06b316d6f168..b7960ae0b5cb 100644 --- a/warehouse/templates/manage/projects.html +++ b/warehouse/templates/manage/projects.html @@ -46,12 +46,12 @@ <h3 class="package-snippet__title">{{ project.name }}</h3> href="{{ request.route_path('manage.project.releases', project_name=project.normalized_name) }}" class="button button--primary" {% if project.name in projects_owned %} - title="Edit this project" + title="Manage this project" {% else %} disabled title="You are not an owner of this project" {% endif %} - >Edit</a> + >Manage</a> <a href="{{ request.route_path('packaging.project', name=project.normalized_name) }}" class="button"