Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update outdated dependencies #829

Merged
merged 9 commits into from
Dec 3, 2021
Merged

Conversation

remi-dupre
Copy link
Contributor

@remi-dupre remi-dupre commented Dec 2, 2021

This takes parts of a larger effort to unify all dependencies in mimirsbrunn, a few notes here:

@datanel
Copy link
Member

datanel commented Dec 2, 2021

The tests fail because we use proj 7.2.1 but the crate proj:0.24 requires proj >= 8.1.0

Should we upgrade the version of proj in the docker image ? @woshilapin @pbougue

@woshilapin
Copy link
Contributor

The tests fail because we use proj 7.2.1 but the crate proj:0.24 requires proj >= 8.1.0

Should we upgrade the version of proj in the docker image ? @woshilapin @pbougue

I think we can take the opportunity to upgrade to Proj:8.1.0 (which is the version for the crate proj:0.24.0). I'm trying to update https://github.com/CanalTP/ci-images for that. I'll keep you posted how it goes.

@woshilapin
Copy link
Contributor

woshilapin commented Dec 2, 2021

Might need https://github.com/CanalTP/ci-images/pull/32 to be merged and released first but this should help us land your PR with a upgraded version of proj.

@woshilapin
Copy link
Contributor

woshilapin commented Dec 2, 2021

New docker images for the CI have been updated and released with Proj:8.1.0 inside. I've made a small PR on top of your branch that should make transit_model aware of these new images (I hope I didn't forget anything).

Note that by a happy coincidence, the new Docker image was build just after rust:1.57.0 as released. This mean you might have new clippy warnings showing up to fix (our CI check for clippy warnings).

@datanel
Copy link
Member

datanel commented Dec 3, 2021

@remi-dupre there is still some tests failing but I can push a fix if you want

@remi-dupre
Copy link
Contributor Author

I should be fined, I initially missed the all-targets --all-features parameters and a few system dependencies (proj, clang) as I've just received a new laptop for work.

@datanel
Copy link
Member

datanel commented Dec 3, 2021

I should be fined, I initially missed the all-targets --all-features parameters and a few system dependencies (proj, clang) as I've just received a new laptop for work.

Just execute make test

@remi-dupre
Copy link
Contributor Author

I still have some failing tests on my side, I wonder if it comes from the update of proj?

---- test_write_netex_france_from_gtfs stdout ----
thread 'test_write_netex_france_from_gtfs' panicked at 'assertion failed: `(left == right)`

Diff < left / right > :
 [
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>",
     "<PublicationDelivery version=\"1.09:FR-NETEX_ARRET-2.1-1.0\" xmlns=\"http://www.netex.org.uk/netex\" xmlns:core=\"http://www.govtalk.gov.uk/core\" xmlns:gml=\"http://www.opengis.net/gml/3.2\" xmlns:ifopt=\"http://www.ifopt.org.uk/ifopt\" xmlns:siri=\"http://www.siri.org.uk/siri\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.netex.org.uk/netex\">",
     "\t<PublicationTimestamp>2019-04-03T17:19:00+00:00</PublicationTimestamp>",
     "\t<ParticipantRef>Participant</ParticipantRef>",
     "\t<dataObjects>",
     "\t\t<GeneralFrame id=\"FR:GeneralFrame:NETEX_ARRET:\" version=\"any\">",
     "\t\t\t<members>",
     "\t\t\t\t<Quay id=\"FR:Quay:GDLR:\" version=\"any\">",
     "\t\t\t\t\t<Name>Gare de Lyon (RER)</Name>",
     "\t\t\t\t\t<Centroid>",
     "\t\t\t\t\t\t<Location>",
<    "\t\t\t\t\t\t\t<gml:pos srsName=\"EPSG:2154\">653983.726554971 6860704.890453682</gml:pos>",
>    "\t\t\t\t\t\t\t<gml:pos srsName=\"EPSG:2154\">653983.726554971 6860704.890453683</gml:pos>",
     "\t\t\t\t\t\t</Location>",
     "\t\t\t\t\t</Centroid>",
     "\t\t\t\t\t<AccessibilityAssessment id=\"FR:AccessibilityAssessment:GDLR_0:\" version=\"any\">",
     "\t\t\t\t\t\t<MobilityImpairedAccess>partial</MobilityImpairedAccess>",
[...]
     "\t\t\t\t\t<Centroid>",
     "\t\t\t\t\t\t<Location>",
<    "\t\t\t\t\t\t\t<gml:pos srsName=\"EPSG:2154\">650223.8079440364 6860484.10406642</gml:pos>",
>    "\t\t\t\t\t\t\t<gml:pos srsName=\"EPSG:2154\">650223.8079440364 6860484.104066422</gml:pos>",
     "\t\t\t\t\t\t</Location>",
     "\t\t\t\t\t</Centroid>",
     "\t\t\t\t\t<TransportMode>bus</TransportMode>",
     "\t\t\t\t\t<StopPlaceType>busStation</StopPlaceType>",
     "\t\t\t\t</StopPlace>",
     "\t\t\t</members>",
     "\t\t</GeneralFrame>",
     "\t</dataObjects>",
     "</PublicationDelivery>",
 ]

', /home/remi/code/navitia/transit_model/src/test_utils.rs:125:9

@datanel
Copy link
Member

datanel commented Dec 3, 2021

I still have some failing tests on my side, I wonder if it comes from the update of proj?

---- test_write_netex_france_from_gtfs stdout ----
thread 'test_write_netex_france_from_gtfs' panicked at 'assertion failed: `(left == right)`

Diff < left / right > :
 [
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>",
     "<PublicationDelivery version=\"1.09:FR-NETEX_ARRET-2.1-1.0\" xmlns=\"http://www.netex.org.uk/netex\" xmlns:core=\"http://www.govtalk.gov.uk/core\" xmlns:gml=\"http://www.opengis.net/gml/3.2\" xmlns:ifopt=\"http://www.ifopt.org.uk/ifopt\" xmlns:siri=\"http://www.siri.org.uk/siri\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.netex.org.uk/netex\">",
     "\t<PublicationTimestamp>2019-04-03T17:19:00+00:00</PublicationTimestamp>",
     "\t<ParticipantRef>Participant</ParticipantRef>",
     "\t<dataObjects>",
     "\t\t<GeneralFrame id=\"FR:GeneralFrame:NETEX_ARRET:\" version=\"any\">",
     "\t\t\t<members>",
     "\t\t\t\t<Quay id=\"FR:Quay:GDLR:\" version=\"any\">",
     "\t\t\t\t\t<Name>Gare de Lyon (RER)</Name>",
     "\t\t\t\t\t<Centroid>",
     "\t\t\t\t\t\t<Location>",
<    "\t\t\t\t\t\t\t<gml:pos srsName=\"EPSG:2154\">653983.726554971 6860704.890453682</gml:pos>",
>    "\t\t\t\t\t\t\t<gml:pos srsName=\"EPSG:2154\">653983.726554971 6860704.890453683</gml:pos>",
     "\t\t\t\t\t\t</Location>",
     "\t\t\t\t\t</Centroid>",
     "\t\t\t\t\t<AccessibilityAssessment id=\"FR:AccessibilityAssessment:GDLR_0:\" version=\"any\">",
     "\t\t\t\t\t\t<MobilityImpairedAccess>partial</MobilityImpairedAccess>",
[...]
     "\t\t\t\t\t<Centroid>",
     "\t\t\t\t\t\t<Location>",
<    "\t\t\t\t\t\t\t<gml:pos srsName=\"EPSG:2154\">650223.8079440364 6860484.10406642</gml:pos>",
>    "\t\t\t\t\t\t\t<gml:pos srsName=\"EPSG:2154\">650223.8079440364 6860484.104066422</gml:pos>",
     "\t\t\t\t\t\t</Location>",
     "\t\t\t\t\t</Centroid>",
     "\t\t\t\t\t<TransportMode>bus</TransportMode>",
     "\t\t\t\t\t<StopPlaceType>busStation</StopPlaceType>",
     "\t\t\t\t</StopPlace>",
     "\t\t\t</members>",
     "\t\t</GeneralFrame>",
     "\t</dataObjects>",
     "</PublicationDelivery>",
 ]

', /home/remi/code/navitia/transit_model/src/test_utils.rs:125:9

yes it comes from proj, good luck 😜

@datanel
Copy link
Member

datanel commented Dec 3, 2021

@remi-dupre I already have the fix about proj, I can push it if want

@remi-dupre
Copy link
Contributor Author

@remi-dupre I already have the fix about proj, I can push it if want

Sure! Go for it, I'm not used to work with proj so I may have struggled (I was at the step of manually installing proj as latest available version from arch repositories is still 8.0).

@remi-dupre
Copy link
Contributor Author

Thanks for the help with the rough corners!

@woshilapin
Copy link
Contributor

@remi-dupre I already have the fix about proj, I can push it if want

Sure! Go for it, I'm not used to work with proj so I may have struggled (I was at the step of manually installing proj as latest available version from arch repositories is still 8.0).

With almost every update we made with proj we had to fix our tests. If you don't know proj, it's basically for playing with and converting geolocations from one system of projection to another. But it seems that with proj updates comes some improvement in their conversion system (more precise, adjusting for evolution of tectonic or whatever): therefore, some conversion change results slightly (and break our tests).

Copy link
Contributor

@woshilapin woshilapin left a comment

Choose a reason for hiding this comment

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

Seems good. Thank you very much for pulling out al this work.

@woshilapin woshilapin merged commit c95cddd into hove-io:master Dec 3, 2021
@datanel datanel mentioned this pull request Jan 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants