Skip to content

Commit

Permalink
- Switch away from setuptools to distribute.
Browse files Browse the repository at this point in the history
- Remove cpyamf/*.c files and autogenerate the code when needed. Include the .c for sdist so that Cython is not a hard dependancy.
- Refactored setup.py to only include required meta data. All all other logic has been moved to setuptools.py
- Removed the need for duplicate versions - the master is now in setup.py and pyamf receives an autogenerated file.

Fixes: #682, #824
  • Loading branch information
njoyce committed Feb 7, 2011
1 parent f215298 commit bd04c08
Show file tree
Hide file tree
Showing 16 changed files with 880 additions and 48,737 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
*.pyc
*.class
*.c
PyAMF.egg-info/
_trial_temp/
build/
Expand All @@ -11,3 +12,6 @@ doc/themes
cpyamf/amf3.pyd
cpyamf/codec.pyd
cpyamf/util.pyd
dist
file_model
pyamf/_version.py
6 changes: 4 additions & 2 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ versions of PyAMF.
.. contents::


Next version
------------
0.6.1 (Unreleased)
----------------

- Switched to Distribute as the future of Python packaging (Ticket:682)


0.6 (21-10-2010)
Expand Down
8 changes: 6 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
graft doc
include ez_setup.py
include CHANGES.txt
prune doc/build
prune doc/_build
include distribute_setup.py
include *.txt
recursive-include cpyamf *.pxd
global-exclude *.swf
Loading

0 comments on commit bd04c08

Please sign in to comment.