Skip to content

Commit

Permalink
Merge pull request #65 from nasa/CUMULUS-1627
Browse files Browse the repository at this point in the history
Cumulus 1627
  • Loading branch information
Jkovarik authored Dec 13, 2019
2 parents 4eca618 + f201de4 commit 0f1f570
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ jobs:
$GIT_API_URL/$GIT_PATH/releases \
--data $CREATE_RELEASE_REQUEST_BODY | jq .
echo "Building ${ZIPFILENAME}"
sudo pip install pyinstaller
sudo pip install -r requirements.txt
make clean
make $ZIPFILENAME
if [ -f $ZIPFILENAME ]; then
Expand Down
14 changes: 12 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@ All notable changes to this project are documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [v1.1.2]

### Added

- Updated release process to utilize [pyinstaller](https://www.pyinstaller.org/)[CUMULUS-1447] to create a pre-package python+CMA release binary compatible with AWS Linux 2, added as the executable `cma` to the release package.


## [v1.1.1] - 2019-10-03

### Removed

- Removed deprecated function `loadRemoteEvent` and updated tests.
Expand Down Expand Up @@ -167,8 +175,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Added
- Initial release

[Unreleased]: https://github.com/nasa/cumulus-message-adapter/compare/v1.1.0...HEAD
[v1.1.0]: https://github.com/nasa/cumulus-message-adapter/compare/v1.0.13...HEAD
[Unreleased]: https://github.com/nasa/cumulus-message-adapter/compare/v1.1.2...HEAD
[v1.1.2]: https://github.com/nasa/cumulus-message-adapter/compare/v1.1.1...v1.1.2
[v1.1.1]: https://github.com/nasa/cumulus-message-adapter/compare/v1.1.1...v1.1.2
[v1.1.0]: https://github.com/nasa/cumulus-message-adapter/compare/v1.0.13...v1.1.1
[v1.0.13]: https://github.com/nasa/cumulus-message-adapter/compare/v1.0.12...v1.0.13
[v1.0.5]: https://github.com/nasa/cumulus-message-adapter/compare/v1.0.4...v1.0.5
[v1.0.4]: https://github.com/nasa/cumulus-message-adapter/compare/v1.0.3...v1.0.4
Expand Down
9 changes: 8 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
clean:
rm -rf dist
rm -rf dist_package
rm -f cumulus-message-adapter.zip

dist:
Expand All @@ -13,7 +14,13 @@ requirements: dist requirements.txt
xargs rm -rf
rm -rf dist/docutils

cumulus-message-adapter.zip: requirements
packaged_runtime: requirements
cp __main__.py ./dist/
pip install pyinstaller
pyinstaller --distpath dist_package --clean -F -n cma ./dist/__main__.py

cumulus-message-adapter.zip: requirements packaged_runtime
cp __main__.py ./dist/
cp -R message_adapter ./dist/
cp ./dist_package/cma ./dist/
(cd dist && zip -r -9 ../cumulus-message-adapter.zip .)
2 changes: 1 addition & 1 deletion message_adapter/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = 'v1.1.1'
__version__ = 'v1.1.2'
1 change: 1 addition & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
nose>=1.3
mock~=1.3
pylint>=1.8.2
pyinstaller~=3.5.0

0 comments on commit 0f1f570

Please sign in to comment.