Skip to content

Commit 49d0f70

Browse files
committed
Reformat files with editorconfig settings
1 parent 8a77cfa commit 49d0f70

7 files changed

Lines changed: 370 additions & 370 deletions

File tree

.gitignore

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
tmp/
2-
build/
3-
artifacts/
4-
__pycache__/
5-
syrup.egg-info/
1+
tmp/
2+
build/
3+
artifacts/
4+
__pycache__/
5+
syrup.egg-info/

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,4 +189,4 @@ Copyright © 2018-2019 :: Odd Stråbø <oddstr13@openshell.no>
189189
comment syntax for the file format. We also recommend that a
190190
file or class name and description of purpose be included on the
191191
same "printed page" as the copyright notice for easier
192-
identification within third-party archives.
192+
identification within third-party archives.

README.md

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
Installation
2-
============
3-
```
4-
pip install git+https://github.com/OpenShell-no/syrup.git
5-
```
6-
7-
Usage
8-
=====
9-
```
10-
syrup build --name="TestApp" --company="TestingInc" --version=0.0.1 --src-dir=testinput
11-
```
12-
13-
See `syrup build --help` for details.
14-
15-
Developement
16-
============
17-
```
18-
git clone https://github.com/OpenShell-no/syrup.git
19-
pip install --editable ./syrup
20-
```
21-
22-
External dependencies
23-
=====================
24-
* Git (For installing from git) - https://git-scm.com/
25-
* Python >= 3.5 - https://python.org/
26-
* NSIS >= 3.04 - https://nsis.sourceforge.io/Download \
27-
The following packages works for Mint 19 "tessa" (Ubuntu 18.04 "bionic"):
28-
- https://packages.ubuntu.com/disco/amd64/nsis/download
29-
- https://packages.ubuntu.com/disco/all/nsis-common/download
1+
Installation
2+
============
3+
```
4+
pip install git+https://github.com/OpenShell-no/syrup.git
5+
```
6+
7+
Usage
8+
=====
9+
```
10+
syrup build --name="TestApp" --company="TestingInc" --version=0.0.1 --src-dir=testinput
11+
```
12+
13+
See `syrup build --help` for details.
14+
15+
Developement
16+
============
17+
```
18+
git clone https://github.com/OpenShell-no/syrup.git
19+
pip install --editable ./syrup
20+
```
21+
22+
External dependencies
23+
=====================
24+
* Git (For installing from git) - https://git-scm.com/
25+
* Python >= 3.5 - https://python.org/
26+
* NSIS >= 3.04 - https://nsis.sourceforge.io/Download \
27+
The following packages works for Mint 19 "tessa" (Ubuntu 18.04 "bionic"):
28+
- https://packages.ubuntu.com/disco/amd64/nsis/download
29+
- https://packages.ubuntu.com/disco/all/nsis-common/download

setup.py

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
from setuptools import setup, find_packages
2-
# TODO: include package data (templates)
3-
setup(
4-
name='syrup',
5-
version='0.0.2',
6-
packages=find_packages(),
7-
package_data={
8-
'': ['templates/*']
9-
},
10-
install_requires=[
11-
'click',
12-
'requests',
13-
'Pillow',
14-
'jinja2',
15-
],
16-
entry_points='''
17-
[console_scripts]
18-
syrup=syrup.__main__:cli
19-
''',
20-
zip_safe=True,
21-
)
1+
from setuptools import setup, find_packages
2+
# TODO: include package data (templates)
3+
setup(
4+
name='syrup',
5+
version='0.0.2',
6+
packages=find_packages(),
7+
package_data={
8+
'': ['templates/*']
9+
},
10+
install_requires=[
11+
'click',
12+
'requests',
13+
'Pillow',
14+
'jinja2',
15+
],
16+
entry_points='''
17+
[console_scripts]
18+
syrup=syrup.__main__:cli
19+
''',
20+
zip_safe=True,
21+
)

syrup/__main__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@ def build(ctx, do_clean, version, name, company, description, license, icon, bui
6262
click.echo("Building {} v{}...".format(name, version))
6363
if do_clean:
6464
ctx.forward(clean)
65-
65+
6666
os.makedirs(build_dir, exist_ok=True)
6767

6868
copySrc(src_dir=src_dir, build_dir=build_dir)
69-
69+
7070
if icon:
7171
icon = makeIco(icon=icon, name=name, build_dir=build_dir)
72-
72+
7373
nsi_script = compileNSISTemplate(
7474
build_dir=build_dir, artifact_dir=artifact_dir,
7575
executables=executable,

0 commit comments

Comments
 (0)