summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-04-12Merge branch 'master' into feature/BeforeTraversalBert JW Regeer
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 #2475 from stevepiercy/feature/BeforeTraversalBert JW Regeer
update BeforeTraversal event in router.rst
2016-04-11- upgrade `BeforeTraversal` event in router.rstSteve Piercy
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
2016-04-11Merge pull request #2471 from stevepiercy/docs/easy-install-to-pip.2104Steve Piercy
- update narr/project.rst to use pip instead of setup.py
2016-04-11- add trailing line endingSteve Piercy
2016-04-11- update narr/project.rst to use pip instead of setup.pySteve Piercy
- update starter scaffold tests and setup.py (used in `narr/project.rst` and `narr/testing.rst`) - update links to documentation
2016-04-11Merge pull request #2470 from stevepiercy/docs/easy-install-to-pip.2104Steve Piercy
tweak wiki2 test to be more succinct
2016-04-11tweak wiki2 test to be more succinctSteve Piercy
2016-04-11Merge pull request #2466 from stevepiercy/docs/easy-install-to-pip.2104Steve Piercy
update installation.rst to use pip, pyvenv, Python 3.4
2016-04-10Fix whitespaceBert JW Regeer
2016-04-10Add explicit tests for IBeforeTraversal/BeforeTraversalBert JW Regeer
Although the new code was already being covered by other tests, this adds some explicit testing to make sure it all works.
2016-04-10Update router documentationBert JW Regeer