mirror of
https://github.com/wassname/cachier.git
synced 2026-09-09 11:19:08 +08:00
Merge pull request #12 from mayli/pip10
Avoid using pip internal function to make cachier work on pip>=10
This commit is contained in:
+3
-1
@@ -10,10 +10,12 @@ matrix:
|
||||
sudo: true
|
||||
before_install:
|
||||
# coverage submission packages
|
||||
- pip install -U pip
|
||||
- pip install -U pytest
|
||||
- pip install codecov
|
||||
- pip install pymongo
|
||||
install:
|
||||
- if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; then pip install pytest coverage pytest-cov .; else pip install ".[test]"; fi
|
||||
- if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; then pip install coverage pytest-cov .; else pip install ".[test]"; fi
|
||||
script: python -m pytest --cov=cachier
|
||||
# submit coverage
|
||||
after_success:
|
||||
|
||||
+1
-12
@@ -16,18 +16,7 @@ import os
|
||||
from functools import wraps
|
||||
|
||||
import datetime
|
||||
try: # for asynchronous file uploads
|
||||
from concurrent.futures import ThreadPoolExecutor
|
||||
except ImportError: # we're in python 2.x
|
||||
import pip
|
||||
PACKAGES = [
|
||||
package.project_name
|
||||
for package
|
||||
in pip.get_installed_distributions()
|
||||
]
|
||||
if 'futures' not in PACKAGES:
|
||||
pip.main(['install', 'futures'])
|
||||
from concurrent.futures import ThreadPoolExecutor
|
||||
from concurrent.futures import ThreadPoolExecutor
|
||||
|
||||
from .pickle_core import _PickleCore
|
||||
from .mongo_core import _MongoCore, RecalculationNeeded
|
||||
|
||||
@@ -38,10 +38,11 @@ setup(
|
||||
cachier=cachier.scripts.cli:cli
|
||||
''',
|
||||
install_requires=[
|
||||
'watchdog', 'portalocker'
|
||||
'watchdog', 'portalocker',
|
||||
],
|
||||
extras_require={
|
||||
'test': TEST_REQUIRES
|
||||
'test': TEST_REQUIRES,
|
||||
':python_version == "2.7"': ['futures'],
|
||||
},
|
||||
platforms=['linux', 'osx', 'windows'],
|
||||
keywords=['cache', 'persistence', 'mongo', 'memoization', 'decorator'],
|
||||
|
||||
Reference in New Issue
Block a user