Граф коммитов

187 Коммитов

Автор SHA1 Сообщение Дата
Paul McLanahan c494144f80 Merge pull request #70 from johngian/django-1.6.11-upgrade
Upgrade Django to 1.6.11
2015-03-23 12:06:10 -04:00
John Giannelos 4591e0f63f Upgrade Django to 1.6.11 2015-03-23 11:26:16 +01:00
Peter Bengtsson 3105e447ee Merge pull request #69 from johngian/upgrade-django-compressor
Upgrade django-compressor to v1.4
2015-01-14 12:56:28 -08:00
John Giannelos d918009db8 Upgrade django-compressor to v1.4 2015-01-14 14:23:05 +02:00
Josh Mize 4a03ab8e81 Merge pull request #68 from pmclanahan/upgrade-django-1.6.10
Upgrade Django to 1.6.10.
2015-01-13 21:33:42 -06:00
Paul McLanahan 0ab0d1b6a1 Upgrade Django to 1.6.10.
This is a move from Django 1.5.9 to 1.6.10. I have done this
on bedrock witout issue. It may still be a bit harsh to just
do this here, but 1.5.x is unsuported and there are now unpatched
security issues in the wild. This should allow playdoh users at least
a slightly easier path forward.

Not that I've also moved Django from being checked into the repo to
a submodule. We had issues in the past when the official Django github
repo changed the hashes of the previous mirror. Things are now stable
on github for Django, so this seemes easier to update for now.
2015-01-13 21:53:30 -05:00
Peter Bengtsson 2a0c7ade84 Merge pull request #67 from pmclanahan/master
Upgrade to latest funfactory
2015-01-08 14:30:24 -08:00
Paul McLanahan 3b867b954e Upgrade to latest funfactory
Included in this update:

* dd118bb Fix test errors
* 3829825 django.core.management.execute_manager is deprecated
2015-01-08 15:44:39 -05:00
Josh Mize d3af53f654 Merge pull request #66 from pmclanahan/update-funfactory-locales
Bug 1101261: Update funfactory to pull in new locale mapping.
2014-11-20 15:21:55 -06:00
Paul McLanahan cc581479bf Bug 1101261: Update funfactory to pull in new locale mapping.
Diff:
d9daf21 Merge pull request #60 from kyoshino/bug-1101261-es-locale
626f878 Add canonical locale mapping for Bug 1101261
2014-11-20 15:39:33 -05:00
Michael Kelly ec29c24cf6 Merge pull request #64 from peterbe/django-159
django 1.5.9
2014-08-21 13:58:58 -04:00
Peter Bengtsson 50b9e05dd1 django 1.5.9 2014-08-21 09:49:28 -07:00
Peter Bengtsson e75bec7a8a django 1.5.8, r=@willkg 2014-05-16 15:40:10 -07:00
Peter Bengtsson 62c8b50c74 django-browserid 0.10.1, r=Osmose 2014-05-08 12:35:20 -07:00
Paul McLanahan 2905bf6ba7 Merge pull request #60 from pmclanahan/upgrade-django-1.5.6
Upgrade Django from 1.5.5 -> 1.5.6.
2014-04-22 15:01:25 -04:00
Paul McLanahan 19c10473f1 Upgrade Django from 1.5.5 -> 1.5.6. 2014-04-21 20:33:56 -04:00
Giorgos Logiotatidis 83cee012ae Merge pull request #59 from peterbe/upgrade-test_utils
upgrade test_utils
2014-01-17 15:22:36 -08:00
Peter Bengtsson 57c1b29a1e upgrade test_utils 2014-01-17 15:12:38 -08:00
Will Kahn-Greene ce500515cb Merge pull request #58 from glogiotatidis/master
Upgrade test-utils to support Django 1.5.
2013-12-10 05:42:05 -08:00
Giorgos Logiotatidis 19e16abbb7 Upgrade test-utils to support Django 1.5.
ffccaed Merge pull request #23 from wraithan/django-1.5
a5f44fa lift code from django-nose to support django 1.5
ce5136a Merge pull request #20 from andymckay/master
139131c add in SQL_RESET_SEQUENCES option
2013-12-10 14:18:05 +02:00
Will Kahn-Greene ee0b8756ec Merge pull request #57 from pmclanahan/upgrade-django-nose
Upgrade django-nose
2013-12-06 13:39:16 -08:00
Paul McLanahan b5273feaa3 Upgrade django-nose
The current version has a conflict with Django 1.5
that causes tests not to run.

Changelog:

4ffb4fa Update the version notes.
41130bb Merge pull request #139 from mgedmin/patch-1
77bf19a Fix ReST error that breaks rendering on PyPI
a9f98c1 release 1.2 with python 3 support
a420186 fixing #123
12ef57a from itertools import product (fixes #130)
51c3d1d don't test django master with python 2.6
d8fa2c0 run Travis tests against Django master
4908503 py3 compat without six (via @jonashaag)
193aa86 Set up simultaneous python 2/3 compatibility.
cff3b1c ci me
c8366ed Fix obscure "'SkipDatabaseCreation' object has no attribute
'_rollback_works'" AttributeError when attempting to run django_nose
tests with REUSE_DB=1 on Django trunk (pre-v1.5)
627d896 add some secret keys
9d5f341 Merge pull request #96 from ramiro/patch-1
7fd0132 Free Django's assertion helpers, like `assert_contains()`, from
their TestCase shackles. Thanks, mjtorn!
a4b426d Depend on a newer nose so assertion helpers aren't no-ops under
python -O.
b28fbc9 Change test reordering link to Django 1.4 docs
66d895e Reset sequences only for tables in the correct DB, when using
multiple DBs.
04839d2 Restore the model cache after mocking, and make a few style
tweaks.
01d094a Improve doc string of runner.BasicNoseRunner.run_tests()
174119c Merge nose-verbosity option.
6adbff2 Fix bad iterated options for nose
c505562 Added nose-verbosity option based on pull request by @mzdaniel
fixes #6
b79291f Merge in Camilo's PEP 8 fixes and unused import removals.
9d9d704 Revert fixture_tables PEP8 fixes.
e133cd4 A couple of final PEP8 tweaks
b6c07c9 PEP8 fixes
1e3fcd8 PEP8 fixes
b142a65 PEP8 fixes
d3f7a45 Removed non required imports
e3942c2 Tweaks some comments.
83869cc Merge pull request #84 from ashchristopher/master
d965816 Fixed typos.
c3d045d Updated README to reflect non-intuitive upgrade path
a08d977 Adding unittests for
NoseTestSuiteRunner._get_models_for_connection.
5747417 Reset sequences only for tables that exists.
5951b88 Forget about advising about REUSE_DB. Tweak some docstring and
code formatting.
a4865e8 Stop suggesting REUSE_DB until we figure out #76.
7076a5a Tiny readme tweaks
4657e1d Put a date on the 1.1 release.
4ec548b Polish docs for 1.1 release. Kinda closes #71.
9b89deb Note REUSE_DB incompatible with unhygienic TransactionTestCases.
Closes #73.
178a8a5 Models defined anywhere that's run at test-loading time now get
their DB tables properly created. Fixes #15.
267b87e Document hygienic TransactionTestCases.
897550c Merge adepue's --liveserver fixes.
6490fb3 Mention the --liveserver fix in README.
6aaab6a Merge the two test-reordering plugins; there can be only one
prepareTest. (I think it should be chainable.)
62b7b49 Bump version to 1.1.
f9d759c Make FastFixtureTestCase and TransactionTestCaseReorderer get
along better.
1fd5da8 Add an always-on plugin that makes sure TransactionTestCases run
last. Fixes #70.
0268292 Add liveserver run attributes to django specific, so they don't
get passed down to nose
274eb8b Note that we don't support Django 1.0. Closes #64.
4463e74 Note some nice things about being able to use nose.
bb25afd Tweak comment formatting.
7df1020 Merge in Roger's SQLAlchemy connection pooling fix. Bump version
to 1.0.1.
c7e2d5d SQLAlchemy fix
40e20ba Fix RST formatting in version history.
f0d033f Remove an invalid trove classifier.
30188c1 Nail down version numbers for dependencies.
291be5a Use same wording in changelog as in readme.
5443b56 Add a few more trove classifiers. Include changelog in distro.
af2ec16 Inner functions? Private module-level functions? Let's decide on
one.
dec6a48 Add runtests.sh to manifest.
798c436 Factor up repetition for always-on plugins.
293d559 Polish up readme and changelog for 1.0 release.
a84a2d4 Merge refactor-all-the-things branch. Postgres, SQLite,
REUSE_DB, and FastFixtureTestCase.
e976b6b Don't prompt the user to pass REUSE_DB when doing so makes no
sense.
84c9e11 Call sql_reset_sequence() if the backend DB supports it.
Special-case MySQL because that backend can't be bothered.
2098c1c Kill a redundant comment and tweak formatting.
1d9e078 typo fix
8da107c Don't crash when using REUSE_DB=1 with in-memory SQLite DBs.
e45e831 fix so Postgres reset sequences will work
d37d2cd Tweak code formatting
833a7a8 remove unnecessary line
d3aea5f Remove dependency on MySQL and add Django v1.2 support for
REUSE_DB.
c944f1d remove dependency on MySQL, add Django v1.2 support for
REUSE_DB=1
46bf5ba Remove the disabled plugin which skipped setting up DBs if we
weren't going to run any DB-needing tests. Refs #41.
9764c3a Don't crash when `-p` is passed at verbosity level 2. Fixes #51.
937cd06 Remove settings_test from changelog. We're not doing that
anymore.
29397e0 Correct some lies in docstrings.
f2e4e25 more Django 1.2 compat fixes
0d8428b Flip an "if" around. No behavior changes.
43687f3 Rewrite FORCE_DB docs to REUSE_DB.
c1adc78 REUSE_DB now actually works.
d492250 fix support for Django v1.2
1f68246 Rip out settings_test support. Invert FORCE_DB flag.
53d7180 fix spelling
d2f8e3b fix copy-paste error
89e892b override Plugin.options() to avoid superclass's options() adding
the --with-* option, which we wouldn't use
a15e155 Force setting self.enabled, since superclass's methods would
override it.
a98b6cd Make Plugin classes inherit from nose.plugins.base.Plugin to
help ensure they implement the api required by nose.
e6423ac Tweak readme.
16f1afb Add myself as maintainer in setup.py.
116971a Rename RunnyNose→BasicNoseRunner, and move settings_test.py
support to the more basic runner.
403b1fe Pull a bunch of functionality out of test-utils. Bump version to
1.0.
6e768b7 Merge branch 'jbalogh-master'
dd860d4 Merge branch 'mjtorn-master'
9ee7fd0 Merge branch 'jbalogh-master' into mjtorn-master
f28092d Base tools on TransactionTestCase
45669b3 Merge branch 'mergetest'
8661f9c Merge branch 'mergetest' into mjtorn-master
7ea7bcf Merge branch 'master' of github.com:mjtorn/django-nose
dbd9344 Merge branch 'jbalogh-master'
b31e4a7 Merge branch 'jbalogh-master' into mergetest
c6529e6 Document assertions
407a130 Function for testing mail count
d628012 assert_mail_count function
25185b1 Merge branch 'master' into mjt-master
19af4b6 Make the heading doc string a bit more descriptive
51fc326 Rename file to tools.py for nose symmetry
068cd01 Docstrings for assert_code() and assert_ok()
fdbd371 Split long assert line
82c0886 Take test methods from Django, fixing their names
e150090 Replace Python asserts with what nose provides us
c41dc00 assert_code and assert_ok
3924e5f assert_template_not_used
77d63e8 assert_template_used
59b7495 assert_form_error
85a17f8 assert_not_contains
937a584 assert_contains
bcb284b assert_redirects function, fix signature Also a potential bug in
Django found and duely circumvented.
5553f2d Prefix for Django
48d5452 Content in Pythonesque functions
eb7d23b Signatures and dummy assertions
2013-12-06 16:25:38 -05:00
Peter Bengtsson 1117eccdf2 Merge pull request #56 from willkg/update-funfactory
Update funfactory to latest master tip
2013-12-05 07:13:48 -08:00
Will Kahn-Greene 6bc7ee1942 Update funfactory to latest master tip
6b797bb Merge pull request #58 from willkg/jingo-monkey
c0e77cc Use jingo.monkey if it exists
2013-12-04 22:53:34 -05:00
Will Kahn-Greene f4936a8888 Update jingo to latest master tip (5e985a5)
5e985a5 Merge pull request #49 from dpoirier/document-templates-from-strings
0a4c203 Document how to use Jingo when template is in a string
883d57e Merge pull request #48 from magopian/tox
debfaf4 use tox
3b64b76 Merge pull request #43 from berkerpeksag/py3-support
b40ccfc Add Python 3 support.
95b30e6 Support showing template source with debug toolbar
6ece259 Use split because we want the left-most part.
736467a Revert "Split template_name into dirname and basename."
962754e Split template_name into dirname and basename.
a7bdc1e Merge pull request #37 from berkerpeksag/readme-update
65f6af9 Fix a typo.
2cf6cb4 Update README.rst.
b51c879 Merge pull request #40 from berkerpeksag/unused-import
071dcf1 Merge pull request #41 from berkerpeksag/fix-deprecated-function
8269c7e Remove unused import "patch".
abee47e django.conf.urls.defaults is deprecated.
5c5df00 Fix field_attrs test.
c619c1e Update travis config with django versions.
e47a4a7 Copyright updates for 2013.
d47b0a1 Update Django version.
f202360 Merge pull request #39 from jerenept/patch-1
deb38c6 Fixed typo in readme.rst
581e275 Merge pull request #38 from berkerpeksag/patch-1
9fe2329 Update the example in the usage section.
15cb6d4 Issue #24 - Add the context_processors app to
jingo.EXCLUDE_APPS.
327dd86 Merge remote-tracking branch 'berkerpeksag/patch-2'
a149eaf Update Django version to 1.5.1.
df1965a Fix note markup.
c2d04ff Merge pull request #33 from mattdennewitz/master
579809b Fixed `render()` syntax example
017fbf8 Merge pull request #32 from nvie/master
2d399ab Document the `csrf()` helper function.
8a6fe63 Version bump, 0.6.1.
1cc3c1e Merge pull request #31 from nvie/master
4f9c745 Remove unused imports.
eb6f8b3 Update README, too.
4cac571 Add support for *inclusion* patterns.
f44931d Bump version to 0.6.
a52b9e8 Better monkeypatch and test.
7810633 Make test_csrf work across Django versions.
33d37b9 Django dropped direct_to_template.
b4d1019 Tests run at all on Django 1.5.
b4e4c26 Version bump to v0.5.
e123911 Ignore more.
7c2b3cf Add Changelog.
c5a95c1 Remove deprecated jingo.render().
19f0533 D'oh.
52b1f57 Remove jingo.views and tests. Fix #2.
6f1de5e Add TravisCI configuration.
4361b9a Include monkeypatch from nuggets. Fix #11.
42321f5 Flake8 cleanup.
6736d3b Clarify docs and add EXCLUDE_APPS default. Fix #22.
f705931 Add override kwarg to register.filter. Fix #20.
2013-12-04 09:26:08 -05:00
Will Kahn-Greene 892ed74012 Update to Django 1.5.5 2013-12-03 16:13:00 -05:00
Peter Bengtsson 2c89fe7ea1 Upgrade bleach to 1.2.2
This updates bleach from 1.1.5 to 1.2.2.

* linkify changed significantly
* delinkify is gone

See the CHANGES file for more details. https://github.com/jsocol/bleach/blob/master/CHANGES
2013-11-06 11:01:15 -08:00
Peter Bengtsson db88c21b06 Django 1.4.10, r=willkg 2013-11-06 10:53:36 -08:00
Will Kahn-Greene 94dcac7bc7 Merge pull request #53 from willkg/remove-schematic-2
Remove schematic submodule
2013-11-04 08:18:54 -08:00
Josh Mize c66e5139f1 Remove schematic submodule
If you're using schematic, you need to:

1. install schematic into vendor-local

2. remove the now unmaintained, unversioned vendor/src/schematic/ directory

3. update the deploy code to use the correct schematic path

4. update your documentation regarding running migrations because
   schematic is in a new place
2013-11-04 10:50:34 -05:00
Will Kahn-Greene 2ad6d1e536 Merge pull request #50 from willkg/sort-vendorpth
Cosmetic: Resort vendor.pth
2013-10-20 19:52:06 -07:00
Will Kahn-Greene 16d21ce3ee Cosmetic: Resort vendor.pth
Having this file sorted makes it easier to compare against other lists.
2013-10-18 11:29:15 -04:00
lonnen 707fdfcf77 updating django-mobility and django-multidb-router 2013-10-11 22:00:03 -04:00
Josh Mize 4d482c3f35 Merge pull request #49 from akatsoulas/update-funfactory
Update funfactory to latest master.
2013-09-30 05:20:02 -07:00
Tasos Katsoulas 730f35db02 Update funfactory to latest master. 2013-09-26 13:36:43 +03:00
Peter Bengtsson 65d7a52550 upgrade to django-browserid 0.9
NOTE! django-browserid has changed a lot since 0.7.
See https://github.com/mozilla/django-browserid/blob/master/CHANGELOG.rst
The significant changes are:

 * SITE_URL is now only needed when DEBUG == False
 * SITE_URL can be a list of strings
 * Default CSS is available for pretty login and logout buttons
 * Replaced `browserid_button` with `browserid_login` and `browserid_logout,
   and made `browserid_info` a function
 * `LOGIN_REDIRECT_URL`, `LOGIN_REDIRECT_URL_FAILURE` and
   `LOGOUT_REDIRECT_URL` can no longer be named views. They have to be
   actual strings to redirect to.
 * Instead of adding `'django_browserid.context_processors.browserid_form'`
   to `TEMPLATE_CONTEXT_PROCESSORS` you need to add
   `'django_browserid.context_processors.browserid'`
   and instead of including `{{ browserid_form.media }}` use
   `{% browserid_js %}` (or `{{ browserid_js() }}` if you use jinja)
 * The JavaScript assumes you have jQuery 1.7 or higher
2013-09-23 08:44:48 -07:00
Paul McLanahan a1def3146e Merge pull request #47 from pmclanahan/update-funfactory
Update funfactory to latest master.
2013-09-16 18:54:07 -07:00
Paul McLanahan 9b22ad9c61 Update funfactory to latest master.
This pulls in:

31bd1b4 Merge pull request #55 from pmclanahan/add-locale-middleware-exemption
7a1472a Add exemption for lang param in locale middleware.
cbf37fd Merge pull request #54 from jgmize/FF_DB_HOST
3c1e4a8 Add support for FF_DB_HOST env variable for tests
2013-09-16 21:47:54 -04:00
Will Kahn-Greene 32967d88be Merge pull request #46 from jgmize/update-django-1.4.8
Update to Django 1.4.8
2013-09-15 08:47:25 -07:00
Josh Mize 9f1cc0cea6 Update to Django 1.4.8 2013-09-15 10:24:41 -05:00
Will Kahn-Greene 39be91eca8 Merge pull request #45 from rlr/update-django-147
Update to Django 1.4.7
2013-09-11 07:13:20 -07:00
Ricky Rosario 8ffcea395e Update to Django 1.4.7 2013-09-11 10:07:03 -04:00
Josh Mize 5c9eeb8475 Update funfactory r=mkelly 2013-09-11 01:23:15 -05:00
Will Kahn-Greene 91561d9231 Update to Django 1.4.6 r=r1cky 2013-08-13 19:06:25 -04:00
Will Kahn-Greene 198b178dc6 Merge pull request #42 from dpoirier/update-tower
Update tower
2013-08-02 08:17:39 -07:00
Dan Poirier e8e6095b46 Update tower
Latest tower includes case-insensitive L10n comments for
translators, and other improvements like a README.

Branch: update-tower
2013-08-01 15:51:34 -04:00
Peter Bengtsson 77d2cc77dc Merge pull request #36 from jsocol/arecibo
Drop django-arecibo.
2013-06-04 13:44:13 -07:00
washort 54be25aab3 Merge pull request #40 from peterbe/upgrade-django-session-csrf
upgrade django-session-csrf for safer keys
2013-05-31 15:45:27 -07:00
Peter Bengtsson 963f25c57e upgrade django-session-csrf for safer keys 2013-05-31 15:37:30 -07:00
Peter Bengtsson ba468e60ac upgrading django-session-csrf to avoid possible MemcachedKeyLengthError, r=Osmose 2013-05-17 08:49:14 -07:00