From 2cf1b5051a80732355a8cc5d067d5eed6f49b0e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edouard=20Choini=C3=A8re?= <27212526+echoix@users.noreply.github.com> Date: Sun, 6 Oct 2024 12:53:00 +0000 Subject: [PATCH] temporal: Remove ply from requirements --- .github/workflows/apt.txt | 1 - .github/workflows/macos_dependencies.txt | 1 - .github/workflows/osgeo4w.yml | 1 - .github/workflows/python_requirements.txt | 1 - Dockerfile | 1 - REQUIREMENTS.md | 3 --- Vagrantfile | 1 - binder/requirements.txt | 1 - docker/debian/Dockerfile | 1 - docker/ubuntu/Dockerfile | 1 - docker/ubuntu_wxgui/Dockerfile | 1 - mswindows/osgeo4w/setup.hint.tmpl | 2 +- singularity/debian/singularityfile_debian | 1 - 13 files changed, 1 insertion(+), 15 deletions(-) diff --git a/.github/workflows/apt.txt b/.github/workflows/apt.txt index 4c14cb7b067..1191cf541ec 100644 --- a/.github/workflows/apt.txt +++ b/.github/workflows/apt.txt @@ -21,7 +21,6 @@ python3-dateutil python3-matplotlib python3-numpy python3-pil -python3-ply python3-pyvirtualdisplay python3-termcolor sqlite3 diff --git a/.github/workflows/macos_dependencies.txt b/.github/workflows/macos_dependencies.txt index 8ef1d3460f6..d4aec7d193c 100644 --- a/.github/workflows/macos_dependencies.txt +++ b/.github/workflows/macos_dependencies.txt @@ -35,7 +35,6 @@ pandoc pdal pillow pkg-config -ply postgresql proj pytest diff --git a/.github/workflows/osgeo4w.yml b/.github/workflows/osgeo4w.yml index d9c67cc37c9..a9f407ca7fb 100644 --- a/.github/workflows/osgeo4w.yml +++ b/.github/workflows/osgeo4w.yml @@ -71,7 +71,6 @@ jobs: python3-matplotlib python3-numpy python3-pip - python3-ply python3-pytest python3-pywin32 python3-wxpython diff --git a/.github/workflows/python_requirements.txt b/.github/workflows/python_requirements.txt index 8e2f5e506c3..12b6da9b8b6 100644 --- a/.github/workflows/python_requirements.txt +++ b/.github/workflows/python_requirements.txt @@ -1,4 +1,3 @@ matplotlib numpy Pillow -ply diff --git a/Dockerfile b/Dockerfile index 41fb3264c07..33dc61882fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -135,7 +135,6 @@ ARG GRASS_PYTHON_PACKAGES="\ matplotlib \ numpy \ pip \ - ply \ psycopg2 \ python-dateutil \ python-magic \ diff --git a/REQUIREMENTS.md b/REQUIREMENTS.md index 7b2757d38f5..f42e37d3ccc 100644 --- a/REQUIREMENTS.md +++ b/REQUIREMENTS.md @@ -93,9 +93,6 @@ Note: also the respective development packages (commonly named `xxx-dev` or - **Python dateutil Library** (`python-dateutil`, needed for the tgrass modules `t.*`) [https://pypi.org/project/python-dateutil/](https://pypi.org/project/python-dateutil/) [https://github.com/dateutil/dateutil](https://github.com/dateutil/dateutil) -- **Python PLY Library (Python Lex-Yacc)** (`python-ply`, needed for the - temporal algebra in tgis) - [https://www.dabeaz.com/ply](https://www.dabeaz.com/ply/) - **Pillow (Python Imaging Library)** (highly recommended for wxGUI and necessary for wxGUI Cartographic Composer) [https://python-pillow.org/](https://python-pillow.org/) diff --git a/Vagrantfile b/Vagrantfile index 035bb0c64cb..e5b4b28b9b5 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -70,7 +70,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| "python3-dateutil", "python3-dev", "python3-numpy", - "python3-ply", "python3-pil", "libnetcdf-dev", "netcdf-bin", diff --git a/binder/requirements.txt b/binder/requirements.txt index f5f28b959a7..ac301f19c48 100644 --- a/binder/requirements.txt +++ b/binder/requirements.txt @@ -2,5 +2,4 @@ folium matplotlib numpy Pillow -ply PyVirtualDisplay diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile index 8021ccf409e..75bd8a8a877 100644 --- a/docker/debian/Dockerfile +++ b/docker/debian/Dockerfile @@ -68,7 +68,6 @@ RUN apt-get update && apt-get upgrade -y && \ python3-numpy \ python3-pil \ python3-pip \ - python3-ply \ python3-setuptools \ python3-venv \ software-properties-common \ diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile index 41fb3264c07..33dc61882fc 100644 --- a/docker/ubuntu/Dockerfile +++ b/docker/ubuntu/Dockerfile @@ -135,7 +135,6 @@ ARG GRASS_PYTHON_PACKAGES="\ matplotlib \ numpy \ pip \ - ply \ psycopg2 \ python-dateutil \ python-magic \ diff --git a/docker/ubuntu_wxgui/Dockerfile b/docker/ubuntu_wxgui/Dockerfile index e15d5dcf478..d4127f773ab 100644 --- a/docker/ubuntu_wxgui/Dockerfile +++ b/docker/ubuntu_wxgui/Dockerfile @@ -91,7 +91,6 @@ RUN apt-get update && apt-get upgrade -y && \ python3-numpy \ python3-pil \ python3-pip \ - python3-ply \ python3-setuptools \ python3-venv \ python3-wxgtk4.0 \ diff --git a/mswindows/osgeo4w/setup.hint.tmpl b/mswindows/osgeo4w/setup.hint.tmpl index 00cc0c14174..a8de50e7260 100644 --- a/mswindows/osgeo4w/setup.hint.tmpl +++ b/mswindows/osgeo4w/setup.hint.tmpl @@ -1,7 +1,7 @@ sdesc: "GRASS GIS - daily builds of development version" ldesc: "Geographic Resources Analysis Support System (GRASS GIS) - daily builds of the main branch from Git" category: Desktop -requires: liblas gdal303-runtime proj81-runtime avce00 gpsbabel gs python3-gdal python3-matplotlib libtiff python3-wxpython python3-pillow python3-pip python3-ply python3-pyopengl python3-psycopg2-binary zstd python3-pywin32 +requires: liblas gdal303-runtime proj81-runtime avce00 gpsbabel gs python3-gdal python3-matplotlib libtiff python3-wxpython python3-pillow python3-pip python3-pyopengl python3-psycopg2-binary zstd python3-pywin32 maintainer: MartinLanda curr: @GRASS_VERSION_NUMBER@-1 prev: @GRASS_VERSION_NUMBER@-1 diff --git a/singularity/debian/singularityfile_debian b/singularity/debian/singularityfile_debian index 267d7a74ad5..ba31a79afb0 100644 --- a/singularity/debian/singularityfile_debian +++ b/singularity/debian/singularityfile_debian @@ -69,7 +69,6 @@ Singularity container for GRASS GIS to be run into GRASS main directory python3-pdal \ python3-pillow \ python3-pip \ - python3-ply \ python3-requests \ python3-setuptools \ python3-venv \