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 e2df4b3 + f74de6e commit f8049ce
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 49 deletions.
2 changes: 2 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
branch = True
omit =
pymake/tests/*
[report]
show_missing = True
23 changes: 4 additions & 19 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,14 @@
*.so

# Packages
*.egg
*.egg-info
dist
build
eggs
parts
bin
var
sdist
develop-eggs
.installed.cfg
lib
lib64
__pycache__
MANIFEST
cover/

# Installer logs
pip-log.txt
build/
dist/

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

# Translations
Expand Down
10 changes: 0 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ matrix:
env: TOXENV=pypy3
- python: 3.6
env: TOXENV=flake8
# use cache for big builds like pandas (to minimise build time).
# If issues, clear cache
# https://docs.travis-ci.com/user/caching/#Clearing-Caches
cache:
pip: true
directories:
Expand All @@ -32,15 +29,8 @@ before_cache:
- rm -f $HOME/.cache/pip/log/debug.log
notifications:
email: false
# branches: # remove travis double-check on pull requests in main repo
# only:
# - master
# - /^\d\.\d+$/
install:
# Install tox first, before dependencies (to get per-env deps)
- pip install tox
# install this package (py-make) into the environment
- pip install .
# run tests
script:
- tox
2 changes: 1 addition & 1 deletion LICENCE
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ for their respective work, and release the work under the MPLv2.0 licence.
Exceptions or notable authors are listed below
in reverse chronological order:

* files *
* files: *
MPLv2.0 2016-2019 (c) Casper da Costa-Luis
[casperdcl](https://github.com/casperdcl).

Expand Down
20 changes: 7 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,18 +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 @@ -35,6 +24,7 @@
pypi
help
none
run

help:
@python setup.py make -p
Expand All @@ -49,7 +39,8 @@ all:
@+make build

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

test:
tox --skip-missing-interpreters
Expand Down Expand Up @@ -111,3 +102,6 @@ buildupload:

none:
# used for unit testing

run:
python -Om pymake
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ py-make

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

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


Bring basic ``Makefile`` support to any system with Python.
Expand Down Expand Up @@ -152,8 +152,8 @@ We are grateful for all |GitHub-Contributions|.
:target: https://coveralls.io/github/tqdm/py-make
.. |Branch-Coverage-Status| image:: https://codecov.io/gh/tqdm/py-make/branch/master/graph/badge.svg
:target: https://codecov.io/gh/tqdm/py-make
.. |Codacy-Grade| image:: https://api.codacy.com/project/badge/Grade/3f965571598f44549c7818f29cdcf177
:target: https://www.codacy.com/app/tqdm/py-make?utm_source=github.com&utm_medium=referral&utm_content=tqdm/py-make&utm_campaign=Badge_Grade
.. |Codacy-Grade| image:: https://api.codacy.com/project/badge/Grade/1f1dab515f294a05af8fc45e200660e5
:target: https://www.codacy.com/app/tqdm/py-make
.. |GitHub-Status| image:: https://img.shields.io/github/tag/tqdm/py-make.svg?maxAge=86400&logo=github&logoColor=white
:target: https://github.com/tqdm/py-make/releases
.. |GitHub-Forks| image:: https://img.shields.io/github/forks/tqdm/py-make.svg?logo=github&logoColor=white
Expand Down Expand Up @@ -189,4 +189,4 @@ We are grateful for all |GitHub-Contributions|.
.. |DOI-URI| image:: https://zenodo.org/badge/21637/tqdm/py-make.svg
:target: https://zenodo.org/badge/latestdoi/21637/tqdm/py-make
.. |README-Hits| image:: https://caspersci.uk.to/cgi-bin/hits.cgi?q=py-make&style=social&r=https://github.com/tqdm/py-make
:target: https://caspersci.uk.to/cgi-bin/hits.cgi?q=py-make&a=plot&r=https://github.com/tqdm/tqdm&style=social
:target: https://caspersci.uk.to/cgi-bin/hits.cgi?q=py-make&a=plot&r=https://github.com/tqdm/py-make&style=social
2 changes: 1 addition & 1 deletion pymake/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
__all__ = ["__version__"]

# major, minor, patch, -extra
version_info = 0, 1, 0
version_info = 0, 1, 1

# Nice string for the version
__version__ = '.'.join(map(str, version_info))
Expand Down
7 changes: 6 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
name='py-make',
version=__version__,
description='Makefile execution powered by pure Python',
long_description=README_rst,
license='MPLv2.0, MIT Licenses',
author='Casper da Costa-Luis',
author_email='[email protected]',
Expand All @@ -45,7 +46,6 @@
entry_points={'console_scripts': ['pymake=pymake._main:main'], },
package_data={'py-make': ['CONTRIBUTE', 'LICENCE',
'examples/*.py', 'examples/Makefile*']},
long_description=README_rst,
python_requires='>=2.6, !=3.0.*, !=3.1.*',
classifiers=[
# Trove classifiers
Expand Down Expand Up @@ -85,12 +85,17 @@
'Programming Language :: Python :: Implementation :: IronPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Desktop Environment',
'Topic :: Education :: Computer Aided Instruction (CAI)',
'Topic :: Education :: Testing',
'Topic :: Office/Business',
'Topic :: Other/Nonlisted Topic',
'Topic :: Software Development :: Build Tools',
'Topic :: Software Development :: Libraries',
'Topic :: Software Development :: Libraries :: Python Modules',
'Topic :: Software Development :: Pre-processors',
'Topic :: Software Development :: User Interfaces',
'Topic :: System :: Installation/Setup',
'Topic :: System :: Logging',
'Topic :: System :: Monitoring',
'Topic :: System :: Shells',
'Topic :: Terminals',
Expand Down

0 comments on commit f8049ce

Please sign in to comment.