summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix libmagic testlibmagic-compatAdam Hupp2018-01-141-1/+5
|
* bump to 0.4.16Adam Hupp2018-01-141-1/+1
|
* various cleanups proposed by debian folksAdam Hupp2018-01-143-5/+9
|
* Merge in compatability mode with libmagicAdam Hupp2018-01-146-12/+424
| | | | | | | | | | | | | The libmagic distribution uses the same package name `magic` as python-magic, but has an incompatible API. This change merges in a copy of libmagic's bindings, wrapped to give deprecation warnings. This is intended to a) mitigate the short-term pain to users and packagers who need to figure out which to use, and b) give us a path to merging the two sets of bindings. I'd be happy for libmagic to take over this package if we could find a path to it.
* add from_open_file to match libmagic binding featuresetAdam Hupp2018-01-142-0/+17
|
* Convert to a package so we can add more filesAdam Hupp2018-01-141-0/+0
|
* commit pypi upload scriptAdam Hupp2017-12-181-0/+3
|
* remove python versions unsupported by xenialAdam Hupp2017-12-101-5/+0
|
* Merge pull request #156 from kobus-v-schoor/patch-1Adam Hupp2017-12-091-2/+2
|\ | | | | Fix typos in README
| * Fix typos in READMEKobus van Schoor2017-12-091-2/+2
| |
* | fix test for xenial since travis started enabling itAdam Hupp2017-12-091-5/+5
|/
* bump to 0.4.15 since I forgot some merges0.4.15Adam Hupp2017-12-031-1/+1
|
* Update README.mdAdam Hupp2017-12-031-0/+4
|
* Update README.mdAdam Hupp2017-12-031-3/+10
|
* Merge pull request #147 from hugovk/patch-2Adam Hupp2017-11-201-4/+3
|\ | | | | Only install coveralls and codecov when needed
| * pip install coverageHugo2017-10-141-0/+1
| |
| * Only install coveralls and codecov when neededHugo2017-10-131-4/+2
| | | | | | No need to download/install for failing builds
* | bump to 0.4.140.4.14Adam Hupp2017-11-201-1/+1
| |
* | Merge pull request #144 from nicfit/masterAdam Hupp2017-11-201-1/+1
|\ \ | | | | | | Handle incorrectly encoded file names
| * | Handle incorrectly encoded files (i.e. does not match file systemTravis Shirk2017-09-261-1/+1
| | | | | | | | | | | | encoding)
* | | Merge pull request #149 from hugovk/fix-ciAdam Hupp2017-11-201-1/+1
|\ \ \ | | | | | | | | Fix the CI
| * | | Revert "update filetype reported by libmagic >=5.23 for keep_going=true"Hugo2017-10-141-1/+1
| | |/ | |/| | | | | | | This reverts commit 9d127ceaab1da0632128422ffd6a2d340bd3e778.
* | | python3 str handlingAdam Hupp2017-11-203-1/+15
| | | | | | | | | | | | | | | | | | | | | In python3 ctypes, a str is passed to ctypes as wchar*. This means the layout of the string magic looks like [ascii, null, ascii, null, etc]. For some reason, magic handles this just fine most of the time, but it's clearly wrong and I'm amazed it worked at all.
* | | Merge pull request #146 from hugovk/patch-1Adam Hupp2017-10-221-0/+7
|\ \ \ | |/ / |/| | Update classifiers
| * | Update classifiersHugo2017-10-131-0/+7
|/ /
* | update travis to use xenial for modern libfileAdam Hupp2017-10-011-1/+1
| |
* | update filetype reported by libmagic >=5.23 for keep_going=trueAdam Hupp2017-10-011-1/+1
| |
* | use my own photo to avoid licensing concernsAdam Hupp2017-10-011-0/+0
|/
* rename magic.pyc to avoid cleaning during build stepAdam Hupp2017-09-142-2/+2
|
* Merge pull request #133 from Disassem/patch-1Adam Hupp2017-06-241-1/+1
|\ | | | | Info about test and new source
| * Info about test and new sourceDisassem2017-05-021-1/+1
|/ | | libmagicwin64 works fine. Add new source of DLLs.
* 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