xi2annotator 1.0.1__tar.gz → 1.0.3__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: xi2annotator
3
- Version: 1.0.1
3
+ Version: 1.0.3
4
4
  Summary: Mass spectrometry spectrum annotation web service
5
5
  Author: Rappsilber Laboratory
6
6
  License: AGPL-3.0-or-later
@@ -11,15 +11,16 @@ Description-Content-Type: text/markdown
11
11
  License-File: COPYING
12
12
  License-File: COPYING.LESSER
13
13
  Requires-Dist: xicommon<2.0.0,>=1.0.0
14
- Requires-Dist: flask[async]==2.3.3
14
+ Requires-Dist: flask[async]<4,>=3.1.3
15
15
  Requires-Dist: flask-cors
16
16
  Requires-Dist: waitress
17
- Requires-Dist: python-dotenv
17
+ Requires-Dist: python-dotenv>=1.2.2
18
18
  Provides-Extra: dev
19
- Requires-Dist: pytest>=3.6.4; extra == "dev"
19
+ Requires-Dist: pytest<9.1,>=9.0.3; extra == "dev"
20
20
  Requires-Dist: pytest-flask==1.3.0; extra == "dev"
21
21
  Requires-Dist: pytest-cov; extra == "dev"
22
22
  Requires-Dist: pytest-flake8>=1.1.0; extra == "dev"
23
- Requires-Dist: flake8==4.0.1; extra == "dev"
23
+ Requires-Dist: flake8>=6.0.0; extra == "dev"
24
24
  Requires-Dist: build; extra == "dev"
25
+ Requires-Dist: recursive-diff; extra == "dev"
25
26
  Dynamic: license-file
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "xi2annotator"
7
- version = "1.0.1"
7
+ version = "1.0.3"
8
8
  description = "Mass spectrometry spectrum annotation web service"
9
9
  readme = "README.md"
10
10
  requires-python = ">=3.8"
@@ -17,20 +17,21 @@ dependencies = [
17
17
  "xicommon>=1.0.0,<2.0.0",
18
18
 
19
19
  # Web framework
20
- "flask[async]==2.3.3",
20
+ "flask[async]>=3.1.3,<4",
21
21
  "flask-cors",
22
22
  "waitress",
23
- "python-dotenv",
23
+ "python-dotenv>=1.2.2",
24
24
  ]
25
25
 
26
26
  [project.optional-dependencies]
27
27
  dev = [
28
- "pytest>=3.6.4",
28
+ "pytest>=9.0.3,<9.1",
29
29
  "pytest-flask==1.3.0",
30
30
  "pytest-cov",
31
31
  "pytest-flake8>=1.1.0",
32
- "flake8==4.0.1",
32
+ "flake8>=6.0.0",
33
33
  "build",
34
+ "recursive-diff",
34
35
  ]
35
36
 
36
37
  [project.urls]
@@ -16,7 +16,6 @@
16
16
  # USA
17
17
 
18
18
  import traceback
19
- from flask import jsonify
20
19
  from xicommon.config import Crosslinker, Modification, ModificationConfig, Loss, \
21
20
  FragmentationConfig, Config
22
21
  from xicommon.mock_context import MockContext
@@ -338,11 +337,11 @@ def annotate_request(json_request):
338
337
  # ToDo: the version should come from a central place
339
338
  json_request['annotation']['xiVersion'] = const.VERSION
340
339
 
341
- return jsonify(json_request)
340
+ return json_request
342
341
  except Exception as e:
343
342
  debug_value = os.environ.get("XI2ANNOTATOR_DEBUG", "false")
344
343
  if debug_value.lower() != "false" and debug_value != "0":
345
- return jsonify({'error': str(e), "stacktrace": traceback.format_exc()}), 400
344
+ return {'error': str(e), "stacktrace": traceback.format_exc()}, 400
346
345
  raise e
347
346
 
348
347
 
@@ -16,6 +16,7 @@
16
16
  # USA
17
17
 
18
18
  from flask import request
19
+ from flask import jsonify
19
20
  from xi2annotator import bp
20
21
  from xi2annotator.annotation import annotate_request
21
22
 
@@ -27,4 +28,4 @@ def annotate():
27
28
  # get the content of the json request
28
29
  content = request.get_json()
29
30
 
30
- return annotate_request(content)
31
+ return jsonify(annotate_request(content))
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: xi2annotator
3
- Version: 1.0.1
3
+ Version: 1.0.3
4
4
  Summary: Mass spectrometry spectrum annotation web service
5
5
  Author: Rappsilber Laboratory
6
6
  License: AGPL-3.0-or-later
@@ -11,15 +11,16 @@ Description-Content-Type: text/markdown
11
11
  License-File: COPYING
12
12
  License-File: COPYING.LESSER
13
13
  Requires-Dist: xicommon<2.0.0,>=1.0.0
14
- Requires-Dist: flask[async]==2.3.3
14
+ Requires-Dist: flask[async]<4,>=3.1.3
15
15
  Requires-Dist: flask-cors
16
16
  Requires-Dist: waitress
17
- Requires-Dist: python-dotenv
17
+ Requires-Dist: python-dotenv>=1.2.2
18
18
  Provides-Extra: dev
19
- Requires-Dist: pytest>=3.6.4; extra == "dev"
19
+ Requires-Dist: pytest<9.1,>=9.0.3; extra == "dev"
20
20
  Requires-Dist: pytest-flask==1.3.0; extra == "dev"
21
21
  Requires-Dist: pytest-cov; extra == "dev"
22
22
  Requires-Dist: pytest-flake8>=1.1.0; extra == "dev"
23
- Requires-Dist: flake8==4.0.1; extra == "dev"
23
+ Requires-Dist: flake8>=6.0.0; extra == "dev"
24
24
  Requires-Dist: build; extra == "dev"
25
+ Requires-Dist: recursive-diff; extra == "dev"
25
26
  Dynamic: license-file
@@ -1,13 +1,14 @@
1
1
  xicommon<2.0.0,>=1.0.0
2
- flask[async]==2.3.3
2
+ flask[async]<4,>=3.1.3
3
3
  flask-cors
4
4
  waitress
5
- python-dotenv
5
+ python-dotenv>=1.2.2
6
6
 
7
7
  [dev]
8
- pytest>=3.6.4
8
+ pytest<9.1,>=9.0.3
9
9
  pytest-flask==1.3.0
10
10
  pytest-cov
11
11
  pytest-flake8>=1.1.0
12
- flake8==4.0.1
12
+ flake8>=6.0.0
13
13
  build
14
+ recursive-diff
File without changes
File without changes