Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Choose a Base Repository
django/django
AndreaCrotti/django
BooBSD/django
Bouke/django
EmployInsight/django
Epictetus/django
GaussCheng/django
Gautier/django
Gildus/django
JannKleen/django
PaulMcMillan/django
Psycojoker/django
SmileyChris/django
Txerrinko/django
aashudwivedi/django
ademaro/django
adrianholovaty/django
afei418/django
aht/django
akaariai/django
allanfreitas/django
allisonmobley/django
andrewgodwin/django
andrewjesaitis/django
andrewsmedina/django
andymckay/django
apollo13/django
ashgadala/django
ashwoods/django-1
atlassian/django
atul-bhouraskar/django
audreyr/django
beanbaginc/django
bennylope/django
bilalahmad1994/django
bmispelon/django
bohyn/django
brad/django
bradbeattie/django
brenosantana/django
brianriley/django
bronsen/django
btubbs/django
carljm/django
charettes/django
chrisdew/django
chrisglass/django
chrishas35/django
claudep/django
crodjer/django
danawoodman/django
danielroseman/django
datajockey/django
davedash/django-1
davideklund/django
dgerzo/django
dhepper/django
digitalpbk/django
dittaeva/django
django-nonrel/django
djworth/django
dkuznetsov/django
douglas/django
dstufft/django
duilio/django
dwatkinsweb/django
econchick/django
edmoody/django
ei-grad/django
ershadul/django
evildmp/django
fabianbuechler/django
fengsi/django
fgo/django
fivejjs/django
freakboy3742/django
gabejackson/django
gabrielhurley/django
gaker/django
geodesign/django
gertjanjansen/django
ghing/django
gilsondev/django
graemeglass/django
grapo/django
gs412/django
httpdss/django
idan/django
ikeikeikeike/django
ivensrocha/django
jakul/django
jandas/django
jarayabozo/django
jarshwah/django
jaylett/django
jdhardy/django
jiangzhonghui/django
jmolmo/django
jphalip/django
jsma/django
judy2k/django
justzx2011/django
karthikabinav/django
kcunning/django
keimlink/django
kennethlove/django
kenthauser/django
kipanshi/django-1
kkszysiu/django
kleinmatic/django
kmikzjh/django
koniiiik/django
ktemo/django
ladyrassilon/django
lenin/django
lightyoruichi/django
loic/django
lqc/django
macro/django
manfre/django
maraujop/django
marcneuwirth/django
martar/django
matheussl/django
matthewwithanm/django
max-arnold/django
metllord/django
mick/django
milin/django
mitar/django
mjtamlyn/django
moorick/django
mortenthansen/django
morty/django
mpaolini/django
msabramo/django
muratcorlu/django
nashadalam/django
natebragg/django
netconstructor/django
netoxico/django
nimbis/django
nmfm/django
ogier/django
oinopion/django
ojii/django
originalgremlin/django1.4
ozgurgunes/django
paulsmith/django
pawan-darda/django
payeldillip/django
peachananr/django
pelme/django
philipkimmey/django-1
pombredanne/django
programmerq/django
ptone/django
pvanderlinden/django
pvl/django
ra21vi/django
rafaduran/django
ramiro/django
rasca/django
revskill/django
ritksm/django
rmboggs/django
robgolding/django
rpedigoni/django
sachingupta006/django
samuraisam/django
saschpe/django
sassman/django
seacoastboy/django
sebastianviera/django
shekharsharma/django
sjaensch/django
skada/django
spookylukey/django
starenka/django
stefanklug/django
stratoukos/django
tarsisazevedo/django
theodesp/django
timgraham/django
tinio/django
tschellenbach/django
tswicegood/django
ulope/django
umazalakain/django
valhallasw/django
vsajip/django
webjunkie/django
willmadison/django
xyzzy32/django
yumike/django
yuvadm/django
zhj12ab/django
zuotian/django
zuzelvp/django
zzp/django
Nothing to show
...
Choose a Head Repository
django/django
AndreaCrotti/django
BooBSD/django
Bouke/django
EmployInsight/django
Epictetus/django
GaussCheng/django
Gautier/django
Gildus/django
JannKleen/django
PaulMcMillan/django
Psycojoker/django
SmileyChris/django
Txerrinko/django
aashudwivedi/django
ademaro/django
adrianholovaty/django
afei418/django
aht/django
akaariai/django
allanfreitas/django
allisonmobley/django
andrewgodwin/django
andrewjesaitis/django
andrewsmedina/django
andymckay/django
apollo13/django
ashgadala/django
ashwoods/django-1
atlassian/django
atul-bhouraskar/django
audreyr/django
beanbaginc/django
bennylope/django
bilalahmad1994/django
bmispelon/django
bohyn/django
brad/django
bradbeattie/django
brenosantana/django
brianriley/django
bronsen/django
btubbs/django
carljm/django
charettes/django
chrisdew/django
chrisglass/django
chrishas35/django
claudep/django
crodjer/django
danawoodman/django
danielroseman/django
datajockey/django
davedash/django-1
davideklund/django
dgerzo/django
dhepper/django
digitalpbk/django
dittaeva/django
django-nonrel/django
djworth/django
dkuznetsov/django
douglas/django
dstufft/django
duilio/django
dwatkinsweb/django
econchick/django
edmoody/django
ei-grad/django
ershadul/django
evildmp/django
fabianbuechler/django
fengsi/django
fgo/django
fivejjs/django
freakboy3742/django
gabejackson/django
gabrielhurley/django
gaker/django
geodesign/django
gertjanjansen/django
ghing/django
gilsondev/django
graemeglass/django
grapo/django
gs412/django
httpdss/django
idan/django
ikeikeikeike/django
ivensrocha/django
jakul/django
jandas/django
jarayabozo/django
jarshwah/django
jaylett/django
jdhardy/django
jiangzhonghui/django
jmolmo/django
jphalip/django
jsma/django
judy2k/django
justzx2011/django
karthikabinav/django
kcunning/django
keimlink/django
kennethlove/django
kenthauser/django
kipanshi/django-1
kkszysiu/django
kleinmatic/django
kmikzjh/django
koniiiik/django
ktemo/django
ladyrassilon/django
lenin/django
lightyoruichi/django
loic/django
lqc/django
macro/django
manfre/django
maraujop/django
marcneuwirth/django
martar/django
matheussl/django
matthewwithanm/django
max-arnold/django
metllord/django
mick/django
milin/django
mitar/django
mjtamlyn/django
moorick/django
mortenthansen/django
morty/django
mpaolini/django
msabramo/django
muratcorlu/django
nashadalam/django
natebragg/django
netconstructor/django
netoxico/django
nimbis/django
nmfm/django
ogier/django
oinopion/django
ojii/django
originalgremlin/django1.4
ozgurgunes/django
paulsmith/django
pawan-darda/django
payeldillip/django
peachananr/django
pelme/django
philipkimmey/django-1
pombredanne/django
programmerq/django
ptone/django
pvanderlinden/django
pvl/django
ra21vi/django
rafaduran/django
ramiro/django
rasca/django
revskill/django
ritksm/django
rmboggs/django
robgolding/django
rpedigoni/django
sachingupta006/django
samuraisam/django
saschpe/django
sassman/django
seacoastboy/django
sebastianviera/django
shekharsharma/django
sjaensch/django
skada/django
spookylukey/django
starenka/django
stefanklug/django
stratoukos/django
tarsisazevedo/django
theodesp/django
timgraham/django
tinio/django
tschellenbach/django
tswicegood/django
ulope/django
umazalakain/django
valhallasw/django
vsajip/django
webjunkie/django
willmadison/django
xyzzy32/django
yumike/django
yuvadm/django
zhj12ab/django
zuotian/django
zuzelvp/django
zzp/django
Nothing to show
Choose a head branch
abstract_overrides
add_filter_fix
add_filter_fix_19
add_relation
add_test_requirements
akaariai_committer
always_process_response
annotate_join_cond
annotate_order_by_values
assertqs_ordering
available_apps_more
backpatch_18
cache_orm_tx
cache_orm
callable_transforms
chain_ops
custom_lookups
custom_refs_19385
dates_expressions
datetime_cast_fix
db_schemas
dedupe_cols
defer_alt
defer_getattr
defer_inheritance_pk
defer_only_interaction
deprecation_subclasses
disjuction_promotion
distance_order_by
django_git_guidelines
dupe_away
exclude_combine
exprs_in_filter
fast_delete
fast_init_and_nonchunked
fast_init_test
fast_init
fast_tests_merged
faster_iterator
field_pickle
final
fix_duration_on_sqlite
fix_oracle
fix_oracle2
fix_proxy_model_inheritance
fix_select_related_perf
fix_singletableinh
fixture_improvement
generic_rel_jax
generic_rel_reverse
generic_rel_target
get_default
get_pk_on_save
group_by_expr
inheritance_custom_pk_m2m
isolated_apps
jarshwah-ticket-23001
jdunck_preinit
join_class
join_reuse_fix
join_trim_improv
liveserver_issue
lookups_3_final
lookups_3
m2m_regress_fix
manager_factory
manager_methods
manual_savepoint_atomic
master
meta_refactor
meta_table_api
model_annotation
model_eq_inherit
model_eq_nopk
model_eq_proxy
model_from_db
model_modified_poc
model_new
model_save_refactor_squash
model_save_refactor
model_state_improvements
move_bilaterals_to_lookups
mssql_test_constraints
mssql_tests_1.8
names_to_path_to_fields
nested_lookups
new_tx
new_10790_rm_trim
new_10790
non_chunked_iter_squashed
non_chunked_reads
nonaggregate-annotations
not_and_having
only_load_bug
oracle_in_fix
oracle_promotion_fix
oracle_py3
oracle_regex_fix
oragisfix
order_join_promotion
ordered_dict_on_need
orm_perf
orm_py3
orm_readme
orm_refactorings
orm_16_release_notes
parallel_isolated_apps
perm_in_perms
pgsql_cached
postgis2
pr_5163
pull_38_fix
pull_67
pull_407
pull_1240
pull_1685_simpler_queries
pull_1685
queryset_to_query_in_filter
refactor_utils_tree
refactor_utils_tree_2
rel_field_get_lookup
rel_fix
rel_manager_tx_fixes
related_rel_removal
remove_rel_usage
reverse_generic_rel
reverse_unique
rm_emptyqs
rm_get_ordered_objects
rm_select_fields
select_cols_cached
select_cols_gis
select_cols
select_on_save
select_on_save_16
simple_build_lookup
simplify_count_query
skip_bcrypt
skip_validation
soc2013/composite-fields
split_exclude_cleanup
splitted_clone
test_auto_settings
test_state_tracking
ticket_901
ticket_3011
ticket_3881
ticket_4102_niwibe
ticket_8467_test
ticket_10790_final
ticket_10790_new
ticket_10790
ticket_11521
ticket_12885
ticket_13781
ticket_14030_alt
ticket_14030
ticket_15915_fix
ticket_15933_alt
ticket_16047
ticket_16187_cherrypick
ticket_16187_new
ticket_16187
ticket_16211_fix
ticket_16211
ticket_16426_new
ticket_16426
ticket_16426_2
ticket_16679
ticket16715_more
ticket16715
ticket_16759
ticket_17485_fix
ticket_17541_for_15
ticket_17541
ticket_17750
ticket_17788_backpatch
ticket_17788
ticket_17886
ticket_17957
ticket_18082
ticket_18163
ticket_18169
ticket_18175
ticket_18248
ticket_18251
ticket_18304
ticket_18305_both
ticket_18305
ticket_18306
ticket_18324
ticket_18347
ticket_18375_alt
ticket_18375_bc
ticket_18375_new
ticket_18375
ticket_18676_fix
ticket_18726
ticket_18748_comb
ticket_18748
ticket_18823
ticket_18843_fix
ticket_18979
ticket_19167
ticket_19197
ticket_19274
ticket_19276
ticket_19326
ticket_19385_squash
ticket_19385
ticket_19385_2_rebased
ticket_19385_2
ticket_19645
ticket_19707_14
ticket_19837
ticket_19964_opt_2
ticket_19964
ticket_20289
ticket_20289_14
ticket_20434
ticket_20528
ticket_20600
ticket_20874
ticket_21126
ticket_21126_15
ticket_21126_16
ticket_21134
ticket_21150
ticket_21160
ticket_21169
ticket_21203
ticket_21428_master
ticket_21428
ticket_21431
ticket_21696
ticket_21748
ticket_21748_16
ticket_21787
ticket_21825
ticket_21863
ticket_21903_16
ticket_21952
ticket_22429
ticket_22994
ticket_23372
ticket_23605
ticket_23622
ticket_23791
ticket_23877
ticket_24090
ticket_24171
ticket_24279
ticket_24605
ticket_24705
ticket_24748
ticket_24752
ticket_24766
ticket_24923
ticket_25307
ticket_26092
ticket_26196_fix
tx_improvements
tx_improvements_2
unicode_label
unicode_label_15
update_cascade
use_resolve_ref
virtual_rel_field
warn_missing_keys
where_as_sql
Nothing to show
Checking mergeability… Don’t worry, you can still create the pull request.
  • 3 commits
  • 1 file changed
  • 0 commit comments
  • 1 contributor
Showing with 17 additions and 4 deletions.
  1. +17 −4 tests/runtests.py
View
@@ -5,6 +5,21 @@
import sys
import tempfile
+def upath(path):
+ """
+ Separate version of django.utils._os.upath. The django.utils version isn't
+ usable here, as upath is needed for RUNTESTS_DIR which is needed for the
+ try-except of import django.
+ """
+ if sys.version_info[0] == 3:
+ fs_encoding = sys.getfilesystemencoding() or sys.getdefaultencoding()
+ return path.decode(fs_encoding)
+ return path
+
+RUNTESTS_DIR = os.path.abspath(os.path.dirname(upath(__file__)))
+sys.path.insert(0, os.path.dirname(RUNTESTS_DIR)) # 'tests/../'
+import django
+
from django import contrib
from django.utils._os import upath
from django.utils import six
@@ -13,7 +28,6 @@
TEST_TEMPLATE_DIR = 'templates'
-RUNTESTS_DIR = os.path.abspath(os.path.dirname(upath(__file__)))
CONTRIB_DIR = os.path.dirname(upath(contrib.__file__))
TEMP_DIR = tempfile.mkdtemp(prefix='django_')
os.environ['DJANGO_TEST_TEMP_DIR'] = TEMP_DIR
@@ -306,10 +320,9 @@ def paired_tests(paired_test, options, test_labels):
options, args = parser.parse_args()
if options.settings:
os.environ['DJANGO_SETTINGS_MODULE'] = options.settings
- elif "DJANGO_SETTINGS_MODULE" not in os.environ:
- parser.error("DJANGO_SETTINGS_MODULE is not set in the environment. "
- "Set it or use --settings.")
else:
+ if "DJANGO_SETTINGS_MODULE" not in os.environ:
+ os.environ['DJANGO_SETTINGS_MODULE'] = 'test_sqlite'
options.settings = os.environ['DJANGO_SETTINGS_MODULE']
if options.liveserver is not None:

No commit comments for this range