Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor!: Move ISA-Tab templates into a separate repository (#96) #170

Merged
merged 15 commits into from
Sep 18, 2023

Conversation

mikkonie
Copy link
Contributor

This is a pull request for #96.

The new separate template repo cubi-isa-templates can be found here.

This is still a draft, please comment or improve as you need fit. I haven't published the package on PyPI yet and I don't recommend merging this until there's a proper PyPI dependency.

I've been unable to test this locally because I run into some errors with varfish-cli dependencies (see below). Some cubi-tk expert might want to tell me what I'm doing wrong.

@mikkonie
Copy link
Contributor Author

Getting the following conflict locally: pkg_resources.ContextualVersionConflict: (attrs 23.1.0 (/home/mikkopen/.virtualenvs/cubi-tk/lib/python3.8/site-packages), Requirement.parse('attrs<22.0,>=21.2.0'), {'varfish-cli'})

Once I attempt installing the expected depdndencies, the result is:

pkg_resources.ContextualVersionConflict: (attrs 23.1.0 (/home/mikkopen/.virtualenvs/cubi-tk/lib/python3.8/site-packages), Requirement.parse('attrs<22.0,>=21.2.0'), {'varfish-cli'})

Traceback (most recent call last):
  File "/home/mikkopen/.virtualenvs/cubi-tk/bin/cubi-tk", line 11, in <module>
    load_entry_point('cubi-tk', 'console_scripts', 'cubi-tk')()
  File "/home/mikkopen/.virtualenvs/cubi-tk/lib/python3.8/site-packages/pkg_resources/__init__.py", line 489, in load_entry_point
    return get_distribution(dist).load_entry_point(group, name)
  File "/home/mikkopen/.virtualenvs/cubi-tk/lib/python3.8/site-packages/pkg_resources/__init__.py", line 2852, in load_entry_point
    return ep.load()
  File "/home/mikkopen/.virtualenvs/cubi-tk/lib/python3.8/site-packages/pkg_resources/__init__.py", line 2443, in load
    return self.resolve()
  File "/home/mikkopen/.virtualenvs/cubi-tk/lib/python3.8/site-packages/pkg_resources/__init__.py", line 2449, in resolve
    module = __import__(self.module_name, fromlist=['__name__'], level=0)
  File "/home/mikkopen/code/cubi-tk/cubi_tk/__main__.py", line 26, in <module>
    from .sea_snap import run as run_sea_snap
  File "/home/mikkopen/code/cubi-tk/cubi_tk/sea_snap/__init__.py", line 26, in <module>
    from .itransfer_raw_data import setup_argparse as setup_argparse_itransfer_raw_data
  File "/home/mikkopen/code/cubi-tk/cubi_tk/sea_snap/itransfer_raw_data.py", line 7, in <module>
    from ..snappy.itransfer_common import SnappyItransferCommandBase
  File "/home/mikkopen/code/cubi-tk/cubi_tk/snappy/__init__.py", line 56, in <module>
    from .varfish_upload import setup_argparse as setup_argparse_varfish_upload
  File "/home/mikkopen/code/cubi-tk/cubi_tk/snappy/varfish_upload.py", line 11, in <module>
    from varfish_cli.__main__ import main as varfish_cli_main
  File "/home/mikkopen/.virtualenvs/cubi-tk/lib/python3.8/site-packages/varfish_cli/__main__.py", line 13, in <module>
    from varfish_cli.case import run as run_case
  File "/home/mikkopen/.virtualenvs/cubi-tk/lib/python3.8/site-packages/varfish_cli/case/__init__.py", line 9, in <module>
    from varfish_cli.case.list_case import setup_argparse as setup_argparse_list
  File "/home/mikkopen/.virtualenvs/cubi-tk/lib/python3.8/site-packages/varfish_cli/case/list_case.py", line 9, in <module>
    import attrs
ModuleNotFoundError: No module named 'attrs'

@github-actions
Copy link
Contributor

Please format your code with black: make black.

@sellth
Copy link
Contributor

sellth commented May 22, 2023

Tests run fine for me. Had similar issues until I realised that pytest was not called from my venv but from .local/bin

@sellth sellth changed the title Move ISA-Tab templates into a separate repository (#96) Refactor: Move ISA-Tab templates into a separate repository (#96) Jun 7, 2023
@sellth sellth changed the title Refactor: Move ISA-Tab templates into a separate repository (#96) refactor: Move ISA-Tab templates into a separate repository (#96) Jun 7, 2023
@sellth sellth marked this pull request as ready for review September 18, 2023 11:22
@sellth sellth requested a review from ericblanc20 September 18, 2023 11:26
@codecov
Copy link

codecov bot commented Sep 18, 2023

Codecov Report

Patch coverage: 93.10% and project coverage change: -0.11% ⚠️

Comparison is base (3939f83) 75.59% compared to head (76fa3cc) 75.48%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #170      +/-   ##
==========================================
- Coverage   75.59%   75.48%   -0.11%     
==========================================
  Files          98       98              
  Lines        7806     7767      -39     
==========================================
- Hits         5901     5863      -38     
+ Misses       1905     1904       -1     
Files Changed Coverage Δ
cubi_tk/isa_tpl/__init__.py 95.00% <71.42%> (ø)
cubi_tk/archive/readme.py 83.23% <100.00%> (ø)
tests/test_isa_tpl.py 100.00% <100.00%> (ø)

... and 4 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sellth sellth merged commit 409ac9c into main Sep 18, 2023
7 of 8 checks passed
@sellth sellth deleted the 96-move-isa-templates branch September 18, 2023 14:20
@sellth sellth changed the title refactor: Move ISA-Tab templates into a separate repository (#96) refactor!: Move ISA-Tab templates into a separate repository (#96) Oct 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Accommodate cookiecutter templates repository Move cookiecutter templates to their own repository
3 participants