Skip to content

Commit bc2399d

Browse files
committed
merge sandbox
1 parent c094c8a commit bc2399d

9 files changed

Lines changed: 25 additions & 14 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ jobs:
1414
runs-on: ubuntu-latest
1515
strategy:
1616
matrix:
17-
python: [3.6, 3.7, 3.8, 3.9, "3.10", pypy3]
17+
python: [3.7, 3.8, 3.9, "3.10", 3.11, pypy3.8]
1818

1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v3
2121
- name: setup python
22-
uses: actions/setup-python@v2
22+
uses: actions/setup-python@v4
2323
with:
2424
python-version: ${{ matrix.python }}
2525
- name: Install dependencies

.github/workflows/dev.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ jobs:
1414
runs-on: ubuntu-latest
1515
strategy:
1616
matrix:
17-
python: [3.6, 3.7, 3.8, 3.9, "3.10", pypy3]
17+
python: [3.7, 3.8, 3.9, "3.10", 3.11, pypy3.8]
1818

1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v3
2121
- name: setup python
22-
uses: actions/setup-python@v2
22+
uses: actions/setup-python@v4
2323
with:
2424
python-version: ${{ matrix.python }}
2525
- name: Install dependencies

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ jobs:
1313
runs-on: ubuntu-latest
1414
strategy:
1515
matrix:
16-
python: [3.6, 3.7, 3.8, 3.9, "3.10", pypy3]
16+
python: [3.7, 3.8, 3.9, "3.10", 3.11, pypy3.8]
1717

1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v3
2020
- name: setup python
21-
uses: actions/setup-python@v2
21+
uses: actions/setup-python@v4
2222
with:
2323
python-version: ${{ matrix.python }}
2424
- name: Install dependencies

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 7.0.0
2+
3+
- Drop python 3.6, add python 3.11 (@hugovk - thx)
4+
15
## 6.1.2
26

37
- Reintroduce the cli options

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ However, there is an alternative decoding package called [Unidecode](https://git
2020

2121
- Python `2.7` <-> python-slugify `< 5.0.0`
2222
- Python `3.6+` <-> python-slugify `>= 5.0.0`
23+
- Python `3.7+` <-> python-slugify `>= 7.0.0`
2324

2425
# How to install
2526

setup.cfg

Lines changed: 0 additions & 2 deletions
This file was deleted.

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010

1111
package = 'slugify'
12-
python_requires = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
12+
python_requires = ">=3.7"
1313
here = os.path.abspath(os.path.dirname(__file__))
1414

1515
install_requires = ['text-unidecode>=1.3']
@@ -75,11 +75,11 @@ def status(s):
7575
'License :: OSI Approved :: MIT License',
7676
'Programming Language :: Python',
7777
'Programming Language :: Python :: 3',
78-
'Programming Language :: Python :: 3.6',
7978
'Programming Language :: Python :: 3.7',
8079
'Programming Language :: Python :: 3.8',
8180
'Programming Language :: Python :: 3.9',
8281
'Programming Language :: Python :: 3.10',
82+
'Programming Language :: Python :: 3.11',
8383
],
8484
entry_points={'console_scripts': ['slugify=slugify.__main__:main']},
8585
)

slugify/__init__.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
11
from .special import *
22
from .slugify import *
3+
from .__version__ import __title__
4+
from .__version__ import __author__
5+
from .__version__ import __author_email__
6+
from .__version__ import __description__
7+
from .__version__ import __url__
8+
from .__version__ import __license__
9+
from .__version__ import __copyright__
10+
from .__version__ import __version__

slugify/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
__url__ = 'https://github.com/un33k/python-slugify'
66
__license__ = 'MIT'
77
__copyright__ = 'Copyright 2022 Val Neekman @ Neekware Inc.'
8-
__version__ = '6.1.2'
8+
__version__ = '7.0.0'

0 commit comments

Comments
 (0)