Skip to content

Commit f8049ce

Browse files
committed
bump version, merge branch 'devel'
2 parents e2df4b3 + f74de6e commit f8049ce

File tree

8 files changed

+25
-49
lines changed

8 files changed

+25
-49
lines changed

.coveragerc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
branch = True
33
omit =
44
pymake/tests/*
5+
[report]
6+
show_missing = True

.gitignore

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,14 @@
44
*.so
55

66
# Packages
7-
*.egg
87
*.egg-info
9-
dist
10-
build
11-
eggs
12-
parts
13-
bin
14-
var
15-
sdist
16-
develop-eggs
17-
.installed.cfg
18-
lib
19-
lib64
20-
__pycache__
21-
MANIFEST
22-
cover/
23-
24-
# Installer logs
25-
pip-log.txt
8+
build/
9+
dist/
2610

2711
# Unit test / coverage reports
28-
.coverage
2912
.tox/
13+
.coverage
14+
__pycache__
3015
nosetests.xml
3116

3217
# Translations

.travis.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ matrix:
2121
env: TOXENV=pypy3
2222
- python: 3.6
2323
env: TOXENV=flake8
24-
# use cache for big builds like pandas (to minimise build time).
25-
# If issues, clear cache
26-
# https://docs.travis-ci.com/user/caching/#Clearing-Caches
2724
cache:
2825
pip: true
2926
directories:
@@ -32,15 +29,8 @@ before_cache:
3229
- rm -f $HOME/.cache/pip/log/debug.log
3330
notifications:
3431
email: false
35-
# branches: # remove travis double-check on pull requests in main repo
36-
# only:
37-
# - master
38-
# - /^\d\.\d+$/
3932
install:
40-
# Install tox first, before dependencies (to get per-env deps)
4133
- pip install tox
42-
# install this package (py-make) into the environment
4334
- pip install .
44-
# run tests
4535
script:
4636
- tox

LICENCE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ for their respective work, and release the work under the MPLv2.0 licence.
55
Exceptions or notable authors are listed below
66
in reverse chronological order:
77

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

Makefile

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
# IMPORTANT: for compatibility with `python setup.py make [alias]`, ensure:
22
# 1. Every alias is preceded by @[+]make (eg: @make alias)
33
# 2. A maximum of one @make alias or command per line
4-
#
5-
# Sample makefile compatible with `python setup.py make`:
6-
#```
7-
#all:
8-
# @make test
9-
# @make install
10-
#test:
11-
# nosetest
12-
#install:
13-
# python setup.py \
14-
# install
15-
#```
4+
# see: https://github.com/tqdm/py-make/issues/1
165

176
.PHONY:
187
alltests
@@ -35,6 +24,7 @@
3524
pypi
3625
help
3726
none
27+
run
3828

3929
help:
4030
@python setup.py make -p
@@ -49,7 +39,8 @@ all:
4939
@+make build
5040

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

5445
test:
5546
tox --skip-missing-interpreters
@@ -111,3 +102,6 @@ buildupload:
111102

112103
none:
113104
# used for unit testing
105+
106+
run:
107+
python -Om pymake

README.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ py-make
55

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

8-
|DOI-URI| |LICENCE| |OpenHub-Status|
8+
|DOI-URI| |LICENCE| |OpenHub-Status| |Gift-Casper|
99

1010

1111
Bring basic ``Makefile`` support to any system with Python.
@@ -152,8 +152,8 @@ We are grateful for all |GitHub-Contributions|.
152152
:target: https://coveralls.io/github/tqdm/py-make
153153
.. |Branch-Coverage-Status| image:: https://codecov.io/gh/tqdm/py-make/branch/master/graph/badge.svg
154154
:target: https://codecov.io/gh/tqdm/py-make
155-
.. |Codacy-Grade| image:: https://api.codacy.com/project/badge/Grade/3f965571598f44549c7818f29cdcf177
156-
: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
155+
.. |Codacy-Grade| image:: https://api.codacy.com/project/badge/Grade/1f1dab515f294a05af8fc45e200660e5
156+
:target: https://www.codacy.com/app/tqdm/py-make
157157
.. |GitHub-Status| image:: https://img.shields.io/github/tag/tqdm/py-make.svg?maxAge=86400&logo=github&logoColor=white
158158
:target: https://github.com/tqdm/py-make/releases
159159
.. |GitHub-Forks| image:: https://img.shields.io/github/forks/tqdm/py-make.svg?logo=github&logoColor=white
@@ -189,4 +189,4 @@ We are grateful for all |GitHub-Contributions|.
189189
.. |DOI-URI| image:: https://zenodo.org/badge/21637/tqdm/py-make.svg
190190
:target: https://zenodo.org/badge/latestdoi/21637/tqdm/py-make
191191
.. |README-Hits| image:: https://caspersci.uk.to/cgi-bin/hits.cgi?q=py-make&style=social&r=https://github.com/tqdm/py-make
192-
:target: https://caspersci.uk.to/cgi-bin/hits.cgi?q=py-make&a=plot&r=https://github.com/tqdm/tqdm&style=social
192+
:target: https://caspersci.uk.to/cgi-bin/hits.cgi?q=py-make&a=plot&r=https://github.com/tqdm/py-make&style=social

pymake/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
__all__ = ["__version__"]
1010

1111
# major, minor, patch, -extra
12-
version_info = 0, 1, 0
12+
version_info = 0, 1, 1
1313

1414
# Nice string for the version
1515
__version__ = '.'.join(map(str, version_info))

setup.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
name='py-make',
3434
version=__version__,
3535
description='Makefile execution powered by pure Python',
36+
long_description=README_rst,
3637
license='MPLv2.0, MIT Licenses',
3738
author='Casper da Costa-Luis',
3839
author_email='casper.dcl@physics.org',
@@ -45,7 +46,6 @@
4546
entry_points={'console_scripts': ['pymake=pymake._main:main'], },
4647
package_data={'py-make': ['CONTRIBUTE', 'LICENCE',
4748
'examples/*.py', 'examples/Makefile*']},
48-
long_description=README_rst,
4949
python_requires='>=2.6, !=3.0.*, !=3.1.*',
5050
classifiers=[
5151
# Trove classifiers
@@ -85,12 +85,17 @@
8585
'Programming Language :: Python :: Implementation :: IronPython',
8686
'Programming Language :: Python :: Implementation :: PyPy',
8787
'Topic :: Desktop Environment',
88+
'Topic :: Education :: Computer Aided Instruction (CAI)',
8889
'Topic :: Education :: Testing',
8990
'Topic :: Office/Business',
9091
'Topic :: Other/Nonlisted Topic',
92+
'Topic :: Software Development :: Build Tools',
9193
'Topic :: Software Development :: Libraries',
9294
'Topic :: Software Development :: Libraries :: Python Modules',
95+
'Topic :: Software Development :: Pre-processors',
9396
'Topic :: Software Development :: User Interfaces',
97+
'Topic :: System :: Installation/Setup',
98+
'Topic :: System :: Logging',
9499
'Topic :: System :: Monitoring',
95100
'Topic :: System :: Shells',
96101
'Topic :: Terminals',

0 commit comments

Comments
 (0)