diff --git a/doc/release_notes.rst b/doc/release_notes.rst index ac8c2559..892558b1 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -9,6 +9,8 @@ Release Notes Upcoming Release ================ +* Fixed PDF encoding in ``build_biomass_transport_costs`` with update of tabula-py and jpype1 + * More modular and flexible handling of transmission projects. One can now add new transmission projects in a subfolder of `data/transmission projects` similar to the files in the template folder. After adding the new files and updating the config section `transmission_projects:`, transmission projects will be included if they are not duplicates of existing lines or other projects. * Add option to apply a gaussian kernel density smoothing to wind turbine power curves. diff --git a/envs/environment.fixed.yaml b/envs/environment.fixed.yaml index 917deab7..31dc7527 100644 --- a/envs/environment.fixed.yaml +++ b/envs/environment.fixed.yaml @@ -391,7 +391,7 @@ dependencies: - stack_data=0.6.2 - statsmodels=0.14.2 - stopit=1.1.2 -- tabula-py=2.7.0 +- jpype1=1.5.0 - tabulate=0.9.0 - tbb=2021.11.0 - tblib=3.0.0 @@ -466,3 +466,4 @@ dependencies: - snakemake-executor-plugin-slurm-jobstep==0.2.1 - snakemake-storage-plugin-http==0.2.3 - tsam==2.3.1 + - tabula-py=2.9.3 diff --git a/envs/environment.yaml b/envs/environment.yaml index c87de77a..9115ccd9 100644 --- a/envs/environment.yaml +++ b/envs/environment.yaml @@ -43,7 +43,7 @@ dependencies: - geopy - tqdm - pytz -- tabula-py +- jpype1 - pyxlsb - graphviz - pre-commit @@ -63,3 +63,4 @@ dependencies: - snakemake-executor-plugin-slurm - snakemake-executor-plugin-cluster-generic - highspy + - tabula-py diff --git a/scripts/build_biomass_transport_costs.py b/scripts/build_biomass_transport_costs.py index 085a0f00..d5650902 100644 --- a/scripts/build_biomass_transport_costs.py +++ b/scripts/build_biomass_transport_costs.py @@ -24,7 +24,7 @@ import tabula as tbl ENERGY_CONTENT = 4.8 # unit MWh/t (wood pellets) system = platform.system() -encoding = "cp1252" if system == "Windows" else None +encoding = "cp1252" if system == "Windows" else "utf-8" def get_countries():