Skip to content

Commit

Permalink
Merge pull request #394 from cogent3/release
Browse files Browse the repository at this point in the history
Release 2019.11.15a
  • Loading branch information
GavinHuttley committed Nov 15, 2019
2 parents 9168c9b + 6810560 commit 5fc492b
Show file tree
Hide file tree
Showing 292 changed files with 395 additions and 358 deletions.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ Our `cogent3.app` module provides a very different approach to using the library

## Installation?

We will be up on PyPI as soon as the documentation is written, until then it's install from this repo
```bash
$ pip install cogent3
```

### Installing the development version

```bash
$ pip install git+https://github.com/cogent3/cogent3.git@master#egg=cogent3
Expand Down
56 changes: 42 additions & 14 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ variables:
CIBW_BEFORE_BUILD: python -m pip install --upgrade pip

jobs:
- job: Linux_Test
- job: Linux_Test_py36
pool: {vmImage: 'ubuntu-latest'}
steps:
- task: UsePythonVersion@0
Expand All @@ -16,23 +16,37 @@ jobs:
python -m pip install .[dev] codecov
- task: UsePythonVersion@0
inputs:
versionSpec: '3.8'
versionSpec: '3.6'
- bash: |
tox -e py38
tox -e py36
codecov
- job: Linux_Test_py37
pool: {vmImage: 'ubuntu-latest'}
steps:
- task: UsePythonVersion@0
- bash: |
python -m pip install --upgrade pip
python -m pip install .[dev] codecov
- task: UsePythonVersion@0
inputs:
versionSpec: '3.7'
- bash: |
tox -e py37
codecov
- job: Linux_Test_py38
pool: {vmImage: 'ubuntu-latest'}
steps:
- task: UsePythonVersion@0
- bash: |
python -m pip install --upgrade pip
python -m pip install .[dev] codecov
- task: UsePythonVersion@0
inputs:
versionSpec: '3.6'
versionSpec: '3.8'
- bash: |
tox -e py36
tox -e py38
codecov
- job: MacOS_Test
- job: MacOS_Test_py36
pool: {vmImage: 'macos-latest'}
steps:
- task: UsePythonVersion@0
Expand All @@ -41,23 +55,37 @@ jobs:
python -m pip install .[dev] codecov
- task: UsePythonVersion@0
inputs:
versionSpec: '3.8'
versionSpec: '3.6'
- bash: |
tox -e py38
tox -e py36
codecov
- job: MacOS_Test_py37
pool: {vmImage: 'macos-latest'}
steps:
- task: UsePythonVersion@0
- bash: |
python -m pip install --upgrade pip
python -m pip install .[dev] codecov
- task: UsePythonVersion@0
inputs:
versionSpec: '3.7'
- bash: |
tox -e py37
codecov
- job: MacOS_Test_py38
pool: {vmImage: 'macos-latest'}
steps:
- task: UsePythonVersion@0
- bash: |
python -m pip install --upgrade pip
python -m pip install .[dev] codecov
- task: UsePythonVersion@0
inputs:
versionSpec: '3.6'
versionSpec: '3.8'
- bash: |
tox -e py36
tox -e py38
codecov
- job: Windows_Test
- job: Windows_Test_py37
pool: {vmImage: 'windows-latest'}
steps:
- {task: UsePythonVersion@0, inputs: {versionSpec: '3.7', architecture: x86}}
Expand All @@ -76,7 +104,7 @@ jobs:
- {task: UsePythonVersion@0, inputs: {versionSpec: '3.8'}}
- bash: |
python -m pip install --upgrade pip
python -m pip install cibuildwheel==1.0.0 numpy
python -m pip install cibuildwheel numpy
cibuildwheel --output-dir wheelhouse .
python setup.py sdist
cp dist/*.gz wheelhouse/.
Expand All @@ -91,7 +119,7 @@ jobs:
- {task: UsePythonVersion@0, inputs: {versionSpec: '3.8'}}
- bash: |
python -m pip install --upgrade pip
python -m pip install cibuildwheel==1.0.0 numpy
python -m pip install cibuildwheel numpy
cibuildwheel --output-dir wheelhouse .
- task: PublishBuildArtifacts@1
inputs: {pathtoPublish: 'wheelhouse'}
Expand All @@ -107,7 +135,7 @@ jobs:
- {task: UsePythonVersion@0, inputs: {versionSpec: '3.8', architecture: x64}}
- bash: |
python -m pip install --upgrade pip
python -m pip install cibuildwheel==1.0.0 numpy
python -m pip install cibuildwheel numpy
cibuildwheel --output-dir wheelhouse .
- task: PublishBuildArtifacts@1
inputs: {pathtoPublish: 'wheelhouse'}
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

version = ""

release = "2019.10.24a"
release = "2019.11.11a"

# exclude_trees = ["_build"]

Expand Down
5 changes: 4 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"Daniel McDonald",
]
__license__ = "BSD-3"
__version__ = "2019.10.24a"
__version__ = "2019.11.11a"
__maintainer__ = "Peter Maxwell"
__email__ = "pm67nz@gmail.com"
__status__ = "Production"
Expand Down Expand Up @@ -163,6 +163,9 @@ def CythonExtension(module_name, **kw):
"Topic :: Scientific/Engineering :: Bio-Informatics",
"Topic :: Software Development :: Libraries :: Python Modules",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
],
packages=find_packages(where="src"),
package_dir={"": PACKAGE_DIR},
Expand Down
2 changes: 1 addition & 1 deletion src/cogent3/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"Daniel McDonald",
]
__license__ = "BSD-3"
__version__ = "2019.10.24a"
__version__ = "2019.11.11a"
__maintainer__ = "Gavin Huttley"
__email__ = "gavin.huttley@anu.edu.au"
__status__ = "Production"
Expand Down
2 changes: 1 addition & 1 deletion src/cogent3/align/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
__copyright__ = "Copyright 2007-2019, The Cogent Project"
__credits__ = ["Peter Maxwell", "Jeremy Widmann", "Gavin Huttley", "Rob Knight"]
__license__ = "BSD-3"
__version__ = "2019.10.24a"
__version__ = "2019.11.11a"
__maintainer__ = "Gavin Huttley"
__email__ = "gavin.huttley@anu.edu.au"
__status__ = "Production"
18 changes: 9 additions & 9 deletions src/cogent3/align/_compare.c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/cogent3/align/_compare.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"""

version_info = (1, 3)
__version__ = "('2019', '10', '24a')"
__version__ = "('2019', '11', '11a')"

cdef int cmax(int a, int b):
if a > b:
Expand Down
18 changes: 9 additions & 9 deletions src/cogent3/align/_pairwise_pogs.c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/cogent3/align/_pairwise_pogs.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ cdef extern from "math.h":
double log (double x)

version_info = (3, 2)
__version__ = "('2019', '10', '24a')"
__version__ = "('2019', '11', '11a')"

cdef double SCALE_STEP, MIN_FLOAT_VALUE
SCALE_STEP = 2.0**50
Expand Down

0 comments on commit 5fc492b

Please sign in to comment.