Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/install_ubuntu_deps/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ runs:
uses: conda-incubator/setup-miniconda@v3.0.1
with:
miniconda-version: "latest"
python-version: "3.9"
python-version: "3.10"
activate-environment: "habitat"
- name: Install conda and dependencies
run: |-
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/install_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup python
uses: actions/setup-python@v5.0.0
with:
python-version: '3.9.16'
python-version: '3.10.17'
- name: install dependencies
run: |-
pip install -U pip setuptools pre-commit
Expand All @@ -34,7 +34,7 @@ jobs:
- name: Setup python
uses: actions/setup-python@v5.0.0
with:
python-version: '3.9.16'
python-version: '3.10.17'
- name: setup
run: |-
pip install -U pip
Expand Down Expand Up @@ -389,7 +389,7 @@ jobs:
uses: conda-incubator/setup-miniconda@v3
with:
miniconda-version: "latest"
python-version: "3.9"
python-version: '3.10.17'
activate-environment: "habitat"
- name: Set CI_TEST variable based on "main merge" vs. "pull_request" workflow
run: |-
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[![Conda Platforms support Badge](https://img.shields.io/conda/pn/aihabitat/habitat-sim?color=orange&label=platforms)](https://anaconda.org/aihabitat/habitat-sim)
[![Documentation](https://img.shields.io/badge/docs-automated-green.svg)](https://aihabitat.org/docs/habitat-sim/)
[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
[![Python 3.9](https://img.shields.io/badge/python-3.9.svg)](https://www.python.org/downloads/release/)
[![Python 3.10](https://img.shields.io/badge/python-3.10.svg)](https://www.python.org/downloads/release/)
[![Supports Bullet](https://img.shields.io/static/v1?label=supports&message=Bullet%20Physics&color=informational&link=https://opensource.google/projects/bullet3)](https://opensource.google/projects/bullet3)
[![Twitter Follow](https://img.shields.io/twitter/follow/ai_habitat?style=social)](https://twitter.com/ai_habitat)

Expand Down
4 changes: 2 additions & 2 deletions conda-build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ ENV PATH /opt/conda/bin:$PATH
ADD ./common/install_conda.sh install_conda.sh
RUN bash ./install_conda.sh && rm install_conda.sh

RUN conda init bash && conda create --name py39 python=3.9 -y
RUN source ~/.bashrc && conda activate py39 && conda install -y anaconda-client git gitpython ninja conda-build
RUN conda init bash && conda create --name py310 python=3.10 -y
RUN source ~/.bashrc && conda activate py310 && conda install -y anaconda-client git gitpython ninja conda-build
RUN conda config --set anaconda_upload yes
2 changes: 1 addition & 1 deletion conda-build/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
### Building for macOS

Install conda packages as described here ```conda-build/common/install_conda.sh``` and run ```conda create --name py39 python=3.9 -y;conda activate py39```.
Running ```python matrix_builder.py``` with python >= 3.9 will start the build process by setting all the environment variables and making a call to conda build. Make sure the meta.yaml file in conda-build/habitat-sim/ is configured correctly according to https://docs.conda.io/projects/conda-build/en/latest/resources/define-metadata.html
Running ```python matrix_builder.py``` with python >= 3.10 will start the build process by setting all the environment variables and making a call to conda build. Make sure the meta.yaml file in conda-build/habitat-sim/ is configured correctly according to https://docs.conda.io/projects/conda-build/en/latest/resources/define-metadata.html

Once the package is built, make sure you're logged in to anaconda cloud and then run ```anaconda upload <path to the tarball file that conda build created>```. For example ```anaconda upload hsim-macos/osx-64/habitat-sim-1.3.2-py3.9_osx.tar.bz2```. This will upload the package to anaconda cloud for everyone to download.

Expand Down
4 changes: 2 additions & 2 deletions conda-build/matrix_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def call(cmd, env=None):


def get_default_modes_and_vers():
py_vers = ["3.9"]
py_vers = ["3.10"]
bullet_modes = [False, True]
if platform.system() == "Darwin":
return py_vers, bullet_modes, [False], [None]
Expand Down Expand Up @@ -92,7 +92,7 @@ def main():
if args.ci_test:
bullet_modes = [True]
headless_modes = [get_headless_mode_for_test()]
py_vers = ["3.9"]
py_vers = ["3.10"]

for py_ver, use_bullet, headless, cuda_ver in itertools.product(
py_vers, bullet_modes, headless_modes, cuda_vers
Expand Down
2 changes: 1 addition & 1 deletion mypy.ini
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ check_untyped_defs = True
files=
src_python/habitat_sim,
tests
python_version = 3.9
python_version = 3.10

[mypy-habitat_sim.bindings]
ignore_errors = True
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ def load(filename):
if __name__ == "__main__":
assert StrictVersion(
"{}.{}".format(sys.version_info[0], sys.version_info[1])
) >= StrictVersion("3.9"), "Must use python 3.9 or newer"
) >= StrictVersion("3.10"), "Must use python 3.10 or newer"
with open("./requirements.txt", "r") as f:
requirements = [l.strip() for l in f.readlines() if len(l.strip()) > 0]

Expand All @@ -448,7 +448,7 @@ def load(filename):
package_dir={"": "src_python"},
install_requires=requirements,
tests_require=["hypothesis", "pytest-benchmark", "pytest"],
python_requires=">=3.9",
python_requires=">=3.10",
# add extension module
ext_modules=[CMakeExtension("habitat_sim._ext.habitat_sim_bindings", "src")],
# add custom build_ext command
Expand Down
2 changes: 1 addition & 1 deletion src/cmake/dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ if(BUILD_PYTHON_BINDINGS)

# Let the Find module do proper version checks on what we found (it uses the
# same PYTHON_EXECUTABLE variable, will pick it up from the cache)
find_package(PythonInterp 3.9 REQUIRED)
find_package(PythonInterp 3.10 REQUIRED)

message(STATUS "Bindings being generated for python at ${PYTHON_EXECUTABLE}")

Expand Down
Loading