Skip to content

Multi-commit rebase #80

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

Open
pkaminski wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Multi-commit rebase #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e7ced9
Edit setup_helpers among other things.
pkaminski Sep 30, 2022
ad64d33
Edit logger.py.
pkaminski Sep 30, 2022
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
4 changes: 2 additions & 2 deletions astropy/logger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@

from . import config as _config
from . import conf as _conf
from .extern.six import PY3
from .extern.seven import PY3
from .utils.console import color_print
from .utils.misc import find_current_module
from .utils.exceptions import AstropyWarning, AstropyUserWarning

__all__ = ['Conf', 'conf', 'log', 'AstropyLogger', 'LoggingError']
__all__ = ['Conf', 'conf', 'Log', 'log', 'AstropyLogger', 'LoggingError']


# Initialize by calling _init_log()
Expand Down
2 changes: 1 addition & 1 deletion astropy/setup_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
setup/build/packaging that are useful to astropy as a whole.
"""

from __future__ import absolute_import, print_function
from __past__ import absolute_import, print_function

import collections
import errno
Expand Down