bjpop · jkoppel · Nov 22, 2024 · Nov 24, 2024 · Apr 22, 2025 · Apr 22, 2025
diff --git a/cabal.project b/cabal.project
@@ -1,2 +1,9 @@
-packages: language-python/
-          language-python-test/
+packages:
+  language-python
+  language-python-test
+
+
+with-compiler: ghc-9.8.4
+
+tests: True
+
diff --git a/language-python-test/Setup.lhs b/language-python-test/Setup.lhs
diff --git a/language-python-test/language-python-test.cabal b/language-python-test/language-python-test.cabal
@@ -1,5 +1,5 @@
 name:                language-python-test
-version:             0.6.0
+version:             0.6.2
 cabal-version:       >= 1.8
 synopsis:            testing code for the language-python library
 description:         A few executables to test the language-python library.
@@ -14,6 +14,7 @@ build-type:          Simple
 stability:           experimental
 
 tested-with:
+  GHC == 9.8.4
   GHC == 9.6.1
   GHC == 9.4.4
   GHC == 9.2.7
@@ -35,18 +36,18 @@ Executable language-python-roundtrip
       ./src
    main-is: RoundTrip.hs
    other-modules:
-   build-depends:    base == 4.*, language-python == 0.6.0
+   build-depends:    base == 4.*, language-python == 0.6.2
 
 Executable language-python-tokens
    hs-source-dirs:
       ./src
    main-is: Tokens.hs
    other-modules:
-   build-depends:    base == 4.*, language-python == 0.6.0
+   build-depends:    base == 4.*, language-python == 0.6.2
 
 Executable language-python-parse-pretty
    hs-source-dirs:
       ./src
    main-is: ParsePretty.hs
    other-modules:
-   build-depends:    base == 4.*, language-python == 0.6.0
+   build-depends:    base == 4.*, language-python == 0.6.2
diff --git a/language-python-test/test/CPython_test_suite_v2/UserString.py b/language-python-test/test/CPython_test_suite_v2/UserString.py
diff --git a/language-python-test/test/CPython_test_suite_v2/base64.py b/language-python-test/test/CPython_test_suite_v2/base64.py
diff --git a/language-python-test/test/CPython_test_suite_v2/cProfile.py b/language-python-test/test/CPython_test_suite_v2/cProfile.py
diff --git a/language-python-test/test/CPython_test_suite_v2/cgi.py b/language-python-test/test/CPython_test_suite_v2/cgi.py
diff --git a/language-python-test/test/CPython_test_suite_v2/fractions.py b/language-python-test/test/CPython_test_suite_v2/fractions.py
diff --git a/language-python-test/test/CPython_test_suite_v2/keyword.py b/language-python-test/test/CPython_test_suite_v2/keyword.py
diff --git a/language-python-test/test/CPython_test_suite_v2/mailbox.py b/language-python-test/test/CPython_test_suite_v2/mailbox.py
diff --git a/language-python-test/test/CPython_test_suite_v2/make_test.sh b/language-python-test/test/CPython_test_suite_v2/make_test.sh
diff --git a/language-python-test/test/CPython_test_suite_v2/mimify.py b/language-python-test/test/CPython_test_suite_v2/mimify.py
diff --git a/language-python-test/test/CPython_test_suite_v2/pdb.py b/language-python-test/test/CPython_test_suite_v2/pdb.py
diff --git a/language-python-test/test/CPython_test_suite_v2/platform.py b/language-python-test/test/CPython_test_suite_v2/platform.py
diff --git a/language-python-test/test/CPython_test_suite_v2/profile.py b/language-python-test/test/CPython_test_suite_v2/profile.py
diff --git a/language-python-test/test/CPython_test_suite_v2/pydoc.py b/language-python-test/test/CPython_test_suite_v2/pydoc.py
diff --git a/language-python-test/test/CPython_test_suite_v2/quopri.py b/language-python-test/test/CPython_test_suite_v2/quopri.py
diff --git a/language-python-test/test/CPython_test_suite_v2/runpy.py b/language-python-test/test/CPython_test_suite_v2/runpy.py
diff --git a/language-python-test/test/CPython_test_suite_v2/smtpd.py b/language-python-test/test/CPython_test_suite_v2/smtpd.py
diff --git a/language-python-test/test/CPython_test_suite_v2/smtplib.py b/language-python-test/test/CPython_test_suite_v2/smtplib.py
diff --git a/language-python-test/test/CPython_test_suite_v2/symbol.py b/language-python-test/test/CPython_test_suite_v2/symbol.py
diff --git a/language-python-test/test/CPython_test_suite_v2/tabnanny.py b/language-python-test/test/CPython_test_suite_v2/tabnanny.py
diff --git a/language-python-test/test/CPython_test_suite_v2/token.py b/language-python-test/test/CPython_test_suite_v2/token.py
diff --git a/language-python-test/test/CPython_test_suite_v2/uu.py b/language-python-test/test/CPython_test_suite_v2/uu.py
diff --git a/language-python-test/test/CPython_test_suite_v3/make_test.sh b/language-python-test/test/CPython_test_suite_v3/make_test.sh
diff --git a/language-python-test/test/CPython_test_suite_v3/test_userstring.py b/language-python-test/test/CPython_test_suite_v3/test_userstring.py
diff --git a/language-python-test/test/make_utf8.sh b/language-python-test/test/make_utf8.sh
diff --git a/language-python/Setup.lhs b/language-python/Setup.lhs
diff --git a/language-python/language-python.cabal b/language-python/language-python.cabal
@@ -1,5 +1,5 @@
 name:                language-python
-version:             0.6.0
+version:             0.6.2
 cabal-version:       >= 1.8
 synopsis:            Parsing and pretty printing of Python code.
 description:         language-python is a Haskell library for lexical analysis, parsing
@@ -16,6 +16,7 @@ stability:           experimental
 extra-source-files:  Changelog.md
 
 tested-with:
+  GHC == 9.8.4
   GHC == 9.6.1
   GHC == 9.4.4
   GHC == 9.2.7
@@ -41,9 +42,10 @@ Library
       pretty == 1.1.*,
       array >= 0.4 && < 0.6,
       transformers >= 0.3 && < 0.7,
-      monads-tf == 0.1.*,
+      monads-tf == 0.3.*,
       utf8-string >= 1 && < 2
-   build-tools: happy, alex
+   build-tools: happy >= 1.20, alex
+   build-tool-depends: happy:happy
    exposed-modules:
       Language.Python.Common
       Language.Python.Common.ParseError

diff --git a/language-python/src/Language/Python/Version2/Parser/Parser.y b/language-python/src/Language/Python/Version2/Parser/Parser.y
@@ -1,8 +1,9 @@
 {
+{-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE MagicHash #-}
+{-# LANGUAGE UnboxedTuples #-}
 
-#undef __GLASGOW_HASKELL__
-#define __GLASGOW_HASKELL__ 709
 -----------------------------------------------------------------------------
 -- |
 -- Module      : Language.Python.Version2.Parser.Parser 

diff --git a/language-python/src/Language/Python/Version3/Parser/Parser.y b/language-python/src/Language/Python/Version3/Parser/Parser.y
@@ -1,8 +1,9 @@
 {
+{-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE MagicHash #-}
+{-# LANGUAGE UnboxedTuples #-}
 
-#undef __GLASGOW_HASKELL__
-#define __GLASGOW_HASKELL__ 709
 -----------------------------------------------------------------------------
 -- |
 -- Module      : Language.Python.Version3.Parser.Parser 

diff --git a/language-python/stack.yaml b/language-python/stack.yaml
@@ -1,10 +1,13 @@
-resolver: lts-10.2
+resolver: lts-23.19
 
 packages:
 - .
 
 extra-deps: []
 
+system-ghc: false
+install-ghc: true
+
 # Override default flag values for local packages and extra-deps
 # flags: {}