Skip to content

Commit

Permalink
Merge pull request #11 from jacebrowning/release/v0.4
Browse files Browse the repository at this point in the history
Release v0.4
  • Loading branch information
jacebrowning committed Apr 29, 2018
2 parents 63c7e9c + 9d729a8 commit 2c7f3d1
Show file tree
Hide file tree
Showing 16 changed files with 151 additions and 115 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ Icon*
/docs/apidocs/
/site/
/*.html
/*.rst
/docs/*.png

# Google Drive
Expand Down
9 changes: 1 addition & 8 deletions .verchew.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,7 @@ versions = Python 3.4. | Python 3.5. | Python 3.6
[pipenv]

cli = pipenv
versions = 10.1.1 | 10.1.2

[pandoc]

cli = pandoc
version = 1.
optional = true
message = This is only needed to generate the README for PyPI.
versions = 10. | 11.

[Graphviz]

Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Revision History

## 0.4 (2018/4/28)

- Added `reset=True` as `init()` option to replace all existing logging handlers.
- Added `exception` logging API.
- Added convenience alias: `log.c`, `log.exc`.

## 0.3.1 (2018/03/30)

- Fixed bug where records were written for disabled levels.
Expand Down
1 change: 0 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* Mac: http://developer.apple.com/xcode
* Linux: http://www.gnu.org/software/make
* pipenv: http://docs.pipenv.org
* Pandoc: http://johnmacfarlane.net/pandoc/installing.html
* Graphviz: http://www.graphviz.org/Download.php

To confirm these system dependencies are configured correctly:
Expand Down
10 changes: 4 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ DEPENDENCIES := $(VENV)/.pipenv-$(shell bin/checksum Pipfile* setup.py)
install: $(DEPENDENCIES)

$(DEPENDENCIES):
pipenv run python setup.py develop
pipenv install --dev
@ touch $@

Expand Down Expand Up @@ -161,15 +162,12 @@ build: dist

.PHONY: dist
dist: install $(DIST_FILES)
$(DIST_FILES): $(MODULES) README.rst CHANGELOG.rst
$(DIST_FILES): $(MODULES)
rm -f $(DIST_FILES)
pipenv run python setup.py check --restructuredtext --strict --metadata
pipenv run python setup.py check --strict --metadata
pipenv run python setup.py sdist
pipenv run python setup.py bdist_wheel

%.rst: %.md
pandoc -f markdown_github -t rst -o $@ $<

.PHONY: exe
exe: install $(EXE_FILES)
$(EXE_FILES): $(MODULES) $(PROJECT).spec
Expand All @@ -187,7 +185,7 @@ TWINE := pipenv run twine
upload: dist ## Upload the current version to PyPI
git diff --name-only --exit-code
$(TWINE) upload dist/*.*
bin/open https://pypi.python.org/pypi/$(PROJECT)
bin/open https://pypi.org/project/$(PROJECT)

# CLEANUP #####################################################################

Expand Down
22 changes: 9 additions & 13 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -1,35 +1,30 @@
[[source]]

url = "https://pypi.python.org/simple"
url = "https://pypi.org/simple"
verify_ssl = true
name = "pypi"

[requires]

python_version = "3"

[packages]

minilog = { path = ".", editable = true }

[dev-packages]

# Linters
pylint = "~=1.7.5"
astroid = "~=1.5.3" # temporary to work around apparent regression in 1.6
pylint = "*"
pycodestyle = "*"
pydocstyle = "*"

# # Testing
# Testing
pytest = "~= 3.3"
pytest-describe = "*"
pytest-expecter = "*"
pytest-random = "*"
pytest-ordering = "*"
pytest-cov = "*"

# # Reports
"coverage.space" = "*"
# Reports
coverage-space = "*"

# Documentation
mkdocs = "*"
Expand All @@ -41,9 +36,10 @@ wheel = "*"
pyinstaller = "*"

# Release
twine = "*"
setuptools = ">= 38.6.0"
twine = ">= 1.11.0"

# Tooling
sniffer = "*"
pync = {version = "< 2.0", sys_platform = "== 'darwin'"}
MacFSEvents = {version = "*", sys_platform = "== 'darwin'"}
pync = { version = "<2.0", sys_platform = "== 'darwin'" }
MacFSEvents = { version = "*", sys_platform = "== 'darwin'" }

0 comments on commit 2c7f3d1

Please sign in to comment.