Skip to content

Commit

Permalink
convert repo to used vendored auxlib
Browse files Browse the repository at this point in the history
  • Loading branch information
kalefranz committed Jun 30, 2016
1 parent 4dd0f36 commit f77033f
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ install:
- printenv
- pip install psutil ruamel.yaml pycosat pycrypto requests
- pip install flake8 pytest pytest-cov mock
- pip install auxlib pytest-timeout radon responses
- pip install pytest-timeout radon responses

script:
- bash ./utils/travis-run-script.sh
Expand Down
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ include MANIFEST.in
include README.rst
include setup.cfg
include setup.py
include auxlib/*
include shell/*
recursive-include conda *.py
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ install:
- conda install -q pytest requests mock
- conda install -q pycrypto pyflakes pycosat
- conda install -q git menuinst
- pip install auxlib flake8 pytest-cov pytest-timeout responses
- pip install flake8 pytest-cov pytest-timeout responses
- python --version
- python -c "import struct; print(struct.calcsize('P') * 8)"
- python setup.py install --old-and-unmanageable
Expand Down
2 changes: 1 addition & 1 deletion conda/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"""OS-agnostic, system-level binary package manager."""
from __future__ import absolute_import, division, print_function

from auxlib.packaging import get_version
from ._vendor.auxlib.packaging import get_version

__all__ = [
"__name__", "__version__", "__author__",
Expand Down
2 changes: 2 additions & 0 deletions conda/_vendor/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# -*- coding: utf-8 -*-
from __future__ import absolute_import, division, print_function
8 changes: 2 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,8 @@
src_dir = os.path.join(here, "conda")
sys.path.insert(0, src_dir)

import auxlib # noqa -- build-time dependency only
import conda # NOQA


with open(os.path.join(here, "README.rst")) as f:
long_description = f.read()

Expand Down Expand Up @@ -64,12 +62,10 @@
],
packages=[
'conda',
'conda.cli',
'conda.progressbar'
],
cmdclass={
'build_py': auxlib.BuildPyCommand,
'sdist': auxlib.SDistCommand,
'build_py': conda._vendor.auxlib.BuildPyCommand,
'sdist': conda._vendor.auxlib.SDistCommand,
},
install_requires=[
'pycosat >=0.6.1',
Expand Down

0 comments on commit f77033f

Please sign in to comment.