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.

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

Normalize to module imports #576

Merged
merged 6 commits into from
Feb 19, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
1 change: 0 additions & 1 deletion .isort.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[settings]
combine_as_imports=True
multi_line_output=3
include_trailing_comma=True
force_grid_wrap=0
Expand Down
3 changes: 2 additions & 1 deletion tests/test_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@

import pretend

from twine import commands, package as package_file
from twine import commands
from twine import package as package_file
from twine.commands import check


Expand Down
3 changes: 2 additions & 1 deletion tests/test_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@

import pretend

from twine import __main__ as dunder_main, cli, exceptions
from twine import __main__ as dunder_main
from twine import cli, exceptions
bhrutledge marked this conversation as resolved.
Show resolved Hide resolved


def test_exception_handling(monkeypatch):
Expand Down
3 changes: 2 additions & 1 deletion tests/test_package.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
import pretend
import pytest

from twine import exceptions, package as package_file
from twine import exceptions
from twine import package as package_file


def test_sign_file(monkeypatch):
Expand Down
3 changes: 2 additions & 1 deletion tests/test_upload.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
import requests

import helpers
from twine import cli, exceptions, package as package_file
from twine import cli, exceptions
from twine import package as package_file
from twine.commands import upload

SDIST_FIXTURE = "tests/fixtures/twine-1.5.0.tar.gz"
Expand Down
3 changes: 2 additions & 1 deletion twine/commands/check.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@

import readme_renderer.rst

from twine import commands, package as package_file
from twine import commands
from twine import package as package_file

_RENDERERS = {
None: readme_renderer.rst, # Default if description_content_type is None
Expand Down
4 changes: 3 additions & 1 deletion twine/commands/register.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
import argparse
import os.path

from twine import exceptions, package as package_file, settings
from twine import exceptions
from twine import package as package_file
from twine import settings


def register(register_settings, package):
Expand Down
4 changes: 3 additions & 1 deletion twine/commands/upload.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
import argparse
import os.path

from twine import commands, exceptions, package as package_file, settings, utils
from twine import commands, exceptions
from twine import package as package_file
from twine import settings, utils


def skip_upload(response, skip_existing, package):
Expand Down