Skip to content
This repository was archived by the owner on Feb 15, 2023. It is now read-only.

Commit 4a63d99

Browse files
committed
Merge pull request #296 from nostrademons/housekeeping
Update THANKS file and release notes, and fix Travis build for Macs.
2 parents 7a55fdc + f166031 commit 4a63d99

File tree

4 files changed

+31
-6
lines changed

4 files changed

+31
-6
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ os:
99
- osx
1010

1111
install:
12-
- wget 'https://googletest.googlecode.com/files/gtest-1.6.0.zip'
13-
- unzip gtest-1.6.0.zip
14-
- ln -s gtest-1.6.0 gtest
12+
- wget 'https://googletest.googlecode.com/files/gtest-1.7.0.zip'
13+
- unzip gtest-1.7.0.zip
14+
- ln -s gtest-1.7.0 gtest
1515
- sudo pip install BeautifulSoup
1616
- sudo pip install html5lib==0.95
1717
- ln -s `python -c 'import html5lib, os; print os.path.dirname(html5lib.__file__)'`/tests/testdata .

CHANGES.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
Gumbo 0.9.3 (2015-02-17)
2+
3+
* Bugfix for Æ entities (rgrove)
4+
* Fix CDATA handling; CDATA sections now generate a GUMBO_NODE_CDATA node rather
5+
than plain text.
6+
* Fix get_title example to handle whitespace nodes (gsnedders)
7+
* Visual Studio compilation fixes (fishioon)
8+
* Take the namespace into account when determining whether a node matches a
9+
certain tag (aroben)
10+
* Replace the varargs tag functions with a tagset bytevector, for a 20-30%
11+
speedup in overall parse time (kevinhendricks, vmg)
12+
* Add MacOS X support to Travis CI, and fix the deployment/DLL issues this
13+
uncovered (nostrademons, kevinhendricks, vmg)
14+
115
Gumbo 0.9.2 (2014-09-21)
216

317
* Performance improvements: Ragel-based char ref decoder and DFA-based UTF8
@@ -9,7 +23,7 @@ Gumbo 0.9.2 (2014-09-21)
923
* Fix duplicate attributes when parsing <isindex> tags.
1024
* Don't leave semicolons behind when consuming entity references (rgrove)
1125
* Internally rename some functions in preparation for an amalgamation file
12-
* (jdeng)
26+
(jdeng)
1327
* Add proper cflags for gyp builds (skabbes)
1428

1529
Gumbo 0.9.1 (2014-08-07)

THANKS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Gumbo HTML parser THANKS file
33
Gumbo was originally written by Jonathan Tang, but many people helped out through suggestions, question-answering, code reviews, bugfixes, and organizational support. Here is a list of these people. Help me keep it complete and exempt of errors.
44

55
Adam Barth
6+
Adam Roben
67
Ben Noordhuis
78
Bowen Han
89
Constantinos Michael
@@ -11,6 +12,7 @@ Geoffrey Sneddon
1112
Ian Hickson
1213
Jack Deng
1314
Jonathan Shneier
15+
Kevin Hendricks
1416
Mason Tang
1517
Maxim Zakharov
1618
Neal Norwitz
@@ -20,3 +22,4 @@ Stefan Haustein
2022
Steffen Meschkat
2123
Steven Kabbes
2224
Thiago Farina
25+
Vicent Marti

setup.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
11
#!/usr/bin/env python
2+
import sys
23
from setuptools import setup
34
from setuptools.command.sdist import sdist
45

6+
_name_of_lib = 'libgumbo.so'
7+
if sys.platform.startswith('darwin'):
8+
_name_of_lib = 'libgumbo.dylib'
9+
elif sys.platform.startswith('win'):
10+
_name_of_lib = 'gumbo.dll'
11+
512
class CustomSdistCommand(sdist):
613
"""Customized Sdist command, to copy libgumbo.so into the Python directory
714
so that it can be installed with `pip install`."""
815
def run(self):
916
try:
1017
import shutil
11-
shutil.copyfile('.libs/libgumbo.so', 'python/gumbo/libgumbo.so')
18+
shutil.copyfile('.libs/' + _name_of_lib,
19+
'python/gumbo/' + _name_of_lib)
1220
sdist.run(self)
1321
except IOError as e:
1422
print(e)
@@ -172,6 +180,6 @@ def run(self):
172180
classifiers=CLASSIFIERS,
173181
packages=['gumbo'],
174182
package_dir={'': 'python'},
175-
package_data={'gumbo': ['libgumbo.so']},
183+
package_data={'gumbo': [_name_of_lib]},
176184
cmdclass={ 'sdist': CustomSdistCommand },
177185
zip_safe=False)

0 commit comments

Comments
 (0)