diff --git a/.csvforwkt b/.csvforwkt index cc9c41f..d52cc13 100644 --- a/.csvforwkt +++ b/.csvforwkt @@ -1,2 +1,2 @@ -python3 -m venv csvforwkt-env && export PYTHONPATH=. && export PATH=/home/malapert/Work/csvforwkt/csvforwkt-env/bin:/home/malapert/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin -source "/home/malapert/Work/csvforwkt/csvforwkt-env/bin/activate" +python3 -m venv csvforwkt-env && export PYTHONPATH=. && export PATH=/home/jcmalapert/csvforwkt/csvforwkt-env/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/snap/bin +source "/home/jcmalapert/csvforwkt/csvforwkt-env/bin/activate" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a3a6cbe..cfcb0f2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ # See https://pre-commit.com/hooks.html for more hooks repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 + rev: v4.4.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer @@ -18,15 +18,15 @@ repos: - id: pretty-format-json - id: fix-encoding-pragma - repo: https://github.com/asottile/reorder_python_imports - rev: v3.8.3 + rev: v3.9.0 hooks: - id: reorder-python-imports - repo: https://github.com/ambv/black - rev: 22.10.0 + rev: 22.12.0 hooks: - id: black language_version: python3.10 - - repo: https://gitlab.com/pycqa/flake8 - rev: 3.9.2 + - repo: https://github.com/pycqa/flake8 + rev: 6.0.0 hooks: - id: flake8 diff --git a/CHANGELOG b/CHANGELOG index c4dd6f3..a6d7250 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,14 @@ -### Fix DOI resolver pattern for full URL (HEAD -> fix-doi-url) +### Fix precomit Fix docs Fix tests Remove useless file (HEAD -> main) +>Sat, 24 Dec 2022 14:37:18 +0100 + +>Author: Jean-Christophe Malapert (jean-chrsitophe.malapert@cnes.fr) + +>Commiter: Jean-Christophe Malapert (jean-chrsitophe.malapert@cnes.fr) + + + + +### Fix DOI resolver pattern for full URL >Tue, 6 Dec 2022 16:58:07 +0100 >Author: Benoit Seignovert (benoit.seignovert@univ-nantes.fr) @@ -8,7 +18,7 @@ -### Add pandas in requirements.txt Update to python 3.10 Fix the calculation of the radius when the approxmation is selected. (origin/main, origin/HEAD, main) +### Add pandas in requirements.txt Update to python 3.10 Fix the calculation of the radius when the approxmation is selected. >Tue, 11 Oct 2022 00:02:05 +0200 >Author: Jean-Christophe Malapert (Jean-christophe.malapert@cnes.fr) diff --git a/Makefile b/Makefile index 0b5f08c..b6e81c3 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,6 @@ Usage:\n -------------------------------------------------------------------------\n make prepare-dev\t\t Prepare Development environment\n make install-dev\t\t Install COTS and csvforwkt for development purpose\n - make data\t\t\t Download data\n make tests\t\t\t Run units and integration tests\n \n make doc\t\t\t Generate the documentation\n @@ -118,9 +117,6 @@ release: version: python3 setup.py --version -data: - pip install -r requirements_data.txt && python scripts/data_download.py - upload-test-pypi: flit publish --repository pypitest diff --git a/README.rst b/README.rst index 4b2274e..6084f6b 100644 --- a/README.rst +++ b/README.rst @@ -103,7 +103,7 @@ Run tests .. code-block:: console - $make tests + $ make tests diff --git a/docs/source/conf.py b/docs/source/conf.py index ed38f70..75fc326 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -57,7 +57,6 @@ def setup(app): "sphinx.ext.intersphinx", "sphinx.ext.viewcode", "sphinxcontrib.plantuml", - "sphinx_exec_directive", ] # Add any paths that contain templates here, relative to this directory. diff --git a/scripts/data_download.py b/scripts/data_download.py deleted file mode 100644 index 173db9d..0000000 --- a/scripts/data_download.py +++ /dev/null @@ -1,4 +0,0 @@ -# -*- coding: utf-8 -*- -import os.path - -# download script TODO diff --git a/tests/csvforwkt_test.py b/tests/csvforwkt_test.py index ca66e5e..ed438cd 100644 --- a/tests/csvforwkt_test.py +++ b/tests/csvforwkt_test.py @@ -113,6 +113,14 @@ def test_color_formatter(): def test_iau(data): + """Test the library output with the GDAL output. + + Also fix : + - some number with float precision between GDAL and library output + - some extra spaces + - the DOI URL by waiting we regenerate the DOI URL with GDAL + + """ import re iau_prj = {} @@ -125,6 +133,7 @@ def test_iau(data): for wkt in wkts: iau_line_regexo = '"IAU",(.*),2015' m = re.findall(iau_line_regexo, wkt) + # print(f"{m} -> {wkt}") id: int if len(m) > 1: id = int(m[1]) @@ -143,8 +152,6 @@ def test_iau(data): continue iau_wkt_proj = iau_prj[key] generated_wkt = pytest.crs[key].wkt() - # print(generated_wkt) - # print(iau_wkt_proj) iau_wkt_proj = ( iau_wkt_proj.replace("\t", "") .replace(" ", "") @@ -216,6 +223,10 @@ def test_iau(data): .replace('AXIS["Northing(N)"', 'AXIS["(N)"') .replace('AXIS["Westing(W)', 'AXIS["(W)') .replace('AXIS["westing(W)', 'AXIS["(W)') + .replace( + "https://doi.org/10.1007/s10569-017-9805-5", + "doi://10.1007/s10569-017-9805-5", + ) # .replace("Easting", "") # .replace("Northing", "") ) diff --git a/third_party.txt b/third_party.txt index ef1fafd..e152a4e 100644 --- a/third_party.txt +++ b/third_party.txt @@ -1,84 +1,81 @@ -make[2]: Entering directory '/home/malapert/Dev/csvforwkt' +make[1] : on entre dans le répertoire « /home/jcmalapert/csvforwkt » pip-licenses - Name Version License - Babel 2.10.1 BSD License - Jinja2 3.1.2 BSD License - MarkupSafe 2.1.1 BSD License - PyYAML 6.0 MIT License - Pygments 2.12.0 BSD License - Sphinx 4.3.1 BSD License - alabaster 0.7.12 BSD License - appdirs 1.4.4 MIT License - astroid 2.6.6 GNU Lesser General Public License v2 (LGPLv2) - attrs 21.4.0 MIT License - black 20.8b1 MIT License - certifi 2021.10.8 Mozilla Public License 2.0 (MPL 2.0) - cfgv 3.3.1 MIT License - charset-normalizer 2.0.12 MIT License - click 7.1.2 BSD License - coverage 6.2 Apache Software License - csvforwkt 0.1.dev6+g19e0121.d20220507 GNU General Public License v3 (GPLv3)GNU Lesser General Public License v3 (LGPLv3) - distlib 0.3.4 Python Software Foundation License - docutils 0.17.1 BSD License; GNU General Public License (GPL); Public Domain; Python Software Foundation License - filelock 3.6.0 Public Domain - flake8 4.0.1 MIT License - flit 3.5.1 BSD License - flit-core 3.5.1 BSD License - identify 2.5.0 MIT License - idna 3.3 BSD License - imagesize 1.3.0 MIT License - iniconfig 1.1.1 MIT License - isort 5.10.1 MIT License - lazy-object-proxy 1.7.1 BSD License - mccabe 0.6.1 MIT License - mypy 0.910 MIT License - mypy-extensions 0.4.3 MIT License - nodeenv 1.6.0 BSD License - numpy 1.22.3 BSD License - packaging 21.3 Apache Software License; BSD License - pandas 1.4.2 BSD License - pathspec 0.9.0 Mozilla Public License 2.0 (MPL 2.0) - pkg-resources 0.0.0 UNKNOWN - platformdirs 2.5.2 MIT License - pluggy 1.0.0 MIT License - pre-commit 2.16.0 MIT License - pre-commit-hooks 4.0.1 MIT License - pur 5.4.2 BSD License - py 1.11.0 MIT License - pycodestyle 2.8.0 MIT License - pyflakes 2.4.0 MIT License - pylint 3.0.0a1 GNU General Public License (GPL) - pyparsing 3.0.8 MIT License - pytest 6.2.5 MIT License - pytest-html 3.1.1 Mozilla Public License 2.0 (MPL 2.0) - pytest-metadata 2.0.1 MPL-2.0 - python-dateutil 2.8.2 Apache Software License; BSD License - pytz 2022.1 MIT License - regex 2022.4.24 Apache Software License - requests 2.27.1 Apache Software License - ruamel.yaml 0.17.21 MIT License - ruamel.yaml.clib 0.2.6 MIT License - setuptools-scm 6.3.2 MIT License - six 1.16.0 MIT License - snowballstemmer 2.2.0 BSD License - sphinx-bootstrap-theme 0.8.0 MIT License - sphinx-exec-directive 0.6 MIT License - sphinx-rtd-theme 1.0.0 MIT License - sphinxcontrib-applehelp 1.0.2 BSD License - sphinxcontrib-devhelp 1.0.2 BSD License - sphinxcontrib-htmlhelp 2.0.0 BSD License - sphinxcontrib-jsmath 1.0.1 BSD License - sphinxcontrib-plantuml 0.23 BSD License - sphinxcontrib-qthelp 1.0.3 BSD License - sphinxcontrib-serializinghtml 1.1.5 BSD License - toml 0.10.2 MIT License - tomli 2.0.1 MIT License - tomli-w 1.0.0 MIT License - tox 3.24.4 MIT License - typed-ast 1.5.3 Apache License 2.0 - types-setuptools 57.4.4 Apache Software License - typing-extensions 4.2.0 Python Software Foundation License - urllib3 1.26.9 MIT License - virtualenv 20.14.1 MIT License - wrapt 1.12.1 BSD License -make[2]: Leaving directory '/home/malapert/Dev/csvforwkt' + Name Version License + Babel 2.11.0 BSD License + Jinja2 3.1.2 BSD License + MarkupSafe 2.1.1 BSD License + PyYAML 6.0 MIT License + Pygments 2.13.0 BSD License + Sphinx 4.3.1 BSD License + alabaster 0.7.12 BSD License + appdirs 1.4.4 MIT License + astroid 2.6.6 GNU Lesser General Public License v2 (LGPLv2) + attrs 22.2.0 MIT License + black 20.8b1 MIT License + certifi 2022.12.7 Mozilla Public License 2.0 (MPL 2.0) + cfgv 3.3.1 MIT License + charset-normalizer 2.1.1 MIT License + click 7.1.2 BSD License + coverage 6.2 Apache Software License + csvforwkt 0.1.dev12+gb999ad3.d20221224 GNU General Public License v3 (GPLv3)GNU Lesser General Public License v3 (LGPLv3) + distlib 0.3.6 Python Software Foundation License + docutils 0.17.1 BSD License; GNU General Public License (GPL); Public Domain; Python Software Foundation License + filelock 3.8.2 The Unlicense (Unlicense) + flake8 4.0.1 MIT License + flit 3.5.1 BSD License + flit-core 3.5.1 BSD License + identify 2.5.11 MIT License + idna 3.4 BSD License + imagesize 1.4.1 MIT License + iniconfig 1.1.1 MIT License + isort 5.11.4 MIT License + lazy-object-proxy 1.8.0 BSD License + mccabe 0.6.1 MIT License + mypy 0.910 MIT License + mypy-extensions 0.4.3 MIT License + nodeenv 1.7.0 BSD License + numpy 1.24.0 BSD License + packaging 22.0 Apache Software License; BSD License + pandas 1.5.2 BSD License + pathspec 0.10.3 Mozilla Public License 2.0 (MPL 2.0) + platformdirs 2.6.0 MIT License + pluggy 1.0.0 MIT License + pre-commit 2.16.0 MIT License + pre-commit-hooks 4.0.1 MIT License + pur 5.4.2 BSD License + py 1.11.0 MIT License + pycodestyle 2.8.0 MIT License + pyflakes 2.4.0 MIT License + pylint 3.0.0a1 GNU General Public License (GPL) + pytest 6.2.5 MIT License + pytest-html 3.1.1 Mozilla Public License 2.0 (MPL 2.0) + pytest-metadata 2.0.4 MPL-2.0 + python-dateutil 2.8.2 Apache Software License; BSD License + pytz 2022.7 MIT License + regex 2022.10.31 Apache Software License + requests 2.28.1 Apache Software License + ruamel.yaml 0.17.21 MIT License + ruamel.yaml.clib 0.2.7 MIT License + setuptools-scm 6.3.2 MIT License + six 1.16.0 MIT License + snowballstemmer 2.2.0 BSD License + sphinx-bootstrap-theme 0.8.0 MIT License + sphinx-rtd-theme 1.1.1 MIT License + sphinxcontrib-applehelp 1.0.2 BSD License + sphinxcontrib-devhelp 1.0.2 BSD License + sphinxcontrib-htmlhelp 2.0.0 BSD License + sphinxcontrib-jsmath 1.0.1 BSD License + sphinxcontrib-plantuml 0.24.1 BSD License + sphinxcontrib-qthelp 1.0.3 BSD License + sphinxcontrib-serializinghtml 1.1.5 BSD License + toml 0.10.2 MIT License + tomli 2.0.1 MIT License + tomli-w 1.0.0 MIT License + tox 3.24.4 MIT License + typed-ast 1.5.4 Apache License 2.0 + types-setuptools 57.4.4 Apache Software License + typing-extensions 4.4.0 Python Software Foundation License + urllib3 1.26.13 MIT License + virtualenv 20.17.1 MIT License + wrapt 1.12.1 BSD License +make[1] : on quitte le répertoire « /home/jcmalapert/csvforwkt »