Skip to content

Commit

Permalink
merge sandbox
Browse files Browse the repository at this point in the history
  • Loading branch information
un33k committed Nov 18, 2022
1 parent c094c8a commit bc2399d
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python: [3.6, 3.7, 3.8, 3.9, "3.10", pypy3]
python: [3.7, 3.8, 3.9, "3.10", 3.11, pypy3.8]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: setup python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
- name: Install dependencies
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python: [3.6, 3.7, 3.8, 3.9, "3.10", pypy3]
python: [3.7, 3.8, 3.9, "3.10", 3.11, pypy3.8]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: setup python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
- name: Install dependencies
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python: [3.6, 3.7, 3.8, 3.9, "3.10", pypy3]
python: [3.7, 3.8, 3.9, "3.10", 3.11, pypy3.8]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: setup python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
- name: Install dependencies
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 7.0.0

- Drop python 3.6, add python 3.11 (@hugovk - thx)

## 6.1.2

- Reintroduce the cli options
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ However, there is an alternative decoding package called [Unidecode](https://git

- Python `2.7` <-> python-slugify `< 5.0.0`
- Python `3.6+` <-> python-slugify `>= 5.0.0`
- Python `3.7+` <-> python-slugify `>= 7.0.0`

# How to install

Expand Down
2 changes: 0 additions & 2 deletions setup.cfg

This file was deleted.

4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@


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

install_requires = ['text-unidecode>=1.3']
Expand Down Expand Up @@ -75,11 +75,11 @@ def status(s):
'License :: OSI Approved :: MIT License',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
],
entry_points={'console_scripts': ['slugify=slugify.__main__:main']},
)
8 changes: 8 additions & 0 deletions slugify/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
from .special import *
from .slugify import *
from .__version__ import __title__
from .__version__ import __author__
from .__version__ import __author_email__
from .__version__ import __description__
from .__version__ import __url__
from .__version__ import __license__
from .__version__ import __copyright__
from .__version__ import __version__
2 changes: 1 addition & 1 deletion slugify/__version__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
__url__ = 'https://github.com/un33k/python-slugify'
__license__ = 'MIT'
__copyright__ = 'Copyright 2022 Val Neekman @ Neekware Inc.'
__version__ = '6.1.2'
__version__ = '7.0.0'

0 comments on commit bc2399d

Please sign in to comment.