10000 Merge pull request #284 from pyexcel/dev · blog2i2j/pyexcel.._..pyexcel@8066234 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8066234

Browse files
chfwchfw
authored
Merge pull request pyexcel#284 from pyexcel/dev
Maintenance release
2 parents 376aed4 + 7b548b7 commit 8066234

File tree

100 files changed

+879
-791
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+879
-791
lines changed

‎.github/workflows/moban-update.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
python-version: '3.7'
1616
- name: check changes
1717
run: |
18+
pip install markupsafe==2.0.1
1819
pip install moban gitfs2 pypifs moban-jinja2-github moban-ansible
1920
moban
2021
git status

‎.github/workflows/pythonpublish.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,16 @@ on:
55
types: [created]
66

77
jobs:
8-
deploy:
8+
pypi-publish:
9+
name: upload release to PyPI
910
runs-on: ubuntu-latest
11+
# Specifying a GitHub environment is optional, but strongly encouraged
12+
environment: pypi
13+
permissions:
14+
# IMPORTANT: this permission is mandatory for trusted publishing
15+
id-token: write
1016
steps:
17+
# retrieve your distributions here
1118
- uses: actions/checkout@v1
1219
- name: Set up Python
1320
uses: actions/setup-python@v1
@@ -16,11 +23,9 @@ jobs:
1623
- name: Install dependencies
1724
run: |
1825
python -m pip install --upgrade pip
19-
pip install setuptools wheel twine
20-
- name: Build and publish
21-
env:
22-
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
23-
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
26+
pip install setuptools wheel
27+
- name: Build
2428
run: |
2529
python setup.py sdist bdist_wheel
26-
twine upload dist/*
30+
- name: Publish package distributions to PyPI
31+
uses: pypa/gh-action-pypi-publish@release/v1

‎.github/workflows/tests.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@ name: Run unit tests on Windows, Ubuntu and Mac
33
on: [push, pull_request]
44

55
jobs:
6+
67
test:
8+
name: ${{ matrix.os }} / ${{ matrix.python_version }}
9+
runs-on: ${{ matrix.os }}-latest
710
strategy:
8-
fail-fast: false
9-
matrix:
10-
python-version: [3.7, 3.8, 3.9]
11-
os: [macOs-latest, ubuntu-latest, windows-latest]
12-
exclude:
13-
- os: macOs-latest
14-
python-version: 3.7
11+
fail-fast: false
12+
matrix:
13+
os: [Ubuntu]
14+
python_version: ["3.9.16"]
1515

16-
runs-on: ${{ matrix.os }}
17-
name: run tests
1816
steps:
1917
- uses: actions/checkout@v2
2018
- name: Set up Python
21-
uses: actions/setup-python@v1
19+
uses: actions/setup-python@v5
2220
with:
23-
python-version: ${{ matrix.python-version }}
21+
python-version: ${{ matrix.python_version }}
22+
architecture: x64
23+
2424
- name: install
2525
run: |
2626
pip --use-deprecated=legacy-resolver install -r requirements.txt

‎.moban.d/docs/source/pyexcel-index.rst.jj2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manipulate and write data in various excel formats. This library makes
88
information processing involving excel files an enjoyable task. The data in
99
excel files can be turned into :ref:`array or dict<a-list-of-data-structures>`
1010
with minimal code and vice versa. This library focuses on data
11-
processing using excel files as storage media hence fonts, colors and charts
11+
processing using excel files. Therefore, fonts, colors and charts
1212
were not and will not be considered.
1313

1414
{% include "origin.rst.jj2" %}

0 commit comments

Comments
 (0)
0