Skip to content

Commit

Permalink
Merge pull request #36 from giordano/mg/compat-bounds
Browse files Browse the repository at this point in the history
Fix compat bounds and cleanup dependencies
  • Loading branch information
caseykneale authored Mar 7, 2020
2 parents 6d4821e + e23044e commit 5973162
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 48 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/docs/build/*
Internal*
/docs/Manifest.toml
/Manifest.toml
18 changes: 10 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,18 @@ os:
- osx
julia:
- 1.0
- 1.1
# - nightly
- 1.3
- 1.4
- nightly

branches:
only:
- master
- /^v\d+\.\d+(\.\d+)?(-\S*)?$/
after_success:
- if [[ $TRAVIS_JULIA_VERSION = 1.1 ]] && [[ $TRAVIS_OS_NAME = linux ]]; then
julia --project=test/coverage -e 'using Pkg; Pkg.instantiate();
using Coverage; Codecov.submit(Codecov.process_folder())';
fi

jobs:
allow_failures:
- julia: nightly
include:
- stage: Documentation
julia: 1.0
Expand All @@ -29,4 +28,7 @@ jobs:
notifications:
email: false
git:
depth: 99999999
depth: 99999999

after_success:
- julia -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'
43 changes: 14 additions & 29 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,45 +4,30 @@ authors = ["caseykneale "]
version = "0.5.10"

[deps]
Arpack = "7d9fca2a-8960-54d3-9f78-7d1dccf2cb97"
BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
Combinatorics = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
HypothesisTests = "09f84164-cd44-5f33-b23f-e6b0d136a0d5"
IntervalArithmetic = "d1acc4aa-44c8-5952-acd4-ba5d80a2a253"
IntervalRootFinding = "d2bf35a9-74e0-55ec-b149-d360ff49b807"
LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"
Roots = "f2b01f46-fcfa-551c-844a-d8ac1e96c665"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[compat]
Arpack = "^0.3.1"
BenchmarkTools = "^0.4.3"
CSV = "^0.5.14"
Combinatorics = "^0.7.0"
DataFrames = "^0.19.4"
Distributions = "^0.21.3"
FFTW = "^1.0"
HypothesisTests = "^0.8.0"
IntervalArithmetic = "^0.15.2"
IntervalRootFinding = "^0.4.0"
LaTeXStrings = "^1.0.3"
RecipesBase = "^0.7.0"
Revise = "^2.2.2"
Roots = "^0.8.3"
SpecialFunctions = "^0.7.2"
StaticArrays = "^0.11.1"
StatsBase = "^0.32.0"
julia = "1.0, 1.1, 1.2, 1.3, 1.4, 1.5"
CSV = "0.5.14"
Combinatorics = "0.7.0, 1"
DataFrames = "0.19.4, 0.20"
Distributions = "0.21.3, 0.22"
FFTW = "1.0"
RecipesBase = "0.7.0, 0.8"
StatsBase = "0.32.0"
julia = "1"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test"]
10 changes: 0 additions & 10 deletions REQUIRE

This file was deleted.

2 changes: 1 addition & 1 deletion src/ChemometricsTools.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module ChemometricsTools
using DataFrames, LinearAlgebra, Statistics, StatsBase, SparseArrays,
RecipesBase, Distributions, Dates, Combinatorics, Revise, FFTW
RecipesBase, Distributions, Dates, Combinatorics, FFTW
using CSV: read
#DSP.jl is currently broken and has been removed as a dependancy from
#this project until further notice.
Expand Down

0 comments on commit 5973162

Please sign in to comment.