Skip to content

Commit

Permalink
Merge branch 'master' into lazy
Browse files Browse the repository at this point in the history
  • Loading branch information
mataton committed Dec 3, 2024
2 parents 2a297f5 + 06397a9 commit 1a57b11
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 40 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/python-package-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

env:
latest_python: "3.12"
supported_pythons: '["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]'
supported_pythons: '["3.9", "3.10", "3.11", "3.12", "3.13"]'
miniforge_version: "22.9.0-2"
miniforge_variant: "Mambaforge"

Expand Down Expand Up @@ -98,13 +98,13 @@ jobs:
shell: bash -l {0}
run: |
conda install -q --yes -c conda-forge --file ci/conda_requirements.txt
pip install . --no-deps
pip install -e . --no-deps
conda list
- name: Install dependencies (pip)
if: ${{ !matrix.use_conda }}
shell: bash -l {0}
run: |
pip install .
pip install -e .
conda list
- name: Run unit tests
shell: bash -l {0}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- '*'

env:
earliest_python: "3.8"
earliest_python: "3.9"
latest_python: "3.12"
miniforge_version: "23.11.0-0"
miniforge_variant: "Mambaforge"
Expand Down
4 changes: 4 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ BIOM-Format ChangeLog
biom-2.1.16-dev
---------------

Maintenance:

* Python 3.7 and 3.8 removed from CI as they are [end-of-life](https://devguide.python.org/versions/). Python 3.13 added to CI. See PR[#986](https://github.com/biocore/biom-format/pull/986).

biom 2.1.16
-----------

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
# ----------------------------------------------------------------------------

ifeq ($(WITH_DOCTEST), TRUE)
TEST_COMMAND = python setup.py test -a --doctest-modules --doctest-glob='*.pyx'
TEST_COMMAND = pytest --doctest-modules --doctest-glob='*.pyx'
else
TEST_COMMAND = python setup.py test
TEST_COMMAND = pytest
endif

.PHONY: doc lint test
Expand Down
2 changes: 1 addition & 1 deletion aarch64.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ COPY . /work
WORKDIR /work
RUN bash -c ". /opt/conda/etc/profile.d/conda.sh && conda activate testing && conda env update -q -f ci/conda_host_env.yml"
RUN bash -c ". /opt/conda/etc/profile.d/conda.sh && conda activate testing && conda install -q --yes --file ci/aarch64.conda_requirements.txt"
RUN bash -c ". /opt/conda/etc/profile.d/conda.sh && conda activate testing && pip install . --no-deps"
RUN bash -c ". /opt/conda/etc/profile.d/conda.sh && conda activate testing && pip install -e . --no-deps"
RUN bash -c ". /opt/conda/etc/profile.d/conda.sh && conda activate testing && conda list"
RUN bash -c ". /opt/conda/etc/profile.d/conda.sh && conda activate testing && make test"
33 changes: 0 additions & 33 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

from setuptools import setup, find_packages
from setuptools.extension import Extension
from setuptools.command.test import test as TestCommand
import numpy as np
from Cython.Build import cythonize

Expand All @@ -37,37 +36,6 @@
__email__ = "[email protected]"


# derived from https://docs.pytest.org/en/3.8.0/goodpractices.html
class PyTest(TestCommand):
user_options = [("pytest-args=", "a", "Arguments to pass to pytest")]

def initialize_options(self):
TestCommand.initialize_options(self)
self.pytest_args = ""

def run_tests(self):
try:
import numpy
try:
# NumPy 1.14 changed repr output breaking our doctests,
# request the legacy 1.13 style
numpy.set_printoptions(legacy="1.13")
except TypeError:
# Old Numpy, output should be fine as it is :)
# TypeError: set_printoptions() got an unexpected
# keyword argument 'legacy'
pass
except ImportError:
numpy = None

import shlex

# import here, cause outside the eggs aren't loaded
import pytest
errno = pytest.main(shlex.split(self.pytest_args))
sys.exit(errno)


long_description = """BIOM: Biological Observation Matrix
http://www.biom-format.org
Expand Down Expand Up @@ -152,7 +120,6 @@ def run_tests(self):
'anndata': ["anndata"],
},
classifiers=classifiers,
cmdclass={"pytest": PyTest},
entry_points='''
[console_scripts]
biom=biom.cli:cli
Expand Down

0 comments on commit 1a57b11

Please sign in to comment.