Skip to content

Commit de302c7

Browse files
authored
Merge pull request #244 from invenia/ed/new-lts
Set new minimum Julia version to 1.6 and drop old support
2 parents 1729b6c + 380fd27 commit de302c7

File tree

6 files changed

+8
-129
lines changed

6 files changed

+8
-129
lines changed

.github/workflows/CI.yml

+2-11
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,9 @@ jobs:
3434
- os: macOS-latest
3535
arch: x86
3636
include:
37-
# Add a 1.0 job just to make sure we still support it
37+
# Add a LTS job just to make sure we still support it
3838
- os: ubuntu-latest
39-
version: "1.0"
40-
arch: x64
41-
postgresql-version: latest
42-
# Add a 1.5 job because that's what Invenia actually uses
43-
- os: ubuntu-latest
44-
version: 1.5
39+
version: "1.6"
4540
arch: x64
4641
postgresql-version: latest
4742
# Add older supported PostgreSQL Versions
@@ -61,10 +56,6 @@ jobs:
6156
version: 1
6257
arch: x64
6358
postgresql-version: '10'
64-
- os: ubuntu-latest
65-
version: 1
66-
arch: x64
67-
postgresql-version: '9.6'
6859
steps:
6960
- uses: actions/checkout@v2
7061
- uses: julia-actions/setup-julia@v1

Project.toml

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
name = "LibPQ"
22
uuid = "194296ae-ab2e-5f79-8cd4-7183a0a5a0d1"
33
license = "MIT"
4-
version = "1.10.0"
4+
version = "1.11.0"
55

66
[deps]
7-
BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
87
CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82"
98
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
109
Decimals = "abce61dc-4473-55a0-ba07-351d65e31d42"
@@ -22,7 +21,6 @@ Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
2221
TimeZones = "f269a46b-ccf7-5d73-abea-4c690281aa53"
2322

2423
[compat]
25-
BinaryProvider = "0.5"
2624
CEnum = "0.2, 0.3, 0.4"
2725
DataFrames = "0.20, 0.21"
2826
Decimals = "0.4.1"
@@ -31,12 +29,12 @@ Infinity = "0.2"
3129
Intervals = "1.4"
3230
IterTools = "1"
3331
LayerDicts = "1"
34-
LibPQ_jll = "12"
32+
LibPQ_jll = "14"
3533
Memento = "0.10, 0.11, 0.12, 0.13, 1"
3634
OffsetArrays = "0.9.1, 0.10, 0.11, 1"
3735
Tables = "0.2, 1"
3836
TimeZones = "0.9.2, 0.10, 0.11, 1"
39-
julia = "1"
37+
julia = "1.6"
4038

4139
[extras]
4240
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"

deps/build.jl

-55
This file was deleted.

deps/build_OpenSSL.jl

-45
This file was deleted.

src/LibPQ.jl

+1-9
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,7 @@ include(joinpath(@__DIR__, "utils.jl"))
5353
module libpq_c
5454
export Oid
5555

56-
@static if VERSION < v"1.3.0"
57-
include(joinpath(@__DIR__, "..", "deps", "deps.jl"))
58-
59-
function __init__()
60-
return check_deps()
61-
end
62-
else
63-
using LibPQ_jll
64-
end
56+
using LibPQ_jll
6557

6658
include(joinpath(@__DIR__, "headers", "libpq-fe.jl"))
6759
end

test/runtests.jl

+2-4
Original file line numberDiff line numberDiff line change
@@ -1790,10 +1790,8 @@ end
17901790
wait(ar)
17911791
@test false
17921792
catch err
1793-
if VERSION >= v"1.3.0-alpha.110"
1794-
while err isa TaskFailedException
1795-
err = err.task.exception
1796-
end
1793+
while err isa TaskFailedException
1794+
err = err.task.exception
17971795
end
17981796
@test err isa LibPQ.Errors.JLConnectionError
17991797
end

0 commit comments

Comments
 (0)