Skip to content

Commit 7ee40f3

Browse files
montanalowMontana Low
montanalow
and
Montana Low
authored
Update all dependencies (#1668)
Co-authored-by: Montana Low <montanalow@gmail.com>
1 parent 61cc285 commit 7ee40f3

File tree

34 files changed

+1249
-934
lines changed

34 files changed

+1249
-934
lines changed

‎.github/workflows/ci.yml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ jobs:
1010
working-directory: pgml-extension
1111
steps:
1212
- uses: actions/checkout@v4
13-
with:
14-
submodules: 'recursive'
1513
- name: Fetch master
1614
run: |
1715
git fetch origin master --depth 1
@@ -45,7 +43,7 @@ jobs:
4543
~/.cargo
4644
pgml-extension/target
4745
~/.pgrx
48-
key: ${{ runner.os }}-rust-1.74-${{ hashFiles('pgml-extension/Cargo.lock') }}-bust2
46+
key: ${{ runner.os }}-rust-1.74-${{ hashFiles('pgml-extension/Cargo.lock') }}-bust3
4947
- name: Install pgrx
5048
if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0'
5149
run: |
@@ -55,17 +53,8 @@ jobs:
5553
5654
if [[ ! -d ~/.pgrx ]]; then
5755
cargo pgrx init
58-
echo "shared_preload_libraries = 'pgml'" >> ~/.pgrx/data-16/postgresql.conf
56+
echo "shared_preload_libraries = 'pgml'" >> ~/.pgrx/data-17/postgresql.conf
5957
fi
60-
- name: Update extension test
61-
if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0'
62-
run: |
63-
git checkout origin/master
64-
echo "\q" | cargo pgrx run
65-
psql -p 28816 -h localhost -d pgml -P pager -c "DROP EXTENSION IF EXISTS pgml CASCADE; DROP SCHEMA IF EXISTS pgml CASCADE; CREATE EXTENSION pgml;"
66-
git checkout $GITHUB_SHA
67-
echo "\q" | cargo pgrx run
68-
psql -p 28816 -h localhost -d pgml -P pager -c "ALTER EXTENSION pgml UPDATE;"
6958
- name: Unit tests
7059
if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0'
7160
run: |
@@ -74,4 +63,4 @@ jobs:
7463
if: steps.pgml_extension_changed.outputs.PGML_EXTENSION_CHANGED_FILES != '0'
7564
run: |
7665
echo "\q" | cargo pgrx run
77-
psql -p 28816 -h 127.0.0.1 -d pgml -P pager -f tests/test.sql
66+
psql -p 28817 -h 127.0.0.1 -d pgml -P pager -f tests/test.sql

‎.github/workflows/ubuntu-packages-and-docker-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55
inputs:
66
packageVersion:
7-
default: "2.9.3"
7+
default: "2.10.0"
88
jobs:
99
#
1010
# PostgresML extension.

‎.gitmodules

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

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ docker run \
8282
-v postgresml_data:/var/lib/postgresql \
8383
-p 5433:5432 \
8484
-p 8000:8000 \
85-
ghcr.io/postgresml/postgresml:2.7.12 \
85+
ghcr.io/postgresml/postgresml:2.10.0 \
8686
sudo -u postgresml psql -d postgresml
8787
```
8888

‎packages/postgresml-dashboard/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dir="/tmp/postgresml-dashboard"
55
deb_dir="$dir/deb-build"
66
source_dir="$dir/source"
77
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
8-
export PACKAGE_VERSION=${1:-"2.7.12"}
8+
export PACKAGE_VERSION=${1:-"2.10.0"}
99
export GITHUB_STARS=$(curl -s "https://api.github.com/repos/postgresml/postgresml" | grep stargazers_count | cut -d : -f 2 | tr -d " " | tr -d ",")
1010
if [[ $(arch) == "x86_64" ]]; then
1111
export ARCH=amd64

‎packages/postgresml-dashboard/release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
55
package_version="$1"
66

77
if [[ -z "$package_version" ]]; then
8-
echo "Usage: $0 <package version, e.g. 2.7.12>"
8+
echo "Usage: $0 <package version, e.g. 2.10.0>"
99
exit 1
1010
fi
1111

‎packages/postgresml-python/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
77
deb_dir="/tmp/postgresml-python/deb-build"
88
major=${1:-"14"}
99

10-
export PACKAGE_VERSION=${1:-"2.7.12"}
10+
export PACKAGE_VERSION=${1:-"2.10.0"}
1111
export PYTHON_VERSION=${2:-"3.10"}
1212

1313
if [[ $(arch) == "x86_64" ]]; then

‎packages/postgresml-python/release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fi
1212

1313
if [[ -z "$package_version" ]]; then
1414
echo "postgresml-python package build and release script"
15-
echo "usage: $0 <package version, e.g. 2.7.12>"
15+
echo "usage: $0 <package version, e.g. 2.10.0>"
1616
exit 1
1717
fi
1818

‎packages/postgresml/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ set -e
33

44
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
55

6-
export PACKAGE_VERSION=${1:-"2.7.12"}
6+
export PACKAGE_VERSION=${1:-"2.10.0"}
77
export PGVERSION=${2:-"14"}
8+
export UBUNTU_VERSION=${3:-"24.04"}
89

910
deb_dir="/tmp/postgresml/deb-build"
1011

@@ -26,5 +27,4 @@ dpkg-deb \
2627
--root-owner-group \
2728
-z1 \
2829
--build "$deb_dir" \
29-
postgresml-${PGVERSION}-${PACKAGE_VERSION}-ubuntu22.04-all.deb
30-
30+
postgresml-${PGVERSION}-${PACKAGE_VERSION}-ubuntu${UBUNTU_VERSION}-all.deb

‎packages/postgresml/release.sh

Lines changed: 40 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,52 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
55
package_version="$1"
66

77
if [[ -z "$package_version" ]]; then
8-
echo "postgresml package build and release script"
9-
echo "usage: $0 <package version, e.g. 2.7.12>"
10-
exit 1
8+
echo "postgresml package build and release script"
9+
echo "usage: $0 <package version, e.g. 2.10.0>"
10+
exit 1
1111
fi
1212

1313
if ! which deb-s3; then
14-
curl -sLO https://github.com/deb-s3/deb-s3/releases/download/0.11.4/deb-s3-0.11.4.gem
15-
sudo gem install deb-s3-0.11.4.gem
16-
deb-s3
14+
curl -sLO https://github.com/deb-s3/deb-s3/releases/download/0.11.4/deb-s3-0.11.4.gem
15+
sudo gem install deb-s3-0.11.4.gem
16+
deb-s3
1717
fi
1818

1919
function package_name() {
20-
echo "postgresml-$1-$package_version-ubuntu22.04-all.deb"
20+
local pg_version=$1
21+
local ubuntu_version=$2
22+
echo "postgresml-${pg_version}-${package_version}-ubuntu${ubuntu_version}-all.deb"
2123
}
2224

23-
for pg in {12..16}; do
24-
bash ${SCRIPT_DIR}/build.sh ${package_version} ${pg}
25-
26-
if [[ ! -f $(package_name ${pg}) ]]; then
27-
echo "File $(package_name ${pg}) doesn't exist"
28-
exit 1
29-
fi
30-
31-
deb-s3 upload \
32-
--lock \
33-
--bucket apt.postgresml.org \
34-
$(package_name ${pg}) \
35-
--codename $(lsb_release -cs)
36-
37-
rm $(package_name ${pg})
25+
# Active LTS Ubuntu versions
26+
ubuntu_versions=("20.04" "22.04" "24.04")
27+
28+
# Map Ubuntu versions to codenames
29+
declare -A ubuntu_codenames=(
30+
["20.04"]="focal"
31+
["22.04"]="jammy"
32+
["24.04"]="noble"
33+
)
34+
35+
for ubuntu_version in "${ubuntu_versions[@]}"; do
36+
codename=${ubuntu_codenames[$ubuntu_version]}
37+
echo "Building packages for Ubuntu ${ubuntu_version} (${codename})"
38+
39+
for pg in {11..17}; do
40+
echo "Building PostgreSQL ${pg} package..."
41+
bash ${SCRIPT_DIR}/build.sh ${package_version} ${pg} ${ubuntu_version}
42+
43+
if [[ ! -f $(package_name ${pg} ${ubuntu_version}) ]]; then
44+
echo "File $(package_name ${pg} ${ubuntu_version}) doesn't exist"
45+
exit 1
46+
fi
47+
48+
deb-s3 upload \
49+
--lock \
50+
--bucket apt.postgresml.org \
51+
$(package_name ${pg} ${ubuntu_version}) \
52+
--codename ${codename}
53+
54+
rm $(package_name ${pg} ${ubuntu_version})
55+
done
3856
done

‎packages/postgresql-pgml/release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e
44
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
55

66
if [[ -z "${1}" ]]; then
7-
echo "Usage: $0 <package version, e.g. 2.7.12>"
7+
echo "Usage: $0 <package version, e.g. 2.10.0>"
88
exit 1
99
fi
1010

‎pgml-cms/docs/open-source/pgml/api/pgml.tune.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ Without tuning, DistilBERT classifies every single movie review as `positive`, a
159159

160160
Once our model has been fine tuned on the dataset, it'll be saved and deployed with a Project visible in the Dashboard, just like models built from simpler algorithms.
161161

162-
[![Fine Tuning](https://github.com/postgresml/postgresml/raw/v2.7.12/dashboard/static/images/dashboard/tuning.png)](https://github.com/postgresml/postgresml/blob/v2.7.12/dashboard/static/images/dashboard/tuning.png)
162+
[![Fine Tuning](https://github.com/postgresml/postgresml/raw/v2.10.0/dashboard/static/images/dashboard/tuning.png)](https://github.com/postgresml/postgresml/blob/v2.10.0/dashboard/static/images/dashboard/tuning.png)
163163

164164
#### Prepare the data
165165

‎pgml-cms/docs/open-source/pgml/developers/contributing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ SELECT pgml.version();
127127
postgres=# select pgml.version();
128128
version
129129
-------------------
130-
2.9.3
130+
2.10.0
131131
(1 row)
132132
```
133133
{% endtab %}

‎pgml-cms/docs/open-source/pgml/developers/installation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ CREATE EXTENSION
132132
pgml_test=# SELECT pgml.version();
133133
version
134134
---------
135-
2.9.3
135+
2.10.0
136136
(1 row)
137137
```
138138

‎pgml-cms/docs/open-source/pgml/developers/quick-start-with-docker.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ docker run \
1818
-v postgresml_data:/var/lib/postgresql \
1919
-p 5433:5432 \
2020
-p 8000:8000 \
21-
ghcr.io/postgresml/postgresml:2.9.3 \
21+
ghcr.io/postgresml/postgresml:2.10.0 \
2222
sudo -u postgresml psql -d postgresml
2323
```
2424
{% endtab %}
@@ -43,7 +43,7 @@ docker run \
4343
--gpus all \
4444
-p 5433:5432 \
4545
-p 8000:8000 \
46-
ghcr.io/postgresml/postgresml:2.9.3 \
46+
ghcr.io/postgresml/postgresml:2.10.0 \
4747
sudo -u postgresml psql -d postgresml
4848
```
4949

@@ -80,7 +80,7 @@ Time: 41.520 ms
8080
postgresml=# SELECT pgml.version();
8181
version
8282
---------
83-
2.9.3
83+
2.10.0
8484
(1 row)
8585
```
8686

‎pgml-cms/docs/open-source/pgml/developers/self-hosting/pooler.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,6 @@ Type "help" for help.
115115
postgresml=> SELECT pgml.version();
116116
version
117117
---------
118-
2.9.3
118+
2.10.0
119119
(1 row)
120120
```

‎pgml-extension/.cargo/config.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
[build]
2-
# Postgres symbols won't be available until runtime
32
rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup"]
43

54
[target.x86_64-unknown-linux-gnu]
65
rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup,-fuse-ld=lld"]
76

87
[target.aarch64-unknown-linux-gnu]
98
rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup,-fuse-ld=lld"]
9+
10+
[target.aarch64-apple-darwin]
11+
rustflags = ["-C", "link-args=-WL,-undefined,dynamic_lookup"]

0 commit comments

Comments
 (0)