diff --git a/env_linux.yml b/env_linux.yml index 5bfa6a66..1e9d079b 100644 --- a/env_linux.yml +++ b/env_linux.yml @@ -2,11 +2,16 @@ name: cra channels: - conda-forge dependencies: - - python >=3.9,<3.11 + - git + - python ==3.9 + - pip - compas - compas_view2 - ipopt + - pyomo ==6.4.2 + - matplotlib - pip: - - -r requirements.txt + - git+https://github.com/compas-dev/compas_view2.git@compas2 + - compas_assembly >=0.7.0 - -r requirements-dev.txt - -e . diff --git a/env_osx.yml b/env_osx.yml index 5bfa6a66..1e9d079b 100644 --- a/env_osx.yml +++ b/env_osx.yml @@ -2,11 +2,16 @@ name: cra channels: - conda-forge dependencies: - - python >=3.9,<3.11 + - git + - python ==3.9 + - pip - compas - compas_view2 - ipopt + - pyomo ==6.4.2 + - matplotlib - pip: - - -r requirements.txt + - git+https://github.com/compas-dev/compas_view2.git@compas2 + - compas_assembly >=0.7.0 - -r requirements-dev.txt - -e . diff --git a/env_win.yml b/env_win.yml index 0f8fac0b..89e2fb79 100644 --- a/env_win.yml +++ b/env_win.yml @@ -2,11 +2,16 @@ name: cra channels: - conda-forge dependencies: - - python >=3.9,<3.11 + - git + - python ==3.9 + - pip - compas - compas_view2 - ipopt ==3.11.1 + - pyomo ==6.4.2 + - matplotlib - pip: - - -r requirements.txt + - git+https://github.com/compas-dev/compas_view2.git@compas2 + - compas_assembly >=0.7.0 - -r requirements-dev.txt - -e . diff --git a/pyproject.toml b/pyproject.toml index 6843dabd..1a9ff696 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ keywords = [] authors = [{ name = "Gene Ting-Chun Kao", email = "kao@arch.ethz.ch" }] license = { file = "LICENSE" } readme = "README.md" -requires-python = ">=3.9,<3.11" +requires-python = ">=3.9" dynamic = ['dependencies', 'optional-dependencies', 'version'] classifiers = [ "Development Status :: 4 - Beta", @@ -22,6 +22,7 @@ classifiers = [ "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", ] [project.urls] diff --git a/requirements-dev.txt b/requirements-dev.txt index acb76e48..f6901cf6 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,7 +2,7 @@ attrs >=17.4 black >=22.12.0 bump-my-version compas_invocations2 -compas_notebook +# compas_notebook invoke >=0.14 ruff sphinx_compas2_theme diff --git a/requirements.txt b/requirements.txt index 576a649a..eebd5283 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ -pyomo ==6.4.2 -compas >=2.0 -compas_assembly >=0.7.0 +# compas >=2.0 +# compas_assembly >=0.7.0