Commit Graph

671 Commits

Author SHA1 Message Date
Matthew Planchard
c621d45474
Merge pull request #210 from pypiserver/docker-updates
Dockerfile & doc updates
2018-06-26 22:14:31 -05:00
Matthew Planchard
66f24858df Giving up on build stages 2018-06-26 21:59:19 -05:00
Matthew Planchard
797167fcb2 More testing 2018-06-26 21:57:28 -05:00
Matthew Planchard
fd170f899b Reordered stages for testing 2018-06-26 21:52:47 -05:00
Matthew Planchard
2206fd543a Moved install and script keys 2018-06-26 21:51:30 -05:00
Matthew Planchard
3d69d60e92 Trying to figure out travis build stages 2018-06-26 21:33:24 -05:00
Matthew Planchard
abba8ecd42 Add language to 2nd stage of travis build 2018-06-26 21:23:00 -05:00
Matthew Planchard
3e1a399fe3 Add simple functional tests for docker 2018-06-26 21:19:03 -05:00
Matthew Planchard
47231ea5fb Dockerfile & doc updates 2018-06-26 20:51:32 -05:00
Matthew Planchard
cd7707379a
Merge pull request #209 from hugovk/patch-1
Remove broken downloads badge
2018-06-19 20:03:47 -05:00
Hugo
2c9684b27e
Badges fit on one line 2018-06-14 08:50:01 +03:00
Matthew Planchard
4455b2cdc0
Merge pull request #198 from hugovk/rm-3.3
Drop support for EOL Python 3.3
2018-06-13 18:32:22 -05:00
Hugo
9c2c44ca91
Remove broken downloads badge
See https://github.com/badges/shields/issues/716.
2018-06-13 07:06:41 +03:00
Hugo
c777ee4018
Merge pull request #1 from mplanchard/hugovk-rm-3.3
Prep for merge
2018-06-13 07:00:47 +03:00
Matthew Planchard
2499dac8ec Merge branch 'rm-3.3' of git://github.com/hugovk/pypiserver into hugovk-rm-3.3 2018-06-12 20:26:31 -05:00
Matthew Planchard
17e7f9c1b6 chore(ver): bump 1.2.2.dev0-->1.2.2 v1.2.2 2018-06-12 20:15:11 -05:00
Matthew Planchard
99d4f23ffb REL: Prep for v1.2.2 2018-06-12 19:58:31 -05:00
Matthew Planchard
24905addc9 chore(ver): bump 1.2.2dev0-->1.2.2.dev0 v1.2.2.dev0 2018-06-11 20:48:36 -05:00
Matthew Planchard
472c18b0b1
Merge pull request #208 from pypiserver/205-pypi-fallbacks
FIX: Fallback URL, remove calls to pip.main
2018-06-11 20:42:18 -05:00
Matthew Planchard
c791d12292 FIX: Fallback URL, remove calls to pip.main
Resolves #205 - pypi.python.org shutting down

* Updated the default fallback URL to `pypi.org/simple` rather than
`pypi.python.org/simple`
* Scrubbed references and links to `pypi.python.org`
* Fixed tests breaking due to the removal of `pip.main()` in pip 10.0 -
see pypa/pip#5080 for more info
2018-06-11 20:31:03 -05:00
Hugo
127b097022 Revert changes to 'upstream-derived' file 2018-05-07 22:29:36 +03:00
Hugo
711deb51b7 Use triple-quoted docstrings 2018-05-07 22:29:36 +03:00
Hugo
676e86d683 Remove redundant parentheses 2018-05-07 22:29:36 +03:00
Hugo
31a5b5d7e7 Replace function call with set literal 2018-05-07 22:29:36 +03:00
Hugo
288f38f26e Remove unused imports 2018-05-07 22:29:36 +03:00
Hugo
a8b7efc776 Drop support for EOL Python 3.3 2018-05-07 22:29:36 +03:00
Matthew Planchard
91edcffdf2
Merge pull request #204 from pypiserver/twine-prerelease
Provide Prerelease Testing for Twine
2018-03-06 20:22:41 -06:00
Matthew Planchard
8639ad3d40 Provide Prerelease Testing for Twine
Resolves #203
Related to pypa/twine#314

This commit adds an ``sh -c`` call, whose argument is the value of the
environment variable ``PYPISERVER_SETUP_CMD``, or ``true`` if that
variable is not set. This was specifically added to enable the
``pre_twine`` environment, which is provided to automatically test
pre-releases of twine, both for our use (e.g. #203) and for the use of
the twine maintainers (pypa/twine#314).

The capacity to specify an arbitrary setup command via an environment
variable may also wind up being useful in other cases in the future.

In addition, the envlist is updated to include only Python versions we
actually support.

This commit also alphabetizes the ``dev.pip`` requirements and rmeoves
specific requirements for testing using Python 2.5 (which we do not test
against anymore).
2018-03-06 20:08:14 -06:00
Matthew Planchard
1477158f3a
Merge pull request #196 from mplanchard/125-better-strip
Resolved paste config parsing issue for Python 2
2017-12-03 16:22:22 -06:00
Matthew Planchard
46ba4ac532
Merge pull request #194 from mplanchard/180-update-404
Update 404 to match PyPI
2017-12-03 16:22:02 -06:00
Kostis Anagnostopoulos
c6b52633fa
Merge pull request #195 from mplanchard/classifier-update
Updated setup.py classifiers
2017-12-04 00:19:13 +02:00
Kostis Anagnostopoulos
091b31504b fix(standalone): .standalone dir were already created by git-workdir
... and strangely `mkdir` were missing `-p` option.
2017-12-03 12:07:59 +02:00
Matthew Planchard
e6a0bfc812 Resolved paste config parsing issue for Python 2
The ability to propagate configuration values from a paste config
file was introduced in #156. However, as pointed out in #125
by @redbaron4, the string strip method introduced in #156 was
problematic in Python 2.

This resolves that issue while also creating a test that fails
on the current master and passes with updates, demonstrating the
issue.
2017-11-29 20:04:09 -06:00
Matthew Planchard
8afe3233ab Update 404 to match PyPI 2017-11-29 19:43:39 -06:00
Matthew Planchard
2cc5016015 Updated setup.py classifiers
* Added Python 3.6 to languages
* Added PyPy implementation
* Also updated some minor spacing issues
2017-11-29 19:39:06 -06:00
Matthew Planchard
861aa73534
Merge pull request #193 from mplanchard/release-tidying
Release Tidying
2017-11-29 19:33:59 -06:00
Matthew Planchard
f7c665ccce Updated Version to 1.2.2dev0 2017-11-29 19:24:42 -06:00
Matthew Planchard
5cc13e075f Changelog Update
I neglected to remove the mention of matrix authorization from the
changelog when we reverted that PR. Noticed it when writing release
notes.

g	.vscode/
2017-11-29 19:17:46 -06:00
Matthew Planchard
56b9636e7b chore(ver): bump 1.2.1-->1.2.1 v1.2.1 2017-11-29 19:10:17 -06:00
Matthew Planchard
8c65a591c9
Merge pull request #191 from mplanchard/v1.2.1release
Prep for v1.2.1 release
2017-11-29 19:09:13 -06:00
Matthew Planchard
e8f54aeba2 Pinned pytest requirement for Python 3.3 2017-11-29 18:59:05 -06:00
Matthew Planchard
420491a1c1 Prep for v1.2.1 release 2017-11-29 18:49:27 -06:00
Kostis Anagnostopoulos
44ba3f886f
Merge pull request #190 from axnsan12/patch-1
Add $scheme forwarding to example nginx configuration
2017-11-25 13:27:39 +02:00
Cristi Vîjdea
5241ded111
Add $scheme forwarding to example nginx configuration
Adding `X-Forwarded-Proto` makes bottle pick up on the original request's scheme (https/http), so that the URL on the welcome page is displayed correctly.
2017-11-25 01:26:43 +01:00
Matthew Planchard
56fe8f3a26
Merge pull request #189 from mplanchard/bumpver-1.2.1rc0
chore(ver): bump 1.2.1.dev0-->1.2.1rc0
2017-11-14 12:49:23 -06:00
Matthew Planchard
ea92f16bf3 chore(ver): bump 1.2.1.dev0-->1.2.1rc0 2017-11-14 11:51:26 -06:00
Matthew Planchard
238eefa027
Merge pull request #187 from mplanchard/revert-matrix-auth
Revert matrix auth
2017-11-14 11:28:52 -06:00
Matthew Planchard
1770f3cf93 Updated Tests
In addition to including tests from @jameshiebert with slight
updates, I have also resolved an issue with newer versions of twine,
which require an extra parameter in the calls to `upload` and
`register`.
2017-11-14 11:02:44 -06:00
Matthew Planchard
c0b93bdaef Revert Matrix Auth
This reverts commits 29c1803 c79dd18 568f901 and 3d37c00. This has
resulted in bugs referenced in #175, #179, and #186.
2017-11-14 08:43:49 -06:00
Matthew Planchard
35f9740429
Merge pull request #185 from ankostis/bumpver
feat(build): add `/bin/bumpver.py` script to facilitate new releases
v1.2.1dev0
2017-11-10 12:10:42 -06:00