Skip to content

Commit bf74fcc

Browse files
author
fredkingham
committed
Merge branch 'v0.22.2'
2 parents a15cebb + 9dd1a98 commit bf74fcc

File tree

18 files changed

+120
-76
lines changed

18 files changed

+120
-76
lines changed

‎.appveyor.yml

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

‎.github/workflows/ci.yml

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
on: [pull_request]
2+
name: CI
3+
jobs:
4+
# run python/js tests, coveralls and lint
5+
integration-test:
6+
name: python ${{ matrix.python-version }}
7+
runs-on: ${{ matrix.os }}
8+
services:
9+
postgres:
10+
image: postgres:11
11+
env:
12+
POSTGRES_USER: postgres
13+
POSTGRES_PASSWORD: postgres
14+
POSTGRES_DB: ci_db_test
15+
ports:
16+
- 5432:5432
17+
strategy:
18+
fail-fast: false
19+
matrix:
20+
os:
21+
- ubuntu-20.04
22+
python-version:
23+
- 3.6
24+
- 3.7
25+
- 3.8
26+
- 3.9
27+
steps:
28+
- name: Checkout
29+
uses: actions/checkout@v2
30+
- name: Set up Python ${{ matrix.python-version }}
31+
uses: actions/setup-python@v2
32+
with:
33+
python-version: ${{ matrix.python-version }}
34+
- name: Set up ruby for coveralls
35+
uses: actions/setup-ruby@v1
36+
- name: Set up js
37+
uses: actions/setup-node@v1
38+
- name: Install js dependencies
39+
run: npm install [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
40+
- name: Install opal
41+
run: pip install -e .
42+
- name: Install dependencies
43+
run: pip install -r test-requirements.txt
44+
- run: gem install coveralls-lcov
45+
- name: run tests
46+
run: opal test --coverage
47+
- name: flake8
48+
run: flake8
49+
- name: combine coveralls
50+
run: find coverage -name "lcov.info" -exec coveralls-lcov -v -n {} \; > coverage/coverage.json
51+
- run: coveralls --merge=coverage/coverage.json
52+
env:
53+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}"
54+
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
55+
# make sure the python side of things works on windows
56+
other-os-tests:
57+
name: ${{ matrix.os }} python ${{ matrix.python-version }}
58+
runs-on: ${{ matrix.os }}
59+
strategy:
60+
fail-fast: false
61+
matrix:
62+
os:
63+
- windows-latest
64+
python-version:
65+
- 3.9
66+
steps:
67+
- name: Checkout
68+
uses: actions/checkout@v2
69+
- name: Set up Python ${{ matrix.python-version }}
70+
uses: actions/setup-python@v2
71+
with:
72+
python-version: ${{ matrix.python-version }}
73+
- name: Install opal
74+
run: pip install -e .
75+
- name: Install dependencies
76+
run: pip install -r test-requirements.txt
77+
- name: run tests
78+
run: opal test py

‎.travis.yml

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

‎README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
Opal
22
====
33

4-
[![Build Status](https://travis-ci.org/openhealthcare/opal.svg?branch=v0.11.0)](https://travis-ci.org/openhealthcare/opal)
4+
![Build](https://github.com/openhealthcare/opal/workflows/.github/workflows/build.yml/badge.svg)
5+
56
[![Coverage Status](https://coveralls.io/repos/github/openhealthcare/opal/badge.svg?branch=v0.11.0)](https://coveralls.io/github/openhealthcare/opal?branch=v0.11.0)
6-
[![PyPI version](https://badge.fury.io/py/opal.svg)](https://badge.fury.io/py/opal)
77

8+
[![PyPI version](https://badge.fury.io/py/opal.svg)](https://badge.fury.io/py/opal)
89

910
Opal is a full stack web framework that makes building digital tools for health care easy.
1011

‎changelog.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
### 0.22.2 (Minor Release)
2+
3+
#### The future filter now accepts strings
4+
5+
The filter `future` now accepts a string as outputted by the Opal date serialization
6+
e.g. 27/12/2022.
7+
8+
19
### 0.22.1 (Minor Release)
210

311
#### Exclude many to one relationships from the advanced search

‎doc/mkdocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ dev_addr: 0.0.0.0:8965
121121
include_next_prev: false
122122

123123
extra:
124-
version: v0.22.1
124+
version: v0.22.2
125125

126126
markdown_extensions:
127127
- fenced_code

‎opal/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
"""
22
Declare our current version string
33
"""
4-
__version__ = '0.22.1'
4+
__version__ = '0.22.2'

‎opal/core/search/extract.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import logging
1111
import os
1212
import tempfile
13-
import zipfile
1413

1514
from django.template import loader
1615
from django.core.serializers.json import DjangoJSONEncoder
@@ -84,7 +83,9 @@ def get_field_names_to_render(self):
8483

8584
# We should have id, patient_id, episode_id in every subrecord
8685
# CSV, if these fields are present, make them appear first.
87-
id_fields = [f for f in ["id", "patient_id", "episode_id"] if f in result]
86+
id_fields = [
87+
f for f in ["id", "patient_id", "episode_id"] if f in result
88+
]
8889

8990
for f in id_fields:
9091
result.remove(f)

‎opal/core/search/static/js/search/services/patient_summary.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
//
22
// This is the main PatientSummary class for OPAL.
33
//
4-
angular.module('opal.services').factory('PatientSummary', function(UserProfile) {
4+
angular.module('opal.services').factory('PatientSummary', function() {
55
var PatientSummary = function(jsonResponse){
66
var startYear, endYear;
7-
var self = this;
87

98
if(jsonResponse.start_date){
109
startYear= moment(jsonResponse.start_date, 'DD/MM/YYYY').format("YYYY");
@@ -28,9 +27,6 @@ angular.module('opal.services').factory('PatientSummary', function(UserProfile)
2827
this.categories = jsonResponse.categories.join(", ");
2928
this.link = "/#/patient/" + jsonResponse.patient_id;
3029
this.hospitalNumber = jsonResponse.hospital_number;
31-
UserProfile.load().then(function(user_profile){
32-
self.canViewPatientNotes = _.contains(user_profile.roles.default, "micro_haem");
33-
})
3430
};
3531

3632
return PatientSummary;

‎opal/core/search/static/js/test/extract.controller.test.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,6 @@ describe('ExtractCtrl', function(){
424424
{categories: []}
425425
]
426426
});
427-
$httpBackend.expectGET('/api/v0.1/userprofile/').respond({roles: {default: []}});
428427
$scope.criteria[0] = {
429428
combine : "and",
430429
column : "symptoms",

0 commit comments

Comments
 (0)