Browse Source

feat: upgrade to Django 1.11 (#16479)

josh 5 years ago
parent
commit
591ae19e25
2 changed files with 2 additions and 36 deletions
  1. 1 35
      .travis.yml
  2. 1 1
      requirements-base.txt

+ 1 - 35
.travis.yml

@@ -34,7 +34,7 @@ env:
     - SENTRY_SKIP_BACKEND_VALIDATION=1
     - MIGRATIONS_TEST_MIGRATE=0
     # Use this to override the django version in the requirements file.
-    - DJANGO_VERSION=">=1.10,<1.11"
+    - DJANGO_VERSION=">=1.11,<1.12"
     # node's version is pinned by .nvmrc and is autodetected by `nvm install`.
     - NODE_DIR="${HOME}/.nvm/versions/node/v$(< .nvmrc)"
     - NODE_OPTIONS=--max-old-space-size=4096
@@ -149,18 +149,6 @@ matrix:
       name: 'Acceptance'
       env: TEST_SUITE=acceptance USE_SNUBA=1
 
-    - <<: *postgres_default
-      name: '[Django 1.11] Backend with migrations [Postgres] (1/2)'
-      env: DJANGO_VERSION=">=1.11,<1.12" TEST_SUITE=postgres DB=postgres TOTAL_TEST_GROUPS=2 TEST_GROUP=0 MIGRATIONS_TEST_MIGRATE=1
-
-    - <<: *postgres_default
-      name: '[Django 1.11] Backend with migrations [Postgres] (2/2)'
-      env: DJANGO_VERSION=">=1.11,<1.12" TEST_SUITE=postgres DB=postgres TOTAL_TEST_GROUPS=2 TEST_GROUP=1 MIGRATIONS_TEST_MIGRATE=1
-
-    - <<: *acceptance_default
-      name: '[Django 1.11] Acceptance'
-      env: DJANGO_VERSION=">=1.11,<1.12" TEST_SUITE=acceptance USE_SNUBA=1 PERCY_ENABLE=0
-
     - <<: *acceptance_default
       name: 'Plugins'
       env: TEST_SUITE=plugins DB=postgres PERCY_TOKEN=${PLUGIN_PERCY_TOKEN}
@@ -226,28 +214,6 @@ matrix:
       before_script:
         - psql -c 'create database sentry;' -U postgres
 
-    - python: 2.7
-      name: '[Django 1.11] Snuba Integration with migrations'
-      env: DJANGO_VERSION=">=1.11,<1.12" TEST_SUITE=snuba USE_SNUBA=1 SENTRY_ZOOKEEPER_HOSTS=localhost:2181 SENTRY_KAFKA_HOSTS=localhost:9092 MIGRATIONS_TEST_MIGRATE=1
-      services:
-        - docker
-        - memcached
-        - redis-server
-        - postgresql
-      before_install:
-        - *pip_install
-        - docker run -d --network host --name zookeeper -e ZOOKEEPER_CLIENT_PORT=2181 confluentinc/cp-zookeeper:4.1.0
-        - 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
-        - docker run -d --network host --name clickhouse-server --ulimit nofile=262144:262144 yandex/clickhouse-server:19.11
-        - docker run -d --network host --name snuba --env SNUBA_SETTINGS=test --env CLICKHOUSE_SERVER=localhost:9000 getsentry/snuba
-        - docker ps -a
-      install:
-        - python setup.py install_egg_info
-        - pip install -U -e ".[dev]"
-        - pip install confluent-kafka
-      before_script:
-        - psql -c 'create database sentry;' -U postgres
-
     # Deploy 'storybook' (component & style guide) - allowed to fail
     - name: 'Storybook Deploy'
       language: node_js

+ 1 - 1
requirements-base.txt

@@ -12,7 +12,7 @@ datadog>=0.15.0,<0.31.0
 django-crispy-forms==1.7.2
 django-picklefield>=0.3.0,<1.1.0
 django-sudo>=3.0.0,<4.0.0
-Django>=1.10,<1.11
+Django>=1.11,<1.12
 djangorestframework==3.6.4
 email-reply-parser>=0.2.0,<0.3.0
 enum34>=1.1.6,<1.2.0 ; python_version < "3.4"