From 2f07de0f4790f298a553d0c1a586477d44982b62 Mon Sep 17 00:00:00 2001 From: Frank Austin Nothaft Date: Tue, 21 Jun 2016 12:43:25 -0700 Subject: [PATCH] Modified copyright in license header (resolves #989) Change copyright owner from `UCSC Computational Genomics Lab` to `Regents of the University of California` and updated date range from 2015 to 2015-2016. --- setup.py | 2 +- src/toil/__init__.py | 2 +- src/toil/batchSystems/__init__.py | 2 +- src/toil/batchSystems/abstractBatchSystem.py | 2 +- src/toil/batchSystems/gridengine.py | 2 +- src/toil/batchSystems/jobDispatcher.py | 2 +- src/toil/batchSystems/mesos/__init__.py | 2 +- src/toil/batchSystems/mesos/batchSystem.py | 2 +- src/toil/batchSystems/mesos/conftest.py | 2 +- src/toil/batchSystems/mesos/executor.py | 2 +- src/toil/batchSystems/parasol.py | 2 +- src/toil/batchSystems/singleMachine.py | 2 +- src/toil/common.py | 2 +- src/toil/cwl/conftest.py | 2 +- src/toil/job.py | 2 +- src/toil/jobStores/__init__.py | 2 +- src/toil/jobStores/abstractJobStore.py | 2 +- src/toil/jobStores/aws/jobStore.py | 2 +- src/toil/jobStores/aws/utils.py | 2 +- src/toil/jobStores/azureJobStore.py | 2 +- src/toil/jobStores/conftest.py | 2 +- src/toil/jobStores/fileJobStore.py | 2 +- src/toil/jobWrapper.py | 2 +- src/toil/leader.py | 2 +- src/toil/lib/__init__.py | 2 +- src/toil/lib/bioio.py | 2 +- src/toil/lib/encryption/__init__.py | 2 +- src/toil/lib/encryption/_dummy.py | 2 +- src/toil/lib/encryption/_nacl.py | 2 +- src/toil/provisioners/__init__.py | 2 +- src/toil/provisioners/abstractProvisioner.py | 2 +- src/toil/provisioners/clusterScaler.py | 2 +- src/toil/realtimeLogger.py | 2 +- src/toil/resource.py | 2 +- src/toil/test/__init__.py | 2 +- src/toil/test/batchSystems/__init__.py | 2 +- src/toil/test/batchSystems/batchSystemTest.py | 2 +- src/toil/test/cwl/conftest.py | 2 +- src/toil/test/jobStores/__init__.py | 2 +- src/toil/test/jobStores/jobStoreTest.py | 2 +- src/toil/test/mesos/__init__.py | 2 +- src/toil/test/mesos/helloWorld.py | 2 +- src/toil/test/mesos/mesosTest.py | 2 +- src/toil/test/mesos/stress.py | 2 +- src/toil/test/provisioners/__init__.py | 2 +- src/toil/test/provisioners/clusterScalerTest.py | 2 +- src/toil/test/sort/__init__.py | 2 +- src/toil/test/sort/lib.py | 2 +- src/toil/test/sort/sort.py | 2 +- src/toil/test/sort/sortTest.py | 2 +- src/toil/test/src/__init__.py | 2 +- src/toil/test/src/helloWorldTest.py | 2 +- src/toil/test/src/importExportFileTest.py | 2 +- src/toil/test/src/jobCacheEjectionTest.py | 2 +- src/toil/test/src/jobCacheTest.py | 2 +- src/toil/test/src/jobEncapsulationTest.py | 2 +- src/toil/test/src/jobFileStoreTest.py | 2 +- src/toil/test/src/jobServiceTest.py | 2 +- src/toil/test/src/jobTest.py | 2 +- src/toil/test/src/jobWrapperTest.py | 2 +- src/toil/test/src/promisedRequirementTest.py | 2 +- src/toil/test/src/promisesTest.py | 2 +- src/toil/test/src/realtimeLoggerTest.py | 2 +- src/toil/test/src/regularLogTest.py | 2 +- src/toil/test/src/resourceTest.py | 2 +- src/toil/test/src/retainTempDirTest.py | 2 +- src/toil/test/src/toilContextManagerTest.py | 2 +- src/toil/test/src/userDefinedJobArgTypeTest.py | 2 +- src/toil/test/utils/__init__.py | 2 +- src/toil/test/utils/utilsTest.py | 2 +- src/toil/toilState.py | 2 +- src/toil/utils/toilClean.py | 2 +- src/toil/utils/toilKill.py | 2 +- src/toil/utils/toilStats.py | 2 +- src/toil/utils/toilStatus.py | 2 +- src/toil/version.py | 2 +- src/toil/worker.py | 2 +- version.py | 16 +++++++++++++++- 78 files changed, 92 insertions(+), 78 deletions(-) mode change 120000 => 100755 version.py diff --git a/setup.py b/setup.py index 4380d4eb20..072710c569 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/__init__.py b/src/toil/__init__.py index 73543e68d5..6ab7255902 100644 --- a/src/toil/__init__.py +++ b/src/toil/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/batchSystems/__init__.py b/src/toil/batchSystems/__init__.py index 3ebc5ec231..51a047f02e 100644 --- a/src/toil/batchSystems/__init__.py +++ b/src/toil/batchSystems/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/batchSystems/abstractBatchSystem.py b/src/toil/batchSystems/abstractBatchSystem.py index a90df7d35c..e74780ca53 100644 --- a/src/toil/batchSystems/abstractBatchSystem.py +++ b/src/toil/batchSystems/abstractBatchSystem.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/batchSystems/gridengine.py b/src/toil/batchSystems/gridengine.py index a43aa904ad..02c2f39c83 100644 --- a/src/toil/batchSystems/gridengine.py +++ b/src/toil/batchSystems/gridengine.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/batchSystems/jobDispatcher.py b/src/toil/batchSystems/jobDispatcher.py index b5d6570dda..3b090c2b6b 100644 --- a/src/toil/batchSystems/jobDispatcher.py +++ b/src/toil/batchSystems/jobDispatcher.py @@ -4,7 +4,7 @@ # caching branch as well. The main semantic changes to JobDispatcher were wall time and the # IssuedJob stuff. -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/batchSystems/mesos/__init__.py b/src/toil/batchSystems/mesos/__init__.py index a600040bf5..7dbec75b04 100644 --- a/src/toil/batchSystems/mesos/__init__.py +++ b/src/toil/batchSystems/mesos/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/batchSystems/mesos/batchSystem.py b/src/toil/batchSystems/mesos/batchSystem.py index 6ac819acd0..334d56bd1f 100644 --- a/src/toil/batchSystems/mesos/batchSystem.py +++ b/src/toil/batchSystems/mesos/batchSystem.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/batchSystems/mesos/conftest.py b/src/toil/batchSystems/mesos/conftest.py index 8e522d3cc8..657c64ff08 100644 --- a/src/toil/batchSystems/mesos/conftest.py +++ b/src/toil/batchSystems/mesos/conftest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/batchSystems/mesos/executor.py b/src/toil/batchSystems/mesos/executor.py index bc633ae97f..e0d5967492 100644 --- a/src/toil/batchSystems/mesos/executor.py +++ b/src/toil/batchSystems/mesos/executor.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/batchSystems/parasol.py b/src/toil/batchSystems/parasol.py index c519921b6d..e5c4918566 100644 --- a/src/toil/batchSystems/parasol.py +++ b/src/toil/batchSystems/parasol.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/batchSystems/singleMachine.py b/src/toil/batchSystems/singleMachine.py index 9aee1ab2aa..a38ff8fa20 100644 --- a/src/toil/batchSystems/singleMachine.py +++ b/src/toil/batchSystems/singleMachine.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/common.py b/src/toil/common.py index e0522d78e7..fb61dd52ce 100644 --- a/src/toil/common.py +++ b/src/toil/common.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/cwl/conftest.py b/src/toil/cwl/conftest.py index 01725cbd22..2eca681900 100644 --- a/src/toil/cwl/conftest.py +++ b/src/toil/cwl/conftest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/job.py b/src/toil/job.py index 0d6ae1eb2d..a4c6222f1b 100644 --- a/src/toil/job.py +++ b/src/toil/job.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/jobStores/__init__.py b/src/toil/jobStores/__init__.py index 072d235f28..20da7b0521 100644 --- a/src/toil/jobStores/__init__.py +++ b/src/toil/jobStores/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/jobStores/abstractJobStore.py b/src/toil/jobStores/abstractJobStore.py index a20b6ed929..a636c6de65 100644 --- a/src/toil/jobStores/abstractJobStore.py +++ b/src/toil/jobStores/abstractJobStore.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/jobStores/aws/jobStore.py b/src/toil/jobStores/aws/jobStore.py index 23eae6b319..fb14edcebb 100644 --- a/src/toil/jobStores/aws/jobStore.py +++ b/src/toil/jobStores/aws/jobStore.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/jobStores/aws/utils.py b/src/toil/jobStores/aws/utils.py index e7186d801e..9fa3582bf5 100644 --- a/src/toil/jobStores/aws/utils.py +++ b/src/toil/jobStores/aws/utils.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/jobStores/azureJobStore.py b/src/toil/jobStores/azureJobStore.py index 731893e2d0..98fd4852d4 100644 --- a/src/toil/jobStores/azureJobStore.py +++ b/src/toil/jobStores/azureJobStore.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/jobStores/conftest.py b/src/toil/jobStores/conftest.py index b5648931ff..0d32e61b4f 100644 --- a/src/toil/jobStores/conftest.py +++ b/src/toil/jobStores/conftest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/jobStores/fileJobStore.py b/src/toil/jobStores/fileJobStore.py index 2ba9983795..2369a85704 100644 --- a/src/toil/jobStores/fileJobStore.py +++ b/src/toil/jobStores/fileJobStore.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/jobWrapper.py b/src/toil/jobWrapper.py index cd81520239..bbda478b92 100644 --- a/src/toil/jobWrapper.py +++ b/src/toil/jobWrapper.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/leader.py b/src/toil/leader.py index fc6f8a8caa..cb3a8313c6 100644 --- a/src/toil/leader.py +++ b/src/toil/leader.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/lib/__init__.py b/src/toil/lib/__init__.py index 072d235f28..20da7b0521 100644 --- a/src/toil/lib/__init__.py +++ b/src/toil/lib/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/lib/bioio.py b/src/toil/lib/bioio.py index 73683991cd..9cb109825a 100644 --- a/src/toil/lib/bioio.py +++ b/src/toil/lib/bioio.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/lib/encryption/__init__.py b/src/toil/lib/encryption/__init__.py index 158d237e41..33d9a2e98b 100644 --- a/src/toil/lib/encryption/__init__.py +++ b/src/toil/lib/encryption/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/lib/encryption/_dummy.py b/src/toil/lib/encryption/_dummy.py index 8508919683..1b270b30b2 100644 --- a/src/toil/lib/encryption/_dummy.py +++ b/src/toil/lib/encryption/_dummy.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/lib/encryption/_nacl.py b/src/toil/lib/encryption/_nacl.py index 61780c4dc4..d440a94bbf 100644 --- a/src/toil/lib/encryption/_nacl.py +++ b/src/toil/lib/encryption/_nacl.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/provisioners/__init__.py b/src/toil/provisioners/__init__.py index 072d235f28..20da7b0521 100644 --- a/src/toil/provisioners/__init__.py +++ b/src/toil/provisioners/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/provisioners/abstractProvisioner.py b/src/toil/provisioners/abstractProvisioner.py index c58266a940..568c005b3b 100644 --- a/src/toil/provisioners/abstractProvisioner.py +++ b/src/toil/provisioners/abstractProvisioner.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/provisioners/clusterScaler.py b/src/toil/provisioners/clusterScaler.py index 1f1e0821a7..d9ea5226ae 100644 --- a/src/toil/provisioners/clusterScaler.py +++ b/src/toil/provisioners/clusterScaler.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/realtimeLogger.py b/src/toil/realtimeLogger.py index 18eb42bd6d..1c90adab43 100644 --- a/src/toil/realtimeLogger.py +++ b/src/toil/realtimeLogger.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/resource.py b/src/toil/resource.py index df9395c6d8..79f1509ab1 100644 --- a/src/toil/resource.py +++ b/src/toil/resource.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/__init__.py b/src/toil/test/__init__.py index 616a9dcba8..a51af098ca 100644 --- a/src/toil/test/__init__.py +++ b/src/toil/test/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/batchSystems/__init__.py b/src/toil/test/batchSystems/__init__.py index 072d235f28..20da7b0521 100644 --- a/src/toil/test/batchSystems/__init__.py +++ b/src/toil/test/batchSystems/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/batchSystems/batchSystemTest.py b/src/toil/test/batchSystems/batchSystemTest.py index 9231fb8a8f..921b9b8e9f 100644 --- a/src/toil/test/batchSystems/batchSystemTest.py +++ b/src/toil/test/batchSystems/batchSystemTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/cwl/conftest.py b/src/toil/test/cwl/conftest.py index 6eabda2704..5202ed47ae 100644 --- a/src/toil/test/cwl/conftest.py +++ b/src/toil/test/cwl/conftest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/jobStores/__init__.py b/src/toil/test/jobStores/__init__.py index 072d235f28..20da7b0521 100644 --- a/src/toil/test/jobStores/__init__.py +++ b/src/toil/test/jobStores/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/jobStores/jobStoreTest.py b/src/toil/test/jobStores/jobStoreTest.py index bb690265d4..c5de67434d 100644 --- a/src/toil/test/jobStores/jobStoreTest.py +++ b/src/toil/test/jobStores/jobStoreTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/mesos/__init__.py b/src/toil/test/mesos/__init__.py index 072d235f28..20da7b0521 100644 --- a/src/toil/test/mesos/__init__.py +++ b/src/toil/test/mesos/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/mesos/helloWorld.py b/src/toil/test/mesos/helloWorld.py index 54665b2b55..89c0ad9100 100644 --- a/src/toil/test/mesos/helloWorld.py +++ b/src/toil/test/mesos/helloWorld.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/mesos/mesosTest.py b/src/toil/test/mesos/mesosTest.py index c2043191af..ecb70c9395 100644 --- a/src/toil/test/mesos/mesosTest.py +++ b/src/toil/test/mesos/mesosTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/mesos/stress.py b/src/toil/test/mesos/stress.py index 98eed281c4..5885c0d684 100644 --- a/src/toil/test/mesos/stress.py +++ b/src/toil/test/mesos/stress.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/provisioners/__init__.py b/src/toil/test/provisioners/__init__.py index 072d235f28..20da7b0521 100644 --- a/src/toil/test/provisioners/__init__.py +++ b/src/toil/test/provisioners/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/provisioners/clusterScalerTest.py b/src/toil/test/provisioners/clusterScalerTest.py index 4eb0fda46e..c018cb0d58 100644 --- a/src/toil/test/provisioners/clusterScalerTest.py +++ b/src/toil/test/provisioners/clusterScalerTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/sort/__init__.py b/src/toil/test/sort/__init__.py index 072d235f28..20da7b0521 100644 --- a/src/toil/test/sort/__init__.py +++ b/src/toil/test/sort/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/sort/lib.py b/src/toil/test/sort/lib.py index b42177b985..8a7e73d9a0 100644 --- a/src/toil/test/sort/lib.py +++ b/src/toil/test/sort/lib.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/sort/sort.py b/src/toil/test/sort/sort.py index bdf681d81d..60da5fc5b2 100755 --- a/src/toil/test/sort/sort.py +++ b/src/toil/test/sort/sort.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/sort/sortTest.py b/src/toil/test/sort/sortTest.py index 9c43320e11..c66712033e 100755 --- a/src/toil/test/sort/sortTest.py +++ b/src/toil/test/sort/sortTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/src/__init__.py b/src/toil/test/src/__init__.py index 072d235f28..20da7b0521 100644 --- a/src/toil/test/src/__init__.py +++ b/src/toil/test/src/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/src/helloWorldTest.py b/src/toil/test/src/helloWorldTest.py index 847d7d9566..36832ae3a2 100644 --- a/src/toil/test/src/helloWorldTest.py +++ b/src/toil/test/src/helloWorldTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/src/importExportFileTest.py b/src/toil/test/src/importExportFileTest.py index ee27f4db0d..9a2934873e 100644 --- a/src/toil/test/src/importExportFileTest.py +++ b/src/toil/test/src/importExportFileTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/src/jobCacheEjectionTest.py b/src/toil/test/src/jobCacheEjectionTest.py index fc40e05295..ac4e9f4a23 100644 --- a/src/toil/test/src/jobCacheEjectionTest.py +++ b/src/toil/test/src/jobCacheEjectionTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/src/jobCacheTest.py b/src/toil/test/src/jobCacheTest.py index f618bd032a..a535d76444 100644 --- a/src/toil/test/src/jobCacheTest.py +++ b/src/toil/test/src/jobCacheTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/src/jobEncapsulationTest.py b/src/toil/test/src/jobEncapsulationTest.py index d28805b45a..ffcc28b2af 100644 --- a/src/toil/test/src/jobEncapsulationTest.py +++ b/src/toil/test/src/jobEncapsulationTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/src/jobFileStoreTest.py b/src/toil/test/src/jobFileStoreTest.py index 7d76a171b9..30925549a6 100644 --- a/src/toil/test/src/jobFileStoreTest.py +++ b/src/toil/test/src/jobFileStoreTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/src/jobServiceTest.py b/src/toil/test/src/jobServiceTest.py index 64f6e955f6..763378103c 100644 --- a/src/toil/test/src/jobServiceTest.py +++ b/src/toil/test/src/jobServiceTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/src/jobTest.py b/src/toil/test/src/jobTest.py index 198a8b1771..ccc84cb8f4 100644 --- a/src/toil/test/src/jobTest.py +++ b/src/toil/test/src/jobTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/src/jobWrapperTest.py b/src/toil/test/src/jobWrapperTest.py index 90bc32c2cd..a69c10a5af 100644 --- a/src/toil/test/src/jobWrapperTest.py +++ b/src/toil/test/src/jobWrapperTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/src/promisedRequirementTest.py b/src/toil/test/src/promisedRequirementTest.py index a99f2bee4c..a6de6b785c 100644 --- a/src/toil/test/src/promisedRequirementTest.py +++ b/src/toil/test/src/promisedRequirementTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/src/promisesTest.py b/src/toil/test/src/promisesTest.py index 3eb74a990f..d66579266b 100644 --- a/src/toil/test/src/promisesTest.py +++ b/src/toil/test/src/promisesTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/src/realtimeLoggerTest.py b/src/toil/test/src/realtimeLoggerTest.py index 1be6310d4e..fcca5d101f 100644 --- a/src/toil/test/src/realtimeLoggerTest.py +++ b/src/toil/test/src/realtimeLoggerTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/src/regularLogTest.py b/src/toil/test/src/regularLogTest.py index 6297c87500..d822a64cef 100644 --- a/src/toil/test/src/regularLogTest.py +++ b/src/toil/test/src/regularLogTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/src/resourceTest.py b/src/toil/test/src/resourceTest.py index 2add93ce48..18c55eb5ae 100644 --- a/src/toil/test/src/resourceTest.py +++ b/src/toil/test/src/resourceTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/src/retainTempDirTest.py b/src/toil/test/src/retainTempDirTest.py index 4ac97be68e..5cf8d9ec12 100644 --- a/src/toil/test/src/retainTempDirTest.py +++ b/src/toil/test/src/retainTempDirTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/src/toilContextManagerTest.py b/src/toil/test/src/toilContextManagerTest.py index 7ef0e682c9..93db8024e9 100644 --- a/src/toil/test/src/toilContextManagerTest.py +++ b/src/toil/test/src/toilContextManagerTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/src/userDefinedJobArgTypeTest.py b/src/toil/test/src/userDefinedJobArgTypeTest.py index fd7f4e2169..49998a83a4 100644 --- a/src/toil/test/src/userDefinedJobArgTypeTest.py +++ b/src/toil/test/src/userDefinedJobArgTypeTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/utils/__init__.py b/src/toil/test/utils/__init__.py index 072d235f28..20da7b0521 100644 --- a/src/toil/test/utils/__init__.py +++ b/src/toil/test/utils/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/test/utils/utilsTest.py b/src/toil/test/utils/utilsTest.py index 8c55dfac38..d41d35727e 100644 --- a/src/toil/test/utils/utilsTest.py +++ b/src/toil/test/utils/utilsTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/toilState.py b/src/toil/toilState.py index d0af43894a..26a2789da0 100644 --- a/src/toil/toilState.py +++ b/src/toil/toilState.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/utils/toilClean.py b/src/toil/utils/toilClean.py index b1da5e39de..8324cf7a3c 100644 --- a/src/toil/utils/toilClean.py +++ b/src/toil/utils/toilClean.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/utils/toilKill.py b/src/toil/utils/toilKill.py index 767a5bb373..d6eefcdd90 100644 --- a/src/toil/utils/toilKill.py +++ b/src/toil/utils/toilKill.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/utils/toilStats.py b/src/toil/utils/toilStats.py index f39a396206..ee6ed34a6d 100644 --- a/src/toil/utils/toilStats.py +++ b/src/toil/utils/toilStats.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/utils/toilStatus.py b/src/toil/utils/toilStatus.py index 4ce9c7a524..4f3d56e280 100644 --- a/src/toil/utils/toilStatus.py +++ b/src/toil/utils/toilStatus.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/version.py b/src/toil/version.py index 395402d98d..7b1fd0c562 100644 --- a/src/toil/version.py +++ b/src/toil/version.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/toil/worker.py b/src/toil/worker.py index 74d1369942..0c859d6262 100644 --- a/src/toil/worker.py +++ b/src/toil/worker.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 UCSC Computational Genomics Lab +# Copyright (C) 2015-2016 Regents of the University of California # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/version.py b/version.py deleted file mode 120000 index b4e50d74c4..0000000000 --- a/version.py +++ /dev/null @@ -1 +0,0 @@ -src/toil/version.py \ No newline at end of file diff --git a/version.py b/version.py new file mode 100755 index 0000000000..7b1fd0c562 --- /dev/null +++ b/version.py @@ -0,0 +1,15 @@ +# Copyright (C) 2015-2016 Regents of the University of California +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +version = '3.2.0a2'