aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * properly merge pypy coverage with coveragerc pathsPaul Kehrer2016-01-071-0/+1
|/
* Merge pull request #2641 from reaperhulk/fix-2640Alex Gaynor2016-01-062-17/+27
|\ | | | | refactor the init validation of AuthorityKeyIdentifier
| * refactor the init validation of AuthorityKeyIdentifierPaul Kehrer2016-01-052-17/+27
|/ | | | Fixes #2640
* Merge pull request #2638 from reaperhulk/travis-pypyAlex Gaynor2016-01-044-18/+16
|\ | | | | Travis PyPy coverage
| * modify upload_coverage to handle pypy-nocoverage properlyPaul Kehrer2016-01-041-5/+10
| |
| * install me a pypy plzPaul Kehrer2016-01-031-1/+1
| |
| * install the right pypy for pypy-nocov as wellPaul Kehrer2016-01-031-1/+1
| |
| * add missing basepythonPaul Kehrer2016-01-031-0/+1
| |
| * add a pypy-nocoverage target and use that on OS XPaul Kehrer2016-01-033-2/+10
| |
| * Drop pypy3, we don't run it in CI, and we won't run it again until these ↵Alex Gaynor2016-01-032-9/+1
| | | | | | | | issues are resolved
| * Attempt to enable coverage on pypyAlex Gaynor2016-01-032-9/+1
| |
* | Merge pull request #2639 from reaperhulk/readme-renameAlex Gaynor2016-01-041-1/+1
|\ \ | |/ |/| Remove or rename readme
| * readme has been renamed to readme_rendererPaul Kehrer2016-01-041-1/+1
|/
* Merge pull request #2625 from reaperhulk/full-coverageAlex Gaynor2016-01-033-0/+10
|\ | | | | full branch coverage by custom compiling 1.0.0
| * add a py27 for 1.0.0 as wellPaul Kehrer2016-01-031-0/+2
| |
| * run a 1.0.0 test in travis as wellPaul Kehrer2016-01-033-0/+8
| |
* | Merge pull request #2635 from alex/rfc-hashPaul Kehrer2016-01-032-0/+11
|\ \ | |/ |/| Implement __hash__ on RFC822Name
| * Implement __hash__ on RFC822NameAlex Gaynor2016-01-032-0/+11
| |
* | Merge pull request #2636 from alex/uri-hashPaul Kehrer2016-01-032-0/+11
|\ \ | | | | | | Implement __hash__ on UniformResourceIdentifier
| * | Implement __hash__ on UniformResourceIdentifierAlex Gaynor2016-01-032-0/+11
| |/
* | Merge pull request #2633 from reaperhulk/travis-sed-thingAlex Gaynor2016-01-031-0/+5
|\ \ | |/ |/| sed the openssl makefile to change the shlib version
| * more review commentsPaul Kehrer2016-01-031-3/+4
| |
| * match a bit more robustlyPaul Kehrer2016-01-031-3/+3
| |
| * sed the openssl makefile to change the shlib versionPaul Kehrer2016-01-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We do this to prevent a version collision between the custom one we're installing and whatever the system has. OpenSSL 1.0.0 through 1.0.2 all declare an SHLIB version of 1.0.0, so if Python has been linked against 1.0.1 and cryptography against 1.0.0, but then you try to load Python it will consider either 1.0.1 or 1.0.0 to satisfy the library version. This is, of course, nonsense since 1.0.1 has substantially more symbols than 1.0.0. The result is that if you do a LD_LIBRARY_PATH that points at the "real" 1.0.0 then Python will fail to load because there are missing symbols. We can avoid this entire nonsense by changing the major version. The dynamic linker will happily load both versions and nothing will kerplode.
* | Merge pull request #2634 from alex/avoid-legacy-shellPaul Kehrer2016-01-031-1/+1
|\ \ | |/ |/| Backticks are apparently legacy.
| * Backticks are apparently legacy.Alex Gaynor2016-01-031-1/+1
|/ | | | I just do what shellcheck tells me
* Merge pull request #2632 from alex/quotingPaul Kehrer2016-01-032-2/+2
|\ | | | | Quote a few things that shellcheck suggests
| * Quote a few things that shellcheck suggestsAlex Gaynor2016-01-032-2/+2
|/
* Merge pull request #2629 from reaperhulk/travis-refactorAlex Gaynor2016-01-032-24/+24
|\ | | | | refactor travis custom openssl code to work with other versions
| * use -n instead of ! -zPaul Kehrer2016-01-032-2/+2
| |
| * refactor travis custom openssl code to work with other versionsPaul Kehrer2016-01-032-24/+24
| |
* | Merge pull request #2631 from alex/remove-hackPaul Kehrer2016-01-031-6/+0
|\ \ | | | | | | Remove lucid hack, this should our custom OpenSSL compilation
| * | Remove lucid hack, this should our custom OpenSSL compilationAlex Gaynor2016-01-031-6/+0
|/ /
* | Merge pull request #2630 from reaperhulk/travis-update-osxAlex Gaynor2016-01-031-10/+13
|\ \ | | | | | | update osx_image values based on travis supported versions
| * | update osx_image values based on travis supported versionsPaul Kehrer2016-01-021-10/+13
| |/ | | | | | | https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions
* | Merge pull request #2628 from reaperhulk/travis-reduce-osxAlex Gaynor2016-01-031-0/+3
|\ \ | |/ |/| don't test CC on a dynamic link build on OS X travis
| * don't test CC on a dynamic link build on OS X travisPaul Kehrer2016-01-021-0/+3
|/
* Merge pull request #2553 from reaperhulk/098-changeAlex Gaynor2016-01-023-30/+29
|\ | | | | Build our own 0.9.8 on travis
| * be less verbose when untarringPaul Kehrer2016-01-021-1/+1
| |
| * rename 098 directory in CI to 098lPaul Kehrer2016-01-023-11/+11
| |
| * make this 0.9.8l and cryPaul Kehrer2015-12-271-5/+8
| |
| * tree isn't availablePaul Kehrer2015-12-231-1/+0
| |
| * 0.9.8 experiment for travisPaul Kehrer2015-12-233-30/+27
| |
* | Merge pull request #2626 from reaperhulk/dstufft-also-annoyed-by-mentionbotAlex Gaynor2016-01-021-1/+1
|\ \ | | | | | | @dstufft is also annoyed by the mentionbot
| * | @dstufft is also annoyed by the mentionbotPaul Kehrer2016-01-021-1/+1
|/ /
* | Merge pull request #2624 from alex/2016Paul Kehrer2016-01-013-3/+3
|\ \ | | | | | | Bump the copyright year
| * | Bump the copyright yearAlex Gaynor2016-01-013-3/+3
| | |
* | | Merge pull request #2617 from reaperhulk/compiler-mingw-why-notAlex Gaynor2016-01-014-14/+29
|\ \ \ | | | | | | | | don't add the NXCOMPAT and DYNAMICBASE flags if the compiler isn't msvc
| * | | convert other extra_link_args callsPaul Kehrer2016-01-012-6/+4
| | | |
| * | | don't add the NXCOMPAT and DYNAMICBASE flags if the compiler isn't msvcPaul Kehrer2016-01-012-8/+25
| | | |