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 relative paths for online extra resources #3285

Merged
merged 4 commits into from
Nov 11, 2020

Conversation

peircej
Copy link
Member

@peircej peircej commented Nov 11, 2020

No description provided.

It was using the filename rather than the folder and that gave the files
a ../ at the beginning

This is now fixed in the dialog hen fetching te filename and also in the
loading of previous experiments that had included the error (2020.2.5)
@peircej peircej changed the title Fix resources rel path Fix relative paths for online extra resources Nov 11, 2020
@coveralls
Copy link

coveralls commented Nov 11, 2020

Coverage Status

Coverage decreased (-0.02%) to 46.509% when pulling 3ae90ae on peircej:fix-resourcesRelPath into 8887d6e on psychopy:master.

@codecov-io
Copy link

codecov-io commented Nov 11, 2020

Codecov Report

Merging #3285 (3ae90ae) into master (b6645c2) will increase coverage by 0.00%.
The diff coverage is 56.52%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3285   +/-   ##
=======================================
  Coverage   42.68%   42.68%           
=======================================
  Files         261      261           
  Lines       51046    51063   +17     
  Branches     8812     8816    +4     
=======================================
+ Hits        21787    21798   +11     
- Misses      27056    27060    +4     
- Partials     2203     2205    +2     
Impacted Files Coverage Δ
psychopy/app/builder/dialogs/__init__.py 42.72% <30.00%> (+0.12%) ⬆️
psychopy/experiment/_experiment.py 52.08% <76.92%> (+0.22%) ⬆️
psychopy/visual/slider.py 74.91% <0.00%> (-0.52%) ⬇️
psychopy/experiment/components/slider/__init__.py 73.43% <0.00%> (+0.20%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b6645c2...3ae90ae. Read the comment docs.

@peircej peircej merged commit d8b0963 into psychopy:master Nov 11, 2020
@peircej peircej deleted the fix-resourcesRelPath branch November 11, 2020 16:05
peircej added a commit that referenced this pull request Nov 12, 2020
* BF: fix format of Resources file list after loading study

* BF: online Resources dlg was using incorrect root for rel path

It was using the filename rather than the folder and that gave the files
a ../ at the beginning

This is now fixed in the dialog hen fetching te filename and also in the
loading of previous experiments that had included the error (2020.2.5)

* TESTS: create test_onlineExtraResources to demonstrate broken resources

(also updated this file to use pathlib)
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

3 participants