Skip to content

Commit 94959d3

Browse files
committed
Resurrect CI
1 parent ad3f851 commit 94959d3

File tree

7 files changed

+21
-22
lines changed

7 files changed

+21
-22
lines changed

Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ENV BROWSER=/browser \
88
PYTHON_TARGET_VERSION="3.11.0-1+jammy1" \
99
PYTHON_VERSION=3.11 \
1010
MKL=2020.4-304 \
11-
LLVM=17
11+
LLVM=21
1212

1313
RUN echo '#!/bin/bash\n\
1414
\n\
@@ -21,8 +21,7 @@ echo\n' > /browser && \
2121
RUN apt-get update && \
2222
apt-get install -y --no-install-suggests --no-install-recommends gnupg gcc ca-certificates wget && \
2323
echo "deb https://apt.repos.intel.com/mkl all main" > /etc/apt/sources.list.d/intel-mkl.list && \
24-
wget -O - https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB | \
25-
apt-key add - && \
24+
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys BAC6F0C353D04109 && \
2625
apt-get update && \
2726
apt-get install -y --no-install-suggests --no-install-recommends intel-mkl-common-c-$MKL intel-mkl-gnu-rt-$MKL intel-mkl-f95-$MKL && \
2827
rm -rf \
@@ -63,7 +62,7 @@ RUN echo 'deb-src http://archive.ubuntu.com/ubuntu/ jammy main restricted' >>/et
6362
echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
6463
locale-gen && \
6564
echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main" >>/etc/apt/sources.list.d/llvm.list && \
66-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
65+
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 15CF4D18AF4F7421 && \
6766
apt-get update && \
6867
apt-get install -y bolt-$LLVM llvm-$LLVM && \
6968
export LLVM_SYMBOLIZER_PATH=/usr/lib/llvm-$LLVM/bin/llvm-symbolizer && \

server/athenian/api/internal/features/github/check_run_metrics_accelerated.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def calculate_interval_intersections(starts: np.ndarray,
9393
cdef void _calculate_interval_intersections(const uint64_t[:] intervals,
9494
const int64_t[:] borders,
9595
char time_offset,
96-
uint64_t[:] intersections) nogil:
96+
uint64_t[:] intersections) noexcept nogil:
9797
cdef:
9898
int64_t i, j, border_index, group_start, group_finish, ii_open, intersections_offset
9999
uint64_t item, index_mask, timestamp, previous_timestamp, delta
@@ -161,7 +161,7 @@ cdef void _mark_check_suite_types(
161161
const int64_t[:] check_suite_sizes,
162162
int64_t[:] type_marks,
163163
mi_heap_destroy_stl_allocator[int64_t] *alloc,
164-
) nogil:
164+
) noexcept nogil:
165165
cdef:
166166
int64_t pos = 0, local_pos, size, previous_name, current_name
167167
size_t j

server/athenian/api/internal/miners/github/dag_accelerated.pyx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ cdef void _recalculate_vertices_and_edges(
435435
uint32_t[:] old_vertex_map,
436436
uint32_t[:] result_vertexes,
437437
uint32_t[:] result_edges,
438-
) nogil:
438+
) noexcept nogil:
439439
cdef:
440440
uint32_t j, left, offset = 0, pos = 0, list_size
441441
uint32_t old_edge_i = 0, new_edge_i = 0, size = len(result_vertexes) - 1, i
@@ -944,7 +944,7 @@ cdef void _toposort(
944944
bool heads_order_is_significant,
945945
int32_t[:] order,
946946
mi_heap_destroy_stl_allocator[char] &alloc,
947-
) nogil:
947+
) noexcept nogil:
948948
"""Topological sort of `heads`. The order is reversed!"""
949949
cdef:
950950
optional[mi_vector[uint32_t]] boilerplate
@@ -1095,7 +1095,7 @@ def mark_dag_parents(
10951095
@cython.wraparound(False)
10961096
cdef void _copy_parents_to_array(const mi_vector[mi_vector[uint32_t]] *parents,
10971097
uint32_t[:] output,
1098-
int64_t[:] splits) nogil:
1098+
int64_t[:] splits) noexcept nogil:
10991099
cdef:
11001100
size_t i, offset = 0
11011101
const mi_vector[uint32_t] *vec
@@ -1205,7 +1205,7 @@ cdef void _extract_first_parents(const uint32_t[:] vertexes,
12051205
const uint32_t[:] edges,
12061206
const uint32_t[:] heads,
12071207
long max_depth,
1208-
char[:] first_parents) nogil:
1208+
char[:] first_parents) noexcept nogil:
12091209
cdef:
12101210
uint32_t head
12111211
long i, depth
@@ -1260,7 +1260,7 @@ cdef void _partition_dag(
12601260
const uint32_t[:] heads,
12611261
char[:] borders,
12621262
mi_heap_destroy_stl_allocator[char] &alloc,
1263-
) nogil:
1263+
) noexcept nogil:
12641264
cdef:
12651265
optional[mi_vector[uint32_t]] boilerplate
12661266
optional[mi_vector[char]] visited_alloc
@@ -1358,7 +1358,7 @@ cdef void _extract_pr_commits(
13581358
const uint32_t[:] pr_merges,
13591359
int8_t[:] left_vertexes_map,
13601360
mi_vector[mi_vector[uint32_t]] &pr_commits,
1361-
) nogil:
1361+
) noexcept nogil:
13621362
cdef:
13631363
long i
13641364
uint32_t first, last, v, j, edge, peek
@@ -1495,7 +1495,7 @@ cdef void _extract_independent_ownership(
14951495
uint32_t[:] left_vertexes,
14961496
uint32_t[:] left_edges,
14971497
mi_vector[mi_vector[uint32_t]] *result,
1498-
) nogil:
1498+
) noexcept nogil:
14991499
cdef:
15001500
int64_t i, p
15011501
uint32_t j, head, parent, count, peek, edge

server/athenian/api/models/sql_builders.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ cdef void _in_any_values_array_int64(
191191
int length,
192192
int alignment,
193193
char *output,
194-
) nogil:
194+
) noexcept nogil:
195195
cdef:
196196
int i, pos = 7, valstart
197197
lldiv_t qr
@@ -625,7 +625,7 @@ cdef void _in_int64(const char *data,
625625
int stride,
626626
int length,
627627
int alignment,
628-
char *output) nogil:
628+
char *output) noexcept nogil:
629629
cdef:
630630
int i, pos = 0, valstart
631631
lldiv_t qr

server/athenian/api/native/mi_heap_destroy_stl_allocator.pxd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ cdef extern from "mi_heap_destroy_stl_allocator.h" nogil:
3535

3636
cdef cppclass mi_vector[T](vector[T]):
3737
mi_vector mi_vector[X](mi_heap_destroy_stl_allocator[X]&) except +
38-
T& emplace_back(...) except +
3938
mi_heap_destroy_stl_allocator[T] get_allocator()
4039

4140
cdef cppclass mi_string(string):
@@ -47,6 +46,7 @@ cdef inline mi_heap_destroy_stl_allocator[char] *mi_heap_allocator_from_capsule(
4746
return <mi_heap_destroy_stl_allocator[char] *> PyCapsule_GetPointer(obj, b"mi_heap_destroy_stl_allocator")
4847

4948

50-
cdef inline void _delete_mi_heap_allocator_in_capsule(obj):
49+
cdef inline void _delete_mi_heap_allocator_in_capsule(obj) noexcept:
5150
cdef mi_heap_destroy_stl_allocator[char] *alloc = mi_heap_allocator_from_capsule(obj)
52-
del alloc
51+
if alloc != NULL:
52+
del alloc

server/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ["setuptools!=60.6.0,!=64.0.0", "wheel", "Cython>=0.29.30", "numpy==1.23.4"]
2+
requires = ["setuptools==75.3.0", "wheel", "Cython==3.0.12", "numpy==1.26.4"]
33

44
[tool.pytest.ini_options]
55
asyncio_mode = "auto"

server/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ morcilla[sqlite,postgresql]==0.5.37
99
psycopg2-binary==2.9.6
1010
xxhash==3.2.0
1111
# remember to change these versions in Dockerfile and pyproject.toml, too!
12-
numpy==1.23.4
12+
numpy==1.26.4
1313
# end of remember to change in Dockerfile
1414
scipy==1.10.1
15-
medvedi==0.1.67
15+
medvedi==0.1.68
1616
pytz==2023.3
1717
sentry-sdk[pure_eval]==1.19.1
1818
prometheus_client==0.14.1
@@ -44,7 +44,7 @@ psutil==5.9.4
4444
flogging==0.0.21
4545
unidecode==1.3.6
4646
pluralizer==1.2.0
47-
pyarrow==11.0.0
47+
pyarrow==14.0.2
4848
email-validator==1.3.1
4949
aiomonitor==0.4.5
5050
gunicorn==20.1.0

0 commit comments

Comments
 (0)