diff --git a/.gitattributes b/.gitattributes index 7f9357f62..f3df90d38 100644 --- a/.gitattributes +++ b/.gitattributes @@ -13,3 +13,10 @@ CHANGES text eol=lf CREDITS text eol=lf LICENSE text eol=lf Readme.md text eol=lf +# make sure that repo-specific settings (.gitignore, CI-setup,...) +# are excluded from the source-package generated via 'git archive' +.git* export-ignore +/.travis* export-ignore +/.coveralls* export-ignore +appveyor.yml export-ignore + diff --git a/code/PlyLoader.cpp b/code/PlyLoader.cpp index 090473893..d348fe113 100644 --- a/code/PlyLoader.cpp +++ b/code/PlyLoader.cpp @@ -538,7 +538,7 @@ void PLYImporter::LoadFace(const PLY::Element* pcElement, const PLY::ElementInst ai_assert(NULL != instElement); if (mGeneratedMesh == NULL) - throw DeadlyImportError("Invalid .ply file: Vertices shoud be declared before faces"); + throw DeadlyImportError("Invalid .ply file: Vertices should be declared before faces"); bool bOne = false; diff --git a/port/PyAssimp/setup.py b/port/PyAssimp/setup.py index e683f7a81..26cf9b400 100644 --- a/port/PyAssimp/setup.py +++ b/port/PyAssimp/setup.py @@ -8,6 +8,9 @@ setup(name='pyassimp', description='Python bindings for the Open Asset Import Library (ASSIMP)', url='https://github.com/assimp/assimp', packages=['pyassimp'], - data_files=[('share/pyassimp', ['README.md']), - ('share/examples/pyassimp', ['scripts/' + f for f in os.listdir('scripts/')])], requires=['numpy'] + data_files=[ + ('share/pyassimp', ['README.md']), + ('share/examples/pyassimp', ['scripts/' + f for f in os.listdir('scripts/')]) + ], + requires=['numpy'] )