Skip to content

Commit ce2a34a

Browse files
authored
Merge branch 'master' into develop
2 parents 8517951 + ffeb5de commit ce2a34a

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

.github/workflows/pythonapp.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: Python application
22

3-
on: [push]
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
49

510
jobs:
611
build:
@@ -9,10 +14,12 @@ jobs:
914

1015
steps:
1116
- uses: actions/checkout@v1
17+
1218
- name: Set up Python 3.7
1319
uses: actions/setup-python@v1
1420
with:
1521
python-version: 3.7
22+
1623
- name: Install dependencies
1724
run: |
1825
python -m pip install --upgrade pip
@@ -27,4 +34,6 @@ jobs:
2734
- name: Test with pytest
2835
run: |
2936
pip install pytest
30-
pytest
37+
38+
pytest test.py
39+

swagger/hospitaldemands.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
openapi: 3.0.2
22
info:
33
description: This is Hostpital Demands API
4+
45
version: 0.2.0
6+
57
title: Hostpital Demands API
68
# put the contact info for your development or API team
79
contact:
@@ -96,14 +98,15 @@ paths:
9698
schema:
9799
$ref: 'validations.yaml#/components/schemas/SuspendItem'
98100
description: Hospital Demands item to suspend 取消医院需求item
101+
99102
servers:
100103
- url: 'https://virtserver.swaggerhub.com/wuhan2020/hospitaldemands/0.2.0'
101104
components:
102105
schemas:
103106
HospitalDemandItem:
104107
type: object
105108
required:
106-
- hospital
109+
- hospitDevelopal
107110
- demands
108111
- contact
109112
- releaseDate
@@ -115,6 +118,7 @@ components:
115118
example: d290f1ee-6c54-4b01-90e6-d701748f0851
116119
hospital:
117120
$ref: 'hospitals.yaml#/components/schemas/HospitalItem'
121+
118122
validation:
119123
$ref: 'validations.yaml#/components/schemas/ValidationItem'
120124
releaseDate:

test.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
def test_nothing():
2+
"""Placeholder for Pytest on Github Actions."""
3+
assert True

0 commit comments

Comments
 (0)