Skip to content

Commit fd68c3f

Browse files
committed
Merge commit '11d4c70809b316dae49fe515e7bec644e30b3efa'
# Conflicts: # docs/source/conf.py # modelseedpy/biochem/modelseed_biochem.py # modelseedpy/biochem/modelseed_builder.py # modelseedpy/biochem/modelseed_compound.py # modelseedpy/biochem/modelseed_reaction.py # modelseedpy/biochem/modelseed_to_cobra.py # modelseedpy/biochem/seed_object.py # modelseedpy/community/mscommunity.py # modelseedpy/community/mscompatibility.py # modelseedpy/config.cfg # modelseedpy/core/__init__.py # modelseedpy/core/biolog.py # modelseedpy/core/exceptions.py # modelseedpy/core/fbahelper.py # modelseedpy/core/gapfillinghelper.py # modelseedpy/core/msatpcorrection.py # modelseedpy/core/msbuilder.py # modelseedpy/core/msgapfill.py # modelseedpy/core/msgenome.py # modelseedpy/core/msgenomeclassifier.py # modelseedpy/core/msgrowthphenotypes.py # modelseedpy/core/msmedia.py # modelseedpy/core/msmodelutl.py # modelseedpy/core/mstemplate.py # modelseedpy/core/rast_client.py # modelseedpy/fbapkg/basefbapkg.py # modelseedpy/fbapkg/bilevelpkg.py # modelseedpy/fbapkg/flexiblebiomasspkg.py # modelseedpy/fbapkg/fluxfittingpkg.py # modelseedpy/fbapkg/gapfillingpkg.py # modelseedpy/fbapkg/kbasemediapkg.py # modelseedpy/fbapkg/reactionusepkg.py # modelseedpy/helpers.py # modelseedpy/ml/build_classifier.py # modelseedpy/ml/predict_phenotype.py # tests/biochem/test_modelseed_biochem.py # tests/community/test_mscommunity.py # tests/context.py # tests/core/test_msatpcorreption.py # tests/core/test_msbuilder.py # tests/core/test_msgapfill.py # tests/core/test_msgenome.py # tests/test_data/mock_data.py # tests/test_data/mseditorapi_testing.py
2 parents c8eca41 + 11d4c70 commit fd68c3f

File tree

144 files changed

+786692
-427937
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+786692
-427937
lines changed

.github/workflows/pre-commit.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Run Pre-Commit
2+
3+
on:
4+
pull_request: {}
5+
push:
6+
branches:
7+
- dev
8+
- main
9+
10+
jobs:
11+
pre-commit:
12+
runs-on: ${{ matrix.os }}
13+
strategy:
14+
matrix:
15+
os: [ubuntu-latest]
16+
python-version: ['3.8', '3.9', '3.10']
17+
steps:
18+
- uses: actions/checkout@v2
19+
- uses: actions/setup-python@v3
20+
with:
21+
python-version: ${{ matrix.python-version }}
22+
- name: Set file mode to false
23+
run: |
24+
git config core.filemode false
25+
- uses: pre-commit/[email protected]

.pre-commit-config.yaml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
repos:
2+
- repo: https://github.com/pre-commit/pre-commit-hooks
3+
rev: v4.3.0
4+
hooks:
5+
- id: fix-encoding-pragma
6+
- id: check-merge-conflict
7+
- id: end-of-file-fixer
8+
- id: debug-statements
9+
- id: check-added-large-files
10+
- id: check-ast
11+
- id: check-byte-order-marker
12+
- id: check-case-conflict
13+
- id: check-docstring-first
14+
- id: check-executables-have-shebangs
15+
types: [python]
16+
- id: check-vcs-permalinks
17+
- id: check-symlinks
18+
- id: mixed-line-ending
19+
- id: name-tests-test
20+
exclude: tests/test_data
21+
args:
22+
- --pytest-test-first
23+
- id: check-json
24+
- id: pretty-format-json
25+
args:
26+
- --autofix
27+
- --top-keys=_id
28+
- id: check-yaml
29+
- id: sort-simple-yaml
30+
files: '.yaml$'
31+
- id: detect-private-key
32+
- id: trailing-whitespace
33+
- repo: https://github.com/psf/black
34+
rev: 22.8.0
35+
hooks:
36+
- id: black
37+
- repo: https://github.com/Lucas-C/pre-commit-hooks
38+
rev: v1.3.1
39+
hooks:
40+
- id: remove-tabs
41+
exclude: '(\.tsv|Makefile)$'
42+
- id: remove-crlf

.travis.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
language: python
2-
python:
3-
- 3.6
4-
- 3.7
5-
- 3.8
6-
before_install:
7-
- python --version
8-
- pip install -U pip
9-
- pip install -U pytest
10-
- pip install -U importlib_metadata
11-
- pip install codecov
12-
install:
13-
- pip install ".[test]" . # install package + test dependencies
14-
script: pytest # run tests
15-
after_success:
16-
- codecov # submit coverage
1+
language: python
2+
python:
3+
- 3.7
4+
- 3.8
5+
- 3.9
6+
before_install:
7+
- python --version
8+
- pip install -U pip
9+
- pip install -U pytest
10+
- pip install -U importlib_metadata
11+
- pip install codecov
12+
install:
13+
- pip install ".[test]" . # install package + test dependencies
14+
script: pytest # run tests
15+
after_success:
16+
- codecov # submit coverage

README.rst

100755100644
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Installation
3636
ModelSEEDpy will soon be installable via the ``PyPI`` channel::
3737

3838
pip install modelseedpy
39-
39+
4040
but, until then, the repository must cloned::
4141

4242
git clone https://github.com/ModelSEED/ModelSEEDpy.git
@@ -45,13 +45,13 @@ and then locally installed with ``pip``::
4545

4646
cd path/to/modelseedpy
4747
pip install .
48-
48+
4949
The associated ModelSEED Database, which is required for a few packages, is simply downloaded by cloning the GitHub repository::
5050

5151
git clone https://github.com/ModelSEED/ModelSEEDDatabase.git
52-
53-
and the path to this repository is passed as an argument to the corresponding packages.
54-
52+
53+
and the path to this repository is passed as an argument to the corresponding packages.
54+
5555
**Windows users** must separately install the ``pyeda`` module: 1) download the appropriate wheel for your Python version from `this website <https://www.lfd.uci.edu/~gohlke/pythonlibs/#pyeda>`_ ; and 2) install the wheel through the following commands in a command prompt/powershell console::
5656

5757
cd path/to/pyeda/wheel

docs/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@ Indices and tables
1919
* :ref:`genindex`
2020
* :ref:`modindex`
2121
* :ref:`search`
22-

0 commit comments

Comments
 (0)