summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* add testdata to sdist0.4.13Adam Hupp2017-03-191-0/+2
|
* Merge pull request #130 from mbeacom/dev-alpineAdam Hupp2017-03-181-1/+2
|\ | | | | Accommodate linux distros that return trailing version, i.e. Alpine
| * Accommodate linux distros that return trailing version, i.e. AlpineMark Beacom2017-02-241-1/+2
| |
* | Merge pull request #125 from askoretskiy/patch-2Adam Hupp2017-03-181-1/+1
|\ \ | |/ |/| Bumped version to 0.4.13 to include bugfixes
| * Bumped version to 0.4.13 to include bugfixesArtem Skoretskiy2016-12-291-1/+1
| | | | | | Bumping version to be ready to push new version to package managers.
* | Merge pull request #127 from MichaelAquilina/python_3.6_supportAdam Hupp2017-01-271-0/+1
|\ \ | | | | | | Add python 3.6 to travis
| * | Add python 3.6 to travisMichael Aquilina2017-01-231-0/+1
|/ /
* | Merge pull request #126 from askoretskiy/patch-1Adam Hupp2017-01-161-1/+1
|\ \ | |/ |/| Fixed type for DLL search on Linux platform
| * Fixed type for DLL search on Linux platformArtem Skoretskiy2017-01-051-1/+1
|/ | | Provide correct list of strings instead of string
* Merge pull request #123 from askoretskiy/patch-1Adam Hupp2016-12-261-1/+3
|\ | | | | Added a fallback for Alpine to find library file
| * Added a fallback for Alpine to find library fileArtem Skoretskiy2016-12-211-1/+3
| | | | | | | | There are some Linuxes that have libraries search broken. This commit would add a reasonable fallback for these systems. Otherwise python-magic does not work there having "magic" library installed and python-magic from Pypi.
* | Update README.mdAdam Hupp2016-12-211-4/+2
|/
* Merge pull request #121 from SergeySatskiy/masterAdam Hupp2016-11-251-1/+1
|\ | | | | Handling 'mime' and 'mime_encoding' independently
| * Handling 'mime' and 'mime_encoding' independentlySergeySatskiy2016-11-221-1/+1
|/
* Merge pull request #120 from pmlandwehr/patch-1Adam Hupp2016-11-211-2/+1
|\ | | | | Added LICENSE to MANIFEST
| * Added LICENSE to MANIFESTPeter M. Landwehr2016-11-071-2/+1
|/ | | I've been putting together a build of python-magic for using [conda](http://conda.pydata.org) for [conda-forge](http://conda-forge.github.io). For license compliance we like to bundle a copy of the original license file in with the build. Doing so requires that the license file be included with the source distribution. Adding this line to MANIFEST.in makes sure that the actual license file gets included with the source code.
* Merge pull request #116 from tltx/patch-1Adam Hupp2016-09-291-0/+3
|\ | | | | Configure package universal wheel distribution
| * Configure package universal wheel distributionTore Lundqvist2016-09-261-0/+3
|/
* bump to 0.4.12Adam Hupp2016-07-041-1/+1
|
* Merge pull request #108 from varnion/patch-1Adam Hupp2016-06-181-0/+2
|\ | | | | add pypi and travis badges
| * add pypi and travis badges!Bruno Souza2016-06-131-1/+2
| | | | | | [ci skip]
| * add pypi badge to READMEBruno Souza2016-06-131-0/+1
|/
* Return str rather than bytes for the description strings on python3.Adam Hupp2016-06-052-8/+13
| | | | | Assumes utf-8 encoding from magic return values, which I hope is always the case.
* propagate exception in other branch of 509 hackAdam Hupp2016-06-052-1/+14
|
* Merge pull request #106 from tgoodyear/patch-1Adam Hupp2016-06-011-2/+3
|\ | | | | Fix typos in README.md
| * Fix typos in README.mdTrevor Goodyear2016-05-311-2/+3
|/ | | Changed `recociled` to `reconciled`. Changed `explictly` to `explicitly`.
* what did 3.2 ever do for youAdam Hupp2016-03-211-1/+0
|
* hopefully fix tests on whatever travisci usesAdam Hupp2016-03-211-9/+18
|
* throw proper exception on each python version0.4.11Adam Hupp2016-03-201-6/+3
|
* bump versioncleanAdam Hupp2016-03-201-1/+1
|
* restore test dirAdam Hupp2016-03-201-1/+1
|
* rename the unicode lambda file to "lambda" and rename it at runtime when ↵Adam Hupp2016-03-202-10/+15
| | | | | | running the test. distutils can't handle unicode filenames at install time.
* Update README.mdAdam Hupp2016-01-161-0/+3
|
* Merge pull request #99 from koobs/patch-1Adam Hupp2016-01-041-1/+2
|\ | | | | Match license= to LICENSE, Add Python 2 to Trove
| * Match license= to LICENSE, Add Python 2 to TroveKubilay Kocak2016-01-021-1/+2
|/ | | | | | * Update the distutils license field to match MIT license as specified in: LICENSE file in repository Trove classifier * Add Python :: 2 to trove classifier to declare explicit (PEP20) 2/3 compatibility
* Merge pull request #95 from Rafiot/travisAdam Hupp2015-11-241-0/+5
|\ | | | | Force use trusty on travis
| * Force use trustyRaphaël Vinot2015-11-241-0/+5
|/
* Merge pull request #93 from vaibhavsagar/patch-1Adam Hupp2015-11-091-0/+1
|\ | | | | Add Python 3 trove classifier.
| * Add Python 3 trove classifier.Vaibhav Sagar2015-11-091-0/+1
|/ | | This is so that tools like https://github.com/brettcannon/caniusepython3 work properly.
* Merge pull request #91 from Rafiot/fix_exceptionAdam Hupp2015-11-061-1/+6
|\ | | | | Fix MagicException
| * Fix MagicExceptionRaphaël Vinot2015-11-061-1/+6
| | | | | | | | self.message was missing, causing `_handle509Bug` to fail.
* | Merge pull request #92 from Rafiot/up_travisAdam Hupp2015-11-064-3/+19
|\ \ | |/ |/| Fix travis config
| * Fix travis configRaphaël Vinot2015-11-064-3/+19
|/ | | | The tests fail on travis ci because the libmagic 5.09 is buggy.
* force GMT so test runs consistentlytz-testfixAdam Hupp2015-11-061-2/+6
|
* bump to 0.4.10, for removal of spurious fileAdam Hupp2015-10-201-1/+1
|
* bump to 0.4.9 with pruning of test/ dirAdam Hupp2015-10-192-1/+2
|
* remove spurious newlinesAdam Hupp2015-10-191-19/+0
|
* update test output for libmagic in debian jessieAdam Hupp2015-10-191-4/+4
|
* Replace per-thread Magic instance with a lock. Tested with a stressAdam Hupp2015-10-191-24/+15
| | | | | | stest that runs a 100 from_file checks on a 100 threads, concurrently. This almost immediately causes a SEVG without the lock, and runs successfully with the lock.
* bump to 0.4.8Adam Hupp2015-10-191-7/+1
|
View Lorry Controller Status