Skip to content

Commit 58ef6af

Browse files
authored
Rename the package from ClusterManagers.jl to HTCondorClusterManager.jl (#4)
1 parent fa88c6e commit 58ef6af

File tree

7 files changed

+19
-21
lines changed

7 files changed

+19
-21
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ jobs:
1616
timeout-minutes: 10
1717
needs:
1818
- unit-tests
19-
- test-slurm
2019
# Important: the next line MUST be `if: always()`.
2120
# Do not change that line.
2221
# That line is necessary to make sure that this job runs even if tests fail.
@@ -25,13 +24,11 @@ jobs:
2524
steps:
2625
- run: |
2726
echo unit-tests: ${{ needs.unit-tests.result }}
28-
echo test-slurm: ${{ needs.test-slurm.result }}
2927
- run: exit 1
3028
# The last line must NOT end with ||
3129
# All other lines MUST end with ||
3230
if: |
33-
(needs.unit-tests.result != 'success') ||
34-
(needs.test-slurm.result != 'success')
31+
(needs.unit-tests.result != 'success')
3532
unit-tests:
3633
runs-on: ubuntu-latest
3734
timeout-minutes: 20
@@ -63,6 +60,7 @@ jobs:
6360
# If this is not a PR, then DO fail CI if the Codecov upload errors.
6461
fail_ci_if_error: ${{ github.event_name != 'pull_request' || github.repository == github.event.pull_request.head.repo.full_name }}
6562
test-slurm:
63+
if: false
6664
runs-on: ubuntu-latest
6765
timeout-minutes: 20
6866
strategy:
@@ -100,18 +98,18 @@ jobs:
10098
run: |
10199
docker exec -t slurmctld pwd
102100
docker exec -t slurmctld ls -la
103-
docker exec -t slurmctld ls -la ClusterManagers
101+
docker exec -t slurmctld ls -la HTCondorClusterManager
104102
- name: Instantiate package
105-
run: docker exec -t slurmctld julia --project=ClusterManagers -e 'import Pkg; @show Base.active_project(); Pkg.instantiate(); Pkg.status()'
103+
run: docker exec -t slurmctld julia --project=HTCondorClusterManager -e 'import Pkg; @show Base.active_project(); Pkg.instantiate(); Pkg.status()'
106104
- name: Run tests without a Slurm allocation
107-
run: docker exec -t slurmctld julia --project=ClusterManagers -e 'import Pkg; Pkg.test(; test_args=["slurm"])'
105+
run: docker exec -t slurmctld julia --project=HTCondorClusterManager -e 'import Pkg; Pkg.test(; test_args=["slurm"])'
108106
- name: Run tests inside salloc
109-
run: docker exec -t slurmctld salloc -t 00:10:00 -n 2 julia --project=ClusterManagers -e 'import Pkg; Pkg.test(; test_args=["slurm"], coverage=true)'
107+
run: docker exec -t slurmctld salloc -t 00:10:00 -n 2 julia --project=HTCondorClusterManager -e 'import Pkg; Pkg.test(; test_args=["slurm"], coverage=true)'
110108
- name: Run tests inside sbatch
111-
run: docker exec -t slurmctld ClusterManagers/ci/run_my_sbatch.sh
109+
run: docker exec -t slurmctld HTCondorClusterManager/ci/run_my_sbatch.sh
112110
- run: find . -type f -name '*.cov'
113111
- name: Copy .cov files out of the Docker container
114-
run: docker exec slurmctld /bin/bash -c 'cd /home/docker/ClusterManagers && tar -cf - src/*.cov' | tar -xvf -
112+
run: docker exec slurmctld /bin/bash -c 'cd /home/docker/HTCondorClusterManager && tar -cf - src/*.cov' | tar -xvf -
115113
- run: find . -type f -name '*.cov'
116114
# - run: find . -type f -name '*.cov' -exec cat {} \;
117115
- uses: julia-actions/julia-processcoverage@v1

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name = "ClusterManagers"
1+
name = "HTCondorClusterManager"
22
uuid = "1076c17b-1fcc-416f-99d3-1c6bb2eb7749"
33
version = "1.1.0"
44

src/ClusterManagers.jl renamed to src/HTCondorClusterManager.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module ClusterManagers
1+
module HTCondorClusterManager
22

33
using Distributed
44
using Sockets

src/condor.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ function launch(manager::HTCManager, params::Dict, instances_arr::Array, c::Cond
5555
let
5656
mgr_desc = "HTCondor"
5757
msg = "The $(mgr_desc) functionality in ClusterManagers.jl is currently not actively maintained. " *
58-
"We are currently looking for a new maintainer. " *
58+
"We are currently looking for a new maintainer. " *
5959
"If you are an active user of the $(mgr_desc) functionality and are interested in becoming the maintainer, " *
60-
"Please open an issue on the JuliaParallel/ClusterManagers.jl repo: " *
60+
"Please open an issue on the JuliaParallel/ClusterManagers.jl repo: " *
6161
"https://github.com/JuliaParallel/ClusterManagers.jl/issues"
6262
Base.depwarn(msg, Symbol(typeof(manager)))
6363
end

src/elastic.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ function get_connect_cmd(em::ElasticManager; absolute_exename=true, same_project
150150
join([
151151
exename,
152152
project...,
153-
"-e 'using ClusterManagers; ClusterManagers.elastic_worker(\"$cookie\",\"$ip\",$port)'"
153+
"-e 'import HTCondorClusterManager; HTCondorClusterManager.elastic_worker(\"$cookie\",\"$ip\",$port)'"
154154
]," ")
155155

156156
end

test/elastic.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
em = ElasticManager(addr=:auto, port=0)
55

66
# launch worker
7-
run(`sh -c $(ClusterManagers.get_connect_cmd(em))`, wait=false)
7+
run(`sh -c $(HTCondorClusterManager.get_connect_cmd(em))`, wait=false)
88

99
# wait at most TIMEOUT seconds for it to connect
1010
@test :ok == timedwait(TIMEOUT) do

test/runtests.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import ClusterManagers
1+
import HTCondorClusterManager
22
import Test
33

44
import Distributed
@@ -10,11 +10,11 @@ using Distributed: procs, nprocs
1010
using Distributed: remotecall_fetch, @spawnat
1111
using Test: @testset, @test, @test_skip
1212
# ElasticManager:
13-
using ClusterManagers: ElasticManager
13+
using HTCondorClusterManager: ElasticManager
1414
# Slurm:
15-
using ClusterManagers: addprocs_slurm, SlurmManager
15+
using HTCondorClusterManager: addprocs_slurm, SlurmManager
1616
# SGE:
17-
using ClusterManagers: addprocs_sge, SGEManager
17+
using HTCondorClusterManager: addprocs_sge, SGEManager
1818

1919
const test_args = lowercase.(strip.(ARGS))
2020

@@ -23,7 +23,7 @@ const test_args = lowercase.(strip.(ARGS))
2323
slurm_is_installed() = !isnothing(Sys.which("sbatch"))
2424
qsub_is_installed() = !isnothing(Sys.which("qsub"))
2525

26-
@testset "ClusterManagers.jl" begin
26+
@testset "HTCondorClusterManager.jl" begin
2727
include("elastic.jl")
2828

2929
if slurm_is_installed()

0 commit comments

Comments
 (0)