Skip to content

Update URL parsing regexes and tests#13411

Merged
adamjstewart merged 8 commits intospack:developfrom
adamjstewart:fixes/url-parsing
Oct 29, 2019
Merged

Update URL parsing regexes and tests#13411
adamjstewart merged 8 commits intospack:developfrom
adamjstewart:fixes/url-parsing

Conversation

@adamjstewart
Copy link
Copy Markdown
Member

@adamjstewart adamjstewart commented Oct 24, 2019

@tgamblin this is what happens when I get triggered 😛

Before

$ spack url summary
==> Generating a summary of URL parsing in Spack...

    Total URLs found:          3479
    Names correctly parsed:    3047/3479 (87.58%)
    Versions correctly parsed: 3161/3479 (90.86%)

After

$ spack url summary
==> Generating a summary of URL parsing in Spack...

    Total URLs found:          3465
    Names correctly parsed:    3193/3465 (92.15%)
    Versions correctly parsed: 3252/3465 (93.85%)

Copy link
Copy Markdown
Member

@tgamblin tgamblin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor change request because I'm triggered by that prefix removal copypasta. Otherwise LGTM!


version(
"19.0.4-linux-rhel6-x86_64",
"19.0.4-Redhat-6.0-x86_64",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is kind of an unfortunate change in convention.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought about it, and decided that when we add a when= parameter to the version() directive, all of these will become 19.0.4 anway, so it didn't really matter what we called the version. I can revert this package if you want, I don't really care.

@adamjstewart adamjstewart merged commit 2264e30 into spack:develop Oct 29, 2019
@adamjstewart adamjstewart deleted the fixes/url-parsing branch October 29, 2019 01:28
jrmadsen pushed a commit to jrmadsen/spack that referenced this pull request Oct 30, 2019
* Update URL parsing regexes and tests

* Get rid of no longer used README

* Merge py-udunits and py-cf-units

* netcdf -> netcdf-c

* setup_environment -> setup_*_environment

* Fix doc tests

* Few last minute fixes

* Simplify prefix removal copypasta
SteVwonder added a commit to SteVwonder/spack that referenced this pull request Nov 2, 2019
In spack#13411, `setup_environment` was split into `setup_build_environment`
and `setup_run_environment`, with the `spack_env` and `run_env`
arguments being changed to `env`.  Somehow the flux package was the only
one to not have its `spack_env` references in the function changed to
`env`.
SteVwonder added a commit to SteVwonder/spack that referenced this pull request Nov 2, 2019
In spack#13411, `setup_environment` was split into `setup_build_environment`
and `setup_run_environment`, with the `spack_env` and `run_env`
arguments being changed to `env`.  Somehow the flux package was the only
one to not have its `spack_env` references in the function changed to
`env`.
SteVwonder added a commit to SteVwonder/spack that referenced this pull request Nov 4, 2019
In spack#13411, `setup_environment` was split into `setup_build_environment`
and `setup_run_environment`, with the `spack_env` and `run_env`
arguments being changed to `env`.  Somehow the flux package was the only
one to not have its `spack_env` references in the function changed to
`env`.
adamjstewart pushed a commit that referenced this pull request Nov 4, 2019
* flux: add `url_for_version` to support their C4 repo model

Flux uses a fork of ZeroMQ's Collective Code Construction Contract
(https://github.com/flux-framework/rfc/blob/master/spec_1.adoc).
This model requires a repository fork for every stable release that has
patch releases.  For example, 0.8.0 and 0.9.0 are both tags within the
main repository, but 0.8.1 and 0.9.5 would be releases on the v0.8 and
v0.9 forks, respectively.

* flux: add latest versions

* flux: remove master from `when=@0.X:,master` statements

Now that #1983 has been merged, master > 0.X.0.

* flux-core: remove extraneous `99` patch version in `when` range

Replace `when=@:0.11.99` with `when=@:0.11` since the intention is to
include all patch versions of `0.11`.

* flux-core: fix `setup_build_environment` after changes in #13411

In #13411, `setup_environment` was split into `setup_build_environment`
and `setup_run_environment`, with the `spack_env` and `run_env`
arguments being changed to `env`.  Somehow the flux package was the only
one to not have its `spack_env` references in the function changed to
`env`.

* flux: add runtime environment variables that Flux checks

with older versions of Flux (i.e, 0.0:0.13), FLUX_CONNECTOR_PATH must be
set by spack to prevent failures in certain
scenarios (flux-framework/flux-core#2456).

the flux binary also sets some other environment variables, which can be
listed by running `flux -v start`.  I added a few of those just to be
sure that the Spack-installed paths are used, rather than
system-installed ones.

* flux: add optional testing dependencies to maximize test coverage

Install optional dependencies to ensure that only spack-installed
software is detected and that all tests are run when `spack install
--test` is used.

Flux's test suite will test for the existance of valgrind, jq, and any
MPI installation.  If it detects them (even if they are system-installed
and outside the spack environment), it will run optional tests against
them.  I noticed on my machine that the valgrind tests were running
against the system-install valgrind.

* flux-sched: switch to new `setup_run_environment` API
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants