From 3689d817d44be89c06a6d5e524137b0cee7b6a12 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 27 Jun 2023 15:40:10 -0700 Subject: [PATCH] bump to python 3.11.4 (#27) * bump to python 3.11.4 * Update requirements.txt * lint * revert --------- Co-authored-by: Maxime Desroches --- .pre-commit-config.yaml | 2 +- Dockerfile | 4 ++-- examples/kinematic_kf.py | 2 +- examples/test_compare.py | 2 +- rednose/__init__.py | 0 rednose/helpers/__init__.py | 6 +++--- rednose/helpers/ekf_sym.py | 6 +++--- rednose/helpers/feature_handler.py | 2 +- rednose/helpers/lst_sq_computer.py | 2 +- requirements.txt | 8 ++++---- 10 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 rednose/__init__.py diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b4ebd20..63c6ae8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,7 +9,7 @@ repos: - id: check-merge-conflict - id: check-symlinks - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.910-1 + rev: v1.4.0 hooks: - id: mypy additional_dependencies: ['git+https://github.com/numpy/numpy-stubs'] diff --git a/Dockerfile b/Dockerfile index 2d51553..a631ce7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,8 @@ RUN apt-get update && apt-get install -y capnproto libcapnp-dev clang wget git a RUN curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash ENV PATH="/root/.pyenv/bin:/root/.pyenv/shims:${PATH}" -RUN pyenv install 3.8.5 -RUN pyenv global 3.8.5 +RUN pyenv install 3.11.4 +RUN pyenv global 3.11.4 RUN pyenv rehash WORKDIR /project diff --git a/examples/kinematic_kf.py b/examples/kinematic_kf.py index 193c446..29049a7 100755 --- a/examples/kinematic_kf.py +++ b/examples/kinematic_kf.py @@ -9,7 +9,7 @@ if __name__ == '__main__': # generating sympy code from rednose.helpers.ekf_sym import gen_code else: - from rednose.helpers.ekf_sym_pyx import EKF_sym_pyx + from rednose.helpers.ekf_sym_pyx import EKF_sym_pyx # pylint: disable=no-name-in-module class ObservationKind(): diff --git a/examples/test_compare.py b/examples/test_compare.py index e5811a4..0b2cdd3 100755 --- a/examples/test_compare.py +++ b/examples/test_compare.py @@ -8,7 +8,7 @@ if __name__ == '__main__': # generating sympy code from rednose.helpers.ekf_sym import gen_code else: - from rednose.helpers.ekf_sym_pyx import EKF_sym_pyx + from rednose.helpers.ekf_sym_pyx import EKF_sym_pyx # pylint: disable=no-name-in-module from rednose.helpers.ekf_sym import EKF_sym as EKF_sym2 diff --git a/rednose/__init__.py b/rednose/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/rednose/helpers/__init__.py b/rednose/helpers/__init__.py index bbd239b..12cce34 100644 --- a/rednose/helpers/__init__.py +++ b/rednose/helpers/__init__.py @@ -9,8 +9,8 @@ def write_code(folder, name, code, header): if not os.path.exists(folder): os.mkdir(folder) - open(os.path.join(folder, f"{name}.cpp"), 'w').write(code) - open(os.path.join(folder, f"{name}.h"), 'w').write(header) + open(os.path.join(folder, f"{name}.cpp"), 'w', encoding='utf-8').write(code) + open(os.path.join(folder, f"{name}.h"), 'w', encoding='utf-8').write(header) def load_code(folder, name, lib_name=None): @@ -20,7 +20,7 @@ def load_code(folder, name, lib_name=None): shared_fn = os.path.join(folder, f"lib{lib_name}.{shared_ext}") header_fn = os.path.join(folder, f"{name}.h") - with open(header_fn) as f: + with open(header_fn, encoding='utf-8') as f: header = f.read() # is the only thing that can be parsed by cffi diff --git a/rednose/helpers/ekf_sym.py b/rednose/helpers/ekf_sym.py index c9cf0bc..b60c202 100644 --- a/rednose/helpers/ekf_sym.py +++ b/rednose/helpers/ekf_sym.py @@ -204,14 +204,14 @@ def gen_code(folder, name, f_sym, dt_sym, x_sym, obs_eqs, dim_x, dim_err, eskf_p # merge code blocks header += "}" - code = "\n".join([pre_code, code, open(os.path.join(TEMPLATE_DIR, "ekf_c.c")).read(), post_code]) + code = "\n".join([pre_code, code, open(os.path.join(TEMPLATE_DIR, "ekf_c.c"), encoding='utf-8').read(), post_code]) # write to file if not os.path.exists(folder): os.mkdir(folder) - open(os.path.join(folder, f"{name}.h"), 'w').write(header) # header is used for ffi import - open(os.path.join(folder, f"{name}.cpp"), 'w').write(code) + open(os.path.join(folder, f"{name}.h"), 'w', encoding='utf-8').write(header) # header is used for ffi import + open(os.path.join(folder, f"{name}.cpp"), 'w', encoding='utf-8').write(code) class EKF_sym(): diff --git a/rednose/helpers/feature_handler.py b/rednose/helpers/feature_handler.py index 6a20b85..473aefa 100755 --- a/rednose/helpers/feature_handler.py +++ b/rednose/helpers/feature_handler.py @@ -36,7 +36,7 @@ def generate_code(generated_dir, K=5): c_code += "#include \n" c_code += "#define K %d\n" % K c_code += "extern \"C\" {\n" - c_code += "\n" + open(os.path.join(TEMPLATE_DIR, "feature_handler.c")).read() + c_code += "\n" + open(os.path.join(TEMPLATE_DIR, "feature_handler.c"), encoding='utf-8').read() c_code += "\n}\n" filename = f"{FeatureHandler.name}_{K}" diff --git a/rednose/helpers/lst_sq_computer.py b/rednose/helpers/lst_sq_computer.py index 56c3bc8..3c74eaa 100755 --- a/rednose/helpers/lst_sq_computer.py +++ b/rednose/helpers/lst_sq_computer.py @@ -54,7 +54,7 @@ def generate_code(generated_dir, K=4): code += "\n#define KDIM %d\n" % K code += "extern \"C\" {\n" code += sympy_code - code += "\n" + open(os.path.join(TEMPLATE_DIR, "compute_pos.c")).read() + "\n" + code += "\n" + open(os.path.join(TEMPLATE_DIR, "compute_pos.c"), encoding='utf-8').read() + "\n" code += "}\n" header += "\nvoid compute_pos(double *to_c, double *in_poses, double *in_img_positions, double *param, double *pos);\n" diff --git a/requirements.txt b/requirements.txt index 9ff7109..ec22f85 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ numpy scipy tqdm cffi -scons==4.1.0.post1 -pre-commit==2.10.1 -pylint==2.7.1 -Cython==0.29.22 \ No newline at end of file +scons +pre-commit +pylint +Cython