Skip to content

Remove optparse-applicative-fork dependency where not depending on cardano-cli #6399

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.

Sign up for GitHub

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

Open
carbolymer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove optparse-applicative-fork dependency where not depending on cardano-cli #6399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bench/cardano-profile/app/cardano-profile.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import Data.Aeson.Encode.Pretty as Aeson
import qualified Data.ByteString.Lazy.Char8 as BSL8
-- Package: containers.
import qualified Data.Map.Strict as Map
-- Package: optparse-applicative-fork.
-- Package: optparse-applicative.
import qualified Options.Applicative as OA
-- Package: self.
import qualified Cardano.Benchmarking.Profile as Profile
Expand Down
2 changes: 1 addition & 1 deletion bench/cardano-profile/cardano-profile.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ executable cardano-profile
, vector
, bytestring
, containers
, optparse-applicative-fork
, optparse-applicative
, text
, cardano-profile

Expand Down
2 changes: 1 addition & 1 deletion bench/cardano-topology/cardano-topology.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ executable cardano-topology
, bytestring
, containers
, graphviz
, optparse-applicative-fork
, optparse-applicative
, split
, text
, cardano-topology
Expand Down
4 changes: 2 additions & 2 deletions bench/locli/locli.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ library
, filepath
, fingertree == 0.1.5.0
, hashable
, optparse-applicative-fork >= 0.18.1
, optparse-applicative
, ouroboros-consensus
, ouroboros-network-api ^>= 0.16
, sop-core
Expand Down Expand Up @@ -156,7 +156,7 @@ executable locli
build-depends: aeson
, cardano-prelude
, locli
, optparse-applicative-fork
, optparse-applicative
, text
, text-short
, transformers
Expand Down
6 changes: 3 additions & 3 deletions bench/tx-generator/tx-generator.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ library
, mtl
, network
, network-mux
, optparse-applicative-fork
, optparse-applicative
, ouroboros-consensus >= 0.6
, ouroboros-consensus-cardano >= 0.5
, ouroboros-consensus-diffusion >= 0.7.0
Expand Down Expand Up @@ -202,7 +202,7 @@ executable calibrate-script
, directory
, extra
, filepath
, optparse-applicative-fork
, optparse-applicative
, cardano-api
, text
, transformers
Expand Down Expand Up @@ -235,7 +235,7 @@ test-suite tx-generator-apitest
, directory
, extra
, filepath
, optparse-applicative-fork
, optparse-applicative
, cardano-api
, cardano-cli
, cardano-node
Expand Down
2 changes: 1 addition & 1 deletion cardano-node-capi/cardano-node-capi.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ library
, aeson
, bytestring
, cardano-node
, optparse-applicative-fork
, optparse-applicative
hs-source-dirs: src
2 changes: 1 addition & 1 deletion cardano-node-chairman/cardano-node-chairman.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ executable cardano-node-chairman
, containers
, contra-tracer
, io-classes:{io-classes, strict-stm, si-timers}
, optparse-applicative-fork
, optparse-applicative
, ouroboros-consensus
, ouroboros-consensus-cardano
, ouroboros-network-api
Expand Down
12 changes: 7 additions & 5 deletions cardano-node/app/cardano-node.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import qualified Data.Text as Text
import qualified Data.Text.IO as Text
import Data.Version (showVersion)
import Options.Applicative
import Options.Applicative.Help.Pretty
import qualified Options.Applicative as Opt
import Options.Applicative.Help ((<$$>))
import System.Info (arch, compilerName, compilerVersion, os)
import System.IO (hPutStrLn, stderr)

Expand Down Expand Up @@ -70,10 +70,12 @@ main = do

nodeCliHelpMain :: String
nodeCliHelpMain = renderHelpDoc 80 $
parserHelpHeader "cardano-node" nodeCLIParser
<$$> ""
<$$> parserHelpOptions nodeCLIParser

mconcat [ parserHelpHeader "cardano-node" nodeCLIParser
, line'
, ""
, line'
, parserHelpOptions nodeCLIParser
]

data Command = RunCmd PartialNodeConfiguration
| TraceDocumentation TraceDocumentationCmd
Expand Down
4 changes: 2 additions & 2 deletions cardano-node/cardano-node.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ library
, network
, network-mux >= 0.8
, nothunks
, optparse-applicative-fork >= 0.18.1
, optparse-applicative
, ouroboros-consensus ^>= 0.28
, ouroboros-consensus-cardano ^>= 0.26
, ouroboros-consensus-diffusion ^>= 0.24
Expand Down Expand Up @@ -236,7 +236,7 @@ executable cardano-node
, cardano-crypto-class
, cardano-git-rev
, cardano-node
, optparse-applicative-fork
, optparse-applicative
, text

test-suite cardano-node-test
Expand Down
3 changes: 2 additions & 1 deletion cardano-node/src/Cardano/Node/Parsers.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import Options.Applicative hiding (str, switch)
-- file. See `parseStartAsNonProducingNode` and `parseValidateDB`.
import qualified Options.Applicative as Opt
import qualified Options.Applicative.Help as OptI
import qualified Prettyprinter.Internal as PP
import System.Posix.Types (Fd (..))
import Text.Read (readMaybe)

Expand Down Expand Up @@ -433,4 +434,4 @@ parserHelpOptions = fromMaybe mempty . OptI.unChunk . OptI.fullDesc (Opt.prefs m
-- | Render the help pretty document.
renderHelpDoc :: Int -> OptI.Doc -> String
renderHelpDoc cols =
(`OptI.renderShowS` "") . OptI.layoutPretty (OptI.LayoutOptions (OptI.AvailablePerLine cols 1.0))
(`PP.renderShowS` "") . OptI.layoutPretty (OptI.LayoutOptions (OptI.AvailablePerLine cols 1.0))
8 changes: 4 additions & 4 deletions cardano-tracer/cardano-tracer.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ library demo-forwarder-lib
, generic-data
, network
, network-mux
, optparse-applicative-fork >= 0.18.1
, optparse-applicative
, ouroboros-network-api
, ouroboros-network-framework
, tasty-quickcheck
Expand Down Expand Up @@ -302,7 +302,7 @@ library demo-acceptor-lib
, extra
, filepath
, generic-data
, optparse-applicative-fork >= 0.18.1
, optparse-applicative
, ouroboros-network-api
, stm <2.5.2 || >=2.5.3
, tasty-quickcheck
Expand Down Expand Up @@ -363,7 +363,7 @@ test-suite cardano-tracer-test
, generic-data
, network
, network-mux
, optparse-applicative-fork >= 0.18.1
, optparse-applicative
, ouroboros-network-api
, ouroboros-network-framework
, stm <2.5.2 || >=2.5.3
Expand Down Expand Up @@ -423,7 +423,7 @@ test-suite cardano-tracer-test-ext
, Glob
, network
, network-mux
, optparse-applicative-fork >= 0.18.1
, optparse-applicative
, ouroboros-network ^>= 0.22.4
, ouroboros-network-api
, ouroboros-network-framework
Expand Down
Loading