Skip to content

Merge bugfix4.2 branch - #819

Merged
sbliven merged 66 commits into
biojava:masterfrom
sbliven:merge-bugfix
Jan 2, 2019
Merged

Merge bugfix4.2 branch#819
sbliven merged 66 commits into
biojava:masterfrom
sbliven:merge-bugfix

Conversation

@sbliven

@sbliven sbliven commented Jan 2, 2019

Copy link
Copy Markdown
Member

It's been a while since merging the bugfix4.2 branch into master, and some changes have accumulated.

biojava-genome/src/main/java/org/biojava/nbio/genome/util/ChromosomeMappingTools.java and biojava-genome/src/test/java/org/biojava/nbio/genome/TestGenomeMapping.java had large conflicts and I mostly just kept the 5.x version. Hopefully no important changes get lost.

Matt Larson and others added 30 commits November 30, 2016 14:39
…usually indicative of misformated lines.

Added line length checks within the LINK and CONECT parsing blocks to allow for short lines to be parsed.
…e position on mRNA for the genes leaving on the forward strand
Updating to latest RCSB URLs for 4.2.x
josemduarte and others added 26 commits December 7, 2017 17:44
log slow downloads upon start
The main change hasn't been implemented, so we want tests to fail.
However, the tests exposed some NPE and IO exceptions. These are now
fixed, so the tests fail in the expected manner.

- Use ATP ligand, which is not covered by the ReducedChemCompProvider
- Use the ReducedChemCompProvider as a fallback consistently, preventing
  null chemComp
- Defensive parsing in SimpleMMcifConsumer
- Robust test, doesn't require internet!
Files less than 40 bytes are deleted to allow for gzip headers.

This addresses biojava#703
This is necessary when changing the cache path.
Use GlobalsHelper.pushState()/restoreState() before and after tests
to ensure that state isn't carried between tests.

This is applied to the AtomCacheTest to fix test regressions
while simplifying the code.
Maven runs tests with a clean environment, so we can't restore PDB_DIR
4LNC was updated to remove the X-Ray experimental method.
This switches the test to 6F2Q, which uses both Neutron & Xray.
Parsing such a file again throws a NumberFormatException.
Further work/discussion of this issue is on biojava#775, but it was blocking
the merging of biojava#774.
Fix biojava#703: Recover from empty structure files in PDB_CACHE_DIR
Uniprot now redirects to https. This fixes the URL, as well as adds
code to do the redirect
@sbliven

sbliven commented Jan 2, 2019

Copy link
Copy Markdown
Member Author

This still has some test failures.

- New feature to re-download too-short files broke some negative tests
- Switched to authId for some chains
@sbliven

sbliven commented Jan 2, 2019

Copy link
Copy Markdown
Member Author

OK, good to go now.

@sbliven
sbliven merged commit f9bfd93 into biojava:master Jan 2, 2019
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.

6 participants