You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ariatosca.apache.org by av...@apache.org on 2017/03/15 12:32:20 UTC
incubator-ariatosca git commit: Address the conditional depedencies
issue in the requirements files [Forced Update!]
Repository: incubator-ariatosca
Updated Branches:
refs/heads/ARIA-96-less-strict-dependencies e8287b6db -> 827303bdd (forced update)
Address the conditional depedencies issue in the requirements files
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/827303bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/827303bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/827303bd
Branch: refs/heads/ARIA-96-less-strict-dependencies
Commit: 827303bdd88cc33d97bd9cc711b6453ea38f50fc
Parents: 4539023
Author: Avia Efrat <av...@gigaspaces.com>
Authored: Wed Mar 15 13:50:09 2017 +0200
Committer: Avia Efrat <av...@gigaspaces.com>
Committed: Wed Mar 15 14:32:13 2017 +0200
----------------------------------------------------------------------
requirements.in | 19 +++++++++-----
requirements.txt | 72 +++++++++++++++++++++++++++++++++------------------
setup.py | 4 +--
3 files changed, 62 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/827303bd/requirements.in
----------------------------------------------------------------------
diff --git a/requirements.in b/requirements.in
index aa4721e..9584a36 100644
--- a/requirements.in
+++ b/requirements.in
@@ -13,11 +13,8 @@
PyYAML>=3.10
requests>=2.7.0, <3
networkx<=1.9 # version 1.10 dropped support of python 2.6
-retrying>=1.3.2 , <1.3.4 # 1.3.3 version came out in Dec 2014. Not so much activity since then.
+retrying>=1.3.2, <1.3.4 # 1.3.3 version came out in Dec 2014. Not so much activity since then.
blinker>=1.4
-importlib ; python_version < '2.7'
-ordereddict ; python_version < '2.7'
-total-ordering ; python_version < '2.7' # only one version on pypi
jsonpickle
ruamel.yaml<=0.11.15 # version 0.12.0 dropped support of python 2.6
Jinja2>=2.8, <2.9
@@ -27,6 +24,16 @@ clint>=0.5.0, <0.6
SQLAlchemy>=1.1.4, <1.2 # version 1.2 dropped support of python 2.6
wagon==0.6.0
bottle>=0.12.11, <0.13
-Fabric>=1.13.1, <2
+Fabric>=1.13.1, <2.O
+
+# Since the tool we are using to generate our requirements.txt, `pip-tools`,
+# does not currently support conditional dependencies (;), we're adding our original
+# conditional dependencies here as comments, and manually adding them to our
+# generated requirements.txt file.
+# The relevant pip-tools issue: https://github.com/jazzband/pip-tools/issues/435
+
+# importlib ; python_version < '2.7'
+# ordereddict ; python_version < '2.7'
+# total-ordering ; python_version < '2.7' # only one version on pypi
# Fabric makes use of this library, but doesn't bring it :(
-pypiwin32==219 ; sys_platform == 'win32'
+# pypiwin32==219 ; sys_platform == 'win32'
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/827303bd/requirements.txt
----------------------------------------------------------------------
diff --git a/requirements.txt b/requirements.txt
index 5844359..1bb1860 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,33 +1,55 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# This file is autogenerated by pip-compile
+# To update, run:
#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-PyYAML>=3.10,<=3.12
-requests
+# pip-compile --output-file requirements.txt requirements.in
+#
+appdirs==1.4.3 # via setuptools
+args==0.1.0 # via clint
+asn1crypto==0.21.1 # via cryptography
+blinker==1.4
+bottle==0.12.13
+CacheControl[filecache]==0.12.1
+cffi==1.9.1 # via cryptography
+clint==0.5.1
+cryptography==1.8.1 # via paramiko
+decorator==4.0.11 # via networkx
+enum34==1.1.6 # via cryptography
+Fabric==1.13.1
+idna==2.5 # via cryptography
+ipaddress==1.0.18 # via cryptography
+Jinja2==2.8.1
+jsonpickle==0.9.4
+lockfile==0.12.2 # via cachecontrol
+MarkupSafe==1.0 # via jinja2
+msgpack-python==0.4.8 # via cachecontrol
networkx==1.9
-retrying
-blinker
+packaging==16.8 # via cryptography, setuptools
+paramiko==2.1.2 # via fabric
+pyasn1==0.2.3 # via paramiko
+pycparser==2.17 # via cffi
+pyparsing==2.2.0 # via packaging
+PyYAML==3.12
+requests==2.13.0
+retrying==1.3.3
+ruamel.ordereddict==0.4.9 # via ruamel.yaml
+ruamel.yaml==0.11.15
+shortuuid==0.5.0
+six==1.10.0 # via cryptography, packaging, retrying, setuptools
+SQLAlchemy==1.1.6
+wagon==0.6.0
+wheel==0.29.0 # via wagon
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools # via cryptography
+
+# Since the tool we are using to generate our requirements.txt, `pip-tools`,
+# does not currently support conditional dependencies (;), we're adding our original
+# conditional dependencies here manually.
+# The relevant pip-tools issue: https://github.com/jazzband/pip-tools/issues/435
+
importlib==1.0.4 ; python_version < '2.7'
ordereddict==1.1 ; python_version < '2.7'
total-ordering==0.1.0 ; python_version < '2.7'
-jsonpickle
-ruamel.yaml
-Jinja2
-shortuuid
-CacheControl[filecache]
-clint
-SQLAlchemy
-wagon
-bottle
-six
-Fabric
# Fabric makes use of this library, but doesn't bring it :(
pypiwin32==219 ; sys_platform == 'win32'
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/827303bd/setup.py
----------------------------------------------------------------------
diff --git a/setup.py b/setup.py
index a9045e6..ff1f5a6 100644
--- a/setup.py
+++ b/setup.py
@@ -51,8 +51,8 @@ try:
# conditional dependencies since reading them from a file in their
# standard ';' from does silently nothing.
extras_require = {":python_version<'2.7'": ['importlib',
- 'ordered_dict',
- 'total_ordering',
+ 'ordereddict',
+ 'total-ordering',
],
":sys_platform=='win32'": 'pypiwin32'}
except IOError: