Skip to content

Commit

Permalink
ci(appveyor): try upgrade pip
Browse files Browse the repository at this point in the history
  • Loading branch information
Kristinita authored and Kristinita committed Aug 3, 2018
1 parent 984eea6 commit f31606f
Show file tree
Hide file tree
Showing 7 changed files with 86 additions and 84 deletions.
25 changes: 14 additions & 11 deletions .release-it.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
{
"buildCommand": "changelog -u https:\/\/${repo.host}\/${repo.repository} -f CHANGELOG.md && sed -i 's\/^version = .*$\/version = ${version}\/g' setup.cfg && sed -i 's\/^VERSION = \".*\"$\/VERSION = \"${version}\"\/g' \"erichek\/eric_config.py\" && python setup.py bdist_wheel && twine upload dist\/*",
"changelogCommand": "changelog -f -",
"github": {
"release": true,
"tokenRef": "GITHUB_TOKEN"
},
"npm": {
"publish": false
},
"safeBump": false
{
"buildCommand": "changelog -u https:\/\/${repo.host}\/${repo.repository} -f CHANGELOG.md && sed -i 's\/^version = .*$\/version = ${version}\/g' setup.cfg && sed -i 's\/^VERSION = \".*\"$\/VERSION = \"${version}\"\/g' \"erichek\/eric_config.py\" && python setup.py bdist_wheel && twine upload dist\/*",
"changelogCommand": "changelog -f -",
"github": {
"release": true,
"tokenRef": "GITHUB_TOKEN"
},
"npm": {
"publish": false
},
"safeBump": false,
"src": {
"addUntrackedFiles": true
}
}
112 changes: 54 additions & 58 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,58 +1,54 @@
.. target parameter necessary, that badges displayed in GitHub as inline elements, not as a block elements, see:
.. https://github.com/badges/shields/issues/1491#issuecomment-364201130
.. Active repository status — http://www.repostatus.org
.. image:: http://www.repostatus.org/badges/latest/active.svg
:target: http://www.repostatus.org/#active
:alt: Project Status: Active – The project has reached a stable, usable state and is being actively developed.

.. PyPI version — https://badge.fury.io/py/
.. image:: https://badge.fury.io/py/erichek.svg
:target: https://badge.fury.io/py/erichek
:alt: PyPI version

.. image:: https://img.shields.io/pypi/pyversions/erichek.svg?style=plastic
:target: https://img.shields.io/pypi/pyversions/erichek.svg?style=plastic
:alt: Python version

.. image:: https://img.shields.io/pypi/wheel/erichek.svg?style=plastic
:target: https://img.shields.io/pypi/wheel/erichek.svg?style=plastic
:alt: Wheel

.. image:: https://travis-ci.org/Kristinita/Erichek.svg?branch=master
:target: https://travis-ci.org/Kristinita/Erichek
:alt: Travis CI

.. AppVeyor badge incorrect displayed in http://rst.ninjs.org — online reStructuredText Viewer
.. image:: https://ci.appveyor.com/api/projects/status/gscnxa6gj2oej1gn?svg=true
:target: https://ci.appveyor.com/project/Kristinita/erichek
:alt: AppVeyor

.. image:: https://circleci.com/gh/Kristinita/Erichek.svg?style=svg
:target: https://circleci.com/gh/Kristinita/Erichek
:alt: Circle CI

.. image:: https://lintly.com/gh/Kristinita/Erichek/badge.svg?style=plastic
:target: https://lintly.com/gh/Kristinita/Erichek/
:alt: Lintly

.. image:: https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=plastic
:target: http://commitizen.github.io/cz-cli/
:alt: Commitizen-friendly


.. Bold text in links
.. https://stackoverflow.com/a/4836544/5951529
Erichek — validator for |Eric's rooms|_.

See full description in |https://Kristinita.ru/Programs/Erichek|_ page.

.. |Eric's rooms| replace:: **Eric's rooms**
.. _Eric's rooms: https://github.com/Kristinita/Erics-Green-Room

.. |https://Kristinita.ru/Programs/Erichek| replace:: **https://Kristinita.ru/Programs/Erichek**
.. _https://Kristinita.ru/Programs/Erichek: https://Kristinita.ru/Programs/Erichek
.. target parameter necessary, that badges displayed in GitHub as inline elements, not as a block elements, see:
.. https://github.com/badges/shields/issues/1491#issuecomment-364201130
.. Active repository status — http://www.repostatus.org
.. image:: http://www.repostatus.org/badges/latest/active.svg
:target: http://www.repostatus.org/#active
:alt: Project Status: Active – The project has reached a stable, usable state and is being actively developed.

.. PyPI version — https://badge.fury.io/py/
.. image:: https://badge.fury.io/py/erichek.svg
:target: https://badge.fury.io/py/erichek
:alt: PyPI version

.. image:: https://img.shields.io/pypi/pyversions/erichek.svg?style=plastic
:target: https://img.shields.io/pypi/pyversions/erichek.svg?style=plastic
:alt: Python version

.. image:: https://img.shields.io/pypi/wheel/erichek.svg?style=plastic
:target: https://img.shields.io/pypi/wheel/erichek.svg?style=plastic
:alt: Wheel

.. image:: https://travis-ci.org/Kristinita/Erichek.svg?branch=master
:target: https://travis-ci.org/Kristinita/Erichek
:alt: Travis CI

.. AppVeyor badge incorrect displayed in http://rst.ninjs.org — online reStructuredText Viewer
.. image:: https://ci.appveyor.com/api/projects/status/gscnxa6gj2oej1gn?svg=true
:target: https://ci.appveyor.com/project/Kristinita/erichek
:alt: AppVeyor

.. image:: https://circleci.com/gh/Kristinita/Erichek.svg?style=svg
:target: https://circleci.com/gh/Kristinita/Erichek
:alt: Circle CI

.. image:: https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=plastic
:target: http://commitizen.github.io/cz-cli/
:alt: Commitizen-friendly


.. Bold text in links
.. https://stackoverflow.com/a/4836544/5951529
Erichek — validator for |Eric's rooms|_.

See full description in |https://Kristinita.ru/Programs/Erichek|_ page.

.. |Eric's rooms| replace:: **Eric's rooms**
.. _Eric's rooms: https://github.com/Kristinita/Erics-Green-Room

.. |https://Kristinita.ru/Programs/Erichek| replace:: **https://Kristinita.ru/Programs/Erichek**
.. _https://Kristinita.ru/Programs/Erichek: https://Kristinita.ru/Programs/Erichek
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ install:
# https://ci.appveyor.com/project/Kristinita/erichek/build/1.0.3
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"

- cmd: python -m pip install --upgrade pip
- cmd: pip install flake8
- cmd: pip install pydocstyle
- cmd: pip install pyfancy
- cmd: pip install pyroma
# Needs, because pyroma works incorrect in old setuptools versions:
# https://github.com/regebro/pyroma/issues/16#issuecomment-362795949
Expand Down
3 changes: 0 additions & 3 deletions lintly.yml

This file was deleted.

14 changes: 7 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
chardet
clize
colorama
logbook
pyfancy
pyfiglet
regex
chardet
clize
colorama
logbook
pyfancy
pyfiglet
regex
termcolor
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ long_description = file: README.rst
# Versions should compatibly with PEP440. For a discussion on single-sourcing
# the version across setup.py and the project code, see
# https://packaging.python.org/en/latest/single_source_version.html
version = 0.0.0
version = 0.3.1
# Author details
author = Sasha Chernykh
author_email = [email protected]
Expand All @@ -35,7 +35,7 @@ classifiers =
License :: OSI Approved :: MIT License
Natural Language :: Russian
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Topic :: Scientific/Engineering :: Information Analysis

[options]
Expand Down
10 changes: 8 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# @Author: SashaChernykh
# @Date: 2018-01-22 08:41:23
# @Last Modified time: 2018-03-06 20:02:11
# @Last Modified time: 2018-08-03 20:59:37
"""A setuptools based setup module.
See:
Expand All @@ -14,7 +14,13 @@
from setuptools import setup

# Install dependencies from requirements.txt
from pip.req import parse_requirements
# https://stackoverflow.com/a/49867265/5951529
# For pip >= 10
try:
from pip._internal.req import parse_requirements
# For pip <= 9.0.3
except ImportError:
from pip.req import parse_requirements

install_reqs = parse_requirements('requirements.txt', session='hack')

Expand Down

0 comments on commit f31606f

Please sign in to comment.