Commit Graph
94 Commits
Author SHA1 Message Date
Mason b637c7575a Modified test script calls 2018-11-01 20:15:56 -07:00
Nicola Soranzo 00632a5295 Fix `expr: non-integer argument error when running make`
when `VERSION_MINOR` in `lib/galaxy/version.py` is e.g. `rc1`.

Also:
- Do not require awk
- Remove unused functions
- Do not require the presence of `~/.github.json` file
2018-10-24 01:03:57 +01:00
John Chilton 1b90d89814 Mocha based client unit testing of rule tests. 2018-04-13 12:21:29 -04:00
Dannon Baker fefd686b29 Increase yarn's network timeout 2018-04-09 15:10:40 -04:00
Nicola Soranzo c9881fdc5c Merge branch 'release_18.01' into dev 2018-04-03 10:54:48 +01:00
Dannon Baker 4d742c3b13 Clarify make targets, update client/README 2018-03-28 10:28:54 -04:00
Dannon Baker 8330bbfe99 Drop old charts building from makefile/package scripts -- this is no longer necessary and charts are individually packed. 2018-03-20 11:50:01 -04:00
Dannon Baker e13740a3f6 Drop short-lived 'make client-production' warning from build scripts, since we're not including these moving forward. 2018-02-12 13:39:08 -05:00
Nicola Soranzo 6f2a0cceb0 Unify config-rebuild Makefile targets
Rebuild reports sample and RST from schema with the new Makefile target.
2018-02-08 10:16:58 -05:00
Nate Coraor 44c291bc66 Merge remote-tracking branch 'origin/dev' into ini_to_yaml_config 2018-01-18 12:30:05 -05:00
Dannon Baker 57090c0e73 Ugh, yern->yarn (was using yern to test the failure of the command, left in this debug switch...) 2018-01-03 17:39:04 -05:00
Dannon Baker a3b575644c Add extra help output in Makefile for when Yarn isn't found. 2018-01-03 17:36:24 -05:00
John Chilton 8a9dc5907d yaml_config - Add entry points (e.g. Makefile) for dealing with Galaxy YAML configs. 2017-12-06 20:28:20 -05:00
Dannon Baker 1c30a850af Add a better client commit warning to the Makefile. 2017-11-29 13:57:33 -05:00
Dannon Baker 9626350168 Makefile targets, and somehow we had a gruntfile map in the repo from ancient times. 2017-11-29 13:04:25 -05:00
Dannon Baker 0417699825 Merge remote-tracking branch 'upstream/dev' into maps_for_developer_only 2017-11-29 12:54:04 -05:00
John Chilton d868ffd08b Improved qunit testing options.
- Speed up qunit testing but not re-building production bundles that aren't used anyway.
- Add a watch option for qunit.
- Add option to speed up running all tests by building tests as single bundle instead of many bundles. (May be future default for ``make client-test``.)

This is as close as I think we are going to get to closing #4843.
2017-11-24 10:01:56 -05:00
John Chilton f2b6af6ef9 Guess we need to build full client before webpack for qunit? 2017-11-24 07:33:13 -05:00
John Chilton 4b20acbed1 Fix client-test Makefile target. 2017-11-23 13:57:55 -05:00
Dannon Baker 3c0ffb0ce9 Separate dev and production builds. 2017-11-22 13:05:24 -05:00
John Chilton 00147bafc7 Run qunit tests under Karma. 2017-11-16 23:43:57 -05:00
Dannon Baker 1b0e89a445 Minor reorg in makefile to group client targets in order 2017-11-02 11:56:37 -04:00
Dannon Baker 000b3c08c3 Merge remote-tracking branch 'upstream/dev' into es6imports 2017-11-02 11:20:45 -04:00
John Chilton 1b0ccf641c Use pipenv to generate development dependencies.
- Rework pattern for linting dependencies to work for dev-requirements.txt.
- Get rid of dev-requirements.txt and replace it with a symbolic link to the latest pinned versions of dependencies.

Rebased against dev to bring in @nsoranzo's bashism bashings in #4876 and fixed up to strip trailing whitespace from generated requirement files.
2017-11-01 21:21:30 -04:00
Dannon Baker 6f2c899d76 Merge remote-tracking branch 'upstream/dev' into es6imports 2017-11-01 14:21:12 -04:00
John Chilton 842b1af60e Add Makefile target for formatting client code. 2017-11-01 13:58:57 -04:00
John Chilton ccb5f61845 Absolute pins on linting dependencies.
- Use completely pinned and hashed dependencies for more consistent, reproducible linting.
- Leverage the awesomeness of pipenv to automate updating these.
- These will always be locked now so builds don't break randomly on other people updating their software. When we finally have the bot up and running that forward merges fixes for Galaxy we can add another if statement that runs this check against dev once a day and opens a PR if needed.
2017-10-26 15:53:25 -04:00
Martin Cech 862212ad40 Merge pull request #4788 from jmchilton/check_dependencies
Include check for updates to dependencies in tox, Makefile, Travis.
2017-10-26 14:48:55 -04:00
Dannon Baker 078b431cdc Remove another target from the Makefile, shepherding people into fewer entrypoints for client build. 2017-10-17 10:00:25 -04:00
Dannon Baker 23db8e7109 Remove Makefile cruft; we'll never want to execute webpack directly from here. 2017-10-16 10:46:17 -04:00
Dannon Baker f6b2e1b92c Roll charts building into package scripts, simplify makefile. 2017-10-16 10:44:21 -04:00
Dannon Baker 4df90df0d1 Force yarn to check-files. This is fast, anyway, and prevents confusion when switching between branches and having differing (sometimes missing) node_modules like gulp, etc. 2017-10-16 10:02:58 -04:00
Dannon Baker f0bf022658 Client-watch does depend on node-deps 2017-10-13 12:46:28 -04:00
Dannon Baker 731a9a6d3e Client-develop -> client-watch, style is built into build and has a package.json target if anyone really needs it. 2017-10-12 15:55:24 -04:00
Dannon Baker 70ef389554 Trim client make targets 2017-10-12 15:52:56 -04:00
Dannon Baker 34749b0440 All libs moving forward are installed by yarn, this endpoint is not to be used. 2017-10-12 14:30:59 -04:00
John Chilton fa178108d6 Include check for updates to dependencies in tox and Makefile. 2017-10-10 15:13:10 -04:00
Dannon Baker 18084224ad Swap from npm to yarn for the js package manager. 2017-08-16 18:51:12 -04:00
Dannon Baker 0d2beb2850 Merge remote-tracking branch 'upstream/dev' into es6 2017-08-15 14:32:05 -04:00
John Chilton 4945f55e4f Makefile shortcuts for configuration script. 2017-08-10 13:15:31 -04:00
Dannon Baker 6940a3b72b Merge remote-tracking branch 'upstream/dev' into es6 2017-08-01 10:45:03 -04:00
Dannon Baker f13097f623 Consolidate and parallelize 'make client' actions. Fast and functional now. 2017-05-04 16:21:40 -04:00
Dannon Baker 0df18b86eb Update 'make client' to use gulp for supported tasks. 2017-05-04 16:07:25 -04:00
John Chilton f78b5709a5 Simplify RC creation in Makefile.
These commands fail without any harm and then prevent the important echo statements from printing that follow them.
2017-05-02 15:02:31 -04:00
Martin Cech 7edfe39f20 fix makefile help for docs
thanks nsoranzo
2017-04-26 15:10:04 -04:00
Martin Cech d42fc9ae71 Merge branch 'dev' into fix_documentation_build 2017-04-26 14:23:38 -04:00
Martin Cech 647b4901c3 move reqs to dev-requirements and touch makefile 2017-04-26 14:19:04 -04:00
Dannon Baker 07502bbfbc Babel transpiling for all gulped files. 2017-04-06 15:07:59 -04:00
Dannon Baker e93eff3507 Fix requirement for webpack Makefile task. 2017-04-05 23:29:39 -04:00
Dannon Baker 21bc58b227 Webpack makefile targets, webpack-dev-watch npm script. 2017-04-05 21:37:16 -04:00