Commit Graph

108 Commits

Author SHA1 Message Date
Brian Warner
da4e7dcfbe hush a bunch of not-really-problems caught by the lgtm.com static analyzer
This is all minor stuff: unreachable debug code (that should be commented-out
instead of in an 'if False:' block), unnecessary 'pass' and 'global'
statements, redundantly-initialized variables. No behavior changes. Nothing
here was actually broken, it just looked suspicious to the static analysis at
https://lgtm.com/projects/g/tahoe-lafs/tahoe-lafs/alerts/?mode=list .
2017-12-31 00:19:41 +01:00
meejah
031a88c25f simplejson -> json 2017-02-23 15:21:36 -07:00
Brian Warner
b81c6a7208 run-deprecations: supress duplicates
I thought 'warnings' or twisted.python.deprecate was supposed to do this
already, but it's clearly not working.
2016-04-06 13:37:52 -10:00
Brian Warner
9d20de3db9 improve run-deprecations script
Rewrote in Twisted, which lets us read/scan/print all log lines in
realtime. The output is now correctly interleaved (as well as
maintaining the stdout-vs-stderr of each message). The renamed
--warnings= logfile records all relevant lines from *both* stdout and
stderr (i.e. any that includes "DeprecationWarning"), which handles a
change (perhaps in recent Twisteds?) that emits these warnings on stdout
instead of stderr.
2016-04-06 11:07:06 -10:00
Brian Warner
c781fc188b run-deprecations: flush stdout before starting trial
This should get the notes printed in the right order.
2016-04-06 09:23:48 -10:00
Brian Warner
14c513db8a tox -e deprecations: add helper script to make it work
Tox doesn't run shell pipelines, and is unhappy about running tools that
it didn't install itself (including non-python things like "make"). So
this adds misc/build_helpers/run-deprecations.py, a python script that
runs a given command (i.e. trial) and writes stdout into a separate file
where the buildbot can see it, and counts the "DeprecationWarning" lines
from the file to decide the returncode.

This ought to improve the status display on the buildbot "test
deprecations" step.
2016-04-06 08:29:48 -10:00
Brian Warner
23826b0224 fix OS-X package version
I changed the quotes in _version.py, and this script was sensitive to
them.
2016-03-23 02:32:48 -07:00
Brian Warner
831b39d8fb remove src/buildtest/ and related build_helper/ test files
This was used to exercise our old virtualenv-like scheme. Now that we
use virtualenv, they're unnecessary. Plus, removing it lets us stop
polluting end-user installs with the extra package (that might
conceivably conflict with some other project that names itself
"buildtest").
2016-03-22 22:56:03 -07:00
Brian Warner
1f712c8ddb Makefile: remove/deprecate old targets
This replaces the following targets with "echo this is obsolete":

* fetch-and-unpack-deps (used by the old 'tarballs' builder, for SUMO tarballs)
* test-desert-island (used by the old 'clean' builder)
* test-pip-install (used by 'new-pip' builder before we switched)

It also removes the test-pip-install.py helper script.
2016-03-22 14:12:45 -07:00
Brian Warner
b5b2036d37 OS-X: fix package generation
The old scheme depended upon the bespoke pseudo-virtualenv scheme that
we cooked up long ago (it copied the entire source tree, bin/tahoe and
support/ and all, into the mac .pkg archive). When we moved to real
virtualenvs, that broke.

This new scheme only installs a populated virtualenv into the archive.
It replaces the entry-point bin/tahoe with a script that behaves a lot
like the old bespoke script: it inserts a relative site-packages/ into
sys.path before importing allmydata.scripts.runner and calling run().

This still depends upon the end-users $PATH having a python that is
compatible with the binary modules we've compiled here, and there are
three potentially-differing Pythons to worry about (homebrew, python.org
installers, and Apple's native /usr/bin/python). We'll have to see if
they tend to differ in ways that cause problems (I think the maintainers
generally try to avoid that). If that's an issue, the next level up is
to use bbfreeze or py2app or something in that category, to ship an
entire python, and not just a bundle of libraries.
2016-03-16 12:31:21 -07:00
Brian Warner
082bc3de6f OS-X installer license: wrap to fit, update CC 2016-03-16 12:23:44 -07:00
Brian Warner
be463cd36c OS-X: move Contents down into misc/ 2016-03-16 12:23:13 -07:00
Daira Hopwood
d8549a2c7f setuptools delenda est. fixes ticket:1582 :-D
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-03-15 17:19:10 +00:00
Brian Warner
eb0e786344 show-tool-versions.py: add tox
As we fix ticket:#1582, we'll move to 'tox' for running tests (which
creates its own virtualenv), so I'd like to see which buildslaves
currently have it installed, and which need to be updated.
2016-03-08 09:33:01 -08:00
Brian Warner
428ca04e2c show-tool-versions: add 'virtualenv' 2016-02-22 12:41:35 -08:00
Ramakrishnan Muthukrishnan
e92a9774fa OS-X package: add a preinstall script and copy the manpage into /etc/manpaths.d.
The preinstall script detects previous installation and removes it.

Author: Ramakrishnan Muthukrishnan <ram@leastauthority.com>
2015-09-03 15:18:08 +01:00
Brian Warner
d8e60f82a4 add test-pip-install 2015-06-16 13:46:43 -07:00
Brian Warner
cf9b382863 move Dockerfile back to root. DockerHub can't handle it elsewhere.
It looks like DockerHub's automated builds only have access to the
subtree of the source checkout at+below the Dockerfile. Putting the
Dockerfile in misc/build_helpers/ meant that the build process only had
access to misc/build_helpers/, not the full source tree.
2015-06-07 14:30:58 -07:00
Brian Warner
c79cda2c69 Dockerfile: fix ADD path to deal with non-root location 2015-06-07 14:24:04 -07:00
Brian Warner
ed7839b276 move Dockerfile down ito misc/build_helpers/ 2015-06-07 13:40:26 -07:00
Brian Warner
a517e00717 test-desert-island wasn't catching https downloads
I think the desert-island build is broken, but the automated test wasn't
catching it because of this bug.
2015-05-21 16:21:02 -07:00
Daira Hopwood
a2e116b330 Update copy of gen-package-table.py in source tree.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-05-13 13:36:04 +01:00
Ramakrishnan Muthukrishnan
96d2614266 fix OS X logo generation 2015-04-30 15:24:20 +01:00
Daira Hopwood
88b735b6be Build Tahoe-LAFS icon for OS X and Windows. refs ticket:2323
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-04-30 15:24:12 +01:00
Daira Hopwood
409cf22ee9 Bump zetuptoolz version (file changes).
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-04-28 18:52:59 +01:00
Ramakrishnan Muthukrishnan
c88deb40ba strip the single quotes around $VERSION
Without stripping the single quotes, the generated pagkage filename
also has the undesired single quotes around the version string.
(eg: tahoe-lafs-'1.10.0.post309'-osx.pkg).
2015-04-11 14:35:18 +05:30
Daira Hopwood
3f9c73bd68 Fix a missing import in test-osx-pkg.py. refs #2393
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-03-24 16:44:54 +00:00
Daira Hopwood
21204876ed More careful quoting in build-osx-pkg.sh. refs #2393
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-03-24 16:42:27 +00:00
Daira Hopwood
61f3d5ae13 Move computation of Tahoe version from Makefile to build-osx-pkg.sh. refs #2393
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-03-24 16:41:43 +00:00
Brian Warner
c12d49b54e create/test/upload tahoe-lafs-VERSION-osx.pkg, not tahoe-lafs-osx.pkg
Closes ticket:2393
2015-03-21 14:20:00 -07:00
Brian Warner
05c6966801 move build-osx-pkg out to a separate shell script
Also remove the duplicate test-osx-pkg (i.e. don't run the test as part
of the build, and have the caller do it themselves later).
2015-03-21 14:12:21 -07:00
Brian Warner
30987c1e7d remove stray trailing whitespace 2015-02-04 01:35:44 -08:00
Daira Hopwood
cf0f64be98 misc/build_helpers/run_trial.py is no longer used.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2014-12-05 17:50:59 +00:00
Brian Warner
5218e87ed1 test-osx-pkg.py: remove unused import 2014-10-26 11:56:57 -07:00
Daira Hopwood
f4d40ffcbf misc/build_helpers/test-osx-pkg.py: script to test the OS X pkg.
After extracting the contents of the package, this script looks at the
output of 'tahoe --version-and-path' to see if the modules are installed
and invoked from the right path.

Author: Ramakrishnan Muthukrishnan <ram@leastauthority.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2014-10-20 17:52:46 +01:00
Ramakrishnan Muthukrishnan
b07446ffc6 Distribution.xml file and scripts for building the OSX package. 2014-10-20 17:52:46 +01:00
Daira Hopwood
e0c9088757 Delete the obsolete misc/build_helpers/test_mac_diskimage.py script.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2014-10-13 18:50:01 +01:00
Zooko
f0ef82bfac remove all the unused scripts from build_helpers
Fixes #2305.
2014-09-30 03:54:55 +00:00
Brian Warner
a1cc7df23d remove obsolete debian-package building tools
setup.py: stop sometimes-depending upon 'stdeb'
setup.cfg: don't try to alias 'sdist_dsc'
misc/build_helpers/build-deb.py: delete this, it was really old anyways

Closes ticket:2282 (trac).
2014-09-04 22:05:08 -07:00
Zooko Wilcox-O'Hearn
f3a1107aab add print_py_pkg_ver for all deps
Including probable-near-future-transitive deps due to the new pyOpenSSL…
2014-05-12 21:51:03 +00:00
Zooko Wilcox-O'Hearn
17736575f4 remove lzip, add cffi, cryptography.io 2014-04-15 16:24:36 +00:00
Zooko Wilcox-O'Hearn
77b536c7a4 remove darcs tools from show-tool-versions 2014-04-11 14:34:01 +00:00
Daira Hopwood
a0f477618d misc/build_helpers/gen-package-table.py: show Python 2.6 as unsupported on Windows.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2013-09-09 23:18:18 +01:00
Zooko O'Whielacronx
52571f469e add alternating grey-background to make it easier to scan across the table left to right 2012-10-08 12:08:50 -07:00
Zooko O'Whielacronx
63b24152a7 link from the tahoe-lafs-dep-eggs/README.html to the relevant wiki pages 2012-10-08 10:49:42 -07:00
Brian Warner
488b6f8ccd test-dont-use-too-old-dep.py: fix tarfile timestamps
It turns out that TarFile.addfile() doesn't provide a reasonable default
timestamp, resulting in files dated to 1970 (they're probably wearing
bell-bottoms and listening to disco too). Then, when the bdist_egg command
tries to create a *zip*file with those files, it explodes because zipfiles
cannot handle timestamps before 1980 (it prefers boomboxes and jackets with
straps on the shoulders, thank you very much).

This puts a modern time.time() on the members of the tarfile, allowing future
cryptocoderarchaeologists the opportunity to make fun of fashion trends from
the user's chosen era, rather than an artificially older one.

refs #1342
2012-05-12 23:34:03 -07:00
Zooko
d867765604 modify build_helpers files
Should close #1342. This makes the actual changes to the two test
files (separated from the 'rename' patch to avoid VC complications).
2012-05-12 20:47:24 -07:00
Zooko
533e4bc813 rename build_helpers files
This is from the darcs patch for #1342, which failed to apply on my darcs
tree, so I'm landing it from git. I'm landing the rename-files part
separately from the modify-those-files part to avoid VC complications.
2012-05-12 20:47:01 -07:00
david-sarah
c7038d1807 misc/build_helpers/show-tool-versions.py: s/print_stderr/print_stdout/ 2012-04-01 02:28:26 +00:00
Zooko O'Whielacronx
4ead889f03 setup: show-tool-versions: report cl only on windows, report buildslave, git, openssl, and lzip, but not 7za 2012-04-01 00:59:25 +00:00