Skip to content

Commit

Permalink
Merge pull request #226 from ilastik/fix-pt3dunet
Browse files Browse the repository at this point in the history
Fix pt3dunet, bump python version, prepare next release
  • Loading branch information
k-dominik authored Dec 11, 2024
2 parents 3c1477f + 9b0bdba commit 5ea5d3a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 23.11.0
current_version = 24.12.0
parse = (?P<year>\d+)\.(?P<month>\d+)\.(?P<number>\d+)((?P<release>[a-z]+)?(?P<build>\d+)?)?
serialize =
{year}.{month}.{number}{release}
Expand Down
9 changes: 7 additions & 2 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,18 @@ build:
requirements:
host:
- pip
- python >=3.8
- python >=3.9
- setuptools >=40.0
- setuptools_scm
run:
- python >=3.8
- python >=3.9
{% for dep in setup_py_data['install_requires'] %}
# for pytorch-3dunet the names on conda and pypi differ:
{% if 'pytorch3dunet' in dep.lower() %}
- {{ dep.lower().replace('pytorch3dunet', 'pytorch-3dunet') }}
{% else %}
- {{ dep.lower() }}
{% endif %}
{% endfor %}
run_constrained:
- mkl <2024.1.0 # [linux] until pytorch is compatible with the current version
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

setup(
name="tiktorch",
version="23.11.0",
version="24.12.0",
description="Tiktorch client/server",
long_description=long_description,
long_description_content_type="text/markdown",
Expand All @@ -21,9 +21,9 @@
classifiers=[ # Optional
"Development Status :: 3 - Alpha",
"Intended Audience :: Developers",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
],
packages=find_packages(exclude=["tests"]), # Required
install_requires=[
Expand All @@ -33,7 +33,7 @@
"numpy<2", # pytorch 2.2.2-py3.9_0 for macos is compiled with numpy 1.*
"protobuf",
"pydantic>=2.7.0,<2.10",
"pytorch-3dunet",
"pytorch3dunet",
"pyyaml",
"xarray",
],
Expand Down

0 comments on commit 5ea5d3a

Please sign in to comment.