Skip to content
This repository was archived by the owner on Jun 30, 2024. It is now read-only.

Conversation

@bjones1
Copy link
Contributor

@bjones1 bjones1 commented Feb 27, 2023

This implements ideas in #2048. Not much testing yet.

Fix:

  • auto-edit .env based on the build type.
  • Links development-only files only in dev mode.

Docs:

  • Improve docs on .env.prototype

     Links development-only files only in dev mode.
Docs: Improve docs on .env.prototype
@bjones1 bjones1 marked this pull request as ready for review February 27, 2023 19:59
@bjones1
Copy link
Contributor Author

bjones1 commented Feb 27, 2023

@bnmnetp. OK works for me after testing. Test failures may be OK; the tests need to be re-run.

@bjones1 bjones1 requested a review from bnmnetp February 27, 2023 20:01
@bnmnetp
Copy link
Member

bnmnetp commented Feb 28, 2023

Tests are failing to start -- missing the runestone_test db !! What would cause that?

@bnmnetp
Copy link
Member

bnmnetp commented Feb 28, 2023

tracking back a little further it is trying to run rsmanage but

from rsmanage import cli
runestoneserver-runestone-1  | ImportError: cannot import name 'cli' from 'rsmanage'

@bnmnetp
Copy link
Member

bnmnetp commented Feb 28, 2023

This is so weird, I can't even find anyplace in our code where we try to import cli from rsmanage. Running the tests locally on my dev build and all is fine, so it seems to be something in the setup for the tests.

Any ideas???

@bjones1
Copy link
Contributor Author

bjones1 commented Feb 28, 2023

I'm guessing this is something new/broken with Poetry 1.4.0. In rsmanage/setup.py, we have:

    entry_points="""
        [console_scripts]
        rsmanage=rsmanage:cli
    """,

which is probably where the import of cli comes from. I'll test and see what happens.

@bjones1
Copy link
Contributor Author

bjones1 commented Feb 28, 2023

OK, testing a fix now...

@bnmnetp
Copy link
Member

bnmnetp commented Mar 1, 2023

looks like it somehow lost the docker-tools test command...

@bnmnetp
Copy link
Member

bnmnetp commented Mar 1, 2023

I'm seeing this message:

print("Note: this must be an initial install; additional commands missing.")

So something is going wrong with the import from docker_tools_misc

@bnmnetp
Copy link
Member

bnmnetp commented Mar 1, 2023

Some real backward incompatibility in poetry 1.4? I see it was just released on the 2/27. I had rebuilt locally a few days before. Looking at the changelog I didn't see see anything to indicate such major changes.

Looking at recent issues on github for poetry it seems there are a few that might be related...

Do you think we should maybe stick with poetry 1.3.2 for a while?

@bnmnetp
Copy link
Member

bnmnetp commented Mar 1, 2023

I had all of the tests passing as long as I used -- --skip_w3_validate

Now I see that my fixes are on my python 3.10 branch. If you think it is better to stick with 1.4.0 then maybe we should merge this and I can merge my 3.10 branch because that has more test fixes...

@bjones1
Copy link
Contributor Author

bjones1 commented Mar 1, 2023

That makes sense to me -- these fixes remove a lot of Poetry bug fix/workaround stuff, so I think it's a good step forward. Let's merge this, then you merge your 3.10 branch. Hopefully, that will get us back to all tests passing again!

@bjones1
Copy link
Contributor Author

bjones1 commented Mar 1, 2023

Do you want to merge this, or shall I?

@bnmnetp
Copy link
Member

bnmnetp commented Mar 1, 2023

I'm on it.

@bnmnetp bnmnetp merged commit ab5c86e into RunestoneInteractive:master Mar 1, 2023
@bjones1 bjones1 deleted the docker-tools-fixes branch March 1, 2023 17:19
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants