Skip to content

Commit 04e97d1

Browse files
authored
ci: build almost functional
Solving auto-deploy bug
2 parents 692877c + 52968d8 commit 04e97d1

23 files changed

+103
-36
lines changed

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ after_script:
2121
notification:
2222
email: false
2323

24-
after_success: python setup.py sdist bdist_wheel
25-
26-
before_deploy: "echo 'Beggining deploy...'"
24+
before_deploy:
25+
- python3 setup.py build
26+
- python3 setup.py sdist bdist_wheel
2727

2828
deploy:
2929
- provider: pypi

README.md

+23-8
Original file line numberDiff line numberDiff line change
@@ -32,32 +32,39 @@ Sometimes we, the developers, go _full-loco_ while programming and make mistakes
3232

3333
### Initial commit
3434

35-
<img src="" style="min-width:200px;margin-left:auto;margin-right:auto;"/>
35+
<img src="https://raw.githubusercontent.com/andre-filho/commit-helper/master/assets/gifs/generate-file.gif" style="min-width:200px;margin-left:auto;margin-right:auto;"/>
3636

3737
### Normal commit
3838

39-
<img src="" style="min-width:200px;margin-left:auto;margin-right:auto;"/>
39+
<img src="https://raw.githubusercontent.com/andre-filho/commit-helper/master/assets/gifs/commit.gif" style="min-width:200px;margin-left:auto;margin-right:auto;"/>
40+
41+
### Commit without generating a configuration file
42+
43+
<img src="https://raw.githubusercontent.com/andre-filho/commit-helper/master/assets/gifs/--no-file.gif" style="min-width:200px;margin-left:auto;margin-right:auto;"/>
4044

4145
### Co-authored commit
4246

43-
<img src="" style="min-width:200px;margin-left:auto;margin-right:auto;"/>
47+
<img src="https://raw.githubusercontent.com/andre-filho/commit-helper/master/assets/gifs/co-author.gif" style="min-width:200px;margin-left:auto;margin-right:auto;"/>
4448

4549
### Fast commit
4650

47-
<img src="" style="min-width:200px;margin-left:auto;margin-right:auto;"/>
51+
<img src="https://raw.githubusercontent.com/andre-filho/commit-helper/master/assets/gifs/single-line.gif" style="min-width:200px;margin-left:auto;margin-right:auto;"/>
4852

4953
### Debugging and commiting
5054

51-
<img src="" style="min-width:200px;margin-left:auto;margin-right:auto;"/>
55+
<img src="https://raw.githubusercontent.com/andre-filho/commit-helper/master/assets/gifs/--debug.gif" style="min-width:200px;margin-left:auto;margin-right:auto;"/>
5256

5357
### All-in-one commit
5458

55-
<img src="" style="min-width:200px;margin-left:auto;margin-right:auto;"/>
59+
<img src="https://raw.githubusercontent.com/andre-filho/commit-helper/master/assets/gifs/all.gif" style="min-width:200px;margin-left:auto;margin-right:auto;"/>
5660

57-
### Getting help for writing in a convention
61+
### Help
5862

59-
<img src="" style="min-width:200px;margin-left:auto;margin-right:auto;"/>
63+
<img src="https://raw.githubusercontent.com/andre-filho/commit-helper/master/assets/gifs/flag-h.gif" style="min-width:200px;margin-left:auto;margin-right:auto;"/>
64+
65+
### Getting help for writing in a convention
6066

67+
<img src="https://raw.githubusercontent.com/andre-filho/commit-helper/master/assets/gifs/tag-help.gif" style="min-width:200px;margin-left:auto;margin-right:auto;"/>
6168

6269
## Installation
6370

@@ -67,6 +74,14 @@ In order to install one of our older versions, check our [previous releases](PRE
6774
$ pip3 install commit-helper
6875
```
6976

77+
## Updating your current version
78+
79+
If you already have one of our `pip` releases installed in your machine and want to update to the latest version, use the command:
80+
81+
```bash
82+
$ pip3 install --upgrade commit-helper
83+
```
84+
7085
## Usage and configuration
7186

7287
This program has a cli that you can take advantage of. Running `commit --help`

VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.4.5
1+
3.4.8

assets/--co-author.gif

-124 KB
Binary file not shown.

assets/--convention.gif

-133 KB
Binary file not shown.

assets/--debug.gif

-112 KB
Binary file not shown.

assets/--no-file.gif

-123 KB
Binary file not shown.

assets/--tudo.gif

-107 KB
Binary file not shown.

assets/commit helper.gif

-280 KB
Binary file not shown.

assets/commit.gif

-91.7 KB
Binary file not shown.

assets/gifs/--debug.gif

31.8 KB
Loading

assets/gifs/--no-file.gif

84.1 KB
Loading

assets/gifs/all.gif

38 KB
Loading

assets/gifs/co-author.gif

69.5 KB
Loading

assets/gifs/commit.gif

46 KB
Loading

assets/gifs/flag-h.gif

87.3 KB
Loading

assets/gifs/generate-file.gif

39.4 KB
Loading

assets/gifs/single-line.gif

59.3 KB
Loading

assets/gifs/tag-help.gif

68.7 KB
Loading

requirements.txt

+30-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,30 @@
1-
pyyaml==3.13
2-
pytest==3.10.1
3-
pycodestyle==2.4.0
4-
argparse==1.4.0
5-
coverage==4.5.2
6-
pytest-cov==2.6.0
7-
codeclimate-test-reporter==0.2.3
8-
codacy-coverage==1.3.11
9-
colored==1.3.93
10-
pytest-watch==4.2.0
1+
argh==0.26.2
2+
atomicwrites==1.2.1
3+
attrs==18.2.0
4+
certifi==2018.11.29
5+
chardet==3.0.4
6+
codacy-coverage==1.3.11
7+
codeclimate-test-reporter==0.2.3
8+
colorama==0.4.1
9+
colored==1.3.93
10+
coverage==4.5.2
11+
docopt==0.6.2
12+
idna==2.8
13+
more-itertools==4.3.0
14+
pathlib==1.0.1
15+
pathtools==0.1.2
16+
pip==18.1
17+
pluggy==0.8.0
18+
py==1.7.0
19+
pycodestyle==2.4.0
20+
pytest==4.0.1
21+
pytest-cov==2.6.0
22+
pytest-watch==4.2.0
23+
PyYAML==3.13
24+
requests==2.21.0
25+
setuptools==40.6.2
26+
six==1.12.0
27+
urllib3==1.24.1
28+
watchdog==0.9.0
29+
wheel==0.32.2
30+
twine==1.12.1

run.sh

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+
docker run --tty --interactive --volume $PWD:/commit-helper --name commit-helper --workdir /commit-helper python:3.6 bash

setup.cfg

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#make wheel build a universal wheel file
2+
[bdist_wheel]
3+
universal = 1
4+
5+
#ensures that your LICENSE file is part of the wheel files which is a common license requirement
6+
[metadata]
7+
license_file = LICENSE

setup.py

+36-14
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,54 @@
1-
from setuptools import setup
2-
from setuptools import find_packages
1+
import codecs
2+
from setuptools import setup, find_packages
3+
from os import path
4+
import os
5+
from pip._internal.req import parse_requirements
36

4-
with open("README.md", 'r') as fi: # pragma: no cover
5-
long_desc = fi.read()
7+
here = path.abspath(path.dirname(__file__))
68

7-
with open("VERSION.txt", 'r') as ver: # pragma: no cover
8-
version = ver.read()
9+
with open(os.path.join(os.path.dirname(__file__), 'README.md')) as readme:
10+
README = readme.read()
11+
12+
# allowes setup.py to be run from any path
13+
os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
14+
15+
# parse_requirements() returns generator of pip.req.InstallRequirement objects
16+
INSTALL_REQS = parse_requirements('requirements.txt', session='hack')
17+
18+
# reqs is a list of requirements
19+
REQUIREMENTS = [str(ir.req) for ir in INSTALL_REQS]
20+
21+
CLASSIFIERS = [
22+
"Development Status :: 5 - Production/Stable",
23+
"Intended Audience :: Developers",
24+
"Natural Language :: Portuguese",
25+
"License :: OSI Approved :: GNU License",
26+
"Operating System :: OS Independent",
27+
"Programming Language :: Python",
28+
"Programming Language :: Python :: 3.6",
29+
"Programming Language :: Python :: Implementation :: CPython",
30+
"Programming Language :: Python :: Implementation :: PyPy",
31+
"Topic :: Software Development :: Libraries :: Python Modules",
32+
]
933

1034
setup( # pragma: no cover
1135
name='commit-helper',
1236
description="A python program that helps you write commits following commit conventions", # nopep8
1337
url='https://github.com/andre-filho/commit-helper',
14-
long_description=long_desc,
38+
long_description=codecs.open('README.md', 'rb', 'utf8').read(),
1539
long_description_content_type='text/markdown',
1640
author='Andre de Sousa Costa Filho',
1741
author_email='[email protected]',
18-
version=str(version).replace('\n', ''),
42+
version=codecs.open('VERSION.txt', 'rb', 'utf8').read(),
1943
packages=find_packages(),
44+
keywords=['commit', 'helper', 'git', 'version', 'versioning'],
2045
entry_points={
2146
'console_scripts': [
2247
'commit = commit_helper.__main__:main',
2348
'commit-helper = commit_helper.__main__:main',
2449
]
2550
},
26-
install_requires=[
27-
'pathlib',
28-
'pyyaml',
29-
'argparse',
30-
'colored',
31-
],
51+
install_requires=REQUIREMENTS,
52+
license='GNU',
53+
classifiers=CLASSIFIERS,
3254
)

0 commit comments

Comments
 (0)