Skip to content

Commit

Permalink
Merge pull request #244 from invenia/ed/new-lts
Browse files Browse the repository at this point in the history
Set new minimum Julia version to 1.6 and drop old support
  • Loading branch information
iamed2 committed Jan 31, 2022
2 parents 1729b6c + 380fd27 commit de302c7
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 129 deletions.
13 changes: 2 additions & 11 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,9 @@ jobs:
- os: macOS-latest
arch: x86
include:
# Add a 1.0 job just to make sure we still support it
# Add a LTS job just to make sure we still support it
- os: ubuntu-latest
version: "1.0"
arch: x64
postgresql-version: latest
# Add a 1.5 job because that's what Invenia actually uses
- os: ubuntu-latest
version: 1.5
version: "1.6"
arch: x64
postgresql-version: latest
# Add older supported PostgreSQL Versions
Expand All @@ -61,10 +56,6 @@ jobs:
version: 1
arch: x64
postgresql-version: '10'
- os: ubuntu-latest
version: 1
arch: x64
postgresql-version: '9.6'
steps:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@v1
Expand Down
8 changes: 3 additions & 5 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
name = "LibPQ"
uuid = "194296ae-ab2e-5f79-8cd4-7183a0a5a0d1"
license = "MIT"
version = "1.10.0"
version = "1.11.0"

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

[compat]
BinaryProvider = "0.5"
CEnum = "0.2, 0.3, 0.4"
DataFrames = "0.20, 0.21"
Decimals = "0.4.1"
Expand All @@ -31,12 +29,12 @@ Infinity = "0.2"
Intervals = "1.4"
IterTools = "1"
LayerDicts = "1"
LibPQ_jll = "12"
LibPQ_jll = "14"
Memento = "0.10, 0.11, 0.12, 0.13, 1"
OffsetArrays = "0.9.1, 0.10, 0.11, 1"
Tables = "0.2, 1"
TimeZones = "0.9.2, 0.10, 0.11, 1"
julia = "1"
julia = "1.6"

[extras]
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
Expand Down
55 changes: 0 additions & 55 deletions deps/build.jl

This file was deleted.

45 changes: 0 additions & 45 deletions deps/build_OpenSSL.jl

This file was deleted.

10 changes: 1 addition & 9 deletions src/LibPQ.jl
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,7 @@ include(joinpath(@__DIR__, "utils.jl"))
module libpq_c
export Oid

@static if VERSION < v"1.3.0"
include(joinpath(@__DIR__, "..", "deps", "deps.jl"))

function __init__()
return check_deps()
end
else
using LibPQ_jll
end
using LibPQ_jll

include(joinpath(@__DIR__, "headers", "libpq-fe.jl"))
end
Expand Down
6 changes: 2 additions & 4 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1790,10 +1790,8 @@ end
wait(ar)
@test false
catch err
if VERSION >= v"1.3.0-alpha.110"
while err isa TaskFailedException
err = err.task.exception
end
while err isa TaskFailedException
err = err.task.exception
end
@test err isa LibPQ.Errors.JLConnectionError
end
Expand Down

2 comments on commit de302c7

@iamed2
Copy link
Collaborator Author

@iamed2 iamed2 commented on de302c7 Jan 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/53586

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v1.11.0 -m "<description of version>" de302c7cc7dcdbc948df878c2a8dc85e7ad5cc13
git push origin v1.11.0

Please sign in to comment.