Skip to content

Commit 240ba95

Browse files
author
Joshua Li
committed
bump django to 1.10
1 parent 6a5425f commit 240ba95

File tree

2 files changed

+2
-36
lines changed

2 files changed

+2
-36
lines changed

.travis.yml

+1-35
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ env:
3535
- SENTRY_SKIP_BACKEND_VALIDATION=1
3636
- MIGRATIONS_TEST_MIGRATE=0
3737
# Use this to override the django version in the requirements file.
38-
- DJANGO_VERSION=">=1.9,<1.10"
38+
- DJANGO_VERSION=">=1.10,<1.11"
3939
# node's version is pinned by .nvmrc and is autodetected by `nvm install`.
4040
- NODE_DIR="${HOME}/.nvm/versions/node/v$(< .nvmrc)"
4141
- NODE_OPTIONS=--max-old-space-size=4096
@@ -150,18 +150,6 @@ matrix:
150150
name: 'Acceptance'
151151
env: TEST_SUITE=acceptance USE_SNUBA=1
152152

153-
- <<: *postgres_default
154-
name: '[Django 1.10] Backend with migrations [Postgres] (1/2)'
155-
env: DJANGO_VERSION=">=1.10,<1.11" TEST_SUITE=postgres DB=postgres TOTAL_TEST_GROUPS=2 TEST_GROUP=0 MIGRATIONS_TEST_MIGRATE=1
156-
157-
- <<: *postgres_default
158-
name: '[Django 1.10] Backend with migrations [Postgres] (2/2)'
159-
env: DJANGO_VERSION=">=1.10,<1.11" TEST_SUITE=postgres DB=postgres TOTAL_TEST_GROUPS=2 TEST_GROUP=1 MIGRATIONS_TEST_MIGRATE=1
160-
161-
- <<: *acceptance_default
162-
name: '[Django 1.10] Acceptance'
163-
env: DJANGO_VERSION=">=1.10,<1.11" TEST_SUITE=acceptance USE_SNUBA=1 PERCY_ENABLE=0
164-
165153
- <<: *acceptance_default
166154
name: 'Plugins'
167155
env: TEST_SUITE=plugins DB=postgres PERCY_TOKEN=${PLUGIN_PERCY_TOKEN}
@@ -227,28 +215,6 @@ matrix:
227215
before_script:
228216
- psql -c 'create database sentry;' -U postgres
229217

230-
- python: 2.7
231-
name: '[Django 1.10] Snuba Integration with migrations'
232-
env: DJANGO_VERSION=">=1.10,<1.11" TEST_SUITE=snuba USE_SNUBA=1 SENTRY_ZOOKEEPER_HOSTS=localhost:2181 SENTRY_KAFKA_HOSTS=localhost:9092 MIGRATIONS_TEST_MIGRATE=1
233-
services:
234-
- docker
235-
- memcached
236-
- redis-server
237-
- postgresql
238-
before_install:
239-
- *pip_install
240-
- docker run -d --network host --name zookeeper -e ZOOKEEPER_CLIENT_PORT=2181 confluentinc/cp-zookeeper:4.1.0
241-
- docker run -d --network host --name kafka -e KAFKA_ZOOKEEPER_CONNECT=localhost:2181 -e KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://localhost:9092 -e KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 confluentinc/cp-kafka:4.1.0
242-
- docker run -d --network host --name clickhouse-server --ulimit nofile=262144:262144 yandex/clickhouse-server:19.11
243-
- docker run -d --network host --name snuba --env SNUBA_SETTINGS=test --env CLICKHOUSE_SERVER=localhost:9000 getsentry/snuba
244-
- docker ps -a
245-
install:
246-
- python setup.py install_egg_info
247-
- pip install -U -e ".[dev]"
248-
- pip install confluent-kafka
249-
before_script:
250-
- psql -c 'create database sentry;' -U postgres
251-
252218
# Deploy 'storybook' (component & style guide) - allowed to fail
253219
- name: 'Storybook Deploy'
254220
language: node_js

requirements-base.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ datadog>=0.15.0,<0.31.0
1212
django-crispy-forms==1.6.1
1313
django-picklefield>=0.3.0,<1.1.0
1414
django-sudo>=3.0.0,<4.0.0
15-
Django>=1.9,<1.10
15+
Django>=1.10,<1.11
1616
djangorestframework==3.4.7
1717
email-reply-parser>=0.2.0,<0.3.0
1818
enum34>=1.1.6,<1.2.0

0 commit comments

Comments
 (0)