Skip to content
This repository was archived by the owner on Dec 21, 2024. It is now read-only.

Commit e8a8a20

Browse files
author
Zak Zajac
committed
fixed python version mapping and typo in tox name
1 parent d020503 commit e8a8a20

File tree

6 files changed

+24
-25
lines changed

6 files changed

+24
-25
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
python: [pypy3, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10]
13+
python-version: [pypy3, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10.0-beta.4]
1414

1515
steps:
1616
- uses: actions/checkout@v2
@@ -25,5 +25,12 @@ jobs:
2525
python -m pip install --upgrade pip
2626
pip install tox tox-gh-actions
2727
28-
- name: Text with tox
28+
- name: Test with tox
2929
run: tox
30+
31+
- name: Publish a Python distribution to PyPI
32+
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
33+
uses: pypa/gh-action-pypi-publish@release/v1
34+
with:
35+
user: __token__
36+
password: ${{ secrets.PYPI_API_TOKEN }}

.travis.yml

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

MANIFEST.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
include LICENSE
2-
recursive-include tests *.py
2+
include README.md
3+
recursive-include tests *.py

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Build Status](https://travis-ci.org/madzak/python-json-logger.svg?branch=master)](https://travis-ci.org/madzak/python-json-logger)
1+
[![Build Status](https://github.com/madzak/python-json-logger/actions/workflows/build.yml/badge.svg)
22
[![License](https://img.shields.io/pypi/l/python-json-logger.svg)](https://pypi.python.org/pypi/python-json-logger/)
33
[![Version](https://img.shields.io/pypi/v/python-json-logger.svg)](https://pypi.python.org/pypi/python-json-logger/)
44

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
from os import path
12
from setuptools import setup, find_packages
23

34
# read the contents of your README file
4-
from os import path
55
this_directory = path.abspath(path.dirname(__file__))
66
with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
77
long_description = f.read()
@@ -11,6 +11,7 @@
1111
version="2.0.1",
1212
url="http://github.com/madzak/python-json-logger",
1313
license="BSD",
14+
include_package_data=True,
1415
description="A python library adding a json log formatter",
1516
long_description=long_description,
1617
long_description_content_type='text/markdown',

tox.ini

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
[tox]
22
envlist = pypy3, py35, py36, py37, py38, py39, py310
33

4+
[gh-actions]
5+
python =
6+
pypy-3: pypy3
7+
3.5: py35
8+
3.6: py36
9+
3.7: py37
10+
3.8: py38
11+
3.9: py39
12+
3.10: py310
13+
414
[testenv]
515
commands = python -m unittest discover

0 commit comments

Comments
 (0)