Skip to content

Commit

Permalink
moved statuspage into its own module to avoid packaging problems
Browse files Browse the repository at this point in the history
  • Loading branch information
jayfk committed Jul 12, 2016
1 parent 9ddc8f3 commit 9b04f10
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 16 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
All enhancements and patches to statuspage will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## Not released [TBD]
## 0.3.2 [2016-07-13]
- fixed packaging problems by using a module
- minified and merged style.css with milligram.min.css

## 0.3.1 [2016-07-12]
Expand Down
4 changes: 2 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
include template/*
include statuspage/template/*
include README.md
include CHANGELOG.md
include CHANGELOG.md
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ endif
ifndef GITHUB_RELEASE
$(error no github-release binary found)
endif
sed -i '' 's/__version__ = "[^0-9.]*\([0-9.]*\).*"/__version__ = "$(version)"/' statuspage.py
sed -i '' 's/__version__ = "[^0-9.]*\([0-9.]*\).*"/__version__ = "$(version)"/' statuspage/statuspage.py
sed -i '' 's/__version__ = "[^0-9.]*\([0-9.]*\).*"/__version__ = "$(version)"/' setup.py
git commit -a -m 'new release $(version)'
git tag $(version)
Expand All @@ -30,11 +30,11 @@ endif
osx:
pip install -r requirements/base.txt
pip install -r requirements/dev.txt
pyinstaller statuspage.spec
pyinstaller statuspage/statuspage.spec
mv dist/statuspage dist/statuspage-darwin-64

linux:

docker run -e LC_ALL="C.UTF-8" -e LANG="C.UTF-8" -v $(shell pwd):/app -w=/app -it python:3.5 bash -c "pip install -r requirements/base.txt && pip install -r requirements/dev.txt && pyinstaller statuspage.spec"
docker run -e LC_ALL="C.UTF-8" -e LANG="C.UTF-8" -v $(shell pwd):/app -w=/app -it python:3.5 bash -c "pip install -r requirements/base.txt && pip install -r requirements/dev.txt && pyinstaller statuspage/statuspage.spec"
mv dist/statuspage dist/statuspage-linux-64

7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import sys

from setuptools import setup
__version__ = "0.3.1"
__version__ = "0.3.2"

with io.open('README.md', 'r', encoding='utf-8') as readme_file:
readme = readme_file.read()
Expand All @@ -32,9 +32,10 @@
url='https://github.com/jayfk/statuspage',
entry_points='''
[console_scripts]
statuspage=statuspage:cli
statuspage=statuspage.statuspage:cli
''',
py_modules=['statuspage'],
packages=['statuspage'],
package_data={'': ["template/*"]},
include_package_data=True,
install_requires=requirements,
license='MIT',
Expand Down
Empty file added statuspage/__init__.py
Empty file.
File renamed without changes.
9 changes: 2 additions & 7 deletions statuspage.spec → statuspage/statuspage.spec
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,14 @@ exe = EXE(pyz,
[
(
'template/template.html',
'template/template.html',
'statuspage/template/template.html',
'template'
),
(
'template/style.css',
'template/style.css',
'statuspage/template/style.css',
'template'
),
(
'template/milligram.min.css',
'template/milligram.min.css',
'template'
)
],
name='statuspage',
debug=False,
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 9b04f10

Please sign in to comment.