From 60b981876bd4e364be542941b9fbbffa2f63da2b Mon Sep 17 00:00:00 2001 From: Esmail Date: Fri, 12 Mar 2021 12:25:25 -0500 Subject: [PATCH 1/3] Update .travis.yml --- .travis.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 81d3b0e..3b0262f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ # Config file for automatic testing at travis-ci.org language: python -python: 3.6 +python: 3.8 -dist: trusty +dist: focal branches: only: @@ -35,6 +35,10 @@ matrix: python: 3.6 - env: TOX_ENV=py36-django21-es61 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt python: 3.6 + - env: TOX_ENV=py38-django22-es61 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt + python: 3.8 + + before_install: - pip install pip==9.0.1 @@ -58,4 +62,4 @@ before_script: script: tox -e $TOX_ENV after_success: - - codecov -e $TOX_ENV \ No newline at end of file + - codecov -e $TOX_ENV From baa5aaf9d52c742a0c2fcbf767bd73ed02ac4128 Mon Sep 17 00:00:00 2001 From: Esmail Date: Fri, 12 Mar 2021 12:45:53 -0500 Subject: [PATCH 2/3] Update .travis.yml --- .travis.yml | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3b0262f..a0f7399 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,36 +12,19 @@ branches: services: - postgresql -# by default travis uses postgres 9.2, and django 2.1 dropped support for it -# this enables 9.4 -addons: - postgresql: "9.4" - matrix: include: - - env: TOX_ENV=py35-django110-es60 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt - python: 3.5 - - env: TOX_ENV=py35-django111-es60 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt - python: 3.5 - - env: TOX_ENV=py35-django20-es60 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt - python: 3.5 - - env: TOX_ENV=py35-django21-es60 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt - python: 3.5 - - env: TOX_ENV=py36-django110-es61 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt - python: 3.6 - - env: TOX_ENV=py36-django111-es61 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt - python: 3.6 - - env: TOX_ENV=py36-django20-es61 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt - python: 3.6 - - env: TOX_ENV=py36-django21-es61 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt - python: 3.6 - env: TOX_ENV=py38-django22-es61 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt python: 3.8 + - env: TOX_ENV=py38-django30-es61 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt + python: 3.8 + - env: TOX_ENV=py38-django31-es61 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt + python: 3.8 before_install: - - pip install pip==9.0.1 + - pip install pip==21.0.1 # work around https://github.com/travis-ci/travis-ci/issues/8363 - wget -qO - https://packages.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add - - echo "deb $ES_APT_URL stable main" | sudo tee -a /etc/apt/sources.list.d/elk.list From 4a103d2304ea593a47f54716bedadcce28d27152 Mon Sep 17 00:00:00 2001 From: Esmail Date: Fri, 12 Mar 2021 12:56:41 -0500 Subject: [PATCH 3/3] Test updating `psycopg2` for Python 3.8 support --- requirements/travis.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/travis.txt b/requirements/travis.txt index 6b14eb4..8888897 100644 --- a/requirements/travis.txt +++ b/requirements/travis.txt @@ -11,7 +11,7 @@ coverage==4.5.2 # via codecov filelock==3.0.10 # via tox idna==2.7 # via requests pluggy==0.8.0 # via tox -psycopg2==2.7.6.1 +psycopg2>=2.8.4 py==1.7.0 # via tox requests==2.20.1 # via codecov six==1.11.0 # via tox