Skip to content

Commit

Permalink
Prep for 0.5.4 release candidate
Browse files Browse the repository at this point in the history
- Enable stricter checking in make_zipapp; fixed typo in configparser (a Python
  2.7 requirement) package name
- Fixed Travis build issue that (likely) prevented make_zipapp from being called
  • Loading branch information
lowell80 committed Jan 3, 2019
1 parent 03c9eab commit 2e90252
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ script:
after_success:
- codecov
- coveralls
- '[[ $BUILD_SDIST == "True" ]] && ./make_zipapp'
- '[[ $BUILD_SDIST == "true" ]] && ./make_zipapp'
deploy:
- provider: releases
api_key:
Expand All @@ -82,7 +82,7 @@ deploy:
skip_cleanup: true
on:
all_branches: true
condition: $DO_RELEASE = "True"
condition: $DO_RELEASE = True
- provider: pypi
user: lowellalleman
password:
Expand Down
6 changes: 6 additions & 0 deletions docs/source/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@

Add Python 3 support, external command plugins, tox and vagrant for testing.

### Release v0.5.4 (UNRELEASED)
* Fix typo in `KSCONF_DEBUG`.
* Resolving some build issues.
* Improved support for development/testing environments using Vagrant (fixes) and Docker (new).
Thanks to Lars Jonsson for these enhancements.

### Release v0.5.3 (2018-11-02)
* Fixed bug where `ksconf combine` could incorrectly order directories on certain file systems
(like ext4), effectively ignoring priorities. Repeated runs may resulted in undefined behavior.
Expand Down
4 changes: 3 additions & 1 deletion make_zipapp
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/bin/bash
echo "Building zipapp"
set -e
version=$(git describe --tags --always)
version=${version/v/}
test -d build || mkdir build
Expand All @@ -16,7 +18,7 @@ echo "Building stanadalone zipapp for $version"

pip install . --target=$install_temp --no-compile
# Install backported configparser for python2.7; required since build script runs on 3.6 but .pyz may be run with an embedded Splunk python (2.7)
pip install confiparser --target=$install_temp --no-compile
pip install configparser --target=$install_temp --no-compile

# zipapp module requires Python 3.5 or greater
python -m zipapp $install_temp --output ${zipapp}.pyz --python '/usr/bin/env python' --main ksconf.__main__:cli
Expand Down

0 comments on commit 2e90252

Please sign in to comment.