search

JulienPalard / python-docs-cookiecutter

Cookiecutter to boostrap a new cpython documentation translation
9 stars 4 forks source link

make merge command gives errors. #6

Closed OmerFI closed 3 years ago

OmerFI commented 3 years ago

Hello, I had this issue:

Error

After that, I opened the MakeFile. I changed the BRANCH to 3.9 and I tried again:

Error2

After that:

Error3

I just did all of the instructions given in the Readme file. And I haven't deleted anything. Could you help me?

JulienPalard commented 3 years ago

Yes I think I can help, let me review my README, it should be out of date.

JulienPalard commented 3 years ago

Can you please try again from scratch? We simplified our makefile a lot, a few weeks ago, and I forgot to merge it on this cookiecutter. Just did the upgrade.

JulienPalard commented 3 years ago

Beware I also updated the README as it's now mandatory to run the git init, switch branch, and make an initial commit before merging.

You may hit:

You're missing dependencies, please enable a venv and install:

  python -m pip install -r requirements.txt -r ../cpython//Doc/requirements.txt

which is expected if you don't already have a venv with all required dependencies installed.

OmerFI commented 3 years ago

I did all of the instructions given in the README file except the last instruction, but in the last instruction, there is a problem. error

OmerFI commented 3 years ago

Maybe, to make a gif can be good for anyone.

JulienPalard commented 3 years ago

Did you forgot the make merge? If not, what happened during it?

OmerFI commented 3 years ago

Sorry, I forgot the make merge. After all I have this:

Screenshot_4

Should I do anything else?

JulienPalard commented 3 years ago

This is the normal state yes.

The make merge gave you an hint on how to add only file that really changed: it's usefull when you merge, say monthly, to avoid a big commit of only po headers and no actual change in them.

Take a look at various translations if you want ideas on different possible workflows: https://github.com/python/?q=python-docs-&type=&language=&sort=

Here in France our workflow is basic: we just use github PRs. But other countries use online tools like transifex, pontoon, ..., as the PEP 545 say, use the workflow that fit the best, as long as we can git clone the .po files with the right hierarchy to build docs.python.org it's OK.

Don't hesitate to get us updated about the progression on docs at python dot org. You may want to team with https://github.com/alaeddingurel/python-docs-tr which also tried to start a Turkish translation a few years ago.

Anyway, don't translate alone, there's too much to do.

I'm closing this as the make merge now works, don't hesitate to continue the discussion on docs@ if you have any question.