Skip to content

Commit 41e6765

Browse files
authored
GitHub actions (#111)
* migrates to setup.cfg requirements spec * makes minor version, preserves current marshamallow dependency * migrate from circleciand appveyor to github-actions * fix failing test that wanted 'requirements.txt' * fixes help formatting check for python 3.9 * skip failing windows test * update README with new badge
1 parent c7cf8fb commit 41e6765

File tree

16 files changed

+122
-246
lines changed

16 files changed

+122
-246
lines changed

.appveyor.yml

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

.circleci/circle_dist.sh

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

.circleci/circle_master_merge.sh

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

.circleci/config.yml

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

.circleci/increment_version.py

Lines changed: 0 additions & 21 deletions
This file was deleted.
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: ci/github-actions
2+
on:
3+
push:
4+
branches: [dev]
5+
pull_request:
6+
7+
jobs:
8+
argschema:
9+
name: ${{ matrix.python-version }}, ${{ matrix.os }}
10+
runs-on: ${{ matrix.os }}
11+
strategy:
12+
matrix:
13+
os: ["macos-latest", "windows-latest", "ubuntu-latest"]
14+
python-version: ["3.6", "3.7", "3.8", "3.9"]
15+
fail-fast: false
16+
defaults:
17+
run:
18+
shell: bash -l {0}
19+
steps:
20+
- uses: actions/checkout@v2
21+
- uses: conda-incubator/setup-miniconda@v2
22+
with:
23+
auto-update-conda: true
24+
python-version: ${{ matrix.python-version }}
25+
activate-environment: test-env
26+
- name: Install
27+
run: |
28+
conda activate test-env
29+
pip install codecov
30+
pip install .[TESTING]
31+
- name: WindowsInstall
32+
if: ${{ matrix.os == 'windows-latest' }}
33+
run: |
34+
pip install .[WINDOWS]
35+
# need this when migrating from appveyor
36+
conda install pywin32
37+
- name: Test
38+
run: |
39+
python -m pytest --cov argschema --cov-report xml
40+
bash <(curl -s https://codecov.io/bash)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![CircleCI](https://circleci.com/gh/AllenInstitute/argschema/tree/master.svg?style=svg)](https://circleci.com/gh/AllenInstitute/argschema/tree/master)
1+
[![Actions Status](https://github.com/AllenInstitute/argschema/workflows/ci/github-actions/badge.svg)](https://github.com/AllenInstitute/argschema/actions)
22
[![codecov.io](https://codecov.io/github/AllenInstitute/argschema/coverage.svg?branch=master)](https://codecov.io/github/AllenInstitute/argschema?branch=master)
33
[![Documentation Status](https://readthedocs.org/projects/argschema/badge/)](http://argschema.readthedocs.io/en/master/)
44
[![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/argschema/Lobby)

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[build-system]
2+
requires = ["setuptools", "wheel"]
3+
build-backend = "setuptools.build_meta"

requirements.txt

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

setup.cfg

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
[metadata]
2+
name = argschema
3+
version = 1.15.3
4+
description= "a wrapper for setting up modules that can have parameters specified by command line arguments, json_files, or dictionary objects. Providing a common wrapper for data processing modules."
5+
authors = ['Forrest Collman, David Feng']
6+
author_email[email protected]
7+
url = https://github.com/AllenInstitute/argschema
8+
description_file = README.md
9+
10+
[options]
11+
install_requires =
12+
numpy
13+
marshmallow==3.0.0rc6
14+
pyyaml
15+
16+
[options.extras_require]
17+
TESTING =
18+
coverage==4.5.4
19+
mock>=2.0.0
20+
pytest>=3.0.7
21+
pep8>=1.7.0
22+
pytest-cov>=2.2.1
23+
pytest-pep8>=1.0.6
24+
pytest-xdist>=1.14
25+
pylint>=1.5.4
26+
flake8>=3.0.4
27+
rstcheck
28+
sphinx
29+
WINDOWS =
30+
pywin32
31+
132
[tool:pytest]
233
addopts = --cov=argschema --cov-report html --junitxml=test-reports/test.xml
334

@@ -8,8 +39,5 @@ test=pytest
839
ignore = E126,E226
940
max-line-length = 200
1041

11-
[metadata]
12-
description-file = README.md
13-
1442
[bdist_wheel]
1543
universal=1

0 commit comments

Comments
 (0)