Mac build fix #11

bgebhardt · 2023-05-29T06:10:46Z

@ABaumher here's my pull request

Fixes what I noted in issue Getting mac builds working #10. Please check this pip-tools change on Windows.
Adds Mac dev instructions
Adds Mac dot files to the .gitignore

I inadvertently committed and reverted some other stuff too. Those are the first 2 commits.

…ns to Protocols to send new auth flow

…es i had to a minimal version of this to get the integration working in GOG Galaxy. This version is newer than what i am testing, so it may have errors

… this patch for the current version i have working in the plugin. Still need to add hello message

…uires sending a hello message.

… webpage to go to step 2. various little bugfixes, including no more infinite loops on getters

…sic code to display all the other pages. This is largely unchanged from the original, but the login page has evidently changed. the code-behind isn't implemented. Various bugfixes as well

…cked up so the merge doesn't destroy it

…Windows 11, macOS12,13). Other tweaks, idk anymore

… 2FA, but hopefully i haven't broken anything else

…ning about types overshadowing the standard types. Removed authentication.py. Moved all enums i could find in Steam_network to a dedicated enums.py. Moved All top level functions that may have been called in multiple spots to a utils.py Internally, downgraded my environment to 3.7 as per GOG Galaxy instructions. The resulting file was added to .gitignore

…d to in order to figure out its type.

…perly. Removed an exceptions import that did nothing and randomly caused an error. Apparently i don't know how to stash things.

…s before it works properly

… of that is implemented. oops. layed out the empty methods for it.

…e, the py versions of proto files were not updated

… plugin works from task.py. Not finished; switching gears to localization so i don't go insane.

…n't print like i want them to, which annoys me immensely. Need to retrieve old py files in the repo before calling build install, which broke them

…few conflicts, i'll have to figure out the best way to handle them

…uld now be able to get the latest proto and py files from them

… finally build this thing and it'll run properly.

…d remaining logged in. will likely need to revert some changes in this commit, and possibly others back to the original fork.

fix installation instructions

…tion-steam

various fixes to readme, upgrade module versions, get pytests closer to running ok

…plemented the html and css changes accidentally reverted when fixing my experimental patch.

Possible fix for achievements sync. Limit simultaneous jobs.

This reverts commit 5231719.

solves errors seen in mac build not tested on windows fix for issue ABaumher#10

ABaumher · 2023-05-30T14:46:24Z

For the pip-tools 5.4.0 issue, the old code used pip 22.0.4 so that wasn't an issue. Currently that is set at

galaxy-integration-steam/requirements/install.txt

Line 2 in 995f7e6

pip==22.0.4

did you run pip install -r dev.txt in your virtual environment? if so, that line isn't working properly for whatever reason. I know a later pip would break on our code because some of our modules drop support for python 3.7 and their old versions use deprecated calls, which newer pip versions will not allow.

I made a couple changes on MacOS_Fix branch which should hopefully fix the certificate issue without requiring you install the certificates manually. It also grants execute permission on protoc for all users when you run inv InstallProtoc. Unfortunately, it only applies to a new protoc install, it won't work on an existing version. I probably could change that to work there as well. let me know if they work. Unfortunately you may need to test it on a different Mac if all your settings are already working, or uninstall python and the certificates and try again.

Disclaimer: i have done almost no programming on a Mac, so idk if these will work. The best i can do is ensure the InstallProtoc change would work on Linux and the underlying call is the same, but idk.

ABaumher · 2023-05-30T14:52:15Z

protobuf_files/README_UPDATE_PROTOBUF_FILES.md

+To regenerate protobufs you must get and install the protobuf compiler.
+
+1. `inv InstallProtoc`
+2. `chmod a+x protoc/bin/protoc` # the InstallProtoc task does not set the protoc to be executable


I have hopefully made this part of the install protoc call. See https://github.com/ABaumher/galaxy-integration-steam/blob/MacOS_Fix/tasks.py#L151-L152

ABaumher · 2023-05-30T14:55:06Z

protobuf_files/README_UPDATE_PROTOBUF_FILES.md

+First time Install Python OpenSSL Certificates so the request library can pull Stream protobufs.
+
+1. Install python 3.7 from https://www.python.org/downloads/. It puts Python in your Applications directory
+2. `"/Applications/Python 3.7/Install Certificates.command"`  You must install for Python 3.7.


hopefully i can just install certifi and it'll work. This is done in https://github.com/ABaumher/galaxy-integration-steam/blob/MacOS_Fix/requirements/install.txt#L13 and https://github.com/ABaumher/galaxy-integration-steam/blob/MacOS_Fix/requirements/app.txt#L7

ABaumher · 2023-05-30T14:58:28Z

I'm rewriting the comments, and i'll make sure to use your inputs as a base for the MacOS section. Unfortunately, the changes are on my home computer and i didn't push them, so i can't access them for a few hours. If the certifi and os.chmod fixes work, i can simplify the macos install instructions.

ABaumher · 2023-06-11T01:55:35Z

I have hopefully fixed all of this on e46968f. Let me know if this is correct for you.

LauraRozier and others added 30 commits March 16, 2023 03:27

Add protobuff files

9ef4340

Add (improvised) missing files

029e695

Update bindings

98e3444

Fix AttributeError('out_of_game_heartbeat_seconds')

e0b914f

Update README.md

cb9f8c3

implemented the RSA call.

0d24e8a

actually staging the changes this time, lol

4f39c71

Updated enums to the current version available. Continued modificatio…

4edb254

…ns to Protocols to send new auth flow

Updated protocol buffer message files to work with auth. Merged chang…

d0c2a14

…es i had to a minimal version of this to get the integration working in GOG Galaxy. This version is newer than what i am testing, so it may have errors

updated the EMsg constants. They were out of date

0b16bfc

minor changes to protobuf client. Prototyping new workflow. Preparing…

77474d5

… this patch for the current version i have working in the plugin. Still need to add hello message

Updated bugfixes to a version that runs in GOG Galaxy. This still req…

6cc7ecb

…uires sending a hello message.

Got the RSA Key all the way back to the Backend, so we can change the…

b61273b

… webpage to go to step 2. various little bugfixes, including no more infinite loops on getters

Update that gets the password RSA key for the user. Implements the ba…

58c8f29

…sic code to display all the other pages. This is largely unchanged from the original, but the login page has evidently changed. the code-behind isn't implemented. Various bugfixes as well

Maybe breaking. Looking for an old message i wrote, so i need this ba…

7498c57

…cked up so the merge doesn't destroy it

updated consts, protobuf, protocol buffer to report modern os types (…

da90375

…Windows 11, macOS12,13). Other tweaks, idk anymore

Testing various changes. This will break at some point before hitting…

83a69a1

… 2FA, but hopefully i haven't broken anything else

adding type hints, mostly. need to track down where job_list was adde…

708083c

…d to in order to figure out its type.

Public Key data comes back in hexidecimal, so that is now handled pro…

141eed8

…perly. Removed an exceptions import that did nothing and randomly caused an error. Apparently i don't know how to stash things.

Full login with no SteamGuard test. Likely will require a few bugfixe…

0eef845

…s before it works properly

Login processed properly, goes to confirm to get the tokens, and none…

dc762dd

… of that is implemented. oops. layed out the empty methods for it.

Merged in Thibmo's fixes and proto files. this is not a complete merg…

0285aa2

…e, the py versions of proto files were not updated

Dealing with getting the proto files properly parsed and built so the…

4429a71

… plugin works from task.py. Not finished; switching gears to localization so i don't go insane.

Added Protos. Updated Tasks.py to properly import them. They still do…

3cd0b49

…n't print like i want them to, which annoys me immensely. Need to retrieve old py files in the repo before calling build install, which broke them

Reverted py files to what they were before merging with Thibmo's fork.

91f2670

Updated the protobuf list to the files we currently use. There are a …

95bbacf

…few conflicts, i'll have to figure out the best way to handle them

Figured out how to handle conflicts with the service messages. we sho…

f65f179

…uld now be able to get the latest proto and py files from them

Finally found the version of protoc the old version was using. we can…

e4cf9bd

… finally build this thing and it'll run properly.

Updates throughout the code base. Preparing for full auth workflow an…

a44be78

…d remaining logged in. will likely need to revert some changes in this commit, and possibly others back to the original fork.

ABaumher and others added 16 commits May 21, 2023 21:02

Update README.md

f93ea59

fix installation instructions

Merge branch 'master' into master

9c700b7

check whether users have py installed

489230c

Merge branch 'master' of https://github.com/MisterZeus/galaxy-integra…

3aa2cfa

…tion-steam

remove exeprobe, make if simpler

a51a0fc

readme tweaks

23ef0c0

Merge pull request ABaumher#3 from MisterZeus/master

3a03a84

various fixes to readme, upgrade module versions, get pytests closer to running ok

Update gitignore to ignore zip files, so it excudes the release. reim…

eb8879b

…plemented the html and css changes accidentally reverted when fixing my experimental patch.

Temporary fix for achievements sync. Limit simultaneous jobs.

432e77c

Merge pull request ABaumher#8 from wwMRd/achievements_temp_fix

3da5c06

Possible fix for achievements sync. Limit simultaneous jobs.

Added .DStore to ignore list

5231719

Revert "Added .DStore to ignore list"

e3bb216

This reverts commit 5231719.

Added mac-related .dot files

6a253d0

updated required pip-tools

9ab4a60

solves errors seen in mac build not tested on windows fix for issue ABaumher#10

Updated mac build instructions

dbd6f45

Added instructions to setup protobuf compiling on Mac

33d791d

ABaumher linked an issue May 30, 2023 that may be closed by this pull request

Getting mac builds working #10

Open

ABaumher reviewed May 30, 2023

View reviewed changes

This was referenced May 30, 2023

Getting mac builds working #10

Open

MacOS Certificate Issue #13

Open

ABaumher force-pushed the master branch 6 times, most recently from bfb80ad to 4a8d717 Compare June 27, 2023 15:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Mac build fix #11

Mac build fix #11

bgebhardt commented May 29, 2023 •

edited

Loading

ABaumher commented May 30, 2023 •

edited

Loading

ABaumher May 30, 2023

ABaumher May 30, 2023

ABaumher commented May 30, 2023

ABaumher commented Jun 11, 2023

Mac build fix #11

Are you sure you want to change the base?

Mac build fix #11

Conversation

bgebhardt commented May 29, 2023 • edited Loading

ABaumher commented May 30, 2023 • edited Loading

ABaumher May 30, 2023

Choose a reason for hiding this comment

ABaumher May 30, 2023

Choose a reason for hiding this comment

ABaumher commented May 30, 2023

ABaumher commented Jun 11, 2023

bgebhardt commented May 29, 2023 •

edited

Loading

ABaumher commented May 30, 2023 •

edited

Loading