Skip to content

Commit 76145ef

Browse files
committed
Merge branch 'develop' into doc
2 parents 2ad740b + e96cc5c commit 76145ef

File tree

6 files changed

+43
-21
lines changed

6 files changed

+43
-21
lines changed
File renamed without changes.

.github/workflows/run-tests.yaml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Run Test
2+
on: [push, pull_request]
3+
jobs:
4+
Test:
5+
runs-on: ${{ matrix.os }}
6+
strategy:
7+
matrix:
8+
python-version:
9+
- '2.7'
10+
- '3.5'
11+
- '3.6'
12+
- '3.7'
13+
- '3.8'
14+
- '3.9'
15+
- '3.10'
16+
os: [ubuntu-latest]
17+
steps:
18+
- name: Check out repository code
19+
uses: actions/checkout@v2
20+
with:
21+
fetch-depth: 0
22+
- name: Set up Python ${{ matrix.python-version }}
23+
uses: actions/setup-python@v2
24+
with:
25+
python-version: ${{ matrix.python-version }}
26+
- name: Install dependencies
27+
run: |
28+
pip install -r .github/requirements.txt
29+
- name: Build
30+
run: |
31+
python setup.py build
32+
- name: Test with pytest
33+
run: |
34+
export PYTHONPATH=$(pwd)/build/lib
35+
python -m pytest

.travis.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

README.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
|travis| |rtd| |pypi|
2-
3-
.. |travis| image:: https://img.shields.io/travis/com/RKrahl/pytest-dependency
4-
:target: https://travis-ci.com/RKrahl/pytest-dependency
5-
:alt: Travis build status
1+
|gh-test| |rtd| |pypi|
62

3+
.. |gh-test| image:: https://github.com/RKrahl/pytest-dependency/actions/workflows/run-tests.yaml/badge.svg
4+
:target: https://github.com/RKrahl/pytest-dependency/actions/workflows/run-tests.yaml
5+
:alt: GitHub Workflow Status
6+
77
.. |rtd| image:: https://img.shields.io/readthedocs/pytest-dependency/latest
88
:target: https://pytest-dependency.readthedocs.io/en/latest/
99
:alt: Documentation build status

setup.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class copy_file_mixin:
3939
does some substitutions on the fly into distutils command class
4040
hierarchy.
4141
"""
42-
Subst_srcs = {"pytest_dependency.py"}
42+
Subst_srcs = {"src/pytest_dependency.py"}
4343
Subst = {'DOC': doc_string, 'VERSION': version}
4444
def copy_file(self, infile, outfile, preserve_mode=1, preserve_times=1,
4545
link=None, level=1):
@@ -90,6 +90,7 @@ class sdist(copy_file_mixin, distutils.command.sdist.sdist):
9090
'Documentation': 'https://pytest-dependency.readthedocs.io/',
9191
'Source Code': 'https://github.com/RKrahl/pytest-dependency',
9292
},
93+
package_dir = {'': 'src'},
9394
py_modules=['pytest_dependency'],
9495
install_requires=['pytest >= 3.7.0'],
9596
classifiers=[
@@ -107,6 +108,7 @@ class sdist(copy_file_mixin, distutils.command.sdist.sdist):
107108
'Programming Language :: Python :: 3.7',
108109
'Programming Language :: Python :: 3.8',
109110
'Programming Language :: Python :: 3.9',
111+
'Programming Language :: Python :: 3.10',
110112
'Operating System :: OS Independent',
111113
'License :: OSI Approved :: Apache Software License',
112114
],
File renamed without changes.

0 commit comments

Comments
 (0)