Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

May/June Environment Updates #1267

Merged

Conversation

mfixstsci
Copy link
Collaborator

No description provided.

Copy link
Collaborator

@melanieclarke melanieclarke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new environment files look good to me! Both of them build, look fine in spot checks, and mostly pass local testing.

Two things though...

  1. I think the requirements.txt and rtd-requirements.txt files need to be updated to match the updated dependency versions.
  2. There are a couple minor local testing issues related to the recent packaging changes (below). They're unrelated to the environment changes here, so I can add a separate PR for it if you want.

Testing issues:

  • test_setup.py fails due to changes in the way versioning is done
  • pyproject.toml is not setup correctly to exclude the static directory, so test discovery is not working right -- 'pytest jwql' attempts to recurse the entire filesystem to find unit tests.

@mfixstsci
Copy link
Collaborator Author

The new environment files look good to me! Both of them build, look fine in spot checks, and mostly pass local testing.

Two things though...

1. I think the requirements.txt and rtd-requirements.txt files need to be updated to match the updated dependency versions.

2. There are a couple minor local testing issues related to the recent packaging changes (below). They're unrelated to the environment changes here, so I can add a separate PR for it if you want.

Testing issues:

* test_setup.py fails due to changes in the way versioning is done

* pyproject.toml is not setup correctly to exclude the static directory, so test discovery is not working right -- 'pytest jwql' attempts to recurse the entire filesystem to find unit tests.

Thanks for the review @melanieclarke! I forgot about the requirement files 😓 I will go ahead and update those. As for the the pyproject.toml files I am unaware of how to set them up so if you have some tips you can give me, that would be excellent. I am still learning about the new packaging configuration we are working with!

@melanieclarke
Copy link
Collaborator

As for the the pyproject.toml files I am unaware of how to set them up so if you have some tips you can give me, that would be excellent. I am still learning about the new packaging configuration we are working with!

Still learning too! I don't know if this is the best way, but testing locally, it looks like it works. In pyproject.toml, remove the addopts line under pytest and replace it with a norecursedirs option, like this:

[tool.pytest]
junit_family = "xunit2"

[tool.pytest.ini_options]
norecursedirs = ["jwql/website/apps/jwql/static"]

@mfixstsci
Copy link
Collaborator Author

@melanieclarke thanks, I went ahead and made the changes.

Copy link
Collaborator

@melanieclarke melanieclarke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good now. Thanks for the updates!

@mfixstsci mfixstsci merged commit 9001e31 into spacetelescope:develop May 31, 2023
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants