Skip to content

Commit

Permalink
Adjust python version pytest-mysql is tested on
Browse files Browse the repository at this point in the history
* Update CI python versions

* python classifiers

* clean up requirements

* adjust circleci
  • Loading branch information
fizyk committed Apr 14, 2020
1 parent ef8d3f0 commit 130c5bb
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version: 2
jobs:
build:
docker:
- image: circleci/python:3.6.8
- image: circleci/python:latest

working_directory: ~/repo

Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
python3 --version
mysqld --version
. venv/bin/activate
py.test -vv -n 0 --showlocals --mysql-user circleci --cov src/pytest_mysql tests
py.test -n 0 --mysql-user circleci --mysql-mysqld /usr/sbin/mysqld -c pytest.ini
- store_artifacts:
path: test-reports
Expand Down
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ dist: xenial
language: python
conditions: v1
python:
- 3.8
- 3.5
- 3.6
- 3.7
- 3.8-dev
- 3.9-dev
- nightly
- pypy3
# blacklist branches
branches:
Expand All @@ -17,14 +19,14 @@ install:
- pip install -e .[tests] coveralls wheel
script:
- mysqld --version
- py.test -n 0 --showlocals --cov pytest_mysql tests
- py.test -n 0
after_success:
- coveralls
jobs:
include:
- stage: xdist
python: 3.7
script: py.test -n 1 --showlocals --cov pytest_mysql tests
script: py.test -n 1
- stage: linters
python: 3.7
install:
Expand Down
5 changes: 5 additions & 0 deletions pytest.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[pytest]
addopts = --max-slave-restart=0 --showlocals --verbose --cov src/pytest_mysql --cov tests
mysql_dbname = pytestmysql
testpaths = tests
xfail_strict = true
2 changes: 1 addition & 1 deletion requirements-lint.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# linters
pycodestyle==2.5.0
pydocstyle==5.0.2
pylint==2.4.4; python_version>'3.3'
pylint==2.4.4
pygments
pyroma==2.6
3 changes: 3 additions & 0 deletions requirements-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ mirakuru==2.2.0; python_version>'3.5'
mirakuru<2.1.0; python_version<='3.5'
mysqlclient==1.4.6 # rq.filter: !=1.4.2.post1
port-for==0.4
pytest-cov==2.7.1
pytest-xdist==1.29.0
mock==3.0.5
12 changes: 5 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ def read(fname):
]

test_requires = [
'pytest-cov==2.7.1',
'pytest-xdist==1.29.0',
'Mock==3.0.5',
'pytest-cov',
'pytest-xdist',
'Mock',
]

extras_require = {
Expand Down Expand Up @@ -73,13 +73,11 @@ def read(fname):
'Natural Language :: English',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Topic :: Software Development :: Libraries :: Python Modules',
],
package_dir={'': 'src'},
Expand Down

0 comments on commit 130c5bb

Please sign in to comment.