Skip to content

Commit aba307e

Browse files
committed
_PACKAGE_SETUP_ should be _ASTROPY_SETUP_ (as described in astropy/astropy#950)
1 parent 5b4abd5 commit aba307e

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

‎packagename/__init__.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
#this indicates whether or not we are in the package's setup.py
44
try:
5-
_PACKAGE_SETUP_
5+
_ASTROPY_SETUP_
66
except NameError:
77
from sys import version_info
88
if version_info[0] >= 3:
99
import builtins
1010
else:
1111
import __builtin__ as builtins
12-
builtins._PACKAGE_SETUP_ = False
12+
builtins._ASTROPY_SETUP_ = False
1313
del version_info
1414

1515
try:
@@ -101,7 +101,7 @@ def test(package=None, test_path=None, args=None, plugins=None,
101101
remote_data=remote_data, pep8=pep8, pdb=pdb,
102102
coverage=coverage, open_files=open_files, **kwargs)
103103

104-
if not _PACKAGE_SETUP_:
104+
if not _ASTROPY_SETUP_:
105105

106106
import os
107107
from warnings import warn

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import builtins
2626
else:
2727
import __builtin__ as builtins
28-
builtins._PACKAGE_SETUP_ = True
28+
builtins._ASTROPY_SETUP_ = True
2929

3030
import astropy
3131
from astropy.setup_helpers import (register_commands, adjust_compiler,

0 commit comments

Comments
 (0)