Skip to content

Commit

Permalink
Merge pull request #248 from Scille/drop_py35
Browse files Browse the repository at this point in the history
Drop Python 3.5
  • Loading branch information
lafrech committed Apr 19, 2020
2 parents 6c9345a + 8771894 commit 2b75dcf
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 10 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
language: python
dist: xenial
cache: pip

services:
Expand Down Expand Up @@ -28,9 +27,9 @@ jobs:
include:

- { python: '3.8', env: TOXENV=lint }
- { python: '3.5', env: TOXENV=py35-pymongo }
- { python: '3.5', env: TOXENV=py35-motor1 }
- { python: '3.5', env: TOXENV=py35-txmongo }
- { python: '3.6', env: TOXENV=py36-pymongo }
- { python: '3.6', env: TOXENV=py36-motor1 }
- { python: '3.6', env: TOXENV=py36-txmongo }
- { python: '3.8', env: TOXENV=py38-pymongo }
- { python: '3.8', env: TOXENV=py38-motor2 }
- { python: '3.8', env: TOXENV=py38-txmongo }
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
url='https://github.com/touilleMan/umongo',
packages=['umongo', 'umongo.frameworks'],
include_package_data=True,
python_requires='>=3.5',
python_requires='>=3.6',
install_requires=requirements,
extras_require={
'motor': ['motor>=1.1,<3.0'],
Expand All @@ -45,7 +45,6 @@
'License :: OSI Approved :: MIT License',
'Natural Language :: English',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
Expand Down
4 changes: 1 addition & 3 deletions tests/frameworks/test_motor_asyncio.py
Original file line number Diff line number Diff line change
Expand Up @@ -669,9 +669,7 @@ class Meta:

# Now ask for indexes building
await UniqueIndexChildDoc.ensure_indexes()
indexes = []
async for index in UniqueIndexChildDoc.collection.list_indexes():
indexes.append(index)
indexes = [e async for e in UniqueIndexChildDoc.collection.list_indexes()]
expected_indexes = [
{
'key': {'_id': 1},
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = lint,{py35,py36,py37,py38}-{motor1,motor2,pymongo,txmongo}
envlist = lint,{py36,py37,py38}-{motor1,motor2,pymongo,txmongo}

[testenv]
setenv =
Expand Down

0 comments on commit 2b75dcf

Please sign in to comment.