summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-04-14We don't use default_match, so remove itBert JW Regeer
2016-04-14Update test to verify the default is text/htmlBert JW Regeer
2016-04-14Make text/html the preferred server returnBert JW Regeer
This matches the original code whereby it would return an HTML page if you sent an Accept header of */*.
2016-04-12For */* case, MIMEAccept picks first server offerBert JW Regeer
This means that to make "text/plain" the default, we need to specifically make it the first thing we offer. For anything else, since the server offers are all weighted equally, the client order should be accepted.
2016-04-12PEP8Bert JW Regeer
2016-04-12We don't need to explicitly set charset for text/*Bert JW Regeer
application/json however doesn't have a charset, so we just specify that as UTF-8 for the purpose of encoding the bytes.
2016-04-12Test that JSON responses are actually JSONBert JW Regeer
We also test out the custom formatter that allows the user to change how the JSON is formatted for the exception.
2016-04-12Add new tests to verify we get what we ask forBert JW Regeer
This simply makes sure we get back the appropriate Content-Type based upon our Accept header.
2016-04-12Update tests to verif Content-Type headerBert JW Regeer
2016-04-12Explicit set Accept header to text/htmlBert JW Regeer
The default is now text/plain, so explicitly set the accept header for what we want to accept.
2016-04-12Use MIMEAccept not AcceptBert JW Regeer
Accept doesn't understand the notation of major/minor masks.
2016-04-12Using WebOb's acceptparse find best mimetype to useBert JW Regeer
We default to text/plain.
2016-04-12Merge pull request #2467 from Pylons/remove.py26Michael Merickel
Remove: py26
2016-04-12Don't force Py2.7 or higherBert JW Regeer
2016-04-12Remove note about -Wd flagBert JW Regeer
Since we no longer support Python 2.6, it becomes a requirement for all our supported Python versions, and thus the note is no longer required.
2016-04-12Update introduction to testingBert JW Regeer
It mentions that we use Jenkins, but our Travis is more open, and used for all commits, so add a reference to Travis as well. Also, remove Python 2.6 reference here.
2016-04-12Replace Python 2.6 with 2.7Bert JW Regeer
2016-04-12Update CHANGES.txtBert JW Regeer
2016-04-12Python 2.7 is the lowest version we supportBert JW Regeer
Remove the trove classifier, and have an hard error on attempting to install Pyramid on 2.6 or lower. Blame @mmerickel for the PEP8 on this commit, pyflake put all kinds of red in my vim window..
2016-04-12Remove Python 2.6 from all testingBert JW Regeer
This removes it from tox/travis
2016-04-12Merge pull request #2468 from Pylons/docs/easy-install-to-pip.2104Michael Merickel
Docs: easy install to pip
2016-04-12Merge pull request #2488 from stevepiercy/docs/easy-install-to-pip.2104Steve Piercy
add changelog entry to CHANGES.txt
2016-04-12- add changelog entry to CHANGES.txtSteve Piercy
2016-04-12Merge pull request #2487 from stevepiercy/docs/easy-install-to-pip.2104Steve Piercy
zap easy_install straggler
2016-04-12- zap easy_install stragglerSteve Piercy
2016-04-12Merge pull request #2486 from stevepiercy/docs/easy-install-to-pip.2104Steve Piercy
add mention of Windows and Python 3.3+ for virtual environments
2016-04-12- add mention of Windows and Python 3.3+ for virtual environmentsSteve Piercy
2016-04-12Merge pull request #2484 from stevepiercy/docs/easy-install-to-pip.2104Steve Piercy
one does not simply "create a virtualenv". one should "create a virtu…
2016-04-12one does not simply "create a virtualenv". one should "create a virtual ↵Steve Piercy
environment". - Fixes #2483
2016-04-12Merge pull request #2482 from stevepiercy/docs/easy-install-to-pip.2104Steve Piercy
one does not simply "create a virtualenv". one should "create a virtu…
2016-04-12one does not simply "create a virtualenv". one should "create a virtual ↵Steve Piercy
environment"
2016-04-12Merge pull request #2481 from stevepiercy/docs/easy-install-to-pip.2104Steve Piercy
update testing.rst
2016-04-12update testing.rstSteve Piercy
- replace nose with py.test - use pip - use literalinclude of MyProject/setup.py instead of copy-pasta
2016-04-12Merge pull request #2480 from stevepiercy/docs/easy-install-to-pip.2104Steve Piercy
quick_tour cleanup; rename testing_extras to tests_require
2016-04-12- use an environment variable and venv. See ↵Steve Piercy
https://github.com/Pylons/pyramid/pull/2468#discussion_r59311019 - rename stanza from `testing_extras` to `tests_require` - switch from nose to pytest
2016-04-12Merge remote-tracking branch 'upstream/docs/easy-install-to-pip.2104' into ↵Steve Piercy
docs/easy-install-to-pip.2104
2016-04-12Merge pull request #2479 from stevepiercy/docs/easy-install-to-pip.2104Steve Piercy
Docs/easy install to pip.2104
2016-04-12Merge remote-tracking branch 'upstream/docs/easy-install-to-pip.2104' into ↵Steve Piercy
docs/easy-install-to-pip.2104
2016-04-12- replace `python -m` with `python3 -m`Steve Piercy
2016-04-12- replace `pyvenv` with `python3 -m venv`Steve Piercy
2016-04-12- removed "now" per ↵Steve Piercy
https://github.com/Pylons/pyramid/pull/2468#discussion_r59310317
2016-04-12Merge pull request #2478 from stevepiercy/docs/easy-install-to-pip.2104Steve Piercy
fix readme in narr/MyProject (used in project.rst and testing.rst)
2016-04-12- fix readme in quick_tour/sqla_demoSteve Piercy
2016-04-12- fix readme in narr/MyProject (used in project.rst and testing.rst)Steve Piercy
2016-04-11fix extras_requires to extras_requireMichael Merickel
2016-04-11Merge branch 'master' into docs/easy-install-to-pip.2104Michael Merickel
2016-04-11remove theme.min.css, it serves no purposeMichael Merickel
2016-04-11fix readme to show directions in both alchemy and zodbMichael Merickel
2016-04-11Merge pull request #2472 from stevepiercy/docs/easy-install-to-pip.2104Steve Piercy
- upgrade setuptools, too, in the two wikis
2016-04-11- upgrade setuptools, too, in the two wikisSteve Piercy