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

fix: python to 3.11 and E2E validator test #666

Merged
merged 8 commits into from
Sep 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
EMAIL_FROM: [email protected]

# DEGREE VALIDATOR
NEXT_PUBLIC_VALIDATOR: http://localhost:5000
NEXT_PUBLIC_VALIDATOR: http://127.0.0.1:5000

NODE_ENV: test

Expand All @@ -72,10 +72,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Setup Python3.10
- name: Setup Python3.11
uses: actions/setup-python@v4
with:
python-version: '3.10'
python-version: '3.11'

- name: Start validator server
working-directory: validator
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validator_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- uses: actions/setup-python@v4
with:
python-version: '3.10'
python-version: '3.11'

- name: Install dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ To be able to start development on Planner make sure that you have the following

- [Node.js v16 or above](https://nodejs.org/en)
- [Git](https://git-scm.com/downloads)
- [Python3.10](https://www.python.org/downloads)
- [Python3.11](https://www.python.org/downloads)
</details>

<details>
Expand Down Expand Up @@ -144,7 +144,7 @@ npm install

```bash
cd validator
python3.10 -m venv venv # Create virtual environment
python3.11 -m venv venv # Create virtual environment
source venv/bin/activate # Use virtual enviornment
pip install -r requirements.txt # Install dependencies
flask --app api run
Expand Down
5 changes: 5 additions & 0 deletions cypress/e2e/create-plan.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,10 @@ describe('Plan creation flow', () => {
.then(($el) => $el.text())
.should('eq', major);
});

cy.get('#tutorial-editor-1 svg.animate-spin').should('not.exist', { timeout: 10000 });
cy.get('#tutorial-editor-1')
.contains('It seems like a screw has gone loose!', { timeout: 0 })
.should('not.exist');
});
});
2 changes: 1 addition & 1 deletion src/server/trpc/router/validator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ export const validatorRouter = router({
})
.catch((err) => {
const errorMessage = `Validator error: ${err.message}`;
console.error(errorMessage);
console.error('Validator error', err);
throw new TRPCError({
code: 'INTERNAL_SERVER_ERROR',
cause: err,
Expand Down
4 changes: 2 additions & 2 deletions validator/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ mypy==1.0.0
mypy-extensions==0.4.3
numpy==1.23.4
ordered-set==4.1.0
ortools==9.4.1874
ortools==9.7.2996
packaging==22.0
pathspec==0.10.3
platformdirs==2.6.0
pluggy==1.0.0
protobuf==4.21.7
protobuf==4.23.3
pydantic==1.10.2
Pygments==2.15.0
pyparsing==3.0.9
Expand Down
Loading