diff --git a/.github/workflows/small_tests.yml b/.github/workflows/small_tests.yml index 336675b1..171b4bda 100644 --- a/.github/workflows/small_tests.yml +++ b/.github/workflows/small_tests.yml @@ -13,7 +13,7 @@ jobs: python-version: 3.8 - name: Install dependencies run: | - sudo apt install gir1.2-gtk-3.0 libgirepository1.0-dev libapt-pkg-dev fakeroot + sudo apt install gir1.2-gtk-3.0 libgirepository1.0-dev python3-apt fakeroot python -m pip install --upgrade pip pip install -r requirements.txt - name: Test with pytest diff --git a/.github/workflows/style_test.yml b/.github/workflows/style_test.yml index 5920d7fe..344c5b17 100644 --- a/.github/workflows/style_test.yml +++ b/.github/workflows/style_test.yml @@ -13,7 +13,7 @@ jobs: python-version: 3.8 - name: Install dependencies run: | - sudo apt install gir1.2-gtk-3.0 libgirepository1.0-dev libapt-pkg-dev fakeroot + sudo apt install gir1.2-gtk-3.0 libgirepository1.0-dev python3-apt fakeroot python -m pip install --upgrade pip pip install -r requirements.txt - name: Test with pytest diff --git a/.github/workflows/url_tests.yml b/.github/workflows/url_tests.yml index 9f3fcb78..33e6b205 100644 --- a/.github/workflows/url_tests.yml +++ b/.github/workflows/url_tests.yml @@ -20,7 +20,7 @@ jobs: python-version: 3.8 - name: Install dependencies run: | - sudo apt install gir1.2-gtk-3.0 libgirepository1.0-dev libapt-pkg-dev fakeroot + sudo apt install gir1.2-gtk-3.0 libgirepository1.0-dev python3-apt fakeroot python -m pip install --upgrade pip pip install -r requirements.txt - name: Test with pytest diff --git a/umake/frameworks/ide.py b/umake/frameworks/ide.py index 70d1f694..f06bbcbf 100644 --- a/umake/frameworks/ide.py +++ b/umake/frameworks/ide.py @@ -839,7 +839,7 @@ def __init__(self, **kwargs): super().__init__(name="RStudio", description=_("RStudio code editor"), only_on_archs=['amd64'], download_page="https://www.rstudio.com/products/rstudio/download/", - packages_requirements=["libjpeg62", "libedit2", "libssl1.0.0 | libssl1.1", "libclang-dev"], + packages_requirements=["libjpeg62", "libedit2", "libssl1.0.0 | libssl1.0.3 | libssl1.1", "libclang-dev"], desktop_filename="rstudio.desktop", required_files_path=["bin/rstudio"], dir_to_decompress_in_tarball="rstudio-*", @@ -858,10 +858,10 @@ def parse_download_link(self, line, in_download): """Parse RStudio download links""" url = None checksum = None - if get_current_distro_version().split('.')[0] < "18" or \ - get_current_distro_version(distro_name="debian") < "9": + if int(get_current_distro_version().split('.')[0]) < 18 or \ + int(get_current_distro_version(distro_name="debian").split('.')[0]) < 9: ubuntu_version = 'xenial' - elif get_current_distro_version(distro_name="debian") == "9": + elif int(get_current_distro_version(distro_name="debian").split('.')[0]) == 9: ubuntu_version = "debian9" else: ubuntu_version = 'bionic'