Skip to content

Commit

Permalink
[Build] Drop 'prettyprinter-configurable' (#6699)
Browse files Browse the repository at this point in the history
  • Loading branch information
effectfully authored Nov 22, 2024
1 parent cf7650d commit 5eb80f3
Show file tree
Hide file tree
Showing 27 changed files with 3 additions and 2,187 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/plutus-tx-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,12 @@ jobs:
plutus/plutus-tx-plugin
plutus/plutus-core
plutus/plutus-ledger-api
plutus/prettyprinter-configurable
allow-newer:
plutus-tx
, plutus-tx-plugin
, plutus-core
, plutus-ledger-api
, prettyprinter-configurable
- name: Build Project With Docker
run: |
Expand Down
1 change: 0 additions & 1 deletion CONTRIBUTING.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,6 @@ We write changelogs for our versioned and published packages, which currently in
- plutus-ledger-api
- plutus-tx
- plutus-tx-plugin
- prettyprinter-configurable

To do this we use https://github.com/nedbat/scriv[`scriv`], a changelog management tool.

Expand Down
4 changes: 1 addition & 3 deletions RELEASE.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ The following packages are versioned and released:
* The main library `plutus-tx:plutus-tx`
- `plutus-tx-plugin`
* The main library `plutus-tx-plugin:plutus-tx-plugin`
- `prettyprinter-configurable`
* The main library `prettyprinter-configurable:prettyprinter-configurable`

== Version Scheme

Expand Down Expand Up @@ -79,7 +77,7 @@ This updates versions and version bounds, and assembles the changelogs.open a PR
- Click `Publish release`.
7. Open a PR in the https://github.com/IntersectMBO/cardano-haskell-packages[CHaP repository] for publishing the new version. +
If you are making PR from your own fork then don't forget to sync your fork with the upstream first. +
Run `./scripts/add-from-github.sh "https://github.com/IntersectMBO/plutus" COMMIT-SHA plutus-core plutus-ledger-api plutus-tx plutus-tx-plugin prettyprinter-configurable` (see https://github.com/IntersectMBO/cardano-haskell-packages#-from-github[the README on CHaP]). Example: https://github.com/IntersectMBO/cardano-haskell-packages/pull/764.
Run `./scripts/add-from-github.sh "https://github.com/IntersectMBO/plutus" COMMIT-SHA plutus-core plutus-ledger-api plutus-tx plutus-tx-plugin` (see https://github.com/IntersectMBO/cardano-haskell-packages#-from-github[the README on CHaP]). Example: https://github.com/IntersectMBO/cardano-haskell-packages/pull/764.
- If issues are found, create a release branch `release/x.y.z`, fix the issues on master, backport the fixes to `release/x.y.z`, tag `x.y.z.0-rc2`, and go to step 4.
- Why not just fix the issues on master and tag `x.y.z.0-rc2` from master?
It is desirable to minimize the amount of change between `rc1` and `rc2`, because it may reduce the tests and checks that need to be performed against `rc2`.
Expand Down
2 changes: 0 additions & 2 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ packages: cardano-constitution
plutus-tx
plutus-tx-plugin
plutus-tx-test-util
prettyprinter-configurable
doc/docusaurus/docusaurus-examples.cabal

-- We never, ever, want this.
Expand Down Expand Up @@ -89,7 +88,6 @@ allow-newer:
-- package cardano-constitution
-- flags: +force-build
-- allow-newer: *:plutus-ledger-api
-- allow-newer: *:prettyprinter-configurable
-- allow-older: *:nothunks

-- -------------------------------------------------------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion cardano-constitution/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@ This executable is disabled by default; to enable it, uncomment the related line
-- package cardano-constitution
-- flags: +force-build
-- allow-newer: *:plutus-ledger-api
-- allow-newer: *:prettyprinter-configurable
-- allow-older: *:nothunks
```

Expand Down
1 change: 0 additions & 1 deletion nix/project.nix
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ let
#plutus-metatheory.package.ghcOptions = "-Werror";
plutus-tx.ghcOptions = [ "-Werror" ];
plutus-tx-plugin.ghcOptions = [ "-Werror" ];
prettyprinter-configurable.ghcOptions = [ "-Werror" ];
};
})
];
Expand Down
4 changes: 2 additions & 2 deletions plutus-core/plutus-core.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ library
, nothunks ^>=0.2
, parser-combinators >=0.4.0
, prettyprinter >=1.1.0.1
, prettyprinter-configurable ^>=1.36
, prettyprinter-configurable
, primitive
, profunctors
, recursion-schemes
Expand Down Expand Up @@ -803,7 +803,7 @@ library plutus-core-testlib
, plutus-core ^>=1.36
, plutus-core:plutus-ir
, prettyprinter >=1.1.0.1
, prettyprinter-configurable ^>=1.36
, prettyprinter-configurable
, QuickCheck
, quickcheck-instances
, quickcheck-transformer
Expand Down
53 changes: 0 additions & 53 deletions prettyprinter-configurable/LICENSE

This file was deleted.

13 changes: 0 additions & 13 deletions prettyprinter-configurable/NOTICE

This file was deleted.

1 change: 0 additions & 1 deletion prettyprinter-configurable/README.md

This file was deleted.

1 change: 0 additions & 1 deletion prettyprinter-configurable/changelog.d/scriv.ini

This file was deleted.

87 changes: 0 additions & 87 deletions prettyprinter-configurable/prettyprinter-configurable.cabal

This file was deleted.

67 changes: 0 additions & 67 deletions prettyprinter-configurable/src/Text/Fixity.hs

This file was deleted.

Loading

1 comment on commit 5eb80f3

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark 'Plutus Benchmarks'.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 1.05.

Benchmark suite Current: 5eb80f3 Previous: cf7650d Ratio
validation-future-pay-out-3 488.3 μs 463.8 μs 1.05
validation-future-pay-out-4 733.1 μs 688.8 μs 1.06
validation-future-settle-early-1 228.6 μs 215.8 μs 1.06
validation-future-settle-early-2 487.7 μs 464.1 μs 1.05
validation-future-settle-early-3 512.2 μs 463.6 μs 1.10
validation-future-settle-early-4 554.2 μs 524 μs 1.06
validation-game-sm-success_1-2 195.8 μs 186.1 μs 1.05
validation-game-sm-success_1-3 576.9 μs 549.3 μs 1.05
validation-game-sm-success_1-4 229.2 μs 216.6 μs 1.06
validation-game-sm-success_2-4 229.4 μs 217.8 μs 1.05
validation-game-sm-success_2-6 229 μs 217.4 μs 1.05
validation-prism-3 344.6 μs 327.7 μs 1.05
validation-stablecoin_1-2 192.1 μs 182.5 μs 1.05
validation-stablecoin_1-5 1253 μs 1176 μs 1.07
validation-uniswap-1 494.4 μs 359.4 μs 1.38
validation-decode-future-increase-margin-4 873.7 μs 681.2 μs 1.28
validation-decode-game-sm-success_2-3 711.4 μs 644.5 μs 1.10
validation-decode-game-sm-success_2-4 231.2 μs 169.9 μs 1.36
validation-decode-game-sm-success_2-5 728 μs 585.4 μs 1.24
validation-decode-multisig-sm-2 752 μs 656.4 μs 1.15
validation-decode-multisig-sm-7 807.6 μs 601.7 μs 1.34
validation-decode-multisig-sm-8 808.6 μs 570.4 μs 1.42
validation-decode-multisig-sm-9 810.3 μs 571.4 μs 1.42
validation-decode-multisig-sm-10 809.2 μs 572.4 μs 1.41
validation-decode-ping-pong-1 678.3 μs 479.5 μs 1.41
validation-decode-pubkey-1 223.1 μs 164.2 μs 1.36
nofib-clausify/formula2 3764 μs 3539 μs 1.06
nofib-clausify/formula3 11370 μs 9731 μs 1.17
nofib-clausify/formula4 28510 μs 22770 μs 1.25
nofib-clausify/formula5 67440 μs 47410 μs 1.42
nofib-knights/4x4 23280 μs 16440 μs 1.42
nofib-knights/6x6 55170 μs 51460 μs 1.07
nofib-queens4x4/fc 17000 μs 12500 μs 1.36
nofib-queens5x5/bt 93180 μs 69020 μs 1.35
nofib-queens5x5/bm 94640 μs 70650 μs 1.34
nofib-queens5x5/bjbt1 101700 μs 80140 μs 1.27
nofib-queens5x5/bjbt2 94840 μs 78010 μs 1.22
marlowe-semantics/004025fd712d6c325ffa12c16d157064192992faf62e0b991d7310a2f91666b8 949.9 μs 779 μs 1.22
marlowe-semantics/0101010001010101010101000100010100000001010000010001000001000101 1230 μs 910.2 μs 1.35
marlowe-semantics/0101020201010201010200010102000201000201010102000102010201010000 393.8 μs 291.5 μs 1.35
marlowe-semantics/0101080808040600020306010000000302050807010208060100070207080202 976.4 μs 720.4 μs 1.36
marlowe-semantics/0104010200020000040103020102020004040300030304040400010301040303 1010 μs 743.1 μs 1.36
marlowe-semantics/04000f0b04051006000e060f09080d0b090d0104050a0b0f0506070f0a070008 958.1 μs 708.1 μs 1.35
marlowe-semantics/0543a00ba1f63076c1db6bf94c6ff13ae7d266dd7544678743890b0e8e1add63 1370 μs 1008 μs 1.36
marlowe-semantics/0705030002040601010206030604080208020207000101060706050502040301 1363 μs 999.1 μs 1.36
marlowe-semantics/07070c070510030509010e050d00040907050e0a0d06030f1006030701020607 1302 μs 958.2 μs 1.36
marlowe-semantics/0bcfd9487614104ec48de2ea0b2c0979866a95115748c026f9ec129384c262c4 1449 μs 1064 μs 1.36
marlowe-semantics/0be82588e4e4bf2ef428d2f44b7687bbb703031d8de696d90ec789e70d6bc1d8 1728 μs 1271 μs 1.36
marlowe-semantics/0f1d0110001b121d051e15140c0c05141d151c1f1d201c040f10091b020a0e1a 612.3 μs 449.5 μs 1.36
marlowe-semantics/119fbea4164e2bf21d2b53aa6c2c4e79414fe55e4096f5ce2e804735a7fbaf91 992.2 μs 733 μs 1.35
marlowe-semantics/12910f24d994d451ff379b12c9d1ecdb9239c9b87e5d7bea570087ec506935d5 637.8 μs 471.3 μs 1.35
marlowe-semantics/18cefc240debc0fcab14efdd451adfd02793093efe7bc76d6322aed6ddb582ad 969.9 μs 714.3 μs 1.36
marlowe-semantics/1a2f2540121f09321216090b2b1f211e3f020c2c133a1a3c3f3c232a26153a04 383.1 μs 289.3 μs 1.32
marlowe-semantics/1a573aed5c46d637919ccb5548dfc22a55c9fc38298d567d15ee9f2eea69d89e 1138 μs 840 μs 1.35
marlowe-semantics/1d56060c3b271226064c672a282663643b1b0823471c67737f0b076870331260 937.4 μs 751.6 μs 1.25
marlowe-semantics/238b21364ab5bdae3ddb514d7001c8feba128b4ddcf426852b441f9a9d02c882 391.9 μs 291.2 μs 1.35
marlowe-semantics/26e24ee631a6d927ea4fb4fac530cfd82ff7636986014de2d2aaa460ddde0bc3 710.1 μs 527.5 μs 1.35
marlowe-semantics/2797d7ac77c1b6aff8e42cf9a47fa86b1e60f22719a996871ad412cbe4de78b5 2450 μs 1861 μs 1.32
marlowe-semantics/28fdce478e179db0e38fb5f3f4105e940ece450b9ce8a0f42a6e313b752e6f2c 1233 μs 911.9 μs 1.35
marlowe-semantics/2cb21612178a2d9336b59d06cbf80488577463d209a453048a66c6eee624a695 1012.9999999999999 μs 747.4 μs 1.36
marlowe-semantics/2f58c9d884813042bce9cf7c66048767dff166785e8b5183c8139db2aa7312d1 976.5 μs 723 μs 1.35
marlowe-semantics/30aa34dfbe89e0c43f569929a96c0d2b74c321d13fec0375606325eee9a34a6a 1446 μs 1073 μs 1.35
marlowe-semantics/322acde099bc34a929182d5b894214fc87ec88446e2d10625119a9d17fa3ec3d 392.1 μs 291.3 μs 1.35
marlowe-semantics/331e4a1bb30f28d7073c54f9a13c10ae19e2e396c299a0ce101ee6bf4b2020db 590.7 μs 441 μs 1.34
marlowe-semantics/33c3efd79d9234a78262b52bc6bbf8124cb321a467dedb278328215167eca455 720.6 μs 587.8 μs 1.23
marlowe-semantics/383683bfcecdab0f4df507f59631c702bd11a81ca3841f47f37633e8aacbb5de 973.8 μs 724.3 μs 1.34
marlowe-semantics/3bb75b2e53eb13f718eacd3263ab4535f9137fabffc9de499a0de7cabb335479 393.4 μs 292.2 μs 1.35
marlowe-semantics/3db496e6cd39a8b888a89d0de07dace4397878958cab3b9d9353978b08c36d8a 1083 μs 807.9 μs 1.34
marlowe-semantics/44a9e339fa25948b48637fe7e10dcfc6d1256319a7b5ce4202cb54dfef8e37e7 394.9 μs 291.1 μs 1.36
marlowe-semantics/4c3efd13b6c69112a8a888372d56c86e60c232125976f29b1c3e21d9f537845c 1306 μs 964.8 μs 1.35
marlowe-semantics/4d7adf91bfc93cebe95a7e054ec17cfbb912b32bd8aecb48a228b50e02b055c8 899 μs 665 μs 1.35
marlowe-semantics/4f9e8d361b85e62db2350dd3ae77463540e7af0d28e1eb68faeecc45f4655f57 516.5 μs 383.7 μs 1.35
marlowe-semantics/52df7c8dfaa5f801cd837faa65f2fd333665fff00a555ce8c55e36ddc003007a 479.4 μs 351.5 μs 1.36
marlowe-semantics/53ed4db7ab33d6f907eec91a861d1188269be5ae1892d07ee71161bfb55a7cb7 489.6 μs 359.8 μs 1.36
marlowe-semantics/55dfe42688ad683b638df1fa7700219f00f53b335a85a2825502ab1e0687197e 393.2 μs 292.1 μs 1.35
marlowe-semantics/56333d4e413dbf1a665463bf68067f63c118f38f7539b7ba7167d577c0c8b8ce 981.1 μs 727 μs 1.35
marlowe-semantics/57728d8b19b0e06412786f3dfed9e1894cd0ad1d2bc2bd497ec0ecb68f989d2b 393.9 μs 290.8 μs 1.35
marlowe-semantics/5abae75af26f45658beccbe48f7c88e74efdfc0b8409ba1e98f95fa5b6caf999 623.8 μs 460.5 μs 1.35
marlowe-semantics/5d0a88250f13c49c20e146819357a808911c878a0e0a7d6f7fe1d4a619e06112 1245 μs 1002 μs 1.24
marlowe-semantics/f339f59bdf92495ed2b14e2e4d3705972b4dda59aa929cffe0f1ff5355db8d79 5870 μs 4719 μs 1.24
marlowe-semantics/ffdd68a33afd86f8844c9f5e45b2bda5b035aa02274161b23d57709c0f8b8de6 1214 μs 901.2 μs 1.35
marlowe-role-payout/0004000402010401030101030100040000010104020201030001000204020401 248 μs 184.4 μs 1.34
marlowe-role-payout/0100000100010000000001000100010101000101000001000000010000010000 335.8 μs 246.8 μs 1.36
marlowe-role-payout/0101000100000101010000010101000100010101000001000001000000010101 264 μs 194.1 μs 1.36
marlowe-role-payout/01dcc372ea619cb9f23c45b17b9a0a8a16b7ca0e04093ef8ecce291667a99a4c 220.6 μs 162.1 μs 1.36
marlowe-role-payout/0201020201020000020000010201020001020200000002010200000101010100 193.5 μs 180.9 μs 1.07
marlowe-role-payout/031d56d71454e2c4216ffaa275c4a8b3eb631109559d0e56f44ea8489f57ba97 215.5 μs 204.4 μs 1.05
marlowe-role-payout/03d730a62332c51c7b70c16c64da72dd1c3ea36c26b41cd1a1e00d39fda3d6cc 261 μs 192.9 μs 1.35
marlowe-role-payout/0403020000030204010000030001000202010101000304030001040404030100 245.1 μs 181 μs 1.35
marlowe-role-payout/0405010105020401010304080005050800040301010800080207080704020206 267.2 μs 196.7 μs 1.36
marlowe-role-payout/041a2c3b111139201a3a2c173c392b170e16370d300f2d28342d0f2f0e182e01 267.8 μs 197.3 μs 1.36
marlowe-role-payout/04f592afc6e57c633b9c55246e7c82e87258f04e2fb910c37d8e2417e9db46e5 295.4 μs 218 μs 1.36
marlowe-role-payout/057ebc80922f16a5f4bf13e985bf586b8cff37a2f6fe0f3ce842178c16981027 226 μs 166.2 μs 1.36
marlowe-role-payout/06317060a8e488b1219c9dae427f9ce27918a9e09ee8ac424afa33ca923f7954 224.6 μs 177.5 μs 1.27
marlowe-role-payout/6621a69217f09d91f42876a9c0cecf79de0e29bdd5b16c82c6c52cf959092ec4 216.1 μs 185.1 μs 1.17

This comment was automatically generated by workflow using github-action-benchmark.

CC: @IntersectMBO/plutus-core

Please sign in to comment.