Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

devops: Update tox and travis scripts. #80

Merged
merged 2 commits into from
Jul 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[run]
include = django_apscheduler/*
omit = *migrations*, *tests*
plugins =
django_coverage_plugin
23 changes: 10 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
dist: xenial

language: python
python: 3.6
python:
- "3.6"
- "3.7"
- "3.8"

install: pip install tox-travis codecov==2.0.5
script: tox
after_success: codecov
deploy:
provider: pypi
user: sallyruthstruik
password:
secure: AO14vBQPpz2UiVZKETQk4D3zjoDzjJjXIRbohnSiQrtPJ9yafF/diLa606McyhZx3mRug3MpJY9dWCTq+0x5ne3NExkOcHC5kz30lIUIK1D2xlHaSteVtT/4hFf0Rz09huTsgOczDzBKww7nDvNCVQ94MLrEs0H0RXt7HZpnVsWZcYDhJovJ4l+3nhas+jjQrhhRUx9ePVvQGjlIJ96UcXYZISlFahodCiLPmoZFyBvdVSwxcJbwnUpsM8NLKnCXy8mzcDRsQCOCS9hsX/H+erErzBoVyrWibJ6KtuZHBcoXLDMV4IBcQgXAUz2RXpSjR3/nb96fAd1tHa5hel6OVyDVsJEQHm682+0Rn89LjXww8eskJEa1TZnOy+r0+zBYKquUo3A0EkYvFIAd/Ucmf3u+KWDlHOGKKXTc2Iu112M78Ih7JgIvw/b0CS7vGd9wOPD6kjLbmZe9JQH0DuCOo5K/J47+ikJnyaAPtJw4MeOggXFZq6QVZIda8vCR1VBP/6lXuBBeF0rZDa4ck+WCkIFIpoXiwYxuQripE9zdUSJsDlb+GTV2XhK7rUIS9u1RhmNSfSV9K+uOpBfOwhTtjJDH96FCQqtiwb+9xLSkuG+5cJnd6slDoVniAGiN9MO/nrJaghSUTbB9GeY1503Tot/xl3lYXUFc3+8rQIQVH0E=
on:
tags: true
Comment on lines -9 to -15
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As per our email, you may want to hang on to this bit.

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, rolled back in e23f5fb.

install:
- pip install tox-travis codecov

script:
- tox -e django-lts, django-latest

notifications:
email: false
after_success: codecov
9 changes: 9 additions & 0 deletions pytest.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[pytest]
python_files = tests.py test_*.py *_tests.py

;https://github.com/bigsassy/pytest-pythonpath#usage
python_paths = tests/

addopts = --ds=tests.settings

norecursedirs = django_apscheduler
4 changes: 0 additions & 4 deletions requirements.txt

This file was deleted.

3 changes: 3 additions & 0 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# General
# ------------------------------------------------------------------------------
APScheduler>=3.2 # https://github.com/agronholm/apscheduler
19 changes: 19 additions & 0 deletions requirements/local.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
-r ./base.txt

# Testing
# ------------------------------------------------------------------------------
tox~=3.17 # https://tox.readthedocs.io/en/latest/#
pytest~=5.4 # https://github.com/pytest-dev/pytest
pytest-sugar~=0.9 # https://github.com/Frozenball/pytest-sugar
pytest-pythonpath~=0.7 # https://github.com/bigsassy/pytest-pythonpath

# Code quality
# ------------------------------------------------------------------------------
flake8~=3.7 # https://github.com/PyCQA/flake8
coverage~=5.0 # https://github.com/nedbat/coveragepy
black~=19.3b # https://github.com/ambv/black

# Django
# ------------------------------------------------------------------------------
django-coverage-plugin~=1.6 # https://github.com/nedbat/django_coverage_plugin
pytest-django~=3.6 # https://github.com/pytest-dev/pytest-django
14 changes: 0 additions & 14 deletions requirements_dev.txt

This file was deleted.

13 changes: 2 additions & 11 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
[flake8]
ignore = E501
max-line-length = 100

[isort]
known_django = django
sections = FUTURE,STDLIB,THIRDPARTY,DJANGO,FIRSTPARTY,LOCALFOLDER
default_section = THIRDPARTY
known_first_party = django_apscheduler
multi_line_output = 3
line_length = 100
indent = 4
ignore = E203, W503 # Don't fight Black on these.
max-line-length = 120
10 changes: 5 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

setup(
name='django-apscheduler',
version='0.3.1',
version='0.4.0',
description='APScheduler for Django',
classifiers=[
"Development Status :: 4 - Beta",
"Environment :: Web Environment",
"Framework :: Django",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
"Programming Language :: Python :: 2.7",
"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",
"Framework :: Django",
],
Expand All @@ -25,8 +25,8 @@
exclude=("tests", )
),
install_requires=[
'django>=1.11',
'apscheduler>=3.2.0',
'django>=2.2',
'apscheduler>=3.2',
],
zip_safe=False
)
File renamed without changes.
15 changes: 6 additions & 9 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
[tox]
envlist = {py36}-{dj1,dj2},{py27-dj1},{py35}-{dj1,dj2},{py36}-{dj2},{py37}-{dj2},{py38}-{dj2}
envlist = {py36,py37,py38}-{django-lts,django-latest}
skipsdist = true

[pytest]
DJANGO_SETTINGS_MODULE=tests.test_settings
DJANGO_SETTINGS_MODULE=tests.settings

[testenv]
deps = pytest
pytest-django
pytest-cov
mock
dj1: Django<2.0.0
dj2: Django==2.*
deps = django-lts: django==2.2.*
django-latest: django
-Ur{toxinidir}/requirements/local.txt

commands =
python setup.py develop
pytest --cov=django_apscheduler
coverage run -m pytest