Commit Graph

672 Commits

Author SHA1 Message Date
Matthew Planchard
0594c33e53
Backwards-compatible argparse config (not yet in use) (#339)
Adds an argparse config that, while adding subcommands (`pypi-server run` and `pypi-server update`), retains full commandline backwards compatibility with the existing config parsing logic.

There's a bit of hackery required to do this, so this also issues a warning if using the non-subcommand arguments, allowing us to potentially remove support for the old form in our next next major version bump (i.e. 3.0).

Also adds a `.pyproject.toml` with a black config, and a mypy config block to `setup.cfg`.

`mypy` is now called in `tox`, currently only for `config.py`, because nothing else typechecks successfully.

----

* WIP: argparse config

* Complete config

* Test all the config options

* Another test and a note re: being unused

* mypy config, call mypy in tox

* No mypy on pypy

* Fix tox config

* Add venv to black ignore

* fix tox config (again)

* Fix formatting, simplify error handling

* FMT: Run black on changed files
2020-10-08 19:37:39 -05:00
PelleK
d886bc2eba
Cleanup code to python 3.6 (#342)
* Cleanup setup.py

* remove explicit inheritance from object

* convert most string interpolations to f-strings

Co-authored-by: Pelle Koster <pelle.koster@nginfra.nl>
2020-10-07 20:45:51 -05:00
Matthew Planchard
b44edb61ce
CHORE: pull CHANGES.rst from v1.4.x 2020-10-05 21:15:33 -05:00
PelleK
8101cf9192
Run black on codebase (#336)
* run black on codebase

* add black check to travis ci

* add pyproject.toml, revert black on bottle.py

Co-authored-by: Pelle Koster <pelle.koster@nginfra.nl>
2020-10-05 21:04:22 -05:00
Matthew Planchard
4ab210c82b
MAINT: drop standalone, drop py 2.7 and 3.5 (#338) 2020-10-03 22:25:14 -05:00
Matthew Planchard
b208103951
chore(ver): bump 1.3.2-->1.4.0 v1.4.0 2020-10-03 17:45:40 -05:00
Norman Schenck
12ae6c118a
Update Dockerfile. Update docker base images. (#330)
Co-authored-by: Matthew Planchard <mplanchard@users.noreply.github.com>
2020-10-03 17:00:47 -05:00
PelleK
8b1979031e
Log messages to stdout instead of stderr (#334)
* log to stdout

* add stdout logging to config and test it

* remove non-implemented parameter from docs

* configure log stream based on config, somehow this change got lost

* fix unittests for other python versions

* option to specify log stream

* Be more explicit in usage text

Co-authored-by: Matthew Planchard <mplanchard@users.noreply.github.com>

* remove redundant arguments

* be more consistent in usage text

* add test for disabling stream logging

* fix side-effect of unittests

Co-authored-by: Matthew Planchard <mplanchard@users.noreply.github.com>
2020-10-03 16:30:49 -05:00
Matthew Planchard
aa2d78cd45
DOC: Add link to zulip chat to README 2020-10-03 15:25:53 -05:00
Daan Luttik
dbb7761606
Moved flask-pypi-proxy and pip2pi to a new "Unmaintained or archived" header since the former is archived and the latter has seen barely any development since mid 2015 and no development since sep 2019. (#326) 2020-09-14 22:16:27 -05:00
Peter Slovak
c21cf72c25
Add the option to specify list of modules we don't want to update (#298)
* Add the option to specify list of modules we don't want to update

Signed-off-by: Peter Slovak <peter.slovak@websupport.sk>

* Fix docs

Signed-off-by: Peter Slovak <peter.slovak@websupport.sk>

* Minimize the number of strip() calls

Co-authored-by: Matthew Planchard <mplanchard@users.noreply.github.com>

* Log an exception when we fail to open/read the package blacklist file

* Abort server startup if we fail to read the blacklist file

Co-authored-by: Matthew Planchard <mplanchard@users.noreply.github.com>
2020-07-16 23:03:30 -05:00
John Children
90d0ea151e
Include watchdog for cache in Docker image (#323)
Include watchdog as a dependency in the docker image pip requirements.
This is very useful in situations where your packages are mounted over
the network which may be a typical use case for the image.

As passlib is included as a default dependency this seems like a natural
addition.
2020-07-16 19:06:47 -05:00
Matthew Planchard
b1bf1ed248
Drop support for Python 3.4 (#321)
* Drop support for Python 3.4

Python 3.4 is no longer supported. Even pyenv is failing to install it
for me, because apparently the currnet version of `ensurepip` bombs for
3.4. Pypiserver may still work on 3.4, but testing on it has becomes
more of a hassle than it's worth.

* Fix @mplanchard's email address

Just realized my email address in the authors' file has been wrong for
pretty much forever.

* Remove GL CI

GitLab CI is nice, but doesn't support forks, and so isn't going to be
viable for this project.
2020-07-09 22:39:01 -05:00
Tiemen Schuijbroek
5b14270d0d
Fix cherrypy CherryPyWSGIServer import (#301)
CherryPy changed the import location.
This attempts the new or falls back to the old location.

Co-authored-by: Tiemen Schuijbroek <t.j.l.schuijbroek@ratio-case.nl>
2020-07-09 22:10:44 -05:00
Gerardwx
54d35cdbaf
Typo (#303) 2020-07-09 22:05:37 -05:00
Karthikeyan Singaravelan
0a9904af57
Fix deprecation warnings due to invalid escape sequences. (#317) 2020-07-09 22:04:39 -05:00
Fernando B
11ed7e6abd
readme (#316)
Co-authored-by: Fernando Balandran <ic3balandran@yahoo.com>
2020-06-05 11:31:14 -05:00
Julian Berman
a7c49fd3e7
Slightly clarify the relationship to warehouse. (#308)
* Slightly clarify the relationship to warehouse.

Closes: #307

* Wording tweaks and split out the related software into its own section.

* Separate the note in a note directive

Co-authored-by: Matthew Planchard <mplanchard@users.noreply.github.com>

Co-authored-by: Matthew Planchard <mplanchard@users.noreply.github.com>
2020-06-04 19:39:21 -05:00
Micah Smith
1efb991069
Fix usage of string formatting in HTTPError (#310)
`HTTPError(code, message, format_args)` appears to be equivalent to `HTTPError(status=code, body=message, exception=format_args)` which is not what we want here. The string formatting can't be deferred like in logging library usage.
2020-06-04 19:28:38 -05:00
Kristian Sloth Lauszus
6589170cfb Updated Docker Compose example with HTTPS configuration using Traefik (#295) 2020-01-19 18:30:10 -06:00
Matthew Planchard
c932451cd5
MAINT: Update passlib in docker reqs (#293) 2020-01-12 00:31:28 -06:00
Matthew Planchard
98958cf2f8
ENH: Officially support python 3.8 (#292) 2020-01-11 23:53:13 -06:00
Matthew Planchard
2dfc7f8ea1
MAINT: Update bottle to 0.12.18 (#290)
* MAINT: Update bottle to 0.12.18

* DOC: update changelog
2020-01-11 23:32:53 -06:00
Matthew Planchard
31fcc898b4
FIX: requirements for docker tests in gitlab (#291)
The gitlab tests started failing with GL's newest "docker in docker"
image due to the lack of some core C library headers. This ensures that
everything needed for twine (i.e. cryptography) is present before doing
a pip install for twine.
2020-01-11 23:19:33 -06:00
Matthew Planchard
db74737d3b
DOC: update CHANGES.rst v1.3.2 2020-01-11 17:31:59 -06:00
Matthew Planchard
9a309883be
chore(ver): bump 1.3.1-->1.3.2 2020-01-11 17:26:14 -06:00
Robin De Schepper
124a2a9c43 Update README.rst (#289) 2020-01-11 16:55:17 -06:00
Étienne Noss
5e3d34324c Use python 3.6 for the Dockerfile (#284)
* Use python 3.6 for the Dockerfile

* Dockerfile: use explicit Alpine version

* Empty commit to trigger a new CI build
2019-12-24 00:36:32 -05:00
Géry Ogam
afafd0ae50 Update welcome.html (#283)
* Fix typos

* Improve HTML
2019-11-11 18:38:21 -06:00
Matthew Planchard
e074cd7c80
FIX: Move pip installation into base image
Resolves #264

Generally, pip doesn't need to be available for `pypiserver` to work
correctly, but the `-U` command to update packages requires it to be
importable. This ensures the `pip` module will be available in the final
image.
2019-11-10 18:11:39 -06:00
Géry Ogam
dbee4ec4ce Update welcome.html (#278)
* Update welcome.html

* Update test_app.py
2019-11-10 17:40:13 -06:00
Matthew Planchard
ec7ece1ece
Ignore pypy3 test status for GL 2019-10-19 13:09:53 -05:00
Matthew Planchard
5cd70bfe86
Chore: Revert "Update badge for gitlab (#272)"
This reverts commit de6a9ce19440975759e979fc47ba870192c99370.

Not going to be able to use GL because they do not support forks, so
reverting associated changes.
2019-10-19 13:05:52 -05:00
Géry Ogam
c6b42c3cf6 Update welcome.html (#276) 2019-10-19 12:52:39 -05:00
Matthew Planchard
d108dac5dd
Pull .travis.yml back into repo (#277)
I didn't realize GitLab does not support running PRs on forks for
mirrored GitHub repos. I have switched other projects to Azure
pipelines, but just to get things going, I'm going to pull .travis.yml
back in here.
2019-10-19 12:44:53 -05:00
Matthew Planchard
205342049b
[268] Ensure remove_pkg removes all pkg instances (#273)
* [268] Ensure remove_pkg removes all pkg instances

Reported by @esciara in #268.

Previously, the `remove_pkg` command was only removing the first
matching package that it found so if, for example, there were a .tar.gz
file and a .whl file, it would only remove one of them.

Of course, it could be run in succession to accomplish full removal, but
the expected behavior is that removal will remove the package entirely.

Here, I've grouped `remove_pkg` related tests into a test class, added
some tests that verify the expected behavior, and updated the
`remove_pkg` method to remove all matching packages.

* CHANGES.rst
2019-09-17 21:30:30 -05:00
Matthew Planchard
1f5c88a23e
Merge branch 'master' of github.com:pypiserver/pypiserver 2019-09-17 20:51:55 -05:00
Matthew Planchard
d4c6a2b693
chore: update classifiers for py3.7 2019-09-17 20:51:48 -05:00
Matthew Planchard
de6a9ce194
Update badge for gitlab (#272) 2019-09-17 20:50:48 -05:00
Matthew Planchard
972f1616dd
Use GitLab as CI Provider (#269)
* Add gitlab CI

* minmor updates to readme in /bin

* no autodeploy; less scary
2019-09-17 20:44:15 -05:00
Matthew Planchard
957538a260
FMT: pypiserver/_app.py 2019-09-17 20:43:43 -05:00
Matthew Planchard
a52c0d6f4c
fmt: tests/test_app.py 2019-09-17 20:29:48 -05:00
Matthew Planchard
9496be122f
chore(ver): bump 1.3.0-->1.3.1 v1.3.1 2019-09-10 19:02:31 -05:00
Matthew Planchard
4b65dcdf42
Prep for 1.3.1 2019-09-10 18:19:38 -05:00
Géry Ogam
88230a2111 Correct a command-line argument parsing bug (#271) 2019-09-10 17:36:21 -05:00
Géry Ogam
acfb0a6c3f Update README.rst (#270)
* Update README.rst

* Update README.rst

* Update __main__.py

* Update README.rst

* Update __main__.py
2019-09-10 17:35:18 -05:00
Matthew Planchard
91a5ebd8b1
[#265] Resolve issue with non-md5 hashing algorithms (#266) 2019-09-02 14:31:59 -05:00
Markus Holtermann
03e30846d8 Fix link to SO question in readme (#258) 2019-06-10 17:54:38 -05:00
Matthew Planchard
a8321cef5f
Update date on changelog 2019-05-05 17:06:00 -05:00
Matthew Planchard
2ef26a87ee
REL: 1.3.0 (#250)
* Compose updates; doc updates; changelog for 1.3.0

* chore(ver): bump 1.2.7-->1.3.0

* update date in README

* rst is not markdown

* Add issue numbers to changelog
v1.3.0
2019-05-05 16:47:06 -05:00