search

haddocking / pdb-tools

A dependency-free cross-platform swiss army knife for PDB files.
https://haddocking.github.io/pdb-tools/
Apache License 2.0
385 stars 113 forks source link

Filters out *pyc files generated with python2.7 #32

Closed mtrellet closed 5 years ago

mtrellet commented 5 years ago

Solves #31
Another solution would have been to prevent the creation of *pyc files using

import sys
sys.dont_write_bytecode = True

But I don't think we want to prevent it. I've also added *pyc files to be ignored by git.

PS: Seems like the fork divergence kind of sticks to all of my attempts to sync the repos. I guess I'll change gear for the future devs and create branch directly from haddocking to avoid the mess. Deleting and re-creating the fork might be a solution but will certainly discard any commit referencing the old fork... At least it seems that upon merging the commit history is not too messy...

codecov[bot] commented 5 years ago

Codecov Report

Merging #32 into master will not change coverage. The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master      #32   +/-   ##
=======================================
  Coverage   81.89%   81.89%           
=======================================
  Files          44       44           
  Lines        3524     3524           
  Branches      742      742           
=======================================
  Hits         2886     2886           
  Misses        451      451           
  Partials      187      187

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update 824bb76...b5bf48c. Read the comment docs.

JoaoRodrigues commented 5 years ago

I split the changes to .gitignore and setup.py in two separate commits. Committing from my PR.

Seems indeed like you have some weird history issues. Try to figure out when is the last common point between the two master branches and do git reset followed by git pull. You can stash the changes and make a new branch if you want to keep them somehow.