forked from github.com/pypiserver
Merge branch 'master' of github.com:pypiserver/pypiserver
This commit is contained in:
commit
1f5c88a23e
|
@ -0,0 +1,90 @@
|
||||||
|
stages:
|
||||||
|
- test
|
||||||
|
|
||||||
|
default:
|
||||||
|
image: python:3
|
||||||
|
|
||||||
|
.base_test:
|
||||||
|
stage: test
|
||||||
|
coverage: '/^TOTAL.*\s+(\d+\%)$/'
|
||||||
|
except:
|
||||||
|
- standalone
|
||||||
|
before_script:
|
||||||
|
- apt-get update && apt-get install -y zip
|
||||||
|
- pip install tox
|
||||||
|
- ./bin/test_standalone.sh
|
||||||
|
|
||||||
|
test-docker:
|
||||||
|
image: docker:latest
|
||||||
|
services:
|
||||||
|
- name: docker:dind
|
||||||
|
alias: localhost
|
||||||
|
except:
|
||||||
|
- standalone
|
||||||
|
before_script:
|
||||||
|
- apk add --no-cache curl python3
|
||||||
|
- pip3 install twine
|
||||||
|
script:
|
||||||
|
- ./bin/test-docker.sh
|
||||||
|
|
||||||
|
validate-readme:
|
||||||
|
image: python:3
|
||||||
|
except:
|
||||||
|
- standalone
|
||||||
|
before_script:
|
||||||
|
- pip install sphinx
|
||||||
|
script:
|
||||||
|
- ./bin/check_readme.sh
|
||||||
|
|
||||||
|
test-2.7:
|
||||||
|
extends: .base_test
|
||||||
|
image: python:2.7
|
||||||
|
script:
|
||||||
|
- tox -e py27
|
||||||
|
|
||||||
|
test-3.4:
|
||||||
|
extends: .base_test
|
||||||
|
image: python:3.4
|
||||||
|
script:
|
||||||
|
- tox -e py34
|
||||||
|
|
||||||
|
test-3.5:
|
||||||
|
extends: .base_test
|
||||||
|
image: python:3.5
|
||||||
|
script:
|
||||||
|
- tox -e py35
|
||||||
|
|
||||||
|
test-3.6:
|
||||||
|
extends: .base_test
|
||||||
|
image: python:3.6
|
||||||
|
script:
|
||||||
|
- tox -e py36
|
||||||
|
|
||||||
|
test-3.7:
|
||||||
|
extends: .base_test
|
||||||
|
image: python:3.7
|
||||||
|
script:
|
||||||
|
- tox -e py37
|
||||||
|
|
||||||
|
test-3.8-rc:
|
||||||
|
extends: .base_test
|
||||||
|
image: python:3.8-rc
|
||||||
|
allow_failure: true
|
||||||
|
script:
|
||||||
|
- tox -e py38
|
||||||
|
|
||||||
|
test-pypy-2:
|
||||||
|
extends: .base_test
|
||||||
|
image: pypy:2
|
||||||
|
before_script:
|
||||||
|
- pypy -m pip install tox
|
||||||
|
script:
|
||||||
|
- tox -e pypy
|
||||||
|
|
||||||
|
test-pypy-3:
|
||||||
|
extends: .base_test
|
||||||
|
image: pypy:3
|
||||||
|
before_script:
|
||||||
|
- pypy3 -m pip install tox
|
||||||
|
script:
|
||||||
|
- tox -e pypy3
|
24
.travis.yml
24
.travis.yml
|
@ -1,24 +0,0 @@
|
||||||
sudo: required
|
|
||||||
language: python
|
|
||||||
services: docker
|
|
||||||
|
|
||||||
python:
|
|
||||||
- 2.7
|
|
||||||
- 3.4
|
|
||||||
- 3.5
|
|
||||||
- 3.6
|
|
||||||
- pypy
|
|
||||||
- pypy3
|
|
||||||
|
|
||||||
install:
|
|
||||||
- pip install -U setuptools twine pip sphinx tox tox-travis
|
|
||||||
|
|
||||||
script:
|
|
||||||
- ./bin/test-docker.sh
|
|
||||||
- ./bin/test_standalone.sh
|
|
||||||
- tox
|
|
||||||
- ./bin/check_readme.sh
|
|
||||||
|
|
||||||
branches:
|
|
||||||
except:
|
|
||||||
- standalone
|
|
|
@ -1,6 +1,11 @@
|
||||||
Changelog
|
Changelog
|
||||||
=========
|
=========
|
||||||
|
|
||||||
|
1.3.2 (tbd)
|
||||||
|
-----------
|
||||||
|
|
||||||
|
- DEV: switched to gitlab for CI
|
||||||
|
|
||||||
1.3.1 (2019-09-10)
|
1.3.1 (2019-09-10)
|
||||||
------------------
|
------------------
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
==============================================================================
|
==============================================================================
|
||||||
pypiserver - minimal PyPI server for use with pip/easy_install
|
pypiserver - minimal PyPI server for use with pip/easy_install
|
||||||
==============================================================================
|
==============================================================================
|
||||||
|pypi-ver| |travis-status| |dependencies| |python-ver| |proj-license|
|
|pypi-ver| |gitlab-status| |dependencies| |python-ver| |proj-license|
|
||||||
|
|
||||||
:Version: 1.3.1
|
:Version: 1.3.1
|
||||||
:Date: 2019-09-10
|
:Date: 2019-09-10
|
||||||
|
@ -920,10 +920,10 @@ See the ``LICENSE.txt`` file.
|
||||||
.. _twine: https://pypi.org/project/twine/
|
.. _twine: https://pypi.org/project/twine/
|
||||||
.. _pypi-uploader: https://pypi.org/project/pypi-uploader/
|
.. _pypi-uploader: https://pypi.org/project/pypi-uploader/
|
||||||
.. _python-pam: https://pypi.org/project/python-pam/
|
.. _python-pam: https://pypi.org/project/python-pam/
|
||||||
.. |travis-status| image:: https://travis-ci.org/pypiserver/pypiserver.svg
|
.. |gitlab-status| image:: https://gitlab.com/mplanchard/pypiserver/badges/master/pipeline.svg
|
||||||
:alt: Travis build status
|
:alt: GitLab build status
|
||||||
:scale: 100%
|
:scale: 100%
|
||||||
:target: https://travis-ci.org/pypiserver/pypiserver
|
:target: https://gitlab.com/mplanchard/pypiserver/commits/master
|
||||||
|
|
||||||
.. |pypi-ver| image:: https://img.shields.io/pypi/v/pypiserver.svg
|
.. |pypi-ver| image:: https://img.shields.io/pypi/v/pypiserver.svg
|
||||||
:target: https://pypi.org/project/pypiserver/
|
:target: https://pypi.org/project/pypiserver/
|
||||||
|
|
|
@ -17,13 +17,14 @@ Files:
|
||||||
|
|
||||||
Release check-list:
|
Release check-list:
|
||||||
===================
|
===================
|
||||||
1. Update ``/CHANGES.rst`` (+ Title + Date) & ``/README.rst``.
|
1. Update ``/CHANGES.rst`` (+ Title + Date) & ``/README.rst`` (Date,
|
||||||
|
not version).
|
||||||
|
|
||||||
2. Push to GitHub to run all TCs once more.
|
2. Push to GitHub to run all TCs once more.
|
||||||
|
|
||||||
3. Bump version: commit & tag it with ``/bin/bumpver.py``.
|
3. Bump version: commit & tag it with ``/bin/bumpver.py``.
|
||||||
Use ``--help``.
|
Use ``--help``.
|
||||||
Read `PEP-440 <https://www.python.org/dev/peps/pep-0440/`_ to decide the version.
|
Read `PEP-440 <https://www.python.org/dev/peps/pep-0440/>`_ to decide the version.
|
||||||
|
|
||||||
4. Push it in GitHub with ``--follow-tags``.
|
4. Push it in GitHub with ``--follow-tags``.
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@ CONTAINER_ID=$(docker run \
|
||||||
|
|
||||||
trap "docker container stop $CONTAINER_ID" EXIT
|
trap "docker container stop $CONTAINER_ID" EXIT
|
||||||
|
|
||||||
sleep 5 # give the container some time to get going
|
sleep 15 # give the container some time to get going
|
||||||
|
|
||||||
# Ensure we can authenticate locally
|
# Ensure we can authenticate locally
|
||||||
RET=$(curl localhost:8080)
|
RET=$(curl localhost:8080)
|
||||||
|
|
|
@ -11,6 +11,7 @@ mock; python_version == '2.7'
|
||||||
pip>=7
|
pip>=7
|
||||||
passlib>=1.6
|
passlib>=1.6
|
||||||
pytest>=2.3
|
pytest>=2.3
|
||||||
|
pytest-cov
|
||||||
setuptools
|
setuptools
|
||||||
setuptools-git>=0.3
|
setuptools-git>=0.3
|
||||||
tox
|
tox
|
||||||
|
|
Loading…
Reference in New Issue