Skip to content

(improvement) Pull from current branch on remote #137

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 20, 2023
Merged

(improvement) Pull from current branch on remote #137

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions notebooker/utils/conversion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ def ipython_to_pdf(raw_executed_ipynb: str, report_title: str, hide_code: bool =
resources["metadata"] = ResourcesDict()
resources["metadata"]["name"] = report_title
pdf, _ = pdf_exporter.from_notebook_node(
nbformat.reads(raw_executed_ipynb, as_version=nbformat.v4.nbformat),
resources=resources,
nbformat.reads(raw_executed_ipynb, as_version=nbformat.v4.nbformat), resources=resources
)
return pdf

Expand All @@ -68,11 +67,11 @@ def _output_ipynb_name(report_name: str) -> str:

def _git_has_changes(repo: git.repo.Repo):
repo.git.fetch()
return repo.commit("origin/master").hexsha != repo.commit("HEAD").hexsha
return repo.commit(f"{repo.remotes[0].name}/{repo.active_branch.name}").hexsha != repo.commit("HEAD").hexsha


def _git_pull_latest(repo: git.repo.Repo):
repo.git.pull("origin", "master")
repo.git.pull()


def _template(report_path: str, py_template_dir: AnyStr) -> AnyStr:
Expand Down