Skip to content

Commit

Permalink
Merge branch 'version1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
bmatern committed Jul 6, 2017
2 parents b7c0cd6 + 748cb01 commit 852eb56
Show file tree
Hide file tree
Showing 19 changed files with 609 additions and 673 deletions.
9 changes: 4 additions & 5 deletions HEADER
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
# This file is part of EMBL-HLA-Submission.
# This file is part of saddle-bags.
#
# EMBL-HLA-Submission is free software: you can redistribute it and/or modify
# saddle-bags is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# EMBL-HLA-Submission is distributed in the hope that it will be useful,
# saddle-bags is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with EMBL-HLA-Submission. If not, see <http://www.gnu.org/licenses/>.
# along with saddle-bags. If not, see <http://www.gnu.org/licenses/>.

# Version 1.0
8 changes: 4 additions & 4 deletions MakeExecutables.bat
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
:: This file is part of EMBL-HLA-Submission.
:: This file is part of saddle-bags.
::
:: EMBL-HLA-Submission is free software: you can redistribute it and/or modify
:: saddle-bags is free software: you can redistribute it and/or modify
:: it under the terms of the GNU Lesser General Public License as published by
:: the Free Software Foundation, either version 3 of the License, or
:: (at your option) any later version.
::
:: EMBL-HLA-Submission is distributed in the hope that it will be useful,
:: saddle-bags is distributed in the hope that it will be useful,
:: but WITHOUT ANY WARRANTY; without even the implied warranty of
:: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
:: GNU Lesser General Public License for more details.
::
:: You should have received a copy of the GNU Lesser General Public License
:: along with EMBL-HLA-Submission. If not, see <http://www.gnu.org/licenses/>.
:: along with saddle-bags. If not, see <http://www.gnu.org/licenses/>.

:: Version 1.0

Expand Down
9 changes: 4 additions & 5 deletions MakeExecutables.sh
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
# This file is part of EMBL-HLA-Submission.
# This file is part of saddle-bags.
#
# EMBL-HLA-Submission is free software: you can redistribute it and/or modify
# saddle-bags is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# EMBL-HLA-Submission is distributed in the hope that it will be useful,
# saddle-bags is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with EMBL-HLA-Submission. If not, see <http://www.gnu.org/licenses/>.
# along with saddle-bags. If not, see <http://www.gnu.org/licenses/>.

# Version 1.0

# This isn't working in it's current state. The spec file is apparently just for windows,
# it's still pulling in windows DLLs.
Expand Down
10 changes: 5 additions & 5 deletions Run_allele_submission.bat
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
:: This file is part of EMBL-HLA-Submission.
:: This file is part of saddle-bags.
::
:: EMBL-HLA-Submission is free software: you can redistribute it and/or modify
:: saddle-bags is free software: you can redistribute it and/or modify
:: it under the terms of the GNU Lesser General Public License as published by
:: the Free Software Foundation, either version 3 of the License, or
:: (at your option) any later version.
::
:: EMBL-HLA-Submission is distributed in the hope that it will be useful,
:: saddle-bags is distributed in the hope that it will be useful,
:: but WITHOUT ANY WARRANTY; without even the implied warranty of
:: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
:: GNU Lesser General Public License for more details.
::
:: You should have received a copy of the GNU Lesser General Public License
:: along with EMBL-HLA-Submission. If not, see <http://www.gnu.org/licenses/>.
:: along with saddle-bags. If not, see <http://www.gnu.org/licenses/>.

:: Version 1.0

:: See the file README.MD for how to set up your anaconda environment.

activate AlleleSubEnvironment && cd src && python AlleleSubmissionEMBL.py && deactivate
activate AlleleSubEnvironment && cd src && python AlleleSubmissionMain.py && deactivate

10 changes: 4 additions & 6 deletions Run_allele_submission.sh
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
# This file is part of EMBL-HLA-Submission.
# This file is part of saddle-bags.
#
# EMBL-HLA-Submission is free software: you can redistribute it and/or modify
# saddle-bags is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# EMBL-HLA-Submission is distributed in the hope that it will be useful,
# saddle-bags is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with EMBL-HLA-Submission. If not, see <http://www.gnu.org/licenses/>.

# Version 1.0
# along with saddle-bags. If not, see <http://www.gnu.org/licenses/>.

# See the file README.MD for how to set up your anaconda environment.

Expand Down
Loading

0 comments on commit 852eb56

Please sign in to comment.