Merge pull request #482 from efiop/master

dvc: relax version requirements
2026-11-10 07:18:27 +01:00 · 2018-02-24 02:35:50 +02:00
parent 9868bf10ad 4a2e000611
commit e12ff1fe91
5 changed files with 34 additions and 196 deletions
@@ -47,6 +47,7 @@ install:
  - cinst gsutil
  - cinst openssl.light
  - wget --no-check-certificate https://github.com/dpinney/omf/raw/master/omf/static/pygraphviz-1.3.1-cp27-none-win32.whl
+  - pip install --upgrade pip setuptools
  - pip install pygraphviz-1.3.1-cp27-none-win32.whl
  - pip install -r requirements.txt
  - python setup.py install
@@ -7,7 +7,6 @@ python:
  - "3.4"
  - "3.5"
 #  - "3.6" Not supported by pyinstaller yet
-cache: pip
 # Travis doesn't support testing python on Mac yet, so we need
 # to workaround it by installing it directly with brew.
 #
@@ -1,98 +1,16 @@
-altgraph==0.13
-appdirs==1.4.3
-backports.shutil-get-terminal-size==1.0.0
-boto==2.46.1
-cachetools==2.0.0
-configparser==3.5.0
-decorator==4.0.11
-dill==0.2.6
-enum34==1.1.6
-fasteners==0.14.1
-funcsigs==1.0.2
-future==0.16.0
-futures==3.0.5
-gapic-google-cloud-datastore-v1==0.15.3
-gapic-google-cloud-error-reporting-v1beta1==0.15.3
-gapic-google-cloud-logging-v2==0.91.3
-gapic-google-cloud-pubsub-v1==0.15.3
-gapic-google-cloud-spanner-admin-database-v1==0.15.3
-gapic-google-cloud-spanner-admin-instance-v1==0.15.3
-gapic-google-cloud-spanner-v1==0.15.3
-gapic-google-cloud-speech-v1beta1==0.15.3
-gapic-google-cloud-vision-v1==0.90.3
-google-auth==0.10.0
-google-auth-httplib2==0.0.2
-google-cloud==0.24.0
-google-cloud-bigquery==0.24.0
-google-cloud-bigtable==0.24.0
-google-cloud-core==0.24.0
-google-cloud-datastore==1.0.0
-google-cloud-dns==0.24.0
-google-cloud-error-reporting==0.24.0
-google-cloud-language==0.24.0
-google-cloud-logging==0.24.0
-google-cloud-monitoring==0.24.0
-google-cloud-pubsub==0.24.0
-google-cloud-resource-manager==0.24.0
-google-cloud-runtimeconfig==0.24.0
-google-cloud-spanner==0.24.0
-google-cloud-speech==0.24.0
-google-cloud-storage==1.0.0
-google-cloud-translate==0.24.0
-google-cloud-vision==0.24.0
-google-gax==0.15.8
-googleapis-common-protos==1.5.2
-grpc-google-iam-v1==0.11.1
-grpcio==1.2.1
-httplib2==0.10.3
-ipython==5.3.0
-ipython-genutils==0.2.0
-macholib==1.8
-mock==2.0.0
-modulegraph==0.14
-monotonic==1.3
-nose==1.3.7
-oauth2client==3.0.0
-packaging==16.8
-pathlib==1.0.1
-pathlib2==2.2.1
-pbr==3.0.0
-pexpect==4.2.1
-pickleshare==0.7.4
-ply==3.8
-prompt-toolkit==1.0.14
-proto-google-cloud-datastore-v1==0.90.3
-proto-google-cloud-error-reporting-v1beta1==0.15.3
-proto-google-cloud-logging-v2==0.91.3
-proto-google-cloud-pubsub-v1==0.15.3
-proto-google-cloud-spanner-admin-database-v1==0.15.3
-proto-google-cloud-spanner-admin-instance-v1==0.15.3
-proto-google-cloud-spanner-v1==0.15.3
-proto-google-cloud-speech-v1beta1==0.15.3
-proto-google-cloud-vision-v1==0.90.3
-protobuf==3.2.0
-ptyprocess==0.5.1
-pyasn1==0.2.3
-pyasn1-modules==0.0.8
-Pygments==2.2.0
-PyInstaller==3.2.1
-pyparsing==2.2.0
-requests==2.13.0
-rsa==3.4.2
-scandir==1.5
-simplegeneric==0.8.1
-six==1.10.0
-traitlets==4.3.2
-wcwidth==0.1.7
-colorama==0.3.9
-google-compute-engine==2.4.1
-configobj==5.0.6
-networkx==1.11
-gcs-oauth2-boto-plugin==1.14
-xmltodict==0.11.0
-pyyaml==3.12
-tinydb==3.7.0
-gitpython==2.1.8
-ntfsutils==0.1.3
-pygraphviz==1.3.1
-checksumdir==1.1.4
+boto>=2.46.1
+google-compute-engine>=2.4.1 #required by boto
+configparser>=3.5.0
+fasteners>=0.14.1
+future>=0.16.0
+google-cloud>=0.24.0
+PyInstaller>=3.2.1
+colorama>=0.3.9
+configobj>=5.0.6
+networkx>=1.11
+pyyaml>=3.12
+tinydb>=3.7.0
+gitpython>=2.1.8
+ntfsutils>=0.1.3
+pygraphviz>=1.3.1
+checksumdir>=1.1.4
@@ -4,103 +4,21 @@ from distutils.errors import DistutilsPlatformError
 from dvc import VERSION

 install_requires = [
-    'altgraph==0.13',
-    'appdirs==1.4.3',
-    'backports.shutil-get-terminal-size==1.0.0',
-    'boto==2.46.1',
-    'cachetools==2.0.0',
-    'configparser==3.5.0',
-    'decorator==4.0.11',
-    'dill==0.2.6',
-    'enum34==1.1.6',
-    'fasteners==0.14.1',
-    'funcsigs==1.0.2',
-    'future==0.16.0',
-    'futures==3.0.5',
-    'gapic-google-cloud-datastore-v1==0.15.3',
-    'gapic-google-cloud-error-reporting-v1beta1==0.15.3',
-    'gapic-google-cloud-logging-v2==0.91.3',
-    'gapic-google-cloud-pubsub-v1==0.15.3',
-    'gapic-google-cloud-spanner-admin-database-v1==0.15.3',
-    'gapic-google-cloud-spanner-admin-instance-v1==0.15.3',
-    'gapic-google-cloud-spanner-v1==0.15.3',
-    'gapic-google-cloud-speech-v1beta1==0.15.3',
-    'gapic-google-cloud-vision-v1==0.90.3',
-    'google-auth==0.10.0',
-    'google-auth-httplib2==0.0.2',
-    'google-cloud==0.24.0',
-    'google-cloud-bigquery==0.24.0',
-    'google-cloud-bigtable==0.24.0',
-    'google-cloud-core==0.24.0',
-    'google-cloud-datastore==1.0.0',
-    'google-cloud-dns==0.24.0',
-    'google-cloud-error-reporting==0.24.0',
-    'google-cloud-language==0.24.0',
-    'google-cloud-logging==0.24.0',
-    'google-cloud-monitoring==0.24.0',
-    'google-cloud-pubsub==0.24.0',
-    'google-cloud-resource-manager==0.24.0',
-    'google-cloud-runtimeconfig==0.24.0',
-    'google-cloud-spanner==0.24.0',
-    'google-cloud-speech==0.24.0',
-    'google-cloud-storage==1.0.0',
-    'google-cloud-translate==0.24.0',
-    'google-cloud-vision==0.24.0',
-    'google-gax==0.15.8',
-    'googleapis-common-protos==1.5.2',
-    'grpc-google-iam-v1==0.11.1',
-    'grpcio==1.2.1',
-    'httplib2==0.10.3',
-    'ipython==5.3.0',
-    'ipython-genutils==0.2.0',
-    'macholib==1.8',
-    'mock==2.0.0',
-    'modulegraph==0.14',
-    'monotonic==1.3',
-    'nose==1.3.7',
-    'oauth2client==3.0.0',
-    'packaging==16.8',
-    'pathlib==1.0.1',
-    'pathlib2==2.2.1',
-    'pbr==3.0.0',
-    'pexpect==4.2.1',
-    'pickleshare==0.7.4',
-    'ply==3.8',
-    'prompt-toolkit==1.0.14',
-    'proto-google-cloud-datastore-v1==0.90.3',
-    'proto-google-cloud-error-reporting-v1beta1==0.15.3',
-    'proto-google-cloud-logging-v2==0.91.3',
-    'proto-google-cloud-pubsub-v1==0.15.3',
-    'proto-google-cloud-spanner-admin-database-v1==0.15.3',
-    'proto-google-cloud-spanner-admin-instance-v1==0.15.3',
-    'proto-google-cloud-spanner-v1==0.15.3',
-    'proto-google-cloud-speech-v1beta1==0.15.3',
-    'proto-google-cloud-vision-v1==0.90.3',
-    'protobuf==3.2.0',
-    'ptyprocess==0.5.1',
-    'pyasn1==0.2.3',
-    'pyasn1-modules==0.0.8',
-    'Pygments==2.2.0',
-    'PyInstaller==3.2.1',
-    'pyparsing==2.2.0',
-    'requests==2.13.0',
-    'rsa==3.4.2',
-    'scandir==1.5',
-    'simplegeneric==0.8.1',
-    'six==1.10.0',
-    'traitlets==4.3.2',
-    'wcwidth==0.1.7',
-    'colorama==0.3.9',
-    'google-compute-engine==2.4.1',
-    'configobj==5.0.6',
-    'networkx==1.11',
-    'gcs-oauth2-boto-plugin==1.14',
-    'pyyaml==3.12',
-    'tinydb==3.7.0',
-    'gitpython==2.1.8',
-    'ntfsutils==0.1.3',
-    'pygraphviz==1.3.1',
-    'checksumdir==1.1.4',
+    "boto>=2.46.1",
+    "google-compute-engine>=2.4.1", #required by boto
+    "configparser>=3.5.0",
+    "fasteners>=0.14.1",
+    "future>=0.16.0",
+    "google-cloud>=0.24.0",
+    "colorama>=0.3.9",
+    "configobj>=5.0.6",
+    "networkx>=1.11",
+    "pyyaml>=3.12",
+    "tinydb>=3.7.0",
+    "gitpython>=2.1.8",
+    "ntfsutils>=0.1.3",
+    "pygraphviz>=1.3.1",
+    "checksumdir>=1.1.4",
 ]

 setup(
@@ -1,3 +1,5 @@
+nose>=1.3.7
+mock>=2.0.0
 coverage==4.3.1
 codeclimate-test-reporter==0.2.3
 xmltodict==0.11.0