Merge branch 'master' of https://github.com/SimonEnsemble/PoreMatMod.jl

SimonEnsemble · Feb 17, 2022 · 38b1bdc · 38b1bdc
2 parents b0f4879 + d7b9f22
commit 38b1bdc
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 13 deletions.
diff --git a/Project.toml b/Project.toml
@@ -4,34 +4,29 @@ authors = ["SimonEnsemble <[email protected]>"]
 version = "0.2.11"
 
 [deps]
+Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 Bio3DView = "99c8bb3a-9d13-5280-9740-b4880ed9c598"
 CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
-Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 FIGlet = "3064a664-84fe-4d92-92c7-ed492f3d8fae"
 Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
 MetaGraphs = "626554b9-1ddb-594c-aa3c-2596fe9399a5"
-Pluto = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
-PlutoSliderServer = "2fc8631c-6f24-4c5b-bca7-cbb509c42db4"
-PlutoUI = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 Xtals = "ede5f01d-793e-4c47-9885-c447d1f18d6d"
 
 [compat]
+Aqua = "^0.5"
 Bio3DView = "^0.1"
 CSV = "^0.8"
 DataFrames = "^0.22.0, 1"
 Documenter = "^0.27"
 FIGlet = "^0.2"
 Graphs = "^1.4"
 MetaGraphs = "^0.7"
-Pluto = "^0.16, ^0.17"
-PlutoSliderServer = "^0.2, ^0.3"
-PlutoUI = "^0.7"
 Reexport = "^1.1"
 StatsBase = "^0.33"
 Xtals = "^0.3"
@@ -41,9 +36,11 @@ julia = "^1.6"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+Pluto = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
+PlutoSliderServer = "2fc8631c-6f24-4c5b-bca7-cbb509c42db4"
+PlutoUI = "7f904dfe-b85e-4ff6-b463-dae2292396a8"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
-PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test", "Documenter", "Printf", "PyCall", "InteractiveUtils", "Pkg"]
+test = ["Test", "Documenter", "Printf", "InteractiveUtils", "Pkg", "Pluto", "PlutoUI", "PlutoSliderServer"]
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ N.b. while `PoreMatMod.jl` was developed for MOFs and other porous crystalline m
 
 | **Documentation** | **Build Status** | **Test Coverage** |
 |:---:|:---:|:---:|
-| [![Docs Badge](https://img.shields.io/badge/docs-dev-blue.svg)](https://SimonEnsemble.github.io/PoreMatMod.jl/dev) | [![build](https://github.com/SimonEnsemble/PoreMatMod.jl/actions/workflows/ci_testing.yml/badge.svg)](https://github.com/SimonEnsemble/PoreMatMod.jl/actions/workflows/ci_testing.yml) | [![codecov](https://codecov.io/gh/SimonEnsemble/PoreMatMod.jl/branch/master/graph/badge.svg?token=Z9VMLXS3U9)](https://codecov.io/gh/SimonEnsemble/PoreMatMod.jl) |
+| [![Docs Badge](https://img.shields.io/badge/docs-dev-blue.svg)](https://SimonEnsemble.github.io/PoreMatMod.jl/dev) | [![build](https://github.com/SimonEnsemble/PoreMatMod.jl/actions/workflows/ci_testing.yml/badge.svg)](https://github.com/SimonEnsemble/PoreMatMod.jl/actions/workflows/ci_testing.yml) | [![codecov](https://codecov.io/gh/SimonEnsemble/PoreMatMod.jl/branch/master/graph/badge.svg?token=Z9VMLXS3U9)](https://codecov.io/gh/SimonEnsemble/PoreMatMod.jl) [![Aqua QA](https://raw.githubusercontent.com/JuliaTesting/Aqua.jl/master/badge.svg)](https://github.com/JuliaTesting/Aqua.jl) |
 
 
 ## Installation

diff --git a/docs/Project.toml b/docs/Project.toml
@@ -34,8 +34,7 @@ Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
-PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test", "Printf", "PyCall", "InteractiveUtils", "Logging", "Markdown", "Pkg"]
+test = ["Test", "Printf", "InteractiveUtils", "Logging", "Markdown", "Pkg"]
diff --git a/src/PoreMatMod.jl b/src/PoreMatMod.jl
@@ -1,6 +1,6 @@
 module PoreMatMod
 
-using DataFrames, FIGlet, Graphs, LinearAlgebra, MetaGraphs, Pluto, Reexport, StatsBase
+using DataFrames, FIGlet, Graphs, LinearAlgebra, MetaGraphs, Reexport, StatsBase
 @reexport using Xtals
 
 import Base.(∈), Base.show, Base.replace

diff --git a/test/aqua.jl b/test/aqua.jl
@@ -0,0 +1,14 @@
+using PoreMatMod
+import Aqua
+
+# ambiguity testing finds many "problems" outside the scope of this package
+ambiguities=false
+
+# to skip when checking for stale dependencies and missing compat entries
+#   Aqua is added in a separate CI job, so (ironically) does not work w/ itself
+stale_deps = (ignore=[:Aqua],)
+
+Aqua.test_all(PoreMatMod;
+    ambiguities=ambiguities, 
+    stale_deps=stale_deps
+)