Skip to content

Commit

Permalink
Merge branch 'update-params-2024' of github.com:daler/trackhub into u…
Browse files Browse the repository at this point in the history
…pdate-params-2024
  • Loading branch information
daler committed Apr 20, 2024
2 parents 0e62ce1 + 01f861a commit 5d02016
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ jobs:
- name: build new conda env
run: |
eval "$(conda shell.bash hook)"
conda create -p ./env -y python=${{ matrix.python-version }} --file test-requirements.txt --channel conda-forge --channel bioconda
conda install -n base mamba -y --channel conda-forge
mamba create -p ./env -y python=${{ matrix.python-version }} --file test-requirements.txt --channel conda-forge --channel bioconda
conda activate ./env
pip install -e .
Expand Down
2 changes: 1 addition & 1 deletion test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pybedtools
pytest
sphinx>4
pygments
sphinx_rtd_theme
sphinx_rtd_theme>=1.2.2
ucsc-bedgraphtobigwig
ucsc-fatotwobit
ucsc-bedtobigbed
Expand Down
2 changes: 1 addition & 1 deletion trackhub/trackhub_from_excel
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ def create_example(filename):
# In Python >=3.9, importlib.resources.files would work, but the method
# used here is agnostic to Python versions.
example_file = os.path.join(
os.path.dirname(sys.modules['trackhub'].__file),
os.path.dirname(sys.modules['trackhub'].__file__),
"example.xlsx"
)
wb = load_workbook(example_file, data_only=True)
Expand Down

0 comments on commit 5d02016

Please sign in to comment.