Revert MacOS build to Python 3.10 & pygame 2.1.2 #274
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Ryos00
added a commit
to Ryos00/clangen
that referenced
this pull request
Nov 15, 2022
commit bc19d0f Merge: 8ca9ff4 e644b98 Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Mon Nov 14 17:28:55 2022 -0600 Merge pull request ClanGenOfficial#276 from Dpeta/release-fix Minor fixes for build workflow commit 8ca9ff4 Merge: 4d361c8 7dfa37d Author: Lixxis <110975120+Lixxis@users.noreply.github.com> Date: Mon Nov 14 16:32:52 2022 +0100 Merge pull request ClanGenOfficial#275 from Lixxis/experimental Other: relationships from list to dict + fixing log bug commit e644b98 Author: Dpeta <jasprose@protonmail.com> Date: Sun Nov 13 23:12:56 2022 +0100 fix double .zip extension commit 3166b51 Author: Dpeta <jasprose@protonmail.com> Date: Sun Nov 13 23:03:29 2022 +0100 Only build zip when required and fix py311 release commit 7dfa37d Merge: 938be44 4d361c8 Author: Lixxis <lixxis.arts@gmail.com> Date: Sun Nov 13 11:40:48 2022 +0100 Merge branch 'experimental' of https://github.com/Lixxis/clangen into experimental commit 938be44 Author: Lixxis <lixxis.arts@gmail.com> Date: Sun Nov 13 11:40:43 2022 +0100 change: transformed relationships from list into dict commit 4d361c8 Merge: b6af6c5 5a7ec06 Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Sat Nov 12 17:19:07 2022 -0600 Merge pull request ClanGenOfficial#274 from Dpeta/macos-rollback Revert MacOS build to Python 3.10 & pygame 2.1.2 commit 5a7ec06 Author: Dpeta <jasprose@protonmail.com> Date: Sat Nov 12 22:29:44 2022 +0100 Revert MacOS build to Python 3.10 & pygame 2.1.2 commit 7cfae56 Author: Lixxis <lixxis.arts@gmail.com> Date: Sat Nov 12 09:11:55 2022 +0100 bugfix: wrong init with realtoinship log, causes mass save events commit b6af6c5 Merge: 246a315 ec880e4 Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Fri Nov 11 16:17:52 2022 -0600 Merge pull request ClanGenOfficial#273 from sedgestripe/df Open/Close Borders feature commit ec880e4 Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Fri Nov 11 16:02:53 2022 -0600 Open/Close Borders feature commit 246a315 Merge: 1cd837d ee8521a Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Fri Nov 11 15:01:51 2022 -0600 Merge pull request ClanGenOfficial#272 from sedgestripe/df Update Info, Add remove accessory, Add kittypet thoughts commit ee8521a Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Fri Nov 11 14:55:05 2022 -0600 quick bug fix commit 5c66c09 Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Fri Nov 11 14:49:16 2022 -0600 update info commit 445f49a Merge: c775366 1cd837d Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Fri Nov 11 14:47:04 2022 -0600 Merge branch 'experimental' of https://github.com/Thlumyn/clangen into df commit c775366 Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Fri Nov 11 14:44:52 2022 -0600 add other thoughts commit 1cd837d Merge: 9009071 d04707f Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Fri Nov 11 14:41:55 2022 -0600 Merge pull request ClanGenOfficial#271 from Lixxis/experimental Other: Restructure death events commit d04707f Author: Lixxis <lixxis.arts@gmail.com> Date: Fri Nov 11 16:01:05 2022 +0100 ClanGenOfficial#271 included code review suggestion commit a84dd90 Author: Lixxis <110975120+Lixxis@users.noreply.github.com> Date: Fri Nov 11 15:52:08 2022 +0100 ClanGenOfficial#271 code review - faster if statement Co-authored-by: Dpeta <69427753+Dpeta@users.noreply.github.com> commit 2f28195 Author: Lixxis <110975120+Lixxis@users.noreply.github.com> Date: Fri Nov 11 15:51:23 2022 +0100 ClanGenOfficial#271 code review - 50/50 chance Co-authored-by: Dpeta <69427753+Dpeta@users.noreply.github.com> commit c092522 Author: Lixxis <lixxis.arts@gmail.com> Date: Thu Nov 10 22:30:11 2022 +0100 change: smaller changes on death event seperation commit 4326d2b Author: Lixxis <lixxis.arts@gmail.com> Date: Thu Nov 10 22:21:49 2022 +0100 change: adapt death events for injuries and illnesses once again commit ee04a1e Merge: 04c1d86 9009071 Author: Lixxis <lixxis.arts@gmail.com> Date: Thu Nov 10 21:35:38 2022 +0100 Merge branch 'experimental' of https://github.com/Lixxis/clangen into experimental commit 04c1d86 Author: Lixxis <lixxis.arts@gmail.com> Date: Thu Nov 10 21:33:16 2022 +0100 change: seperate death events for injuries and illnesses commit 9009071 Merge: 5c72719 906a2c2 Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Thu Nov 10 13:38:26 2022 -0600 Merge pull request ClanGenOfficial#269 from scribblecrumb/History Bugfix: Older cats having ??? skill commit 906a2c2 Merge: 0e11961 5c72719 Author: scribblecrumb <abspence2199@gmail.com> Date: Wed Nov 9 21:33:19 2022 -0600 Merge remote-tracking branch 'upstream/experimental' into History commit 0e11961 Author: scribblecrumb <abspence2199@gmail.com> Date: Wed Nov 9 21:31:06 2022 -0600 Bugfix: adult cats having ??? as a skill commit 5c72719 Merge: f1c65e7 6e668c4 Author: Thlumyn <102194057+Thlumyn@users.noreply.github.com> Date: Wed Nov 9 18:46:20 2022 -0700 Merge pull request ClanGenOfficial#220 from Dpeta/experimental_build-test Add another github actions workflow for building (win/linux/mac) commit 6e668c4 Author: Dpeta <jasprose@protonmail.com> Date: Thu Nov 10 02:24:13 2022 +0100 Update path commit 441274d Author: Dpeta <jasprose@protonmail.com> Date: Thu Nov 10 02:17:05 2022 +0100 py3.11 commit 50be25e Author: Dpeta <jasprose@protonmail.com> Date: Thu Nov 10 02:14:45 2022 +0100 py311 build + artifact path commit f1c65e7 Merge: 1166201 4dca4b7 Author: Ryos00 <112637360+Ryos00@users.noreply.github.com> Date: Wed Nov 9 18:31:04 2022 -0600 Merge pull request ClanGenOfficial#268 from Dpeta/exp_teyit Reformat tests (with teyit) commit 1166201 Merge: 2724b92 0f44491 Author: Ryos00 <112637360+Ryos00@users.noreply.github.com> Date: Wed Nov 9 18:30:25 2022 -0600 Merge pull request ClanGenOfficial#266 from Dpeta/chance-tweaks Reduce base scar chance and reduce the amount of cats killed in extinction events commit 4dca4b7 Author: Dpeta <jasprose@protonmail.com> Date: Thu Nov 10 00:28:13 2022 +0100 Reformat unittests commit 2724b92 Merge: 6545cbd 51d6235 Author: Ryos00 <112637360+Ryos00@users.noreply.github.com> Date: Wed Nov 9 17:00:29 2022 -0600 Merge pull request ClanGenOfficial#267 from scribblecrumb/History Bugfix: List Index crash commit 51d6235 Author: scribblecrumb <abspence2199@gmail.com> Date: Wed Nov 9 16:52:58 2022 -0600 Bugfix: List Index crash commit 0f44491 Author: Dpeta <jasprose@protonmail.com> Date: Wed Nov 9 23:25:56 2022 +0100 Reduce base scar chance and reduce the amount of cats killed in extinctions commit 6545cbd Merge: abd4a50 88afe58 Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Wed Nov 9 12:50:56 2022 -0600 Merge pull request ClanGenOfficial#265 from sedgestripe/df Add exile functionality back commit 88afe58 Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Wed Nov 9 12:50:18 2022 -0600 Add exile functionality back commit abd4a50 Merge: 23951b0 a38afdd Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Wed Nov 9 10:46:20 2022 -0600 Merge pull request ClanGenOfficial#264 from sedgestripe/df Add toggle to auto choose deputy commit 23951b0 Merge: 5091976 4f9a90d Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Wed Nov 9 10:44:25 2022 -0600 Merge pull request ClanGenOfficial#263 from scribblecrumb/History Bugfix: Grammar and Trait Choosing Crash commit 4f9a90d Author: scribblecrumb <abspence2199@gmail.com> Date: Wed Nov 9 07:35:22 2022 -0600 for loop breaks commit 1cc8842 Author: scribblecrumb <abspence2199@gmail.com> Date: Wed Nov 9 07:31:43 2022 -0600 fixing crash related to trait picking commit 6d25642 Author: scribblecrumb <abspence2199@gmail.com> Date: Tue Nov 8 23:20:33 2022 -0600 adjusting grammar once more commit 5091976 Merge: e211804 e152988 Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Tue Nov 8 23:03:03 2022 -0600 Merge pull request ClanGenOfficial#262 from scribblecrumb/History Bugfix: Influence recorded incorrectly, Scar History grammar fixes, Content: Founder Backstory commit a38afdd Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Tue Nov 8 22:54:56 2022 -0600 Add new toggle: automatically choose deputy commit e152988 Author: scribblecrumb <abspence2199@gmail.com> Date: Tue Nov 8 22:43:01 2022 -0600 Change how grammar for scar history is adjusted commit ccc3965 Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Tue Nov 8 22:16:44 2022 -0600 fix df lineart bug commit d655750 Merge: 9a086f0 e211804 Author: scribblecrumb <abspence2199@gmail.com> Date: Tue Nov 8 22:10:23 2022 -0600 Merge remote-tracking branch 'upstream/experimental' into History commit 9a086f0 Author: scribblecrumb <abspence2199@gmail.com> Date: Tue Nov 8 22:04:00 2022 -0600 tweak Reserved chance commit 9af58b7 Author: scribblecrumb <abspence2199@gmail.com> Date: Tue Nov 8 21:59:18 2022 -0600 Fix influence showing as Abrasive when it should be Reserved commit e211804 Merge: bcc5082 b3fa0c8 Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Tue Nov 8 21:56:18 2022 -0600 Merge pull request ClanGenOfficial#261 from sedgestripe/df Fix minor DF bugs commit b3fa0c8 Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Tue Nov 8 21:55:12 2022 -0600 Fix minor DF bugs commit 8d109c8 Merge: bfae79d bcc5082 Author: scribblecrumb <abspence2199@gmail.com> Date: Tue Nov 8 20:31:14 2022 -0600 Merge remote-tracking branch 'upstream/experimental' into History commit bfae79d Author: scribblecrumb <abspence2199@gmail.com> Date: Tue Nov 8 20:28:30 2022 -0600 added Clan Founder backstory commit bcc5082 Merge: e172645 633c6b7 Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Tue Nov 8 19:58:17 2022 -0600 Merge pull request ClanGenOfficial#260 from sedgestripe/df add additional dark forest features commit e172645 Merge: b8d16a5 73053af Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Tue Nov 8 19:58:03 2022 -0600 Merge pull request ClanGenOfficial#259 from scribblecrumb/History Content: Exile to DF button and setting up sub tab functionality commit 633c6b7 Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Tue Nov 8 19:57:01 2022 -0600 add additional dark forest features commit 73053af Author: scribblecrumb <abspence2199@gmail.com> Date: Tue Nov 8 19:20:41 2022 -0600 exile to DF button commit 0de7ec6 Author: scribblecrumb <abspence2199@gmail.com> Date: Tue Nov 8 19:01:45 2022 -0600 setting up the basis for sub tab groups in history commit b8d16a5 Merge: 1a6ee02 36dcb5d Author: Ryos00 <112637360+Ryos00@users.noreply.github.com> Date: Tue Nov 8 18:05:25 2022 -0600 Merge pull request ClanGenOfficial#258 from scribblecrumb/History Couple Bugfixes: Deputy button still crashing, Crash from History tab commit 36dcb5d Author: scribblecrumb <abspence2199@gmail.com> Date: Tue Nov 8 17:44:59 2022 -0600 bugfix: deputy button crash, once again commit 9f4866a Author: scribblecrumb <abspence2199@gmail.com> Date: Tue Nov 8 17:41:58 2022 -0600 bugfix: crash when clicking history on cats with incomplete influence lists commit 8f5e197 Merge: 75ad26a 1a6ee02 Author: scribblecrumb <abspence2199@gmail.com> Date: Tue Nov 8 17:01:24 2022 -0600 Merge remote-tracking branch 'upstream/experimental' into History commit 75ad26a Author: scribblecrumb <abspence2199@gmail.com> Date: Tue Nov 8 17:01:14 2022 -0600 sub tabs and such commit 1a6ee02 Author: Ryos00 <112637360+Ryos00@users.noreply.github.com> Date: Tue Nov 8 14:50:59 2022 -0600 Revert "Revert "Merge branch 'experimental' of https://github.com/Thlumyn/clangen into experimental"" This reverts commit fd255ca. commit fd255ca Author: Ryos00 <112637360+Ryos00@users.noreply.github.com> Date: Tue Nov 8 14:49:57 2022 -0600 Revert "Merge branch 'experimental' of https://github.com/Thlumyn/clangen into experimental" This reverts commit 6828a5e, reversing changes made to 9be98ac. commit 6828a5e Merge: 9be98ac d767bdc Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Tue Nov 8 13:37:20 2022 -0600 Merge branch 'experimental' of https://github.com/Thlumyn/clangen into experimental commit 9be98ac Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Tue Nov 8 13:37:16 2022 -0600 added more DF thoughts minor bug fixes commit d767bdc Merge: e64e290 480b3bc Author: Ryos00 <112637360+Ryos00@users.noreply.github.com> Date: Tue Nov 8 11:33:36 2022 -0600 Merge pull request ClanGenOfficial#256 from Dpeta/exp_300moons fix 0 moons causing kits to age up commit 480b3bc Author: Dpeta <jasprose@protonmail.com> Date: Tue Nov 8 18:21:54 2022 +0100 fix 0 moons causing kits to age up commit e64e290 Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Tue Nov 8 10:55:25 2022 -0600 save dark forest cats commit 3e9f516 Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Tue Nov 8 10:44:24 2022 -0600 Added dark forest thoughts commit 845558b Merge: 62a400c 819534f Author: scribblecrumb <abspence2199@gmail.com> Date: Tue Nov 8 09:30:25 2022 -0600 Merge remote-tracking branch 'upstream/experimental' into experimental commit 62a400c Merge: 40aaaa0 7f2f268 Author: scribblecrumb <abspence2199@gmail.com> Date: Mon Nov 7 21:39:31 2022 -0600 Merge remote-tracking branch 'upstream/experimental' into experimental commit 40aaaa0 Merge: 83f6d4d ba6ab8c Author: scribblecrumb <abspence2199@gmail.com> Date: Mon Nov 7 18:00:30 2022 -0600 Merge remote-tracking branch 'upstream/experimental' into experimental commit 83f6d4d Merge: 6695eaa 515c34f Author: scribblecrumb <abspence2199@gmail.com> Date: Sun Nov 6 23:04:07 2022 -0600 Merge branch 'experimental' of https://github.com/scribblecrumb/clangen into experimental commit 6695eaa Merge: fed8594 546eb24 Author: scribblecrumb <115410010+scribblecrumb@users.noreply.github.com> Date: Sun Nov 6 11:54:47 2022 -0600 Merge branch 'Thlumyn:experimental' into experimental commit ad2acc3 Author: Dpeta <jasprose@protonmail.com> Date: Fri Nov 4 03:50:10 2022 +0100 Removed obsolete dependencies from requirements.txt (noise and numpy) commit ea7cd05 Author: Dpeta <jasprose@protonmail.com> Date: Fri Nov 4 03:48:44 2022 +0100 Add commented out UPX download step and explicitly disable UPX commit e3cebaf Author: Dpeta <jasprose@protonmail.com> Date: Thu Nov 3 23:28:59 2022 +0100 Also update wheel commit 465540a Author: Dpeta <jasprose@protonmail.com> Date: Thu Nov 3 23:15:56 2022 +0100 Remove main.yml since the build.yml mac build action does essentially the same things now. (as discussed on discord 🐱) commit 0f8e2d0 Author: Dpeta <jasprose@protonmail.com> Date: Tue Nov 1 05:35:40 2022 +0100 Package as .dmg for mac like in the CI/CD workflow commit 0e3350a Author: Dpeta <jasprose@protonmail.com> Date: Sat Oct 29 04:46:36 2022 +0200 Use the spec file :3 ✅ commit a0fc98c Author: Dpeta <69427753+Dpeta@users.noreply.github.com> Date: Thu Oct 27 20:18:50 2022 +0200 '--onefile' --> '--onedir' commit e03af9f Author: Dpeta <jasprose@protonmail.com> Date: Thu Oct 27 18:05:18 2022 +0200 Disable UPX on Windows to appease the antivirus overlords commit 60a5daf Author: Dpeta <jasprose@protonmail.com> Date: Thu Oct 27 17:21:48 2022 +0200 Add another github actions workflow for building
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Seems like the macOS build doesn't work with Python 3.11 + pygame 2.1.3. Few ppl in on the discord had this issue and it doesn't run for me on a vm either, not sure why exactly. Probably best to just roll it back for now.