marcoduif/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests 1 Projects Releases Wiki Activity
4197 commits 109 branches 178 tags 19 MiB
Commit graph

4197 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nico Schottelius
c4274e789f include cdist from the scripts/ directory for shipping 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-30 11:51:27 +01:00
Nico Schottelius
10b6c31ac8 Rename cdist.py to scripts/cdist to avoid self import 
naming cdist cdist.py and running import cdist, imports itself and thus raises an interesting error:

(virtualenv)[7:47] brief:virtualenv% cdist.py
Traceback (most recent call last):
  File "<frozen importlib._bootstrap>", line 1512, in _find_and_load_unlocked
AttributeError: 'module' object has no attribute '__path__'

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "/home/users/nico/oeffentlich/rechner/projekte/cdist/virtualenv/bin/cdist.py", line 230, in <module>
    commandline()
  File "/home/users/nico/oeffentlich/rechner/projekte/cdist/virtualenv/bin/cdist.py", line 27, in commandline
    import cdist.banner
ImportError: No module named 'cdist.banner'; cdist is not a package

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "/home/users/nico/oeffentlich/rechner/projekte/cdist/virtualenv/bin/cdist.py", line 235, in <module>
    except cdist.Error as e:
AttributeError: 'module' object has no attribute 'Error'

Also described on

    http://www.velocityreviews.com/forums/t953596-error-executing-import-html-parser-from-a-script.html

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-30 11:47:16 +01:00
Nico Schottelius
a81525b101 add some thoughts on changes for multiple directory search for types and explorers 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-30 07:41:42 +01:00
Nico Schottelius
80e42c133d this is pre3, not pre2 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-30 07:37:19 +01:00
Nico Schottelius
e0bdcea78b adjust type linking script 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-30 07:33:07 +01:00
Nico Schottelius
cbb34de1b2 explorers are now below cdist/ 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-29 23:28:27 +01:00
Nico Schottelius
6c4480abfa ++changes(2.1.0pre3) 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-29 23:25:28 +01:00
Nico Schottelius
8202cd0e7a remove some debug, remove adding dirs 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-29 22:56:29 +01:00
Nico Schottelius
63573a9797 make package_data work 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-29 22:50:27 +01:00
Nico Schottelius
e2ba9ab1d2 add package data info 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-29 22:18:32 +01:00
Nico Schottelius
8324c9dee4 build source for archlinux as well as upload to pypi 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 18:47:49 +02:00
Nico Schottelius
24481781f9 +comment 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 18:42:06 +02:00
Nico Schottelius
fd9aca7b3c release 2.1.0pre2 today 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 18:39:22 +02:00
Nico Schottelius
0d46dc3367 fix manpages of __pf_ruleset and __pf_apply 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 18:38:14 +02:00
Nico Schottelius
2307cdebfa abort dist on any error 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 18:38:00 +02:00
Nico Schottelius
e397f2a74c cleanup distribution process in build file 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 18:35:47 +02:00
Nico Schottelius
3e573fa21e begin to merge releasehelper into build 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 18:20:09 +02:00
Nico Schottelius
992be4959a ++changes(2.1.0pre2) 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 18:14:04 +02:00
Nico Schottelius
195036b710 creating basic cdist archlinux package works 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 18:13:17 +02:00
Nico Schottelius
4c4b234feb ignore generated PKGBUILD 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 17:53:57 +02:00
Nico Schottelius
cbd44a8837 begin initial PKGBUILD for archlinux 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 17:53:35 +02:00
Nico Schottelius
6627325b45 build manpages before doing a pypi package 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 17:42:26 +02:00
Nico Schottelius
7a34c6cd28 add types to pypi distribution 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 17:40:38 +02:00
Nico Schottelius
aef91d972e more cleanups 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 12:23:47 +02:00
Nico Schottelius
281852ff27 use new helper 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 12:19:41 +02:00
Nico Schottelius
1064d8edd5 cleanup release and build script 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 12:17:43 +02:00
Nico Schottelius
c29b7f6814 checklist is now a helper 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 11:59:43 +02:00
Nico Schottelius
3b04f5749e change release script to setup version from changelog 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 08:31:54 +02:00
Nico Schottelius
9eb7503713 split clean-dist into its own section 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 07:37:18 +02:00
Nico Schottelius
ca275133d3 add releasedate for 2.1.0pre1 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 07:36:56 +02:00
Nico Schottelius
80db8a01cf +linebreak 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 07:36:07 +02:00
Nico Schottelius
0db38038a9 merge changelog-2.1 back into main changelog 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 07:20:03 +02:00
Nico Schottelius
27a832676b move logfile into new destination 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 07:09:05 +02:00
Nico Schottelius
eb6687bd32 allow build to be called outside of the project directory 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-26 06:55:01 +02:00
Nico Schottelius
66224f5bdc add some urls 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-25 23:51:45 +02:00
Nico Schottelius
a21f5f787d begin with pre first 2012-10-25 23:51:18 +02:00
Nico Schottelius
c613f868a2 cleanups 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-25 23:49:22 +02:00
Nico Schottelius
3826b6ce36 not needed to import our path anymore 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-25 23:49:10 +02:00
Nico Schottelius
85fcfb1744 correct __file link again 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-25 23:48:56 +02:00
Nico Schottelius
af8f944aaf package_dir not needed anymore 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-25 23:47:32 +02:00
Nico Schottelius
3cf59fdf9a always use dynamic version - on shipping included generated version 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-25 23:45:56 +02:00
Nico Schottelius
136bb01a67 correct placement in build script 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-25 23:43:12 +02:00
Nico Schottelius
91c1374657 begin restructering for python package 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-25 23:37:15 +02:00
Nico Schottelius
5d319027d0 Merge branch 'master' into 2.1_pypi_integration 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>

Conflicts:
	.gitignore
	build
 2012-10-25 22:35:20 +02:00
Nico Schottelius
d3c7abbaba ignore static version 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-25 22:32:05 +02:00
Nico Schottelius
637e4b28cb include base for dynamic and static versioning 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-25 22:19:27 +02:00
Nico Schottelius
afbfc031f7 begin to split off version information from source 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-25 19:12:22 +02:00
Nico Schottelius
d20ae0596d pypi cleanups 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-25 19:07:50 +02:00
Nico Schottelius
37db1e8c2f retry MANIFEST.in, when deleting cache before 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-25 18:47:48 +02:00
Nico Schottelius
65128e4bcf re-indent 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-25 18:44:05 +02:00