Skip to content

Commit 65ed432

Browse files
eunos-1128eunos-1128
authored
Merge pull request #62 from eunos-1128/master
Bump to Release-1.1.14
2 parents 42a6b4b + d532de5 commit 65ed432

File tree

6 files changed

+38
-133
lines changed

6 files changed

+38
-133
lines changed

‎coot.appdata.xml.patch‎

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

‎deps/flatpak-builder-tools‎

‎deps/pypi-dependencies.json‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,20 @@
33
"buildsystem": "simple",
44
"build-commands": [],
55
"modules": [
6+
{
7+
"name": "python3-markupsafe",
8+
"buildsystem": "simple",
9+
"build-commands": [
10+
"pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"markupsafe\" --no-build-isolation"
11+
],
12+
"sources": [
13+
{
14+
"type": "file",
15+
"url": "https://files.pythonhosted.org/packages/b2/97/5d42485e71dfc078108a86d6de8fa46db44a1a9295e89c5d6d4a06e23a62/markupsafe-3.0.2.tar.gz",
16+
"sha256": "ee55d3edf80167e48ea11a923c7386f4669df67d7994554387f84e7d8b0a2bf0"
17+
}
18+
]
19+
},
620
{
721
"name": "python3-meson-python",
822
"buildsystem": "simple",
@@ -22,36 +36,36 @@
2236
},
2337
{
2438
"type": "file",
25-
"url": "https://files.pythonhosted.org/packages/e8/61/9dd3e68d2b6aa40a5fc678662919be3c3a7bf22cba5a6b4437619b77e156/pyproject_metadata-0.9.0-py3-none-any.whl",
26-
"sha256": "fc862aab066a2e87734333293b0af5845fe8ac6cb69c451a41551001e923be0b"
39+
"url": "https://files.pythonhosted.org/packages/7e/b1/8e63033b259e0a4e40dd1ec4a9fee17718016845048b43a36ec67d62e6fe/pyproject_metadata-0.9.1-py3-none-any.whl",
40+
"sha256": "ee5efde548c3ed9b75a354fc319d5afd25e9585fa918a34f62f904cc731973ad"
2741
}
2842
]
2943
},
3044
{
31-
"name": "python3-numpy",
45+
"name": "python3-nanobind",
3246
"buildsystem": "simple",
3347
"build-commands": [
34-
"pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"numpy==1.26.4\" --no-build-isolation"
48+
"pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"nanobind\" --no-build-isolation"
3549
],
3650
"sources": [
3751
{
3852
"type": "file",
39-
"url": "https://files.pythonhosted.org/packages/65/6e/09db70a523a96d25e115e71cc56a6f9031e7b8cd166c1ac8438307c14058/numpy-1.26.4.tar.gz",
40-
"sha256": "2a02aba9ed12e4ac4eb3ea9421c420301a0c6460d9830d74a9df87efa4912010"
53+
"url": "https://files.pythonhosted.org/packages/8e/9e/dadc3831f40e22c1b3925f07894646ada7906ef5b48db5c5eb2b03ca9faa/nanobind-2.5.0-py3-none-any.whl",
54+
"sha256": "e1e5c816e5d10f0b252d82ba7f769f0f6679f5e043cf406aec3d9e184bf2a60d"
4155
}
4256
]
4357
},
4458
{
45-
"name": "python3-markupsafe",
59+
"name": "python3-numpy",
4660
"buildsystem": "simple",
4761
"build-commands": [
48-
"pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"markupsafe\" --no-build-isolation"
62+
"pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"numpy==1.26.4\" --no-build-isolation"
4963
],
5064
"sources": [
5165
{
5266
"type": "file",
53-
"url": "https://files.pythonhosted.org/packages/b2/97/5d42485e71dfc078108a86d6de8fa46db44a1a9295e89c5d6d4a06e23a62/markupsafe-3.0.2.tar.gz",
54-
"sha256": "ee55d3edf80167e48ea11a923c7386f4669df67d7994554387f84e7d8b0a2bf0"
67+
"url": "https://files.pythonhosted.org/packages/65/6e/09db70a523a96d25e115e71cc56a6f9031e7b8cd166c1ac8438307c14058/numpy-1.26.4.tar.gz",
68+
"sha256": "2a02aba9ed12e4ac4eb3ea9421c420301a0c6460d9830d74a9df87efa4912010"
5569
}
5670
]
5771
}

‎deps/pypi-dependencies.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/env bash
22

3-
./flatpak-builder-tools/pip/flatpak-pip-generator --runtime='org.gnome.Sdk//47' --requirements-file='requirements.txt' --output pypi-dependencies
3+
./flatpak-builder-tools/pip/flatpak-pip-generator --runtime='org.gnome.Sdk//48' --requirements-file='requirements.txt' --output pypi-dependencies

‎deps/requirements.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
meson-python
2-
numpy==1.26.4
31
mako
42
markdown
53
markupsafe
4+
meson-python
5+
nanobind
6+
numpy==1.26.4

‎io.github.pemsley.coot.yaml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
app-id: io.github.pemsley.coot
22
runtime: org.gnome.Platform
3-
runtime-version: "47"
3+
runtime-version: "48" # include python 3.12.9
44
sdk: org.gnome.Sdk
55
command: coot
66
finish-args:
@@ -136,7 +136,7 @@ modules:
136136
sources:
137137
- type: git
138138
url: https://github.com/boostorg/boost.git
139-
tag: boost-1.86.0
139+
tag: boost-1.87.0
140140

141141
- name: libdwarf
142142
buildsystem: autotools
@@ -237,10 +237,13 @@ modules:
237237

238238
- name: gemmi
239239
buildsystem: cmake-ninja
240+
config-opts:
241+
- -DUSE_PYTHON=1
242+
- -DPYTHON_INSTALL_DIR=/app/lib/python3.12/site-packages
240243
sources:
241244
- type: git
242245
url: https://github.com/project-gemmi/gemmi.git
243-
commit: 122048f755839a536c186e519387f7617b76a7bf
246+
commit: b01123ef241cd7f8e03c7ae2e412081032222799
244247

245248
- name: swig
246249
buildsystem: autotools
@@ -281,7 +284,7 @@ modules:
281284
sources:
282285
- type: git
283286
url: https://github.com/rdkit/rdkit
284-
tag: Release_2024_09_4
287+
tag: Release_2024_09_5
285288
- type: archive
286289
url: https://github.com/schrodinger/maeparser/archive/refs/tags/v1.3.1.tar.gz
287290
sha256: a8d80f67d1b9be6e23b9651cb747f4a3200132e7d878a285119c86bf44568e36
@@ -323,6 +326,7 @@ modules:
323326
- --with-backward
324327
- --with-libdw
325328
build-options:
329+
cxxflags: "-g -O1"
326330
env:
327331
GLM_CFLAGS: "-I/app/include"
328332
GLM_LIBS: "-L/app/lib -lglm"
@@ -338,9 +342,7 @@ modules:
338342
sources:
339343
- type: git
340344
url: https://github.com/pemsley/coot.git
341-
tag: Release-1.1.13
342-
- type: patch
343-
path: coot.appdata.xml.patch
345+
tag: Release-1.1.14
344346
- type: archive
345347
url: https://github.com/MonomerLibrary/monomers/archive/refs/tags/ccp4-9.0.006.tar.gz
346348
sha256: 3143b3aba958f370956961f2c78b70acb8e94f840a3aee7beb9f2668253153b4

0 commit comments

Comments
 (0)