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

Fix GitHub actions #733

Merged
merged 4 commits into from
Oct 24, 2021
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
27 changes: 14 additions & 13 deletions .github/workflows/pythonpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,25 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [3.5, 3.6, 3.7, 3.8, pypy3]
python-version: [3.5, 3.6, 3.7, 3.8, 3.9, pypy3]
fail-fast: false

steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
- name: Check out repository code
uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python setup.py develop
- name: Style checks
run: |
python -m flakes
- name: Test suite run
run: |
make test
- name: Install isso dependencies
run: python setup.py develop
- name: Install test suite dependencies
run: pip3 install nose
- name: Run test suite
run: make test
env:
PYTHONHASHSEED: random
- name: Install style check dependencies
run: pip3 install flake8
- name: Run style check
run: make flakes
2 changes: 1 addition & 1 deletion isso/dispatch.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from werkzeug.middleware.dispatcher import DispatcherMiddleware
from werkzeug.wrappers import Response

from isso import dist, make_app, wsgi, config
from isso import make_app, wsgi, config

logger = logging.getLogger("isso")

Expand Down
2 changes: 1 addition & 1 deletion isso/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import pkg_resources

from isso import make_app
from isso import dist, config
from isso import config

application = make_app(
config.load(
Expand Down
2 changes: 1 addition & 1 deletion isso/tests/test_guard.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from werkzeug.test import Client
from werkzeug.wrappers import Response

from isso import Isso, config, core, dist
from isso import Isso, config, core
from isso.utils import http

from fixtures import curl, FakeIP
Expand Down
3 changes: 1 addition & 2 deletions isso/tests/test_vote.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@

from __future__ import unicode_literals

import os
import json
import tempfile
import pkg_resources
import unittest

from werkzeug.wrappers import Response

from isso import Isso, core, config, dist
from isso import Isso, core, config
from isso.utils import http

from fixtures import curl, loads, FakeIP, JSONClient
Expand Down
7 changes: 3 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
#!/usr/bin/env python3
# -*- encoding: utf-8 -*-

import sys

from setuptools import setup, find_packages

requires = ['itsdangerous', 'Jinja2', 'misaka>=2.0,<3.0', 'html5lib',
'werkzeug>=1.0', 'bleach', 'Flask-Caching>=1.9']
'werkzeug>=1.0', 'bleach', 'Flask-Caching>=1.9', 'Flask']

setup(
name='isso',
Expand All @@ -29,7 +27,8 @@
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8"
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9"
],
install_requires=requires,
entry_points={
Expand Down