summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use INDIR_MAX rather than BYTES_MAX in tests since the latter wasn'tfix-ciAdam Hupp2018-09-012-7/+3
| | | | | supported until recently. Also, return .value from the ctypes wrapper so callers aren't required to.
* Merge pull request #179 from cbiedl/masterAdam Hupp2018-09-012-1/+40
|\ | | | | getparam/setparam support #163
| * getparam/setparam support #163Christoph Biedl2018-08-162-1/+40
|/
* Apply change from Corin-EU to allow tests to be run from any directoryAdam Hupp2018-08-161-3/+5
|
* fixes to run.shAdam Hupp2018-08-161-2/+2
|
* Make test runner handle missing python versions, based on a change fromAdam Hupp2018-08-161-4/+11
| | | | Corin-EU
* Merge pull request #178 from sbraz/manifestAdam Hupp2018-08-151-0/+3
|\ | | | | Include the whole test subdirectory in source distributions
| * Include the whole test subdirectory in source distributionsLouis Sautier2018-08-141-0/+3
| |
* | Merge pull request #177 from sbraz/bufferAdam Hupp2018-08-151-11/+14
|\ \ | | | | | | Tests: allow differences when reading a buffer or a file, fixes #173
| * | Tests: allow differences when reading a buffer or a file, fixes #173Louis Sautier2018-08-141-11/+14
| |/ | | | | | | | | Also remove the loop in order to avoid analyzing files or buffers for each expected value, replace it with a call to assertIn().
* | Merge pull request #176 from sbraz/x-gzipAdam Hupp2018-08-141-1/+1
|\ \ | |/ |/| Allow x-gzip as MIME type for gzip files, fixes #96
| * Allow x-gzip as MIME type for gzip files, fixes #96Louis Sautier2018-08-131-1/+1
|/
* Merge pull request #171 from MartinThoma/pypi-docAdam Hupp2018-06-171-4/+11
|\ | | | | Improve project page on PyPI
| * Improve project page on PyPIMartin Thoma2018-06-171-4/+11
|/ | | | See https://pypi.org/project/python-magic/
* add fb noteAdam Hupp2018-04-041-0/+1
|
* Merge pull request #162 from hugovk/update-versionsAdam Hupp2018-03-192-6/+0
|\ | | | | Update Python versions
| * Remove Python 2.6Hugo2018-03-191-2/+0
| |
| * Update classifiersHugo2018-03-191-4/+0
|/
* Merge pull request #158 from gyst/masterAdam Hupp2018-01-284-25/+83
|\ | | | | cleanup
| * Bring "from_file()" under testGuido A.J. Stevens2018-01-251-0/+6
| |
| * Provide tox runnerGuido A.J. Stevens2018-01-252-0/+43
| |
| * PEP8Guido A.J. Stevens2018-01-252-25/+34
|/
* 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
View Lorry Controller Status