Skip to content

Commit

Permalink
fixing bug with py3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
toumorokoshi committed Jan 25, 2015
1 parent d501f35 commit 3b794c4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 14 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ python:
- "2.7"
- "3.2"
- "3.3"
- "3.4"
install: "pip install -r requirements.txt"
script: "nosetests --with-coverage --cover-package=uranium"
script: "nosetests --with-coverage --cover-package=uranium"
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
]

setup(name='uranium',
version='0.0.36',
version='0.0.37',
description='a build system for python',
long_description='a build system for python',
author='Yusuke Tsutsumi',
Expand Down
13 changes: 1 addition & 12 deletions uranium/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,6 @@ def in_virtualenv(path):
# we end my making the virtualenv environment relocatable
make_environment_relocatable(path)

URANIUM_LIBS = [
'docopt',
'jinja2',
'pip',
'pyyaml',
'requests',
'setuptools',
'six',
'virtualenv',
'zc.buildout'
]

def _activate_virtualenv(uranium_dir):
""" this will activate a virtualenv in the case one exists """
Expand All @@ -92,7 +81,7 @@ def _activate_virtualenv(uranium_dir):
# we remove the requirements that are installed
# from the parent environment, so pip will detect
# the requirement from the current virtualenv
for name, req in pkg_resources.working_set.by_key.items():
for name, req in list(pkg_resources.working_set.by_key.items()):
if old_prefix in req.location:
del pkg_resources.working_set.by_key[name]

Expand Down

0 comments on commit 3b794c4

Please sign in to comment.