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

Remove Tuple10 to Tuple22, Const, Eval, computation blocks, and arrow-continuations #2784

Merged
merged 20 commits into from
Jan 12, 2023

Conversation

serras
Copy link
Member

@serras serras commented Aug 2, 2022

No description provided.

@serras serras requested a review from a team August 2, 2022 15:15
@serras serras self-assigned this Aug 2, 2022
@serras serras mentioned this pull request Aug 2, 2022
20 tasks
@nomisRev
Copy link
Member

nomisRev commented Aug 3, 2022

🔥

@nomisRev nomisRev added the 2.0.0 Tickets / PRs belonging to Arrow 2.0 label Aug 3, 2022
@serras serras changed the title Remove Tuple10 to Tuple22, Const, and Eval Remove Tuple10 to Tuple22, Const, Eval, computation blocks, and test modules Aug 3, 2022
@serras serras marked this pull request as draft August 3, 2022 10:58
@serras serras marked this pull request as ready for review August 3, 2022 17:34
@serras serras marked this pull request as draft August 3, 2022 17:34
Copy link
Member

@raulraja raulraja left a comment

Choose a reason for hiding this comment

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

thanks @serras !

@serras serras mentioned this pull request Aug 9, 2022
Copy link
Member

@i-walker i-walker left a comment

Choose a reason for hiding this comment

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

Thanks @serras ! 🙌🏾

@serras serras marked this pull request as ready for review September 14, 2022 09:05
@serras
Copy link
Member Author

serras commented Dec 5, 2022

The JS and Native builds are failing because they expect arrow-continuations, but this is in fact one of the things removed by this PR.

e: Could not find "io.arrow-kt:arrow-continuations" in [/Users/serras/arrow/arrow, /Users/serras/.konan/klib, /Users/serras/.konan/kotlin-native-prebuilt-macos-x86_64-1.7.22/klib/common, /Users/serras/.konan/kotlin-native-prebuilt-macos-x86_64-1.7.22/klib/platform/ios_simulator_arm64]

I expected the problem to go away by excluding arrow-core from the dependencies of kotest-extensions-arrow, thinking that it would also exclude anything based on it. But I guess my assumption was wrong...

@nomisRev
Copy link
Member

nomisRev commented Dec 5, 2022

I am unsure we can rely on the kites extension for Arrow in the 2.x.x since they're build using 1.x.x, and both versions are not compatible.. 🤔

@serras
Copy link
Member Author

serras commented Dec 5, 2022

I guess I’ll have to revert the removal of the test modules, then.

@nomisRev
Copy link
Member

nomisRev commented Dec 6, 2022

@serras if you want I can decouple them in 1.x.x, and we can merge that to 2.x.x

@serras
Copy link
Member Author

serras commented Dec 6, 2022

Wouldn’t we have the same problem? We cannot depend on the test module until there’s a 2.x-compatible version, right?

@serras
Copy link
Member Author

serras commented Dec 6, 2022

Another option would be to stop depending on things like ArrowFxSpec, but keep the few utilities and generators in commonTest for each project.

@nomisRev
Copy link
Member

nomisRev commented Dec 6, 2022

Wouldn’t we have the same problem? We cannot depend on the test module until there’s a 2.x-compatible version, right?

I mean stop relying on the test-module entirely. So decouple the test-module from Arrow Core, to avoid the circular dependency.

Another option would be to stop depending on things like ArrowFxSpec, but keep the few utilities and generators in commonTest for each project.

So doing this yes. ArrowFxSpec was originally brought to live mostly to introduce iterations properties, but this can also be globally overwritten through AbstractKotestProject. Limiting the_depth_ of lists should probably become explicitly where needed only.

@serras serras changed the title Remove Tuple10 to Tuple22, Const, Eval, computation blocks, and test modules Remove Tuple10 to Tuple22, Const, Eval, computation blocks, and arrow-continuations Dec 29, 2022
@serras
Copy link
Member Author

serras commented Dec 29, 2022

@nomisRev @i-walker @raulraja this is now really ready to be merged, I've managed to remove the dependency on the tests on main, and take the whole thing up to here

Copy link
Member

@nomisRev nomisRev left a comment

Choose a reason for hiding this comment

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

Looking great overall. Wondering why the iteration count was dropped from 1000 to 10 in Arrow Optics.

gradle.properties Outdated Show resolved Hide resolved
@serras serras merged commit 39e326f into arrow-2 Jan 12, 2023
@serras serras deleted the removed-in-arrow-2 branch January 12, 2023 13:15
@nomisRev
Copy link
Member

Thanks @serras 🙌 That was a big chunk.

nomisRev added a commit that referenced this pull request Apr 24, 2024
* The beginning of Arrow 2.0

* Resource Arrow 2.0 (#2786)

* Flatten Resource ADT, maintain API

* [Arrow 2.0] Effect without suspending shift (#2797)

* Shift without suspend, inline all the rest
* Add new error handlers signatures
* Make ShiftCancellationException private

* Rename Shift to Raise according to Slack Poll, and add some initial docs (#2827)

* Remove all references to shift from new Arrow 2.0 code (#2834)

* Remove all references to shift from new code

* Update API files

* Fixes merge conflict between main and arrow-2 (#2835)

* Add Resource.allocated() to decompose Resource into it's allocate and… (#2820)
* [2743] Migrate internal use of CircuitBreaker double to duration (#2748)
* Fix typo (#2824)
* Make the server disconnect test more general (#2822)
* Update NonEmptyList.fromList deprecation to suggest `toOption()` instead (#2832)
* Improve Either.getOrHandle() docs (#2833)
* Improve allocated, and fix knit examples
Co-authored-by: Jeff Martin <[email protected]>
Co-authored-by: Martin Moore <[email protected]>
Co-authored-by: valery1707 <[email protected]>
Co-authored-by: Lukasz Kalnik <[email protected]>
Co-authored-by: stylianosgakis <[email protected]>

* Add Atomic module, and StateShift (#2817)

* Two small deprecations

* Add Atomic module, and StateShift. Implement ior through StateShift

* Fix build

* Fix atomic knit

* Fix knit attempt #2

* Update API files

* Remove references to shift

* Change return type of raise to Nothing (#2839)

* Change return type of raise to Nothing

Implements #2805

* Update public api with ./gradlew apiDump

* Suppress warnings for unreachable calls to fail in tests

The test is verifying that no code will be executed after a call to
raise, so it's actually testing the very behaviour that the compiler is
warning us about.

Co-authored-by: Alejandro Serrano <[email protected]>

* Update API files

* Increase timeout

* Fix compiler bug with nested inline + while + return

* Clean up ExitCase.fromError

* Update API files@

* Feature/remove validated (#2795)

Co-authored-by: Simon Vergauwen <[email protected]>
Co-authored-by: Alejandro Serrano <[email protected]>

* Remove CancellationExceptionNoTrace.kt after merge, and run apiDump

* Add missing runnerJUnit5 for arrow-atomic JVM

* Publish Arrow 2.0.0-SNAPSHOT (#2871)

Co-authored-by: Javier Segovia Córdoba <[email protected]>

* Simplify optics to Traversal/Optional/Lens/Prism (#2873)

* 'mapOrAccumulate' for Raise (#2872)

Co-authored-by: Simon Vergauwen <[email protected]>

* Fix problems with Atomic

* Smaller timeouts

* Remove Tuple10 to Tuple22, Const, Eval, computation blocks, and arrow-continuations (#2784)

* Revert typo

* Fix build

* Fix ParMapJvmTest

* Implement NonEmptyList using value class (#2911)

* Fix merge w.r.t. Saga

* apiDump

* Test other return expression

* change unalign signature (#2972)

see discussion in
#2960 (comment)
#2960 (comment)

---------

Co-authored-by: Alejandro Serrano <[email protected]>

* Update after merge main

* Fix :arrow-optics-ksp-plugin:compileKotlin

* Fix Every instances

* Move functions to arrow functions (#3014)

* Bring back `Iso` (#3013)

* Bring back Iso

* API Dump

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update BOM (#3019)

* Fix andThen duplication (#3020)

* Fix Knit

* Fix weird problem with value classes

* Update API docs

* Update publish workflow

Following the instructions in #3090 (comment)

* No closing repo on snapshot

* knit

* Fix optics tests

* Fix after merge

* Refactor ParMapTest from Kotest Plugin to Kotlin-test runtime #3191 (#3221)

Co-authored-by: Simon Vergauwen <[email protected]>
Co-authored-by: Alejandro Serrano <[email protected]>

* Refactor: Use Kotlin-test runtime for arrow-fx-stm tests (#3224)

Co-authored-by: Alejandro Serrano <[email protected]>

* Update all Gradle files to mention kotlin.test

* Refactor ParZip2Test from Kotest Plugin to Kotlin-test runtime #3192 (#3222)

Co-authored-by: Alejandro Serrano <[email protected]>

* Refactor ParZip3Test from Kotest Plugin to Kotlin-test runtime #3193 (#3223)

Co-authored-by: Alejandro Serrano <[email protected]>

* Refactor GuaranteeCaseTest to use kotlin test (#3226)

Closes #3190

* refactor: migrate NotEmptySetTest to kotlin-test (#3230)

Co-authored-by: Alejandro Serrano <[email protected]>

* refactor: migrate EagerEffectSpec to kotlin-test (#3233)

Co-authored-by: Alejandro Serrano <[email protected]>

* Refactor NullableSpec from Kotest Plugin to Kotlin-test runtime (#3236)

#3153

Co-authored-by: Alejandro Serrano <[email protected]>

* Refactor BracketCaseTest to use kotlin test (#3237)

Closes #3186

Co-authored-by: Alejandro Serrano <[email protected]>

* Move arrow-functions tests to kotlin.test (#3243)

* Inline `AtomicBoolean` (#3240)

* Inline AtomicBoolean

* Update API files

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* refactor: migrate MappersSpec to kotlin-test (#3248)

* Refactor ResourceTestJvm from Kotest Plugin to Kotlin-test runtime (#3244)

Closes #3213

* refactor: migrate FlowJvmTest to Kotlin-test (#3228)

* Refactor ParZip9JvmTest from Kotest Plugin to Kotlin-test runtime (#3245)

Closes #3211

* Refactor ParZip8JvmTest from Kotest Plugin to Kotlin-test runtime (#3246)

Closes #3210

* refactor: migrate NumberInstancesTest to kotlin-test (#3232)

* refactor: OptionTest to kotlin-test runtime (#3229)

* Revert "Inline `AtomicBoolean` (#3240)" (#3279)

This reverts commit a6f1e73.

* Refactor ParZip6JvmTest from Kotest Plugin to Kotlin-test runtime (#3255)

Closes #3208

* Refactor ParZip5JvmTest from Kotest Plugin to Kotlin-test runtime (#3256)

Closes #3207

* Refactor ParZip3JvmTest from Kotest Plugin to Kotlin-test runtime (#3258)

Closes #3205

* Refactor ParZip2JvmTest from Kotest Plugin to Kotlin-test runtime (#3259)

Closes #3204

* Refactor ParMapJvmTest from Kotest Plugin to Kotlin-test runtime (#3260)

Closes #3203

* Refactor ParZip4JvmTest from Kotest Plugin to Kotlin-test runtime (#3257)

Closes #3206

* refactor: migrate RaiseAccumulateSpec to kotlin-test (#3250)

* Refactor ParZip7JvmTest from Kotest Plugin to Kotlin-test runtime (#3247)

Closes #3209

Co-authored-by: Alejandro Serrano <[email protected]>

* Update ComparisonKtTest.kt (#3274)

Co-authored-by: Simon Vergauwen <[email protected]>

* Update OptionSpec.kt (#3271)

Co-authored-by: Simon Vergauwen <[email protected]>

* Update TraceJvmSpec.kt (#3276)

* Update TraceJvmSpec.kt

* Update TraceJvmSpec.kt

---------

Co-authored-by: Simon Vergauwen <[email protected]>

* Update ParZip9Test.kt (#3265)

* Update ParZip9Test.kt

* Update ParZip9Test.kt

* Update ParZip8Test.kt (#3266)

* Update ParZip7Test.kt (#3267)

* Update ParZip6Test.kt (#3268)

* Update ParZip5Test.kt (#3269)

* Update ParZip4Test.kt (#3270)

* Refactor CountDownLatchSpec and CyclicBarrierSpec to use kotlin test (#3227)

* Refactor CountDownLatchSpec to use kotlin test

Closes #3187

* Refactor CyclicBarrierSpec to use kotlin test

Closes #3188

---------

Co-authored-by: Alejandro Serrano <[email protected]>

* Refactor NonEmptyListTest to kotlin-test (#3231)

* Add kotlin test dependency

* Refactor NonEmptyList Test to use kotlin test

---------

Co-authored-by: Alejandro Serrano <[email protected]>

* refactor: migrate EffectSpec to kotlin-test (#3234)

* Refactor FlowTest to use kotlin test (#3238)

Closes #3189

Co-authored-by: Alejandro Serrano <[email protected]>

* refactor: migrate IorSpec to kotlin-test (#3249)

Co-authored-by: Simon Vergauwen <[email protected]>

* refactor: migrate ResultSpec to kotlin-test (#3251)

Co-authored-by: Simon Vergauwen <[email protected]>

* refactor: migrate StructuredConcurrencySpec to kotlin-test (#3252)

* refactor: migrate TraceSpec to kotlin-test (#3253)

* refactor: migrate GeneratorsTest to kotlin-test (#3254)

* Refactor RaceNJvmTest from Kotest Plugin to Kotlin-test runtime (#3261)

Closes #3212

Co-authored-by: Alejandro Serrano <[email protected]>

* Update ArrowResponseEAdapterTest.kt (#3264)

* Update ArrowResponseEAdapterTest.kt

* Update ArrowResponseEAdapterTest.kt

---------

Co-authored-by: Simon Vergauwen <[email protected]>
Co-authored-by: Alejandro Serrano <[email protected]>

* Update CollectionsSyntaxTests.kt (#3273)

* Update CollectionsSyntaxTests.kt

* Update CollectionsSyntaxTests.kt

---------

Co-authored-by: Simon Vergauwen <[email protected]>
Co-authored-by: Alejandro Serrano <[email protected]>

* Update NonFatalJvmTest.kt (#3277)

* Update ArrowEitherCallAdapterTest.kt (#3278)

* Update ArrowEitherCallAdapterTest.kt

* Update ArrowEitherCallAdapterTest.kt

* Move tests from `serialization` and `functions` completely to `kotlin.test` (#3289)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Fix problems with tests

* Remove a bunch of warnings in `arrow-2` (#3282)

Co-authored-by: serras <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Finish transition to `kotlin.test` of `retrofit` and `fx-coroutines` (#3291)

* Fix problems with concurrency in tests, take 8

* Port rest of `arrow-core` to `kotlin.test` (#3292)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Implement `fixedRate` using monotonic time source (#3294)

Co-authored-by: serras <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Port `optics` tests to `kotlin.test` (#3295)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Add or fix contracts in Raise (#3293)

* Add or fix contracts in Raise

* Make contracts less strict

* Get back contract on Either

* ignoreErrors should also be AT_MOST_ONCE

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Alternate `SingletonRaise` (#3328)

Co-authored-by: Youssef Shoaib <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: serras <[email protected]>

* Remove (unused) tests for high-arity module

* Fix tests + Knit

* Fix merge NullableSpec

* Regression in Arb.list?

* Fix test for nonEmptyList

* Develocity warning

* Fix merge problem with optics-ksp-plugin

* Fix timeout in test

---------

Co-authored-by: Simon Vergauwen <[email protected]>
Co-authored-by: Sam Cooper <[email protected]>
Co-authored-by: Marc Moreno Ferrer <[email protected]>
Co-authored-by: Javier Segovia Córdoba <[email protected]>
Co-authored-by: Alphonse Bendt <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Andreas Storesund Madsen <[email protected]>
Co-authored-by: molikuner <[email protected]>
Co-authored-by: Jonathan Lagneaux <[email protected]>
Co-authored-by: Marcus Ilgner <[email protected]>
Co-authored-by: Chris Black <[email protected]>
Co-authored-by: Tejas Mate <[email protected]>
Co-authored-by: HyunWoo Lee (Nunu Lee) <[email protected]>
Co-authored-by: serras <[email protected]>
Co-authored-by: Youssef Shoaib <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.0.0 Tickets / PRs belonging to Arrow 2.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants