director.py: restore READTHEDOCS_VERSION_[TYPE|NAME]

[jsquyres]

These env vars were accidentally removed in #9002. This commit naively restores the 2 missing env variables in the new get_rtd_env_vars() location.

Signed-off-by: Jeff Squyres [email protected]

This commit is a potential naïve fix for #9051. I have no good way to test this, but it does restore the 2 env vars that were removed in #9002.

[stsewd]

Thanks, looks like we have a test, but it's marked as skip

readthedocs.org/readthedocs/projects/tests/test_build_tasks.py

Lines 186 to 189 in dd73d84

	@mock.patch("readthedocs.doc_builder.director.load_yaml_config")
	@pytest.mark.skip()
	# NOTE: find a way to test we are passing all the environment variables to all the commands
	def test_get_env_vars_default(self, load_yaml_config):

....

[jsquyres]

I see that some of the CI failed. It looks like this may be something I just ran across in an entirely different context the other day:

Traceback (most recent call last):
  File "/home/circleci/project/.tox/sphinx-35/bin/pytest", line 8, in <module>
    sys.exit(console_main())
  File "/home/circleci/project/.tox/sphinx-35/lib/python3.8/site-packages/_pytest/config/__init__.py", line 187, in console_main
    code = main()
  File "/home/circleci/project/.tox/sphinx-35/lib/python3.8/site-packages/_pytest/config/__init__.py", line 145, in main
    config = _prepareconfig(args, plugins)
...
  File "/home/circleci/project/.tox/sphinx-35/lib/python3.8/site-packages/sphinx/util/rst.py", line 21, in <module>
    from jinja2 import Environment, environmentfilter
ImportError: cannot import name 'environmentfilter' from 'jinja2' (/home/circleci/project/.tox/sphinx-35/lib/python3.8/site-packages/jinja2/__init__.py)
ERROR: InvocationError for command /home/circleci/project/.tox/sphinx-35/bin/pytest -m embed_api (exited with code 1)

The latest release of Jinja2 -- v3.1.0, released 24 May 2022 -- made a backwards-incompatible change. From https://jinja.palletsprojects.com/en/3.1.x/changes/#version-3-1-0:

• Remove previously deprecated code. #1544
  • contextfilter and contextfunction are replaced by pass_context. evalcontextfilter and evalcontextfunction are replaced by pass_eval_context. environmentfilter and environmentfunction are replaced by pass_environment.

If your CI environment restricts itself to the previous release of Jinja 2 (v3.0.3), it should work fine.

That being said, I see several places in the code base where you already have jinja2<3.1.0, so I'm not sure where an additional fix would be needed.

[stsewd]

@jsquyres the tests from tests-embedapi aren't related to this change and are failing on main, we can fix that later, don't worry about it.

[jsquyres]

@jsquyres the tests from tests-embedapi aren't related to this change and are failing on main, we can fix that later, don't worry about it.

Great!

Do you think that this is a sufficient fix for #9051? (I admit that I did a very little bit of grep'ing and git spelunking around the code base to come up with this fix)

If so, is there a way to get this fix into production so that our RTD builds start working again? 😄

[gpaulsen]

I started digging in as well, and saw these were missing.

[jsquyres]

@stsewd Thank you! How long does it take for this change to get into production?

[stsewd]

@jsquyres we will try to deploy this change today

[ericholscher]

@jsquyres
This should now be fixed, please let me know if it isn't.

[jsquyres]

@ericholscher Looks good -- many thanks!