Skip to content

Commit

Permalink
Merging origin develop while adding update to changelog about #292 fix
Browse files Browse the repository at this point in the history
  • Loading branch information
carlio committed Nov 20, 2018
2 parents 9500490 + 816647b commit 35d6b76
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 3 deletions.
6 changes: 6 additions & 0 deletions .pre-commit-hooks.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- id: prospector
name: prospector
description: Analyze Python code using Prospector
entry: prospector
language: python
types: [python]
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
Prospector Changelog
=======

## Version 1.1.5 (placeholder for release)
## Version 1.1.6 (placeholder for release)
- [#292](https://github.com/PyCQA/prospector/issues/292) Adding pylint plugin dependencies back and fixing autodetect behaviour.

# Version 1.1.5
- [#283](https://github.com/PyCQA/prospector/pull/283) Remove unexpected argument from read_config_file - Remove quiet
argument
- [#291](https://github.com/PyCQA/prospector/pull/291) Update pycodestyle support until 2.4.0
- [#280](https://github.com/PyCQA/prospector/pull/280) Add strict option and fixed emacs output format for mypy tool
- [#282](https://github.com/PyCQA/prospector/pull/282) Fix working dir detection

## Version 1.1.4
- [#285](https://github.com/PyCQA/prospector/issues/285) Fix dependency tree resolution - now insists on `pep8-naming<=0.4.1` as later versions cause conflicting versions of flake8 to be installed.

Expand Down
12 changes: 12 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,18 @@ Possible values are ``verylow``, ``low``, ``medium``, ``high``, ``veryhigh``.
Prospector does not include documentation warnings by default, but you can turn
this on using the ``--doc-warnings`` flag.

pre-commit
----------

If you'd like Prospector to be run automatically when making changes to files in your Git
repository, you can install `pre-commit <https://pre-commit.com/>`_ and add the following
text to your repositories' ``.pre-commit-config.yaml``::

repos:
- repo: https://github.com/PyCQA/prospector
rev: 1.1.4 # The version of Prospector to use
hooks:
- id: prospector

License
-------
Expand Down
2 changes: 1 addition & 1 deletion prospector/__pkginfo__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
__version_info__ = (1, 1, 4)
__version_info__ = (1, 1, 5)
__version__ = '.'.join(map(str, __version_info__))
3 changes: 2 additions & 1 deletion prospector/config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,8 @@ def _find_used_libraries(self, config, profile):

# Bring in adaptors that we automatically detect are needed
if config.autodetect and profile.autodetect is True:
map(libraries.append, autodetect_libraries(self.workdir))
for found_dep in autodetect_libraries(self.workdir):
libraries.append(found_dep)

# Bring in adaptors for the specified libraries
for name in set(config.uses + profile.uses):
Expand Down
3 changes: 3 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@

_INSTALL_REQUIRES = [
'pylint-plugin-utils>=0.2.6',
'pylint-django==2.0.2',
'pylint-celery==0.3',
'pylint-flask==0.5',
'requirements-detector>=0.6',
'setoptconf>=0.2.0',
'dodgy>=0.1.9',
Expand Down

0 comments on commit 35d6b76

Please sign in to comment.