Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: iPsychonaut/FunDiSPipe
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.96
Choose a base ref
...
head repository: iPsychonaut/FunDiSPipe
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 20 commits
  • 10 files changed
  • 1 contributor

Commits on Feb 15, 2024

  1. Updated MycoMap_Summarize.py to allow for command line execution.

    @iPsychonaut
    iPsychonaut committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    28e65bf View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from iPsychonaut/MycoMap_Summarize_CL 

    Updated MycoMap_Summarize.py to allow for command line execution.
    @iPsychonaut
    iPsychonaut committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    3425836 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2024

  1. Update FunDiS_GUI.py 

    Updated to include search for minibar.py and linked RiC in haplotype phasing to default Summarize RiC. 

Signed-off-by: Ian M. B. <99409346+iPsychonaut@users.noreply.github.com>
    @iPsychonaut
    iPsychonaut committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    0fd41e0 View commit details
    Browse the repository at this point in the history

  2. Update FunDiS_Minibar.py 

    Updated to appropriately manage searching for minibar.py

Signed-off-by: Ian M. B. <99409346+iPsychonaut@users.noreply.github.com>
    @iPsychonaut
    iPsychonaut committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    df97134 View commit details
    Browse the repository at this point in the history

  3. Update FunDiS_NGSpeciesID.py 

    Linked RiC in haplotype phasing to RiC for Summary

Signed-off-by: Ian M. B. <99409346+iPsychonaut@users.noreply.github.com>
    @iPsychonaut
    iPsychonaut committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    f647215 View commit details
    Browse the repository at this point in the history

  4. Update FunDiS_hap_phase.py 

    Linked RiC in haplotype phasing to RiC for Summary

Signed-off-by: Ian M. B. <99409346+iPsychonaut@users.noreply.github.com>
    @iPsychonaut
    iPsychonaut committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    3b8689c View commit details
    Browse the repository at this point in the history

  5. Update FunDiS_Tools.py 

    Updated to include find_file

Signed-off-by: Ian M. B. <99409346+iPsychonaut@users.noreply.github.com>
    @iPsychonaut
    iPsychonaut committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    f4d9b52 View commit details
    Browse the repository at this point in the history

  6. Update MycoMap_Summarize.py 

    Updated for sanity check

Signed-off-by: Ian M. B. <99409346+iPsychonaut@users.noreply.github.com>
    @iPsychonaut
    iPsychonaut committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    8043832 View commit details
    Browse the repository at this point in the history

  7. Update fundis_setup.sh 

    Removed Conda updating, will prompt user to have current Conda in README

Signed-off-by: Ian M. B. <99409346+iPsychonaut@users.noreply.github.com>
    @iPsychonaut
    iPsychonaut committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    f6e1d19 View commit details
    Browse the repository at this point in the history

  8. Update README.md 

    Updated to require Conda be installed before running

Signed-off-by: Ian M. B. <99409346+iPsychonaut@users.noreply.github.com>
    @iPsychonaut
    iPsychonaut committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    e569255 View commit details
    Browse the repository at this point in the history

  9. Update run_medaka.sh 

    Removed:

# Set the memory allocation for samtools sort (e.g., 4G per thread)
export SAMTOOLS_SORT_MEMORY=4G

Signed-off-by: Ian M. B. <99409346+iPsychonaut@users.noreply.github.com>
    @iPsychonaut
    iPsychonaut committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    9cd5dd0 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2024

  1. Updated FunDiS_Minbar.py name, Corrected run_medaka.sh to properly in… 

    …it and handle conda environment calls, Corrected logging in GUI even if file isn't 'selected', i.e. it is pasted into the cell
    @iPsychonaut
    iPsychonaut committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    ea4ad2e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from iPsychonaut/HS_second_round 

    Updated FunDiS_Minbar.py name, Corrected run_medaka.sh to properly in…
    @iPsychonaut
    iPsychonaut committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    9f0ddbb View commit details
    Browse the repository at this point in the history

  3. Update FunDiS_GUI.py 

    Updated minibar.py to minibar_og.py

Signed-off-by: Ian M. B. <99409346+iPsychonaut@users.noreply.github.com>
    @iPsychonaut
    iPsychonaut committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    9cc094f View commit details
    Browse the repository at this point in the history

  4. Upated minibar.py to minibar_og.py for targeted searching

    @iPsychonaut
    iPsychonaut committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    c9e07d2 View commit details
    Browse the repository at this point in the history

  5. Update FunDiS_GUI.py 

    Corrected to have medaka search in main Gui.

Signed-off-by: Ian M. B. <99409346+iPsychonaut@users.noreply.github.com>
    @iPsychonaut
    iPsychonaut committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    4694e78 View commit details
    Browse the repository at this point in the history

  6. Update FunDiS_NGSpeciesID.py 

    Corrected to have medaka search in main Gui.

Signed-off-by: Ian M. B. <99409346+iPsychonaut@users.noreply.github.com>
    @iPsychonaut
    iPsychonaut committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    ea73f05 View commit details
    Browse the repository at this point in the history

  7. Corrected conda init medaka to conda init bash

    @iPsychonaut
    iPsychonaut committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    6ab433f View commit details
    Browse the repository at this point in the history

  8. Merge pull request #3 from iPsychonaut/HS_Round_2 

    Corrected conda init medaka to conda init bash
    @iPsychonaut
    iPsychonaut committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    4ee8154 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2024

  1. Update fundis_setup.sh 

    Improved installation logic

Signed-off-by: Ian M. B. <99409346+iPsychonaut@users.noreply.github.com>
    @iPsychonaut
    iPsychonaut committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    42fbaa3 View commit details
    Browse the repository at this point in the history
Loading