Skip to content

Commit 209179f

Browse files
authored
Merge pull request #207 from MoseleyBioinformaticsLab/dev2
Dev2
2 parents 7b10f87 + b9a1fce commit 209179f

51 files changed

Lines changed: 176373 additions & 2106 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/main.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,21 @@ name: build
44

55
on:
66
push:
7-
branches: [ "main" ]
7+
branches:
8+
- main
9+
- dev
810
pull_request:
9-
branches: [ "main" ]
11+
branches:
12+
- main
13+
- dev
1014
workflow_dispatch:
1115

1216
jobs:
1317
build:
1418

1519
strategy:
1620
matrix:
17-
python-version: ["3.8", "3.9", "3.10"]
21+
python-version: ["3.10", "3.11"]
1822
os: [ ubuntu-latest, windows-latest ]
1923
runs-on: ${{matrix.os}}
2024

README.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The complete documentation for our API and CLI including tutorials can be found
1111

1212
Installation
1313
------------
14-
Requires python 3.8 and above.
14+
Requires python 3.10 and above.
1515

1616
Install on Linux, Mac OS X
1717
~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -48,6 +48,7 @@ Note, the ``pip`` command will install dependencies automatically.
4848
docopt
4949
requests
5050
tqdm
51+
jsonschema
5152
5253
Get the source code
5354
-------------------

dev/conftest.py

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,40 @@
1+
# noinspection PyPackageRequirements
12
import pytest as pt
2-
3+
import os
4+
import shutil as sh
35
import kegg_pull.kegg_url as ku
46

57

68
@pt.fixture(autouse=True)
79
def mock_organism_set(mocker, request):
8-
if not 'disable_mock_organism_set' in request.keywords:
10+
if 'disable_mock_organism_set' not in request.keywords:
911
organism_set_mock = {'organism-code', 'organism-T-number'}
12+
mocker.patch.object(ku.AbstractKEGGurl, 'organism_set', organism_set_mock)
13+
14+
15+
@pt.fixture(name='output_file', params=['dir/subdir/file.txt', 'dir/file.txt', './file.txt', 'file.txt'])
16+
def get_output_file(request):
17+
output_file: str = request.param
18+
yield output_file
19+
os.remove(output_file)
20+
sh.rmtree('dir', ignore_errors=True)
21+
22+
23+
@pt.fixture(name='zip_archive_data', params=['file.txt', 'dir/file.txt', '/file.txt', '/dir/file.txt'])
24+
def get_zip_archive_data(request):
25+
zip_file_name: str = request.param
26+
zip_archive_path = 'archive.zip'
27+
yield zip_archive_path, zip_file_name
28+
os.remove(zip_archive_path)
29+
1030

11-
mocker.patch.object(
12-
ku.AbstractKEGGurl, 'organism_set', organism_set_mock
13-
)
31+
@pt.fixture(name='json_file_path', params=[
32+
'dir/subdir/file.json', 'dir/file.json', './file.json', 'file.json', 'archive.zip:file.json', 'archive.zip:dir/file.json'])
33+
def get_json_file_path(request):
34+
json_file_path: str = request.param
35+
yield json_file_path
36+
if '.zip:' in json_file_path:
37+
os.remove('archive.zip')
38+
else:
39+
os.remove(json_file_path)
40+
sh.rmtree('dir', ignore_errors=True)

dev/test.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
source .env/bin/activate || source .env/Scripts/activate # Windows has Scripts instead of bin
2-
32
python3 -m pytest dev --cov --cov-branch --cov-report=term-missing
Lines changed: 141 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -1,140 +1,141 @@
1-
br08901
2-
br08902
3-
br08904
4-
br08906
5-
ko00001
6-
ko00002
7-
ko00003
8-
br08907
9-
ko01000
10-
ko01001
11-
ko01009
12-
ko01002
13-
ko01003
14-
ko01005
15-
ko01011
16-
ko01004
17-
ko01008
18-
ko01006
19-
ko01007
20-
ko00199
21-
ko00194
22-
ko03000
23-
ko03021
24-
ko03019
25-
ko03041
26-
ko03011
27-
ko03009
28-
ko03016
29-
ko03012
30-
ko03110
31-
ko04131
32-
ko04121
33-
ko03051
34-
ko03032
35-
ko03036
36-
ko03400
37-
ko03029
38-
ko02000
39-
ko02044
40-
ko02042
41-
ko02022
42-
ko02035
43-
ko03037
44-
ko04812
45-
ko04147
46-
ko02048
47-
ko04030
48-
ko04050
49-
ko04054
50-
ko03310
51-
ko04040
52-
ko04031
53-
ko04052
54-
ko04515
55-
ko04090
56-
ko01504
57-
ko00535
58-
ko00536
59-
ko00537
60-
ko04091
61-
ko04990
62-
ko03200
63-
ko03210
64-
ko03100
65-
br08001
66-
br08002
67-
br08003
68-
br08005
69-
br08006
70-
br08007
71-
br08009
72-
br08021
73-
br08201
74-
br08202
75-
br08204
76-
br08203
77-
br08303
78-
br08302
79-
br08301
80-
br08313
81-
br08312
82-
br08304
83-
br08305
84-
br08331
85-
br08330
86-
br08332
87-
br08310
88-
br08307
89-
br08327
90-
br08311
91-
br08402
92-
br08401
93-
br08403
94-
br08411
95-
br08410
96-
br08420
97-
br08601
98-
br08610
99-
br08611
100-
br08612
101-
br08613
102-
br08614
103-
br08615
104-
br08620
105-
br08621
106-
br08605
107-
br03220
108-
br03222
109-
br01610
110-
br01611
111-
br01612
112-
br01613
113-
br01601
114-
br01602
115-
br01600
116-
br01620
117-
br01553
118-
br01554
119-
br01556
120-
br01555
121-
br01557
122-
br01800
123-
br01810
124-
br08011
125-
br08020
126-
br08012
127-
br08120
128-
br08319
129-
br08329
130-
br08318
131-
br08328
132-
br08309
133-
br08341
134-
br08324
135-
br08317
136-
br08315
137-
br08314
138-
br08442
139-
br08441
140-
br08431
1+
br:br08901
2+
br:br08902
3+
br:br08904
4+
br:br08906
5+
br:ko00001
6+
br:ko00002
7+
br:ko00003
8+
br:br08907
9+
br:ko01000
10+
br:ko01001
11+
br:ko01009
12+
br:ko01002
13+
br:ko01003
14+
br:ko01005
15+
br:ko01011
16+
br:ko01004
17+
br:ko01008
18+
br:ko01006
19+
br:ko01007
20+
br:ko00199
21+
br:ko00194
22+
br:ko03000
23+
br:ko03021
24+
br:ko03019
25+
br:ko03041
26+
br:ko03011
27+
br:ko03009
28+
br:ko03016
29+
br:ko03012
30+
br:ko03110
31+
br:ko04131
32+
br:ko04121
33+
br:ko03051
34+
br:ko03032
35+
br:ko03036
36+
br:ko03400
37+
br:ko03029
38+
br:ko02000
39+
br:ko02044
40+
br:ko02042
41+
br:ko02022
42+
br:ko02035
43+
br:ko03037
44+
br:ko04812
45+
br:ko04147
46+
br:ko02048
47+
br:ko04030
48+
br:ko04050
49+
br:ko04054
50+
br:ko03310
51+
br:ko04040
52+
br:ko04031
53+
br:ko04052
54+
br:ko04515
55+
br:ko04090
56+
br:ko01504
57+
br:ko00535
58+
br:ko00536
59+
br:ko00537
60+
br:ko04091
61+
br:ko04990
62+
br:ko03200
63+
br:ko03210
64+
br:ko03100
65+
br:br08001
66+
br:br08002
67+
br:br08003
68+
br:br08005
69+
br:br08006
70+
br:br08007
71+
br:br08009
72+
br:br08021
73+
br:br08120
74+
br:br08201
75+
br:br08202
76+
br:br08204
77+
br:br08203
78+
br:br08303
79+
br:br08302
80+
br:br08301
81+
br:br08313
82+
br:br08312
83+
br:br08304
84+
br:br08305
85+
br:br08331
86+
br:br08330
87+
br:br08332
88+
br:br08310
89+
br:br08307
90+
br:br08327
91+
br:br08311
92+
br:br08402
93+
br:br08401
94+
br:br08403
95+
br:br08411
96+
br:br08410
97+
br:br08420
98+
br:br08601
99+
br:br08610
100+
br:br08611
101+
br:br08612
102+
br:br08613
103+
br:br08614
104+
br:br08615
105+
br:br08620
106+
br:br08621
107+
br:br08605
108+
br:br03220
109+
br:br03222
110+
br:br03223
111+
br:br01610
112+
br:br01611
113+
br:br01612
114+
br:br01613
115+
br:br01601
116+
br:br01602
117+
br:br01600
118+
br:br01620
119+
br:br01553
120+
br:br01554
121+
br:br01556
122+
br:br01555
123+
br:br01557
124+
br:br01800
125+
br:br01810
126+
br:br08011
127+
br:br08020
128+
br:br08012
129+
br:br08319
130+
br:br08329
131+
br:br08318
132+
br:br08328
133+
br:br08309
134+
br:br08341
135+
br:br08324
136+
br:br08317
137+
br:br08315
138+
br:br08314
139+
br:br08442
140+
br:br08441
141+
br:br08431

dev/test_data/brite-entries/br_br08902.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ C br08006 Endocrine disrupting compounds
8484
C br08007 Pesticides
8585
C br08009 Natural toxins
8686
C br08021 Glycosides
87+
B Glycans
88+
C br08120 O-antigen
8789
B Reactions
8890
C br08201 Enzymatic reactions
8991
C br08202 IUBMB reaction hierarchy
@@ -132,5 +134,5 @@ B Organism information
132134
C br08605 Plant pathogens
133135
!
134136
#
135-
#Last updated: February 24, 2023
137+
#Last updated: April 4, 2023
136138
#» Japanese version

0 commit comments

Comments
 (0)