From f9d34aa9fbb0c6446f601d71632b2fac7eb9c964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?xavier=20dupr=C3=A9?= Date: Fri, 1 Jan 2021 19:42:18 +0100 Subject: [PATCH] update to python 3.9 --- .circleci/config.yml | 6 +++--- .local.jenkins.lin.yml | 7 +++---- .local.jenkins.win.yml | 5 ++--- .travis.yml | 7 +++++-- HISTORY.rst | 9 ++++----- LICENSE.txt | 2 +- _doc/sphinxdoc/source/conf.py | 2 +- appveyor.yml | 11 ++++------- build_script.bat | 8 ++------ src/papierstat/__init__.py | 2 +- 10 files changed, 26 insertions(+), 33 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3223315..6c1722a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: circleci/python:3.8.3 + - image: circleci/python:3.9.1 working_directory: ~/repo @@ -18,8 +18,8 @@ jobs: name: Install pandoc command: | sudo apt-get update - wget https://github.com/jgm/pandoc/releases/download/2.2.1/pandoc-2.2.1-1-amd64.deb - sudo dpkg -i pandoc-2.2.1-1-amd64.deb + wget https://github.com/jgm/pandoc/releases/download/2.11.3.2/pandoc-2.11.3.2-1-amd64.deb + sudo dpkg -i pandoc-2.11.3.2-1-amd64.deb - run: name: Install tex diff --git a/.local.jenkins.lin.yml b/.local.jenkins.lin.yml index 45d6225..402f798 100644 --- a/.local.jenkins.lin.yml +++ b/.local.jenkins.lin.yml @@ -2,8 +2,7 @@ language: python python: - - { PATH: "{{Python37}}", VERSION: 3.7, DIST: std, PYINT: python3.7, PYTHONPATH: src } - - { PATH: "{{Python38}}", VERSION: 3.8, DIST: std, PYINT: python3.8, PYTHONPATH: src } + - { PATH: "{{Python39}}", VERSION: 3.9, DIST: std, PYINT: python3.9, PYTHONPATH: src } virtualenv: - path: {{ospathjoin(root_path, pickname("$NAME_JENKINS", project_name + "_$VERSION_$DIST_$NAME"), "_venv")}} @@ -13,7 +12,7 @@ install: - $PYINT -m pip install --upgrade --no-cache-dir --no-deps --index http://localhost:8067/simple/ jyquickhelper pyquickhelper mlinsights pandas_streaming pyensae scikit-learn --extra-index-url=https://pypi.python.org/simple/ - $PYINT -m pip install -r requirements_conda.txt - $PYINT -m pip install -r requirements.txt - - $PYINT -m pip install shapely!=1.7.0,!=1.7.1 + - $PYINT -m pip install shapely - $PYINT --version - $PYINT -m pip freeze @@ -23,7 +22,7 @@ script: after_script: - $PYINT -u setup.py bdist_wheel - - if [ ${VERSION} == "3.7" and ${DIST} != "conda" and ${NAME} == "UT" ] then cp dist/*.whl {{root_path}}/../local_pypi/local_pypi_server fi + - if [ ${VERSION} == "3.9" and ${DIST} != "conda" and ${NAME} == "UT" ] then cp dist/*.whl {{root_path}}/../local_pypi/local_pypi_server fi documentation: - if [ ${NAME} == "UT" ] then $PYINT -u setup.py build_sphinx fi diff --git a/.local.jenkins.win.yml b/.local.jenkins.win.yml index da75d54..8dda427 100644 --- a/.local.jenkins.win.yml +++ b/.local.jenkins.win.yml @@ -2,15 +2,14 @@ language: python python: - - { PATH: "{{replace(Python37, '\\', '\\\\')}}", VERSION: 3.7, DIST: std, PYTHONPATH: src } + - { PATH: "{{replace(Python39, '\\', '\\\\')}}", VERSION: 3.9, DIST: std, PYTHONPATH: src } virtualenv: - path: {{ospathjoin(root_path, pickname("%NAME_JENKINS%", project_name + "_%VERSION%_%DIST%_%NAME%"), "_venv")}} install: - pip install --upgrade pip - - pip install --no-cache-dir --no-deps --index http://localhost:8067/simple/ jyquickhelper --extra-index-url=https://pypi.python.org/simple/ - - pip install --no-cache-dir --no-deps --index http://localhost:8067/simple/ pyquickhelper --extra-index-url=https://pypi.python.org/simple/ + - pip install --no-cache-dir --no-deps --index http://localhost:8067/simple/ jyquickhelper pyquickhelper --extra-index-url=https://pypi.python.org/simple/ - pip install --no-cache-dir --no-deps --index http://localhost:8067/simple/ mlinsights pandas_streaming pyensae --extra-index-url=https://pypi.python.org/simple/ - pip install -r requirements.txt - pip freeze diff --git a/.travis.yml b/.travis.yml index f17efc8..36b11f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ -dist: xenial +dist: focal sudo: true language: python python: - - "3.8" + - "3.9" addons: - apt: - packages: @@ -20,12 +20,15 @@ env: - SEGFAULT_SIGNALS=all - PYTHONUNBUFFERED=True - SDL_VIDEODRIVER=dummy SDL_AUDIODRIVER=disk + before_install: - sudo apt-get install graphviz + install: - pip install -r requirements_conda.txt - pip install -r requirements.txt - pip install --no-deps geopandas fiona pyproj shapely - export PYTHONPATH=src + script: - python setup.py unittests diff --git a/HISTORY.rst b/HISTORY.rst index a940147..910efdf 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -5,7 +5,10 @@ History ======= -current - 2020-06-03 - 0.00Mb +current - 2021-01-01 - 0.00Mb +============================= + +0.2.350 - 2020-06-03 - 1.80Mb ============================= * `31`: Moves ConstraintKMeans to mlinsights (2020-06-03) @@ -19,10 +22,6 @@ current - 2020-06-03 - 0.00Mb * `22`: replaces as_matrix by values (pandas deprecated warning) (2018-07-29) * `21`: take a dependency on mlinsights where some code was moved (sklapi) (2018-07-29) * `19`: ajouter un code pour télécharger les données spacy du notebook sur word2vec (2018-06-17) - -0.1.178 - 2018-06-12 - 1.75Mb -============================= - * `17`: calculer ACP notebook word2vec (2018-06-12) * `15`: ajouter un notebook sur word2vec (2018-06-11) * `8`: ajouter un notebook sur les données carroyées (2018-06-11) diff --git a/LICENSE.txt b/LICENSE.txt index ceccfaf..6a38f81 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2018-2020, Xavier Dupré +Copyright (c) 2018-2021, Xavier Dupré Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/_doc/sphinxdoc/source/conf.py b/_doc/sphinxdoc/source/conf.py index 24b54b3..77e7702 100644 --- a/_doc/sphinxdoc/source/conf.py +++ b/_doc/sphinxdoc/source/conf.py @@ -11,7 +11,7 @@ local_template = os.path.join(os.path.abspath( os.path.dirname(__file__)), "phdoc_templates") -set_sphinx_variables(__file__, "papierstat", "Xavier Dupré", 2019, +set_sphinx_variables(__file__, "papierstat", "Xavier Dupré", 2021, # "guzzle_sphinx_theme", guzzle_sphinx_theme.html_theme_path(), "bootstrap", sphinx_bootstrap_theme.get_html_theme_path(), locals(), extlinks=dict( diff --git a/appveyor.yml b/appveyor.yml index 80c950f..374af22 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,8 +2,8 @@ image: - Visual Studio 2019 environment: matrix: - - PYTHON: "C:\\Python38-x64" - PYTHON_VERSION: "3.8.x" + - PYTHON: "C:\\Python39-x64" + PYTHON_VERSION: "3.9.x" PYTHON_ARCH: "64" init: - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%" @@ -11,13 +11,10 @@ init: install: - "%PYTHON%\\python -m pip install --upgrade pip" - "%PYTHON%\\Scripts\\pip install pymyinstall" - - "%PYTHON%\\Scripts\\pip install numpy pandas scikit-learn scipy matplotlib jupyter statsmodels tensorflow spacy cython" - # - "%PYTHON%\\python -c \"import locale;print('locale.getpreferredencoding=', locale.getpreferredencoding())\"" + - "%PYTHON%\\Scripts\\pip install numpy" - "%PYTHON%\\python -m pip install torch==1.7.0+cpu torchvision==0.8.1+cpu torchaudio===0.7.0 -f https://download.pytorch.org/whl/torch_stable.html" - - "%PYTHON%\\Scripts\\pymy_install3 ujson wrapt" - - "%PYTHON%\\Scripts\\pymy_install3 fiona cartopy pyproj gdal shapely pyshp" + - "%PYTHON%\\Scripts\\pymy_install3 fiona cartopy pyproj gdal shapely" - "%PYTHON%\\Scripts\\pip install -r requirements_conda.txt" - - "%PYTHON%\\Scripts\\pip install category_encoders --no-deps" - "%PYTHON%\\Scripts\\pip install -r requirements.txt" - set PYTHONPATH=src build: off diff --git a/build_script.bat b/build_script.bat index 7688939..b92257b 100644 --- a/build_script.bat +++ b/build_script.bat @@ -5,12 +5,8 @@ set pythonexe="%1" goto custom_python: :default_value_python: -set pythonexe="c:\Python372_x64\python.exe" -if not exist %pythonexe% set pythonexe="c:\Python370_x64\python.exe" -if not exist %pythonexe% set pythonexe="c:\Python366_x64\python.exe" -if not exist %pythonexe% set pythonexe="c:\Python365_x64\python.exe" -if not exist %pythonexe% set pythonexe="c:\Python364_x64\python.exe" -if not exist %pythonexe% set pythonexe="c:\Python363_x64\python.exe" +set pythonexe="c:\Python391_x64\python.exe" +if not exist %pythonexe% set pythonexe="c:\Python372_x64\python.exe" :custom_python: @echo [python] %pythonexe% %pythonexe% -u setup.py build_script diff --git a/src/papierstat/__init__.py b/src/papierstat/__init__.py index 356abe6..0e004eb 100644 --- a/src/papierstat/__init__.py +++ b/src/papierstat/__init__.py @@ -4,7 +4,7 @@ @brief Module *papierstat*. Look for insights for machine learned models. """ -__version__ = "0.2.363" +__version__ = "0.2.381" __author__ = "Xavier Dupré" __github__ = "https://github.com/sdpython/papierstat" __url__ = "http://www.xavierdupre.fr/app/papierstat/helpsphinx/index.html"