[GRASS-git] [OSGeo/grass] e2d4fb: Python: Remove code for Python 2, remove six from ...

Alexandre Detiste noreply at github.com
Tue Aug 8 08:14:08 PDT 2023


  Branch: refs/heads/main
  Home:   https://github.com/OSGeo/grass
  Commit: e2d4fbabe5c04b38387333c13cb219975576ef71
      https://github.com/OSGeo/grass/commit/e2d4fbabe5c04b38387333c13cb219975576ef71
  Author: Alexandre Detiste <alexandre.detiste at gmail.com>
  Date:   2023-08-08 (Tue, 08 Aug 2023)

  Changed paths:
    M .github/workflows/apt.txt
    M .github/workflows/osgeo4w.yml
    M .pylintrc
    M .travis/linux.install.sh
    M REQUIREMENTS.md
    M Vagrantfile
    M docker/alpine/Dockerfile
    M gui/wxpython/.pylintrc
    M gui/wxpython/animation/dialogs.py
    M gui/wxpython/animation/frame.py
    M gui/wxpython/animation/nviztask.py
    M gui/wxpython/animation/temporal_manager.py
    M gui/wxpython/animation/utils.py
    M gui/wxpython/core/gcmd.py
    M gui/wxpython/core/gconsole.py
    M gui/wxpython/core/gthread.py
    M gui/wxpython/core/menutree.py
    M gui/wxpython/core/settings.py
    M gui/wxpython/core/toolboxes.py
    M gui/wxpython/core/treemodel.py
    M gui/wxpython/core/units.py
    M gui/wxpython/core/utils.py
    M gui/wxpython/core/workspace.py
    M gui/wxpython/dbmgr/base.py
    M gui/wxpython/dbmgr/dialogs.py
    M gui/wxpython/dbmgr/sqlbuilder.py
    M gui/wxpython/dbmgr/vinfo.py
    M gui/wxpython/gcp/manager.py
    M gui/wxpython/gmodeler/dialogs.py
    M gui/wxpython/gmodeler/frame.py
    M gui/wxpython/gmodeler/model.py
    M gui/wxpython/gui_core/dialogs.py
    M gui/wxpython/gui_core/forms.py
    M gui/wxpython/gui_core/ghelp.py
    M gui/wxpython/gui_core/gselect.py
    M gui/wxpython/gui_core/mapdisp.py
    M gui/wxpython/gui_core/pyedit.py
    M gui/wxpython/gui_core/query.py
    M gui/wxpython/gui_core/treeview.py
    M gui/wxpython/gui_core/widgets.py
    M gui/wxpython/iclass/frame.py
    M gui/wxpython/iclass/statistics.py
    M gui/wxpython/iclass/toolbars.py
    M gui/wxpython/icons/icon.py
    M gui/wxpython/image2target/ii2t_manager.py
    M gui/wxpython/iscatt/controllers.py
    M gui/wxpython/iscatt/core_c.py
    M gui/wxpython/iscatt/dialogs.py
    M gui/wxpython/iscatt/frame.py
    M gui/wxpython/iscatt/iscatt_core.py
    M gui/wxpython/iscatt/plots.py
    M gui/wxpython/lmgr/giface.py
    M gui/wxpython/lmgr/pyshell.py
    M gui/wxpython/location_wizard/wizard.py
    M gui/wxpython/mapdisp/main.py
    M gui/wxpython/mapwin/base.py
    M gui/wxpython/mapwin/buffered.py
    M gui/wxpython/modules/colorrules.py
    M gui/wxpython/nviz/mapwindow.py
    M gui/wxpython/nviz/tools.py
    M gui/wxpython/nviz/wxnviz.py
    M gui/wxpython/photo2image/ip2i_manager.py
    M gui/wxpython/psmap/frame.py
    M gui/wxpython/psmap/instructions.py
    M gui/wxpython/startup/locdownload.py
    M gui/wxpython/timeline/frame.py
    M gui/wxpython/tools/build_modules_xml.py
    M gui/wxpython/tools/update_menudata.py
    M gui/wxpython/tplot/frame.py
    M gui/wxpython/vdigit/dialogs.py
    M gui/wxpython/vdigit/mapwindow.py
    M gui/wxpython/vdigit/preferences.py
    M gui/wxpython/vdigit/wxdigit.py
    M gui/wxpython/vdigit/wxdisplay.py
    M gui/wxpython/vnet/dialogs.py
    M gui/wxpython/vnet/vnet_core.py
    M gui/wxpython/vnet/vnet_data.py
    M gui/wxpython/vnet/widgets.py
    M gui/wxpython/web_services/dialogs.py
    M gui/wxpython/web_services/widgets.py
    M gui/wxpython/wxgui.py
    M gui/wxpython/wxplot/base.py
    M gui/wxpython/wxplot/profile.py
    M locale/grass_po_stats.py
    M man/parser_standard_options.py
    M mswindows/osgeo4w/setup.hint.tmpl
    M python/.pylintrc
    M python/grass/gunittest/case.py
    M python/grass/gunittest/checkers.py
    M python/grass/gunittest/invoker.py
    M python/grass/gunittest/reporters.py
    M python/grass/gunittest/testsuite/data/samplecode/testsuite/test_python_unittest.py
    M python/grass/gunittest/testsuite/data/samplecode/testsuite/test_success.py
    M python/grass/gunittest/utils.py
    M python/grass/pydispatch/dispatcher.py
    M python/grass/pydispatch/saferef.py
    M python/grass/pygrass/Makefile
    M python/grass/pygrass/gis/__init__.py
    M python/grass/pygrass/gis/region.py
    M python/grass/pygrass/modules/grid/grid.py
    M python/grass/pygrass/modules/grid/patch.py
    M python/grass/pygrass/modules/grid/split.py
    M python/grass/pygrass/modules/interface/env.py
    M python/grass/pygrass/modules/interface/flag.py
    M python/grass/pygrass/modules/interface/module.py
    M python/grass/pygrass/modules/interface/parameter.py
    M python/grass/pygrass/modules/interface/read.py
    M python/grass/pygrass/modules/interface/testsuite/test_flag.py
    M python/grass/pygrass/modules/interface/testsuite/test_parameter.py
    M python/grass/pygrass/modules/interface/typedict.py
    M python/grass/pygrass/modules/shortcuts.py
    R python/grass/pygrass/orderdict.py
    M python/grass/pygrass/raster/__init__.py
    M python/grass/pygrass/raster/abstract.py
    M python/grass/pygrass/tests/benchmark.py
    M python/grass/pygrass/tests/set_mapset.py
    M python/grass/pygrass/vector/__init__.py
    M python/grass/pygrass/vector/table.py
    M python/grass/pygrass/vector/testsuite/test_table.py
    M python/grass/script/__init__.py
    M python/grass/script/array.py
    M python/grass/script/core.py
    M python/grass/script/db.py
    M python/grass/script/raster.py
    M python/grass/script/raster3d.py
    M python/grass/script/task.py
    M python/grass/script/testsuite/test_utils.py
    M python/grass/script/utils.py
    M python/grass/script/vector.py
    M python/grass/temporal/__init__.py
    M python/grass/temporal/abstract_map_dataset.py
    M python/grass/temporal/abstract_space_time_dataset.py
    M python/grass/temporal/base.py
    M python/grass/temporal/core.py
    M python/grass/temporal/datetime_math.py
    M python/grass/temporal/metadata.py
    M python/grass/temporal/sampling.py
    M python/grass/temporal/spatial_extent.py
    M python/grass/temporal/spatial_topology_dataset_connector.py
    M python/grass/temporal/spatio_temporal_relationships.py
    M python/grass/temporal/temporal_algebra.py
    M python/grass/temporal/temporal_extent.py
    M python/grass/temporal/temporal_granularity.py
    M python/grass/temporal/temporal_operator.py
    M python/grass/temporal/temporal_raster3d_algebra.py
    M python/grass/temporal/temporal_raster_algebra.py
    M python/grass/temporal/temporal_raster_base_algebra.py
    M python/grass/temporal/temporal_topology_dataset_connector.py
    M python/grass/temporal/temporal_vector_algebra.py
    M python/grass/temporal/unit_tests.py
    M python/grass/temporal/univar_statistics.py
    M python/libgrass_interface_generator/ctypesgen/main.py
    M python/libgrass_interface_generator/ctypesgen/parser/lex.py
    M rpm/grass.spec
    M scripts/g.manual/g.manual.py
    M scripts/g.search.modules/g.search.modules.py
    M scripts/i.image.mosaic/i.image.mosaic.py
    M scripts/r.in.wms/wms_base.py
    M scripts/r.tileset/r.tileset.py
    M scripts/v.in.geonames/v.in.geonames.py
    M scripts/v.in.wfs/v.in.wfs.py
    M temporal/t.info/t.info.py
    M temporal/t.list/t.list.py
    M temporal/t.rast.accumulate/t.rast.accumulate.py
    M temporal/t.rast.neighbors/t.rast.neighbors.py
    M temporal/t.rast.to.rast3/t.rast.to.rast3.py
    M temporal/t.register/t.register.py
    M temporal/t.topology/t.topology.py
    M temporal/t.vect.db.select/t.vect.db.select.py
    M utils/g.html2man/g.html2man.py

  Log Message:
  -----------
  Python: Remove code for Python 2, remove six from requirements (#3079)

* remove unused code

* removing six dependency from CI

* remove reference to removed orderdict.py

* python2: remove old py3-compat imports from __future__

* python2 removal: review all "except ImportError:"

* python2 removal: update ctypesgen help text

* python2 removal: Ctypes is a builtin now

* rpm: remove reference to RHEL6 python2 packages


---------

Co-authored-by: Anna Petrasova <kratochanna at gmail.com>




More information about the grass-commit mailing list