Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
155 commits
Select commit Hold shift + click to select a range
dbe77ef
Switched to TemporaryUploadFile because the magic foo in SimpleUpload…
benliles Mar 21, 2010
bdd9c99
Fix error in README (register without -r attempts pypi.python.org).
bshi Dec 8, 2009
3def782
Switched download_url to be a CharField instead of a URLField.
Mar 18, 2010
d06c58f
Addded Michael Richardson to AUTHORS
Mar 22, 2010
9c47954
Began adding South migration support, refactoring models to more clos…
benliles Apr 28, 2010
b195ce1
More model refactorization and second South migration
benliles May 1, 2010
4a39736
Moved djangopypi module into a src directory as it's own package, mov…
benliles May 23, 2010
1d1cc6a
Removed application settings for djangopypi from chishop project, twe…
benliles May 24, 2010
f96238a
Added a symlink for readme
benliles May 24, 2010
a84ed81
Nevermind on the readme
benliles May 24, 2010
07c5ffc
Moving views to django generics when possible
benliles May 25, 2010
12686ff
Fixed a misnaming of project views file, a little bit more on using s…
benliles May 26, 2010
6d3984e
Using __getattr__ and __setattr__ to provide access to version specif…
benliles May 27, 2010
dce0d10
Renamed project to package and added south migration, more work on vi…
benliles Jun 1, 2010
c90ffa5
Added a decorator for basic auth handling, removed user registration …
benliles Jun 3, 2010
3c3e5c0
Merged migrations into a single one, template work, almost ready for …
benliles Jun 4, 2010
3f940b2
Added eclipse magic files to .gitignore
benliles Jun 7, 2010
9462d54
Removing deprecated search views (merged into package views)
benliles Jun 7, 2010
d0e43ff
Added decorators for testing if a user owns/maintains a package and w…
benliles Jun 7, 2010
16f9786
Added a package management view that uses the django generic create_u…
benliles Jun 7, 2010
da45fb3
Fleshed out default package management template and added a nicer one…
benliles Jun 7, 2010
8f6db08
Switched order due to import order conflicts
benliles Jun 7, 2010
30834e2
Added a release management form (very limited due to the changing nat…
benliles Jun 7, 2010
c38471b
Added more detection of variables for metadata version determination …
benliles Jun 7, 2010
bb7171f
Added dummy metadata forms and fleshed out version 1.0 form
benliles Jun 7, 2010
2de25ff
Filled out the metadata forms for versions 1.0-1.2 as per PEP specs (…
benliles Jun 7, 2010
cdbc0a1
Switched classifiers to using name as the primary key
benliles Jun 7, 2010
b156fd9
Cleaned up TODO and created a separate TODO for chishop
benliles Jun 8, 2010
6628cdb
Added a view for release metadata editing along with metadata forms f…
benliles Jun 9, 2010
918d295
Pushed version back to 0.3 and removed ununsed utilities
benliles Jun 9, 2010
8836ca4
Added signals for auto-hiding of releases
benliles Jun 9, 2010
e8ab6c9
Added an if statement around the output of files table to make sure t…
benliles Jun 9, 2010
c424790
Added view for managing releases of a package, stub for managing file…
benliles Jun 9, 2010
44a55b8
Removed extra import from package views and fleshed out file manageme…
benliles Jun 9, 2010
c412060
Switched comment to an input box in template
benliles Jun 9, 2010
298ded5
Switched pypi/ to be the root view and fallback
benliles Jun 9, 2010
74ddf68
Removed user views (registration is still undergoing major API change…
benliles Jun 9, 2010
b51426b
Added missing close form tags
benliles Jun 9, 2010
d6ce27e
Added chishop specific templates for release and package management
benliles Jun 9, 2010
841c8fb
Filtering incoming data to remove 'UNKNOWN' that register command lik…
benliles Jun 9, 2010
d7e1882
Updated documentation for the split in chishop and djangopypi
benliles Jun 9, 2010
6d85075
Merged AUTHOR changes from Ask
benliles Jun 9, 2010
accdd44
Added to changelog and TODO
benliles Jun 9, 2010
15ee2a1
Switched back to relative paths due to a problem installing
benliles Jun 9, 2010
6e5683f
Added install bug fix to changelog
benliles Jun 9, 2010
1f09e3d
Added simple index and package detail pages, changed doap addresses t…
benliles Jun 10, 2010
182e48f
Added simple index and package detail pages, changed doap addresses t…
benliles Jun 10, 2010
ac532fb
Added the 'list_classifiers' action. Added GET request handling to ro…
benliles Jun 10, 2010
d2f0a86
Some initial work on RSS feeds
benliles Jun 10, 2010
2fcc985
Closes issue #3, fix decorator imports
benliles Jun 11, 2010
b8429e8
RSS feeds working (tested in Django 1.2 only)
benliles Jun 11, 2010
e829a76
Fixed a bug for non-authenticated users
benliles Jun 14, 2010
0e4a4fc
Made the content be editable since Django 1.2 locks out editable=Fals…
benliles Jun 14, 2010
c81e05f
Moved the md5 hash generation to a signal handler for pre_save on Dis…
benliles Jun 14, 2010
501f7d9
Added an upload form to the manage filed view and added an upload fil…
benliles Jun 14, 2010
d57b70c
Updated docs for progress on 0.4 and increased version in setup.py to…
benliles Jun 14, 2010
5d024cd
Updated setup file a little and moved doc files to root dir of django…
jezdez Jun 16, 2010
b427476
Updated buildout config a little.
jezdez Jun 16, 2010
795deb2
Added django-registration to default settings of chishop.
jezdez Jun 16, 2010
402b622
Added optional requirements file for pip lovers.
jezdez Jun 16, 2010
310abb1
Minor bugfix.
jezdez Jun 16, 2010
6cf8c65
Renamed README file, if it's not in docs folder, then github and pypi…
benliles Jun 17, 2010
a4fc9df
Fixed file reading in setup.py for README name change
benliles Jun 17, 2010
0adbedf
Added django-haystack and Whoosh to buildout eggs
benliles Jun 17, 2010
7901991
Incorporated whitespace cleanup from jezdez, ignoring the addition of…
benliles Jun 17, 2010
c8c6833
Incorporated whitespace cleanup from jezdez
benliles Jun 17, 2010
be19b8d
Haystack Package search index with fields for authors (incl. owners, …
benliles Jun 17, 2010
71a12a9
Fixed a few typos/bugs with the Package search index
benliles Jun 17, 2010
23806ad
Incorporated Haystack code from jezdez
benliles Jun 17, 2010
de69a55
Version 0.4.1
benliles Jun 17, 2010
8be5d08
Except the distutils view from CSRF handling.
jacobian Jul 28, 2010
0412adc
Merge branch 'jacobian'
Oct 26, 2010
d6076b9
Found full-name for contributor Halldor
Jul 22, 2010
18f3dce
Merge branch 'ask'
Oct 26, 2010
1de0bd6
Added the basic handlers for xml rpc requests.
Oct 26, 2010
3ff5827
Made mangage.py executable
Oct 26, 2010
2d9064a
Got some tests working for xml rpc.
Oct 26, 2010
5aa6117
Added a check for 'text/xml' content type and
Oct 26, 2010
6736796
Merge branch 'xmlrpc'
Oct 26, 2010
7b0526e
Added a MANIFEST.in file to include the misc files setup.py requires
Oct 27, 2010
767e356
Bumped the version so it didn't conflict with the current version
Oct 27, 2010
12add5a
deleted a strange empty comment
Dec 1, 2010
29ac3f8
The authentication for the owners now allows for multiple owners.
Dec 1, 2010
7da55d4
Added some ordering to the package model and set the get latest by
Dec 1, 2010
6cef0a6
Version bump to 0.4.2beta2
Dec 1, 2010
b88e8f8
Fixed CSRF handling.
Feb 8, 2011
dafee26
Pep8 cleaning.
Feb 8, 2011
4f27791
Added Django 1.1 compatibile CSRF exempt decorator.
Feb 8, 2011
bcc2971
Bumped version.
Feb 8, 2011
ec49f64
Updated changelog for version 0.4.2.
Feb 8, 2011
a284e5d
Added myself to the authors.
Feb 8, 2011
5fdb98a
Added manifest and setup.cdg.
Feb 8, 2011
c7f2b87
The authentication for the owners now allows for multiple owners.
Dec 1, 2010
dc5f608
Added some ordering to the package model and set the get latest by
Dec 1, 2010
ab7558d
Found full-name for contributor Halldor
Jul 22, 2010
9b79033
Added the basic handlers for xml rpc requests.
Oct 26, 2010
2c37f43
Made mangage.py executable
Oct 26, 2010
3a6a7b9
Got some tests working for xml rpc.
Oct 26, 2010
44920b8
Merged changes from washingtontimes with a few modifications
benliles Feb 21, 2011
830bce2
Various bug fixes and one new feature for version 0.4.2
benliles Feb 21, 2011
14e252e
Version 0.4.3, see Changelog for details
benliles Feb 22, 2011
448fc96
Removed chiship specific stuffs
Sep 11, 2011
69923e3
Moving djangopypi to the root
Sep 11, 2011
6121fd0
Formatted authors.rst, updated setup files
benliles Sep 11, 2011
db85462
Removed bootstrap/buildout (now in buildout branch), removed TODO in …
benliles Sep 11, 2011
357c3b9
Added masterindex and mirrorlog
benliles Sep 11, 2011
1e42aa5
Added new models to admin and removed user requirement on distributions
benliles Sep 12, 2011
fd39451
Updated the Manifiest.in to have the appropriate names.
coordt Mar 11, 2012
fa96914
Initial change to add multi-user support: User FK, and name-user uniq…
coordt Mar 11, 2012
df1675d
Version bump to 0.4.4b2
coordt Mar 11, 2012
38b3065
Don't need comments in this.
coordt Mar 30, 2012
af38bd7
Adding in user parameters for all the views
coordt Mar 30, 2012
c93f804
Using the new url structure.
coordt Mar 30, 2012
62c6298
Merge branch 'multiuser'
coordt Apr 4, 2012
e126dee
Convert existing settings into a dict and raise deprecation warnings …
coordt Apr 5, 2012
883d6ea
Updated imports of new settings
coordt Apr 5, 2012
052e52e
Created a function to allow settings that include paths to get import…
coordt Apr 5, 2012
a80ff8a
Allowing optional trailing slashes since pip doesn't request them. Tr…
coordt Apr 6, 2012
7a1e0d1
Fixed an issue with the class loader
coordt Apr 6, 2012
367ae85
Some style fixes and import fixes.
coordt Apr 6, 2012
6e5f222
Version bump to 0.4.4b4
coordt Apr 6, 2012
7924fcd
Merge branch 'settings-refactor'
coordt Apr 6, 2012
3a4d38f
Making packages private as default
coordt Apr 13, 2012
30087d0
Renamed djangopypi to userpypi due to the amount of restructuring I'm…
coordt Apr 13, 2012
9b78b8a
Major refactoring to include owner in views.
coordt Apr 15, 2012
5a9d70d
Moved requirements file out of the package
coordt Apr 15, 2012
3493074
Renamed package from djangopypi to userpypi
coordt Apr 15, 2012
3078734
Altered the debug wrapper so it only debugs if DEBUG is true.
coordt Apr 15, 2012
b101d59
Changed the FALLBACK_VIEW default
coordt Apr 15, 2012
9eb557a
Working basic_auth
coordt Apr 20, 2012
e104db3
Properly handling missing packages and proxy requests with a redirect…
coordt Apr 20, 2012
6d86540
Version bump to 0.5
coordt Apr 25, 2012
dd464c6
renamed username param to owner
coordt May 4, 2012
50ed773
Adding initial maintainer support
coordt May 11, 2012
fbe2ae2
ignoring build directory
coordt May 11, 2012
b8375bc
Switched back to a normal function view for the manage view. It was t…
coordt May 11, 2012
76dc963
Forgot to not import the view I just deleted
coordt May 11, 2012
9efd2e0
Need at least 1 extra inline for the dynamic adding to work.
coordt May 11, 2012
bfd81ae
Version bump to 0.5.2
coordt May 11, 2012
39c07e9
Added permissions for fine tuning of maintainer and user permissions
coordt May 25, 2012
3d61c1d
Changed the OwnerMixin to include "owner" in the context as a User ob…
coordt May 25, 2012
03c05a6
Version bump to 0.5.3
coordt May 25, 2012
2fa9e4f
Added a get_owner method for releases
coordt May 28, 2012
20aba36
Version bump to 0.5.4
coordt May 28, 2012
3365363
Fixing the authentication and creation of packages for teams.
coordt Jun 1, 2012
2bfec0c
Version bump to 0.5.5
coordt Jun 1, 2012
e25c67a
Updated a mis-typed variable in the authorize method
coordt Jun 6, 2012
c434572
Added the owner into the package admin
coordt Jun 11, 2012
18971e6
Changed the way in which the owner is retrieved to support organizations
coordt Jun 11, 2012
480fd5f
Version bump to 0.5.7
coordt Jun 11, 2012
297cca8
Fix NameError due to missing ObjectDoesNotExist import, clean up unus…
Jun 13, 2012
1f955a3
Merge pull request #1 from mattcaldwell/master
coordt Jul 2, 2012
ba48d8e
updated buildout.cfg and created a Makefile
Aug 8, 2012
46e196a
fixed settings to run Django 1.4.1
Aug 8, 2012
86bf050
merge
Aug 8, 2012
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
.project
.pydevproject
.settings
.DS_Store
*.pyc
*~
Expand All @@ -15,4 +18,9 @@ parts
eggs
bin
developer-eggs
develop-eggs
downloads
.installed.cfg
chishop/media/dists/*
chishop/haystack/*
build/
19 changes: 19 additions & 0 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Authors/Contributors
--------------------

* Ask Solem <askh@opera.com>
* Rune Halvorsen <runeh@opera.com>
* Russell Sim <russell.sim@gmail.com>
* Brian Rosner <brosner@gmail.com>
* Hugo Lopes Tavares <hltbra@gmail.com>
* Sverre Johansen <sverre.johansen@gmail.com>
* Bo Shi <bs@alum.mit.edu>
* Carl Meyer <carl@dirtcircle.com>
* Vinícius das Chagas Silva <vinimaster@gmail.com>
* Vanderson Mota dos Santos <vanderson.mota@gmail.com>
* Stefan Foulis <stefan.foulis@gmail.com>
* Michael Richardson <michael@michaelrichardson.me>
* Benjamin Liles <benliles@gmail.com>
* Halldór Rúnarsson <halldor89@gmail.com>
* Jannis Leidel <jannis@leidel.info>
* Sebastien Fievet <zyegfryed@gmail.com>
41 changes: 0 additions & 41 deletions Changelog

This file was deleted.

76 changes: 76 additions & 0 deletions Changelog.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
History
=======

0.5 (2012-04)
-------------

* Renamed fork to userpypi
* Added multi-user support with private indexes

0.4.3 (2011-02-22)
------------------

* Moved xmlrpc views into views folder
* Moved xmlrpc command settings to the settings file
* Cleaned up xmlrpc views to remove django.contrib.sites dependency

0.4.2 (2011-02-21)
------------------

* Added CSRF support for Django>=1.2
* Added conditional support to proxy packages not indexed

0.4.1 (2010-06-17)
------------------

* Added conditional support for django-haystack searching

0.4 (2010-06-14)
----------------

* 'list_classifiers' action handler
* Issue #3: decorators imports incompatible with Django 1.0, 1.1
* RSS support for release index, packages
* Distribution uploads (files for releases)

0.3.1 (2010-06-09)
------------------

* Installation bugfix

0.3 (2010-06-09)
----------------

* Added DOAP views of packages and releases
* Splitting userpypi off of chishop
* Switched most views to using django generic views

Backwards incompatible changes
______________________________

* Refactored package/project model to support multiple owners/maintainers
* Refactored release to match the metadata only that exists on pypi.python.org
* Created a Distribution model for distribution files on a release

0.2.0 (2009-03-22)
------------------

* Registering projects and uploading releases now requires authentication.
* Every project now has an owner, so only the user registering the project can
add releases.
* md5sum is now properly listed in the release link.
* Project names can now have dots ('.') in them.
* Fixed a bug where filenames was mangled if the distribution file already existed.
* Releases now list both project name and version, instead of just version in the admin interface.
* Added a sample buildout.cfg. Thanks to Rune Halvorsen (runeh@opera.com).

Backwards incompatible changes
______________________________

* Projects now has an associated owner, so old projects must be exported and
imported to a new database.

0.1.0 (2009-03-22)
------------------

* Initial release
12 changes: 5 additions & 7 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
include AUTHORS
include README
include TODO
include MANIFEST.in
include README.rst
include AUTHORS.rst
include Changelog.rst
include LICENSE
include Changelog
recursive-include djangopypi *
recursive-include chishop *
include TODO
# include MANIFEST.in
20 changes: 20 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
.PHONY: run
run: bin/django syncdb
./bin/django runserver 0.0.0.0:10000

.PHONY: shell
shell: bin/django
./bin/django shell

bin/django: bin/buildout buildout.cfg
./bin/buildout
touch bin/django

bin/buildout:
python bootstrap.py --distribute

syncdb: bin/django
./bin/django syncdb
touch syncdb

buildout.cfg:
79 changes: 0 additions & 79 deletions README

This file was deleted.

95 changes: 95 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
DjangoPyPI
==========

DjangoPyPI is a Django application that provides a re-implementation of the
`Python Package Index <http://pypi.python.org>`_.

Installation
------------

Path
____

The first step is to get ``userpypi`` into your Python path.

Buildout
++++++++

Simply add ``userpypi`` to your list of ``eggs`` and run buildout again it
should downloaded and installed properly.

EasyInstall/Setuptools
++++++++++++++++++++++

If you have setuptools installed, you can use ``easy_install userpypi``

Manual
++++++

Download and unpack the source then run::

$ python setup.py install

Django Settings
_______________

Add ``userpypi`` to your ``INSTALLED_APPS`` setting and run ``syncdb`` again
to get the database tables [#]_.

Then add an include in your url config for ``userpypi.urls``::

urlpatterns = patterns("",
...
url(r'', include("userpypi.urls"))
)

This will make the repository interface be accessible at ``/pypi/``.



Uploading to your PyPI
----------------------

Assuming you are running your Django site locally for now, add the following to
your ``~/.pypirc`` file::

[distutils]
index-servers =
pypi
local

[pypi]
username:user
password:secret

[local]
username:user
password:secret
repository:http://localhost:8000/pypi

Uploading a package: Python >=2.6
_________________________________

To push the package to the local pypi::

$ python setup.py register -r local sdist upload -r local


Uploading a package: Python <2.6
________________________________

If you don't have Python 2.6 please run the command below to install the
backport of the extension for multiple repositories::

$ easy_install -U collective.dist

Instead of using register and dist command, you can use ``mregister`` and
``mupload`` which are a backport of python 2.6 register and upload commands
that supports multiple servers.

To push the package to the local pypi::

$ python setup.py mregister -r local sdist mupload -r local

.. [#] ``userpypi`` is South enabled, if you are using South then you will need
to run the South ``migrate`` command to get the tables.
Loading