Skip to content

Commit

Permalink
Merge pull request #491 from micromoses/fix_gh_actions_and_mp_utest
Browse files Browse the repository at this point in the history
Fix gh actions and mp utest
  • Loading branch information
boxed authored Feb 17, 2023
2 parents 4eb611a + 569d211 commit e7d48d6
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 11 deletions.
20 changes: 11 additions & 9 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@master

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4

- name: Install tox
run: pip install tox
Expand All @@ -22,23 +22,25 @@ jobs:
run: pip install python-dateutil && tox -e mypy

tests:
name: Python ${{ matrix.python-version }}
name: Python ${{ matrix.implementation }}${{ matrix.python-version }}
runs-on: ubuntu-latest
strategy:
matrix:
python-version:
- 3.7
- 3.8
- 3.9
- pypy3
- '3.7'
- '3.8'
- '3.9'
implementation:
- '' # CPython
- 'pypy' # PyPy

steps:
- uses: actions/checkout@master

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
- name: Set up Python ${{ matrix.implementation }}${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
python-version: ${{ matrix.implementation }}${{ matrix.python-version }}

- name: Install tox
run: pip install tox
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ classifiers =

[options]
packages = freezegun
python_requires = >=3.6
python_requires = >=3.7
install_requires =
python-dateutil >= 2.7
include_package_data = true
1 change: 1 addition & 0 deletions tests/test_configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ def test_extend_default_ignore_list():
'django.utils.six.moves',
'google.gax',
'threading',
'multiprocessing',
'Queue',
'selenium',
'_pytest.terminal.',
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# and then run "tox" from this directory.

[tox]
envlist = py36, py37, py38, py39, pypy3, mypy
envlist = py37, py38, py39, pypy3, mypy

[testenv]
commands = pytest --cov {posargs}
Expand Down

0 comments on commit e7d48d6

Please sign in to comment.