Skip to content

Commit

Permalink
Merge pull request #46 from franneck94/fixMacOs
Browse files Browse the repository at this point in the history
up for 0.4.4
  • Loading branch information
franneck94 authored Mar 13, 2023
2 parents f33d427 + 798368f commit ba9cb84
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 23 deletions.
33 changes: 18 additions & 15 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,34 @@ default_language_version:
python: python3
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v4.4.0
hooks:
- id: check-ast
- id: check-builtin-literals
- id: check-merge-conflict
- id: check-yaml
- id: check-toml
- id: end-of-file-fixer
- id: trailing-whitespace

- repo: https://gitlab.com/pycqa/flake8
rev: 5.0.4
- repo: https://github.com/MarcoGorelli/cython-lint
rev: v0.13.0
hooks:
- id: flake8

- repo: https://github.com/psf/black
rev: 22.8.0
hooks:
- id: black
- id: cython-lint
- id: double-quote-cython-strings

- repo: https://github.com/PyCQA/isort
rev: 5.10.1
rev: 5.12.0
hooks:
- id: isort
exclude: ^docs/

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.971
- repo: https://github.com/psf/black
rev: 23.1.0
hooks:
- id: mypy
- id: black
exclude: ^docs/

- repo: https://github.com/PyCQA/flake8
rev: 6.0.0
hooks:
- id: flake8
exclude: ^docs/
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# TensorCross Change Log

## Version 0.4.4: March 13, 2023

- Bugfix for MacOS tensorflow metal

## Version 0.4.3: September 12, 2022

- Bugfix for computing the mean val score in CV
Expand Down
15 changes: 10 additions & 5 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Runtime requirements
--requirement requirements.txt

# Packaging
pip
setuptools
Expand All @@ -6,19 +9,21 @@ twine

# Docs
mkdocs
mkdocstrings[python]
mkdocs-autorefs
mkdocs-material
mkdocs-material-extensions
mkdocstrings
pygments

# Linting/Tooling
flake8>=5.0.4
mypy>=0.971
black>=23.0
flake8>=6.0
isort>=5.12
mypy>=1.0
pre-commit>=3.1
pylint>=2.16
mypy-extensions
isort>=5.10.1
black>=22.8.0
pre-commit>= 2.20.0

# Testing
pytest
Expand Down
4 changes: 3 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# TensorFLow Libraries
tensorflow>=2.0
tensorflow-macos; sys_platform == "darwin"
tensorflow-metal; sys_platform == "darwin"
tensorflow>=2.0; sys_platform != "darwin"

# Libraries
scikit-learn
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
ISRELEASED = False

MIN_PYTHON_VERSION = "3.7"
INSTALL_REQUIRES = ["tensorflow>=2.0", "numpy", "scipy", "scikit-learn"]
INSTALL_REQUIRES = ["numpy", "scipy", "scikit-learn"]


PACKAGES = find_packages(include=["tensorcross", "tensorcross.*"])

Expand Down
2 changes: 1 addition & 1 deletion tensorcross/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.4.3"
__version__ = "0.4.4"

0 comments on commit ba9cb84

Please sign in to comment.