Skip to content

Commit 4e80ee5

Browse files
committed
Fix line ending in files
It looks like git on some of the developer machines wasn't set up to do automatic line ending handling, as such a lot of litteral ^M are checked into the respository from files that were created entirely on Macs. When viewing these files on a Linux machine, they look all kinds of weird because the line ending is ^J. This creates a .gitattributes file and sets all the files with extra ^M checked into the repository to be reset to git native ^J. When checked out locally git will do translation to the right local endings (^M on Mac, ^M^J on Win, ^J on Linux).
1 parent 3554bde commit 4e80ee5

18 files changed

Lines changed: 974 additions & 912 deletions

.gitattributes

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Set the default behavior, in case people don't have core.autocrlf set.
2+
* text=auto
3+
4+
# Explicitly declare text files you want to always be normalized and converted
5+
# to native line endings on checkout.
6+
*.csv text
7+
8+
# Declare files that will always have CRLF line endings on checkout.
9+
*.sln text eol=crlf
10+
11+
# Denote all files that are truly binary and should not be modified.
12+
*.png binary
13+
*.jpg binary

.gitignore

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
1-
# IDE OS
2-
.DS_Store
3-
.idea
4-
5-
# Byte-compiled / optimized / DLL files
6-
__pycache__/
7-
*.py[cod]
8-
*$py.class
9-
10-
# Distribution / packaging
11-
.Python
12-
env/
13-
build/
14-
develop-eggs/
15-
dist/
16-
eggs/
17-
.eggs/
18-
lib/
19-
lib64/
20-
parts/
21-
sdist/
22-
var/
23-
*.egg-info/
24-
.installed.cfg
25-
*.egg
26-
27-
# PyInstaller
28-
# Usually these files are written by a python script from a template
29-
# before PyInstaller builds the exe, so as to inject date/other infos into it.
30-
*.manifest
31-
*.spec
32-
33-
# Installer logs
34-
pip-log.txt
35-
pip-delete-this-directory.txt
36-
37-
# Unit test / coverage reports
38-
htmlcov/
39-
.tox/
40-
.coverage
41-
.coverage.*
42-
.cache
43-
nosetests.xml
44-
coverage.xml
45-
*,cover
46-
47-
# virtual env
48-
venv/
49-
# python 3 virtual env
50-
python3/
51-
52-
.env
53-
54-
# resources
55-
resources/output.wav
56-
57-
docs/_build/
58-
deploy.sh
1+
# IDE OS
2+
.DS_Store
3+
.idea
4+
5+
# Byte-compiled / optimized / DLL files
6+
__pycache__/
7+
*.py[cod]
8+
*$py.class
9+
10+
# Distribution / packaging
11+
.Python
12+
env/
13+
build/
14+
develop-eggs/
15+
dist/
16+
eggs/
17+
.eggs/
18+
lib/
19+
lib64/
20+
parts/
21+
sdist/
22+
var/
23+
*.egg-info/
24+
.installed.cfg
25+
*.egg
26+
27+
# PyInstaller
28+
# Usually these files are written by a python script from a template
29+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
30+
*.manifest
31+
*.spec
32+
33+
# Installer logs
34+
pip-log.txt
35+
pip-delete-this-directory.txt
36+
37+
# Unit test / coverage reports
38+
htmlcov/
39+
.tox/
40+
.coverage
41+
.coverage.*
42+
.cache
43+
nosetests.xml
44+
coverage.xml
45+
*,cover
46+
47+
# virtual env
48+
venv/
49+
# python 3 virtual env
50+
python3/
51+
52+
.env
53+
54+
# resources
55+
resources/output.wav
56+
57+
docs/_build/
58+
deploy.sh
5959
docs/apis
6060
docs/gh-pages
6161
test/__init__.py

examples/__init__.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
# Copyright 2016 IBM All Rights Reserved.
2-
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
6-
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
8-
#
9-
# Unless required by applicable law or agreed to in writing, software
10-
# distributed under the License is distributed on an "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
13-
# limitations under the License.
1+
# Copyright 2016 IBM All Rights Reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.

0 commit comments

Comments
 (0)