Skip to content

Commit

Permalink
add chardet as dependency, related to pyexcel/pyexcel#272
Browse files Browse the repository at this point in the history
  • Loading branch information
chfw committed Nov 9, 2024
1 parent 1caf894 commit 1bd673a
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 20 deletions.
1 change: 1 addition & 0 deletions .github/workflows/moban-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
python-version: '3.7'
- name: check changes
run: |
pip install markupsafe==2.0.1
pip install moban gitfs2 pypifs moban-jinja2-github moban-ansible
moban
git status
Expand Down
19 changes: 12 additions & 7 deletions .github/workflows/pythonpublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,16 @@ on:
types: [created]

jobs:
deploy:
pypi-publish:
name: upload release to PyPI
runs-on: ubuntu-latest
# Specifying a GitHub environment is optional, but strongly encouraged
environment: pypi
permissions:
# IMPORTANT: this permission is mandatory for trusted publishing
id-token: write
steps:
# retrieve your distributions here
- uses: actions/checkout@v1
- name: Set up Python
uses: actions/setup-python@v1
Expand All @@ -16,11 +23,9 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel twine
- name: Build and publish
env:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
pip install setuptools wheel
- name: Build
run: |
python setup.py sdist bdist_wheel
twine upload dist/*
- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
24 changes: 12 additions & 12 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
name: Run unit tests on Windows and Mac
name: Run unit tests on Windows, Ubuntu and Mac

on: [push, pull_request]

jobs:

test:
name: ${{ matrix.os }} / ${{ matrix.python_version }}
runs-on: ${{ matrix.os }}-latest
strategy:
fail-fast: false
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
os: [macOs-latest, ubuntu-latest, windows-latest]
exclude:
- os: macOs-latest
python-version: 3.6
fail-fast: false
matrix:
os: [Ubuntu]
python_version: ["3.9.16"]

runs-on: ${{ matrix.os }}
name: run tests
steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v1
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
python-version: ${{ matrix.python_version }}
architecture: x64

- name: install
run: |
pip --use-deprecated=legacy-resolver install -r requirements.txt
Expand Down
1 change: 1 addition & 0 deletions pyexcel-io.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ copyright_year: 2015-2022
moban_command: false
is_on_conda: true
dependencies:
- chardet
- lml>=0.0.4
test_dependencies:
- pyexcel
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
chardet
lml>=0.0.4
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
)
URL = "https://github.com/pyexcel/pyexcel-io"
DOWNLOAD_URL = "%s/archive/0.6.6.tar.gz" % URL
FILES = ["README.rst", "CHANGELOG.rst"]
FILES = ["README.rst", "CONTRIBUTORS.rst", "CHANGELOG.rst"]
KEYWORDS = [
"python",
"API",
Expand All @@ -68,11 +68,13 @@

'License :: OSI Approved :: BSD License',
'Programming Language :: Python :: Implementation :: PyPy'

]

PYTHON_REQUIRES = ">=3.6"

INSTALL_REQUIRES = [
"chardet",
"lml>=0.0.4",
]
SETUP_COMMANDS = {}
Expand Down

0 comments on commit 1bd673a

Please sign in to comment.