From 60527bdbeca7e98ced0a2bab2fbeefdd867b591a Mon Sep 17 00:00:00 2001 From: Alex Arslan Date: Wed, 8 May 2019 13:38:23 -0700 Subject: [PATCH 1/4] Remove REQUIRE files They are no longer used now that Pkg has fully transitioned away from the METADATA-based workflow. --- REQUIRE | 3 --- test/REQUIRE | 3 --- 2 files changed, 6 deletions(-) delete mode 100644 REQUIRE delete mode 100644 test/REQUIRE diff --git a/REQUIRE b/REQUIRE deleted file mode 100644 index 6c0f4e0a5..000000000 --- a/REQUIRE +++ /dev/null @@ -1,3 +0,0 @@ -julia 0.7 -MathProgBase 0.7 0.8 -OrderedCollections diff --git a/test/REQUIRE b/test/REQUIRE deleted file mode 100644 index 15f2da5bd..000000000 --- a/test/REQUIRE +++ /dev/null @@ -1,3 +0,0 @@ -GLPKMathProgInterface -ECOS -SCS 0.4.0 From ef0c7d57ac5223fb0a9d9b451c24c186e75b4c99 Mon Sep 17 00:00:00 2001 From: Alex Arslan Date: Wed, 8 May 2019 13:45:32 -0700 Subject: [PATCH 2/4] Use semver for compatibility bounds, drop Julia 0.7 Julia 0.7 is no longer maintained so we'd might as well set our lower bound at 1.0, the current LTS release. Using `^` (semver compat) instead of `>=` for version bounds is safer as it ensures that, assuming package authors are actually obeying semver, we aren't immediately opting into potentially breaking changes. --- .travis.yml | 2 +- Project.toml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4aaab2e25..1140988bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,8 @@ os: - linux - osx julia: - - 0.7 - 1.0 + - 1.1 notifications: email: false sudo: false diff --git a/Project.toml b/Project.toml index a5253eb49..164a49067 100644 --- a/Project.toml +++ b/Project.toml @@ -8,9 +8,9 @@ OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [compat] -MathProgBase = "0.7" -OrderedCollections = ">=1.0.0" -julia = "0.7, 1.0" +MathProgBase = "^0.7" +OrderedCollections = "^1.0" +julia = "^1.0" [extras] ECOS = "e2685f51-7e38-5353-a97d-a921fd2c8199" From dfd07605f192ab8938128f58fcc9f7f546d6c124 Mon Sep 17 00:00:00 2001 From: Alex Arslan Date: Wed, 8 May 2019 13:50:34 -0700 Subject: [PATCH 3/4] Clean up .travis.yml We don't need any of the APT addons. Also, standard YAML indentation is 2 spaces, so reformat to that. --- .travis.yml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1140988bb..6158aa8a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,11 @@ language: julia os: - - linux - - osx + - linux + - osx julia: - - 1.0 - - 1.1 + - 1.0 + - 1.1 notifications: - email: false -sudo: false -addons: - apt_packages: - - gfortran - - liblapack-dev - - libgmp-dev - - libglpk-dev + email: false after_success: - - julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder())' + - julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder())' From a5d2ddbef1edb30b232d792f9b7691eeef7a8351 Mon Sep 17 00:00:00 2001 From: Alex Arslan Date: Wed, 8 May 2019 13:51:59 -0700 Subject: [PATCH 4/4] Set Project.toml version to 0.12.0 --- Project.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Project.toml b/Project.toml index 164a49067..1deb93e00 100644 --- a/Project.toml +++ b/Project.toml @@ -1,5 +1,6 @@ name = "Convex" uuid = "f65535da-76fb-5f13-bab9-19810c17039a" +version = "0.12.0" [deps] LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"