aboutsummaryrefslogtreecommitdiffstats
path: root/moonv4
diff options
context:
space:
mode:
authorWuKong <rebirthmonkey@gmail.com>2017-07-19 10:23:25 +0200
committerWuKong <rebirthmonkey@gmail.com>2017-07-19 10:23:25 +0200
commitffd694ebadb1d3b4e140104f9f0a81837c0e7258 (patch)
treedcd2affe2d8963ab0e0ba4b3cdc85fbd2b30b209 /moonv4
parent2513cb55eeea516fec50f2fa781ce778eeae1059 (diff)
add pip package
Change-Id: I8b4d3fa24f6ad7c7f9bb5dc93279c4a48bb0fe86 Signed-off-by: WuKong <rebirthmonkey@gmail.com>
Diffstat (limited to 'moonv4')
-rw-r--r--moonv4/DEV.md (renamed from moonv4/development.md)49
-rw-r--r--moonv4/bin/build_all_pip.sh16
-rw-r--r--moonv4/moon_db/Changelog4
-rw-r--r--moonv4/moon_db/moon_db/__init__.py2
-rw-r--r--moonv4/moon_orchestrator/Changelog21
-rw-r--r--moonv4/moon_orchestrator/moon_orchestrator/__init__.py2
-rw-r--r--moonv4/moon_router/LICENSE (renamed from moonv4/moon_secrouter/LICENSE)0
-rw-r--r--moonv4/moon_router/MANIFEST.in (renamed from moonv4/moon_secrouter/MANIFEST.in)0
-rw-r--r--moonv4/moon_router/README.rst (renamed from moonv4/moon_secrouter/README.rst)0
-rw-r--r--moonv4/moon_router/doc/api-moon-secrouter.pdf (renamed from moonv4/moon_secrouter/doc/api-moon-secrouter.pdf)bin195778 -> 195778 bytes
-rw-r--r--moonv4/moon_router/doc/api.pdf (renamed from moonv4/moon_secrouter/doc/api.pdf)bin195377 -> 195377 bytes
-rw-r--r--moonv4/moon_router/moon_secrouter/__init__.py (renamed from moonv4/moon_secrouter/moon_secrouter/__init__.py)0
-rw-r--r--moonv4/moon_router/moon_secrouter/__main__.py (renamed from moonv4/moon_secrouter/moon_secrouter/__main__.py)0
-rw-r--r--moonv4/moon_router/moon_secrouter/api/__init__.py (renamed from moonv4/moon_secrouter/moon_secrouter/api/__init__.py)0
-rw-r--r--moonv4/moon_router/moon_secrouter/api/generic.py (renamed from moonv4/moon_secrouter/moon_secrouter/api/generic.py)0
-rw-r--r--moonv4/moon_router/moon_secrouter/api/route.py (renamed from moonv4/moon_secrouter/moon_secrouter/api/route.py)0
-rw-r--r--moonv4/moon_router/moon_secrouter/messenger.py (renamed from moonv4/moon_secrouter/moon_secrouter/messenger.py)0
-rw-r--r--moonv4/moon_router/moon_secrouter/server.py (renamed from moonv4/moon_secrouter/moon_secrouter/server.py)0
-rw-r--r--moonv4/moon_router/requirements.txt (renamed from moonv4/moon_secrouter/requirements.txt)0
-rw-r--r--moonv4/moon_router/setup.py (renamed from moonv4/moon_secrouter/setup.py)0
-rw-r--r--moonv4/moon_router/tests/moon_db-0.1.0.tar.gz (renamed from moonv4/moon_secrouter/tests/moon_db-0.1.0.tar.gz)bin21423 -> 21423 bytes
-rw-r--r--moonv4/moon_router/tests/moon_policy-0.1.0.tar.gz (renamed from moonv4/moon_secrouter/tests/moon_policy-0.1.0.tar.gz)bin8640 -> 8640 bytes
-rw-r--r--moonv4/moon_utilities/Changelog3
-rw-r--r--moonv4/moon_utilities/moon_utilities/__init__.py2
-rw-r--r--moonv4/templates/moon_keystone/README.md2
25 files changed, 88 insertions, 13 deletions
diff --git a/moonv4/development.md b/moonv4/DEV.md
index bc5f7e97..70bcc4fc 100644
--- a/moonv4/development.md
+++ b/moonv4/DEV.md
@@ -1,8 +1,8 @@
-# Build Python Packages and Containers
+# Build Python Packages and Docker Images
## Python Package
-### Get the code
-
+### pre-requist
+Get the code
```bash
git clone https://git.opnfv.org/moon
cd moon/moonv4
@@ -10,20 +10,51 @@ export MOON_HOME=$(pwd)
sudo ln -s $(pwd)/conf /etc/moon
```
-### Build python packages for all components
+Install python wheel
```bash
-sudo pip3 install pip --upgrade
-cd ${MOON_HOME}/bin
-source build_all.sh
+sudo apt install python3-wheel
```
-### moon_db
+Install pip twine
+```bash
+sudo pip install twine
+```
+Package code, wheel is a new format instead of `tar.gz`
+```bash
+python setup.py sdist bdist_wheel
+```
-### utilities
+Upload to PyPi
+```bash
+twine upload dist/moon_xxx-y.y.y.whl
+twine upload dist/moon_xxx-y.y.y.tar.gz
+```
+Install a package from PyPi
+```bash
+sudo pypi install moon_xxx --upgrade
+```
+
+### moon_db
+- change version in `moon_db/__init__.py`
+- add `Changelog`
+
+### moon_utilities
+- change version in `moon_utilities/__init__.py`
+- add `Changelog`
### moon_orchestrator
+- change version in `moon_orchestrator/__init__.py`
+- add `Changelog`
+
+
+### Build All Pip
+```bash
+sudo pip3 install pip --upgrade
+cd ${MOON_HOME}/bin
+source build_all_pip.sh
+```
## Container
diff --git a/moonv4/bin/build_all_pip.sh b/moonv4/bin/build_all_pip.sh
new file mode 100644
index 00000000..2b415bf0
--- /dev/null
+++ b/moonv4/bin/build_all_pip.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+
+echo Building Moon_DB
+cd $MOON_HOME/moon_db
+python3 setup.py sdist bdist_wheel> /tmp/moon_db.log
+
+
+echo Building Moon_Utilities
+cd $MOON_HOME/moon_utilities
+python3 setup.py sdist bdist_wheel> /tmp/moon_utilities.log
+
+
+echo Building Moon_Orchestrator
+cd $MOON_HOME/moon_orchestrator
+python3 setup.py sdist bdist_wheel> /tmp/moon_orchestrator.log \ No newline at end of file
diff --git a/moonv4/moon_db/Changelog b/moonv4/moon_db/Changelog
index 94631fce..9295c0de 100644
--- a/moonv4/moon_db/Changelog
+++ b/moonv4/moon_db/Changelog
@@ -19,3 +19,7 @@ CHANGES
-----
- Update setup.py to force the installation of requirements.
+1.0.2
+-----
+- Test PyPi upload
+
diff --git a/moonv4/moon_db/moon_db/__init__.py b/moonv4/moon_db/moon_db/__init__.py
index ddfaf2bb..bfca6ef9 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.1"
+__version__ = "1.0.2"
diff --git a/moonv4/moon_orchestrator/Changelog b/moonv4/moon_orchestrator/Changelog
new file mode 100644
index 00000000..544e8fd1
--- /dev/null
+++ b/moonv4/moon_orchestrator/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_orchestrator library.
+
+1.0.0
+-----
+- First public version of the moon_orchestrator library.
+
+1.0.1
+-----
+- add Changelog
+
diff --git a/moonv4/moon_orchestrator/moon_orchestrator/__init__.py b/moonv4/moon_orchestrator/moon_orchestrator/__init__.py
index 660beb1e..2249a1b6 100644
--- a/moonv4/moon_orchestrator/moon_orchestrator/__init__.py
+++ b/moonv4/moon_orchestrator/moon_orchestrator/__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_secrouter/LICENSE b/moonv4/moon_router/LICENSE
index 4143aac2..4143aac2 100644
--- a/moonv4/moon_secrouter/LICENSE
+++ b/moonv4/moon_router/LICENSE
diff --git a/moonv4/moon_secrouter/MANIFEST.in b/moonv4/moon_router/MANIFEST.in
index 1f674d50..1f674d50 100644
--- a/moonv4/moon_secrouter/MANIFEST.in
+++ b/moonv4/moon_router/MANIFEST.in
diff --git a/moonv4/moon_secrouter/README.rst b/moonv4/moon_router/README.rst
index ded4e99a..ded4e99a 100644
--- a/moonv4/moon_secrouter/README.rst
+++ b/moonv4/moon_router/README.rst
diff --git a/moonv4/moon_secrouter/doc/api-moon-secrouter.pdf b/moonv4/moon_router/doc/api-moon-secrouter.pdf
index 9ba75db0..9ba75db0 100644
--- a/moonv4/moon_secrouter/doc/api-moon-secrouter.pdf
+++ b/moonv4/moon_router/doc/api-moon-secrouter.pdf
Binary files differ
diff --git a/moonv4/moon_secrouter/doc/api.pdf b/moonv4/moon_router/doc/api.pdf
index b7d91293..b7d91293 100644
--- a/moonv4/moon_secrouter/doc/api.pdf
+++ b/moonv4/moon_router/doc/api.pdf
Binary files differ
diff --git a/moonv4/moon_secrouter/moon_secrouter/__init__.py b/moonv4/moon_router/moon_secrouter/__init__.py
index 903c6518..903c6518 100644
--- a/moonv4/moon_secrouter/moon_secrouter/__init__.py
+++ b/moonv4/moon_router/moon_secrouter/__init__.py
diff --git a/moonv4/moon_secrouter/moon_secrouter/__main__.py b/moonv4/moon_router/moon_secrouter/__main__.py
index 8ec695db..8ec695db 100644
--- a/moonv4/moon_secrouter/moon_secrouter/__main__.py
+++ b/moonv4/moon_router/moon_secrouter/__main__.py
diff --git a/moonv4/moon_secrouter/moon_secrouter/api/__init__.py b/moonv4/moon_router/moon_secrouter/api/__init__.py
index e69de29b..e69de29b 100644
--- a/moonv4/moon_secrouter/moon_secrouter/api/__init__.py
+++ b/moonv4/moon_router/moon_secrouter/api/__init__.py
diff --git a/moonv4/moon_secrouter/moon_secrouter/api/generic.py b/moonv4/moon_router/moon_secrouter/api/generic.py
index d066f715..d066f715 100644
--- a/moonv4/moon_secrouter/moon_secrouter/api/generic.py
+++ b/moonv4/moon_router/moon_secrouter/api/generic.py
diff --git a/moonv4/moon_secrouter/moon_secrouter/api/route.py b/moonv4/moon_router/moon_secrouter/api/route.py
index 2a2c54bc..2a2c54bc 100644
--- a/moonv4/moon_secrouter/moon_secrouter/api/route.py
+++ b/moonv4/moon_router/moon_secrouter/api/route.py
diff --git a/moonv4/moon_secrouter/moon_secrouter/messenger.py b/moonv4/moon_router/moon_secrouter/messenger.py
index 52e5c341..52e5c341 100644
--- a/moonv4/moon_secrouter/moon_secrouter/messenger.py
+++ b/moonv4/moon_router/moon_secrouter/messenger.py
diff --git a/moonv4/moon_secrouter/moon_secrouter/server.py b/moonv4/moon_router/moon_secrouter/server.py
index 16f6ea9c..16f6ea9c 100644
--- a/moonv4/moon_secrouter/moon_secrouter/server.py
+++ b/moonv4/moon_router/moon_secrouter/server.py
diff --git a/moonv4/moon_secrouter/requirements.txt b/moonv4/moon_router/requirements.txt
index a919c625..a919c625 100644
--- a/moonv4/moon_secrouter/requirements.txt
+++ b/moonv4/moon_router/requirements.txt
diff --git a/moonv4/moon_secrouter/setup.py b/moonv4/moon_router/setup.py
index 0c3b61ba..0c3b61ba 100644
--- a/moonv4/moon_secrouter/setup.py
+++ b/moonv4/moon_router/setup.py
diff --git a/moonv4/moon_secrouter/tests/moon_db-0.1.0.tar.gz b/moonv4/moon_router/tests/moon_db-0.1.0.tar.gz
index 14df1d47..14df1d47 100644
--- a/moonv4/moon_secrouter/tests/moon_db-0.1.0.tar.gz
+++ b/moonv4/moon_router/tests/moon_db-0.1.0.tar.gz
Binary files differ
diff --git a/moonv4/moon_secrouter/tests/moon_policy-0.1.0.tar.gz b/moonv4/moon_router/tests/moon_policy-0.1.0.tar.gz
index d3246532..d3246532 100644
--- a/moonv4/moon_secrouter/tests/moon_policy-0.1.0.tar.gz
+++ b/moonv4/moon_router/tests/moon_policy-0.1.0.tar.gz
Binary files differ
diff --git a/moonv4/moon_utilities/Changelog b/moonv4/moon_utilities/Changelog
index c91a0385..bd049b14 100644
--- a/moonv4/moon_utilities/Changelog
+++ b/moonv4/moon_utilities/Changelog
@@ -19,3 +19,6 @@ CHANGES
-----
- Update setup.py to force the installation of requirements.
+1.0.2
+-----
+- Test PyPi upload \ No newline at end of file
diff --git a/moonv4/moon_utilities/moon_utilities/__init__.py b/moonv4/moon_utilities/moon_utilities/__init__.py
index 2249a1b6..b254b246 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.1"
+__version__ = "1.0.2"
diff --git a/moonv4/templates/moon_keystone/README.md b/moonv4/templates/moon_keystone/README.md
index 77c90e98..cf77a74a 100644
--- a/moonv4/templates/moon_keystone/README.md
+++ b/moonv4/templates/moon_keystone/README.md
@@ -13,7 +13,7 @@ docker build --build-arg https_proxy=http://proxy:3128 --build-arg http_proxy=ht
```
-## set up an execution environment
+## Setup an execution environment
### clean up if necessary
```bash