Skip to content

Commit

Permalink
Move to MIT license, v0.9 (fix #286) (#360)
Browse files Browse the repository at this point in the history
* switch to MIT license, following bedtools lead

* update version and changelog

* rm remaining travis-ci config and script

* include py3.9 in tests
  • Loading branch information
daler authored Jan 24, 2022
1 parent f1ae2e7 commit 45eddc0
Show file tree
Hide file tree
Showing 11 changed files with 56 additions and 175 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
build-and-test:
strategy:
matrix:
python-version: [3.6, 3.7, 3.8]
python-version: [3.6, 3.7, 3.8, 3.9]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand Down
40 changes: 0 additions & 40 deletions .travis.yml

This file was deleted.

31 changes: 17 additions & 14 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
Wrapper for Aaron Quinlan's BEDtools, plus other useful methods for working
with BED, BAM, GFF, and VCF files
Wrapper -- and more -- for BEDtools

Copyright (c) 2010-2015 Ryan Dale
Copyright (c) 2010-2022 Ryan Dale
All rights reserved.

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
112 changes: 0 additions & 112 deletions condatest.sh

This file was deleted.

29 changes: 29 additions & 0 deletions docs/source/changes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,35 @@
Changelog
=========

Changes in v0.9
---------------

2022-01-23

The biggest change is that pybedtools is now under the MIT license, following
the lead of BEDTools itself.

Bugfixes:

* Bugfix: `Interval` objects representing VCF lines now have their `start`
attribute correctly zero-based, as indicated in the docs and consistent with
other 1-based formats. See `#355 <https://github.com/daler/pybedtools/issues/355>`_.
* Bugfix: Manually creating `Interval` objects using the `otherfields` argument
now correctly converts to C++ strings. See `#348
<https://github.com/daler/pybedtools/issues/348>`_.
* Bugfix: Workaround for `BedTool.intersect` which in some versions of BEDTools
requires a specific order of arguments. Fixes `#345
<https://github.com/daler/pybedtools/issues/345>`_ and also is a better way
of addressing `#81 <https://github.com/daler/pybedtools/issues/81>`_.

Code cleanup:

* Removed some remnants of Python 2.7 support (thanks @DavidCain)
* Updates to setup.py classifiers to better reflect state of code (thanks @DavidCain)
* Sorted filenames in setup.py to improve reproducibility of build (thanks @lamby)
* Tests converted to run on GitHub Actions (see `#339
<https://github.com/daler/pybedtools/pull/339>`_).

Changes in v0.8.2
-----------------

Expand Down
5 changes: 3 additions & 2 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@



`pybedtools` is released under the GPLv2 license; see LICENSE.txt for more
info.
As of 2022, `pybedtools` is released under the MIT license; see LICENSE.txt for
more info.


.. note::

Expand Down
2 changes: 1 addition & 1 deletion pybedtools/include/bedFile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Department of Biochemistry and Molecular Genetics
University of Virginia
[email protected]
Licensed under the GNU General Public License 2.0 license.
Licensed under the MIT license (as of Jan 2022)
******************************************************************************/
#include "bedFile.h"

Expand Down
2 changes: 1 addition & 1 deletion pybedtools/include/bedFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
University of Virginia
[email protected]
Licensed under the GNU General Public License 2.0 license.
Licensed under the MIT license (as of Jan 2022)
******************************************************************************/
#ifndef BEDFILE_H
#define BEDFILE_H
Expand Down
2 changes: 1 addition & 1 deletion pybedtools/include/fileType.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
University of Virginia
[email protected]
Licensed under the GNU General Public License 2.0 license.
Licensed under the MIT license (as of Jan 2022)
******************************************************************************/

#include "fileType.h"
Expand Down
2 changes: 1 addition & 1 deletion pybedtools/include/fileType.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
University of Virginia
[email protected]
Licensed under the GNU General Public License 2.0 license.
Licensed under the MIT license (as of Jan 2022)
******************************************************************************/
#ifndef FILETYPE_H
#define FILETYPE_H
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@


MAJ = 0
MIN = 8
REV = 2
MIN = 9
REV = 0
VERSION = '%d.%d.%d' % (MAJ, MIN, REV)


Expand Down

0 comments on commit 45eddc0

Please sign in to comment.