Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Possible to redefine server's welcome-page with cmd-line option (2). #61

Merged
merged 3 commits into from
Feb 15, 2015

Conversation

ankostis
Copy link
Member

  • Extract http welcome-msg(/) in a separate ASCII file.
  • Add cmd-line option --welcome for changing the welcome-file and update docs.
  • Add 2 TCs, for cmd-line option and / http-req.

@schmir
Copy link
Contributor

schmir commented Nov 19, 2014

I think this will break installation as standalone script (see https://pypi.python.org/pypi/pypiserver#alternative-installation-as-standalone-script).

I'm not sure how many people - if any - are using that method. The instructions now also point to the wrong URL..

@petri
Copy link

petri commented Jan 13, 2015

The welcome msg should NOT be ascii but encoded as UTF-8 to support international users, please...

@ankostis ankostis force-pushed the feat/welcome-msg branch 3 times, most recently from aeec7f4 to e9620d9 Compare January 14, 2015 19:41
@ankostis ankostis added this to the v1.7.1 milestone Jan 15, 2015
- Read welcome-msg in UTF-8.
- Add cmd-line option for `welcome-file`.
- Add TCs for welcome-file option and `/` http-req.
- Update docs for new option.
- Failback to in-code welcome-msg if unreadable (ie standalone mode, bad file).
@ankostis
Copy link
Member Author

I made it consume utf-8 and provide an in-code message if reading failed (for standalone).
Also squashed and rebased changes on latest master to be ready for merging.

ankostis added a commit that referenced this pull request Feb 15, 2015
Possible to redefine server's welcome-page with cmd-line option (2).
@ankostis ankostis merged commit a90c96d into pypiserver:master Feb 15, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants