Rebase from upstream, remove Python 2 from CI, and set use_2to3=False #81

robertbruntz · 2021-10-11T18:49:04Z

Rebased 'master' branch on fork by Robert Bruntz onto 'master' branch on main repo.

Have to create a file inside a dir to create the dir

robertbruntz · 2021-10-13T14:23:40Z

I reviewed all of the changes. Main changes are:

removing Python 2 testing in .github/workflows/test.yml (in the first step toward completely removing Python 2 support)
changing "use_2to3=True" to "use_2to3=False" in setup.py, to address incompatibility with setuptools >= 58.0.0 (see cannot be installed with latest setuptools #79 and [BUG] Should fail hard when installing packages that want 2to3 pypa/setuptools#2769 )
some changes to the installation script
a lot of changes to docs files, mostly extra LFs, which probably came about merge conflicts from me rebasing my master branch onto the main repo master branch, to get the 2 sync'd up (and some other changes that I don't think matter)

As per discussion with Ryan, this PR does not need further review, so I'm merging it myself.

robertbruntz and others added 8 commits October 11, 2021 11:10

Creating docs dir

95cce72

Have to create a file inside a dir to create the dir

Initial commit - dqsegdb documentation built 2020.03.09a

c9040c9

Create empty .nojekyll file, to enable JavaScript

a41ddbc

Create .nojekyll

7951194

Some updates to blocks 1 and 2

aac15e4

Added code for ABRT

12b6dfe

Remove Python 2.7 from CI tests

1e339f6

Change use_2to3 from True to False, for setuptools >= 58 compatibility

16548bf

robertbruntz merged commit 4a90871 into ligovirgo:master Oct 13, 2021

robertbruntz deleted the rebase_from_upstream branch October 13, 2021 14:24

robertbruntz changed the title ~~Rebase from upstream~~ Rebase from upstream, remove Python 2 from CI, and set use_2to3=False Oct 13, 2021

robertbruntz mentioned this pull request Oct 13, 2021

use pyproject.toml to force old setuptools for build #80

Closed

Provide feedback