Skip to content

Commit

Permalink
Merge pull request #973 from davidmarin/execfile-in-setup
Browse files Browse the repository at this point in the history
execfile() in setup
  • Loading branch information
yalinhuang committed Mar 11, 2015
2 parents e70bccb + beb9f3c commit 5259cd1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
*.pyc
*~
*.swp
.eggs
.idea
.project
.pydevproject
.ropeproject/
Expand Down
9 changes: 6 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from os.path import join
from os.path import dirname

# get __version__
execfile(join(dirname(__file__), 'mrjob/__init__.py'))

try:
from setuptools import setup
Expand All @@ -31,8 +36,6 @@
from distutils.core import setup
setuptools_kwargs = {}

import mrjob

setup(
author='David Marin',
author_email='dave@yelp.com',
Expand Down Expand Up @@ -69,6 +72,6 @@
},
scripts=['bin/mrjob'],
url='http://github.com/Yelp/mrjob',
version=mrjob.__version__,
version=__version__,
**setuptools_kwargs
)

0 comments on commit 5259cd1

Please sign in to comment.