Skip to content

Commit

Permalink
Merge pull request #537 from LCSB-BioCore/develop
Browse files Browse the repository at this point in the history
Regular merge develop→master
  • Loading branch information
laurentheirendt authored Dec 7, 2021
2 parents c0dcab5 + 181120f commit da5e807
Show file tree
Hide file tree
Showing 17 changed files with 748 additions and 349 deletions.
27 changes: 14 additions & 13 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ variables:
# Test environment & platform settings
#

.global_julia15: &global_julia15
.global_julia17: &global_julia17
variables:
JULIA_VER: "v1.5.3"
JULIA_VER: "v1.7.0"

.global_julia16: &global_julia16
variables:
Expand Down Expand Up @@ -85,7 +85,7 @@ variables:
# any available docker and current julia
#

docker:julia1.6:
docker:julia1.7:
stage: test
image: $CI_REGISTRY/r3/docker/julia-custom
script:
Expand All @@ -99,12 +99,12 @@ docker:julia1.6:
# built & deployed
#

linux:julia1.5:
linux:julia1.7:
stage: test
tags:
- slave01
<<: *global_trigger_full_tests
<<: *global_julia15
<<: *global_julia17
<<: *global_env_linux

linux:julia1.6:
Expand All @@ -119,22 +119,22 @@ linux:julia1.6:
# Additional platform&environment compatibility tests
#

windows8:julia1.5:
windows8:julia1.7:
stage: test-compat
<<: *global_trigger_compat_tests
<<: *global_julia15
<<: *global_julia17
<<: *global_env_win8

windows10:julia1.5:
windows10:julia1.7:
stage: test-compat
<<: *global_trigger_compat_tests
<<: *global_julia15
<<: *global_julia17
<<: *global_env_win10

mac:julia1.5:
mac:julia1.7:
stage: test-compat
<<: *global_trigger_compat_tests
<<: *global_julia15
<<: *global_julia17
<<: *global_env_mac

windows8:julia1.6:
Expand Down Expand Up @@ -221,6 +221,7 @@ documentation-assets:gource:
- docker run -v "$PWD":/visualization $CI_REGISTRY/r3/docker/gource
artifacts:
paths: ['output.gif']
expire_in: 1 year
<<: *global_trigger_build_doc

#
Expand All @@ -238,12 +239,12 @@ documentation-assets:gource:
- julia --project=@. -e 'import Pkg; Pkg.instantiate();'
- julia --project=@. --color=yes test/doctests.jl

doc-tests-pr:julia1.6:
doc-tests-pr:julia1.7:
stage: documentation
<<: *global_doctests
<<: *global_trigger_pull_request

doc-tests:julia1.6:
doc-tests:julia1.7:
stage: test
<<: *global_doctests
<<: *global_trigger_full_tests
Expand Down
13 changes: 4 additions & 9 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
name = "COBREXA"
uuid = "babc4406-5200-4a30-9033-bf5ae714c842"
authors = ["The developers of COBREXA.jl"]
version = "1.1"
version = "1.1.1"

[deps]
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
DistributedData = "f6a0035f-c5ac-4ad0-b410-ad102ced35df"
JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
Expand All @@ -23,29 +22,25 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"

[compat]
DistributedData = "0.1.4"
Documenter = "0.26"
JSON = "0.21"
JuMP = "0.21"
Literate = "2.8"
MAT = "0.10"
MacroTools = "0.5.6"
OSQP = "0.6"
OrderedCollections = "1.4"
SBML = "0.7, 0.8"
SBML = "0.7, 0.8.2"
StableRNGs = "1.0"
Tulip = "0.7"
julia = "1"
julia = "1.5, 1.6, 1.7"

[extras]
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
GLPK = "60bf3e95-4087-53dc-ae20-288a0d20c6a6"
Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
OSQP = "ab2f91bb-94b4-55e3-9ba0-7f65df51de79"
SHA = "ea8e919c-243c-51af-8825-aaa63cd721ce"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Tulip = "6dd1b50a-3aae-11e9-10b5-ef983d2400fa"

[targets]
test = ["Aqua", "Downloads", "OSQP", "SHA", "Test", "Tulip", "GLPK"]
test = ["Aqua", "Downloads", "GLPK", "OSQP", "SHA", "Test", "Tulip"]
1 change: 1 addition & 0 deletions docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ Tulip = "6dd1b50a-3aae-11e9-10b5-ef983d2400fa"

[compat]
Documenter = "0.26"
Literate = "2.8"
Loading

2 comments on commit da5e807

@exaexa
Copy link
Collaborator

@exaexa exaexa commented on da5e807 Dec 7, 2021

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/50088

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.1.1 -m "<description of version>" da5e807e0bb2ef8b69414019247994f0f502a61f
git push origin v1.1.1

Please sign in to comment.