Skip to content

Commit

Permalink
Merge pull request #203 from jacebrowning/release/v1.0
Browse files Browse the repository at this point in the history
Release v1.0
  • Loading branch information
jacebrowning committed Apr 18, 2016
2 parents f8f56ca + bf258b9 commit df64f3e
Show file tree
Hide file tree
Showing 88 changed files with 850 additions and 450 deletions.
1 change: 1 addition & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[run]
branch = true
omit =
*/env/*
*/test/*
5 changes: 3 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
* text=auto
CHANGES.md merge=union

*.xlsx binary

# Python, Git, and Cygwin have different ideas about the correct line endings
*.yml -text
Expand All @@ -7,5 +10,3 @@
*.html -text
*.csv -text
*.tsv -text

*.xlsx binary
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
*.pyc
*.egg-info
__pycache__
.ipynb_checkpoints

# Temporary OS files
Icon*
Expand All @@ -13,7 +14,7 @@ env
# Generated documentation
docs/gen
apidocs
docs/*.html
/*.html
*.rst
docs/*.png
docs/sphinx/_build
Expand All @@ -28,6 +29,8 @@ pages/reqs/

# Testing and coverage results
.coverage
htmlcov
pyunit.xml

# Build and release directories
build
Expand Down
1 change: 0 additions & 1 deletion .noserc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ cover-package=doorstop.common,doorstop.core,
doorstop.cli.main,doorstop.cli.utilities,
doorstop.gui,doorstop.server
cover-erase=1
cover-min-percentage=100

verbosity=1
logging-level=DEBUG
Expand Down
5 changes: 5 additions & 0 deletions .pep257
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[pep257]

# D10*: Missing docstring (checked by PyLint)
# D202: No blank lines allowed *after* function docstring (personal preference)
add-ignore = D102,D105,D202
27 changes: 18 additions & 9 deletions .project
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</natures>
<filteredResources>
<filter>
<id>1399387763933</id>
<id>1398478527151</id>
<name></name>
<type>26</type>
<matcher>
Expand All @@ -25,7 +25,7 @@
</matcher>
</filter>
<filter>
<id>1399387763939</id>
<id>1398478527152</id>
<name></name>
<type>26</type>
<matcher>
Expand All @@ -34,7 +34,7 @@
</matcher>
</filter>
<filter>
<id>1399387763945</id>
<id>1398478527153</id>
<name></name>
<type>26</type>
<matcher>
Expand All @@ -43,7 +43,7 @@
</matcher>
</filter>
<filter>
<id>1399387763951</id>
<id>1398478527154</id>
<name></name>
<type>22</type>
<matcher>
Expand All @@ -52,7 +52,7 @@
</matcher>
</filter>
<filter>
<id>1399387763956</id>
<id>1398478527155</id>
<name></name>
<type>26</type>
<matcher>
Expand All @@ -61,7 +61,7 @@
</matcher>
</filter>
<filter>
<id>1399387763962</id>
<id>1398478527156</id>
<name></name>
<type>22</type>
<matcher>
Expand All @@ -70,7 +70,7 @@
</matcher>
</filter>
<filter>
<id>1399387763968</id>
<id>1398478527157</id>
<name></name>
<type>22</type>
<matcher>
Expand All @@ -79,7 +79,7 @@
</matcher>
</filter>
<filter>
<id>1399387763974</id>
<id>1398478527158</id>
<name></name>
<type>26</type>
<matcher>
Expand All @@ -88,13 +88,22 @@
</matcher>
</filter>
<filter>
<id>1399387763981</id>
<id>1398478527159</id>
<name></name>
<type>26</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-dist</arguments>
</matcher>
</filter>
<filter>
<id>1429034866152</id>
<name></name>
<type>26</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-htmlcov</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
2 changes: 0 additions & 2 deletions .pydevproject
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
<?eclipse-pydev version="1.0"?><pydev_project>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 3.0</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Doorstop</pydev_property>


<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
<path>/${PROJECT_DIR_NAME}</path>
</pydev_pathproperty>
Expand Down
4 changes: 2 additions & 2 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ msg-template={msg_id}:{line:3d},{column}:{msg}

[FORMAT]

max-line-length=79
max-line-length=80

ignore-long-lines=^.*#+.*((https?:)|(pragma:)|(TODO:)).*$
ignore-long-lines=^.*((https?:)|(pragma:)|(TODO:)).*$
31 changes: 22 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,33 @@
sudo: false

language: python
python:
- 3.3
- 3.4
git:
depth: 1
- 3.5

env:
global:
# Encrypted GH_TOKEN token: http://benlimmer.com/2013/12/26/automatically-publish-javadoc-to-gh-pages-with-travis-ci
secure: JfVl6zxzhRIEG1VvLqMEPMGOecrzDyb2U0HPyQ4Z4pfKJgFJOdQ1orT9Aztpfr4edXqbCZnEy4WH8+FLBQagkXjT3Ladopv+9j1IkP8v1Gu1O8H2tHQc7wfGxnkQF+h0pFFS6adNAsMliQ5dxTojFYVoWebvZQbiVGYkew+QZ0c=

install:
- pip install coveralls scrutinizer-ocular
script: make ci

before_script:
- make env
- make depends-ci

script:
- make ci

after_success:
- coveralls
- ocular

after_script: >
echo $TRAVIS_BRANCH; echo $TRAVIS_PULL_REQUEST; echo $TRAVIS_PYTHON_VERSION;
if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' && $TRAVIS_PYTHON_VERSION == '3.3' ]]; then
if [[ $TRAVIS_BRANCH == 'develop' && $TRAVIS_PULL_REQUEST == 'false' && $TRAVIS_PYTHON_VERSION == '3.3' ]]; then
# Generate Doorstop and Sphinx HTML pages
make pages ;
Expand All @@ -32,12 +47,10 @@ after_script: >
git add . ;
git commit -m "Deploy Travis CI build $TRAVIS_BUILD_NUMBER to GitHub pages" ;
git push -f https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG} master:gh-pages ;
fi
notifications:
email:
on_success: never
on_failure: always
env:
global:
# Encrypted GH_TOKEN token: http://benlimmer.com/2013/12/26/automatically-publish-javadoc-to-gh-pages-with-travis-ci
secure: JfVl6zxzhRIEG1VvLqMEPMGOecrzDyb2U0HPyQ4Z4pfKJgFJOdQ1orT9Aztpfr4edXqbCZnEy4WH8+FLBQagkXjT3Ladopv+9j1IkP8v1Gu1O8H2tHQc7wfGxnkQF+h0pFFS6adNAsMliQ5dxTojFYVoWebvZQbiVGYkew+QZ0c=
on_failure: change
12 changes: 10 additions & 2 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
Changelog
=========
Revision History
================

1.0 (2016/04/17)
----------------

- Fixed a bug checking levels across inactive items.
- Added error message for all IO errors.
- Added '--skip' options to disable documents during validation.
- Added Mercurial support. (credit: [@tjasz](https://github.com/tjasz))

0.8.4 (2015/03/12)
------------------
Expand Down
51 changes: 51 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
For Contributors
================

Requirements
------------

* Make:
* Windows: http://cygwin.com/install.html
* Mac: https://developer.apple.com/xcode
* Linux: http://www.gnu.org/software/make (likely already installed)
* virtualenv: https://pypi.python.org/pypi/virtualenv#installation
* Pandoc: http://johnmacfarlane.net/pandoc/installing.html
* Graphviz: http://www.graphviz.org/Download.php

Installation
------------

Create a virtualenv:

```
$ make env
```

Run the tests:

```
$ make test
$ make tests # includes integration tests
```

Build the documentation:

```
$ make doc
```

Run static analysis:

```
$ make pep8
$ make pep257
$ make pylint
$ make check # includes all checks
```

Release to PyPI:

```
$ make upload-test # dry run upload to a test server
$ make upload
```
Loading

0 comments on commit df64f3e

Please sign in to comment.