diff options
author | Asteroide <thomas.duval@orange.com> | 2017-07-19 07:32:34 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-07-19 07:32:34 +0000 |
commit | 1eb5524be074b25b09a023aa17b60c427b733479 (patch) | |
tree | 5f71afad9da349ed43119509a4cc13347bef2c16 | |
parent | 060d082854119f24a44ffa938ab45e8409bd6a9d (diff) | |
parent | e5578133cdb1ddfe4f5a556b0197c98399a04d9f (diff) |
Merge "Force requirements to be installed with pip"
-rw-r--r-- | moonv4/moon_db/Changelog | 5 | ||||
-rw-r--r-- | moonv4/moon_db/moon_db/__init__.py | 2 | ||||
-rw-r--r-- | moonv4/moon_db/setup.py | 5 | ||||
-rw-r--r-- | moonv4/moon_utilities/Changelog | 21 | ||||
-rw-r--r-- | moonv4/moon_utilities/MANIFEST.in | 1 | ||||
-rw-r--r-- | moonv4/moon_utilities/moon_utilities/__init__.py | 2 | ||||
-rw-r--r-- | moonv4/moon_utilities/setup.py | 4 |
7 files changed, 36 insertions, 4 deletions
diff --git a/moonv4/moon_db/Changelog b/moonv4/moon_db/Changelog index b69bdaef..94631fce 100644 --- a/moonv4/moon_db/Changelog +++ b/moonv4/moon_db/Changelog @@ -14,3 +14,8 @@ CHANGES 1.0.0 ----- - First public version of the moon_db library. + +1.0.1 +----- +- Update setup.py to force the installation of requirements. + diff --git a/moonv4/moon_db/moon_db/__init__.py b/moonv4/moon_db/moon_db/__init__.py index 578e22af..ddfaf2bb 100644 --- a/moonv4/moon_db/moon_db/__init__.py +++ b/moonv4/moon_db/moon_db/__init__.py @@ -3,5 +3,5 @@ # license which can be found in the file 'LICENSE' in this package distribution # or at 'http://www.apache.org/licenses/LICENSE-2.0'. -__version__ = "1.0.0" +__version__ = "1.0.1" diff --git a/moonv4/moon_db/setup.py b/moonv4/moon_db/setup.py index 51bb4539..0d2aa1bf 100644 --- a/moonv4/moon_db/setup.py +++ b/moonv4/moon_db/setup.py @@ -7,6 +7,9 @@ from setuptools import setup, find_packages import moon_db +with open('requirements.txt') as f: + required = f.read().splitlines() + setup( name='moon_db', @@ -23,7 +26,7 @@ setup( long_description=open('README.rst').read(), - # install_requires= , + install_requires=required, include_package_data=True, diff --git a/moonv4/moon_utilities/Changelog b/moonv4/moon_utilities/Changelog new file mode 100644 index 00000000..c91a0385 --- /dev/null +++ b/moonv4/moon_utilities/Changelog @@ -0,0 +1,21 @@ +# Copyright 2015 Open Platform for NFV Project, Inc. and its contributors +# This software is distributed under the terms and conditions of the 'Apache-2.0' +# license which can be found in the file 'LICENSE' in this package distribution +# or at 'http://www.apache.org/licenses/LICENSE-2.0'. + + +CHANGES +======= + +0.1.0 +----- +- First version of the moon_utilities library. + +1.0.0 +----- +- First public version of the moon_utilities library. + +1.0.1 +----- +- Update setup.py to force the installation of requirements. + diff --git a/moonv4/moon_utilities/MANIFEST.in b/moonv4/moon_utilities/MANIFEST.in index 1f674d50..b764e35c 100644 --- a/moonv4/moon_utilities/MANIFEST.in +++ b/moonv4/moon_utilities/MANIFEST.in @@ -5,5 +5,6 @@ include README.rst include LICENSE +include Changelog include setup.py include requirements.txt diff --git a/moonv4/moon_utilities/moon_utilities/__init__.py b/moonv4/moon_utilities/moon_utilities/__init__.py index 660beb1e..2249a1b6 100644 --- a/moonv4/moon_utilities/moon_utilities/__init__.py +++ b/moonv4/moon_utilities/moon_utilities/__init__.py @@ -3,4 +3,4 @@ # license which can be found in the file 'LICENSE' in this package distribution # or at 'http://www.apache.org/licenses/LICENSE-2.0'. -__version__ = "1.0.0" +__version__ = "1.0.1" diff --git a/moonv4/moon_utilities/setup.py b/moonv4/moon_utilities/setup.py index 9bd1db40..6c9ffd3d 100644 --- a/moonv4/moon_utilities/setup.py +++ b/moonv4/moon_utilities/setup.py @@ -6,6 +6,8 @@ from setuptools import setup, find_packages import moon_utilities +with open('requirements.txt') as f: + required = f.read().splitlines() setup( @@ -23,7 +25,7 @@ setup( long_description=open('README.rst').read(), - # install_requires= , + install_requires=required, include_package_data=True, |