Skip to content

Commit

Permalink
Merge pull request #44 from AAbouZaid/fix-pip-issue
Browse files Browse the repository at this point in the history
Fix pip issue and remove py2.6 from ci pipeline
  • Loading branch information
aabouzaid committed Nov 20, 2019
2 parents 095cfb1 + 0f4a38b commit f021602
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
1 change: 0 additions & 1 deletion .travis.yml
@@ -1,6 +1,5 @@
language: python
python:
- "2.6"
- "2.7"
- "3.5"
cache: pip
Expand Down
11 changes: 7 additions & 4 deletions setup.py
Expand Up @@ -23,6 +23,7 @@ def open_file(file_name, splitlines=False):

return file_output


# Get vars from project files.
version = open_file('VERSION')
long_description = open_file('README.rst')
Expand Down Expand Up @@ -92,12 +93,14 @@ def finalize_options(self):
pass

def run(self):
import pip

# Install requirements via pip.
pip.main(['install', '.'])
cmd = ['pip', 'install', '-r', 'requirements.txt']

if self.tests_requirement:
pip.main(['install', '.[tests]'])
cmd += ['-r', 'tests/requirements.txt']

print(' '.join(cmd))
subprocess.check_call(cmd)

setup(
name='ansible-netbox-inventory',
Expand Down

0 comments on commit f021602

Please sign in to comment.