Cleanup
This commit is contained in:
@@ -123,4 +123,3 @@ Additional language was incorporated and modified from the following Codes of Co
|
||||
* [Mozilla Community Participation Guidelines](https://www.mozilla.org/en-US/about/governance/policies/participation/) is licensed [Creative Commons Attribution-ShareAlike 3.0 Unported License](https://creativecommons.org/licenses/by-sa/3.0/).
|
||||
* [Python Mentors Code of Conduct](http://pythonmentors.com/)
|
||||
* [Speak Up! Community Code of Conduct](http://web.archive.org/web/20141109123859/http://speakup.io/coc.html), licensed under a [Creative Commons Attribution 3.0 Unported License](http://creativecommons.org/licenses/by/3.0/)
|
||||
|
||||
|
@@ -28,14 +28,14 @@ def canonical_url(url):
|
||||
u = urlparse(url)
|
||||
# It seems cargo drops query and fragment
|
||||
u = ParseResult(u.scheme, u.netloc, u.path, None, None, None)
|
||||
u = u._replace(path = u.path.rstrip('/'))
|
||||
u = u._replace(path=u.path.rstrip('/'))
|
||||
|
||||
if u.netloc == 'github.com':
|
||||
u = u._replace(scheme = 'https')
|
||||
u = u._replace(path = u.path.lower())
|
||||
u = u._replace(scheme='https')
|
||||
u = u._replace(path=u.path.lower())
|
||||
|
||||
if u.path.endswith('.git'):
|
||||
u = u._replace(path = u.path[:-len('.git')])
|
||||
u = u._replace(path=u.path[:-len('.git')])
|
||||
|
||||
return u
|
||||
|
||||
@@ -91,7 +91,7 @@ def find_cargo_toml(git_repo_dir):
|
||||
f'Multiple Cargo.toml files found in {git_repo_dir}\n'
|
||||
'Please report this error and the link to the affected repisitory here:\n'
|
||||
'https://github.com/flatpak/flatpak-builder-tools/issues'
|
||||
)
|
||||
)
|
||||
raise Exception(f'No Cargo.toml found in {git_repo_dir}')
|
||||
|
||||
|
||||
@@ -234,7 +234,7 @@ async def get_git_package_sources(package, git_repos):
|
||||
{
|
||||
'type': 'inline',
|
||||
'contents': json.dumps({'package': None, 'files': {}}),
|
||||
'dest': f'{CARGO_CRATES}/{name}', #-{version}',
|
||||
'dest': f'{CARGO_CRATES}/{name}', # -{version}',
|
||||
'dest-filename': '.cargo-checksum.json',
|
||||
}
|
||||
]
|
||||
|
@@ -13,7 +13,6 @@ import tempfile
|
||||
import urllib.request
|
||||
|
||||
from collections import OrderedDict
|
||||
from typing import Dict
|
||||
|
||||
try:
|
||||
import requirements
|
||||
@@ -197,7 +196,7 @@ if opts.runtime:
|
||||
if os.path.exists(requirements_file):
|
||||
prefix = os.path.realpath(requirements_file)
|
||||
flag = '--filesystem={}'.format(prefix)
|
||||
flatpak_cmd.insert(1,flag)
|
||||
flatpak_cmd.insert(1, flag)
|
||||
else:
|
||||
flatpak_cmd = [pip_executable]
|
||||
|
||||
|
@@ -1,14 +1,14 @@
|
||||
PyGObject
|
||||
natsort
|
||||
Pillow
|
||||
beautifulsoup4
|
||||
lxml
|
||||
keyring >= 21.6.0
|
||||
brotli
|
||||
cloudscraper
|
||||
dateparser >= 1.1.4
|
||||
emoji
|
||||
python_magic
|
||||
keyring >= 21.6.0
|
||||
lxml
|
||||
natsort
|
||||
Pillow
|
||||
pure-protobuf
|
||||
cloudscraper
|
||||
Unidecode
|
||||
brotli
|
||||
PyGObject
|
||||
python_magic
|
||||
rarfile
|
||||
Unidecode
|
||||
|
@@ -1,7 +1,6 @@
|
||||
import logging
|
||||
import pytest
|
||||
from pytest_steps import test_steps
|
||||
import urllib
|
||||
|
||||
from komikku.utils import log_error_traceback
|
||||
|
||||
|
Reference in New Issue
Block a user