Skip to content

Commit a54e654

Browse files
gsolardgsolard
authored
Remove 3.7 support. Added 3.9 dependencies and removed 3.12 from CI. Removed model from setup.py (#31)
* Added 3.9 dependencies and removed 3.12 from CI * Fixed the zipp version in th CI * Removed 3.7 support * Updated spacy * Removed spacy model from setup * Updated spacy model in the CI
1 parent 92c5dc8 commit a54e654

5 files changed

+24
-30
lines changed

‎.github/workflows/wnf_build_tests_less_than_39.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
build:
3030
strategy:
3131
matrix:
32-
python-version: ["3.7", "3.8", "3.9"]
32+
python-version: ["3.8", "3.9"]
3333
os: [ubuntu-latest, windows-latest]
3434
runs-on: ${{ matrix.os }}
3535

@@ -58,7 +58,7 @@ jobs:
5858
build-spacy:
5959
strategy:
6060
matrix:
61-
python-version: ["3.7", "3.8", "3.9"]
61+
python-version: ["3.8", "3.9"]
6262
os: [ubuntu-latest, windows-latest]
6363
runs-on: ${{ matrix.os }}
6464

@@ -72,7 +72,7 @@ jobs:
7272
run: |
7373
python -m pip install --upgrade pip
7474
pip install setuptools
75-
pip install https://github.com/explosion/spacy-models/releases/download/fr_core_news_sm-3.3.0/fr_core_news_sm-3.3.0-py3-none-any.whl
75+
pip install https://github.com/explosion/spacy-models/releases/download/fr_core_news_sm-3.7.0/fr_core_news_sm-3.7.0-py3-none-any.whl
7676
pip install .[lemmatizer]
7777
pip install nose==1.3.7 nose-exclude==0.5.0 coverage==5.3
7878
pip install flake8
@@ -88,7 +88,7 @@ jobs:
8888
build-local:
8989
strategy:
9090
matrix:
91-
python-version: ["3.7", "3.8", "3.9"]
91+
python-version: ["3.8", "3.9"]
9292
os: [ubuntu-latest, windows-latest]
9393
runs-on: ${{ matrix.os }}
9494

‎.github/workflows/wnf_build_tests_more_than_310.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
build-spacy:
5959
strategy:
6060
matrix:
61-
python-version: ["3.10", "3.11", "3.12"]
61+
python-version: ["3.10", "3.11"]
6262
os: [ubuntu-latest, windows-latest]
6363
runs-on: ${{ matrix.os }}
6464

@@ -72,7 +72,7 @@ jobs:
7272
run: |
7373
python -m pip install --upgrade pip
7474
pip install setuptools
75-
pip install https://github.com/explosion/spacy-models/releases/download/fr_core_news_sm-3.3.0/fr_core_news_sm-3.3.0-py3-none-any.whl
75+
pip install https://github.com/explosion/spacy-models/releases/download/fr_core_news_sm-3.7.0/fr_core_news_sm-3.7.0-py3-none-any.whl
7676
pip install .[lemmatizer]
7777
pip install pytest
7878
pip install flake8
@@ -88,7 +88,7 @@ jobs:
8888
build-local:
8989
strategy:
9090
matrix:
91-
python-version: ["3.10", "3.11", "3.12"]
91+
python-version: ["3.10", "3.11"]
9292
os: [ubuntu-latest, windows-latest]
9393
runs-on: ${{ matrix.os }}
9494

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
![WNF tests 3.10](https://github.com/OSS-Pole-Emploi/words_n_fun/actions/workflows/wnf_build_tests_more_than_310.yaml/badge.svg)
44
![WNF linter](https://github.com/OSS-Pole-Emploi/words_n_fun/actions/workflows/wnf_linter.yaml/badge.svg)
55
[![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)
6-
[![Generic badge](https://img.shields.io/badge/python-3.7|3.8|3.9|3.10|3.11-blue.svg)](https://shields.io/)
6+
[![Generic badge](https://img.shields.io/badge/python-3.8|3.9|3.10|3.11-blue.svg)](https://shields.io/)
77

88
# WORDS N FUN : Semantic analysis module
99

‎requirements.txt

+11-15
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
# Data manipulation
2-
numpy==1.21.6; python_version < "3.8"
3-
numpy==1.23.2; python_version == "3.8"
4-
numpy==1.23.2; python_version == "3.9"
2+
numpy==1.23.2; python_version < "3.10"
53
numpy==1.26.0; python_version >= "3.10"
6-
pandas==1.3.5; python_version < "3.8"
7-
pandas==1.4.4; python_version == "3.8"
8-
pandas==1.4.4; python_version == "3.9"
4+
pandas==1.4.4; python_version < "3.10"
95
pandas==2.1.1; python_version >= "3.10"
106

117
# NLP
@@ -18,20 +14,20 @@ simplejson==3.19.2
1814
requests==2.31.0
1915

2016
# Optionnals - code quality & cie
21-
flake8==5.0.4; python_version <= "3.9"
17+
flake8==5.0.4; python_version < "3.10"
2218
flake8==6.1.0; python_version >= "3.10"
23-
black==22.8.0; python_version <= "3.9"
19+
black==22.8.0; python_version < "3.10"
2420
black==23.3.0; python_version >= "3.10"
25-
isort==5.10.1; python_version <= "3.9"
21+
isort==5.10.1; python_version < "3.10"
2622
isort==5.12.0; python_version >= "3.10"
27-
nose==1.3.7; python_version <= "3.9"
28-
nose-exclude==0.5.0; python_version <= "3.9"
29-
coverage==6.4.4; python_version <= "3.9"
23+
nose==1.3.7; python_version < "3.10"
24+
nose-exclude==0.5.0; python_version < "3.10"
25+
coverage==6.4.4; python_version < "3.10"
3026
pytest==7.4.2; python_version >= "3.10"
3127

3228
# Has to be installed last / optionnal to use spacy lemmatizer
33-
markupsafe==2.1.3 # BUG FIX -> https://github.com/aws/aws-sam-cli/issues/3661
29+
markupsafe==2.1.3
3430
Cython==3.0.3
35-
spacy==3.3.3
31+
spacy==3.7.1
3632
# The following line downloads a french spacy model. It can be commented if you don't have an internet access to download it, but lemmatizer features won't work.
37-
https://github.com/explosion/spacy-models/releases/download/fr_core_news_sm-3.3.0/fr_core_news_sm-3.3.0-py3-none-any.whl
33+
https://github.com/explosion/spacy-models/releases/download/fr_core_news_sm-3.7.0/fr_core_news_sm-3.7.0-py3-none-any.whl

‎setup.py

+5-7
Original file line numberDiff line numberDiff line change
@@ -43,26 +43,24 @@
4343
description="Semantic library of the Data Services agency",
4444
url="https://github.com/OSS-Pole-Emploi/words_n_fun",
4545
platforms=['windows', 'linux'],
46-
python_requires='>=3.7',
46+
python_requires='>=3.8',
4747
package_data={
4848
'words_n_fun': ['configs/*.json', 'nltk_data/corpora/stopwords/french']
4949
},
5050
include_package_data=True,
5151
install_requires=[
52-
'pandas>=1.3,<1.4; python_version < "3.8"',
53-
'pandas>=1.3,<1.5; python_version == "3.8"',
52+
'pandas>=1.3,<1.5; python_version < "3.10"',
5453
'pandas>=1.3; python_version >= "3.10"',
55-
'numpy>=1.19,<1.22; python_version < "3.8"',
56-
'numpy>=1.19,<1.24; python_version == "3.8"',
54+
'numpy>=1.19,<1.24; python_version < "3.10"',
5755
'numpy>=1.19; python_version >= "3.10"',
5856
'nltk>=3.4',
5957
'ftfy>=5.8',
6058
'tqdm>=4.40',
61-
'simplejson>=3.17',
59+
'simplejson>=3.17',
6260
'requests>=2.23',
6361
],
6462
extras_require={
65-
"lemmatizer": ["spacy>=3.3.3", "markupsafe>=2.0.1", "Cython>=0.29.24", "fr-core-news-sm==3.3.0"]
63+
"lemmatizer": ["spacy>=3.7.1", "markupsafe>=2.1.3", "Cython>=3.0.3"]
6664
}
6765
# pip install words_n_fun || pip install words_n_fun[lemmatizer]
6866
)

0 commit comments

Comments
 (0)