Skip to content

Commit

Permalink
bump version, merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
casperdcl committed Jan 21, 2019
2 parents 649b05d + e6c2316 commit 5aa2741
Show file tree
Hide file tree
Showing 11 changed files with 285 additions and 279 deletions.
28 changes: 21 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,26 @@
gitfame/*.py[co]
gitfame/*.c
gitfame/*.so
gitfame/tests/*.py[co]
# build
git_fame.egg-info/
*.py[cod]

# C extensions
*.so

# Packages
*.egg-info
build/
dist/
# test

# Unit test / coverage reports
.tox/
.coverage
__pycache__
nosetests.xml

# Translations
*.mo

# Mr Developer
.mr.developer.cfg
.project
.pydevproject

# PyCharm
.idea
11 changes: 3 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# sudo: required
# dist: trusty
language: python
matrix:
include:
Expand All @@ -13,7 +11,9 @@ matrix:
env: TOXENV=py35
- python: 3.6
env: TOXENV=py36
- python: 3.7-dev
- python: 3.7
dist: xenial
sudo: true
env: TOXENV=py37
- python: pypy2.7-5.10.0
env: TOXENV=pypy
Expand All @@ -31,11 +31,6 @@ before_cache:
- rm -f $HOME/.cache/pip/log/debug.log
notifications:
email: false
before_install:
# fix a crash with multiprocessing on Travis
# - sudo rm -rf /dev/shm
# - sudo ln -s /run/shm /dev/shm
- git fetch --tags
install:
- pip install tox
- pip install .
Expand Down
8 changes: 5 additions & 3 deletions LICENCE
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
* files: *
MPLv2.0 2016-2018 (c) Casper da Costa-Luis
MPLv2.0 2016-2019 (c) Casper da Costa-Luis
[casperdcl](https://github.com/casperdcl).


Mozilla Public Licence (MPL) v. 2.0 - Exhibit A
-----------------------------------------------

This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
This Source Code Form is subject to the terms of the
Mozilla Public License, v. 2.0.
If a copy of the MPL was not distributed with this file,
You can obtain one at https://mozilla.org/MPL/2.0/.
20 changes: 7 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
# IMPORTANT: for compatibility with `python setup.py make [alias]`, ensure:
# 1. Every alias is preceded by @[+]make (eg: @make alias)
# 2. A maximum of one @make alias or command per line
#
# Sample makefile compatible with `python setup.py make`:
#```
#all:
# @make test
# @make install
#test:
# nosetest
#install:
# python setup.py install
#```
# see: https://github.com/tqdm/py-make/issues/1

.PHONY:
alltests
Expand All @@ -26,15 +16,18 @@
coverclean
prebuildclean
clean
toxclean
installdev
install
build
buildupload
pypi
help
none
run

help:
@python setup.py make
@python setup.py make -p

alltests:
@+make testcoverage
Expand All @@ -46,7 +39,8 @@ all:
@+make build

flake8:
@+flake8 --max-line-length=80 --ignore=E111,E114 --exclude .tox --count --statistics --exit-zero .
@+flake8 --max-line-length=80 --ignore=E111,E114 --exclude .tox,build \
-j 8 --count --statistics --exit-zero .

test:
tox --skip-missing-interpreters
Expand Down
94 changes: 62 additions & 32 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ Pretty-print ``git`` repository collaborators sorted by contributions.

|PyPI-Status| |PyPI-Versions|

|Build-Status| |Coverage-Status| |Branch-Coverage-Status| |Codacy-Grade|
|Build-Status| |Coverage-Status| |Branch-Coverage-Status| |Codacy-Grade| |Libraries-Rank|

|LICENCE| |Donate| |OpenHub-Status|
|DOI-URI| |LICENCE| |OpenHub-Status| |Gift-Casper|

.. code:: sh
Expand Down Expand Up @@ -41,16 +41,16 @@ Installation
Latest PyPI stable release
~~~~~~~~~~~~~~~~~~~~~~~~~~

|PyPI-Status|
|PyPI-Status| |PyPI-Downloads| |Libraries-Dependents|

.. code:: sh
pip install git-fame
Latest development release on github
Latest development release on GitHub
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

|GitHub-Status|
|GitHub-Status| |GitHub-Stars| |GitHub-Commits| |GitHub-Forks| |GitHub-Updated|

Pull and install in the current directory:

Expand Down Expand Up @@ -90,6 +90,14 @@ On Ubuntu, the procedure would be:
followed by a terminal restart.


Changelog
---------

The list of all changes is available either on GitHub's Releases:
|GitHub-Status| or on crawlers such as
`allmychanges.com <https://allmychanges.com/p/python/git-fame/>`_.


Usage
-----

Expand Down Expand Up @@ -119,6 +127,8 @@ It is also possible to run from within a python shell or script.
Documentation
-------------

|PyPI-Versions| |README-Hits|

.. code:: sh
Usage:
Expand Down Expand Up @@ -152,55 +162,75 @@ Documentation
--log=<lvl> FATAL|CRITICAL|ERROR|WARN(ING)|[default: INFO]|DEBUG|NOTSET.
Changelog
---------
Contributions
-------------
The list of all changes is available either on
`Github's Releases <https://github.com/casperdcl/git-fame/releases>`__
or on crawlers such as
`allmychanges.com <https://allmychanges.com/p/python/git-fame/>`__.
|GitHub-Commits| |GitHub-Issues| |GitHub-PRs| |OpenHub-Status|
All source code is hosted on `GitHub <https://github.com/casperdcl/git-fame>`__.
Contributions are welcome.
Licence
LICENCE
-------
Open Source (OSI approved): |LICENCE|
Copyright (c) 2016-2018 Casper da Costa-Luis.
This Source Code Form is subject to the terms of the
Mozilla Public License, v. 2.0.
If a copy of the MPL was not distributed with this file, You can obtain one
at `https://mozilla.org/MPL/2.0/ <https://mozilla.org/MPL/2.0/>`__.
Citation information: |DOI-URI|
Authors
-------
|OpenHub-Status|
- Casper da Costa-Luis (`@casperdcl <https://github.com/casperdcl/>`__) |Donate|
- Casper da Costa-Luis (`casperdcl <https://github.com/casperdcl>`__ |Gift-Casper|)
We are grateful for all |GitHub-Contributions|.
|git-fame-hits|
|README-Hits|
.. |Build-Status| image:: https://travis-ci.org/casperdcl/git-fame.svg?branch=master
.. |Build-Status| image:: https://img.shields.io/travis/casperdcl/git-fame/master.svg?logo=travis
:target: https://travis-ci.org/casperdcl/git-fame
.. |Coverage-Status| image:: https://coveralls.io/repos/casperdcl/git-fame/badge.svg?branch=master
:target: https://coveralls.io/github/casperdcl/git-fame
.. |Branch-Coverage-Status| image:: https://codecov.io/gh/casperdcl/git-fame/branch/master/graph/badge.svg
:target: https://codecov.io/gh/casperdcl/git-fame
.. |GitHub-Status| image:: https://img.shields.io/github/tag/casperdcl/git-fame.svg?maxAge=2592000
:target: https://github.com/casperdcl/git-fame/releases
.. |Codacy-Grade| image:: https://api.codacy.com/project/badge/Grade/bde789ee0e57491eb2bb8609bd4190c3
:target: https://www.codacy.com/app/casper-dcl/git-fame
.. |GitHub-Status| image:: https://img.shields.io/github/tag/casper-dcl/git-fame.svg?maxAge=86400&logo=github&logoColor=white
:target: https://github.com/casper-dcl/git-fame/releases
.. |GitHub-Forks| image:: https://img.shields.io/github/forks/casper-dcl/git-fame.svg?logo=github&logoColor=white
:target: https://github.com/casper-dcl/git-fame/network
.. |GitHub-Stars| image:: https://img.shields.io/github/stars/casper-dcl/git-fame.svg?logo=github&logoColor=white
:target: https://github.com/casper-dcl/git-fame/stargazers
.. |GitHub-Commits| image:: https://img.shields.io/github/commit-activity/y/casper-dcl/git-fame.svg?logo=git&logoColor=white
:target: https://github.com/casper-dcl/git-fame/graphs/commit-activity
.. |GitHub-Issues| image:: https://img.shields.io/github/issues-closed/casper-dcl/git-fame.svg?logo=github&logoColor=white
:target: https://github.com/casper-dcl/git-fame/issues
.. |GitHub-PRs| image:: https://img.shields.io/github/issues-pr-closed/casper-dcl/git-fame.svg?logo=github&logoColor=white
:target: https://github.com/casper-dcl/git-fame/pulls
.. |GitHub-Contributions| image:: https://img.shields.io/github/contributors/casper-dcl/git-fame.svg?logo=github&logoColor=white
:target: https://github.com/casper-dcl/git-fame/graphs/contributors
.. |GitHub-Updated| image:: https://img.shields.io/github/last-commit/casper-dcl/git-fame/master.svg?logo=github&logoColor=white&label=pushed
:target: https://github.com/casper-dcl/git-fame/pulse
.. |Gift-Casper| image:: https://img.shields.io/badge/gift-donate-dc10ff.svg
:target: https://caspersci.uk.to/donate.html
.. |PyPI-Status| image:: https://img.shields.io/pypi/v/git-fame.svg
:target: https://pypi.python.org/pypi/git-fame
.. |PyPI-Versions| image:: https://img.shields.io/pypi/pyversions/git-fame.svg
:target: https://pypi.python.org/pypi/git-fame
.. |git-fame-hits| image:: https://caspersci.uk.to/cgi-bin/hits.cgi?q=git-fame&a=hidden
:target: https://pypi.org/project/git-fame
.. |PyPI-Downloads| image:: https://img.shields.io/pypi/dm/git-fame.svg?label=pypi%20downloads&logo=python&logoColor=white
:target: https://pypi.org/project/git-fame
.. |PyPI-Versions| image:: https://img.shields.io/pypi/pyversions/git-fame.svg?logo=python&logoColor=white
:target: https://pypi.org/project/git-fame
.. |Libraries-Rank| image:: https://img.shields.io/librariesio/sourcerank/pypi/git-fame.svg?logo=koding&logoColor=white
:target: https://libraries.io/pypi/git-fame
.. |Libraries-Dependents| image:: https://img.shields.io/librariesio/dependent-repos/pypi/git-fame.svg?logo=koding&logoColor=white
:target: https://github.com/casper-dcl/git-fame/network/dependents
.. |OpenHub-Status| image:: https://www.openhub.net/p/git-fame/widgets/project_thin_badge?format=gif
:target: https://www.openhub.net/p/git-fame?ref=Thin+badge
.. |LICENCE| image:: https://img.shields.io/pypi/l/git-fame.svg
:target: https://mozilla.org/MPL/2.0/
.. |Codacy-Grade| image:: https://api.codacy.com/project/badge/Grade/bde789ee0e57491eb2bb8609bd4190c3
:target: https://www.codacy.com/app/casper-dcl/git-fame
.. |Donate| image:: https://img.shields.io/badge/gift-donate-dc10ff.svg
:target: https://caspersci.uk.to/donate.html
:target: https://raw.githubusercontent.com/casper-dcl/git-fame/master/LICENCE
.. |DOI-URI| image:: https://zenodo.org/badge/21637/casper-dcl/git-fame.svg
:target: https://zenodo.org/badge/latestdoi/21637/casper-dcl/git-fame
.. |README-Hits| image:: https://caspersci.uk.to/cgi-bin/hits.cgi?q=git-fame&style=social&r=https://github.com/casper-dcl/git-fame
:target: https://caspersci.uk.to/cgi-bin/hits.cgi?q=git-fame&a=plot&r=https://github.com/casper-dcl/git-fame&style=social
Loading

0 comments on commit 5aa2741

Please sign in to comment.