Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support downloading universal and pure Python wheels #4981

Merged
merged 13 commits into from
Nov 27, 2019
Merged

Support downloading universal and pure Python wheels #4981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
12bc992
tell the root layout about the desired python_tag
trishankatdatadog Sep 20, 2019
a9a0189
new major version of downloader that can override --python-tag
trishankatdatadog Nov 5, 2019
4a42c53
refactoring to make code easier to read
trishankatdatadog Nov 6, 2019
e9753d1
add friendlier error handling for in-toto verification
trishankatdatadog Nov 15, 2019
819ea59
check whether wheel is compatible w/ sys Python
trishankatdatadog Nov 19, 2019
b9579ff
replace some asserts
trishankatdatadog Nov 20, 2019
c093029
manually downgrade version; will bump later
trishankatdatadog Nov 21, 2019
5734754
update libs
trishankatdatadog Nov 23, 2019
464a8bf
update to 5.root.json
trishankatdatadog Nov 27, 2019
825dfc2
update requirements.in
trishankatdatadog Nov 27, 2019
36ec481
appease the style nanny
trishankatdatadog Nov 27, 2019
2504873
appease black
trishankatdatadog Nov 27, 2019
b28fe1f
update in-toto in ddev
trishankatdatadog Nov 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions datadog_checks_base/datadog_checks/base/data/agent_requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ flup==1.0.3.dev-20110405; python_version < '3.0'
flup-py3==1.0.3; python_version > '3.0'
gearman==2.0.2; sys_platform != 'win32' and python_version < '3.0'
httplib2==0.10.3
in-toto==0.3.0
in-toto==0.4.1
ipaddress==1.0.22; python_version < '3.0'
jaydebeapi==1.1.1
jpype1==0.7.0
Expand Down Expand Up @@ -56,15 +56,15 @@ requests==2.22.0
requests-kerberos==0.12.0
requests_ntlm==1.1.0
scandir==1.8
securesystemslib[crypto,pynacl]==0.11.3
securesystemslib[crypto,pynacl]==0.12.2
selectors34==1.2.0; sys_platform == 'win32' and python_version < '3.4'
semver==2.9.0
serpent==1.27; sys_platform == 'win32'
service_identity[idna]==18.1.0
simplejson==3.6.5
six==1.12.0
supervisor==4.0.1
tuf==0.11.2.dev3
tuf==0.12.1
uptime==3.0.1
vertica-python==0.9.4
win-inet-pton==1.1.0; sys_platform == 'win32' and python_version < '3.0'
2 changes: 1 addition & 1 deletion datadog_checks_dev/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
'click',
'colorama',
'docker-compose>=1.23.1,<1.24.0',
'in-toto==0.3.0',
'in-toto>=0.4.1',
'pip-tools',
'pylint',
'Pillow',
Expand Down
39 changes: 9 additions & 30 deletions datadog_checks_downloader/datadog_checks/downloader/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,9 @@
import argparse
import re

# 3rd party.
from tuf.exceptions import UnknownTargetError

# 2nd party.
# 2nd party.
from .download import REPOSITORY_URL_PREFIX, TUFDownloader
from .exceptions import NonCanonicalVersion, NonDatadogPackage, NoSuchDatadogPackageOrVersion
from .exceptions import NonCanonicalVersion, NonDatadogPackage

# Private module functions.

Expand All @@ -27,11 +23,6 @@ def __is_canonical(version):
return re.match(P, version) is not None


def __get_wheel_distribution_name(standard_distribution_name):
# https://www.python.org/dev/peps/pep-0491/#escaping-and-unicode
return re.sub('[^\\w\\d.]+', '_', standard_distribution_name, re.UNICODE)


# Public module functions.


Expand Down Expand Up @@ -60,23 +51,11 @@ def download():

if not standard_distribution_name.startswith('datadog-'):
raise NonDatadogPackage(standard_distribution_name)
else:
wheel_distribution_name = __get_wheel_distribution_name(standard_distribution_name)
tuf_downloader = TUFDownloader(repository_url_prefix=repository_url_prefix, verbose=verbose)

if not version:
version = tuf_downloader.get_latest_version(standard_distribution_name, wheel_distribution_name)
else:
if not __is_canonical(version):
raise NonCanonicalVersion(version)

target_relpath = 'simple/{}/{}-{}-py2.py3-none-any.whl'.format(
standard_distribution_name, wheel_distribution_name, version
)

try:
target_abspath = tuf_downloader.download(target_relpath)
except UnknownTargetError:
raise NoSuchDatadogPackageOrVersion(standard_distribution_name, version)

print(target_abspath) # pylint: disable=print-statement

if version and not __is_canonical(version):
raise NonCanonicalVersion(version)

tuf_downloader = TUFDownloader(repository_url_prefix=repository_url_prefix, verbose=verbose)
wheel_relpath = tuf_downloader.get_wheel_relpath(standard_distribution_name, version=version)
wheel_abspath = tuf_downloader.download(wheel_relpath)
print(wheel_abspath) # pylint: disable=print-statement
74 changes: 37 additions & 37 deletions datadog_checks_downloader/datadog_checks/downloader/data/repo/metadata/current/root.json
View file
Open in desktop

Large diffs are not rendered by default.

Loading